5554 files changed, 14649 insertions, 134706 deletions

diff --git a/games-action/0verkill-0.16-r4 b/games-action/0verkill-0.16-r4
new file mode 100644
index 000000000000..076d26ba7829
--- /dev/null
+++ b/games-action/0verkill-0.16-r4
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 478fcc1bbda7..000000000000
--- a/games-action/0verkill/0verkill-0.16-r4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
deleted file mode 100644
index 642d42166de3..000000000000
--- a/games-action/0verkill/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 568f8a4aa6f2..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-CC.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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
deleted file mode 100644
index 90d049309f4d..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-docs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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
deleted file mode 100644
index d48b758c9e53..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-gentoo-paths.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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
deleted file mode 100644
index 63bfb5fa7a6a..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-home-overflow.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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
deleted file mode 100644
index a8a832e19619..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-ovflfix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 9f9656dfd9fa..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-segv.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
deleted file mode 100644
index d0af396deafd..000000000000
--- a/games-action/0verkill/files/0verkill-0.16-underflow-check.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/0verkill/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index d09cebd91159..9f2380038025 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
new file mode 100644
index 000000000000..0b4352eac684
--- /dev/null
+++ b/games-action/abuse-0.8-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index b59bb441f6ff..000000000000
--- a/games-action/abuse/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 5099dd703aa8..000000000000
--- a/games-action/abuse/abuse-0.8-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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
deleted file mode 100644
index c5d97834d9ec..000000000000
--- a/games-action/abuse/files/abuse-0.8-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index c040f7c7d3e0..000000000000
--- a/games-action/abuse/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/games-action/accelerator3d-0.1.1-r3 b/games-action/accelerator3d-0.1.1-r3
new file mode 100644
index 000000000000..90d666bb13cd
--- /dev/null
+++ b/games-action/accelerator3d-0.1.1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+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
deleted file mode 100644
index d91f1930bfb9..000000000000
--- a/games-action/accelerator3d/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 1a5d9737b89a..000000000000
--- a/games-action/accelerator3d/accelerator3d-0.1.1-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-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
deleted file mode 100644
index 526fa678fdbc..000000000000
--- a/games-action/accelerator3d/files/accelerator3d-0.1.1-gentoo-paths.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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
deleted file mode 100644
index 31d0a8b5b4c5..000000000000
--- a/games-action/accelerator3d/files/accelerator3d-0.1.1-gllightmodel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index eaa5ae72c1f2..000000000000
--- a/games-action/accelerator3d/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
new file mode 100644
index 000000000000..5629f043eca9
--- /dev/null
+++ b/games-action/armagetronad-0.2.8.3.3-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 018b527f208b..000000000000
--- a/games-action/armagetronad/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 9147b2111608..000000000000
--- a/games-action/armagetronad/armagetronad-0.2.8.3.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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
deleted file mode 100644
index 0cd6e5bc1d67..000000000000
--- a/games-action/armagetronad/files/armagetronad-0.2.8.3.3-gcc6.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-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
deleted file mode 100644
index 0a249e335798..000000000000
--- a/games-action/armagetronad/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">armagetronad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/atanks-6.4-r1 b/games-action/atanks-6.4-r1
new file mode 100644
index 000000000000..8ec01bae877a
--- /dev/null
+++ b/games-action/atanks-6.4-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 8c9c1ee6f223..000000000000
--- a/games-action/atanks/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index ed2deed79042..000000000000
--- a/games-action/atanks/atanks-6.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
deleted file mode 100644
index e13ebb1d1421..000000000000
--- a/games-action/atanks/files/atanks-6.4-fix-build-system.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-* 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
deleted file mode 100644
index f4e068857c3f..000000000000
--- a/games-action/atanks/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">atanks</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/barrage-1.0.4-r1 b/games-action/barrage-1.0.4-r1
new file mode 100644
index 000000000000..4d680b398ff7
--- /dev/null
+++ b/games-action/barrage-1.0.4-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3b217a4f8900..000000000000
--- a/games-action/barrage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index fc4dde6e54ed..000000000000
--- a/games-action/barrage/barrage-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
deleted file mode 100644
index 2cbba7c09d17..000000000000
--- a/games-action/barrage/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lgames</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/battalion-1.4b-r1 b/games-action/battalion-1.4b-r1
new file mode 100644
index 000000000000..e962f360d62c
--- /dev/null
+++ b/games-action/battalion-1.4b-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3d3f8b7e0742..000000000000
--- a/games-action/battalion/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index d601672cf212..000000000000
--- a/games-action/battalion/battalion-1.4b-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
deleted file mode 100644
index fe209e1db953..000000000000
--- a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- 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
deleted file mode 100644
index 91fd8ee51d3b..000000000000
--- a/games-action/battalion/files/battalion-1.4b-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/battalion/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/beathazardultra-20130308-r1 b/games-action/beathazardultra-20130308-r1
new file mode 100644
index 000000000000..450aa8c7b3a5
--- /dev/null
+++ b/games-action/beathazardultra-20130308-r1
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index 9bbb60437fa1..000000000000
--- a/games-action/beathazardultra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index dbfa798f384d..000000000000
--- a/games-action/beathazardultra/beathazardultra-20130308-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-action/beathazardultra/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-action/bomberclone-0.11.8-r1 b/games-action/bomberclone-0.11.8-r1
new file mode 100644
index 000000000000..296b7c93a7da
--- /dev/null
+++ b/games-action/bomberclone-0.11.8-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index a3857946adc9..000000000000
--- a/games-action/bomberclone/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 31eb3fe53e87..000000000000
--- a/games-action/bomberclone/bomberclone-0.11.8-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
deleted file mode 100644
index fd77e1b7b1d6..000000000000
--- a/games-action/bomberclone/files/bomberclone-0.11.8-gcc52.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 18c063b56db9..000000000000
--- a/games-action/bomberclone/files/bomberclone-0.11.8-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 3948f34d5eb8..000000000000
--- a/games-action/bomberclone/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bomberclone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/brutal-legend-20130615-r2 b/games-action/brutal-legend-20130615-r2
new file mode 100644
index 000000000000..55e8288badf0
--- /dev/null
+++ b/games-action/brutal-legend-20130615-r2
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index dfab1cb7fd4f..000000000000
--- a/games-action/brutal-legend/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b9c0096e1456..000000000000
--- a/games-action/brutal-legend/brutal-legend-20130615-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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
deleted file mode 100644
index 336d0fe7cf2a..000000000000
--- a/games-action/brutal-legend/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		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
new file mode 100644
index 000000000000..301cdf3da966
--- /dev/null
+++ b/games-action/btanks-0.9.8083
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index c437f173ab2c..000000000000
--- a/games-action/btanks/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 6036ed703dea..000000000000
--- a/games-action/btanks/btanks-0.9.8083.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
deleted file mode 100644
index 367c33cc6f24..000000000000
--- a/games-action/btanks/files/btanks-0.9.8083-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 13a4cf3723ae..000000000000
--- a/games-action/btanks/files/btanks-0.9.8083-gcc47.patch
+++ /dev/null
@@ -1,103 +0,0 @@
---- 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
deleted file mode 100644
index 5f11379d8056..000000000000
--- a/games-action/btanks/files/btanks-0.9.8083-gcc6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
deleted file mode 100644
index 47ce410f0bf8..000000000000
--- a/games-action/btanks/files/btanks-0.9.8083-scons-blows.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- 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
deleted file mode 100644
index 3574b919826a..000000000000
--- a/games-action/btanks/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>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
new file mode 100644
index 000000000000..7c37abe0a3f1
--- /dev/null
+++ b/games-action/bzflag-2.4.12
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..2200a1358aad
--- /dev/null
+++ b/games-action/bzflag-2.4.14
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 171c3ec8b98b..000000000000
--- a/games-action/bzflag/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 0f6e8a8722e5..000000000000
--- a/games-action/bzflag/bzflag-2.4.12.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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
deleted file mode 100644
index 290ef54d300a..000000000000
--- a/games-action/bzflag/bzflag-2.4.14.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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
deleted file mode 100644
index e1c546f37a34..000000000000
--- a/games-action/bzflag/files/bzflag-2.4.12-configure.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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
deleted file mode 100644
index f7f6dfd7f14c..000000000000
--- a/games-action/bzflag/files/bzflag-2.4.12-sdl2-cppflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index aa43980b9b67..000000000000
--- a/games-action/bzflag/files/bzflag-2.4.12-tinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 66090a0275ee..000000000000
--- a/games-action/bzflag/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bzflag</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/chickens-0.2.4-r1 b/games-action/chickens-0.2.4-r1
new file mode 100644
index 000000000000..657282871ab5
--- /dev/null
+++ b/games-action/chickens-0.2.4-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 6480162e0a70..000000000000
--- a/games-action/chickens/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 258e87e5303c..000000000000
--- a/games-action/chickens/chickens-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/chickens/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/chromium-bsu-0.9.15.1-r1 b/games-action/chromium-bsu-0.9.15.1-r1
new file mode 100644
index 000000000000..6b3ef0ff8500
--- /dev/null
+++ b/games-action/chromium-bsu-0.9.15.1-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 86afce6bde06..000000000000
--- a/games-action/chromium-bsu/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 578f593bf3df..000000000000
--- a/games-action/chromium-bsu/chromium-bsu-0.9.15.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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
deleted file mode 100644
index 5d3b919adf3f..000000000000
--- a/games-action/chromium-bsu/files/chromium-bsu-0.9.15.1-gcc6.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- 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
deleted file mode 100644
index a8145e90454d..000000000000
--- a/games-action/chromium-bsu/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="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
new file mode 100644
index 000000000000..0017277944f1
--- /dev/null
+++ b/games-action/clanbomber-2.1.1-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 388e17d48c63..000000000000
--- a/games-action/clanbomber/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index b6f4ba83831f..000000000000
--- a/games-action/clanbomber/clanbomber-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
deleted file mode 100644
index 5fce5be335aa..000000000000
--- a/games-action/clanbomber/files/clanbomber-2.1.1-automake112.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index f3e67666a22d..000000000000
--- a/games-action/clanbomber/files/clanbomber-2.1.1-boost150.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
deleted file mode 100644
index 714e9de85fa2..000000000000
--- a/games-action/clanbomber/files/clanbomber-2.1.1-gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
deleted file mode 100644
index f8deca247ba9..000000000000
--- a/games-action/clanbomber/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
new file mode 100644
index 000000000000..e8ae02d1cf42
--- /dev/null
+++ b/games-action/cs2d-1002-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 41ae8cfad422..000000000000
--- a/games-action/cs2d/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 46b4c3b59d80..000000000000
--- a/games-action/cs2d/cs2d-1002-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
deleted file mode 100644
index 31a8e7784a81..000000000000
--- a/games-action/cs2d/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>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
new file mode 100644
index 000000000000..ba0d8d674e5e
--- /dev/null
+++ b/games-action/d1x-rebirth-0.58.1
@@ -0,0 +1,16 @@
+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
deleted file mode 100644
index aa2c13c8adcb..000000000000
--- a/games-action/d1x-rebirth/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 04e178288320..000000000000
--- a/games-action/d1x-rebirth/d1x-rebirth-0.58.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom 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
deleted file mode 100644
index 51723ffb137b..000000000000
--- a/games-action/d1x-rebirth/files/d1x-rebirth-0.58.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 23d592266dfb..000000000000
--- a/games-action/d1x-rebirth/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="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
new file mode 100644
index 000000000000..df14a9995869
--- /dev/null
+++ b/games-action/deathchase3d-0.9-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 63ccc7554699..000000000000
--- a/games-action/deathchase3d/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index f063ab7c3d10..000000000000
--- a/games-action/deathchase3d/deathchase3d-0.9-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# 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
deleted file mode 100644
index ac20e1ff3800..000000000000
--- a/games-action/deathchase3d/files/deathchase3d-0.9-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/deathchase3d/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/descent1-data-1.4a b/games-action/descent1-data-1.4a
new file mode 100644
index 000000000000..b637d11faea3
--- /dev/null
+++ b/games-action/descent1-data-1.4a
@@ -0,0 +1,15 @@
+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
deleted file mode 100644
index d43089b00c93..000000000000
--- a/games-action/descent1-data/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 85cf48cd3a03..000000000000
--- a/games-action/descent1-data/descent1-data-1.4a.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-action/descent1-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/descent1-demodata-1.4-r1 b/games-action/descent1-demodata-1.4-r1
new file mode 100644
index 000000000000..a57b9581bb71
--- /dev/null
+++ b/games-action/descent1-demodata-1.4-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index e6506d67e07d..000000000000
--- a/games-action/descent1-demodata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 8a61ba5c2977..000000000000
--- a/games-action/descent1-demodata/descent1-demodata-1.4-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
deleted file mode 100644
index d14136fc9672..000000000000
--- a/games-action/descent1-demodata/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
new file mode 100644
index 000000000000..e0c3a9b396b1
--- /dev/null
+++ b/games-action/descent2-data-1.2
@@ -0,0 +1,15 @@
+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
deleted file mode 100644
index 51769f7318e2..000000000000
--- a/games-action/descent2-data/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 947680089288..000000000000
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/descent2-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/descent2-demodata-1.0-r1 b/games-action/descent2-demodata-1.0-r1
new file mode 100644
index 000000000000..79751a0337b6
--- /dev/null
+++ b/games-action/descent2-demodata-1.0-r1
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index 5fe6e56e9546..000000000000
--- a/games-action/descent2-demodata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 79abcc78e76d..000000000000
--- a/games-action/descent2-demodata/descent2-demodata-1.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/descent2-demodata/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/descent2-vertigo-1.0 b/games-action/descent2-vertigo-1.0
new file mode 100644
index 000000000000..eb8a8e2c83b1
--- /dev/null
+++ b/games-action/descent2-vertigo-1.0
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 58c57d3cd478..000000000000
--- a/games-action/descent2-vertigo/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index d49ee60b99d0..000000000000
--- a/games-action/descent2-vertigo/descent2-vertigo-1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-action/descent2-vertigo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/descent3-1.4.0b-r2 b/games-action/descent3-1.4.0b-r2
new file mode 100644
index 000000000000..c7e07ca30719
--- /dev/null
+++ b/games-action/descent3-1.4.0b-r2
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..4a4c82cbf483
--- /dev/null
+++ b/games-action/descent3-demo-1.4.0a-r1
@@ -0,0 +1,15 @@
+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
deleted file mode 100644
index fd55865aaa8b..000000000000
--- a/games-action/descent3-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index cad5192149ca..000000000000
--- a/games-action/descent3-demo/descent3-demo-1.4.0a-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
deleted file mode 100644
index 27cdd4f34a28..000000000000
--- a/games-action/descent3-demo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
deleted file mode 100644
index d9c208619dfa..000000000000
--- a/games-action/descent3/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index d663b28ab8f5..000000000000
--- a/games-action/descent3/descent3-1.4.0b-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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
deleted file mode 100644
index bdbb1bdaaee9..000000000000
--- a/games-action/descent3/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
new file mode 100644
index 000000000000..844d37b0fbc3
--- /dev/null
+++ b/games-action/dxx-rebirth-0.59.100
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index f2fde940546b..000000000000
--- a/games-action/dxx-rebirth/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 048eb3cb263c..000000000000
--- a/games-action/dxx-rebirth/dxx-rebirth-0.59.100.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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
deleted file mode 100644
index 75c3a64f893b..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-flags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index ee1b6bb9ea05..000000000000
--- a/games-action/dxx-rebirth/files/dxx-rebirth-0.59.100-sharepath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index b2765a3b0291..000000000000
--- a/games-action/dxx-rebirth/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<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
new file mode 100644
index 000000000000..13e2a38ba7cd
--- /dev/null
+++ b/games-action/extreme-tuxracer-0.7.4
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3428084d1de9..000000000000
--- a/games-action/extreme-tuxracer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index f6ca77b5dc89..000000000000
--- a/games-action/extreme-tuxracer/extreme-tuxracer-0.7.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
deleted file mode 100644
index d2f791335717..000000000000
--- a/games-action/extreme-tuxracer/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<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
new file mode 100644
index 000000000000..7aa7c0f40ca3
--- /dev/null
+++ b/games-action/fakk2-1.02-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index e626e8c64035..000000000000
--- a/games-action/fakk2/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b038c25d14ee..000000000000
--- a/games-action/fakk2/fakk2-1.02-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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
deleted file mode 100644
index 07964f9113c6..000000000000
--- a/games-action/fakk2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
new file mode 100644
index 000000000000..d4164b7d1075
--- /dev/null
+++ b/games-action/formido-1.0.1-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 6a5b821a6eb9..000000000000
--- a/games-action/formido/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index c7e9e86f1740..000000000000
--- a/games-action/formido/formido-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/formido/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/garden-1.0.9-r1 b/games-action/garden-1.0.9-r1
new file mode 100644
index 000000000000..56dbead8e361
--- /dev/null
+++ b/games-action/garden-1.0.9-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 4987ccfa559d..000000000000
--- a/games-action/garden/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 6b197f4f4e1a..000000000000
--- a/games-action/garden/files/garden-1.0.9-dash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index 0ddbdc5e6e30..000000000000
--- a/games-action/garden/files/garden-1.0.9-resources.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- 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
deleted file mode 100644
index eb80fe0b36ba..000000000000
--- a/games-action/garden/garden-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
deleted file mode 100644
index ea6aa407a062..000000000000
--- a/games-action/garden/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
new file mode 100644
index 000000000000..bc58ff976f8c
--- /dev/null
+++ b/games-action/geki2-KXL-2.0.3-r3
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 1a02bbacb023..000000000000
--- a/games-action/geki2-KXL/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index d00f8d439c80..000000000000
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-cflags.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
deleted file mode 100644
index 22844202bb2c..000000000000
--- a/games-action/geki2-KXL/files/geki2-KXL-2.0.3-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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
deleted file mode 100644
index fe44b06c04b0..000000000000
--- a/games-action/geki2-KXL/geki2-KXL-2.0.3-r3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/geki2-KXL/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/geki3-KXL-1.0.3-r3 b/games-action/geki3-KXL-1.0.3-r3
new file mode 100644
index 000000000000..6230e8131267
--- /dev/null
+++ b/games-action/geki3-KXL-1.0.3-r3
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3df9ea5cf9e9..000000000000
--- a/games-action/geki3-KXL/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 26f3f4371b85..000000000000
--- a/games-action/geki3-KXL/files/geki3-KXL-1.0.3-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
deleted file mode 100644
index e4a7bf505b6d..000000000000
--- a/games-action/geki3-KXL/geki3-KXL-1.0.3-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/geki3-KXL/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/gltron-0.70-r2 b/games-action/gltron-0.70-r2
new file mode 100644
index 000000000000..96a1feda47b8
--- /dev/null
+++ b/games-action/gltron-0.70-r2
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index a40cd40f4707..000000000000
--- a/games-action/gltron/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 5bdef979a57f..000000000000
--- a/games-action/gltron/files/gltron-0.70-configure.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index 4e25618ce9b6..000000000000
--- a/games-action/gltron/files/gltron-0.70-debian.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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
deleted file mode 100644
index 4a1d5cbe1e1e..000000000000
--- a/games-action/gltron/files/gltron-0.70-gcc49.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 621963aeb689..000000000000
--- a/games-action/gltron/files/gltron-0.70-prototypes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
deleted file mode 100644
index dc47e0b51cab..000000000000
--- a/games-action/gltron/gltron-0.70-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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
deleted file mode 100644
index 0612306374d9..000000000000
--- a/games-action/gltron/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gltron</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/heretic2-1.06c-r1 b/games-action/heretic2-1.06c-r1
new file mode 100644
index 000000000000..0463cb4e101a
--- /dev/null
+++ b/games-action/heretic2-1.06c-r1
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..0d1f8eb97457
--- /dev/null
+++ b/games-action/heretic2-demo-1.06a
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 3ad7013042ab..000000000000
--- a/games-action/heretic2-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0db2fab52331..000000000000
--- a/games-action/heretic2-demo/heretic2-demo-1.06a.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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
deleted file mode 100644
index 3df7e72452ae..000000000000
--- a/games-action/heretic2-demo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
deleted file mode 100644
index efbf3772cc08..000000000000
--- a/games-action/heretic2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index dc1322e89355..000000000000
--- a/games-action/heretic2/heretic2-1.06c-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-action/heretic2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/heroes-0.21-r2 b/games-action/heroes-0.21-r2
new file mode 100644
index 000000000000..0639e05da548
--- /dev/null
+++ b/games-action/heroes-0.21-r2
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index 632d40a7c078..000000000000
--- a/games-action/heroes/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 689fdeea8a6c..000000000000
--- a/games-action/heroes/files/0.21-cvs-segfault-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-===================================================================
-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
deleted file mode 100644
index 1a645df91acb..000000000000
--- a/games-action/heroes/files/heroes-0.21-automake-1.12.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 2e39907347a9..000000000000
--- a/games-action/heroes/files/heroes-0.21-gcc4.patch
+++ /dev/null
@@ -1,184 +0,0 @@
---- 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
deleted file mode 100644
index 18a0fca28f3c..000000000000
--- a/games-action/heroes/files/heroes-0.21-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 5ab9018ee3d1..000000000000
--- a/games-action/heroes/heroes-0.21-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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
deleted file mode 100644
index a811955bf505..000000000000
--- a/games-action/heroes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
new file mode 100644
index 000000000000..866dd68e5d3d
--- /dev/null
+++ b/games-action/hotline-miami-1.0.9a_p20140221-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index c40a4f79d8ab..000000000000
--- a/games-action/hotline-miami/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index c885ea8a511e..000000000000
--- a/games-action/hotline-miami/hotline-miami-1.0.9a_p20140221-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# 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
deleted file mode 100644
index bd944bb6e375..000000000000
--- a/games-action/hotline-miami/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="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
new file mode 100644
index 000000000000..99361c864b6c
--- /dev/null
+++ b/games-action/intrusion2-1.024
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 6d4351168ee0..000000000000
--- a/games-action/intrusion2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 69aae57e2d33..000000000000
--- a/games-action/intrusion2/intrusion2-1.024.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-action/intrusion2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/koth-0.8.0-r1 b/games-action/koth-0.8.0-r1
new file mode 100644
index 000000000000..6e54a99d426a
--- /dev/null
+++ b/games-action/koth-0.8.0-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 623a9303fe98..000000000000
--- a/games-action/koth/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 145f17dbccdd..000000000000
--- a/games-action/koth/files/koth-0.8.0-r1-gcc-3.4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
deleted file mode 100644
index bc77fea14053..000000000000
--- a/games-action/koth/koth-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
deleted file mode 100644
index af8d2cdcfd9e..000000000000
--- a/games-action/koth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<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
new file mode 100644
index 000000000000..d624570bb5a5
--- /dev/null
+++ b/games-action/lugaru-20151204-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 25bd52d81ac9..000000000000
--- a/games-action/lugaru/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index da9310dde58e..000000000000
--- a/games-action/lugaru/files/lugaru-20151204-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index f53cecb8d748..000000000000
--- a/games-action/lugaru/lugaru-20151204-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# 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
deleted file mode 100644
index f50d5486c2ab..000000000000
--- a/games-action/lugaru/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="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
new file mode 100644
index 000000000000..cb2561d669d4
--- /dev/null
+++ b/games-action/luola-1.3.2-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index a5f1eb522994..000000000000
--- a/games-action/luola/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 2c862bbc30db..000000000000
--- a/games-action/luola/files/luola-1.3.2-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index f346b53fc647..000000000000
--- a/games-action/luola/luola-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
deleted file mode 100644
index 5fc36fdad374..000000000000
--- a/games-action/luola/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">luola</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-action/maelstrom-3.0.6-r3 b/games-action/maelstrom-3.0.6-r3
new file mode 100644
index 000000000000..f500bdb8f814
--- /dev/null
+++ b/games-action/maelstrom-3.0.6-r3
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 254815c37b6d..000000000000
--- a/games-action/maelstrom/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 7d6f59a5ac26..000000000000
--- a/games-action/maelstrom/files/maelstrom-3.0.6-64bits.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 6ceb421f16ba..000000000000
--- a/games-action/maelstrom/files/maelstrom-3.0.6-gcc34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
deleted file mode 100644
index db7624bacf91..000000000000
--- a/games-action/maelstrom/files/maelstrom-3.0.6-gcc53.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index ae22c0cdd11a..000000000000
--- a/games-action/maelstrom/files/maelstrom-3.0.6-security.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-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
deleted file mode 100644
index 8b2ca084c65f..000000000000
--- a/games-action/maelstrom/files/maelstrom-3.0.6-warnings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index bd1110643dbe..000000000000
--- a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/maelstrom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/metadata.xml b/games-action/metadata.xml
deleted file mode 100644
index dd0a884f0100..000000000000
--- a/games-action/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-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
new file mode 100644
index 000000000000..daeda73ded12
--- /dev/null
+++ b/games-action/minetest-0.4.16-r1
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..c4f4fd366aee
--- /dev/null
+++ b/games-action/minetest-0.4.17-r1
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 000000000000..effd132156cf
--- /dev/null
+++ b/games-action/minetest-0.4.17.1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 3883e7c3ff1b..000000000000
--- a/games-action/minetest/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index ec3d0138cb73..000000000000
--- a/games-action/minetest/files/minetestserver.confd
+++ /dev/null
@@ -1,16 +0,0 @@
-# /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
deleted file mode 100644
index 1e56ff646517..000000000000
--- a/games-action/minetest/files/minetestserver.initd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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
deleted file mode 100644
index c302c3ff8ee8..000000000000
--- a/games-action/minetest/metadata.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?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
deleted file mode 100644
index 8291b16dba14..000000000000
--- a/games-action/minetest/minetest-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils gnome2-utils 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
deleted file mode 100644
index b71ccc4d1979..000000000000
--- a/games-action/minetest/minetest-0.4.17-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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
deleted file mode 100644
index b71ccc4d1979..000000000000
--- a/games-action/minetest/minetest-0.4.17.1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# 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
new file mode 100644
index 000000000000..d56979ebe08e
--- /dev/null
+++ b/games-action/minetest_game-0.4.16
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000000..94c37038ac7d
--- /dev/null
+++ b/games-action/minetest_game-0.4.17
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index 1fc591a3faf6..000000000000
--- a/games-action/minetest_game/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 15dfa15e0050..000000000000
--- a/games-action/minetest_game/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="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
deleted file mode 100644
index 480fa56907fc..000000000000
--- a/games-action/minetest_game/minetest_game-0.4.16.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
deleted file mode 100644
index cba98c5a4067..000000000000
--- a/games-action/minetest_game/minetest_game-0.4.17.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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
new file mode 100644
index 000000000000..36786becd51a
--- /dev/null
+++ b/games-action/moon-buggy-1.0.51-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 782208303389..000000000000
--- a/games-action/moon-buggy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/moon-buggy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild b/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild
deleted file mode 100644
index 22373707aea9..000000000000
--- a/games-action/moon-buggy/moon-buggy-1.0.51-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
new file mode 100644
index 000000000000..b2a7bc89c737
--- /dev/null
+++ b/games-action/mutantstorm-demo-1.33-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 38283c6ea72f..000000000000
--- a/games-action/mutantstorm-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b12b9be3c4cb..000000000000
--- a/games-action/mutantstorm-demo/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-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
deleted file mode 100644
index c97fee4f7172..000000000000
--- a/games-action/mutantstorm-demo/mutantstorm-demo-1.33-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
new file mode 100644
index 000000000000..21489ffdac3c
--- /dev/null
+++ b/games-action/nighthawk-2.2-r1
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index b3eb487525dc..000000000000
--- a/games-action/nighthawk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index a9ad8c98484a..000000000000
--- a/games-action/nighthawk/files/nighthawk-2.2-gcc42.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index accef759e682..000000000000
--- a/games-action/nighthawk/files/nighthawk.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
deleted file mode 100644
index e90f5a7f5e60..000000000000
--- a/games-action/nighthawk/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index bba6757c9e18..000000000000
--- a/games-action/nighthawk/nighthawk-2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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
new file mode 100644
index 000000000000..3396bb110fef
--- /dev/null
+++ b/games-action/noiz2sa-0.51a-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index a9eb4b2255cd..000000000000
--- a/games-action/noiz2sa/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 9f4f4fe2f1c0..000000000000
--- a/games-action/noiz2sa/files/noiz2sa-0.51a-gcc41.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index 6d6ab9f18636..000000000000
--- a/games-action/noiz2sa/files/noiz2sa-0.51a-underlink.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
deleted file mode 100644
index 953ec64f1e61..000000000000
--- a/games-action/noiz2sa/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index 785ff242ac91..000000000000
--- a/games-action/noiz2sa/noiz2sa-0.51a-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils 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
new file mode 100644
index 000000000000..d2626e1c05e7
--- /dev/null
+++ b/games-action/openastromenace-1.3.2-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index aaadf53f73f5..000000000000
--- a/games-action/openastromenace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 6894dd761700..000000000000
--- a/games-action/openastromenace/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index cdd657e1958c..000000000000
--- a/games-action/openastromenace/openastromenace-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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
new file mode 100644
index 000000000000..fa2c7d23d60f
--- /dev/null
+++ b/games-action/openclonk-7.0
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 37921f643a59..000000000000
--- a/games-action/openclonk/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 4ebd6034a59b..000000000000
--- a/games-action/openclonk/files/openclonk-7.0-paths.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-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
deleted file mode 100644
index 26ad61ec6784..000000000000
--- a/games-action/openclonk/files/openclonk-7.0-postinst.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 9f7e64442887..000000000000
--- a/games-action/openclonk/files/openclonk-wrapper-script.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/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
deleted file mode 100644
index 8d041fd7d412..000000000000
--- a/games-action/openclonk/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<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
deleted file mode 100644
index 46aeb31b45a4..000000000000
--- a/games-action/openclonk/openclonk-7.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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
new file mode 100644
index 000000000000..ef085b5dad88
--- /dev/null
+++ b/games-action/orbital-eunuchs-sniper-1.30-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3fb307073013..000000000000
--- a/games-action/orbital-eunuchs-sniper/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 9492e1e8b967..000000000000
--- a/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-datadir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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
deleted file mode 100644
index d3747ed0802b..000000000000
--- a/games-action/orbital-eunuchs-sniper/files/orbital-eunuchs-sniper-1.30-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/orbital-eunuchs-sniper/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild b/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
deleted file mode 100644
index 191962741a35..000000000000
--- a/games-action/orbital-eunuchs-sniper/orbital-eunuchs-sniper-1.30-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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
new file mode 100644
index 000000000000..f28091e7c5af
--- /dev/null
+++ b/games-action/phobiaii-1.1-r1
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index bca4aa793750..000000000000
--- a/games-action/phobiaii/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/phobiaii/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/phobiaii/phobiaii-1.1-r1.ebuild b/games-action/phobiaii/phobiaii-1.1-r1.ebuild
deleted file mode 100644
index 4a1a879bf68a..000000000000
--- a/games-action/phobiaii/phobiaii-1.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# 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
new file mode 100644
index 000000000000..7d90c9e3557f
--- /dev/null
+++ b/games-action/postalplus-1-r1
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index 5c6536dec6ae..000000000000
--- a/games-action/postalplus/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/postalplus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/postalplus/postalplus-1-r1.ebuild b/games-action/postalplus/postalplus-1-r1.ebuild
deleted file mode 100644
index 569d32f5fa13..000000000000
--- a/games-action/postalplus/postalplus-1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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
new file mode 100644
index 000000000000..1d3d7d268df3
--- /dev/null
+++ b/games-action/powermanga-0.93.1-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index c131f769c97c..000000000000
--- a/games-action/powermanga/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index e8a013a2e04e..000000000000
--- a/games-action/powermanga/files/powermanga-0.93.1-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/powermanga/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/powermanga/powermanga-0.93.1-r1.ebuild b/games-action/powermanga/powermanga-0.93.1-r1.ebuild
deleted file mode 100644
index 01a45a6d43cd..000000000000
--- a/games-action/powermanga/powermanga-0.93.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils 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
new file mode 100644
index 000000000000..e5549f7a242f
--- /dev/null
+++ b/games-action/rafkill-1.2.3-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3446bb719692..000000000000
--- a/games-action/rafkill/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 26e5aa64c101..000000000000
--- a/games-action/rafkill/files/rafkill-1.2.3-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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
deleted file mode 100644
index 7284a74a1ac5..000000000000
--- a/games-action/rafkill/files/rafkill-1.2.3-gcc43.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-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
deleted file mode 100644
index 3c95e02869d1..000000000000
--- a/games-action/rafkill/files/rafkill-1.2.3-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 4adf853e912a..000000000000
--- a/games-action/rafkill/files/rafkill-1.2.3-ldflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
deleted file mode 100644
index cf6a276e7664..000000000000
--- a/games-action/rafkill/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index 7a28f29f9448..000000000000
--- a/games-action/rafkill/rafkill-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# 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
new file mode 100644
index 000000000000..d94cbc676d02
--- /dev/null
+++ b/games-action/rrootage-0.23a-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 4df38bd56370..000000000000
--- a/games-action/rrootage/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 1e6e50e683fd..000000000000
--- a/games-action/rrootage/files/rrootage-0.23a-gcc41.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
deleted file mode 100644
index dbea52d36fff..000000000000
--- a/games-action/rrootage/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index a36a0047c48b..000000000000
--- a/games-action/rrootage/rrootage-0.23a-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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
new file mode 100644
index 000000000000..4e27a9dd348e
--- /dev/null
+++ b/games-action/rune-1.07-r3
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 874c47c9d3dd..000000000000
--- a/games-action/rune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 51b5f12f9019..000000000000
--- a/games-action/rune/metadata.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-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
deleted file mode 100644
index 2f649202e4e4..000000000000
--- a/games-action/rune/rune-1.07-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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
new file mode 100644
index 000000000000..17b81e95fbf7
--- /dev/null
+++ b/games-action/shadowgrounds-bin-0_p1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index f1f0932b39b2..000000000000
--- a/games-action/shadowgrounds-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/shadowgrounds-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/shadowgrounds-bin/shadowgrounds-bin-0_p1.ebuild b/games-action/shadowgrounds-bin/shadowgrounds-bin-0_p1.ebuild
deleted file mode 100644
index 3a8863f6bb90..000000000000
--- a/games-action/shadowgrounds-bin/shadowgrounds-bin-0_p1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
new file mode 100644
index 000000000000..b458525acb87
--- /dev/null
+++ b/games-action/shadowgrounds-survivor-bin-0_p1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 9a351f47acb0..000000000000
--- a/games-action/shadowgrounds-survivor-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/shadowgrounds-survivor-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild b/games-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild
deleted file mode 100644
index 336d592a3471..000000000000
--- a/games-action/shadowgrounds-survivor-bin/shadowgrounds-survivor-bin-0_p1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
new file mode 100644
index 000000000000..16fc4c847b24
--- /dev/null
+++ b/games-action/shootingstar-1.2.0-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 8cbb6a1b100b..000000000000
--- a/games-action/shootingstar/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index b55997552fc8..000000000000
--- a/games-action/shootingstar/files/1.2.0-gcc34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index dfc1a8d8e77e..000000000000
--- a/games-action/shootingstar/files/shootingstar-1.2.0-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/shootingstar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild b/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
deleted file mode 100644
index 11411f402d59..000000000000
--- a/games-action/shootingstar/shootingstar-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
new file mode 100644
index 000000000000..59f69989a7d0
--- /dev/null
+++ b/games-action/slune-1.0.15-r1
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index 8cfbf797dee7..000000000000
--- a/games-action/slune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/slune/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/slune/slune-1.0.15-r1.ebuild b/games-action/slune/slune-1.0.15-r1.ebuild
deleted file mode 100644
index a6e9ecaf1c09..000000000000
--- a/games-action/slune/slune-1.0.15-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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
new file mode 100644
index 000000000000..dd1dd2ceb65c
--- /dev/null
+++ b/games-action/snipes-1.0.4-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index c898af018215..000000000000
--- a/games-action/snipes/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 8bdaeef3e356..000000000000
--- a/games-action/snipes/files/snipes-1.0.4-nongnulinker.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/snipes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/snipes/snipes-1.0.4-r1.ebuild b/games-action/snipes/snipes-1.0.4-r1.ebuild
deleted file mode 100644
index 9d8e9a36c48b..000000000000
--- a/games-action/snipes/snipes-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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
new file mode 100644
index 000000000000..3ba66e8f44c6
--- /dev/null
+++ b/games-action/solar2-1.10
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index 12ee5c767763..000000000000
--- a/games-action/solar2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-action/solar2/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-action/solar2/solar2-1.10.ebuild b/games-action/solar2/solar2-1.10.ebuild
deleted file mode 100644
index 2a092f697e3a..000000000000
--- a/games-action/solar2/solar2-1.10.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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
new file mode 100644
index 000000000000..54d2fd6a19be
--- /dev/null
+++ b/games-action/spacearyarya-kxl-1.0.2-r2
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 9c84c9f78a40..000000000000
--- a/games-action/spacearyarya-kxl/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 3b9b68b745c0..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-clang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 2239858be998..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-flags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 81321b76857a..000000000000
--- a/games-action/spacearyarya-kxl/files/spacearyarya-kxl-1.0.2-gentoo-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/spacearyarya-kxl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild b/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
deleted file mode 100644
index 2396a9a92a19..000000000000
--- a/games-action/spacearyarya-kxl/spacearyarya-kxl-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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
new file mode 100644
index 000000000000..eaea00e618f8
--- /dev/null
+++ b/games-action/spacetripper-demo-1-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3c33104e7f2b..000000000000
--- a/games-action/spacetripper-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/spacetripper-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild b/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
deleted file mode 100644
index 40bcbf3485b8..000000000000
--- a/games-action/spacetripper-demo/spacetripper-demo-1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
new file mode 100644
index 000000000000..9820890f6f8c
--- /dev/null
+++ b/games-action/super-hexagon-20160217
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 387d1d5d9235..000000000000
--- a/games-action/super-hexagon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-action/super-hexagon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/super-hexagon/super-hexagon-20160217.ebuild b/games-action/super-hexagon/super-hexagon-20160217.ebuild
deleted file mode 100644
index a985d2bed49c..000000000000
--- a/games-action/super-hexagon/super-hexagon-20160217.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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
new file mode 100644
index 000000000000..01ecbe9ae197
--- /dev/null
+++ b/games-action/supermariowar-2.0_beta1-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 5842c1973769..000000000000
--- a/games-action/supermariowar/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index da4fa9a87ee4..000000000000
--- a/games-action/supermariowar/files/smwd.initd
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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
deleted file mode 100644
index 03fb190aad65..000000000000
--- a/games-action/supermariowar/files/supermariowar-2.0_beta1-yaml-cpp-config.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-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
deleted file mode 100644
index bd948f685035..000000000000
--- a/games-action/supermariowar/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="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
deleted file mode 100644
index d78992bbd8aa..000000000000
--- a/games-action/supermariowar/supermariowar-2.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# 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
new file mode 100644
index 000000000000..1f6ab752852f
--- /dev/null
+++ b/games-action/supertuxkart-0.9.3
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 2595e7268c9c..000000000000
--- a/games-action/supertuxkart/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index def5c80340ba..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-fix-buildsystem.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-* 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
deleted file mode 100644
index 75830b8ba8f2..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 66191861a963..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-arch-support.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
deleted file mode 100644
index 194f278b958d..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-bundled-libs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
deleted file mode 100644
index ce7ce63fa661..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-irrlicht-system-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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
deleted file mode 100644
index 8c00fce7e186..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-enet.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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
deleted file mode 100644
index 798a6cdea7ac..000000000000
--- a/games-action/supertuxkart/files/supertuxkart-0.9.3-unbundle-libs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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
deleted file mode 100644
index a5ee37310257..000000000000
--- a/games-action/supertuxkart/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<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
deleted file mode 100644
index cfda52536ec4..000000000000
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils
-
-DESCRIPTION="A 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
new file mode 100644
index 000000000000..b881506a8bd6
--- /dev/null
+++ b/games-action/swordandsworcery-1.02
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index eac8dc2513e9..000000000000
--- a/games-action/swordandsworcery/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index ce668c71843a..000000000000
--- a/games-action/swordandsworcery/files/swordandsworcery-wrapper
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-action/swordandsworcery/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild b/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
deleted file mode 100644
index 7369ce107ba3..000000000000
--- a/games-action/swordandsworcery/swordandsworcery-1.02.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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
new file mode 100644
index 000000000000..476bb64c676d
--- /dev/null
+++ b/games-action/teeworlds-0.6.4
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index 60fff8a5150f..000000000000
--- a/games-action/teeworlds/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 4a11a866511d..000000000000
--- a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-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
deleted file mode 100644
index e207a4a354bf..000000000000
--- a/games-action/teeworlds/files/0.6/02-fixed-wavpack-sound-loading.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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
deleted file mode 100644
index 81c3d915316b..000000000000
--- a/games-action/teeworlds/files/0.6/03-use-system-pnglite.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-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
deleted file mode 100644
index fc61b71283b6..000000000000
--- a/games-action/teeworlds/files/0.6/04-dedicated.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index dec6b8d306fc..000000000000
--- a/games-action/teeworlds/files/0.6/05-cc-cflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index fa1a95831ff5..000000000000
--- a/games-action/teeworlds/files/teeworlds-init.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/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
deleted file mode 100644
index 76e30166dd35..000000000000
--- a/games-action/teeworlds/files/teeworlds.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* 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
deleted file mode 100644
index dc675622c78b..000000000000
--- a/games-action/teeworlds/files/teeworlds_srv.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-action/teeworlds/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/teeworlds/teeworlds-0.6.4.ebuild b/games-action/teeworlds/teeworlds-0.6.4.ebuild
deleted file mode 100644
index e0a278459205..000000000000
--- a/games-action/teeworlds/teeworlds-0.6.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit 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
new file mode 100644
index 000000000000..1c3846a8814c
--- /dev/null
+++ b/games-action/towbowl-tactics-0.5
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 975ae76685ba..000000000000
--- a/games-action/towbowl-tactics/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index aa6a950e9a07..000000000000
--- a/games-action/towbowl-tactics/files/towbowl-tactics-0.5-gentoo.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/towbowl-tactics/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild b/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
deleted file mode 100644
index 68970fe0ac94..000000000000
--- a/games-action/towbowl-tactics/towbowl-tactics-0.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
new file mode 100644
index 000000000000..b0bc3ddeba5f
--- /dev/null
+++ b/games-action/transcend-0.3-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index d836e1f95a62..000000000000
--- a/games-action/transcend/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 836cd03754ad..000000000000
--- a/games-action/transcend/files/transcend-0.3-sound.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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
deleted file mode 100644
index af830ea1122e..000000000000
--- a/games-action/transcend/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index 5f95cff17b5f..000000000000
--- a/games-action/transcend/transcend-0.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
new file mode 100644
index 000000000000..d3607fbcd607
--- /dev/null
+++ b/games-action/trine-1.08-r3
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 000000000000..52a804828c94
--- /dev/null
+++ b/games-action/trine-enchanted-edition-2.12.508
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index 5d5d2b7ac2ee..000000000000
--- a/games-action/trine-enchanted-edition/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b26a6baa4124..000000000000
--- a/games-action/trine-enchanted-edition/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="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
deleted file mode 100644
index fcff32bee8f5..000000000000
--- a/games-action/trine-enchanted-edition/trine-enchanted-edition-2.12.508.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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
deleted file mode 100644
index 7db21e5d4541..000000000000
--- a/games-action/trine/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b26a6baa4124..000000000000
--- a/games-action/trine/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="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
deleted file mode 100644
index f9b9673cdd45..000000000000
--- a/games-action/trine/trine-1.08-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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
new file mode 100644
index 000000000000..4dc4e54039e1
--- /dev/null
+++ b/games-action/trine2-2.01.425
@@ -0,0 +1,14 @@
+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
deleted file mode 100644
index 85d97d8698d8..000000000000
--- a/games-action/trine2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index b26a6baa4124..000000000000
--- a/games-action/trine2/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="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
deleted file mode 100644
index 1b49131fab0c..000000000000
--- a/games-action/trine2/trine2-2.01.425.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
new file mode 100644
index 000000000000..e0f41d5e4d81
--- /dev/null
+++ b/games-action/trosh-20-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 3fa4440520cf..000000000000
--- a/games-action/trosh/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-action/trosh/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-action/trosh/trosh-20-r1.ebuild b/games-action/trosh/trosh-20-r1.ebuild
deleted file mode 100644
index 5de7abfdbbc1..000000000000
--- a/games-action/trosh/trosh-20-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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
new file mode 100644
index 000000000000..d16a5c1d26df
--- /dev/null
+++ b/games-action/tuxkart-0.4.0-r1
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index 297525039528..000000000000
--- a/games-action/tuxkart/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 36527bbe0db8..000000000000
--- a/games-action/tuxkart/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index 4591388145c1..000000000000
--- a/games-action/tuxkart/tuxkart-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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
new file mode 100644
index 000000000000..aae0f00cd990
--- /dev/null
+++ b/games-action/violetland-0.4.3-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index b4d2eca0538c..000000000000
--- a/games-action/violetland/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 5ddd5e8445b8..000000000000
--- a/games-action/violetland/files/violetland-0.4.3-boost150.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- 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
deleted file mode 100644
index 21c980e6339f..000000000000
--- a/games-action/violetland/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">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
deleted file mode 100644
index d277b84a643c..000000000000
--- a/games-action/violetland/violetland-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
new file mode 100644
index 000000000000..4f9352e56b45
--- /dev/null
+++ b/games-action/wordwarvi-1.00-r1
@@ -0,0 +1,13 @@
+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
deleted file mode 100644
index b2f3dd522a70..000000000000
--- a/games-action/wordwarvi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 5ad7bc8440b9..000000000000
--- a/games-action/wordwarvi/files/wordwarvi-1.00-sound.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 594ad45f07b0..000000000000
--- a/games-action/wordwarvi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index df7ee9102eb8..000000000000
--- a/games-action/wordwarvi/wordwarvi-1.00-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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
new file mode 100644
index 000000000000..711f3df3d4f1
--- /dev/null
+++ b/games-action/xblast-2.10.4-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 2a57f286f8ba..000000000000
--- a/games-action/xblast/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index c02ee380b861..000000000000
--- a/games-action/xblast/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index 72666813a3c4..000000000000
--- a/games-action/xblast/xblast-2.10.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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
new file mode 100644
index 000000000000..785a1f48d7b1
--- /dev/null
+++ b/games-action/xbomber-101-r1
@@ -0,0 +1,11 @@
+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
deleted file mode 100644
index f35b2f043214..000000000000
--- a/games-action/xbomber/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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
deleted file mode 100644
index 1771f15abc5e..000000000000
--- a/games-action/xbomber/files/xbomber-101-clang.patch
+++ /dev/null
@@ -1,123 +0,0 @@
---- 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
deleted file mode 100644
index 0ee82d81801b..000000000000
--- a/games-action/xbomber/files/xbomber-101-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a0bf2f89d735..000000000000
--- a/games-action/xbomber/files/xbomber-101-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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
deleted file mode 100644
index 5a1691a65ad8..000000000000
--- a/games-action/xbomber/files/xbomber-101-va_list.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-action/xbomber/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-action/xbomber/xbomber-101-r1.ebuild b/games-action/xbomber/xbomber-101-r1.ebuild
deleted file mode 100644
index 2757b322f5db..000000000000
--- a/games-action/xbomber/xbomber-101-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
new file mode 100644
index 000000000000..98d47aa37ed7
--- /dev/null
+++ b/games-action/xpilot-4.5.5-r1
@@ -0,0 +1,12 @@
+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
deleted file mode 100644
index 78900ee9abb3..000000000000
--- a/games-action/xpilot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 8276088f013b..000000000000
--- a/games-action/xpilot/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">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
deleted file mode 100644
index ecc92dce8706..000000000000
--- a/games-action/xpilot/xpilot-4.5.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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}
-}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 4a4fdff16902..0642128770ee 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
diff --git a/games-arcade/abe-1.1-r1 b/games-arcade/abe-1.1-r1
new file mode 100644
index 000000000000..08ecb58c8e4b
--- /dev/null
+++ b/games-arcade/abe-1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis]
+DESCRIPTION=A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game
+EAPI=6
+HOMEPAGE=http://abe.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXi media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=mirror://sourceforge/abe/abe-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a7620659099894ea7e3a63d7cbb3f913
diff --git a/games-arcade/abe/Manifest b/games-arcade/abe/Manifest
deleted file mode 100644
index db8c3ca31be0..000000000000
--- a/games-arcade/abe/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX abe-1.1-doublefree.patch 250 BLAKE2B 8d39ae1dd2ba1cc77f3bddc726f6811c232ee30a094531b394e54e6be96af73e280ee4934344d980a7638a545e0e1817ff7b6296f3820475e3394f2b546228eb SHA512 ca3091783c409a02a0aedf22e41829ff9198b2385cf474f9b365d4acdc2806a1ee952741816df7e658e5c48282b45d5e7577db9def01eb24448d5c579c5985ca
-AUX abe-1.1-format-security.patch 2601 BLAKE2B b918881d0de19eafca8da7a9cc47efdc52bfdc68e5f5c75591093db3045fe2bd47872b0f7e73b3c734de49e38b6d45ec9b268c60bfe14cf0690bac321469232e SHA512 9750a765fc46d70c9b322a7ddc363b4680a6f16ebc9a9ccd0c164d7cb61fa4618969db31d9fdf26d5fa993ac2a285db09a67563c5b286131981bc7f3e9a37712
-AUX abe-1.1-format.patch 506 BLAKE2B 9c91f56e58701d26b3a5809b6a764bd1acc38f4628849171f06d61e2eec1f9ffb3076f0e35c4dd26199f110c679a8c66c4a05d297a1d62d3845cb28e47ee642c SHA512 e0ddbaad3034ab28198ddf8fd7cbebc0648c1a4d30e4d597c90fe3c9327194de579da92d5acbd1a6ab99a50f11c8967f4a5cdda00776f404175f060f8e210c24
-AUX abe-1.1-settings.patch 336 BLAKE2B 093ab417049ce54d012557fd7df9dc59ebd6e6095b0983d465aba0813ae6bfbd2c1c76e5d82bd734481781289c26619ef4bd4cb3651b08655030d36adbb35e4e SHA512 a609ec800165859854a132cca4dc1a12407746b832eae2326889212bcf155076f89ceb980e9cf6c678cdd9f160368c915e617d72b7d26bde2ec7fb23a7c05218
-DIST abe-1.1.tar.gz 3321075 BLAKE2B 2ab51bd9103e8954bbc27eceb81b4bb845ec84ee249f21aaefdc59df87689f865d3b62a8c2db9584b8361303028174b1a96b60e0caf88ee857f8ad0d3cd3d920 SHA512 6106fce9c72554596ac3f94551326381e98c0d40f7a5aa8ae7aeadaa234c113733e8df717bd1b18d2ba835f689982e859607c9d88ab2d59790ec00833a4e48c7
-EBUILD abe-1.1-r1.ebuild 1625 BLAKE2B f7a432819a6ab0f18979e394b21ddab7a720dac6d6170286def241e5c362e719ce9d14b19b262114fe33cb76dcc400d8261ec52334942438f3fcdcde519b21fc SHA512 99c54f52d343cc759ce3238e56b96e743d1c7f03ecabe4d088326a3fd31234947024c563722b3db0c88696ea53875721e8d2ba34ef1115a0bd7e1679192594f2
-MISC metadata.xml 326 BLAKE2B a19b06620dabc908c6b71603bf229a0bbfb5fc8cd604580394c13ddd522ef52261985942321a18b8ce643fee8ad5ff15c915aac3861264111f4dcbefe8406d56 SHA512 85695bf3253d22818b913db2dad61277afe8062258c1b5b80ab9604261304b9f5dd39a50a9565ee4361ea793eff0fa23562c4a20bb9ea63a3296514c33ec1788
diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild
deleted file mode 100644
index 25fb312e3b54..000000000000
--- a/games-arcade/abe/abe-1.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A scrolling, platform-jumping, key-collecting, ancient pyramid exploring game"
-HOMEPAGE="http://abe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/abe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	x11-libs/libXi
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./images/images.tar
-}
-
-PATCHES=(
-	# From Fedora:
-	# Enable changing the video settings.  Sent upstream 2 Apr 2006:
-	# https://sourceforge.net/tracker/?func=detail&aid=1463202&group_id=70141&atid=526743
-	"${FILESDIR}"/${P}-settings.patch
-
-	# Fix a double free() bug.  Sent upstream 15 Mar 2011:
-	# https://sourceforge.net/tracker/?func=detail&aid=3214269&group_id=70141&atid=526745
-	"${FILESDIR}"/${P}-doublefree.patch
-
-	# Fix an incorrect printf format specifier.  Sent upstream 15 Mar 2011:
-	# https://sourceforge.net/tracker/?func=detail&aid=3214270&group_id=70141&atid=526745
-	"${FILESDIR}"/${P}-format.patch
-
-	# Fix build failure with -Werror=format-security
-	"${FILESDIR}"/${P}-format-security.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^TR_CFLAGS/d" \
-		-e "/^TR_CXXFLAGS/d" \
-		configure || die
-}
-
-src_configure() {
-	econf --with-data-dir=/usr/share/${PN}
-}
-
-src_install() {
-	dobin src/abe
-	insinto /usr/share/${PN}
-	doins -r images sounds maps
-	newicon tom1.bmp abe.bmp
-	make_desktop_entry abe "Abe's Amazing Adventure" /usr/share/pixmaps/abe.bmp
-	einstalldocs
-}
diff --git a/games-arcade/abe/files/abe-1.1-doublefree.patch b/games-arcade/abe/files/abe-1.1-doublefree.patch
deleted file mode 100644
index ce7389d97100..000000000000
--- a/games-arcade/abe/files/abe-1.1-doublefree.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Main.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/Main.c	2011-03-14 10:08:31.846413904 -0600
-@@ -35,8 +35,6 @@
-     for(i = 0; modes[i]; ++i)
-       printf("\t%d x %d\n", modes[i]->w, modes[i]->h);
-   }
--
--  free(modes);
- }
- 
- void
diff --git a/games-arcade/abe/files/abe-1.1-format-security.patch b/games-arcade/abe/files/abe-1.1-format-security.patch
deleted file mode 100644
index ad88b4b60486..000000000000
--- a/games-arcade/abe/files/abe-1.1-format-security.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- ./src/Game.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ ./src/Game.c	2013-11-20 12:30:00.000000000 -0700
-@@ -6,21 +6,14 @@ Game game;
- 
- // path_sprintf should not be used by other .c files, as it does not fit for them.
- static void
--path_sprintf(char *path, char *formatted_name, int version)
-+path_sprintf(char *path, const char *name, int version)
- {
--
--  int len;
--
--  printf("path_sprintf (%p, %s, %d)\n", path, formatted_name, version);
--
--  strcpy(path, getSaveGameDir());
--
--  len = strlen(path);
--
-   if(1 == version) {
--    sprintf(path + len, formatted_name);
-+    printf("path_sprintf (%p, %s.dat, %d)\n", path, name, version);
-+    sprintf(path, "%s%s.dat", getSaveGameDir(), name);
-   } else {
--    sprintf(path + len, formatted_name, version);
-+    printf("path_sprintf (%p, %s%d.dat, %d)\n", path, name, version, version);
-+    sprintf(path, "%s%s%d.dat", getSaveGameDir(), name, version);
-   }
- 
- }
-@@ -30,14 +23,14 @@ deleteSavedGame()
- {
-   char path[PATH_SIZE];
-   // version 2
--  path_sprintf(path, "save%d.dat", GAME_VERSION);
-+  path_sprintf(path, "save", GAME_VERSION);
-   remove(path);
--  path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
-+  path_sprintf(path, "savedmap", GAME_VERSION);
-   remove(path);
-   // version 1
--  path_sprintf(path, "save.dat", 1);
-+  path_sprintf(path, "save", 1);
-   remove(path);
--  path_sprintf(path, "savedmap.dat", 1);
-+  path_sprintf(path, "savedmap", 1);
-   remove(path);
- }
- 
-@@ -51,7 +44,7 @@ saveGame()
- 
-   mkshuae();
- 
--  path_sprintf(path, "save%d.dat", GAME_VERSION);
-+  path_sprintf(path, "save", GAME_VERSION);
- 
-   if(!(fp = fopen(path, "wb"))) {
-     err = strerror(errno);
-@@ -79,7 +72,7 @@ saveGame()
-   SDL_RWclose(rwop);
- 
-   // save the map
--  path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
-+  path_sprintf(path, "savedmap", GAME_VERSION);
-   saveMapPath(path);
- }
- 
-@@ -96,7 +89,7 @@ loadGame()
-   version = (int) GAME_VERSION;
- 
-   // load the map
--  path_sprintf(path, "savedmap%d.dat", GAME_VERSION);
-+  path_sprintf(path, "savedmap", GAME_VERSION);
-   if(!loadMapPath(path, 0)) {
-     // if can't find saved map load static map
-     fprintf(stderr,
-@@ -112,9 +105,9 @@ loadGame()
-   // try to find a saved game of any version
-   while(version > 0) {
-     if(version > 1) {
--      path_sprintf(path, "save%d.dat", version);
-+      path_sprintf(path, "save", version);
-     } else {                    // By Pedro: version==1
--      path_sprintf(path, "save.dat", version);
-+      path_sprintf(path, "save", version);
-     }
-     fprintf(stderr, "Trying to load saved game: %s\n", path);
-     fflush(stderr);
diff --git a/games-arcade/abe/files/abe-1.1-format.patch b/games-arcade/abe/files/abe-1.1-format.patch
deleted file mode 100644
index 529534745712..000000000000
--- a/games-arcade/abe/files/abe-1.1-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/MapIO.c.orig	2005-03-05 09:20:04.000000000 -0700
-+++ b/src/MapIO.c	2011-03-14 10:15:33.166949366 -0600
-@@ -93,7 +93,7 @@
-   // compression step 1: read compressed data from disk
-   // FIXME: what would be nicer is to only allocate as much mem as used on disk.
-   size = LEVEL_COUNT * map.w * map.h;
--  printf("size %u\n", size);
-+  printf("size %zu\n", size);
-   fflush(stdout);
-   if(!(read_buff = (Uint16 *) malloc(sizeof(Uint16) * size))) {
-     fprintf(stderr, "Out of memory on map read.");
diff --git a/games-arcade/abe/files/abe-1.1-settings.patch b/games-arcade/abe/files/abe-1.1-settings.patch
deleted file mode 100644
index ea5809f7386a..000000000000
--- a/games-arcade/abe/files/abe-1.1-settings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
---- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
-+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
-@@ -116,7 +116,7 @@
-   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
-     return sound_loaded;
-   else
--    return 0;
-+    return 1;
- }
- 
- void
diff --git a/games-arcade/abe/metadata.xml b/games-arcade/abe/metadata.xml
deleted file mode 100644
index e9edf695246f..000000000000
--- a/games-arcade/abe/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">abe</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/afternoonstalker-1.1.5-r1 b/games-arcade/afternoonstalker-1.1.5-r1
new file mode 100644
index 000000000000..4ef68a920486
--- /dev/null
+++ b/games-arcade/afternoonstalker-1.1.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Clone of the 1981 Night Stalker video game by Mattel Electronics
+EAPI=6
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.6
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker-1.1.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=28c8e004b495cc9464ee5f13b881d6a7
diff --git a/games-arcade/afternoonstalker/Manifest b/games-arcade/afternoonstalker/Manifest
deleted file mode 100644
index 517abd31b285..000000000000
--- a/games-arcade/afternoonstalker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST afternoonstalker-1.1.5.tar.gz 202663 BLAKE2B 1572e5fa2b7ac0c9e24897cd8e31333c1a1819fc36576a3410cbb2ab6676ee505182dc71dd97e65ccaaff8218c470065bdc942a380aafb506f4c0032d4325df4 SHA512 ff08cc72385deddfaffabf98c3cc67f72f8c6db77de1feb4e19d2d3dcf6ca1018a71d6e052d2e2373dc758e119a4c068a3f4195cb6fbf1b01900bdedf193a7e0
-EBUILD afternoonstalker-1.1.5-r1.ebuild 813 BLAKE2B 2bad234cc4b69ec0638c0661cd656796a3cec74bab46d6be8979e23a0982a1ceafea1dd1f084a8bf1fe03a447b498fef19d0b19f45fddc7e0c16958c22952510 SHA512 186e838fc925db34b60f7ef8186c41c1e7751a176f992a7ef512200ac2117d0b02d9747e923c86b62b3cd018ed8197ad93272ccf7530ff3cd95c653d95bf084a
-MISC metadata.xml 383 BLAKE2B 40ab8c4f0c3bbc162a20b7db8130b1d3d3a22dd8b0a828403000c58c1eb5c977ef6b93077f2f887828b6ca6809feefdf234605ca9c71170e13590e6e6f390410 SHA512 6ac1eca021c30af55b915f3d34d180ad429f9f16e7e942b3853d8f77f0ba82fa8bf97439209414e7541b0c0bfba29b49b1efc143e690ae7f8dbffd1fcaae9986
diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild
deleted file mode 100644
index f7f3afc9f23e..000000000000
--- a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Clone of the 1981 Night Stalker video game by Mattel Electronics"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	doman doc/${PN}.6
-	einstalldocs
-}
diff --git a/games-arcade/afternoonstalker/metadata.xml b/games-arcade/afternoonstalker/metadata.xml
deleted file mode 100644
index 418dc79f8c64..000000000000
--- a/games-arcade/afternoonstalker/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel
-Electronics.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/alienwave-0.4.0-r1 b/games-arcade/alienwave-0.4.0-r1
new file mode 100644
index 000000000000..2910fd69aa02
--- /dev/null
+++ b/games-arcade/alienwave-0.4.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=An ncurses-based Xenon clone
+EAPI=6
+HOMEPAGE=http://www.alessandropira.org/alienwave/aw.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://www.alessandropira.org/alienwave/alienwave-0.4.0.tar.gz
+_md5_=52dd0a543aabc845013a93b0f97ec0f3
diff --git a/games-arcade/alienwave/Manifest b/games-arcade/alienwave/Manifest
deleted file mode 100644
index ad6934d9c279..000000000000
--- a/games-arcade/alienwave/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX alienwave-0.4.0-gentoo.patch 497 BLAKE2B 22d3d200e24185e7b307658dad527f92e16f2ba3a050c9b1114f92b01150e9005d573d3729b281f0f02026557e37ef099fc1b72c2aeb103f911861d61c946fbf SHA512 2366807bf2f9f9ac8c7d38155bba31377c6175cff8b402d8f99ff2f64076f84c26c4156c5846a9e7125604d2bb72b0743f243d6cc1c2ab817c73edbe7b9f88d9
-DIST alienwave-0.4.0.tar.gz 21931 BLAKE2B d65701ba7dc94c5507b93c2fb0c5798c01e0298b9cdfdb96e2dbdecb994adea757046a1186b19dfed4aae80bfcc0d7cf86167d3d29ddbf7e53efde7a0f6087c5 SHA512 e3342facda85fb5fee8cb34569a60877d7f9110f23b543f16abe20d694556e1e33a45e1d39dec5c0fdf4cec7f10547c5974a629d29669da985456d8c0398e9bd
-EBUILD alienwave-0.4.0-r1.ebuild 519 BLAKE2B 6dc37d43cc0d91f30e0d3a3f3f459a31c40a7877f788aa88493c94c161652ae9e32f644c13f490a921d55c6e5914fc0371122b423c56efd7b689ae9bb673e5bf SHA512 7a14d38fad220561c6239daede7494d2dd6c2f2a32c14bf2871bfd3f840f35f33f4f1d65c39a1c6c890fe96e09e19dbcea50a0cf4acfb85a4ded3a5858b78bef
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild b/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild
deleted file mode 100644
index eda16474a7f5..000000000000
--- a/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An ncurses-based Xenon clone"
-HOMEPAGE="http://www.alessandropira.org/alienwave/aw.html"
-SRC_URI="http://www.alessandropira.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_install() {
-	dobin alienwave
-	dodoc TO_DO README STORY
-}
diff --git a/games-arcade/alienwave/files/alienwave-0.4.0-gentoo.patch b/games-arcade/alienwave/files/alienwave-0.4.0-gentoo.patch
deleted file mode 100644
index bed5d38c0b8f..000000000000
--- a/games-arcade/alienwave/files/alienwave-0.4.0-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- alienwave.orig/Makefile
-+++ alienwave/Makefile
-@@ -1,9 +1,7 @@
- # This file is part of Alienwave, a game by Alessandro Pira
- 
--CC = gcc
- OBJS = main.o blit.o aliens.o xzarna.o fire.o shield.o levels.o util.o
- # CFLAGS = -c -O2 -Wall -DDEBUG_LEV
--CFLAGS = -c -O2 -Wall
- LIB = -lncurses
- 
- # Uncomment this if you want random waves
-@@ -16,8 +14,7 @@
- 
- 
- alienwave: $(OBJS)
--	$(CC) $(OBJS) $(LIB) -o alienwave
--	strip alienwave
-+	$(CC) $(OBJS) $(LDFLAGS) $(LIB) -o alienwave
- 
- main.o: main.c
- 
diff --git a/games-arcade/alienwave/metadata.xml b/games-arcade/alienwave/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-arcade/alienwave/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/amphetamine-0.8.10-r1 b/games-arcade/amphetamine-0.8.10-r1
new file mode 100644
index 000000000000..ab8d99f06868
--- /dev/null
+++ b/games-arcade/amphetamine-0.8.10-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
+DESCRIPTION=a cool Jump'n Run game offering some unique visual effects
+EAPI=6
+HOMEPAGE=http://homepage.hispeed.ch/loehrer/amph/amph.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] x11-libs/libXpm
+SLOT=0
+SRC_URI=http://homepage.hispeed.ch/loehrer/amph/files/amphetamine-0.8.10.tar.bz2 http://homepage.hispeed.ch/loehrer/amph/files/amphetamine-data-0.8.6.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e89726d03c801bb0d6e5255e92a51eee
diff --git a/games-arcade/amphetamine/Manifest b/games-arcade/amphetamine/Manifest
deleted file mode 100644
index e3a8e1119d30..000000000000
--- a/games-arcade/amphetamine/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX amphetamine-0.8.10-64bit.patch 2708 BLAKE2B 6abc82e1758000b1fbb3e930f51873026a9e6ab0c1558b2f793a9fad75d240b5c31fec6d69f7144a9c3a91eca809fca6860fdb72a1211b8aefd0d4d64480774a SHA512 8216a5b59c52488f35416295256087771c82e8996787e74d03d416829b628267d17b47cc5f6d7bae2ff87b442bdb38aec4f78f14cd130fb045f5c8272f6b4c9d
-AUX amphetamine-0.8.10-bugs.patch 1821 BLAKE2B 3b0870cecaa55879da3d5107e2c23d7c972e49b1289519b2107fa0da48376c562364b8d4c632812dd20a80e4e6a02fc9ddd157aa8e104a3a8e097f238c422ae9 SHA512 30cc93031152e3f244a30cb56430b451ddfb8ccfddde0fc6cd681cbc6bf0ffb4d4801df642b5330fc1462d68cb0fc3e8d8f97f7e4dc87925b5335f5b1707ff8e
-AUX amphetamine-0.8.10-build.patch 700 BLAKE2B d63c5a73f065f181a6673feb3d90e852e85befb51446ac003eca6ea6076caa36cbd911ac0e33064b5aa549c9ffee8264c5a31a34bfa7ecc659f8c07687d12130 SHA512 c79c133bb6acfc666e557e09b0ca3b556203331d167b5266217a19880b5af2101776b651a420a81b53fc4fbf790de221d0b758979955632230226581dfa30ced
-AUX amphetamine-0.8.10-missing-headers.patch 457 BLAKE2B 00c50c928487ff0e8fc4bf1c707d77b6ab28b064a9682e1d7f086e6b0555868c662dd68d5b474dca6346a23eb9bc91620b3f92ce18a6e7f0be597c14b41e0c5d SHA512 1f95ac463f600b0e3812afba10682657cdd8b95dd1e77f6a2fb93af7dab60fcb85c85e60613ee4c93421faf7492ca4663d2c94bc96172c52913effe63d259523
-AUX amphetamine-0.8.10-newline.patch 11906 BLAKE2B bf505f9f51d800b6b99b4a80d9c8cd30a91c97262e7984f371be16044328475ba5905145297019bc411c5c1394a81ee2c3cc3f753af46254cf4269f8e21449fe SHA512 9bb6e300f5c17a4ae2502162c3a7940a9574fcd6c09274454a6170c5b0cfdfdf3e4668d9c6e7876f7ea48119c94e098aef605836c866f8a475d81a15129d28b1
-AUX amphetamine-0.8.10-no-lxt.patch 504 BLAKE2B ab06ee2b2209b293d0a126127c5d0cbc0d51081295d9c53d4805cd386027cd77b94a8c8153c64da6bbf6d4bcf88c0cd79a4730d04d06be4785478ec5b39b8d7b SHA512 6c96aa314cc63de4b3472bfff6e0d0d25407f4f8e8a0974df5d20af9dc44fd95a70974cec3174c642ca01be70223c1a1eaea5d300d2026a35805e03e65028207
-DIST amphetamine-0.8.10.tar.bz2 72324 BLAKE2B 39d8f56066e7fbad853198be28375dfe7ee766d7c493a6faf0e2fa321ee2d2d757f5f294418208ac97a440d58bae03d40de2615e421bb8e9fad7a8ba5220d354 SHA512 eb3106df6070e207ffb3293ac4701bba8222603c0e399667505bad29b6f6433dc9ec008499b5180f713a724d3b686fead15536a20927195bc57780be16a860ef
-DIST amphetamine-data-0.8.6.tar.bz2 928775 BLAKE2B 078de623c719ebaedae3137fe3876ecd7ba02ad7ec44a64b7775fd173a42b399d137a3862d3fe426780a234638b0876a1f0fc5a06d6ab8f4b3c4ca66df367a49 SHA512 0feb86f420b4816064594756bb30bb6e02ae5062f03ef175b3262a8f30043340933f6f1b1894e2b2cfad70befc76d3ed1e0d2777c2dc2f7461459e8a93efeaf1
-EBUILD amphetamine-0.8.10-r1.ebuild 1077 BLAKE2B de34c36beb4aa7d91013a545b4d27fc48b2cec791b45cc4109441aa2c6e0447f684e9420b9b6ef74beb2680abb3477bfa4bfcb6fe580909a7122e06ff3d3d10f SHA512 fb5958ad03a640ee0e2ffee5b6db758bd4694a99cd8638bd5e525bc7b254537506e47638e0e381566da6149491492ce633c8a857c7d17099cdc187908003cf12
-MISC metadata.xml 371 BLAKE2B 12bcfb84a083c0001e99fa3f002b259a5a448f895af66240422d951fc82e4d8635849b8604e588d977c99b47681bc9c3282217a81f107ba7a646fbdbc31f7bb1 SHA512 84d30e975d4eb430e73220b406c49c6d1015f0b449df73af8ff5aa4811a6634f5e90f2db52b28e4a39a1159cbdebc89d9dcb857821401a82156716ab94d5e8c5
diff --git a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild b/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
deleted file mode 100644
index 8df81545c760..000000000000
--- a/games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="a cool Jump'n Run game offering some unique visual effects"
-HOMEPAGE="http://homepage.hispeed.ch/loehrer/amph/amph.html"
-SRC_URI="http://homepage.hispeed.ch/loehrer/amph/files/${P}.tar.bz2
-	http://homepage.hispeed.ch/loehrer/amph/files/${PN}-data-0.8.6.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	x11-libs/libXpm"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-64bit.patch
-
-	# From Debian:
-	"${FILESDIR}"/${P}-no-lxt.patch
-	"${FILESDIR}"/${P}-bugs.patch
-	"${FILESDIR}"/${P}-missing-headers.patch
-	"${FILESDIR}"/${P}-newline.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '55d' src/ObjInfo.cpp || die
-}
-
-src_compile() {
-	emake INSTALL_DIR=/usr/share/${PN}
-}
-
-src_install() {
-	newbin amph ${PN}
-	insinto /usr/share/${PN}
-	doins -r ../amph/*
-	newicon amph.xpm ${PN}.xpm
-	make_desktop_entry ${PN} Amphetamine ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch
deleted file mode 100644
index b7588face714..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-64bit.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- amphetamine-0.8.10.orig/src/Shape.cpp
-+++ amphetamine-0.8.10/src/Shape.cpp
-@@ -56,12 +56,12 @@
-  */
- #ifdef __OPT_MEM_ACCESS__
- 
--#define GET_LONG(adr)		*(unsigned long *)adr
--#define SET_LONG(adr, l)	*(unsigned long *)adr = l
-+#define GET_LONG(adr)		*(uint32_t *)adr
-+#define SET_LONG(adr, l)	*(uint32_t *)adr = l
- 
- #else
- 
--#define GET_LONG(adr)	((long)((unsigned char *)(adr))[0] << 24) + ((long)((unsigned char *)(adr))[1] << 16) + ((long)((unsigned char *)(adr))[2] << 8) + ((long)((unsigned char *)(adr))[3])
-+#define GET_LONG(adr)	((uint32_t)((unsigned char *)(adr))[0] << 24) + ((uint32_t)((unsigned char *)(adr))[1] << 16) + ((uint32_t)((unsigned char *)(adr))[2] << 8) + ((uint32_t)((unsigned char *)(adr))[3])
- #define SET_LONG(adr, l)	((unsigned char *)adr)[0] = (unsigned char)((l) >> 24); \
- 	                        ((unsigned char *)adr)[1] = (unsigned char)((l) >> 16); \
- 	                        ((unsigned char *)adr)[2] = (unsigned char)((l) >> 8); \
-@@ -116,7 +116,7 @@
- 		{
- 			// store the location of this line start
- 			lineStartPtr = destPtr;
--			destPtr += sizeof( unsigned long );
-+			destPtr += sizeof( uint32_t );
- 			
- 			// at the beginning of each row we are not in any run
- 			drawRunFlag = kFalse;
-@@ -160,7 +160,7 @@
- 									// create the skip token
- 									//*( ( unsigned long * )destPtr ) = ( kSkipPixelsToken << 24 ) + runCounter;
- 									SET_LONG(destPtr, ( kSkipPixelsToken << 24 ) + runCounter);
--									destPtr += sizeof( unsigned long );
-+									destPtr += sizeof( uint32_t );
- 								}
- 							
- 							// are we in a draw run
-@@ -179,7 +179,7 @@
- 									
- 									// save the location of the token (so we can fill it in later)
- 									runTokenPtr = destPtr;
--									destPtr += sizeof( unsigned long );
-+									destPtr += sizeof( uint32_t );
- 									
- 									// copy the pixel
- 									*destPtr = *srcPtr;
-@@ -215,7 +215,7 @@
- 	
- 	// create the end of shape token
- 	SET_LONG(destPtr, kEndShapeToken << 24);
--	destPtr += sizeof( unsigned long );
-+	destPtr += sizeof( uint32_t );
- 	
- 	// Resize the handle to match the real size of the shape
- 	//SetHandleSize( shapeHandle, destPtr - ( unsigned char * )( *shapeHandle ) );
-@@ -280,7 +280,7 @@
- 			// get a token
- 			tokenOp = GET_LONG(srcPtr ) >> 24;
- 			tokenData = GET_LONG(srcPtr ) & 0x00ffffff;
--			srcPtr += sizeof( unsigned long );
-+			srcPtr += sizeof( uint32_t );
- 			
- 			// depending on the token
- 			switch( tokenOp )
-@@ -435,7 +435,7 @@
- 			// get a token
- 			tokenOp = GET_LONG(srcPtr) >> 24;
- 			tokenData = GET_LONG(srcPtr) & 0x00ffffff;
--			srcPtr += sizeof( unsigned long );
-+			srcPtr += sizeof( uint32_t );
- 			
- 			// depending on the token
- 			switch( tokenOp )
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch
deleted file mode 100644
index 40a8345516c5..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-bugs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-description: fix issues in collision detection
-Index: amphetamine-0.8.10/src/Appl.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Appl.cpp	2006-05-15 19:16:56.000000000 +0200
-+++ amphetamine-0.8.10/src/Appl.cpp	2006-05-15 19:17:02.000000000 +0200
-@@ -183,7 +183,7 @@
- 
- 	firstPlayRound = 1;
- 	command = kCmdNoCommand;
--	syncTime = gSystem->GetTicks();
-+	syncTime = gSystem->GetTicks() - 20;
- 	aveTime = 20;
- 
- 	while (command == kCmdNoCommand) {
-@@ -256,7 +256,7 @@
- 
- 		if (gSystem->KeyPressed(kKeyEscape)) {
- 			command = gGUI->RunUserInterface(kMainPage);
--			syncTime = gSystem->GetTicks();
-+			syncTime = gSystem->GetTicks() - aveTime;
- 		}
- 		
- 		if (command >= kSaveGameSlot0 && command <= kSaveGameSlot5) {
-Index: amphetamine-0.8.10/src/Object.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Object.cpp	2006-05-15 19:18:21.000000000 +0200
-+++ amphetamine-0.8.10/src/Object.cpp	2006-05-15 19:18:33.000000000 +0200
-@@ -70,10 +70,13 @@
- {
- 	if (ABS(forcex) > ABS(forcey)) {
- 		sx += SIGN(forcex);
--		sy += forcey / ABS(forcex);
-+		if (forcex != 0)
-+			sy += forcey / ABS(forcex);
- 	}else{
- 		sy += SIGN(forcey);
--		sx += forcex / ABS(forcey);
-+		/* Avoid SIGFE on alpha on divide by zero. -- JEH */
-+		if (forcey != 0)
-+			sx += forcex / ABS(forcey);
- 	}
- }
- 
-Index: amphetamine-0.8.10/src/Pltform.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Pltform.cpp	2006-05-15 19:18:25.000000000 +0200
-+++ amphetamine-0.8.10/src/Pltform.cpp	2006-05-15 19:18:33.000000000 +0200
-@@ -136,7 +136,7 @@
- 
- short	CPlatform::Forces()
- {
--	short	collisionObject, collisionCode;
-+	short	collisionObject = 0, collisionCode;
- 	CObject	*collObj;
- 
- 	CObject::Forces();
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
deleted file mode 100644
index 185826c35c37..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-build.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -26,8 +26,8 @@
- 
- # makemake variables
- 
--LINKER       := g++
--DEPENDFLAGS  := -g  ${SEARCHDIRS}
-+LINKER = $(CXX) $(CXXFLAGS)
-+DEPENDFLAGS  := ${SEARCHDIRS}
- TOUCHHEADERS := ${MYCODEDIR}/*.h
- 
- # C
-@@ -37,8 +37,8 @@
- 
- # C++
- 
--CXX      := g++
--CXXFLAGS  = ${DEPENDFLAGS} -O9 -funroll-loops -fomit-frame-pointer -ffast-math -Wcast-align
-+CXX      ?= g++
-+CXXFLAGS  += ${DEPENDFLAGS}
- 
- %.o : %.cpp
- 	${CXX} ${CPPFLAGS} -c $< ${CXXFLAGS} -o $@
-@@ -66,7 +66,7 @@
-     LOADLIBES := $(LOADLIBES) -lXpm -lXt
- endif
- 
--LDFLAGS   = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib 
-+LDFLAGS   += -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib 
- 
- .PHONY : default
- default : amph
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch
deleted file mode 100644
index f9c1b9932b11..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-missing-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-description: include string.h
-Index: amphetamine-0.8.10/src/Surface.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Surface.cpp	2006-05-15 19:10:49.000000000 +0200
-+++ amphetamine-0.8.10/src/Surface.cpp	2006-05-15 19:11:01.000000000 +0200
-@@ -3,6 +3,7 @@
- #include "ShapeLd.hpp"
- #include "Clut.hpp"
- #include "ConstVal.hpp"
-+#include <string.h>
- #include <memory.h>
- 
- const	short	kNoCharSpace = 20;
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch
deleted file mode 100644
index 36482ef30fb1..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-newline.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-description: fix newlines
-Index: amphetamine-0.8.10/src/AmpHead.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/AmpHead.hpp	2002-03-25 11:38:15.000000000 +0100
-+++ amphetamine-0.8.10/src/AmpHead.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -185,4 +185,4 @@
- 
- #define MSG(message) if (logFile) fprintf(logFile, message); fflush(logFile)
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Appl.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Appl.cpp	2002-03-25 12:47:49.000000000 +0100
-+++ amphetamine-0.8.10/src/Appl.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -404,4 +404,4 @@
- 	if (preRenderQueue == remove) bulletList = bulletList->nextBullet;
- 	if (remove->nextBullet) remove->nextBullet->prevBullet = remove->prevBullet;
- 	if (remove->prevBullet) remove->prevBullet->nextBullet = remove->nextBullet;
--}*/
-\ No newline at end of file
-+}*/
-Index: amphetamine-0.8.10/src/Appl.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Appl.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Appl.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -102,4 +102,4 @@
- 
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Clut.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Clut.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Clut.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -84,4 +84,4 @@
- 
- void	SwapBlackWhite(Graphic_file *gf);
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/ConstVal.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/ConstVal.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/ConstVal.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -271,4 +271,5 @@
- void	GetStringConstant(FILE *f, char *constName, char *buffer)
- {
- 	GetValue(f, constName, buffer);
--}
-\ No newline at end of file
-+}
-+
-Index: amphetamine-0.8.10/src/ConstVal.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/ConstVal.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/ConstVal.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -160,4 +160,4 @@
- 	short	disableShapeModes;
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Creeper.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Creeper.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Creeper.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -4,4 +4,4 @@
- #include "Monster.hpp"
- 
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Element.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Element.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Element.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -373,4 +373,4 @@
- 	CElement::Read(f);
- 
- 	OnAllocate();
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/File.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/File.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/File.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -26,4 +26,4 @@
- long	CFile::ReadData(void *data, long size)
- {
- 	return fread(data, size, 1, fileRef);
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/Graphfil.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Graphfil.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Graphfil.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -54,4 +54,4 @@
- Graphic_file *LoadGIF(FILE *fp, char *fname );
- Graphic_file *LoadPICTR(FILE *fp, char *fname );
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Gui.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Gui.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Gui.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -796,4 +796,5 @@
- 	fclose(f);
- }
- 
--	
-\ No newline at end of file
-+	
-+
-Index: amphetamine-0.8.10/src/Gui.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Gui.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Gui.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -183,4 +183,4 @@
- 	void	DisplayInfotext(short num);
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Item.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Item.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Item.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -309,4 +309,4 @@
- 
- 	READDATA(pickedUp);
- 	READDATA(type);
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/Item.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Item.hpp	2002-03-24 11:10:24.000000000 +0100
-+++ amphetamine-0.8.10/src/Item.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -84,4 +84,4 @@
- 	void	Read(FILE *f);
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Level.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Level.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Level.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -29,4 +29,4 @@
- };
- 
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Main.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Main.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Main.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -84,4 +84,4 @@
- 	delete gApplication;
- 
- 	return 0;
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/Monster.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Monster.cpp	2002-03-25 11:53:27.000000000 +0100
-+++ amphetamine-0.8.10/src/Monster.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -372,4 +372,4 @@
- 	READDATA(health);
- 
- 	if (dieFrame != -1) gApplication->Dequeue(&gApplication->collisionThingList, this);
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/Monster.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Monster.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Monster.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -86,4 +86,4 @@
- 
- 
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Monstrxx.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Monstrxx.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Monstrxx.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -123,4 +123,4 @@
- 	void	Read(FILE *f);
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/ObjInfo.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/ObjInfo.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/ObjInfo.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -97,4 +97,4 @@
- 	tWeaponInfo	*FindWeapon(short ref);
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Player.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Player.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Player.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -527,4 +527,4 @@
- 
- 	READDATA(oxygen);
- 	READDATA(lastOxygenDecTime);
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/Player.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Player.hpp	2002-03-24 11:10:24.000000000 +0100
-+++ amphetamine-0.8.10/src/Player.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -81,4 +81,4 @@
- 
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Pltform.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Pltform.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Pltform.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -276,4 +276,4 @@
- 	fread(info, sizeof(tPlatformInfo), 1, f);
- 
- 	OnAllocate();
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/ShapeDes.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/ShapeDes.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/ShapeDes.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -376,4 +376,4 @@
- };
- 
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/ShapeLd.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/ShapeLd.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/ShapeLd.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -93,4 +93,4 @@
- 	height = backgroundPicture->height;
- 
- 	return backgroundPicture->bitmap;
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/SndSys.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/SndSys.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/SndSys.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -132,4 +132,5 @@
-         		playList->RemoveCurrent();
-         	}
-         }
--}
-\ No newline at end of file
-+}
-+
-Index: amphetamine-0.8.10/src/SndSys.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/SndSys.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/SndSys.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -99,4 +99,5 @@
- 
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-+
-Index: amphetamine-0.8.10/src/SoundList.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/SoundList.hpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/SoundList.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -55,4 +55,4 @@
- 	SoundState *first, *prev, *current;

- };

- 

--#endif 
-\ No newline at end of file
-+#endif

-Index: amphetamine-0.8.10/src/System.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/System.cpp	2002-03-25 10:31:27.000000000 +0100
-+++ amphetamine-0.8.10/src/System.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -554,4 +554,5 @@
- 		delete [] tmp;

- 		

- 	return NULL;  // failed

--}
-\ No newline at end of file
-+}

-+

-Index: amphetamine-0.8.10/src/Thing.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Thing.hpp	2002-03-24 17:16:00.000000000 +0100
-+++ amphetamine-0.8.10/src/Thing.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -64,4 +64,4 @@
- 
- };
- 
--#endif
-\ No newline at end of file
-+#endif
-Index: amphetamine-0.8.10/src/Weapon.cpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Weapon.cpp	2002-03-24 09:49:09.000000000 +0100
-+++ amphetamine-0.8.10/src/Weapon.cpp	2006-05-15 19:08:52.000000000 +0200
-@@ -467,4 +467,4 @@
- 	READDATA(dx);
- 	READDATA(dy);
- 
--}
-\ No newline at end of file
-+}
-Index: amphetamine-0.8.10/src/Weapon.hpp
-===================================================================
---- amphetamine-0.8.10.orig/src/Weapon.hpp	2002-03-24 17:16:14.000000000 +0100
-+++ amphetamine-0.8.10/src/Weapon.hpp	2006-05-15 19:08:52.000000000 +0200
-@@ -152,4 +152,4 @@
- 	short	Shoot(double directionx, double directiony, double targetpos);
- };
- 
--#endif
-\ No newline at end of file
-+#endif
diff --git a/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch b/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch
deleted file mode 100644
index 1e654dc89203..000000000000
--- a/games-arcade/amphetamine/files/amphetamine-0.8.10-no-lxt.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-description: don't link against Xt
-Index: amphetamine-0.8.10/Makefile
-===================================================================
---- amphetamine-0.8.10.orig/Makefile	2006-11-08 11:05:57.000000000 +0100
-+++ amphetamine-0.8.10/Makefile	2006-11-08 11:06:01.000000000 +0100
-@@ -69,7 +69,7 @@
- LOADLIBES := -lm $(SDL_LIBS)
- 
- ifeq ($(USE_LIB_XPM),TRUE)
--    LOADLIBES := $(LOADLIBES) -lXpm -lXt
-+    LOADLIBES := $(LOADLIBES) -lXpm
- endif
- 
- LDFLAGS   = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib 
diff --git a/games-arcade/amphetamine/metadata.xml b/games-arcade/amphetamine/metadata.xml
deleted file mode 100644
index 204e28ed3b7a..000000000000
--- a/games-arcade/amphetamine/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Amphetamine is a cool Jump'n Run game offering some unique visual effects.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/aop-0.6-r1 b/games-arcade/aop-0.6-r1
new file mode 100644
index 000000000000..ba012b2fdd13
--- /dev/null
+++ b/games-arcade/aop-0.6-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=Ambassador of Pain is a curses based game with only 64 lines of code
+EAPI=6
+HOMEPAGE=http://raffi.at/view/code/aop
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://www.raffi.at/code/aop/aop-0.6.tar.gz
+_md5_=489e0f914cd7c6b436ce80a4d1beedc1
diff --git a/games-arcade/aop/Manifest b/games-arcade/aop/Manifest
deleted file mode 100644
index 17bf26f2798b..000000000000
--- a/games-arcade/aop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX aop-0.6-as-needed.patch 207 BLAKE2B f2baabf390d7376b55a815c256d0c63194a16d822abfbbc7103cd08463e6b193d443c0404cd691085f8a8a849cc14de98c642ff177ce7b6dae5d0e250bc264fc SHA512 4da201cc444e943f21287208944dae0fa981697af97618268ff94699f1ec52c8fcabcbe2b609f3ab36f4c19fdfdf4c76f7acbcfebe6978bb2740ba02a6c8ecc7
-DIST aop-0.6.tar.gz 11811 BLAKE2B 9b8a278ac4afb33dc9bb79d92343f9cf0fb4968aae04898700c948d01788cf33523989583ef39661142e0078e31488b24f8bf1a6bd9586e00afc4f7248fc8ca1 SHA512 0ce37647a0832b17e23df409633952f902e02666fa536cc4393a35bf91b245a501feeb4f14fd16d1a1d5c4f39682dad18a8e671e107e96cf5ba9c89965f8a77c
-EBUILD aop-0.6-r1.ebuild 673 BLAKE2B 635a6f335ecc03a1a84925b73a3dc2d24d071fd6d69bbcaf12a67f913e248e5bcffc78d603551763a8d964f78d6fc51d1595fa4dcfda9f5e3b38623aae758c3c SHA512 b15df56a050d264f05ca9c2d8c292e0a508443b12c730d07f463549b00397c78853e5351cba9a7411c8c6c22e109e0ae78959eaa42efbe584b50766feb566f9c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aop/aop-0.6-r1.ebuild b/games-arcade/aop/aop-0.6-r1.ebuild
deleted file mode 100644
index 751bc0e7fd13..000000000000
--- a/games-arcade/aop/aop-0.6-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Ambassador of Pain is a curses based game with only 64 lines of code"
-HOMEPAGE="http://raffi.at/view/code/aop"
-SRC_URI="http://www.raffi.at/code/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s#/usr/local/share#${GAMES_DATADIR}#" \
-		aop.c || die
-	eapply "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_install() {
-	dobin aop
-	insinto "/usr/shate/${PN}"
-	doins aop-level-*.txt
-	einstalldocs
-}
diff --git a/games-arcade/aop/files/aop-0.6-as-needed.patch b/games-arcade/aop/files/aop-0.6-as-needed.patch
deleted file mode 100644
index f172919553b4..000000000000
--- a/games-arcade/aop/files/aop-0.6-as-needed.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile.old	2009-01-30 17:00:58.000000000 +0100
-+++ b/Makefile	2009-01-30 17:01:15.000000000 +0100
-@@ -1,5 +1,5 @@
- 
--LDFLAGS = -lncurses
-+LDLIBS := $(shell pkg-config ncurses --libs)
- 
- aop: aop.c
- 
diff --git a/games-arcade/aop/metadata.xml b/games-arcade/aop/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/aop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/apricots-0.2.6-r2 b/games-arcade/apricots-0.2.6-r2
new file mode 100644
index 000000000000..fcb8cec47bab
--- /dev/null
+++ b/games-arcade/apricots-0.2.6-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/openal media-libs/freealut >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga
+EAPI=6
+HOMEPAGE=http://www.fishies.org.uk/apricots.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/openal media-libs/freealut
+SLOT=0
+SRC_URI=http://www.fishies.org.uk/apricots-0.2.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0d1b863024d1cae8dc325182e5f7fa42
diff --git a/games-arcade/apricots/Manifest b/games-arcade/apricots/Manifest
deleted file mode 100644
index 85580776e0e7..000000000000
--- a/games-arcade/apricots/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX apricots-0.2.6-freealut.patch 1608 BLAKE2B 4437952b0fa7b177e02d36f0bd32578265e0d3c2bd7207c55824b1a25086f98a3ee3cb0f883d552d703ea1fdaaa7a61dd619ea92d569b45fd5c69c9de428f5a4 SHA512 cb29fea3ba109f5bae09ad1673aa0ccc81904f09cb2775cc2453c01ea839ad5f5b07639d81bb3804aa3b21a2d417597e2ab5377dcd944763a1de4b20ca68680c
-AUX apricots-0.2.6-ldflags.patch 833 BLAKE2B 3d5f68a96673ef5ecfd022ff18dcf43ac3203e275b682f37aa9f42270e2a64d87f5b3cef24c2fa238aee66aa37d68a23aa0981230e8a56e5f9f2376097231134 SHA512 532c0912dbddd8890829e717d6a062df80cb2d3a51131370062c2cbfd358e987872c5a53948dd1339f0ec820e56fad0696969c286f2da72a956f2d7f01589a80
-DIST apricots-0.2.6.tar.gz 768568 BLAKE2B 82fa6d4be5f1a9ed86e968a4645822cbf558ea37df956d54d0f07e3260ca2e7ff561ae6ea357dabb2c35b7bfd4ff0d806dda5cf51cbb3a956ebdba52f6ef526a SHA512 cf8a988d316382469e4b13a86315c760b702b3d490398cf2fe96f119ba743c1ff707c09228dbbf4eb601189fece708913a621b04c44e9d93162639ccbd502cf5
-EBUILD apricots-0.2.6-r2.ebuild 1370 BLAKE2B b8beb3effe2c18b3b862700fd11ab6ec241f0fb57158ac3bf86f6a73751648ce4d1413a6657d4fe2ee291d885f307fc3e6b39a0e50d4e2410c08040d3cd69ce8 SHA512 e08f4aa491764b431de1a2a569fcda99363b6a70c0733e0da844e81a8172146d15eeba1133478a4abe9fd1c95740142c111dce1c2b29ba477d7f19de04bdef79
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/apricots/apricots-0.2.6-r2.ebuild b/games-arcade/apricots/apricots-0.2.6-r2.ebuild
deleted file mode 100644
index b0a37bd7912b..000000000000
--- a/games-arcade/apricots/apricots-0.2.6-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Fly a plane around bomb/shoot the enemy. Port of Planegame from Amiga"
-HOMEPAGE="http://www.fishies.org.uk/apricots.html"
-SRC_URI="http://www.fishies.org.uk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/openal
-	media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-freealut.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	cp admin/acinclude.m4.in acinclude.m4
-
-	sed -i \
-		-e 's:-DAP_PATH=\\\\\\"$prefix.*":-DAP_PATH=\\\\\\"/usr/share/${PN}/\\\\\\"":' \
-		-e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
-		configure.in || die
-	sed -i \
-		-e "s:filename(AP_PATH):filename(\"/etc/${PN}/\"):" \
-		${PN}/init.cpp || die
-	sed -i \
-		-e "s:apricots.cfg:/etc/${PN}/apricots.cfg:" \
-		README apricots.html || die
-	sed -i \
-		-e 's/-Wmissing-prototypes//' \
-		acinclude.m4 || die
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	emake LIBTOOL="/usr/bin/libtool"
-}
-
-src_install() {
-	HTML_DOCS="apricots.html"
-	einstalldocs
-
-	cd ${PN}
-	dobin apricots
-	insinto /usr/share/${PN}
-	doins *.wav *.psf *.shapes
-	insinto /etc/${PN}
-	doins apricots.cfg
-
-	make_desktop_entry ${PN} Apricots
-}
diff --git a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch b/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
deleted file mode 100644
index d2e1b27f6f34..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.6-freealut.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/apricots/apricots.cpp
-+++ b/apricots/apricots.cpp
-@@ -16,6 +16,7 @@
- int main(int, char**){

- #endif

- 

-+atexit(SDL_Quit);

-   // Initialize data

-   gamedata g;

-   init_data(g);

-
---- a/apricots/sampleio.cpp
-+++ b/apricots/sampleio.cpp
-@@ -74,12 +74,9 @@
-   alListenerfv(AL_ORIENTATION, front );

- 

-   // Load in samples

--  ALvoid* data = malloc(5 * (512 * 3) * 1024);

-   alGenBuffers(numsamples, samples);

- 

-   for (int i = 0; i < numsamples; i++){

--    ALsizei freq;

--    ALboolean fileok;

-     // Evil OpenAL portability fix done here

- #ifdef _WIN32

-     ALenum format;

-@@ -87,15 +84,12 @@
-     alutLoadWAVFile(filenames[i],&format,&data,&filelen,&freq,&trash);

-     fileok = (alGetError() == AL_NO_ERROR);

- #else

--    ALsizei format;

--    ALsizei trash;

--    fileok = alutLoadWAV(filenames[i],&data,&format,&filelen,&trash,&freq);

-+	samples[i] = alutCreateBufferFromFile(filenames[i]);

- #endif

--    if (!fileok){

-+    if (samples[i] == AL_NONE){

-       cerr << "sampleio: could not open " << filenames[i] << endl;

-       exit(1);

-     }         

--    alBufferData(samples[i], format, data, filelen, freq);

-   }

- 

-   // Generate Sources

-@@ -107,7 +101,6 @@
-     alSourcefv(sources[j], AL_ORIENTATION, back );

-   }

-   

--  free(data);

-   

- }

- 

-
---- a/configure.in
-+++ b/configure.in
-@@ -100,7 +100,8 @@
- 
- dnl Check for OpenAL
- AC_CHECK_HEADER(AL/al.h,[CXXFLAGS="$CXXFLAGS -DAP_AUDIO_OPENAL"])
--AC_CHECK_LIB( openal, alutInit)
-+AC_CHECK_LIB( openal, alGetError)
-+AC_CHECK_LIB( alut, alutInit)
- 
- KDE_CHECK_EXTRA_LIBS
- all_libraries="$all_libraries $USER_LDFLAGS"
diff --git a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch b/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
deleted file mode 100644
index 8a7b4a9f9a8c..000000000000
--- a/games-arcade/apricots/files/apricots-0.2.6-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/apricots/Makefile.am.old	2010-10-11 15:58:18.000000000 +0200
-+++ b/apricots/Makefile.am	2010-10-11 15:59:21.000000000 +0200
-@@ -4,7 +4,8 @@
- ## INCLUDES were found outside kdevelop specific part
- 
- apricots_SOURCES = SDLfont.cpp shape.cpp setup.cpp sampleio.cpp init.cpp game.cpp finish.cpp fall.cpp drawall.cpp drak.cpp collide.cpp apricots.cpp all.cpp ai.cpp 
--apricots_LDADD   = 
-+apricots_LDADD   = $(all_libraries) 
-+                                                                                
- 
- SUBDIRS = docs 
- 
-@@ -68,7 +69,3 @@
- ####### kdevelop will overwrite this part!!! (end)############
- # set the include path found by configure
- INCLUDES= $(all_includes)
-- 
--# the library search path.
--apricots_LDFLAGS = $(all_libraries) 
--                                                                                
diff --git a/games-arcade/apricots/metadata.xml b/games-arcade/apricots/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/apricots/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/aquaria-1.1.3-r1 b/games-arcade/aquaria-1.1.3-r1
new file mode 100644
index 000000000000..6aa6defc29f5
--- /dev/null
+++ b/games-arcade/aquaria-1.1.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=A 2D scroller set in a massive ocean world
+EAPI=5
+HOMEPAGE=http://www.bit-blot.com/aquaria/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip fetch bindist
+SLOT=0
+SRC_URI=aquaria-lnx-humble-bundle.mojo.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_=6e1bee5ff8a3839289bd62d1126f0172
diff --git a/games-arcade/aquaria/Manifest b/games-arcade/aquaria/Manifest
deleted file mode 100644
index c34fa6805a20..000000000000
--- a/games-arcade/aquaria/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aquaria-lnx-humble-bundle.mojo.run 209499691 BLAKE2B e592e451f192136b419281b2e55244d9baaae39bf462cd30a1bc4ad26a5ca825634309423ef3e51ae18f35023169417b1d7d78a19a3f4abf9415072d947586dd SHA512 4ae491ade644df73f676c7bd7c36aa79140aa7c4a312ecd613ba1c900506123ae37c644200433c0045713bb8f3f88e90e58be64d2fea6eee4e7015cd3e157738
-EBUILD aquaria-1.1.3-r1.ebuild 1089 BLAKE2B 80cdf759fb8652fe6b9e1fbb6f8b4465f8662495bcbd990583a81d0ddda20b2cee87ded4ef866528cc44d5329bdee8529bd0f67ec3dc3d87217a8ca4c3f87061 SHA512 7013cb6feb1fb6c38c419fdb1af8cae57d9f33a726a7626f25c5e2bf44963c4a29b0f7ac980d5ee934ccfcab8dfacf6c687d14951e34362f35e7c827a2edde1b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild b/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
deleted file mode 100644
index e4546e584a1f..000000000000
--- a/games-arcade/aquaria/aquaria-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker eutils games
-
-DESCRIPTION="A 2D scroller set in a massive ocean world"
-HOMEPAGE="http://www.bit-blot.com/aquaria/"
-SRC_URI="aquaria-lnx-humble-bundle.mojo.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip fetch bindist"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
-
-S=${WORKDIR}/data
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir#/}/aquaria"
-
-pkg_nofetch() {
-	echo
-	elog "Download ${SRC_URI} from ${HOMEPAGE} and place it in ${DISTDIR}"
-	echo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${dir}"
-	exeinto "${dir}"
-
-	doins -r *.xml */
-	doexe "${PN}"
-	doicon "${PN}.png"
-
-	dodoc README-linux.txt
-	mv "${ED}/${dir}"/docs "${ED}/usr/share/doc/${PF}/html" || die
-	dosym /usr/share/doc/${PF}/html "${dir}"/docs
-
-	games_make_wrapper "${PN}" "./${PN}" "${dir}"
-	make_desktop_entry "${PN}" "Aquaria"
-
-	prepgamesdirs
-}
diff --git a/games-arcade/aquaria/metadata.xml b/games-arcade/aquaria/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/aquaria/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/ascii-invaders-0.1b-r1 b/games-arcade/ascii-invaders-0.1b-r1
new file mode 100644
index 000000000000..d1b5a0d3cfb5
--- /dev/null
+++ b/games-arcade/ascii-invaders-0.1b-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=Space invaders clone, using ncurses library
+EAPI=6
+HOMEPAGE=https://packages.gentoo.org/package/games-arcade/ascii-invaders
+KEYWORDS=~alpha ~amd64 ~mips ~ppc64 ~x86 ~x86-fbsd ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=mirror://gentoo/invaders0.1b.tgz
+_md5_=06e31bf7144ebfb3ee5988b150f0fc4b
diff --git a/games-arcade/ascii-invaders/Manifest b/games-arcade/ascii-invaders/Manifest
deleted file mode 100644
index fdd800a3cdd3..000000000000
--- a/games-arcade/ascii-invaders/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST invaders0.1b.tgz 14597 BLAKE2B ecccca6636c4d8dffbc57b8cec82471efc2fd1a256648b9ac46fd256ef99d884205f1c86ff2bf0aedb7bb5996a59a7af3f301339944c6a4753355a8a4db23190 SHA512 3ac9dee0c532384e2849fdc8910bce885e3fdef362b629e8637df1cc0d82eba52c02a836a4925d811b339e9232f20caa7c761dbc1feeddc74e9b6f09e97046b8
-EBUILD ascii-invaders-0.1b-r1.ebuild 658 BLAKE2B 2184d7e5a6fa443f4d877a00a827d2e2639851a0925d05f486830cdfd9e57bab1a1fa0461d38d3057fc72a2c4501c47bb2ae879b941bd1b31bb7022281486669 SHA512 19ebec94c24244bc79b1a399ba79818ea985d4c94c1fb281d86607c684e1abe6a0f7e945d83e0bd77797b8772b278e6099b90c96a263b16242c696ae440c7d6f
-MISC metadata.xml 480 BLAKE2B 519e21066bfdbcb2dfa258e4c7533f217c5aa97ded13d3cb6afc0db83995ad99ffe709410f224cb9e88d19394cc8ec693993d600cb33986fb57428a0a36cfb08 SHA512 fcaa81ee096f7b5e478d8e0e21c81d3dc23e1d50c4a760515a6ab0bacf8e87adec52582726aebe4b288896c1e2403b9050d510fa3a989596d6f37e2d4df63d64
diff --git a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild b/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild
deleted file mode 100644
index 5c6a25c0ed44..000000000000
--- a/games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Space invaders clone, using ncurses library"
-HOMEPAGE="https://packages.gentoo.org/package/games-arcade/ascii-invaders"
-SRC_URI="mirror://gentoo/invaders${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc64 ~x86 ~x86-fbsd ~ppc-macos"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/invaders"
-
-src_prepare() {
-	default
-	rm -f Makefile
-}
-
-src_compile() {
-	emake LDLIBS="$(pkg-config ncurses --libs)" invaders
-}
-
-src_install() {
-	newbin invaders ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/ascii-invaders/metadata.xml b/games-arcade/ascii-invaders/metadata.xml
deleted file mode 100644
index 13dd7d1a5ea3..000000000000
--- a/games-arcade/ascii-invaders/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Ascii-Invaders is a clone of Space Invaders for text-terminals using the 
-curses library. It compiles and runs on MacOS X, GNU/Linux and probably 
-any other system with a curses implementation.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/asteroid-1.2.1 b/games-arcade/asteroid-1.2.1
new file mode 100644
index 000000000000..76ba19680a7d
--- /dev/null
+++ b/games-arcade/asteroid-1.2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer x11-libs/gtk+:2 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A modern version of the arcade classic that uses OpenGL
+EAPI=6
+HOMEPAGE=https://chazomaticus.github.io/asteroid/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl media-libs/sdl-mixer x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://github.com/chazomaticus/asteroid/archive/1.2.1.tar.gz -> asteroid-1.2.1.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_=69d65d2c60ed9521160f1a0ff982b38c
diff --git a/games-arcade/asteroid/Manifest b/games-arcade/asteroid/Manifest
deleted file mode 100644
index 7b1e2cb6bc27..000000000000
--- a/games-arcade/asteroid/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX asteroid-1.2.1-libm.patch 956 BLAKE2B c9d29ea30deb543bb0358ca4dfcc65eb94c9912022849e073d17f9057b1882de18b55a89d0ce8814623ab8ed2b7c36ff657523972c4889f19571936d73ec8f78 SHA512 d421eae4fc4ee5e7f5c00b5e6797f10e17030632a6224ed847d82e19b09e7dcac74d4fa84a19812eeeed9add4af3228f18e4d457b683a3adf73ed62d2671ca22
-DIST asteroid-1.2.1.tar.gz 307596 BLAKE2B c3f5363a0939cc4644425adfa9c3f2ca47ec04ae1beb9dd381fba912ee5e9d3330727fa82d4749b4f6402254988feaaaaef10f7f72aeea691656a1dd188ad5e2 SHA512 a88e0b85264d72bd40add0f3fc8b2b727b1acc0c190de6a60d4e1c79adcc484b17d0ed3537309b704667a6617f387219144cbec93df4fbff585d1237a9823b37
-EBUILD asteroid-1.2.1.ebuild 593 BLAKE2B 1348f0d27b03faa94045350aa47f6afebd3b55bd29fbe4dfd20135afc760e3b74175c6b000a21bff4525a54f620b0d950f8ea6381be2d902d1a34b1a3d1043ef SHA512 a1cd6c861856e8421fee6461272f1c19532edfa1c40d68edc664b293dca267c61cf469531d1f9b912e069ca0c387b08d20fdad17ce8ae2e88073a777a82eac24
-MISC metadata.xml 334 BLAKE2B 651b210093aa77df8209cebb3e4cdb6c03064453e3ac2fa2f974388cdd8102cd2ab548d4b88bbb18052321360edf0d395395fb36e6c2ba1ce038932046c165c9 SHA512 e69632cf70047993dd2924f1bc7c42b428f6e2059482708c2b5cd72ae90263c11b76d4846c457d7f597dbff01ca6bb8296c2cff3e859551a9f5f57ea5ed7c794
diff --git a/games-arcade/asteroid/asteroid-1.2.1.ebuild b/games-arcade/asteroid/asteroid-1.2.1.ebuild
deleted file mode 100644
index b9ac3b5e3501..000000000000
--- a/games-arcade/asteroid/asteroid-1.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="A modern version of the arcade classic that uses OpenGL"
-HOMEPAGE="https://chazomaticus.github.io/asteroid/"
-SRC_URI="https://github.com/chazomaticus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	media-libs/freeglut
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-libm.patch )
diff --git a/games-arcade/asteroid/files/asteroid-1.2.1-libm.patch b/games-arcade/asteroid/files/asteroid-1.2.1-libm.patch
deleted file mode 100644
index cb6e7aaafe29..000000000000
--- a/games-arcade/asteroid/files/asteroid-1.2.1-libm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4efc7fc0a1246f023d6f96b94081678e302ab430 Mon Sep 17 00:00:00 2001
-From: Charles Lindsay <chaz@chazomatic.us>
-Date: Mon, 23 May 2016 18:50:34 -0700
-Subject: [PATCH] Add libm to link command
-
-Without it, some systems (and now mine!) would give a linker error about
-missing libm.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 29fd714..ab9a7ec 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,7 @@ include_directories("${PROJECT_BINARY_DIR}/include")
- file(GLOB asteroid_SRCS "src/*.c")
- add_executable(asteroid ${asteroid_SRCS})
- include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
--target_link_libraries(asteroid ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
-+target_link_libraries(asteroid m ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
- if(Asteroid_BUILD_GTK)
-    include_directories(${GTK2_INCLUDE_DIRS})
-    target_link_libraries(asteroid ${GTK2_LIBRARIES})
diff --git a/games-arcade/asteroid/metadata.xml b/games-arcade/asteroid/metadata.xml
deleted file mode 100644
index d86be3eb5292..000000000000
--- a/games-arcade/asteroid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">chaoslizard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/balloonchase-0.9.6-r1 b/games-arcade/balloonchase-0.9.6-r1
new file mode 100644
index 000000000000..4906996145bb
--- /dev/null
+++ b/games-arcade/balloonchase-0.9.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=Fly a hot air balloon and try to blow the other player out of the screen
+EAPI=6
+HOMEPAGE=http://makegho.mbnet.fi/c/bchase/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video]
+SLOT=0
+SRC_URI=http://makegho.mbnet.fi/c/bchase/balloonchase-0.9.6.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1b835598566c112f11445778d80ade2d
diff --git a/games-arcade/balloonchase/Manifest b/games-arcade/balloonchase/Manifest
deleted file mode 100644
index c85d80474641..000000000000
--- a/games-arcade/balloonchase/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.9.6-gentoo.patch 6154 BLAKE2B a8729b678e4d8ece1ad327e0d35b63fddef5b28f9878efc89802ee8c4263dd9a758f1d13f66ce7125d069dc1874de680ff96888461516f142716b668a46ec687 SHA512 a16b70a3c1ba071b8e058e252843827e8a5b63d5b87e2332a93cb8d43e00ccbfd6b7aa13406275980c7a7cffd32b1b1453bf5d1f9c9c0b585cc969f5b9c6ae81
-DIST balloonchase-0.9.6.tar.bz2 523085 BLAKE2B 50e453327d51da3fe40f52850cb2fbb7a10e897f59bac5d6f4a676d3211d3dcdae00359304ad119252ebf98e9f46482ad801078762f16ddc609bc94b68c3fc18 SHA512 ab5617713c96187564926fd5ecbdbf5186f78c23cfb43b26b28b9d18e71330efd77700cf7cd02e04be7fd8e33f2d30bf59f64954135ac82802d1d839dc2e7767
-EBUILD balloonchase-0.9.6-r1.ebuild 823 BLAKE2B 8fe0e1701765087731667d8a6fbbf97c4151fcbbca003f21c6ffbdf4306b35dd26f52b4313ebc862609d981793113957094fad8e2017208b4bf013c6a8f98178 SHA512 86eea2e2b37420a01a4bc9993c0b7e81590a2331fb702dbf57a8bbdad0d14cf5c8aaaa43267301987862552f5d8b584c18697f6f040ba5427532e8097f7efd90
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild b/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild
deleted file mode 100644
index 36976cc63a40..000000000000
--- a/games-arcade/balloonchase/balloonchase-0.9.6-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Fly a hot air balloon and try to blow the other player out of the screen"
-HOMEPAGE="http://makegho.mbnet.fi/c/bchase/"
-SRC_URI="http://makegho.mbnet.fi/c/bchase/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-gentoo.patch
-	sed -i "s:g++:$(tc-getCXX):" Makefile || die
-	sed -i \
-		-e "s:GENTOODIR:/usr/share/${PN}:" src/main.c || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images
-	newicon images/kp2b.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Balloon Chase" /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/balloonchase/files/0.9.6-gentoo.patch b/games-arcade/balloonchase/files/0.9.6-gentoo.patch
deleted file mode 100644
index ff232693422b..000000000000
--- a/games-arcade/balloonchase/files/0.9.6-gentoo.patch
+++ /dev/null
@@ -1,183 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,3 @@
--LDFLAGS= -lSDL -lpthread -s
- CFLAGS= -Wall # -DDEBUG
- PKG_BCDIR=balloonchase-`cat src/ver`
- PKG_BCVER=`cat src/ver`
-@@ -9,8 +8,8 @@
- clean:
- 	rm balloonchase src/*.o
- main: 	src/main.c
--	g++ -c -o src/main.o `sdl-config --cflags` src/main.c
--	g++ -o balloonchase src/main.o `sdl-config --libs`
-+	g++ $(CXXFLAGS) -c -o src/main.o `sdl-config --cflags` src/main.c
-+	g++ $(LDFLAGS) -o balloonchase src/main.o `sdl-config --libs`
- pkg:
- 	@echo $(PKG_BCVERSION) >VERSION
- 	rm balloonchase src/*.o
---- a/src/main.c
-+++ b/src/main.c
-@@ -333,47 +333,47 @@
- 
- int InitImages()
- {
--	back = SDL_LoadBMP("images/back.bmp");
-+	back = SDL_LoadBMP("GENTOODIR/images/back.bmp");
- 
--	num3 = SDL_LoadBMP("images/num3.bmp");
-+	num3 = SDL_LoadBMP("GENTOODIR/images/num3.bmp");
- 	SDL_SetColorKey(num3, SDL_SRCCOLORKEY, SDL_MapRGB(num3->format, 0xFF, 0xFF, 0xFF));
--	num2 = SDL_LoadBMP("images/num2.bmp");
-+	num2 = SDL_LoadBMP("GENTOODIR/images/num2.bmp");
- 	SDL_SetColorKey(num2, SDL_SRCCOLORKEY, SDL_MapRGB(num2->format, 0xFF, 0xFF, 0xFF));
--	num1 = SDL_LoadBMP("images/num1.bmp");
-+	num1 = SDL_LoadBMP("GENTOODIR/images/num1.bmp");
- 	SDL_SetColorKey(num1, SDL_SRCCOLORKEY, SDL_MapRGB(num1->format, 0xFF, 0xFF, 0xFF));
--	num0 = SDL_LoadBMP("images/num0.bmp");
-+	num0 = SDL_LoadBMP("GENTOODIR/images/num0.bmp");
- 	SDL_SetColorKey(num0, SDL_SRCCOLORKEY, SDL_MapRGB(num0->format, 0xFF, 0xFF, 0xFF));
--	numv = SDL_LoadBMP("images/num-.bmp");
-+	numv = SDL_LoadBMP("GENTOODIR/images/num-.bmp");
- 	SDL_SetColorKey(numv, SDL_SRCCOLORKEY, SDL_MapRGB(numv->format, 0xFF, 0xFF, 0xFF));
- 
--	menu = SDL_LoadBMP("images/menu.bmp");
--	menu_onoff = SDL_LoadBMP("images/menu_onoff.bmp");
-+	menu = SDL_LoadBMP("GENTOODIR/images/menu.bmp");
-+	menu_onoff = SDL_LoadBMP("GENTOODIR/images/menu_onoff.bmp");
- 
- 
--//	arrow[0] = SDL_LoadBMP("images/down.bmp");
-+//	arrow[0] = SDL_LoadBMP("GENTOODIR/images/down.bmp");
- //	SDL_SetColorKey(arrow[0], SDL_SRCCOLORKEY, SDL_MapRGB(arrow[0]->format, 0x00, 0x00, 0x00));
--//	arrow[1] = SDL_LoadBMP("images/down.bmp");
-+//	arrow[1] = SDL_LoadBMP("GENTOODIR/images/down.bmp");
- //	SDL_SetColorKey(arrow[1], SDL_SRCCOLORKEY, SDL_MapRGB(arrow[1]->format, 0x00, 0x00, 0x00));
- 
--	kp1 = SDL_LoadBMP("images/kp1.bmp");
-+	kp1 = SDL_LoadBMP("GENTOODIR/images/kp1.bmp");
- 	SDL_SetColorKey(kp1, SDL_SRCCOLORKEY, SDL_MapRGB(kp1->format, 0xFF, 0xFF, 0xFF));
--	kp1b = SDL_LoadBMP("images/kp1b.bmp");
-+	kp1b = SDL_LoadBMP("GENTOODIR/images/kp1b.bmp");
- 	SDL_SetColorKey(kp1b, SDL_SRCCOLORKEY, SDL_MapRGB(kp1b->format, 0xFF, 0xFF, 0xFF));
- 
--	kp2 = SDL_LoadBMP("images/kp2.bmp");
-+	kp2 = SDL_LoadBMP("GENTOODIR/images/kp2.bmp");
- 	SDL_SetColorKey(kp2, SDL_SRCCOLORKEY, SDL_MapRGB(kp2->format, 0xFF, 0xFF, 0xFF));
--	kp2b = SDL_LoadBMP("images/kp2b.bmp");
-+	kp2b = SDL_LoadBMP("GENTOODIR/images/kp2b.bmp");
- 	SDL_SetColorKey(kp2b, SDL_SRCCOLORKEY, SDL_MapRGB(kp2b->format, 0xFF, 0xFF, 0xFF));
- 
--	font2 = SDL_LoadBMP("images/font.bmp");
-+	font2 = SDL_LoadBMP("GENTOODIR/images/font.bmp");
- 	font = SDL_CreateRGBSurface(SDL_SWSURFACE, 1288, 100, 32, 0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
- 	SDL_SetColorKey(font, SDL_SRCCOLORKEY, SDL_MapRGB(font->format, 0x00, 0x00, 0x00));
- 	DrawIMG (font, font2, 0, 0);
- 
--	blobtrox = SDL_LoadBMP("images/blobtrox.bmp");
-+	blobtrox = SDL_LoadBMP("GENTOODIR/images/blobtrox.bmp");
- 	//SDL_SetColorKey(blobtrox, SDL_SRCCOLORKEY, SDL_MapRGB(blobtrox->format, 0x01, 0x01, 0x01));
- 
--	balloonchase = SDL_LoadBMP("images/balloonchase.bmp");
-+	balloonchase = SDL_LoadBMP("GENTOODIR/images/balloonchase.bmp");
- 
- 	TMP = SDL_CreateRGBSurface(SDL_SWSURFACE, 259, 200, 32, 		0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF);
- 	blursurface = SDL_CreateRGBSurface(SDL_SWSURFACE, 640, 480, 32, 0x00000000, 0x00000000, 0x00000000, 0x00000000);
-@@ -578,7 +578,7 @@
- 
- void createdat(int winsneed, int option_wave_effect)
- {
--  FILE *OPTFILE=fopen ("balloonchase.dat", "w+");
-+  FILE *OPTFILE=fopen (".balloonchaserc", "w+");
-   char datmsg[60];
-   sprintf (datmsg, "Balloon Chase settings file -- Do not edit manually!");
-   char tmp2;
-@@ -588,52 +588,32 @@
- 	}
-   fputc (winsneed, OPTFILE);
-   fputc (option_wave_effect+2, OPTFILE);
--  fprintf (stderr, "Saved configuration to balloonchase.dat\n");
-+  fprintf (stderr, "Saved configuration to .balloonchaserc\n");
-   fclose (OPTFILE);
- }
- 
- void checkfiles()
- {
--  char found=0;
--  #ifdef WIN32
--	WIN32_FIND_DATA  fileinfo;
--	BOOL rc = 0;
--	HANDLE hFile;
--	hFile = FindFirstFile("*", &fileinfo);
--	while(rc)
--		{
--			rc = FindNextFile(hFile, &fileinfo);
--			if (strcmp (fileinfo.cFileName, "balloonchase.dat")==0)
--		{
--	fprintf(stderr, "Found balloonchase.dat\n"); 
--	found = 1;
--	_findclose(hFile);
--  #endif
--  #ifndef WIN32
--	struct dirent *filelist[255];
--	int i=0;
--	int j=0;
- 	DIR *dp;
--	dp=opendir("./");
--	int filenum=0;
--	while( filelist[filenum]=readdir(dp) )
-- 	 	filenum++;
--	closedir(dp);
--	if (filenum>=2)
--		for (i=0;i<filenum;i++)
--			{
--				if (strcmp(filelist[i]->d_name,"balloonchase.dat")==0)
--						{
--							fprintf (stderr, "Found balloonchase.dat\n");
--							found=1;
--						}
-+
-+	if (getenv("HOME")) {
-+		chdir(getenv("HOME"));
-+	}
-+	if ((dp = opendir("./"))) {
-+		struct dirent *f;
-+
-+		while(f=readdir(dp)) {
-+			if (strcmp(f->d_name, ".balloonchaserc") == 0) {
-+				fprintf (stderr, "Found .balloonchaserc\n");
-+				closedir(dp);
-+				return;
- 			}
--  #endif 
--	if (found==0)
--		{
--			fprintf (stderr, "Balloonchase.dat not found!\nCreating new...\n");
--			if (found==0) createdat(2, 1);
- 		}
-+		closedir(dp);
-+		fprintf (stderr,
-+			"Balloonchase.dat not found!\nCreating new...\n");
-+		createdat(2, 1);
-+	}
- }
- 
- Uint32 rgb(Uint8 r, Uint8 g, Uint8 b)
-@@ -1257,7 +1237,7 @@
-   SDL_WM_SetCaption ("Balloon Chase", 0);
-   checkfiles();
- 
--  FILE *OPTFILE=fopen ("balloonchase.dat", "r");
-+  FILE *OPTFILE=fopen (".balloonchaserc", "r");
-   char datmsg[60];
-   char varmistus[60];
- 
-@@ -1275,7 +1255,7 @@
- 	{
- 		winsneeded=fgetc(OPTFILE);
- 		option_wave_effect=fgetc(OPTFILE)-2;
--		fprintf (stderr, "Successfully loaded balloonchase.dat\n");
-+		fprintf (stderr, "Successfully loaded .balloonchaserc\n");
- 	}
- 		else
- 	{
diff --git a/games-arcade/balloonchase/metadata.xml b/games-arcade/balloonchase/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/balloonchase/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/barbarian-bin-1.01-r1 b/games-arcade/barbarian-bin-1.01-r1
new file mode 100644
index 000000000000..edabf12a6733
--- /dev/null
+++ b/games-arcade/barbarian-bin-1.01-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Save Princess Mariana through one-on-one battles with demonic barbarians
+EAPI=5
+HOMEPAGE=http://www.tdbsoft.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CC-BY-NC-ND-2.0
+RDEPEND=sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] ) >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://www.pcpages.com/tomberrr/downloads/barbarian101_linux.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_=18ee40e9cf5abc19def1e7303c33dc9f
diff --git a/games-arcade/barbarian-bin/Manifest b/games-arcade/barbarian-bin/Manifest
deleted file mode 100644
index e8b6478ba6fb..000000000000
--- a/games-arcade/barbarian-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST barbarian101_linux.zip 925199 BLAKE2B d8552b7fb03836ec75943b5b754489c345c70c9534301f16a64cdd21ea262fcff19ae6916bcd469b26dd088676079df2190bda369ca085d6c4285d84ebc12616 SHA512 9b46c75666359ed5102a89d29e8b6afacf07ccfa6175f6df27b5acc48b0e0119106f1c1376b124ff761d373bf04145e804659b81503b2834ba09ac05fad5c4f4
-EBUILD barbarian-bin-1.01-r1.ebuild 1242 BLAKE2B 41a093a2be3ede578059fedaf70cc979efc8fc55d4b3c4c9cf93c1134d27916411b405167ca633251da04b5d2097f7dc643a7acb5e9a1fa70cec2c1742e866ad SHA512 97e5d5d20421f666ccd9aa9bf162a649fe2b04202fe0559e6d41052c1eae993d452f78060ee99638fe647cf7cb6a230e96b79a95a2e84dec4259d9967880b8b7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
deleted file mode 100644
index 555f99dd3acb..000000000000
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_PN=${PN/-bin/}
-DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
-HOMEPAGE="http://www.tdbsoft.com/"
-SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
-
-LICENSE="CC-BY-NC-ND-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
-
-game_dest="${GAMES_PREFIX_OPT}/${MY_PN}"
-QA_PREBUILT="${game_dest:1}/Barbarian"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "${game_dest}"
-	cp -r gfx sounds "${D}${game_dest}/" || die
-
-	exeinto "${game_dest}"
-	doexe Barbarian
-
-	dohtml Barbarian.html
-
-	games_make_wrapper barbarian ./Barbarian "${game_dest}"
-
-	# High-score file
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/heroes.hoh"
-	fperms 660 "${GAMES_STATEDIR}/heroes.hoh"
-	dosym "${GAMES_STATEDIR}/heroes.hoh" "${game_dest}/heroes.hoh"
-	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
-	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
-	prepgamesdirs
-}
diff --git a/games-arcade/barbarian-bin/metadata.xml b/games-arcade/barbarian-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/barbarian-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/batrachians-0.1.6-r1 b/games-arcade/batrachians-0.1.6-r1
new file mode 100644
index 000000000000..1d1d0991fb53
--- /dev/null
+++ b/games-arcade/batrachians-0.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fly-eating frog video game
+EAPI=6
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/batrachians.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.5
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e989f540e94f19311f03e8bec7d02ef1
diff --git a/games-arcade/batrachians/Manifest b/games-arcade/batrachians/Manifest
deleted file mode 100644
index e4a5d891bbc2..000000000000
--- a/games-arcade/batrachians/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX batrachians-0.1.6-makefile.patch 1083 BLAKE2B 9660401bf833700f353a1ab8ee065d94c585c2ee8ad3ac04318f7d81a17a367c0f81e540fa4e442b75c368d79bb49758795e51507a98f4cb06a087d019d3608b SHA512 9fb3d84f864b7cad0ace0e288969871824cae110f879ba8fe512969c7b1aef370c375bde57caedf5bf2bc7e5f00a9f2819fdc7de6d710c989bb474382a84e77a
-DIST batrachians-0.1.6.tar.gz 198088 BLAKE2B 446e2fd77068dc8c58e801fca6544ea825529240a79e1b14fac6962d26d78f6f4e977f6965751ba5d09ea790679dfa820e5cdb1ed667bd0af46f8c89180a38bf SHA512 d3022712627061f9828e1f3baa7207053884f1f4c0348768d4ac073673ff1bcf14c95cedf01031b8bd36a6b684bf239af0f381df41aa18d49218320a8bea3b68
-EBUILD batrachians-0.1.6-r1.ebuild 602 BLAKE2B 4a65dc982992ba02fdd7a69414c9bb50e129b2223dd66a7cd1992efad3b5359d435774c9aa9be035d56d19a7af260916225d07724126f2d456648d831bc82400 SHA512 d1e6569181add23e144f1ed71ed576dae19d00b6559ae3fb4c12cf7e6383fea3d42d5546b57c7521d5653b7f8f055e8d45089ddd38b62e07af9c10cd3aeb694a
-MISC metadata.xml 383 BLAKE2B 40ab8c4f0c3bbc162a20b7db8130b1d3d3a22dd8b0a828403000c58c1eb5c977ef6b93077f2f887828b6ca6809feefdf234605ca9c71170e13590e6e6f390410 SHA512 6ac1eca021c30af55b915f3d34d180ad429f9f16e7e942b3853d8f77f0ba82fa8bf97439209414e7541b0c0bfba29b49b1efc143e690ae7f8dbffd1fcaae9986
diff --git a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild b/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
deleted file mode 100644
index 87491afe0f23..000000000000
--- a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="A fly-eating frog video game"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/batrachians.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-games/flatzebra-0.1.5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	doman doc/${PN}.6
-	einstalldocs
-}
diff --git a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch b/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch
deleted file mode 100644
index f01fdfb0da8d..000000000000
--- a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru batrachians-0.1.6.orig/src/Makefile.am batrachians-0.1.6/src/Makefile.am
---- batrachians-0.1.6.orig/src/Makefile.am	2011-04-18 21:25:53.000000000 -0400
-+++ batrachians-0.1.6/src/Makefile.am	2014-10-27 23:19:58.292260669 -0400
-@@ -20,7 +20,7 @@
- 	-DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \
- 	-DPKGSOUNDDIR=\"$(pkgsounddir)\"
- 
--pkgsounddir = $(datadir)/sounds/$(PACKAGE)
-+pkgsounddir = $(datadir)/$(PACKAGE)/sounds
- pkgsound_DATA = \
- 	sounds/game-starts.wav \
- 	sounds/game-ends.wav \
-@@ -29,18 +29,18 @@
- 	sounds/frog-jumps.wav \
- 	sounds/tongue-out.wav
- 
--desktopentrydir = $(datadir)/applications
-+desktopentrydir =/usr/share/applications
- desktopentry_DATA = $(PACKAGE).desktop
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir =/usr/share/icons/hicolor/48x48/apps/
- pixmap_DATA = images/$(PACKAGE).png
- 
- 
- check: all
- if HAVE_GETOPT_LONG
- 	test "`./$(PACKAGE) --version`" = "$(PACKAGE) $(VERSION)"
--	./$(PACKAGE) --version >& /dev/null
--	./$(PACKAGE) --help >& /dev/null
-+	./$(PACKAGE) --version > /dev/null 2>&1
-+	./$(PACKAGE) --help > /dev/null 2>&1
- endif
- 
- 
diff --git a/games-arcade/batrachians/metadata.xml b/games-arcade/batrachians/metadata.xml
deleted file mode 100644
index 418dc79f8c64..000000000000
--- a/games-arcade/batrachians/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel
-Electronics.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/berusky-1.7.1-r1 b/games-arcade/berusky-1.7.1-r1
new file mode 100644
index 000000000000..0e10afb8d461
--- /dev/null
+++ b/games-arcade/berusky-1.7.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free logic game based on an ancient puzzle named Sokoban
+EAPI=6
+HOMEPAGE=http://anakreon.cz/?q=node/1
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,video] media-libs/sdl-image[png] x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.anakreon.cz/download/berusky-1.7.1.tar.gz http://www.anakreon.cz/download/berusky-data-1.7.tar.gz https://dev.gentoo.org/~hasufell/distfiles/berusky.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b90a41e4c8c5fbf303a525c89588673e
diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
deleted file mode 100644
index 2a96470e7f2e..000000000000
--- a/games-arcade/berusky/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
-DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
-DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r1.ebuild 744 BLAKE2B 0175d17f9d04d05ac36b8d646788509e358f663312a1001160a36c8d30673d026fa55e55bfb067a8b71b3037579eaf9aa4aa200e714f100c4156552f84cdb83c SHA512 40031b87dd26eacdd5180709eb60e22cd3a04a8246b23e889163c550b735e8e2307d5ee98a14ebdb875e6c33bc7e8f138b113bb325a119c362eb37f97a745cf9
-MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r1.ebuild b/games-arcade/berusky/berusky-1.7.1-r1.ebuild
deleted file mode 100644
index d56b0203f7d5..000000000000
--- a/games-arcade/berusky/berusky-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2
-
-DATAFILE="${PN}-data-1.7"
-DESCRIPTION="Free logic game based on an ancient puzzle named Sokoban"
-HOMEPAGE="http://anakreon.cz/?q=node/1"
-SRC_URI="http://www.anakreon.cz/download/${P}.tar.gz
-	http://www.anakreon.cz/download/${DATAFILE}.tar.gz
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[X,video]
-	media-libs/sdl-image[png]
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_install() {
-	gnome2_src_install
-	rm -rf "${ED}"/usr/doc
-	doicon -s 32 "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN}
-}
diff --git a/games-arcade/berusky/metadata.xml b/games-arcade/berusky/metadata.xml
deleted file mode 100644
index d0959ece3c93..000000000000
--- a/games-arcade/berusky/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Berusky is a free logic game, published under GNU Public License and it's based
-on an ancient puzzle named Sokoban.
-
-An old idea of moving boxes in a maze has been expanded with new logic items
-such as explosives, stones, special gates and so on. In addition, up to five
-bugs can cooperate and be controlled by the player.
-
-In order to leave each level (there's about 120 levels in the game) it is
-necessary to own five keys and also to have a free way to the exit. 
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/betna-0.9.7 b/games-arcade/betna-0.9.7
new file mode 100644
index 000000000000..efdb782165db
--- /dev/null
+++ b/games-arcade/betna-0.9.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=Defend your volcano from the attacking ants by firing rocks/bullets at them
+EAPI=5
+HOMEPAGE=http://koti.mbnet.fi/makegho/c/betna/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] games-misc/games-envd
+SLOT=0
+SRC_URI=http://koti.mbnet.fi/makegho/c/betna/betna-0.9.7.tgz
+_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_=165015bf5f6ed96808ae54c52f323272
diff --git a/games-arcade/betna/Manifest b/games-arcade/betna/Manifest
deleted file mode 100644
index 11f6fa28860a..000000000000
--- a/games-arcade/betna/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST betna-0.9.7.tgz 684723 BLAKE2B 1bef53f216faea681bb4e5dd64ef4eba8ce52f62acf5c1ab8af4890cc97f4d3c529cb3e33633b906990e628cc63c7282367fd31c473954a9c258ff1c4fd43286 SHA512 01a979b3bd5adf1581293db8a066a4db1b4818f5986d8954d0da5d1e1eb394201c2affcee8c679b7cd23b4d255f718619dc00183b59fe7be280f18db0c0548d5
-EBUILD betna-0.9.7.ebuild 1004 BLAKE2B 74536b10ae4d24b234ed6e31b11b7141755646bafc493db330ace0eb24d9b1dabe8cda43ca1b4956ba0c29117650f4468d90864bcdde1d90c0118acd91b5fe8b SHA512 fb48c44f9630c496c1e26c5c405321b1a6f3fc92bc05d648160161ca7682b294657fc47c659d385c800d1f8e8d5f8216a1241798a58f1e0fbcd9949849521730
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/betna/betna-0.9.7.ebuild b/games-arcade/betna/betna-0.9.7.ebuild
deleted file mode 100644
index 5ec01c5aec8c..000000000000
--- a/games-arcade/betna/betna-0.9.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Defend your volcano from the attacking ants by firing rocks/bullets at them"
-HOMEPAGE="http://koti.mbnet.fi/makegho/c/betna/"
-SRC_URI="http://koti.mbnet.fi/makegho/c/betna/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/blobprintf.*char msg/s/char msg/const char msg/' \
-		-e "s:images/:${GAMES_DATADIR}/${PN}/:" \
-		src/main.cpp || die
-
-	sed -i \
-		-e '/^LDFLAGS/d' \
-		-e '/--libs/s/-o/$(LDFLAGS) -o/' \
-		-e 's:-O2:$(CXXFLAGS):g' \
-		-e 's/g++/$(CXX)/' \
-		Makefile || die
-}
-
-src_compile() {
-	emake clean
-	emake
-}
-
-src_install() {
-	dogamesbin betna
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins images/*
-	newicon images/target.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Betna /usr/share/pixmaps/${PN}.bmp
-	dodoc README Q\&A
-	prepgamesdirs
-}
diff --git a/games-arcade/betna/metadata.xml b/games-arcade/betna/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/betna/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/blobby-1.0 b/games-arcade/blobby-1.0
new file mode 100644
index 000000000000..b8a620211119
--- /dev/null
+++ b/games-arcade/blobby-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-games/physfs-2[zip] media-libs/libsdl[sound,joystick,opengl,video,X] virtual/opengl app-arch/zip dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Beach ball game with blobs of goo
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/blobby/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/physfs-2[zip] media-libs/libsdl[sound,joystick,opengl,video,X] virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/blobby/blobby2-linux-1.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=33f7d51c85899e7285cdf1210e0829bf
diff --git a/games-arcade/blobby/Manifest b/games-arcade/blobby/Manifest
deleted file mode 100644
index 5e888a5d2dff..000000000000
--- a/games-arcade/blobby/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX blobby-1.0-compile.patch 953 BLAKE2B c946783dd30b7f10c5f8cd4db932ef1c913fc10dbb8d83d23c0985d07cd2e96a4dda242914a96a2925ed7d8510035c0014641077278fb5600acab54b574d7bc7 SHA512 da389d12f388cfd48a4259be72e076bfff65258e6ff27c9d8ea815e9c04ce99520fc321b17cfcc95241e1ec7b5f70dee7d6a5dd05c36e351648c67ee5226d078
-AUX blobby-1.0-install.patch 669 BLAKE2B c23270394ce98e271713da8af60d8b8f510d1a6f69950485af060eacae977942b2490eb9450faaea25c6adb29a5e216356f68cfd48cb13aca97e9b4eb582d294 SHA512 ed31fd4a8f6e5c0f30bfbaf331c5b4dc51250c72481d38b556bceed673de5ee8c1fe89c5002e15125202551023e3d836937eeb1de1121e78f60c15132b5850c9
-AUX blobby-1.0-paths.patch 1237 BLAKE2B 77199702e08216ce741698b7435288f4536e6304a3fec09f2ef57bd73004d3306d9430230a2d8fdb1fc3a8018765c3a7d7662501eb6eb1caa6b29a858a96a798 SHA512 63c0ea107197ec2bed46b34d6cebbd0df1cc09477d6253ee8f325a554608456b0a34b301201e4d774c985df0512ba330105a5ec2be29ba34250a3a7311437793
-DIST blobby2-linux-1.0.tar.gz 1772918 BLAKE2B ee2231d5c2a287f812debf43a95b6ffe4abdcd87fec41eea5e528253d83190f20d4b2245b5e530f1b8b9df310ce2757b06377f7305f8cf60e6d51db9964ea239 SHA512 b9e36de4a44e482c9d0742b95034c2979d7a51512ac5e3fd8f4933655132028dfc9642c3580e5523b5b95d38acc169932d24808cee236710731c2571321337fa
-EBUILD blobby-1.0.ebuild 802 BLAKE2B c3eef011c49da2d3476e62b6baa7b9abd79d672699dbd8aa7eed95b60b1336b20fec157dfd8899a8bbdbb1949f4d588c84434486cb1f865f127a1ef17b47733d SHA512 3b493fb652e2aadf44972c007dc0506a68c7e9af33d47a04c8650fcaf1500c822f5a203b7ae59c990190c4115beb1e5deb37dd69338ed59dad7ce3e7a35e2d46
-MISC metadata.xml 329 BLAKE2B 57c87f4ead15774d9253ee14454b3316e1ca30eef93f18066c039a25137258555ec8788dfab78f94be77c38bb2ebe03ce42f1046896fb323653ce04760e7b8f6 SHA512 a46248ffada14ff8459d5a6949e8d437d7fc72036c04f0c8f28b3cca614ccdb3116875f741d0dd248e172431d292761c6c1d230f1a07499b2d6cc63208ccc740
diff --git a/games-arcade/blobby/blobby-1.0.ebuild b/games-arcade/blobby/blobby-1.0.ebuild
deleted file mode 100644
index 413ea74b1024..000000000000
--- a/games-arcade/blobby/blobby-1.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Beach ball game with blobs of goo"
-HOMEPAGE="https://sourceforge.net/projects/blobby/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}2-linux-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-games/physfs-2[zip]
-	media-libs/libsdl[sound,joystick,opengl,video,X]
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-libs/boost
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-compile.patch
-	"${FILESDIR}"/${P}-paths.patch
-	"${FILESDIR}"/${P}-install.patch
-)
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon data/Icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Blobby Volley" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-arcade/blobby/files/blobby-1.0-compile.patch b/games-arcade/blobby/files/blobby-1.0-compile.patch
deleted file mode 100644
index f41601d56375..000000000000
--- a/games-arcade/blobby/files/blobby-1.0-compile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From eaa17d2ad90de2024fc3a7a59575597d1dc0b171 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2017 18:01:14 +0100
-Subject: [PATCH] Fix compilation
-
----
- src/NetworkMessage.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/NetworkMessage.cpp b/src/NetworkMessage.cpp
-index 9178e74..0c3163b 100644
---- a/src/NetworkMessage.cpp
-+++ b/src/NetworkMessage.cpp
-@@ -109,6 +109,11 @@ bool operator == (const ServerInfo& lval, const ServerInfo& rval)
- 
- std::ostream& operator<<(std::ostream& stream, const ServerInfo& val)
- {
--	return stream << val.name << " (" << val.hostname << ":" << val.port << ")";
-+	return stream
-+                    << std::string(val.name)
-+                    << std::string(" (")
-+                    << std::string(val.hostname)
-+                    << std::string(":") << std::to_string(val.port)
-+                    << std::string(")");
- }
- 
--- 
-2.11.0
-
diff --git a/games-arcade/blobby/files/blobby-1.0-install.patch b/games-arcade/blobby/files/blobby-1.0-install.patch
deleted file mode 100644
index 5bd95c121ed9..000000000000
--- a/games-arcade/blobby/files/blobby-1.0-install.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0a3ebb368242ed379f4ff7d5eca24be79841d968 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2017 18:55:47 +0100
-Subject: [PATCH] Install missing files
-
----
- data/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index a2454cd..5a2a661 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -25,10 +25,12 @@ set(install_files
- 	${CMAKE_CURRENT_BINARY_DIR}/backgrounds.zip
- 	${CMAKE_CURRENT_BINARY_DIR}/rules.zip
- 	config.xml
-+	Icon.bmp
- 	inputconfig.xml
- 	server/server.xml
- 	lang_de.xml
- 	lang_en.xml
-+	lang_it.xml
- 	lang_fr.xml)
- 
- if (WIN32)
--- 
-2.11.0
-
diff --git a/games-arcade/blobby/files/blobby-1.0-paths.patch b/games-arcade/blobby/files/blobby-1.0-paths.patch
deleted file mode 100644
index 6ddc76877e7d..000000000000
--- a/games-arcade/blobby/files/blobby-1.0-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3dbc91fcfe5412598201e33de80db7b1b01e4ffb Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sat, 21 Jan 2017 18:49:04 +0100
-Subject: [PATCH] Use system installation path
-
----
- data/CMakeLists.txt | 2 +-
- src/main.cpp        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index d9029b3..a2454cd 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -34,5 +34,5 @@ set(install_files
- if (WIN32)
- 	install(FILES ${install_files} DESTINATION data)
- elseif (UNIX)
--	install(FILES ${install_files} DESTINATION share/blobby)
-+	install(FILES ${install_files} DESTINATION /usr/share/blobby)
- endif (WIN32)
-diff --git a/src/main.cpp b/src/main.cpp
-index 2628990..15bddf2 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -78,7 +78,7 @@ void setupPHYSFS()
- 	std::string separator = fs.getDirSeparator();
- 	// Game should be playable out of the source package on all
- 	// relevant platforms.
--	std::string baseSearchPath("data" + separator);
-+	std::string baseSearchPath("/usr/share/blobby/");
- 	// Android and iOS are needing a special path
- 	#ifdef __ANDROID__
- 		baseSearchPath = SDL_AndroidGetExternalStoragePath() + separator;
--- 
-2.11.0
-
diff --git a/games-arcade/blobby/metadata.xml b/games-arcade/blobby/metadata.xml
deleted file mode 100644
index 503a13f4e202..000000000000
--- a/games-arcade/blobby/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">blobby</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/blobwars-2.00 b/games-arcade/blobwars-2.00
new file mode 100644
index 000000000000..dad4a6219d4d
--- /dev/null
+++ b/games-arcade/blobwars-2.00
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib virtual/libintl sys-devel/gettext >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Platform game about a blob and his quest to rescue MIAs from an alien invader
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/blobwars/ https://sourceforge.net/apps/mediawiki/blobwars/index.php?title=Main_Page
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain
+RDEPEND=media-libs/libsdl2 media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/sdl2-image media-libs/sdl2-net sys-libs/zlib virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/blobwars/blobwars-2.00.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	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd091e4ab84e13e8bb902b905c469e98
diff --git a/games-arcade/blobwars/Manifest b/games-arcade/blobwars/Manifest
deleted file mode 100644
index 7eb71f33d23c..000000000000
--- a/games-arcade/blobwars/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST blobwars-2.00.tar.gz 66982603 BLAKE2B 273b5eab5a569f7f4b78982499a85daf63e6fdfb7d4348290d64bbcbeb9be830bb7cf81a0a387df0daa176e7a2a82d62404e88c95f02d6af485bae054170ad38 SHA512 412afd029554e59e7947466f36b51ef863faf1712898397498d5497e9a38dced92777b7684c1fb231998d893a6ce2c435b8f4278429df41168385de8fa18725b
-EBUILD blobwars-2.00.ebuild 1091 BLAKE2B 2757fcc3fef4acd23c0be5d7aae7ee59628de526f2487faad7e31b2387cd9a1f4b1cb0d0feb337d0bba64cdd5ea9e90dbee123c76ac33f035887f7ea7dea540c SHA512 6c5f30ed57dfccd062f2e9c8b6496f0cbb83f22008fc250d4c078d692b15b42cd1d36d65ddbdee7553fdb6deb132e5603acd021899e712d2fb3ddb032e349313
-MISC metadata.xml 435 BLAKE2B 068333d0c08571d1786efe5ed571a2382b51df890ae8a9c800c19f043b563475ffb98ed6a3347a7772fccc7812af1c7cd6db092ea74214e5b97909e2a8e90d8c SHA512 774b29f812036b56f80241d3fa85e93097cbda2492a0a68f8b7c1e0ebad5f7e4ff48532d8cbf96df5c5a200c8c5dc747c78fc36aa130b6def0f35309b29e9420
diff --git a/games-arcade/blobwars/blobwars-2.00.ebuild b/games-arcade/blobwars/blobwars-2.00.ebuild
deleted file mode 100644
index c8e537631e83..000000000000
--- a/games-arcade/blobwars/blobwars-2.00.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils xdg
-
-DESCRIPTION="Platform game about a blob and his quest to rescue MIAs from an alien invader"
-HOMEPAGE="https://sourceforge.net/projects/blobwars/ https://sourceforge.net/apps/mediawiki/blobwars/index.php?title=Main_Page"
-SRC_URI="mirror://sourceforge/blobwars/${P}.tar.gz"
-
-LICENSE="BSD CC-BY-SA-3.0 CC-BY-3.0 GPL-2 LGPL-2.1 fairuse public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl2
-	media-libs/sdl2-mixer
-	media-libs/sdl2-ttf
-	media-libs/sdl2-image
-	media-libs/sdl2-net
-	sys-libs/zlib
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	default
-	sed -i -e "/-Werror/d" Makefile || die
-}
-
-src_compile() {
-	emake \
-		RELEASE="1" \
-		USEPAK="1"
-}
-
-src_install() {
-	emake \
-		BINDIR="/usr/bin/" \
-		USEPAK="1" \
-		DESTDIR="${D}" \
-		DOCDIR="/usr/share/doc/${PF}/html/" \
-		install
-
-	mv -vf \
-		"${D}"/usr/share/doc/${PF}/html/{changes,hacking,porting,readme} \
-		"${D}"/usr/share/doc/${PF}/
-}
diff --git a/games-arcade/blobwars/metadata.xml b/games-arcade/blobwars/metadata.xml
deleted file mode 100644
index d94e97a50ae6..000000000000
--- a/games-arcade/blobwars/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pacho@gentoo.org</email>
-		<name>Pacho Ramos</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">blobwars</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/blockrage-0.2.3 b/games-arcade/blockrage-0.2.3
new file mode 100644
index 000000000000..33206b1a9d0f
--- /dev/null
+++ b/games-arcade/blockrage-0.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=Falling-blocks arcade game with a 2-player hotseat mode
+EAPI=5
+HOMEPAGE=http://blockrage.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/blockrage/blockrage-0.2.3.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_=26afc8aeb4a500fde8771c2fcdeaba58
diff --git a/games-arcade/blockrage/Manifest b/games-arcade/blockrage/Manifest
deleted file mode 100644
index 1dd46bccc691..000000000000
--- a/games-arcade/blockrage/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX blockrage-0.2.3-config.patch 949 BLAKE2B c45af2acebc7e4c1f0bed710cec317f88e7a40fdcba1420f4349c1bf20aec95bc1f72b8d95411129bb05c51ffae373e87449ca974bca922b906915ac3bc0e4d1 SHA512 41b9446bbd0f1a5f0c9c740a3208ed01ec0f6b80bbce0c68e4e24b05b6e5c3bd22a308bc2ef72969dab95faffe20a9456a07e62e110378b4ad2034f9f7676f16
-DIST blockrage-0.2.3.tar.gz 75620 BLAKE2B f54e0f2e30e36b9c9692c28a4cb894305cb9e0eaae31873073899aeafaa1a032c56533840c5094ff60e3e9eb09587fc9cc83b8469f39952ce483369243f5fcc1 SHA512 20ad63cb75f6f3afe482b54c5dc0487615ed9ac9a43fa3819b1da43f343c8dde6c3eb817b46b586bbfdca6ad9c9e9cb3c220f5ab536397e407250daf9fd61aa2
-EBUILD blockrage-0.2.3.ebuild 618 BLAKE2B 805c5fc2794b9f6d6534422f8978425341ea8c250ce6b44779e091de79790bbec6629a10b2380c097f1356579318e02c1351610a4caca8123e28c85ea961ed42 SHA512 66e66aea0193e31aaa72eaf85d647370057c657960370a2181330349a69eec1e83c37a4737b0d9fccf85d8f442c2d44ce97b0a93a1f6d5ba0feb6163c2fd2b6e
-MISC metadata.xml 448 BLAKE2B 6a4517bcb8f863902cc85d8ca2fa678035b1dce32f554593428107258c41c39f21612859e48688e82ecd65bd463be00f5619af2ac144ed2e2622d66423e502c8 SHA512 803f6a13513f89d982db1995fc96d8a9f430b2fd23fedc7dd63da2a2b864326108ce2156ae0a7432afb1fbffe8588db9b3b3b81f8ede2e3c62eb8675e2356101
diff --git a/games-arcade/blockrage/blockrage-0.2.3.ebuild b/games-arcade/blockrage/blockrage-0.2.3.ebuild
deleted file mode 100644
index 62aa1d3692a6..000000000000
--- a/games-arcade/blockrage/blockrage-0.2.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Falling-blocks arcade game with a 2-player hotseat mode"
-HOMEPAGE="http://blockrage.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND=${DEPEND}
-
-# Removing error due to wrong detection of cross-compile mode
-DOCS=( ChangeLog KNOWN_BUGS README TODO )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-config.patch
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch b/games-arcade/blockrage/files/blockrage-0.2.3-config.patch
deleted file mode 100644
index dc1875fc28e8..000000000000
--- a/games-arcade/blockrage/files/blockrage-0.2.3-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- configure
-+++ configure
-@@ -40,7 +40,7 @@
- SOUND_OPT=
- 
- MYCC=gcc
--MYCFLAGS='-s -O2 -Wall `sdl-config --cflags`'" $SOUND_OPT -DSYSCONFDIR=\\\"\${sysconfdir}/\${progname}\\\""
-+MYCFLAGS='-Wall `sdl-config --cflags`'" $SOUND_OPT -DSYSCONFDIR=\\\"\${sysconfdir}/\${progname}\\\""
- 
- if test -z "$CC" ; then
-   CC="$MYCC";
-@@ -75,7 +75,6 @@
-     --build=*) build_alias="$cfg_optarg";;
-     --host=*) if test ."$build_alias" != ."$cfg_optarg" ; then
-         printf "configure: cross-compiling not supported\n" >&2
--	exit 1
-       fi;;
-     
-     --bindir=*) bindir="$cfg_optarg";;
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -1,7 +1,7 @@
- OBJS    = main.o gfxout.o gfxlib.o menus.o keyboard.o bg.o sound.o global.o timer.o
- 
- $(progname)$(XSUF): $(OBJS)
--	gcc -s -o $(progname)$(XSUF) $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) -o $(progname)$(XSUF) $(OBJS) $(LIBS) $(LDFLAGS)
- 
- bg.o: bg.c bg.h global.h main.h
- gfxlib.o: gfxlib.c gfxlib.h global.h gfxout.h
diff --git a/games-arcade/blockrage/metadata.xml b/games-arcade/blockrage/metadata.xml
deleted file mode 100644
index 13e8bd0d6026..000000000000
--- a/games-arcade/blockrage/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-An arcade game with addictive gameplay and a 2-player hotseat mode.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">blockrage</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/bomns-0.99.2 b/games-arcade/bomns-0.99.2
new file mode 100644
index 000000000000..c47cda02f175
--- /dev/null
+++ b/games-arcade/bomns-0.99.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) >=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 fast-paced multiplayer deathmatch arcade game
+EAPI=5
+HOMEPAGE=http://greenridge.sourceforge.net
+IUSE=gtk editor
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/greenridge/bomns-0.99.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=241339af8b7662dbfaa9cef7d3c6cce5
diff --git a/games-arcade/bomns/Manifest b/games-arcade/bomns/Manifest
deleted file mode 100644
index 3d1c444e58e4..000000000000
--- a/games-arcade/bomns/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bomns-0.99.2-fpe.patch 350 BLAKE2B c80f7e73861a458c31df12db2cae3a6776b1d2b512a30927e76ed6277523173e8fbc03bb24a851db428b58910c331cc084ca063bac86ccef23f3e41c6bd3a4a6 SHA512 0e8aad5ebcfc536051c59b7d44c125a82d98ee8963df4fbc2cb0edf879be2e6898b7938aa26cd8f535355e4c2dfa7f95f232b506850fd5a6105ef84f5a37c092
-DIST bomns-0.99.2.tar.gz 1079850 BLAKE2B 7d7eb5a55455fc300d265b5efa652310d0e08b1c4a688221ca0ad8d578b423efac1bd00cd637f1918d1ba9fe903c5890e63c1ce3dab80e9e8f312083be824898 SHA512 db4a2352af0cb220dc0c12de8796d17bbfb71e1aa7de1743dfe534fe4f54c38217f893f0fcaef1dc97509198eec7446d352e92077644664d4bf48acbc2a7897f
-EBUILD bomns-0.99.2.ebuild 1048 BLAKE2B f995b3d1b74f5a0daad3adbb7302c7f251624ab18803c3ad5792f580cb0d53c1bea60f3ce68e465d6ae17575e2159856dd843a47a00275887a1f3cdd74b91c6d SHA512 f87b99997603d23848ac07c83e0aeb975490cf9be70f9d79586cc67f1ece3ef803685194ceca79d9a002fa3c81a8ca0db042239c2082bbfe57e0d69ad21c1f94
-MISC metadata.xml 425 BLAKE2B fced594d29b6f96ad3ec46d47640cf06d62bf20fdcc4849120c189d9dfc84dbc883756c38cb91f972d8d29184e1483393bf55f8c122702032e533d15b44690c9 SHA512 2fce22d02ab3c395d452d3a1312b3f01cc1791177749931b2d20fda56437f38229da616b0993deaf42561d563fdb953305de886e92fbff14a94a7cec19ae2b73
diff --git a/games-arcade/bomns/bomns-0.99.2.ebuild b/games-arcade/bomns/bomns-0.99.2.ebuild
deleted file mode 100644
index 98b2d87716e9..000000000000
--- a/games-arcade/bomns/bomns-0.99.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools flag-o-matic games
-
-DESCRIPTION="A fast-paced multiplayer deathmatch arcade game"
-HOMEPAGE="http://greenridge.sourceforge.net"
-SRC_URI="mirror://sourceforge/greenridge/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="gtk editor"
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	gtk? ( x11-libs/gtk+:2 )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	sed -i \
-		-e "/appicondir/s:\$(prefix):/usr:" \
-		-e "/desktopdir/s:\$(prefix):/usr:" \
-		$(find icons -name Makefile.am) \
-		Makefile.am || die
-	sed -i \
-		-e "s:\$*[({]prefix[})]/share:${GAMES_DATADIR}:" \
-		configure.in \
-		graphics/Makefile.am \
-		levels/Makefile.am \
-		sounds/Makefile.am || die
-	epatch "${FILESDIR}"/${P}-fpe.patch
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fforce-addr
-	egamesconf \
-		--disable-launcher1 \
-		$(use_enable gtk launcher2) \
-		$(use_enable editor)
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-arcade/bomns/files/bomns-0.99.2-fpe.patch b/games-arcade/bomns/files/bomns-0.99.2-fpe.patch
deleted file mode 100644
index 3a9e39c241af..000000000000
--- a/games-arcade/bomns/files/bomns-0.99.2-fpe.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/bomns.cpp.old	2015-01-03 18:44:59.947689613 +0100
-+++ src/bomns.cpp	2015-01-03 18:47:29.854777276 +0100
-@@ -432,7 +432,10 @@
-       if(g_bShowFps)
-       {
-         dwFpsTimer = SDL_GetTicks() - dwFpsTimer;
--        nFps = 1000l / dwFpsTimer;
-+	if (dwFpsTimer)
-+	  nFps = 1000l / dwFpsTimer;
-+	else
-+	  nFps = 1000l;
-       }
-       
-       
diff --git a/games-arcade/bomns/metadata.xml b/games-arcade/bomns/metadata.xml
deleted file mode 100644
index bbfb3927e5f4..000000000000
--- a/games-arcade/bomns/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="editor">enables building the level editor</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">greenridge</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-arcade/briquolo-0.5.7 b/games-arcade/briquolo-0.5.7
new file mode 100644
index 000000000000..98c41b7ec033
--- /dev/null
+++ b/games-arcade/briquolo-0.5.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/libpng:0 nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Breakout with 3D representation based on OpenGL
+EAPI=5
+HOMEPAGE=http://briquolo.free.fr/en/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/libpng:0 nls? ( virtual/libintl ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://briquolo.free.fr/download/briquolo-0.5.7.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fbd21c55a80c6c4fe4e05b7e95b590d7
diff --git a/games-arcade/briquolo/Manifest b/games-arcade/briquolo/Manifest
deleted file mode 100644
index e62eac1e331f..000000000000
--- a/games-arcade/briquolo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX briquolo-0.5.7-gcc43.patch 2954 BLAKE2B 40661c665dadefa60d7b08f0b7a2873beb291a4f4feafe3c3c3807d236ff8bbc743ad600843e19086d16e5eb40f23fe59ec3df14b28bb35c8a7bf7f134648ef4 SHA512 fdee3f69b425591969a351001722a8820d1b78b0107a358c6f60b6c40636a88f1ad657020ed80edd5403f804e3db7af181ba89235e08f660768e4b53f59f499a
-AUX briquolo-0.5.7-libpng14.patch 1058 BLAKE2B d34416489d59adbcbc2d406a6f5983056f1f7c36f2de506ddf881796c8717e471c4c043d9292604ed8f36b1a02642c281827d432e6b3723b2af1e5f374985760 SHA512 0d936eaf6bcb4de420ac45d2d0f41cee8b5b533e329946ddb656da689397e435ceec036ecba53abdec01a52964d56e23dce63d858c4caf77a7e997072ab4da13
-DIST briquolo-0.5.7.tar.bz2 2588084 BLAKE2B 4ec87a161df72f9cc0df592a5b18cdf7a42e9f66675b6eeec20f57f6be599942940eb341dc4927405a1402f1356f52bdd1bea2a6b72c5f36abf229c1ef42e5be SHA512 4ef78193c80ac3554b72149b8da9b5cfd5b8fd68932e5b52666d74642e94a7a3a596dbb6d2865cba526929dd6d9be89743847d5e77b6fbc687c32394bc3be3d2
-EBUILD briquolo-0.5.7.ebuild 1135 BLAKE2B a40a56a0540fe4d9dec44f629aa71851daf79b0d8101ebaa73c0461c8d650cfba48918045a9a8296c749af034065d8ea288c823cd8cbf71f717e17a96aedc94f SHA512 7cf0ea9fcf2b481e71af9973aa7d658771b4fcccb0dc314b545d9a7af4927cd1d3fd9155110b43e342ea67a3306d7c0957076417a231ee2ad6685e57b54c4165
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild b/games-arcade/briquolo/briquolo-0.5.7.ebuild
deleted file mode 100644
index 07776ecc7735..000000000000
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Breakout with 3D representation based on OpenGL"
-HOMEPAGE="http://briquolo.free.fr/en/index.html"
-SRC_URI="http://briquolo.free.fr/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/libpng:0
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libpng14.patch
-	# no thanks we'll take care of it.
-	sed -i \
-		-e '/^SUBDIRS/s/desktop//' \
-		Makefile.in || die
-	sed -i \
-		-e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
-		-e 's:=.*share/locale:=/usr/share/locale:' \
-		configure || die
-	sed -i \
-		-e 's:$(datadir)/locale:/usr/share/locale:' \
-		po/Makefile.in.in || die
-}
-
-src_configure() {
-	egamesconf $(use_enable nls)
-}
-
-src_install() {
-	default
-	doicon desktop/briquolo.svg
-	make_desktop_entry briquolo Briquolo
-	prepgamesdirs
-}
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch b/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
deleted file mode 100644
index 13e932a1c69e..000000000000
--- a/games-arcade/briquolo/files/briquolo-0.5.7-gcc43.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -ru src.orig/Constante.cpp src/Constante.cpp
---- src.orig/Constante.cpp	2008-03-22 05:40:33.000000000 -0400
-+++ src/Constante.cpp	2008-06-11 23:16:46.000000000 -0400
-@@ -27,6 +27,7 @@
- #define DATADIR_BRIQUOLO "./"
- #define PACKAGE "briquolo"
- #endif
-+#include <cstdlib>
- 
- #ifdef WIN32
- #define WIN32_LEAN_AND_MEAN
-diff -ru src.orig/MOGL/MOGL_EnsembleObjet.cpp src/MOGL/MOGL_EnsembleObjet.cpp
---- src.orig/MOGL/MOGL_EnsembleObjet.cpp	2008-03-24 09:12:36.000000000 -0400
-+++ src/MOGL/MOGL_EnsembleObjet.cpp	2008-06-11 23:17:11.000000000 -0400
-@@ -24,7 +24,8 @@
- #include "MOGL_Armature.h"
- #include "MOGL_Peau.h"
- //#include
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstring>
- 
- //#include <mmsystem.h>
- 
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.cpp src/MOGL/MOGL_GestionnaireObjet.cpp
---- src.orig/MOGL/MOGL_GestionnaireObjet.cpp	2008-03-24 08:56:13.000000000 -0400
-+++ src/MOGL/MOGL_GestionnaireObjet.cpp	2008-06-11 23:18:45.000000000 -0400
-@@ -21,6 +21,7 @@
-  *****************************************************************************/
- #include "../I18n.h"
- #include "MOGL_GestionnaireObjet.h"
-+#include <cstring>
- 
- bool MOGL_GestionnaireObjet::ChargerObjetASCTriangle(const char * p_NomFichier, const MOGL_GestionnaireTexture & p_GM,
-                                                      MOGL_Objet & p_Objet)
-diff -ru src.orig/MOGL/MOGL_GestionnaireObjet.h src/MOGL/MOGL_GestionnaireObjet.h
---- src.orig/MOGL/MOGL_GestionnaireObjet.h	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_GestionnaireObjet.h	2008-06-11 23:20:07.000000000 -0400
-@@ -24,7 +24,8 @@
- 
- #include <vector>
- #include <iostream>
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstring>
- 
- #include "MOGL_Triangle.h"
- #include "MOGL_Objet.h"
-diff -ru src.orig/MOGL/MOGL_Image.h src/MOGL/MOGL_Image.h
---- src.orig/MOGL/MOGL_Image.h	2006-03-07 15:53:11.000000000 -0500
-+++ src/MOGL/MOGL_Image.h	2008-06-11 23:20:51.000000000 -0400
-@@ -24,6 +24,7 @@
- 
- #include "MOGL_Structure.h"
- #include <string>
-+#include <cstring>
- 
- using namespace std;
- 
-diff -ru src.orig/MOGL/MOGL_Objet.cpp src/MOGL/MOGL_Objet.cpp
---- src.orig/MOGL/MOGL_Objet.cpp	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_Objet.cpp	2008-06-11 23:21:05.000000000 -0400
-@@ -20,6 +20,7 @@
-  *
-  *****************************************************************************/
- #include "MOGL_Objet.h"
-+#include <cstdlib>
- 
- //MOGL_Objet::MOGL_Objet(): MOGL_ObjetAbstrait(), MOGL_ElementArbre()
- MOGL_Objet::MOGL_Objet(): MOGL_Noeud(), _ModifieTriangle(true), _ModifieStrip(true),
-diff -ru src.orig/MOGL/MOGL_Peau.cpp src/MOGL/MOGL_Peau.cpp
---- src.orig/MOGL/MOGL_Peau.cpp	2006-03-07 15:31:24.000000000 -0500
-+++ src/MOGL/MOGL_Peau.cpp	2008-06-11 23:21:17.000000000 -0400
-@@ -20,6 +20,7 @@
-  *
-  *****************************************************************************/
- #include "MOGL_Peau.h"
-+#include <cstdlib>
- 
- MOGL_Peau::MOGL_Peau(): MOGL_Noeud(), _ModifieTriangle(true)
- {
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
deleted file mode 100644
index d325bac02578..000000000000
--- a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308667
-
---- src/MOGL/MOGL_Image.cpp
-+++ src/MOGL/MOGL_Image.cpp
-@@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char *
-   info_ptr = png_create_info_struct(png_ptr);
-   if (info_ptr == NULL)
-   {
--    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+    png_destroy_read_struct(&png_ptr, NULL, NULL);
-     return false;
-   }
- 
-@@ -191,7 +191,7 @@ bool MOGL_Image::ChargerPNG(const char *
-   if (setjmp(png_jmpbuf(png_ptr)))
-   {
-     // On lib�re la m�moire
--    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-     return false;
-   }
-         
-@@ -235,7 +235,7 @@ bool MOGL_Image::ChargerPNG(const char *
-   /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
-   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
-   {
--    png_set_gray_1_2_4_to_8(png_ptr);
-+    png_set_expand_gray_1_2_4_to_8(png_ptr);
-   }
-   
-   /* Expand paletted or RGB images with transparency to full alpha channels
diff --git a/games-arcade/briquolo/metadata.xml b/games-arcade/briquolo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/briquolo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/bub-n-bros-1.6.2 b/games-arcade/bub-n-bros-1.6.2
new file mode 100644
index 000000000000..58f75740e287
--- /dev/null
+++ b/games-arcade/bub-n-bros-1.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A multiplayer clone of the famous Bubble Bobble game
+EAPI=5
+HOMEPAGE=http://bub-n-bros.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=MIT Artistic-2
+RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-misc/games-envd
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/bub-n-bros/bubbros-1.6.2.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=127e7ecffdf2bc15359f0bbe185d36a3
diff --git a/games-arcade/bub-n-bros/Manifest b/games-arcade/bub-n-bros/Manifest
deleted file mode 100644
index b4fd9a384f67..000000000000
--- a/games-arcade/bub-n-bros/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bub-n-bros-1.6.2-home.patch 2035 BLAKE2B c88722cd81e358658c751efc05953db01c68f59868181f1f4984a496e93da5f54b963b5edfdd3adb509764ed54315797e881164355cf4c69beaf13b7759913e4 SHA512 77362d4b1daa02f59daa34bc31f6a68506a14eaa4633d04ee3f21f9c8244089e35568bff001a997659de07a4640af84d2ed14807242561e876634d7192f8ab34
-DIST bubbros-1.6.2.tar.gz 11568771 BLAKE2B f1add409c510b0f57817080e4e5bd0beec6c619c849e885c3a203be237f36cf00f34aa2d009d4be183e9d6d25c7fed18565178c9685a2c11fc0880eb242b6c85 SHA512 a05fca8e31655e4bade60cd085f29796d789b349f005c715bf0e37e51f0bacb9d8b9650f3b10470917ee25421d32443e01132816a2f508e359302aa2c6d18ddb
-EBUILD bub-n-bros-1.6.2.ebuild 1452 BLAKE2B 85525d5046ab8b4cdf57ae60e26c208a1a2cdff1bd6da550941f62896287344ec5aefbfd509a4a501ff451c2061bba14d0b2fca7163654c01688dab653a8d52d SHA512 4cab910ae29d57230b2cae223d5e9022a6e99dc89eafae6a7b14502d72828e3fae54c7e6ba9feef6449e1cf62c63a0180e4bdac091a89730cbc079f2b348cec8
-MISC metadata.xml 333 BLAKE2B 094c2346ec43b216c3d2a0ece7ee9a90b81a747f8265b725859dece1bace34c245b9685b696c41447b3e9d1a7377fc0c8391ee3108b6c58d194dadd1086030b3 SHA512 ff711e95f012d2e24741f74d91bcce9871303186b15daae6e254be786329b53d1b6acf3c4c403b85a1d83f22423f95b404cb20725042425d309d1fe06fd04edb
diff --git a/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild b/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild
deleted file mode 100644
index a930f12a9b08..000000000000
--- a/games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-MY_P=${P/-n-}
-DESCRIPTION="A multiplayer clone of the famous Bubble Bobble game"
-HOMEPAGE="http://bub-n-bros.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT Artistic-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-	epatch "${FILESDIR}"/${P}-home.patch
-	python_fix_shebang .
-}
-
-src_compile() {
-	# Compile the "statesaver" extension module to enable the Clock bonus
-	cd "${S}"/bubbob
-	${EPYTHON} setup.py build_ext -i || die
-
-	# Compile the extension module required for the X Window client
-	cd "${S}"/display
-	${EPYTHON} setup.py build_ext -i || die
-
-	# Build images
-	cd "${S}"/bubbob/images
-	${EPYTHON} buildcolors.py || die
-}
-
-src_install() {
-	local dir=$(games_get_libdir)/${PN}
-
-	exeinto "${dir}"
-	doexe *.py
-
-	insinto "${dir}"
-	doins -r bubbob common display java http2 metaserver
-
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}"/BubBob.py "${GAMES_BINDIR}"/bubnbros
-
-	python_optimize "${D}${dir}"
-
-	newicon http2/data/bob.png ${PN}.png
-	make_desktop_entry bubnbros Bub-n-Bros
-
-	prepgamesdirs
-}
diff --git a/games-arcade/bub-n-bros/files/bub-n-bros-1.6.2-home.patch b/games-arcade/bub-n-bros/files/bub-n-bros-1.6.2-home.patch
deleted file mode 100644
index 4d2cc317aba3..000000000000
--- a/games-arcade/bub-n-bros/files/bub-n-bros-1.6.2-home.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- bubbob/images.py	2007-09-08 17:03:41.000000000 +0200
-+++ bubbob/images.py	2007-09-08 17:57:45.000000000 +0200
-@@ -454,7 +454,6 @@
-     # check and maybe regenerate the colored image files
-     file = os.path.join('images', 'buildcolors.py')
-     g = {'__name__': '__auto__', '__file__': file}
--    execfile(file, g)
-     # replace the entries 'filename_%d.ppm' by a family of entries,
-     # one for each color
-     sprmap = {}
---- display/pclient.py	2007-09-08 17:03:41.000000000 +0200
-+++ display/pclient.py	2007-09-08 17:57:45.000000000 +0200
-@@ -162,8 +162,8 @@
-         if mode[-1].has_key('cfgfile'):
-             self.trackcfgfile = mode[-1]['cfgfile']
-         else:
--            self.trackcfgfile = os.path.join(DataChunk.SOURCEDIR,
--                                             'http2', 'config.txt')
-+            self.trackcfgfile = os.path.join(os.environ.get('HOME'),
-+                                             '.bubnbros')
-         self.udpsock = None
-         self.udpsock_low = None
-         self.udpsock2 = None
---- http2/httppages.py	2007-09-08 17:03:41.000000000 +0200
-+++ http2/httppages.py	2007-09-08 17:57:45.000000000 +0200
-@@ -38,7 +38,7 @@
- 
- 
- class PageServer:
--    CONFIGFILE = 'config.txt'
-+    CONFIGFILE = '.bubnbros'
-     localservers = None
- 
-     def __init__(self, Game):
-@@ -46,7 +46,7 @@
-         self.seed = hex(random.randrange(0x1000, 0x10000))
-         #self.unique_actions = {}
-         self.localhost = gamesrv.HOSTNAME
--        self.filename = os.path.join(LOCALDIR, self.CONFIGFILE)
-+        self.filename = os.path.join(os.environ.get('HOME'), self.CONFIGFILE)
-         data = self.loadoptionfile()
-         self.globaloptions = Options(data.get('*', {}))
-         self.localoptions  = Options(data.get(self.localhost, {}))
-@@ -333,7 +333,6 @@
-                             'buildcolors.py')
-         if os.path.exists(file):
-             g = {'__name__': '__auto__', '__file__': file}
--            execfile(file, g)
- 
-         if port:
-             address = '%s:%s' % (host, port)
diff --git a/games-arcade/bub-n-bros/metadata.xml b/games-arcade/bub-n-bros/metadata.xml
deleted file mode 100644
index 349a63e580ba..000000000000
--- a/games-arcade/bub-n-bros/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bub-n-bros</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/bumprace-1.5.3 b/games-arcade/bumprace-1.5.3
new file mode 100644
index 000000000000..02682325f153
--- /dev/null
+++ b/games-arcade/bumprace-1.5.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[mod] virtual/jpeg:0 sys-libs/zlib media-libs/sdl-image[gif,jpeg,png]
+DESCRIPTION=simple arcade racing game
+EAPI=5
+HOMEPAGE=http://www.linux-games.com/bumprace/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[mod] virtual/jpeg:0 sys-libs/zlib media-libs/sdl-image[gif,jpeg,png] games-misc/games-envd
+SLOT=0
+SRC_URI=http://user.cs.tu-berlin.de/~karlb/bumprace/bumprace-1.5.3.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_=032a36e4c64b7aa08e7ff4be5052da63
diff --git a/games-arcade/bumprace/Manifest b/games-arcade/bumprace/Manifest
deleted file mode 100644
index d5b2a5b8cef6..000000000000
--- a/games-arcade/bumprace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bumprace-1.5.3.tar.gz 906459 BLAKE2B d08d1760cfb01eb7426c012233152007ba196e1ae6774d0474d3b9dcfa45608d08d6f18b9ea5c337c6f7f78eb13e887d1e2a4b92e48792f5f481a7efb123fbc2 SHA512 35bc35e82f587dce9f096f68b74f4fe0c0020f7ee2f972f9c0a99473a2dfbd9e61412c030a93194165d9d5968f6b68a6d1656f8e77dd46352f00a53e47ad94c6
-EBUILD bumprace-1.5.3.ebuild 579 BLAKE2B 7a52e95aec1c81daa9a5c2d5f914303e0320c8b047886a441f40713cc0b859f353c86a8e1310536a9214a971a75d22182b5017535cb38c2ad53051c0603ddbbc SHA512 e4bb5036da6f2651af562fb54996662889232c85659a73addbce678a338b315c580da32723778d6eb56ee6c3943363cd26ec0e564f365523f3c925439cb0f7eb
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/bumprace/bumprace-1.5.3.ebuild b/games-arcade/bumprace/bumprace-1.5.3.ebuild
deleted file mode 100644
index cd28a4e023c1..000000000000
--- a/games-arcade/bumprace/bumprace-1.5.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="simple arcade racing game"
-HOMEPAGE="http://www.linux-games.com/bumprace/"
-SRC_URI="http://user.cs.tu-berlin.de/~karlb/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[mod]
-	virtual/jpeg:0
-	sys-libs/zlib
-	media-libs/sdl-image[gif,jpeg,png]"
-RDEPEND=${DEPEND}
-
-src_install() {
-	default
-	make_desktop_entry bumprace BumpRace
-	prepgamesdirs
-}
diff --git a/games-arcade/bumprace/metadata.xml b/games-arcade/bumprace/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/bumprace/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/burgerspace-1.9.2 b/games-arcade/burgerspace-1.9.2
new file mode 100644
index 000000000000..f12552dc5d62
--- /dev/null
+++ b/games-arcade/burgerspace-1.9.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Clone of the 1982 BurgerTime video game by Data East
+EAPI=5
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/burgerspace.html
+IUSE=network
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.6 games-misc/games-envd
+RESTRICT=test
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/burgerspace-1.9.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4e196da848234ddba3e4d5b0402f1823
diff --git a/games-arcade/burgerspace/Manifest b/games-arcade/burgerspace/Manifest
deleted file mode 100644
index 7538e75563cb..000000000000
--- a/games-arcade/burgerspace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST burgerspace-1.9.2.tar.gz 505314 BLAKE2B 8a6de753e41de791fdc3a2ceb106f193da3de6c04c80c19b9f84cb03f569982ae8f3fe2e5541c1c389e16085d51867733d4911f04266497420eafd170d085095 SHA512 b2af53d6fcf1d52164870147aa8a5b08941ecb62f3d9bbce5c2872885923057481c21bc34f1e19b8aeb8a76acadd9a11c11fa7b6304438610e8a23e043b7deee
-EBUILD burgerspace-1.9.2.ebuild 1085 BLAKE2B 8e84976eb6ac203a905c54f68400aebec155ba00fcc99678777a27684821cc9821161477de22fe4e7fd6fbf21af0f1b341c7042b2a12a5d9ee4eed20b5c75cf5 SHA512 8bf38338818089276d071e45477521f15b2945c21c4b6c8c628fd2033d4b60a3f2ee9d4f05fbfa2423b1bc8b14f67a01956b8eeb327c44ba076b31985760fe04
-MISC metadata.xml 335 BLAKE2B 5b9037f7c7ada3f92d51b965d65b0f47af853b60c4409d1e04522485eeb3a3783f58c4e6e5cb1dfb759d27d09254fae5593f0d12947ae3eb286d7867a6b7ca99 SHA512 78b9833542c259f024f8041b1e26710f42ab792919970e8d5e73c8da539c74e62bec318f5ee18d09b26baee3c17bc49f14f3e70a1032da46acd587c934407cd4
diff --git a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild b/games-arcade/burgerspace/burgerspace-1.9.2.ebuild
deleted file mode 100644
index 6eb8eafc4737..000000000000
--- a/games-arcade/burgerspace/burgerspace-1.9.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools games
-
-DESCRIPTION="Clone of the 1982 BurgerTime video game by Data East"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/burgerspace.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="network"
-RESTRICT="test"  # doesn't really test anything
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die
-	sed -i \
-		-e "/Categories/s:Application;::" \
-		-e "/Icon/s:\..*::" \
-		-e "/Terminal/s:0:false:" \
-		src/burgerspace.desktop.in \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with network)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	doman doc/${PN}.6
-	dodoc AUTHORS NEWS README THANKS
-	prepgamesdirs
-}
diff --git a/games-arcade/burgerspace/metadata.xml b/games-arcade/burgerspace/metadata.xml
deleted file mode 100644
index 0f35d2dd16cf..000000000000
--- a/games-arcade/burgerspace/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="network">Enable client-server support</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-arcade/cavezofphear-0.5.1 b/games-arcade/cavezofphear-0.5.1
new file mode 100644
index 000000000000..8ebb63edc1d1
--- /dev/null
+++ b/games-arcade/cavezofphear-0.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5:0 virtual/pkgconfig
+DESCRIPTION=A boulder dash / digger-like game for console using ncurses
+EAPI=5
+HOMEPAGE=http://www.x86.no/cavezofphear/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5:0 games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.x86.no/cavezofphear/phear-0.5.1.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=16a17e77921439c6cf74a264b426f098
diff --git a/games-arcade/cavezofphear/Manifest b/games-arcade/cavezofphear/Manifest
deleted file mode 100644
index 90dd5d2e3e56..000000000000
--- a/games-arcade/cavezofphear/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cavezofphear-0.5.1-gentoo.patch 876 BLAKE2B fe2ff1ff1b1698ecbe06492bd80b8104908def9b1d4810b2c6b569e55d71a420a70a2d731555cee3a42adb40fa76b2964e2ba57105a1b47c00f54ca48851b213 SHA512 ee3d37644d1b94b39db2274eac0eadd3a823736177da317a2476238dbebe1a8a5af466f01771249e59aed838c684c9fd59fe7868aac3f1e1b89a75863bc49af4
-DIST phear-0.5.1.tar.bz2 25750 BLAKE2B 0b2c4a6f51fadd48a1e01dd5ac2072984368b3314fd3df01d4ad8adfdc0d031d443ac5f950651d4fff4ff5019b61868532eff0ed3d31bd6b2ba0f97893391d6a SHA512 23326a63acc06e77a1dd3505345940f8ef31b671282e00f623b181fe1cdbdf1b7e4b37a6e91ea430348a02239ed1450736dc075ea3af3eee0e8acb115aa89f3b
-EBUILD cavezofphear-0.5.1.ebuild 786 BLAKE2B e65d12cc486465e7e2eb95e08e303ef32cde37826134d2a8c1023e214fa926bac81e757df3b57c618041283046548243ff5bc6b13d7768d8aa6153a8d15fd969 SHA512 0ac69f98da352351119afe16354aab827ab2b199dd6422e92cf0cd9993553e8ac37e10f793d56d66ea45cd82ef7b562ce87fd75b64b5e88ca60b72977dcbffc3
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild b/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
deleted file mode 100644
index d8b152e2fbfe..000000000000
--- a/games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A boulder dash / digger-like game for console using ncurses"
-HOMEPAGE="http://www.x86.no/cavezofphear/"
-SRC_URI="http://www.x86.no/${PN}/${P/cavezof}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/cavezof/}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e "s:get_data_dir(.):\"${GAMES_DATADIR}/${PN}/\":" \
-		src/{chk.c,main.c,gplot.c} \
-		|| die
-}
-
-src_install() {
-	dogamesbin src/phear
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data/*
-	dodoc ChangeLog README* TODO
-	prepgamesdirs
-}
diff --git a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch b/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
deleted file mode 100644
index fbf79af44519..000000000000
--- a/games-arcade/cavezofphear/files/cavezofphear-0.5.1-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ru phear-0.5.1.orig/Makefile phear-0.5.1/Makefile
---- phear-0.5.1.orig/Makefile	2007-02-27 06:21:55.000000000 -0500
-+++ phear-0.5.1/Makefile	2013-01-18 02:09:56.403224104 -0500
-@@ -2,7 +2,7 @@
- DESTDIR_DATA = /usr/local/share
- 
- make:
--	cd src && make
-+	$(MAKE) -C src phear
- clean:
- 	rm -f phear editor
- install:
-diff -ru phear-0.5.1.orig/src/Makefile phear-0.5.1/src/Makefile
---- phear-0.5.1.orig/src/Makefile	2011-12-12 07:26:03.000000000 -0500
-+++ phear-0.5.1/src/Makefile	2013-01-18 02:10:48.218423433 -0500
-@@ -2,10 +2,8 @@
- 
- DESTDIR = ..
- 
--CC = gcc
- INSTALL = install
--CFLAGS ?= -s -Wall -O2
--LDFLAGS += -lncurses
-+LDLIBS = `pkg-config ncurses --libs`
- 
- all: phear install clean
- 
-@@ -13,7 +11,7 @@
- 	$(CC) $(CFLAGS) -c $^ -o $@
- 
- phear: $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $^ ${LDFLAGS}
-+	$(CC) $(CFLAGS) -o $@ $^ ${LDFLAGS} $(LDLIBS)
- 
- install: install-game
- 
diff --git a/games-arcade/cavezofphear/metadata.xml b/games-arcade/cavezofphear/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/cavezofphear/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/cdogs-sdl-0.4-r1 b/games-arcade/cdogs-sdl-0.4-r1
new file mode 100644
index 000000000000..92f755869c6d
--- /dev/null
+++ b/games-arcade/cdogs-sdl-0.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
+DESCRIPTION=A port of the old DOS arcade game C-Dogs
+EAPI=5
+HOMEPAGE=http://lumaki.com/code/cdogs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
+SLOT=0
+SRC_URI=http://icculus.org/cdogs-sdl/files/src/cdogs-sdl-0.4.tar.bz2 http://icculus.org/cdogs-sdl/files/data/cdogs-data-2007-07-06.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ae9f617e33e30044fd81b6bde2e34280
diff --git a/games-arcade/cdogs-sdl/Manifest b/games-arcade/cdogs-sdl/Manifest
deleted file mode 100644
index 237864c149df..000000000000
--- a/games-arcade/cdogs-sdl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cdogs-sdl-0.4-64bit.patch 1047 BLAKE2B daf0cd53da4acfde31a1a26f5f2a676dafe1d4caa9d8ff7929a18c207f9b67406058bfa25a2d96fc2d72a87ff44c3b856bfbe1931b18031e8b0e7e8d3a2f2b29 SHA512 6a0c474d1bac65400cf1078a3b49cb2ea147fa460d6f361482a3a340bdedec9816976e235b57facabb7327be770796be8cf45b9a5a1891ecd44f1a090a4bcf54
-DIST cdogs-data-2007-07-06.tar.bz2 218810 BLAKE2B fb788ed11ef220b4f244a74be838536281a87a5c8055cb9674b4269f0a63cb07120b31af113fab63f820c1b293c97b310e91d3638bc41d5d3ef4a12472481aaa SHA512 9e645d64bcc0b99df9fb113f7103590eb8045ca9439700279c8ea55a6277d10fc38aff38bb1137887bc5697c505fe18e15d6c62eaf2790c065b1261fa7418a84
-DIST cdogs-sdl-0.4.tar.bz2 164804 BLAKE2B 91498d981b2318d4f1d68112fe8d574b447290f9cad7b232a56cd6d516ca2fd3983b01789c87914f81eaa6d1c593dac95fe88ec1cd2823e6769d9f5980c6c2d5 SHA512 69fbac533207e38c85cf0f71db47df50405a5ff220a6662f7e186d1f54c4181ee56e1ff8049a427acec7fcf0529b8df66db36a693978bb0aa04eb0594a8b5adc
-EBUILD cdogs-sdl-0.4-r1.ebuild 1261 BLAKE2B 0bdc892706823e514c7bfa9a6ad2113ef8505986960550eaba76d3997c2fc5a3943bffe93db1b825b5b4bf76be6e43608572d2729bf48ee093b578b70dd16d70 SHA512 e90e30c1079458c48bef0927e78e891356ef56ab4168931ac319ccb86f09d29604f4464a666cb21a3d52ce47c4a29e9457c901c004d96dd6a1a228e6a9a35053
-MISC metadata.xml 559 BLAKE2B e0c0e67efaa3883d573482c8ae9e0eefd8a2315c8e021b32fa7f92cb01518ba75212e8b25cdc9464fd6c98af855eb2f658003ec180355eab57d5c0bf17654e78 SHA512 c3a7ca1efeffa6465e89a8bd1c8460a6345406c52281190ae4d63cad3896f08cab7808732658bb26425850032888010f6c5abc6ce2833bd14c5ef80c25a1b29c
diff --git a/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild b/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild
deleted file mode 100644
index 04c64376691c..000000000000
--- a/games-arcade/cdogs-sdl/cdogs-sdl-0.4-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-CDOGS_DATA="cdogs-data-2007-07-06"
-DESCRIPTION="A port of the old DOS arcade game C-Dogs"
-HOMEPAGE="http://lumaki.com/code/cdogs"
-SRC_URI="http://icculus.org/cdogs-sdl/files/src/${P}.tar.bz2
-	http://icculus.org/cdogs-sdl/files/data/${CDOGS_DATA}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}/src
-
-src_unpack() {
-	unpack ${A}
-	mv ${CDOGS_DATA} ${P}/data || die
-}
-
-src_prepare() {
-	sed -i \
-		-e "/^CF_OPT/d" \
-		-e "/^CC/d" \
-		Makefile || die
-	sed -i -e "/\bopen(/s/)/, 0666)/" files.c || die
-	epatch "${FILESDIR}"/${P}-64bit.patch
-	append-cflags -std=gnu89 # build with gcc5 (bug #571112)
-}
-
-src_compile() {
-	emake I_AM_CONFIGURED=yes \
-		SYSTEM="\"linux\"" \
-		STRIP=true \
-		DATADIR="${GAMES_DATADIR}/${PN}" \
-		cdogs
-}
-
-src_install() {
-	dogamesbin cdogs
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../data/*
-	newicon ../data/cdogs_icon.png ${PN}.png
-	dodoc ../doc/{README,AUTHORS,ChangeLog,README_DATA,TODO,original_readme.txt}
-	make_desktop_entry "cdogs -fullscreen" C-Dogs
-	prepgamesdirs
-}
diff --git a/games-arcade/cdogs-sdl/files/cdogs-sdl-0.4-64bit.patch b/games-arcade/cdogs-sdl/files/cdogs-sdl-0.4-64bit.patch
deleted file mode 100644
index bcab13c0ebfd..000000000000
--- a/games-arcade/cdogs-sdl/files/cdogs-sdl-0.4-64bit.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/grafx.c
-+++ src/grafx.c
-@@ -216,12 +216,6 @@
- 	SDL_VideoQuit();		
- }
- 
--typedef struct _Pic {
--	short int w;
--	short int h;
--	char *data;
--} Pic;
--
- int ReadPics(const char *filename, void **pics, int maxPics,
- 	     color * palette)
- {
-@@ -241,12 +235,12 @@
- 			fread(&size, sizeof(size), 1, f);
- 			swap16(&size);
- 			if (size) {
--				Pic *p = sys_mem_alloc(size);
-+				unsigned char *p = sys_mem_alloc(size);
- 				
--				f_read16(f, &p->w, 2);
--				f_read16(f, &p->h, 2);
-+				f_read16(f, &p[0], 2); // w
-+				f_read16(f, &p[2], 2); // h
- 
--				f_read(f, &p->data, size - 4);
-+				f_read(f, &p[4], size - 4); // data
- 
- 				pics[i] = p;
- 
-@@ -278,11 +272,11 @@
- 			fread(&size, sizeof(size), 1, f);
- 			swap16(&size);
- 			if (size) {
--				Pic *p = sys_mem_alloc(size);
-+				unsigned char *p = sys_mem_alloc(size);
- 
--				f_read16(f, &p->w, 2);
--				f_read16(f, &p->h, 2);
--				f_read(f, &p->data, size - 4);
-+				f_read16(f, &p[0], 2); // w
-+				f_read16(f, &p[2], 2); // h
-+				f_read(f, &p[4], size - 4); // data
- 
- 				pics[i] = p;
- 
diff --git a/games-arcade/cdogs-sdl/metadata.xml b/games-arcade/cdogs-sdl/metadata.xml
deleted file mode 100644
index 8332a46990b6..000000000000
--- a/games-arcade/cdogs-sdl/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-C-Dogs is an arcade shoot-em-up which lets players work alone and
-cooperatively during missions or fight against each other in the "dogfight"
-deathmatch mode. The DOS version of C-Dogs came with severla built in missions
-and dogfight maps. This version does too.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/ceferino-0.97.8-r2 b/games-arcade/ceferino-0.97.8-r2
new file mode 100644
index 000000000000..1473a71b68d4
--- /dev/null
+++ b/games-arcade/ceferino-0.97.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Super-Pang clone (destroy bouncing balloons with your grapnel)
+EAPI=6
+HOMEPAGE=http://www.loosersjuegos.com.ar/juegos/ceferino
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libsdl-1.2[video] >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ceferino/ceferino_0.97.8+svn37.orig.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=d59ce4172f81a0bed1edd27cb3613ec6
diff --git a/games-arcade/ceferino/Manifest b/games-arcade/ceferino/Manifest
deleted file mode 100644
index 1f30ebe0fb64..000000000000
--- a/games-arcade/ceferino/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ceferino_0.97.8+svn37.orig.tar.gz 2104956 BLAKE2B b3cb68d37e383223def569a333950511e4506b1bea1337189dda36e4c04fd6261c45d532bb2ad3691e73989e8ce5544f7d5e750d035081441f8241401d62217b SHA512 83bccb39f0ecd9f41767c4d94cebb3266c77f11eb22d6cf517f6488af384bad88bdd538b5746e0a3c6e1a57481a4c946ec03afb97a000cd21664d3f179e1a9b6
-EBUILD ceferino-0.97.8-r2.ebuild 1170 BLAKE2B e39d6e3ec277c2f9ae1af4e3e770d43b980e8c34af8a3640a5606c7f20d7ef44b0334b5b1ed149821037199bdb7cd2597b74272e5a7b27486b896f2a7f842659 SHA512 3cbfe58c7ee27c3cd10a0bc3b8fb21a282eaa5bd42c8a6f4e3a66754408c08953fafda36d513d272762f4faa80377d884671e6ba0e2339d4071d85fd2eacd7ff
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild b/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
deleted file mode 100644
index 736477bbe141..000000000000
--- a/games-arcade/ceferino/ceferino-0.97.8-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Super-Pang clone (destroy bouncing balloons with your grapnel)"
-HOMEPAGE="http://www.loosersjuegos.com.ar/juegos/ceferino"
-SRC_URI="mirror://debian/pool/main/c/ceferino/${PN}_${PV}+svn37.orig.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[video]
-	>=media-libs/sdl-image-1.2
-	>=media-libs/sdl-mixer-1.2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${P}+svn37"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-latin1.patch
-	sed -i \
-		-e '/^INCLUDES/s:\$(datadir)/locale:/usr/share/locale:' \
-		src/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon data/ima/icono.png ${PN}.png
-	make_desktop_entry ceferino "Don Ceferino Hazaña"
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/ceferino/metadata.xml b/games-arcade/ceferino/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/ceferino/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/circuslinux-1.0.3-r1 b/games-arcade/circuslinux-1.0.3-r1
new file mode 100644
index 000000000000..3ef76fe43cc2
--- /dev/null
+++ b/games-arcade/circuslinux-1.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+DESCRIPTION=clone of the Atari 2600 game "Circus Atari"
+EAPI=6
+HOMEPAGE=http://www.newbreedsoftware.com/circus-linux/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/circuslinux-1.0.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=12bd2147479b280a9c24883e81f135b2
diff --git a/games-arcade/circuslinux/Manifest b/games-arcade/circuslinux/Manifest
deleted file mode 100644
index 89267782775d..000000000000
--- a/games-arcade/circuslinux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST circuslinux-1.0.3.tar.gz 1253839 BLAKE2B 1f0b57e417144b88688b2f900efebd95d35d7656a16a1b074197e0bd1fb33de3434582ac66e3bf996e7f1fbaafaefadc5091967696eecfcbbdf4a1c2316e0d17 SHA512 292bcaad39342ad69862f1add36b11505ca5f2601637a8db6fad438c5a4b32d7801bc7e6c08b903b0fb8bf68dcb3ec8d968fb913cde65941b9b9ac64b5a5266f
-EBUILD circuslinux-1.0.3-r1.ebuild 779 BLAKE2B a0fb16d476f708bdac79382cceced694b8fdc03abbb8417985d04523d1443c325640d89502709cd22bedb58f8ce6017495c4cb54b29516638d9d34ec812e9f0d SHA512 8b87bf86f8819e5965ba73716063dc435fdb69330c2b891132ab599e8fafaae6c0833fb5085680a8915db3b8d86566e87b96c5bf371e507df29c26149f18c5b1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild b/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
deleted file mode 100644
index bc3c43f34833..000000000000
--- a/games-arcade/circuslinux/circuslinux-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="clone of the Atari 2600 game \"Circus Atari\""
-SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/circus-linux/${P}.tar.gz"
-HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^install-data-am/d" \
-		Makefile.in \
-		|| die
-	sed -i \
-		-e 's/\$(pkgdatadir)/$(DESTDIR)&/' \
-		data/Makefile.in \
-		|| die
-}
-
-src_install () {
-	default
-	newicon data/images/${PN}-icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Circus Linux!"
-}
diff --git a/games-arcade/circuslinux/metadata.xml b/games-arcade/circuslinux/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/circuslinux/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/cob-0.9-r1 b/games-arcade/cob-0.9-r1
new file mode 100644
index 000000000000..111bdade6476
--- /dev/null
+++ b/games-arcade/cob-0.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[joystick,sound,video]
+DESCRIPTION=Cruising on Broadway: a painting-type game
+EAPI=6
+HOMEPAGE=http://www.autismuk.freeserve.co.uk/
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video]
+SLOT=0
+SRC_URI=http://www.autismuk.freeserve.co.uk/cob-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=727ed4585e15cd0f86f580fc9ae34047
diff --git a/games-arcade/cob/Manifest b/games-arcade/cob/Manifest
deleted file mode 100644
index cddbae98481e..000000000000
--- a/games-arcade/cob/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX cob-0.9-gcc43.patch 618 BLAKE2B 211bc0f4221b05ed761b8d214ebb11e6cf4262d89ba01beba75a10297d70547ea0d66c6c85d313fdc0826706bd8270e5741ae5e44ad5e97b4a078e25163eac32 SHA512 15cdb6cfacdd49e37fd41e337f425e9f3f020f9d019ea8d1fb860d14b0cebb04dab558c0bb1aa923d0d58fac56c6d579398b0ca7c18e70989c3efd924452d7e5
-AUX cob-0.9-gcc44.patch 1147 BLAKE2B 01a069e45b39b2d4bdd3d066ff295a2e99d2d782c5e924ab2aa5a4614e9b9482acf52735a0f48e6d7d312d101ba3652987fad9fa675897d1b49054fec85d0ffa SHA512 169559f882eba5f34558f845c44c09ba6821db689ae5a73dc6e8cd14ae12d4299fbad3e67b4c828fa3de435c20e948fb8c0266e3267b52b5bb87302047d4034d
-DIST cob-0.9.tar.gz 712618 BLAKE2B f73bec711f4e2c7907cf987fdd12207556752e05f5cf98f9818ef470c2bc2fa95f03c8c4a2f6c114b87d5c00cf3b17da3a1d127869b7ee548d5bd0d05d4c4114 SHA512 1a329bb06a25137c1dc9d65cff949ed1b0ca7445ecf897375be71581c35f0bc563008fc7607d650a660a405f2282b0329148487bd29b6a053478b61d932bdf4d
-EBUILD cob-0.9-r1.ebuild 593 BLAKE2B 25c5e8a97fe40c204f0208405433b184de2bcd62c09c89a0542580a7d44cfb5533068c3e51bcd948d9c8633271098dadbf31cfe7320b697c09b70ae07ab8c413 SHA512 351d45bcee92b810c7196d7844470d06699c1ac089eed506308aff172d202964633fc16d67e41a47f275f5d2d9bacf4668a5f8bd1d9613e48d9862566f3a58cd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/cob/cob-0.9-r1.ebuild b/games-arcade/cob/cob-0.9-r1.ebuild
deleted file mode 100644
index 26d73169d352..000000000000
--- a/games-arcade/cob/cob-0.9-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Cruising on Broadway: a painting-type game"
-HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[joystick,sound,video]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-)
-
-src_install() {
-	default
-	make_desktop_entry ${PN} "Cruising on Broadway"
-}
diff --git a/games-arcade/cob/files/cob-0.9-gcc43.patch b/games-arcade/cob/files/cob-0.9-gcc43.patch
deleted file mode 100644
index bc7e6fb3e02c..000000000000
--- a/games-arcade/cob/files/cob-0.9-gcc43.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/cob/menu.cpp
-+++ b/cob/menu.cpp
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- 
- #include "cob.hxx"
-+#include <cstring>
- 
- //	**************************************************************************************************************************
- //
---- a/cob/sdw.hxx
-+++ b/cob/sdw.hxx
-@@ -19,6 +19,7 @@
- 

- #include <iostream>

- #include <string>

-+#include <cstdlib>

- 

- namespace SDLWrapper                            // It's all nicely in a namespace SDLWrapper

- {

-@@ -192,4 +193,4 @@
-         AudioNoise(int l) : AudioBeep(0,l) { }

- };

- 

--};

-+}

diff --git a/games-arcade/cob/files/cob-0.9-gcc44.patch b/games-arcade/cob/files/cob-0.9-gcc44.patch
deleted file mode 100644
index 02b4842617f2..000000000000
--- a/games-arcade/cob/files/cob-0.9-gcc44.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/cob/game.cpp
-+++ b/cob/game.cpp
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstdio>
- #include "cob.hxx"
- 
- //	**************************************************************************************************************************
---- a/cob/main.cpp
-+++ b/cob/main.cpp
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstdio>
- #include "cob.hxx"
- 
- //	**************************************************************************************************************************
---- a/cob/map.cpp
-+++ b/cob/map.cpp
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstdio>
- #include "cob.hxx"
- 
- //	**************************************************************************************************************************
diff --git a/games-arcade/cob/metadata.xml b/games-arcade/cob/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/cob/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/commandergenius-1.8.3 b/games-arcade/commandergenius-1.8.3
new file mode 100644
index 000000000000..9abddd9ae14e
--- /dev/null
+++ b/games-arcade/commandergenius-1.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Open Source Commander Keen clone (needs original game files)
+EAPI=5
+HOMEPAGE=http://clonekeenplus.sourceforge.net
+IUSE=opengl tremor
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) games-misc/games-envd
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/gerstrong/Commander-Genius/archive/v183release.tar.gz -> commandergenius-1.8.3.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=23f052c8f78301470e9d8b09cbd31950
diff --git a/games-arcade/commandergenius/Manifest b/games-arcade/commandergenius/Manifest
deleted file mode 100644
index 81acbd597a87..000000000000
--- a/games-arcade/commandergenius/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX commandergenius-wrapper 450 BLAKE2B 6baf65533f64f398628bdd33f3e9a5f36225b0817a8a9fee61719fb63fcb7f9d2445a7187def831c68422626eac78899721dbf9c93da0d76971ffa3622f66cf6 SHA512 7c3eb80389dfcae1345cbf7dae614c392dfa4ad3c6cbe02b850055df6d43f4e5531bc8fab8703804ce78ae882ed6322c9e4adf0c0f516235e1af17a8c29d7f1f
-DIST commandergenius-1.8.3.tar.gz 71446309 BLAKE2B 01f54e3deb4189e103d9ae23efadfe82363893b48e31d4b5b505f961191b5afe36440b67f0da55d59b6fceeadb15659503d3326975cb131f131b9a630ac35ae8 SHA512 821a356751629b7f3b122f52a31588f2174580fa6450699f8a03bcd78e305c649c7b36bb21dd2d222411c648b78c3bb02c11e9691e8cb2459380e6a70c2dbe2a
-EBUILD commandergenius-1.8.3.ebuild 2157 BLAKE2B 113e8381fd4d1099ee692a888bc1fd1027cdff5fe812d3bd23a56e431069e069f25727b63aeaf80ce447851aa428086eddd611860ec7711d1491af972d82e07f SHA512 7171cd0d82c83ad3d9409d89482aa5416f2d2034bd378f7e38537ce390999ec899457f312c9d2b0d013811c3573526001079173c78d3666615bc6a9c3cd9bef2
-MISC metadata.xml 547 BLAKE2B f23ffc9a4f2fad2c93dd1009c01cf85b458137a847e8e80b61b7831fd35d27f5edb4d4f69663ac6123ea7303dd675fd08910c85f4acf3f6b648a219d67198c1b SHA512 cd0eba4defa145cacddef5596483c9665a5f1c7dd940dc98ad7b7dec578d6b149f53d6540a0c7610b1976bee91cd2f33eb03b12a466cec15aef8d092f9eb82ba
diff --git a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild b/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
deleted file mode 100644
index 435c937ccf64..000000000000
--- a/games-arcade/commandergenius/commandergenius-1.8.3.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils eutils games
-
-MY_P=CGenius-${PV}-Release-Source
-DESCRIPTION="Open Source Commander Keen clone (needs original game files)"
-HOMEPAGE="http://clonekeenplus.sourceforge.net"
-SRC_URI="https://github.com/gerstrong/Commander-Genius/archive/v${PV//./}release.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl tremor"
-RESTRICT="mirror" # contains keen files, but we do not install them
-
-RDEPEND="media-libs/libsdl2[X,opengl?,sound,video]
-	media-libs/sdl2-image
-	opengl? ( virtual/opengl )
-	tremor? ( media-libs/tremor )
-	!tremor? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-
-S=${WORKDIR}/Commander-Genius-${PV//./}release
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	rm -rf vfsroot || die
-	sed -i -e '/INCLUDE(package.cmake)/d' CMakeLists.txt || die
-	cp version.h src/ || die # Workaround buggy neard package - bug #558160
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAPPDIR="${GAMES_BINDIR}"
-		-DSHAREDIR="/usr/share"
-		-DGAMES_SHAREDIR="${GAMES_DATADIR}"
-		-DDOCDIR="/usr/share/doc/${PF}"
-		-DBUILD_TARGET="LINUX"
-		$(cmake-utils_use opengl OPENGL)
-		$(cmake-utils_use tremor TREMOR)
-		$(cmake-utils_use !tremor OGG)
-		-DUSE_SDL2=1
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon src/CGLogo.png ${PN}.png
-	newgamesbin "${FILESDIR}"/commandergenius-wrapper commandergenius
-	if [[ -e "${ED}${GAMES_BINDIR}"/CGeniusExe ]] ; then
-		mv "${ED}${GAMES_BINDIR}"/CGeniusExe \
-			"${ED}${GAMES_BINDIR}"/CommanderGenius || die
-	fi
-
-	make_desktop_entry commandergenius
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Check your settings in ~/.CommanderGenius/cgenius.cfg"
-	elog "after you have started the game for the first time."
-	use opengl && elog "You may also want to set \"OpenGL = true\""
-	elog
-	elog "Run the game via:"
-	elog "    'commandergenius [path-to-keen-data]'"
-	elog "or add your keen data dir to the search paths in cgenius.cfg"
-}
diff --git a/games-arcade/commandergenius/files/commandergenius-wrapper b/games-arcade/commandergenius/files/commandergenius-wrapper
deleted file mode 100644
index 0fa5243a5df0..000000000000
--- a/games-arcade/commandergenius/files/commandergenius-wrapper
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# CommanderGenius by default searches pwd for keen data which can cause
-# massive load/lag depending on which dir you are currently in.
-# This wrapper cd's into ~/.CommanderGenius unless you pass a directory
-# on the command line which is used as additional search path then.
-#
-# use: commandergenius [path-to-keen-dir]
-
-if [ -z $1 ] ; then
-	SEARCHDIR=~/.CommanderGenius
-else
-	SEARCHDIR="$1"
-fi
-
-cd ${SEARCHDIR}
-
-exec CommanderGenius "$@"
diff --git a/games-arcade/commandergenius/metadata.xml b/games-arcade/commandergenius/metadata.xml
deleted file mode 100644
index 1f862355f14e..000000000000
--- a/games-arcade/commandergenius/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="tremor">
-			Use <pkg>media-libs/tremor</pkg> as ogg decoder
-			instead of <pkg>media-libs/libvorbis</pkg>
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">clonekeenplus</remote-id>
-		<remote-id type="github">gerstrong/Commander-Genius</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/conveysdl-1.3-r1 b/games-arcade/conveysdl-1.3-r1
new file mode 100644
index 000000000000..7ff87973966a
--- /dev/null
+++ b/games-arcade/conveysdl-1.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+DESCRIPTION=Guide the blob along the conveyer belt collecting the red blobs
+EAPI=6
+HOMEPAGE=http://www.cloudsprinter.com/software/conveysdl/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://www.cloudsprinter.com/software/conveysdl/conveysdl.1.3.tar
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=5e473b952280b7732a958ee87b834947
diff --git a/games-arcade/conveysdl/Manifest b/games-arcade/conveysdl/Manifest
deleted file mode 100644
index 457772c0e250..000000000000
--- a/games-arcade/conveysdl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX conveysdl-1.3-arrays.patch 997 BLAKE2B 6a243b48ee809c86a02a6c49117a0e86a1b0dbce80cb9c761e693b66a576536b92ffb1c61e0bb3676d2b6850f1b8985d52d0c0d67de4bf9e6aaf186fed2e1bac SHA512 c4d52d0da7bedb4941d7438203e7c1d25d72960ab739e1a4c359628424a95f95001340b74b7926ae22c7c837f2f7a241891381f16c3a15f75e51ad908cc6b56e
-AUX conveysdl-1.3-speed.patch 1410 BLAKE2B 2e0716f1a40e2a42cd9e30e3154f3b79dd4691e97a530761d8f4b6d3f1069382c5e430b56df5f60928f1c249257652c8c4b5800ba08a5d6881bd9d8267dfd378 SHA512 8766d4c522b58f9def8d7f1a9b928287643068daf6594fde91ba1fe9aa6363eea36958d98ca3aa40eead761eda7a253209cf74143b4a6333f2e0ed9bdc116fbf
-DIST conveysdl.1.3.tar 429568 BLAKE2B 950952ad311bb51855bbd1cf3bf25b750d067db1cef8333f44ac3a96f30033f700efb9771d3050be6a3acc63c79b49fa8d64a1a11a088a777a13f21fb82a4c81 SHA512 fe6f91cdd63ae1019cb99613618e44ceeddb4080ad5e50bd8ce0abf27e057617d3658a29b2faf668cbc3b0887f1a4a05cadadb060f69d850c3d85c9e7190dd8a
-EBUILD conveysdl-1.3-r1.ebuild 1193 BLAKE2B 38abb28c4be7f04bb8274b67f7f11fca9c6cd3ebd21d7f3fae58bbca584e6c340c03cbc19610a74b20a62a74a7dc75201a941c0fad30ad1d4af39b3b87439b21 SHA512 d4cbf98bb28f849369a83e4a6bec021d5c9ab1b01b19d51a2c35b88b178226e237671461097941769219d58a34cecea23c44e576e8f03db98eb86d9dd4a97731
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild b/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
deleted file mode 100644
index 5c39dd327ee7..000000000000
--- a/games-arcade/conveysdl/conveysdl-1.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Guide the blob along the conveyer belt collecting the red blobs"
-HOMEPAGE="http://www.cloudsprinter.com/software/conveysdl/"
-SRC_URI="http://www.cloudsprinter.com/software/conveysdl/${P/-/.}.tar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	# Incomplete readme
-	sed -i \
-		-e 's:I k:use -nosound to disable sound\n\nI k:' \
-		readme || die
-
-	sed -i \
-		-e 's:SDL_Mi:SDL_mi:' \
-		main.c || die
-
-	eapply \
-		"${FILESDIR}"/${P}-arrays.patch \
-		"${FILESDIR}"/${P}-speed.patch
-}
-
-src_compile() {
-	emake main \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} $(sdl-config --cflags) \
-			-DDATA_PREFIX=\\\"/usr/share/${PN}/\\\" \
-			-DENABLE_SOUND" \
-		LDLIBS="-lSDL_mixer $(sdl-config --libs)"
-}
-
-src_install() {
-	newbin main ${PN}
-	insinto /usr/share/${PN}
-	doins -r gfx sounds levels
-	newicon gfx/jblob.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Convey /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
deleted file mode 100644
index a6286d96f145..000000000000
--- a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/main.c.org	2010-07-28 13:16:20.552161148 +0300
-+++ b/main.c	2010-07-29 20:43:14.714543259 +0300
-@@ -22,7 +22,7 @@
- 
- SDL_Surface *bletters;
- SDL_Surface *letters[100];
--SDL_Surface *tiles[9];
-+SDL_Surface *tiles[10];
- SDL_Surface *btiles;
- SDL_Surface *blob;
- SDL_Surface *jblob;
-@@ -51,7 +51,7 @@
- FILE *file_ptr;
- 
- 
--int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
-+int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
- /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -452,7 +452,7 @@
- static void info(void)
- {
-   int monkey=70,munk;
--  char scoremonkey[10];
-+  char scoremonkey[16];
-   if (lives>1) {
-     for (munk=1 ; munk<lives ; munk++ )
-     {
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
deleted file mode 100644
index 6d6d13eb11be..000000000000
--- a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/main.c	2010-07-30 10:41:21.392783010 +0300
-+++ b/main.c	2010-07-30 10:44:35.791690958 +0300
-@@ -52,6 +52,7 @@
- 
- 
- int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
-+int realspeed;
- /* Keys */
- int quit = 0;
- int spacebar = 0;
-@@ -140,6 +141,7 @@
-   char path[256],jib[50];
-   int lvspx,lvspy;
-   bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4;
-+  realspeed=speed;
-   strcpy(path, DATA_PREFIX);
-   sprintf(jib,"levels/level%d",level);
-   strcat(path, jib);
-@@ -212,15 +214,16 @@
-     if (jumpf==jumpoo) { jump=0; }
-     if (jumpf==jumpoo*2) { jumpf=0; }
-   }
--  score+=speed;
-+  score+=realspeed;
-   /*crap*/
- }
- 
- static void plotfloor(void)
- {
-+  if (bpointy==400) realspeed=speed;
-   int nob,nx,nobx=48,ek,ej,el;
--  bpointx-=speed*2;
--  bpointy+=speed;
-+  bpointx-=realspeed*2;
-+  bpointy+=realspeed;
-   pointx=bpointx;
-   pointy=bpointy;
-   imageplot(bb, blobx[6], bloby[6] );
-@@ -542,7 +545,7 @@
-   }
-   while ( jump_down==0 );
-   leveldone=3;
--  speed=4;
-+  speed=4; realspeed=speed;
-    blankscreen();
- }
- 
-@@ -563,7 +566,7 @@
-    if (quit>0) break;
-   }
-   while ( jump_down==0 );
--  speed=4;
-+  speed=4; realspeed=speed;
-   lives+=1;
-   level+=1;
-   getlevel();
diff --git a/games-arcade/conveysdl/metadata.xml b/games-arcade/conveysdl/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/conveysdl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/cosmosmash-1.4.7-r1 b/games-arcade/cosmosmash-1.4.7-r1
new file mode 100644
index 000000000000..aa3ada86b61e
--- /dev/null
+++ b/games-arcade/cosmosmash-1.4.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-games/flatzebra-0.1.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A space rock shooting video game
+EAPI=6
+HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/flatzebra-0.1.6
+RESTRICT=test
+SLOT=0
+SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0786de6c086d9ed4a15bf627e74b5bc1
diff --git a/games-arcade/cosmosmash/Manifest b/games-arcade/cosmosmash/Manifest
deleted file mode 100644
index a6c271ccbe14..000000000000
--- a/games-arcade/cosmosmash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cosmosmash-1.4.7.tar.gz 906213 BLAKE2B 58117881e8f705d85c40cf5d0c56a734b80ebf7a84909c98a085aa5d880247c72af8a84d54fe11a4f02c8af226005c561802d93e7a747ff4a836feefde1cafde SHA512 1eaf8b05550c6f96e6392f6ba4565700cd4a9cac66dd57d634569caf9b4dfaf4917b3b9973153d4e6e0ddcd65c68d5242faae7c4f516c07c2e07d1b2f3b838b9
-EBUILD cosmosmash-1.4.7-r1.ebuild 850 BLAKE2B fc96196f483153e9b375f4d86da63b7bbbd27077323fa653c57ab5aa6d792472b21cb0720d853b8f65cadffd59cc1bc10ee36b9b7e73ed14660dadf6e1ba5b38 SHA512 762fb1ac7353ba31a658f0749f4c0e8721ee0ca940cddab811ea121891c04686e351355acb53d94fba712e8bcc2133b49a055f126d738a17d1cde908962ac869
-MISC metadata.xml 383 BLAKE2B 40ab8c4f0c3bbc162a20b7db8130b1d3d3a22dd8b0a828403000c58c1eb5c977ef6b93077f2f887828b6ca6809feefdf234605ca9c71170e13590e6e6f390410 SHA512 6ac1eca021c30af55b915f3d34d180ad429f9f16e7e942b3853d8f77f0ba82fa8bf97439209414e7541b0c0bfba29b49b1efc143e690ae7f8dbffd1fcaae9986
diff --git a/games-arcade/cosmosmash/cosmosmash-1.4.7-r1.ebuild b/games-arcade/cosmosmash/cosmosmash-1.4.7-r1.ebuild
deleted file mode 100644
index b8b44c33ea54..000000000000
--- a/games-arcade/cosmosmash/cosmosmash-1.4.7-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A space rock shooting video game"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/cosmosmash.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test" # uses the sound card which portage user might not be available.
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am \
-		|| die
-	eautoreconf
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	einstalldocs
-	doman doc/${PN}.6
-}
diff --git a/games-arcade/cosmosmash/metadata.xml b/games-arcade/cosmosmash/metadata.xml
deleted file mode 100644
index 418dc79f8c64..000000000000
--- a/games-arcade/cosmosmash/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Afternoon Stalker, a clone of the 1981 Night Stalker video game by Mattel
-Electronics.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/crack-attack-1.1.14-r2 b/games-arcade/crack-attack-1.1.14-r2
new file mode 100644
index 000000000000..264f88af477d
--- /dev/null
+++ b/games-arcade/crack-attack-1.1.14-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/freeglut sdl? ( media-libs/libsdl media-libs/sdl-mixer ) gtk? ( >=x11-libs/gtk+-2.6:2 ) virtual/pkgconfig
+DESCRIPTION=Addictive OpenGL-based block game
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/crack-attack/
+IUSE=gtk sdl
+KEYWORDS=~amd64 ~arm ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut sdl? ( media-libs/libsdl media-libs/sdl-mixer ) gtk? ( >=x11-libs/gtk+-2.6:2 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/crack-attack/crack-attack-1.1.14.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=1d3cdd51c63d4fb0eea0fa7ab552d661
diff --git a/games-arcade/crack-attack/Manifest b/games-arcade/crack-attack/Manifest
deleted file mode 100644
index d10de329e972..000000000000
--- a/games-arcade/crack-attack/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX crack-attack-1.1.14-gcc43.patch 176 BLAKE2B 31ae3d2ada1212633ded026c9fbbdd517e7a7cc9742ad24036698c474a4b173cb7521857f6a41b7fe72cfff78f5db89236cc7ef3920658c7b3dc43a60cee793a SHA512 e9e5cc3c93bb00ad8e8b7d6bafd2035c13673fc27217fa6ba3d66ad285bd4d9f6048fbb933723d91e4c60495175fd065acc6663bcce0b2fb606f23f4ecbf4fb3
-AUX crack-attack-1.1.14-glut.patch 385 BLAKE2B 1f1b3830199c3488e71a6055b9db1092b1a730e194ed8f68974e6b8f867a8399b5d3f5b49011839a3e07a9265bca7e5e0f3d33ea634ffcb92fa68aa80dc4a3aa SHA512 d39bbd78172d9454a3f2244dff21e9f538c2235e86a3d8a53e855d0eb4f70403ff75b7fcaf774ad2054f77e9002786a802d1e3cfcc8d8dbb3ba082379e037949
-DIST crack-attack-1.1.14.tar.bz2 801404 BLAKE2B 78c6fa9ee16ddb341aa1f11d1964c7036c85d0b1f0145c6fe57d585eb4c237fdb33d351f0d5510eabaf7666a63e74f8afbe0f09952ec1d4c5713a87a89963b82 SHA512 1afc1a59e25359a82cabc33a1f999e1166dcf74c031c29a366f8414989bc7c32b9a40e467ee40a37901f2bd08f4569fed25c4d3021b1a75254614840410a7bfa
-EBUILD crack-attack-1.1.14-r2.ebuild 946 BLAKE2B 2c67cf472dcfc489c32412e9685423ed355256654ebb3e1ffd96814efcec916eafdb2dfeae8931dfb2b1900bb2ea31c5041ddfe208d1007f5f405a7c43081228 SHA512 a39048eef58fb35ec783eb6836a7198e6550f191986ba25544f34c9138ba9971121a7b3324f61f888ce6f8cb7a21b3b3af732993c56317bd4bdaf77177765847
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
deleted file mode 100644
index eded2a71ead8..000000000000
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Addictive OpenGL-based block game"
-HOMEPAGE="http://www.nongnu.org/crack-attack/"
-SRC_URI="https://savannah.nongnu.org/download/crack-attack/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
-IUSE="gtk sdl"
-
-RDEPEND="
-	media-libs/freeglut
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-mixer )
-	gtk? ( >=x11-libs/gtk+-2.6:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-glut.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-	sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
-	touch -r . * */*
-}
-
-src_configure() {
-	econf \
-		--disable-binreloc \
-		$(use_enable sdl sound) \
-		$(use_enable gtk)
-}
-
-src_install() {
-	HTML_DOCS="doc/*"
-	default
-	doicon data/crack-attack.xpm
-	make_desktop_entry crack-attack Crack-attack
-}
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
deleted file mode 100644
index 8cabe7eb2574..000000000000
--- a/games-arcade/crack-attack/files/crack-attack-1.1.14-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/Game.h
-+++ b/src/Game.h
-@@ -34,6 +34,7 @@
- #include <climits>
- #include <cstdlib>
- #include <cmath>
-+#include <cstring>
- 
- #ifdef __MINGW32__
- #  include <windows.h>
diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
deleted file mode 100644
index 430d4e742f31..000000000000
--- a/games-arcade/crack-attack/files/crack-attack-1.1.14-glut.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix from upstream to work with newer freegluts.
-
-http://bugs.gentoo.org/97954
-
---- a/src/Attack.cxx
-+++ b/src/Attack.cxx
-@@ -83,6 +83,7 @@
-   int height = -1, width = -1;
-   
-   player_name[0] = '\0';
-+  glutInit(&argc, argv);
-   parseCommandLine(argc, argv, mode, port, host_name, player_name, height, width);
-   run_crack_attack(mode, port, host_name, player_name, height, width);
- 
diff --git a/games-arcade/crack-attack/metadata.xml b/games-arcade/crack-attack/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/crack-attack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/criticalmass-1.0.2-r1 b/games-arcade/criticalmass-1.0.2-r1
new file mode 100644
index 000000000000..51a2183bb8a2
--- /dev/null
+++ b/games-arcade/criticalmass-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0= virtual/opengl net-misc/curl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=SDL/OpenGL space shoot'em up game
+EAPI=6
+HOMEPAGE=http://criticalmass.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng:0= virtual/opengl net-misc/curl
+SLOT=0
+SRC_URI=mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
+_eclasses_=autotools	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_=acfdd86e6ee6baad342aea13b4196563
diff --git a/games-arcade/criticalmass/Manifest b/games-arcade/criticalmass/Manifest
deleted file mode 100644
index f9612b200faa..000000000000
--- a/games-arcade/criticalmass/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX criticalmass-1.0.2-cflags.patch 868 BLAKE2B 5e4179592ab03bbc34e14e7649ebfca2268a8f22728f7afb92f4978aeb09461588b7daa6642fa07c8ce007597ee40296d28c44b9381bc734184c5c82f6eb2106 SHA512 545f822a3fb2709c52e4c9bbacc8ea56a7aee229acdaec1af3024928d67395de8f3f0014b5647bb48afa1a85478854945490c482c96486e908c5342eba2538e9
-AUX criticalmass-1.0.2-gcc43.patch 3150 BLAKE2B c039896207f59cc4e0c4c4e81ced2266ca91c4731cb853c6e4120b1962cef0b7ebce1094d0b38081fbec44c098d3e109fe3a2e2d294c483caf1008611c4a5209 SHA512 a3a23367de54d99b3e47951477c3c85fa861a6a48c3a2d81e2352e55d0a32d6c319f5fd37ff287c93a5b9b0dfa230c89a90a507219960bb72a567977058f3bd6
-AUX criticalmass-1.0.2-libpng14.patch 449 BLAKE2B e27405000136410be47bb241208c1321bbbf8540b8707244271e9368cfaaf7cd058172cc952ff0dd1d84a5e693f0373f2ec8ddd47db1b05b8768f242fa037488 SHA512 976cb237901945119fe54bf8b7e8856d70d7104ff7071b80cdeb7fdab64e783c3f69a6099bd1ee11aae2eb5bd94dcac681869328e44bb74c4808b3c67a23e975
-AUX criticalmass-1.0.2-libpng15.patch 686 BLAKE2B a96af03a21e1e12606acd4ea07631c9688d80b377d126b44e1ace016e5aa727446d2c8c18606983fa6b2288f83b19130488e96e4f3364dc1e2d42b543d1e3766 SHA512 c2a68f80f0f775e5b6acbb6ed3a565200f481c83f505320488073783a30265769ba32f545590f2756a1d4974b0cc65462f559f23237ce206cfb80be370195d97
-AUX criticalmass-1.0.2-system_curl.patch 976 BLAKE2B 8af3bae1f2653e882a8d2f0955ef7973af93058bcf646f2264ccacc7b804a622b6104c50cbfc5531775bd9da22660317d2fb00804566014f543ef8e5a1d231be SHA512 6ce040132b9b3a4d4cf7a14c48a3e33320cd95ae440512f8c1c78e78200e6936fe95140e1e16607a225ec0ed1421e03bc09ba065552bc5419cbb42ac74f44b47
-DIST CriticalMass-1.0.2.tar.bz2 5122126 BLAKE2B 91642309270aa9a76c1639b213b14f5b1feecce9a1bd9a516b84618e33d454542e31a34ffc974bb0e584b2ff5d5bad6b9112906a0c818662df7eb1ad0d812470 SHA512 af3200adc4b6ed9f24eaa89ef5b2f31e8d09e402d0c2eef8db604afcbb2d36bad48e76c3c11c1b2410d2d4e0ffd8554e2e9749a8c8cc4752b4636b8919a66037
-EBUILD criticalmass-1.0.2-r1.ebuild 1277 BLAKE2B 1d5b5a0b6941f8aab5ebcb29660e245d82a8db33046cf39b33efad6dbefb1d022413383540cb51f7948a8bbefea8057fafcd2afdc37c21e471e28a640e0c7064 SHA512 b0560a8d03dc9dc3b921d421949fcc3314055605d69af9ce20d354547a189819300fc36d01aaa919a8806f9ade279f5ef9660581b368be6405e01481eafc747f
-MISC metadata.xml 335 BLAKE2B 5b324731ab938d41661d143e1c10f44dcf05579341e642b07eb955252737e49eca38fffe4a95651f5d822de780ced0b9570bc0285d656e61c2f38f5ea594e214 SHA512 ef6dcb84323c49c9a21a59eea375bd3c1419ba2c7490f3e20e9daeab88942b4574d3d8668c465e2b2fc4221dff97695ba122d6790ebade3202f873f890fef9e4
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
deleted file mode 100644
index 5191beb0107f..000000000000
--- a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="SDL/OpenGL space shoot'em up game"
-HOMEPAGE="http://criticalmass.sourceforge.net/"
-SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libpng:0=
-	virtual/opengl
-	net-misc/curl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/CriticalMass-${PV}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-system_curl.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-cflags.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-
-	rm -rf curl
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=gnu++98 # Bug 612758
-	default
-}
-
-src_install() {
-	HTML_DOCS="Readme.html"
-	default
-	rm -f "${ED}/usr/bin/Packer"
-	newicon critter.png ${PN}.png
-	make_desktop_entry critter "Critical Mass"
-}
-
-pkg_postinst() {
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		ewarn
-		ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer"
-		ewarn "with the \"mod\" USE flag turned on."
-		ewarn
-	fi
-}
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
deleted file mode 100644
index 0d9063c37538..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/configure.in.orig	2011-07-20 11:23:19.849122541 -0400
-+++ b/configure.in	2011-07-20 11:24:28.169713094 -0400
-@@ -35,9 +35,6 @@
- AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE)
- AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32)
- 
--CFLAGS=""
--CXXFLAGS=""
--
- if test "x$GCC" = xyes; then
-    CFLAGS="$CFLAGS -W -Wall"
-    CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions"
-@@ -51,14 +48,6 @@
-         CXXFLAGS="$CXXFLAGS -g"
- fi
- 
--AC_ARG_ENABLE(optimize,
--[  --enable-optimize=level      Enable optimization [default=2]],
--        enable_optmize=$enableval, enable_optimize=2)
--if test "x$enable_optimize" != "xno" ; then
--        CFLAGS="$CFLAGS -O$enable_optimize"
--        CXXFLAGS="$CXXFLAGS -O$enable_optimize"
--fi
--
- AC_ARG_ENABLE(dyngl,
- [  --enable-dyngl               Load GL library dynamically [default=off]],
-         enable_dyngl=$enableval, enable_dyngl=off)
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
deleted file mode 100644
index e57c11f5af28..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -21,10 +21,12 @@
- distribution.

- */

- 

- #include "tinyxml.h"

- 

-+#include <cstring>
-+
- 

- TiXmlNode::TiXmlNode( NodeType _type )

- {

- 	parent = 0;

- 	type = _type;

---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.h	2008-04-18 19:40:35.000000000 +0200
-@@ -28,10 +28,11 @@
- #ifdef _MSC_VER

- #pragma warning( disable : 4530 )

- #pragma warning( disable : 4786 )

- #endif

- 

-+#include <cstdlib>
- #include <string>

- #include <stdio.h>

- #include <assert.h>

- 

- class TiXmlDocument;

---- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp	2003-03-03 03:34:58.000000000 +0100
-+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -23,10 +23,12 @@
- 

- 

- #include "tinyxml.h"

- #include <ctype.h>

- 

-+#include <cstring>
-+
- const char* TiXmlBase::SkipWhiteSpace( const char* p )

- {

- 	while ( p && *p && 

- 	        ( isspace( *p ) || *p == '\n' || *p == '\r' ) )

- 		p++;

---- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp	2005-01-02 03:59:29.000000000 +0100
-+++ CriticalMass-1.0.0/utils/ResourceManager.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <ResourceManager.hpp>
- #include <FindHash.hpp>
- #include <Endian.hpp>
- #include <WalkDirectory.hpp>
- 
-+#include <cstring>
-+
- #ifdef WIN32
- const char PATH_SEPERATOR = '\\';
- #else
- const char PATH_SEPERATOR = '/';
- #endif
---- CriticalMass-1.0.0.orig/utils/Value.hpp	2004-12-18 03:41:24.000000000 +0100
-+++ CriticalMass-1.0.0/utils/Value.hpp	2008-04-18 19:40:35.000000000 +0200
-@@ -13,10 +13,11 @@
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
- #ifndef _Value_hpp_
- #define _Value_hpp_
- 
-+#include <cstdlib>
- #include <stdio.h>
- #include <string>
- 
- #include <Trace.hpp>
- 
---- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp	2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // This program is distributed in the hope that it will be useful,  but  WITHOUT
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
-+#include <cstdlib>
- #include <Trace.hpp>
- #include <zStreamBufferImplZLib.hpp>
- 
- bool ziStreamBufferImplZLib::init( void)
- {
---- CriticalMass-1.0.0.orig/utils/zStream.cpp	2005-07-31 22:06:14.000000000 +0200
-+++ CriticalMass-1.0.0/utils/zStream.cpp	2008-04-18 19:40:35.000000000 +0200
-@@ -10,10 +10,11 @@
- //
- // This program is distributed in the hope that it will be useful,  but  WITHOUT
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
- //
-+#include <cstdlib>
- #include <Trace.hpp>
- #include <Endian.hpp>
- #include <zStream.hpp>
- #include <zStreamBufferImplLZMA.hpp>
- #include <zStreamBufferImplZLib.hpp>
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
deleted file mode 100644
index f8a0eec2ad57..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then
- else
-     LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS"
-     CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include"
--	AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed))
-+	AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed))
- 	AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed))
- 	if test "x$TARGET" = xUNIX; then
- 	    if test "x$enable_dyngl" = xoff; then
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
deleted file mode 100644
index dbdfc9f32275..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/game/main.cpp
-+++ b/game/main.cpp
-@@ -28,6 +28,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <zlib.h>
-+
- void migrateConfig( void)
- {
-     //if onlineCheck is not set, default it to true
---- a/utilssdl/PNG.cpp
-+++ b/utilssdl/PNG.cpp
-@@ -45,7 +45,7 @@
- {
-     png_size_t check;
- 
--    check = fwrite( data, 1, length, (FILE *)(png->io_ptr));
-+    check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png)));
-     if( check != length)
-     {
- 	png_error( png, "Write Error");
-@@ -72,7 +72,7 @@
- 	return false;
-     }
- 
--    if( setjmp(_png->jmpbuf))
-+    if( setjmp(png_jmpbuf(_png)))
-     {
- 	fclose( fp);
- 	png_destroy_write_struct(&_png, (png_infopp)NULL);
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
deleted file mode 100644
index 1ab1a2d5ce52..000000000000
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -115,8 +115,6 @@ fi
- AC_CHECK_LIB(m, sin,, 
-     AC_MSG_ERROR(libm is needed))
- 
--AC_CONFIG_SUBDIRS(curl)
--
- AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
- 
- echo "Configuration:
---- a/game/Makefile.am
-+++ b/game/Makefile.am
-@@ -41,7 +41,7 @@ critter_SOURCES = \
-         main.cpp
- 
- LDADD = \
--	../curl/lib/libcurl.a \
-+	-lcurl \
- 	../utils/libutils.a \
- 	../utilssdl/libutilssdl.a \
- 	../utilsgl/libutilsgl.a \
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,7 +4,7 @@
- AUTOMAKE_OPTIONS = 1.4
- 
- ## Any directories that you want built and installed should go here.
--SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
-+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
- 
- ## Any directories you want a part of the distribution should be listed
- ## here, as well as have a Makefile generated at the end of configure.in
diff --git a/games-arcade/criticalmass/metadata.xml b/games-arcade/criticalmass/metadata.xml
deleted file mode 100644
index 26c1c9ca5f2d..000000000000
--- a/games-arcade/criticalmass/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">criticalmass</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/defendguin-0.0.12-r1 b/games-arcade/defendguin-0.0.12-r1
new file mode 100644
index 000000000000..2d6e8dce3bd9
--- /dev/null
+++ b/games-arcade/defendguin-0.0.12-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
+DESCRIPTION=A clone of the arcade game Defender, but with a Linux theme
+EAPI=6
+HOMEPAGE=http://www.newbreedsoftware.com/defendguin/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-mixer[mod] media-libs/libsdl[video]
+SLOT=0
+SRC_URI=ftp://ftp.tuxpaint.org/unix/x/defendguin/src/defendguin-0.0.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=ba0255517a1b528dfd7bc089f6d16c07
diff --git a/games-arcade/defendguin/Manifest b/games-arcade/defendguin/Manifest
deleted file mode 100644
index 9b957608744e..000000000000
--- a/games-arcade/defendguin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST defendguin-0.0.12.tar.gz 2235694 BLAKE2B 4e694edb5a8e51948e343da8ba4555062505c1c7f2563e291cc4f421624b791630dec7b0c7ce08df0ca0db40070418cd67f750fbe525ef1b1d1577951a5224bd SHA512 3a62c7ac62b016eeb6fc63655e8a8c1ac6c5c7cae7eee03c4ab0b9951ba605c7634336d94adb538e94ccbf1d9f927ac530f58da87413a4b1555b2684681e4167
-EBUILD defendguin-0.0.12-r1.ebuild 921 BLAKE2B 81735673664173bda825eccd41f766ef89581fb98d911a111c71e07eb39091d5b96e6956eb57f89e1cffb7c0cc8fba9d967953b07c565d11690e4893ff535dfa SHA512 026d5689a5b60a046984efdbc25bee3641660edcce12d8cf2ea4e41ebfae326e38fd5be16541548941662ac72ce5d7e1d36776fbf59f4596e1b466ca6c733df7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild
deleted file mode 100644
index db692cd67f23..000000000000
--- a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A clone of the arcade game Defender, but with a Linux theme"
-HOMEPAGE="http://www.newbreedsoftware.com/defendguin/"
-SRC_URI="ftp://ftp.tuxpaint.org/unix/x/${PN}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/sdl-mixer[mod]
-	media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:\$(DATA_PREFIX):/usr/share/${PN}/:" \
-		-e '/^CFLAGS=.*-O2/d' \
-		-e '/^CFLAGS=/s:=:+= $(LDFLAGS) :' \
-		Makefile \
-		|| die
-	rm -f data/images/*.sh
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r ./data/*
-
-	newicon data/images/ufo/ufo0.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Defendguin /usr/share/pixmaps/${PN}.bmp
-
-	doman src/${PN}.6
-	dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt
-}
diff --git a/games-arcade/defendguin/metadata.xml b/games-arcade/defendguin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/defendguin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/diameter-0.4.0.3-r2 b/games-arcade/diameter-0.4.0.3-r2
new file mode 100644
index 000000000000..4421a764974c
--- /dev/null
+++ b/games-arcade/diameter-0.4.0.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] 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=Arcade game with elements of economy and adventure
+EAPI=6
+HOMEPAGE=http://gamediameter.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[mod] virtual/opengl virtual/glu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/gamediameter/diameter-0.4.0.3.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2e6b6b3458660592684465251be42dde
diff --git a/games-arcade/diameter/Manifest b/games-arcade/diameter/Manifest
deleted file mode 100644
index 37e8a02d485c..000000000000
--- a/games-arcade/diameter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST diameter-0.4.0.3.tar.bz2 4729201 BLAKE2B e96989e0213bbea1c0e7c8d5bea155c2a561741c367220f5d0fb7a4630c076932a4393ad577573195e96945fc812e9a1fb6026089d601d96a22be5004c77877e SHA512 74491d49b233f16b44e4ea7c477fe5c6d71bc88c34b815f7992ea881558e2b4de98b10c5041cff6d0a6098dc4f440291825fb1746ff0282e3f538fac4ee4975d
-EBUILD diameter-0.4.0.3-r2.ebuild 1298 BLAKE2B 3f585855da26aab2f7a9cc8de2dfa8fe97c9052420946c8192c14827fa4298f3f20d68f07f94493efa15346440fc36f0fa54dbbd55da0f92d840a679735fee75 SHA512 04dc2012aedd8b4149413f3f601ed4c4a8c5161a5f577aa86ab236b63a21d5d681fa78a817995996dfca777cc28db12438d18aee847ec54891bbb512fe1cdbc3
-MISC metadata.xml 637 BLAKE2B 013b8e33bef387c1dd5e8e8380e4cac93b3271c1e94178a2a0bc33b11371dce4c396f7402f4127a9266fae89ed1f7d3e18afb4fbf97cc5473f44e8c166ceef7f SHA512 307ba08fa4280af81002a0993f4539021afa6507c67dccf9c5a2eeedeb07e820f0c3ad5ce8a0bf19d71087e5fe41e6b86ff6ce097f355ff00f11e0374bd771dc
diff --git a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
deleted file mode 100644
index 1f7c45b1a67f..000000000000
--- a/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="Arcade game with elements of economy and adventure"
-HOMEPAGE="http://gamediameter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gamediameter/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-games/guichan-0.8[opengl,sdl]
-	media-libs/libpng:0=
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[mod]
-	virtual/opengl
-	virtual/glu
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gamediameter
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:gamediameter:diameter:" \
-		configure.in || die
-	mv configure.in configure.ac || die
-	sed -i \
-		-e '/for i in .*\/lib/s:".*:/usr/lib/ ; do:' \
-		-e "/AC_SUBST.*LDFLAGS/s/\".*\"/\$PYTHON_LIBS/" \
-		acinclude.m4 || die
-	# bug #336812
-	sed -i \
-		-e '/gui nebular3.gif/s/gui//' \
-		data/texture/Makefile.am || die
-	eautoreconf
-
-	# needed, otherwise -lpython2.7 will not be found
-	python_export PYTHON PYTHON_LIBS
-}
-
-src_install() {
-	default
-
-	newicon data/texture/gui/eng/main/logo.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}
diff --git a/games-arcade/diameter/metadata.xml b/games-arcade/diameter/metadata.xml
deleted file mode 100644
index ec2759fffab8..000000000000
--- a/games-arcade/diameter/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-"Diameter" - is an arcade-style game with elements of economy and adventure.
-Project's main objective is to make a distinctive game with a storm gameplay and
-simultaneously alluring with its world. Plus, the main mood will be funny, but
-thus be serious.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gamediameter</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/digger-20140423-r1 b/games-arcade/digger-20140423-r1
new file mode 100644
index 000000000000..b96f8474b100
--- /dev/null
+++ b/games-arcade/digger-20140423-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[X,video] x11-libs/libX11
+DESCRIPTION=Digger Remastered
+EAPI=6
+HOMEPAGE=http://www.digger.org/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,video] x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://gentoo/digger-20140423.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=db4f020b11bb4ba4ac264dfab19c9425
diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest
deleted file mode 100644
index 415121bd4e93..000000000000
--- a/games-arcade/digger/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX digger-20140423-ldflags.patch 659 BLAKE2B f999cde34935ff2919327b4a6e1fa8ff9a8559507d97e504b0b6ff3f1958307a0aa03b4f0c93415e3056798ed555795079aeb36e830fa02da71962cfa957656e SHA512 69ebbe64576df62927389087f22f4871582bde0507be7cd80f1ea96abb14819c844d7adbbfd13c89e2e6921d1accd289e5cc2246a25a962639dc5bdf40b23fd1
-DIST digger-20140423.tar.gz 117375 BLAKE2B 39ec5a17c2a12c1d23ed8dbcecfcd1f8309d5309540cd6d50d92aeee056e60f31156016f7cbcdf35092690c0e4df9312feee0a686c8fb1afb6068181630aca59 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece
-EBUILD digger-20140423-r1.ebuild 535 BLAKE2B aa3873df30822fbd5ac37e329b148090a6643eec5b6d16fd9cfbeb1315f28d189123ec6c1aa67b6375c5938ee9a79fc554eee83dbeaa8360a1b7f0d78e87494b SHA512 d99c56e0e1130b2fea26963f05bf84e8b95b986f1268c899ee0b28cf2f77f771df06ece7dbea1ea87be95f9ca07d74c4e7f99d894b5144c5d0dde420dc26c86f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/digger/digger-20140423-r1.ebuild b/games-arcade/digger/digger-20140423-r1.ebuild
deleted file mode 100644
index 716e33c57c1b..000000000000
--- a/games-arcade/digger/digger-20140423-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Digger Remastered"
-HOMEPAGE="http://www.digger.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-
-DEPEND="media-libs/libsdl[X,video]
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_install() {
-	dobin digger
-	dodoc digger.txt
-	make_desktop_entry digger Digger
-}
diff --git a/games-arcade/digger/files/digger-20140423-ldflags.patch b/games-arcade/digger/files/digger-20140423-ldflags.patch
deleted file mode 100644
index fd1e9953b634..000000000000
--- a/games-arcade/digger/files/digger-20140423-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru digger-digger.orig/Makefile digger-digger/Makefile
---- digger-digger.orig/Makefile	2013-10-11 04:56:41.000000000 -0400
-+++ digger-digger/Makefile	2014-04-24 13:11:58.749211920 -0400
-@@ -26,7 +26,7 @@
- ifeq ($(ARCH),"LINUX")
- OBJS	+= fbsd_sup.o	# strup()
- RCFLAGS	+= -DLINUX $(shell sdl-config --cflags)
--LIBS	+= $(shell sdl-config --libs) -lz
-+LIBS	+= $(shell sdl-config --libs) -lX11 -lz
- ESUFFIX	=
- endif
- 
-@@ -40,7 +40,7 @@
- all: digger$(ESUFFIX)
- 
- digger$(ESUFFIX): $(OBJS)
--	$(CC) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
- 
- $(OBJS): %.o: %.c
- 	$(CC) -c $(RCFLAGS) $(CFLAGS) $< -o $@
diff --git a/games-arcade/digger/metadata.xml b/games-arcade/digger/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/digger/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/dynamitejack-1.0.23-r1 b/games-arcade/dynamitejack-1.0.23-r1
new file mode 100644
index 000000000000..6521cca137ee
--- /dev/null
+++ b/games-arcade/dynamitejack-1.0.23-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DESCRIPTION=A stealth game with bombs in glorious 2D
+EAPI=5
+HOMEPAGE=http://www.galcon.com/dynamitejack/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=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/libsdl-1.2.15-r4[X,sound,joystick,opengl,video,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(-)] >=virtual/glu-9.0-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(-)] games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=dynamitejack-1.0.23.tgz
+_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_=cd5e0d3f5a7448b0cdb04e3452f13959
diff --git a/games-arcade/dynamitejack/Manifest b/games-arcade/dynamitejack/Manifest
deleted file mode 100644
index 02078bf0ecde..000000000000
--- a/games-arcade/dynamitejack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dynamitejack-1.0.23.tgz 54195417 BLAKE2B 5cb659be0a76617c6a09c2dd696daaaa23ec9d24918a842e1dcc2e5b294c4e4c19f80f4dff92a5e539469a048bda2f1f61f9240569f8c0d2fc8e0e2147b55d39 SHA512 57897194244ded8d41ef0e7704fd973a58fe52dbc01b7dceed2a47694f7cc3e75d732547532bc7be4dd7d510572dedb85188da413b5857f52182799427243c4d
-EBUILD dynamitejack-1.0.23-r1.ebuild 1717 BLAKE2B 7230f789c65f9117560fa8d30fc8d34fb6803f67be8557c843183525a86401ff611639af095b74cd94e37c593cbecfd506a72d914a9f14f49be59dff437f21cb SHA512 3556deb20f703f0e1d86422d000d834363f104e3a36d863a314de89992ab728d0f50ca9b77402a9c14b2166d2b5f332820987b178b7d47d7a98be49769837ec0
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild b/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
deleted file mode 100644
index 580c082224c1..000000000000
--- a/games-arcade/dynamitejack/dynamitejack-1.0.23-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: icon
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A stealth game with bombs in glorious 2D"
-HOMEPAGE="http://www.galcon.com/dynamitejack/"
-SRC_URI="${P}.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/bin/*"
-
-# linked to pulseaudio
-RDEPEND="
-	>=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/libsdl-1.2.15-r4[X,sound,joystick,opengl,video,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(-)]
-	>=virtual/glu-9.0-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(-)]"
-
-S=${WORKDIR}/${PN}
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	rm run_me || die
-	mv LINUX.txt "${T}"/ || die
-}
-
-src_install() {
-	dodoc "${T}"/LINUX.txt
-
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	games_make_wrapper ${PN} "./main" "${MYGAMEDIR}/bin"
-	make_desktop_entry ${PN}
-
-	fperms +x "${MYGAMEDIR}"/bin/main
-	prepgamesdirs
-}
diff --git a/games-arcade/dynamitejack/metadata.xml b/games-arcade/dynamitejack/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-arcade/dynamitejack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/emilia-pinball-0.3.1-r1 b/games-arcade/emilia-pinball-0.3.1-r1
new file mode 100644
index 000000000000..530c697cd201
--- /dev/null
+++ b/games-arcade/emilia-pinball-0.3.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) 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=SDL OpenGL pinball game
+EAPI=5
+HOMEPAGE=http://pinball.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl x11-libs/libSM media-libs/libsdl[joystick,opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=528076a65f4023116cc782ed062c965a
diff --git a/games-arcade/emilia-pinball/Manifest b/games-arcade/emilia-pinball/Manifest
deleted file mode 100644
index d5cb610045d9..000000000000
--- a/games-arcade/emilia-pinball/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX emilia-pinball-0.3.1-gcc46.patch 887 BLAKE2B 1b850fc066b2f33edde6c5f9e0ce58af86b4ae5eda7bb77b3d364e45548572b48f34a7e0a50f9ca660585ca0282e0ec9c3031449ca9ffa7b60d2c3cae920c794 SHA512 758d2d42f40b7d020aeeef75331b6a392c18eb9f9f34242d449ee233ef2f1b12900b69d572a40930a6dbd986e98be9258ccb2130746e36c8729c011ce294fda3
-AUX emilia-pinball-0.3.1-glibc210.patch 379 BLAKE2B 5eb1a6885265f7c5ca3ca73108ba54890e0f1551e8b0efcfca62637385b9700a900ce7181c7f5a7100f265c82df7b0ef98765bc6bd05ad079e7941b12d384541 SHA512 a949474aa76dc0b503635c40fb8b641daaab59b51d1d680fc9ac3f6e94566f9064526fe21107e5e549a02c3264dfa0fc6d94a5f8a833a88defd4e9b3a6bb9be0
-AUX emilia-pinball-0.3.1-libtool.patch 2371 BLAKE2B 625fc092dfe779ca1cb7b17c305e21de5113314f59ea7e2cd214b59a1c49b45668b3a76e9e56141d18df0e42eb72c295cf84aa4df50d7e070b6b1864250b506b SHA512 c60940620ba70c725774c9e0dfb930d2e5760fad9e64ec951ca3ab973f3e9f0884d88c0e7b4d8bf01f91651a7e5bd2111bcf5a38a63b46319436c7d2f270d71e
-AUX emilia-pinball-0.3.1-parallel.patch 428 BLAKE2B 368bf4e511f362e3daff200bee164fc0fa5c8bedde5f81cbe8778159e5f5157ff7a48b611541942703cc76f78e85b8e1b8bc42b6a305770feaf4577204576071 SHA512 8c8d0ef2bbb59579cf3e0f12e624bc28c27e810cad2d140a4c85f998d482101d97bdb7109fd01fb4bb9f2e77369c503b51c5a704b2f0768e570e7eb094f4f3c6
-DIST pinball-0.3.1.tar.gz 6082982 BLAKE2B 307fd8fa6a6a64a15423f2cdacf6711affec4d0a94beca4c660316fa2db268b857fe80d3a672a078fd4454e858fdbf235ab3c62ba9695ee6df422b56536ba2d2 SHA512 d54f2635f583be8a7e4bf3463c69c1ab368e1c069dd7c4edffb95df0448faf7e82ddb8f8607d22a7336e2db176134555ca65b613e9d008b38fecb8ad5a818498
-EBUILD emilia-pinball-0.3.1-r1.ebuild 1480 BLAKE2B 52e56f3be42f2acff04ae8404d89709c40fb99b7d5979a5a42bf0befaa9cdf5452d60fde8ed101fd3c401e0d6db7e71ce72c363c46435f23442ca9e4fbb973c7 SHA512 0084ee59a4bddf993b55da586c70182d6f6f9a70c975e1cb1ae6527156e6286d38abaf09eb2189d7dd65b17fee2ffa4fd3353d4eb2c3ccdc4918e85e07c24984
-MISC metadata.xml 330 BLAKE2B 7deaad70c752f4c41009dfd6ec073f972e9ee484d4497c0b23d184cd48bdb5aaa45f2644c412ab2a885aea6655e1a737a612bb65b3d8147272f63a2de932825c SHA512 8432311fd9fb74150e0571245c2afda26de63a3a3671905cb7f221984933e5971c1f5f355517c54b7c31de3a3d3349d06116a4e67c57c44489147af5ae80e8cf
diff --git a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild b/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
deleted file mode 100644
index 519b304f6840..000000000000
--- a/games-arcade/emilia-pinball/emilia-pinball-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-MY_PN=${PN/emilia-/}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="SDL OpenGL pinball game"
-HOMEPAGE="http://pinball.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pinball/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Drop the libtool dep once libltdl goes stable.
-RDEPEND="virtual/opengl
-	x11-libs/libSM
-	media-libs/libsdl[joystick,opengl,video,X]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i -e '/dnl/d' {src,test}/Makefile.am || die #334899
-	epatch "${FILESDIR}"/${P}-glibc210.patch \
-		"${FILESDIR}"/${P}-libtool.patch \
-		"${FILESDIR}"/${P}-gcc46.patch \
-		"${FILESDIR}"/${P}-parallel.patch
-	rm -rf libltdl
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf --with-x
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	default
-	dosym "${GAMES_BINDIR}"/pinball "${GAMES_BINDIR}"/emilia-pinball
-	mv "${D}/${GAMES_PREFIX}/include" "${D}/usr/" || die
-	dodir /usr/bin
-	mv "${D}/${GAMES_BINDIR}/pinball-config" "${D}/usr/bin/" || die
-	sed -i \
-		-e 's:-I${prefix}/include/pinball:-I/usr/include/pinball:' \
-		"${D}"/usr/bin/pinball-config || die
-	newicon data/pinball.xpm ${PN}.xpm
-	make_desktop_entry emilia-pinball "Emilia pinball"
-	prepgamesdirs
-}
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
deleted file mode 100644
index d78779197fce..000000000000
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-gcc46.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- base/SignalSender.cpp.old	2011-04-26 09:39:24.303339444 +0200
-+++ base/SignalSender.cpp	2011-04-26 09:39:51.261063162 +0200
-@@ -11,6 +11,7 @@
- #include "SignalSender.h"
- #include "Group.h"
- #include "Behavior.h"
-+#include <cstddef>
- 
- SignalSender * SignalSender::p_SignalSender = NULL;
- 
---- base/Behavior.cpp.old	2011-04-26 09:36:27.129006665 +0200
-+++ base/Behavior.cpp	2011-04-26 09:36:48.855396752 +0200
-@@ -9,6 +9,7 @@
- #include "Private.h"
- #include "Behavior.h"
- #include "Group.h"
-+#include <cstddef>
- 
- Behavior::Behavior() {
- 	//EM_COUT("Behavior::Behavior", 1);
---- base/BehaviorVisitor.cpp.old	2011-04-26 09:37:39.759653248 +0200
-+++ base/BehaviorVisitor.cpp	2011-04-26 09:37:54.481594952 +0200
-@@ -9,6 +9,7 @@
- #include "BehaviorVisitor.h"
- #include "Behavior.h"
- #include "Group.h"
-+#include <cstddef>
- 
- BehaviorVisitor * BehaviorVisitor::p_BehaviorVisitor = NULL;
- 
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
deleted file mode 100644
index 800dbeae21a7..000000000000
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-glibc210.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/Config.cpp
-+++ base/Config.cpp
-@@ -423,8 +423,8 @@
-   m_sDataDir = string(EM_DATADIR) + "/";
-   m_sExeDir = "./";
-   if ( *( m_sDataDir.c_str() ) != '/' ) {
--    char* ptr=0; 
--    char* ptrw = 0;
-+    const char* ptr=0; 
-+    const char* ptrw = 0;
-     //cout<<"relative to exe file"<<endl;
-     ptr = (strrchr(argv0,'/')); // unix /cygwin / check win32 
- #ifdef WIN32
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
deleted file mode 100644
index 437e4eb684a4..000000000000
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-libtool.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur pinball-0.3.1.orig/configure.ac pinball-0.3.1/configure.ac
---- pinball-0.3.1.orig/configure.ac	2003-11-21 09:40:18.000000000 +0200
-+++ pinball-0.3.1/configure.ac	2010-03-05 20:41:24.000000000 +0200
-@@ -14,18 +14,13 @@
- CFLAGS="-g -W -Wall -O2"
- CXXFLAGS="-g -W -Wall -O2"
- 
--AC_CONFIG_SUBDIRS(libltdl)
--
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_INSTALL
--AC_LIBTOOL_DLOPEN
--AC_LIBLTDL_CONVENIENCE
--AC_PROG_LIBTOOL
- 
--AC_SUBST(INCLTDL)
--AC_SUBST(LIBLTDL)
-+LT_PREREQ([2.2.6])
-+LT_INIT([dlopen])
- 
- dnl *******************************************
- dnl PATHS AND DIRS ****************************
-diff -ur pinball-0.3.1.orig/Makefile.am pinball-0.3.1/Makefile.am
---- pinball-0.3.1.orig/Makefile.am	2003-12-10 12:15:35.000000000 +0200
-+++ pinball-0.3.1/Makefile.am	2010-03-05 20:36:48.000000000 +0200
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS = gnu
- 
--SUBDIRS = libltdl addon base data src test
-+SUBDIRS = addon base data src test
- 
- EXTRA_DIST = bootstrap pinball.spec clean pinball.desktop
- 
-diff -ur pinball-0.3.1.orig/src/Makefile.am pinball-0.3.1/src/Makefile.am
---- pinball-0.3.1.orig/src/Makefile.am	2003-11-20 18:46:17.000000000 +0200
-+++ pinball-0.3.1/src/Makefile.am	2010-03-05 20:37:08.000000000 +0200
-@@ -7,9 +7,9 @@
- 
- pinlib_LIBRARIES = libemilia_pin.a
- 
--INCLUDES = -I../base -I../addon @INCLTDL@
-+INCLUDES = -I../base -I../addon
- 
--pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
-+pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
- pinball_LDFLAGS = -export-dynamic
- 
- pinball_SOURCES = Pinball.cpp
-diff -ur pinball-0.3.1.orig/test/Makefile.am pinball-0.3.1/test/Makefile.am
---- pinball-0.3.1.orig/test/Makefile.am	2003-11-20 18:46:17.000000000 +0200
-+++ pinball-0.3.1/test/Makefile.am	2010-03-05 20:36:38.000000000 +0200
-@@ -6,8 +6,8 @@
- noinst_PROGRAMS = scale simple light texture load explode collision signal billboard font thread menu joy sound trans math misc varray unittest
- dnl noinst_PROGRAMS = unittest
- 
--INCLUDES = -I../base -I../addon -I../src @INCLTDL@
--LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a @LIBLTDL@
-+INCLUDES = -I../base -I../addon -I../src
-+LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
- 
- testlib_LTLIBRARIES = libModuleTest.la
- 
diff --git a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch b/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
deleted file mode 100644
index 3dfef56090c9..000000000000
--- a/games-arcade/emilia-pinball/files/emilia-pinball-0.3.1-parallel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.old	2011-04-26 10:46:05.102070461 +0200
-+++ src/Makefile.am	2011-04-26 10:46:16.872813136 +0200
-@@ -9,7 +9,7 @@
- 
- INCLUDES = -I../base -I../addon
- 
--pinball_LDADD = ../src/libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
-+pinball_LDADD = libemilia_pin.a ../addon/libemilia_addon.a ../base/libemilia_base.a -lltdl
- pinball_LDFLAGS = -export-dynamic
- 
- pinball_SOURCES = Pinball.cpp
diff --git a/games-arcade/emilia-pinball/metadata.xml b/games-arcade/emilia-pinball/metadata.xml
deleted file mode 100644
index 551a8380f3c8..000000000000
--- a/games-arcade/emilia-pinball/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pinball</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/epiar-0.5-r1 b/games-arcade/epiar-0.5-r1
new file mode 100644
index 000000000000..e3f708982daf
--- /dev/null
+++ b/games-arcade/epiar-0.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] x11-libs/libX11 virtual/opengl app-arch/unzip
+DESCRIPTION=A space adventure/combat game
+EAPI=5
+HOMEPAGE=http://epiar.net/
+KEYWORDS=~x86 ~x86-fbsd
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/epiar/epiar-0.5.0-src.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d18f6f5e1a8ce4e7c7c93c9f5c05ed79
diff --git a/games-arcade/epiar/Manifest b/games-arcade/epiar/Manifest
deleted file mode 100644
index e037d2973025..000000000000
--- a/games-arcade/epiar/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX epiar-0.5-Makefile.linux.patch 682 BLAKE2B 0794a07f1f4beef8b16e8fc720930cabe3db40941be39c0ed3d1ef66b4a24bab68f9aeb6961b4a4429d4de7fc12dc395dbf7e34c7caf887aedee0cf7af94e584 SHA512 5219be09af0443a780d918306086f9c7792a9fd6e7051806c368db6808017ee9c2897b4093664f9c087e3fe987b22edeb50280f25f615cdbfcdf914c1cf4be47
-AUX epiar-0.5-gcc41.patch 332 BLAKE2B c3d34f29b2d9186d0f6ac14b14bb40e63578764f613b74bd670266dda3885c4542e48e3e95b06a668e01fccc9630a9d0e46f1918f1dda37e1e78840ca890dfb7 SHA512 29de0155e37696c1f2f66060aa6b08d01df13bcf36e2fc20a803bf664bd7a326d4ec70141376305771d2c188e67ddd32d19d5a864c3a8c9c7c5ea329a6e19060
-AUX epiar-0.5-paths.patch 2195 BLAKE2B 995f1d0a39b72be7e1e542a6e799b5d644d62cdb2ad1710f44bc73a82310c148b54113254c4502f499fceaada0aadb5944ec5d370b3ca79c72b208d6197e4c20 SHA512 4f6068f69b6f2367bbc665159f2612da86591d050e5296304b26d613c6579465c632a442251033fdb7803e6cb72c8f70e6118e8c1d43d33f0376863b91ebd037
-AUX epiar-0.5-underlink.patch 818 BLAKE2B 9ab04018e1051d905674b53154e4297be50e1954a79c28f7e70fd47381f9dcd4b452385d05dc38ad2cd117bb4b6b06d9d95727d61fdaf483f4d3940a2c8f6028 SHA512 ada142afdd3de71af454bd1a03c8c406d609deeff7a68a84b7066089761bebcb01dae8e69f7fccbd0cf4f0294789696e1181900c30f857c8b5197c24bab51b2a
-DIST epiar-0.5.0-src.zip 8809392 BLAKE2B c29c541f5841da91d13f7ccddfa2d2175265a434ae03e2ed87a64cd5c177d7139ff2cf44ec679ec023fe783427868f0f234c6f5f49d0d52ab08be852d424ba59 SHA512 22d8655aefd3aa071de064aeeed40d8780fb32ee702e657c8b8a723c381b6825ae9b5820cf5b29991e14bc264c443d0b24f88656b4997a6270383aa080c15f3e
-EBUILD epiar-0.5-r1.ebuild 1063 BLAKE2B 283af179cfd95d7afe7eefca643cdb6662563e2fbed24ee437033f1c90f3ee1823e6b9bc4b9d669488f290d3b89cdc1637219873ba6436dabcf1b2b9821972be SHA512 2c81c4665ee0df32f8ec9d5aea824760b2f8328315245d8953e460fac7369a3eebfc615acd5c708dc8f4806f4c05b4145eb0dceae9cefd2568d137138c84e167
-MISC metadata.xml 823 BLAKE2B 4ad0d0b974bd58a1d1edd77eb201fa2e236eb6b7a1efee030c8f106a6a016f3ecbf3de213b162a9d0f52d0e0751c4c3905acdaab4cd2d24292c6425620f7c88b SHA512 ef154f46f533f6b255bac62dcdffb84833fee98135e714b9a6b546a9128c3d3be0e7cfe7721ce1ccf302019b414ef1edb4ba92cc43b7024be6881a3cb0d6dffb
diff --git a/games-arcade/epiar/epiar-0.5-r1.ebuild b/games-arcade/epiar/epiar-0.5-r1.ebuild
deleted file mode 100644
index 7ddbc3d9c668..000000000000
--- a/games-arcade/epiar/epiar-0.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils games
-
-DESCRIPTION="A space adventure/combat game"
-HOMEPAGE="http://epiar.net/"
-SRC_URI="mirror://sourceforge/epiar/${P}.0-src.zip"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[png]"
-DEPEND="${RDEPEND}
-	x11-libs/libX11
-	virtual/opengl
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	sed -i \
-		-e "/^CFLAGS/s:-pg -g:${CFLAGS} ${LDFLAGS}:" \
-		Makefile.linux || die
-	epatch \
-		"${FILESDIR}"/${P}-paths.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-Makefile.linux.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-	sed -i \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}/:" \
-		src/main.c || die
-}
-
-src_compile() {
-	emake -f Makefile.linux
-}
-
-src_install() {
-	dogamesbin epiar
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r missions *.eaf
-	keepdir "${GAMES_DATADIR}"/${PN}/plugins
-	dodoc AUTHORS ChangeLog README
-	prepgamesdirs
-}
diff --git a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch b/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
deleted file mode 100644
index 3086bd13ef9a..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-Makefile.linux.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.linux.old	2007-04-05 16:42:30 +0000
-+++ Makefile.linux	2007-04-05 16:42:47 +0000
-@@ -24,7 +24,7 @@
- 	@echo Building Epiar 0.5.0 ...
- 	@$(CC) $(CFLAGS) -I/usr/X11R6/lib/ $(OBJS) -o epiar $(LIBS)
- 	@echo Building plugins ...
--	@make -f Makefile.linux plugin
-+	@$(MAKE) -f Makefile.linux plugin
- 	@echo Epiar 0.5.0 build complete.
- 	@echo
- 	@echo Type './epiar' to play.
-@@ -33,7 +33,7 @@
- 	@echo Building Epiar 0.5.0 and linking statically ...
- 	@$(CC) $(CFLAGS) -L/usr/X11R6/lib -L/opt/gnome-2.1/lib $(OBJS) -o epiar $(STATIC_LIBS)
- 	@echo Building plugins ...
--	@make plugin
-+	@$(MAKE) plugin
- 	@echo Epiar 0.5.0 build complete.
- 	@echo
- 	@echo Type './epiar' to play.
diff --git a/games-arcade/epiar/files/epiar-0.5-gcc41.patch b/games-arcade/epiar/files/epiar-0.5-gcc41.patch
deleted file mode 100644
index 65f08b2691d1..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-gcc41.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/game/game.h.old	2006-04-23 22:13:36.000000000 +0200
-+++ src/game/game.h	2006-04-23 22:13:50.000000000 +0200
-@@ -2,7 +2,6 @@
- #include "includes.h"

- 

- extern Uint32 average_loop_time;

--extern Uint32 game_start_time;

- extern Uint32 total_play_time, total_frames_drawn;

- extern float average_session_fps, current_fps;

- 

diff --git a/games-arcade/epiar/files/epiar-0.5-paths.patch b/games-arcade/epiar/files/epiar-0.5-paths.patch
deleted file mode 100644
index 41266c7272b1..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-paths.patch
+++ /dev/null
@@ -1,86 +0,0 @@
---- src/input/input.c
-+++ src/input/input.c
-@@ -240,7 +240,10 @@
- *

- ******************************************************************************/

- int load_input_cfg(void) {

--	FILE *fp = fopen("./.epiar-input.ecf", "rb");

-+	char filename[PATH_MAX];
-+	FILE *fp;
-+	snprintf(filename, sizeof(filename), "%s/.epiar-input.ecf", getenv("HOME"));
-+	fp = fopen(filename, "rb");

- 

- 	/* make sure all keys are enabled */

- 	unlock_keys();

-@@ -282,7 +285,7 @@
- 	} else {

- 		float file_version = 0.0f;

- 		/* read the file into the struct */

--		fp = fopen("./.epiar-input.ecf", "rb");

-+		fp = fopen(filename, "rb");

- 

- 		if (fp == NULL) {

- 			fprintf(stdout, "Could not open \"./.epiar-input.ecf\" for reading, assuming default bindings.\n");

-@@ -472,10 +475,12 @@
- }

- 

- void save_keybindings(void) {

-+	char filename[PATH_MAX];
- 	float file_version = 0.2f;

- 	FILE *fp;

- 

--	fp = fopen("./.epiar-input.ecf", "wb");

-+	snprintf(filename, sizeof(filename), "%s/.epiar-input.ecf", getenv("HOME"));
-+	fp = fopen(filename, "wb");

- 	if (fp == NULL) {

- 		fprintf(stdout, "Could not create '~/.epiar-input.ecf' to save keybindings\n");

- 		return;

---- src/main.c
-+++ src/main.c
-@@ -16,7 +16,7 @@
- unsigned char view_mode = 0;

- int ship_to_follow = 0;

- int desired_bpp = 16;

--char *game_path;

-+const char * const game_path = "GENTOO_DATADIR";

- unsigned char use_ogl = 0;

- unsigned char skip_intro = 0;

- FILE *epiar_eaf = NULL, *main_eaf = NULL;

-@@ -78,8 +78,6 @@
- 

- 	parse_commandline(argc, argv);

- 

--	get_absolute_path(argv[0]);

--

- 	init(desired_bpp);

- 

- 	menu();

---- src/main.h
-+++ src/main.h
-@@ -1,2 +1,2 @@
- extern char epiar_version[6];

--extern char *game_path;

-+extern const char * const game_path;

---- src/system/init.c
-+++ src/system/init.c
-@@ -89,9 +89,6 @@
- 		main_eaf = NULL;

- 	}

- 

--	assert(game_path != NULL);

--	free(game_path);

--	game_path = NULL;

- 

- 	if (average_loop_time == 0) average_loop_time = 18; /* in case they quit on menu */

- #ifndef NDEBUG

---- src/system/path.c
-+++ src/system/path.c
-@@ -45,7 +45,7 @@
- }

- #endif

- 

--#ifdef LINUX

-+#if 0

- char *strip_path_of_binary(char *argv) {

- 	int len = 0, i, blen = 0;

- 	char *stripped = NULL;

diff --git a/games-arcade/epiar/files/epiar-0.5-underlink.patch b/games-arcade/epiar/files/epiar-0.5-underlink.patch
deleted file mode 100644
index 13146cb68b27..000000000000
--- a/games-arcade/epiar/files/epiar-0.5-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.linux.old	2011-06-22 15:15:50.000000000 +0200
-+++ Makefile.linux	2011-06-22 15:17:01.000000000 +0200
-@@ -1,6 +1,6 @@
- CFLAGS=-W -Wall `sdl-config --cflags` -Isrc/ -DLINUX -DDEVEL -export-dynamic -I/usr/include/SDL -I/usr/local/include/SDL -DBLIT_METHOD_2 -DNAUDIO -O2 -march=pentium4 -pipe -mfpmath=sse -ggdb -Wl,-O1 -Wl,--as-needed
- 
--LIBS=-lm `sdl-config --libs` -lSDL_image
-+LIBS=-lm `sdl-config --libs` -lSDL_image -ldl
- STATIC_LIBS=-lm /usr/local/lib/libSDL.a /usr/local/lib/libSDL_image.a /usr/local/lib/libSDL_ttf.a /usr/local/lib/libopenal.a /usr/local/lib/libvorbisfile.a /usr/local/lib/libvorbis.a /usr/local/lib/libogg.a /usr/lib/libpng.a /usr/lib/libz.a -lpthread -ldl -lfreetype /usr/lib/libjpeg.a -lX11 -lXext -lesd
- 
- OBJS=main.o init.o video.o backbuffer.o debug.o audio.o linux_video.o \
diff --git a/games-arcade/epiar/metadata.xml b/games-arcade/epiar/metadata.xml
deleted file mode 100644
index 9a42744eb0df..000000000000
--- a/games-arcade/epiar/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-Epiar is a space adventure/combat game written in C with SDL 
-(Simple DirectMedia Layer). It is absolutely free (released 
-under the General Public License v2).
-In Epiar, you begin as a shuttle pilot in a galaxy generally 
-ruled by anarchy, with few stable governments and numerous 
-rebel factions. You start your adventure off doing whatever 
-you want, but generally trying to save up money for a new 
-starship, and your adventure takes off from there ...
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">epiar</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/excido-0.1.5c-r3 b/games-arcade/excido-0.1.5c-r3
new file mode 100644
index 000000000000..5b54313eb2ac
--- /dev/null
+++ b/games-arcade/excido-0.1.5c-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-games/physfs media-libs/libsdl[opengl] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-image[png] media-libs/openal media-libs/freealut
+DESCRIPTION=A fast paced action game
+EAPI=6
+HOMEPAGE=http://icculus.org/excido/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/libsdl[opengl] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-image[png] media-libs/openal media-libs/freealut
+SLOT=0
+SRC_URI=http://icculus.org/excido/excido-0.1.5c-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=603d42b17cd9fc3ec8b6684115771cfc
diff --git a/games-arcade/excido/Manifest b/games-arcade/excido/Manifest
deleted file mode 100644
index 72a7e6885287..000000000000
--- a/games-arcade/excido/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX excido-0.1.5c-build.patch 1033 BLAKE2B 171f87f9c08d51969af8e9171bbae2b177192afb9dad0dcf975fdc4a50ccfc961d5caa055830b929beadc3120f0a627c638371125ca93b4b8b642d4b3b1321d2 SHA512 9cd1b44ae83e9cf1171869124866df78f6d9bc2d18d80968937b7edf7d60dedef3cd0451fd3f81406e5b3b36960b3ac8f77032625e1c545f04d70998da8701ab
-AUX excido-0.1.5c-freealut.patch 1204 BLAKE2B 1aa65ee8e91f01be2ed6af6e45d945d81b1d6b5714072701a8b189b30668a7ef430bb08d54c322c487f0748c0112499c32b52273bc94e2746b687acdd9ea6134 SHA512 11c41ba18f2b698fa4eedfb93d670a09ddd6d954d9504903f51f6df23096e3f72f2836193ca35a5aeb6e3524ad887e1cbf0eb879583988dd99b0b4c439997a1c
-DIST excido-0.1.5c-src.tar.bz2 2981629 BLAKE2B 504c21861a4d966400a94ef6733794f72edbf950a84dcd935213244252b771e168f0bb5e21780c90d2cd1a1799cac821a502dbb558ffe6204d4b552e5af465d4 SHA512 9e1b98ed31eac735087f451c466d0e0d1b885ad5336f7994abf8f844b1c27cc24e90048306ffd62864fa5ab2bada6744b4b54991c6eb9b22624af20c645e02d7
-EBUILD excido-0.1.5c-r3.ebuild 789 BLAKE2B d4e7146161ecd604ff845b2de8b97e34633860cc38e32bf2e07b936db3dcaf79ab52b9e2ecee8a023fdbf07c0c11a8ac7008a979bbc8b82ad9ce063cd16966b1 SHA512 ace3ee24dbc3155db5f276922b1b5d570f0b15288711312711e9a7fb9bae8031c6e665673d005714807ddfcbf7fb799f58b78a0ac0fe28dbe8be271e8d04ee5a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/excido/excido-0.1.5c-r3.ebuild b/games-arcade/excido/excido-0.1.5c-r3.ebuild
deleted file mode 100644
index cea4558b0b61..000000000000
--- a/games-arcade/excido/excido-0.1.5c-r3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A fast paced action game"
-HOMEPAGE="http://icculus.org/excido/"
-SRC_URI="http://icculus.org/excido/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-games/physfs
-	media-libs/libsdl[opengl]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]
-	media-libs/openal
-	media-libs/freealut"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-freealut.patch
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_compile() {
-	emake DATADIR=/usr/share/${PN}/
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins data/*
-	dodoc BUGS CHANGELOG HACKING README TODO \
-		keyguide.txt data/CREDITS data/*.txt
-}
diff --git a/games-arcade/excido/files/excido-0.1.5c-build.patch b/games-arcade/excido/files/excido-0.1.5c-build.patch
deleted file mode 100644
index 1735b51ccdfc..000000000000
--- a/games-arcade/excido/files/excido-0.1.5c-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,8 +1,8 @@
--CC=g++
--CFLAGS=`sdl-config --cflags` #-g -Wall #-O2
-+CXX?=g++
-+CXXFLAGS+=$(shell sdl-config --cflags) #-g -Wall #-O2
- #CFLAGS=`sdl-config --cflags` -I./physfs#-g -Wall #-O2
- OBJS    := ${patsubst %.cpp, %.o, ${wildcard src/*.cpp}}
--LIBS = -s -Bstatic `sdl-config --static-libs` -lSDL_image -lSDL_ttf -L. -lphysfs -lopenal -Bdynamic -lGL -lGLU  
-+LIBS = $(shell sdl-config --libs) -lSDL_image -lSDL_ttf -lphysfs -lopenal -lalut -lGL -lGLU
- #LIBS = -s -Bstatic `sdl-config --static-libs` SDL_image/*.o SDL_ttf/*.o -L. physfs/*.o openal/*.o -ljpeg -lpng -ltiff -lfreetype -Bdynamic -lGL -lGLU  
- PREFIX=/usr/local
- BINDIR=$(PREFIX)/bin/
-@@ -16,12 +16,12 @@
- 
- 
- .cpp.o:
--	$(CC) $(CFLAGS) $(DEFINES) -o ${patsubst %.cpp, %.o, $<} -c $<
-+	$(CXX) $(CXXFLAGS) $(DEFINES) -o ${patsubst %.cpp, %.o, $<} -c $<
- 	
- all: $(TARGET) 
- 
- $(TARGET): $(OBJS)
--	$(CC) $(CFLAGS) -o $(TARGET) $(LIBS) $(OBJS)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
- 
- clean:
- 	rm -f $(OBJS) $(TARGET)
diff --git a/games-arcade/excido/files/excido-0.1.5c-freealut.patch b/games-arcade/excido/files/excido-0.1.5c-freealut.patch
deleted file mode 100644
index c29999fae25d..000000000000
--- a/games-arcade/excido/files/excido-0.1.5c-freealut.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/SoundCore.cpp
-+++ b/src/SoundCore.cpp
-@@ -352,32 +352,13 @@
- 
- 	PHYSFS_close(filehandle);
- 
--	ALenum format;
--	ALvoid *data;
--	ALsizei size,freq;
--	ALboolean loop=AL_FALSE;
- 	ALenum error;
- 
- 	alGetError();
- 
--	alGenBuffers(1,&newsample.alid);
--	if((error=alGetError())!=AL_NO_ERROR){
--		fprintf(stderr,"SoundCore::LoadSample: Error on alGenBuffers\n");
--		PrintALError(error);
--	}
--	alutLoadWAVMemory((ALbyte*)filedata,&format,&data,&size,&freq,&loop);
--	if((error=alGetError())!=AL_NO_ERROR){
--		fprintf(stderr,"SoundCore::LoadSample: Error on alutLoadWAVMemory\n");
--		PrintALError(error);
--	}
--	alBufferData(newsample.alid,format,data,size,freq);
--	if((error=alGetError())!=AL_NO_ERROR){
--		fprintf(stderr,"SoundCore::LoadSample: Error on alBufferData\n");
--		PrintALError(error);
--	}
--	alutUnloadWAV(format,data,size,freq);
--	if((error=alGetError())!=AL_NO_ERROR){
--		fprintf(stderr,"SoundCore::LoadSample: Error on alutUnloadWAV\n");
-+	newsample.alid=alutCreateBufferFromFileImage(filedata, filesize);
-+	if(((error=alGetError())!=AL_NO_ERROR)||(newsample.alid==AL_NONE)){
-+		fprintf(stderr,"SoundCore::LoadSample: Error on alutCreateBufferFromFileImage\n");
- 		PrintALError(error);
- 	}
- 
diff --git a/games-arcade/excido/metadata.xml b/games-arcade/excido/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/excido/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/fishsupper-0.1.6-r1 b/games-arcade/fishsupper-0.1.6-r1
new file mode 100644
index 000000000000..e10a89bc1f27
--- /dev/null
+++ b/games-arcade/fishsupper-0.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl dev-libs/boost >=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 arcade/puzzle game, loosely based on the retro classic Frogger
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/fishsupper/
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-2.5 GPL-3
+RDEPEND=media-libs/libsdl[sound,video,opengl,X] media-libs/sdl-image[png] media-libs/sdl-mixer[wav] virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/fishsupper/fishsupper-0.1.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ad7b9f2b13c17a7e5ccd699e03c5a44d
diff --git a/games-arcade/fishsupper/Manifest b/games-arcade/fishsupper/Manifest
deleted file mode 100644
index 03add5472e32..000000000000
--- a/games-arcade/fishsupper/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fishsupper-0.1.6-asneeded.patch 297 BLAKE2B 18b749a0e6733ee92bbe38ef2fd65fc5acfdb440ccbce23c0d1ae78d7b3f7601ebd3c6f23d5fdd89cd95caac11a9acea2a217b1ef6bd0f1e938d49d7c0735311 SHA512 934d5a308ae6c25e34e437c773ed71d12ac146555848a21855116a848768edd8c4e30e1d789c20a75e8c89f2b5a586c75d9ef122a70e83206848919c7c275be5
-AUX fishsupper-0.1.6-gcc6.patch 1730 BLAKE2B 41317933789d096b9b00a184e15df47b8daf946e9730e6688895497a94bf3efe7d96adf1a39b016dd9874b97a2721472fe98650732689464283495e817d76223 SHA512 9dfaf5c9a5a9554c87e93a3876cb9fb858a638b2ead10a3a10e4c9d8a68fca1608f08c1920d506aa09bc2c965c93ffc748ef3b4e3dad3b24bb86bd1481703d48
-AUX fishsupper-0.1.6-ovflfix.patch 308 BLAKE2B 16d9956ad39c518c171a7d99151853329c0fe76a092494a04d0e4f549819fa07f29a4bc01cd0dcfac104c3dc1df9e25c835dec7fb834b8b9ded24b742e56dda9 SHA512 75501a6ca44c510d73859d4339ee041e71dd3d0bbde3e071cfe438b014b515e868e8788d14ddef461b6402c8ef6c67c14bc3ad94e9a06a553c3aadbba602013a
-DIST fishsupper-0.1.6.tar.gz 1136893 BLAKE2B f07e5cc8fcfef4547fe2af029db1472ab0299fb5267e8f3a4fb29b9aa2cb39115101c217f509f35a4dc81a0e4f6c72f70bb2102c74c7c45981ced4e50230cd5c SHA512 a6b3df47010e8ac186ff4446db3659fd9173e9e3fc973ab376eed46da9cd13f7a4c0c02b25f3427232252e7fe5728036fa91ea773affe0948387a56f617fc7af
-EBUILD fishsupper-0.1.6-r1.ebuild 835 BLAKE2B 47a77e1bbbd699277c5c29f9909041d613f4ef08d880f3babe1a1d8189b476c91e719dbc407cc83f6439c85f7b9592c59a550e3dbc23f4781e068e14495510ca SHA512 6097c550acfb2518cfd78937175a61ea6b3ef461aedf5c5618cb68a1bdccc5807143d33c1bad0df6abfffd0e0cf9aa5f751e240e16ce513b26ae269cbfc2c311
-MISC metadata.xml 333 BLAKE2B de23175a8ff9c7bd8f8e2d59072017d790d2594882ac5963acdf28e4bab252152c01754cf9c3b57122dbc37fc857f2e749bbc52333700d25b43ac4b0b1ecd165 SHA512 6a3a977950808ae8b79c2c34c17fe8e1dd9ae21b9f9a43a2f2808931a4569042825f381d4c10024480eb2e2635893de8433eacf94f5f755d086285e3fe6770b3
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
deleted file mode 100644
index eae5ca15921a..000000000000
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am.old	2012-06-24 18:47:58.947143638 +0200
-+++ b/src/Makefile.am	2012-06-24 18:51:35.738921904 +0200
-@@ -1,7 +1,7 @@
- AM_CPPFLAGS = -DPKG_DATA_DIR=\"$(pkgdatadir)\" \
- 			  @SDL_CFLAGS@ \
- 			  -Wall
--AM_LDFLAGS = @SDL_LIBS@ 
-+LDADD = @SDL_LIBS@ 
- 
- bin_PROGRAMS = fishsupper
- 
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch
deleted file mode 100644
index 3ca63cb4a68b..000000000000
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-gcc6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Bug: https://bugs.gentoo.org/610660
-
---- a/src/Settings_screen.cpp
-+++ b/src/Settings_screen.cpp
-@@ -217,3 +217,7 @@
- 
- // **************************************************
- 
-+const float FS::Settings_screen::bold = 1.0;
-+const float FS::Settings_screen::faded = 0.2;
-+
-+// **************************************************
---- a/src/Settings_screen.h
-+++ b/src/Settings_screen.h
-@@ -71,8 +71,8 @@
-         static const int tick1_x = 252;
-         static const int tick_y_offset = 33;
-         static const int sprite_texture_start = FS_gfx::JOYSTICK;
--        static const float bold = 1.0;
--        static const float faded = 0.2;
-+        static const float bold;
-+        static const float faded;
- 
-         Settings* settings_ptr;
-         int current_option;
---- a/src/Star_particle_system.cpp
-+++ b/src/Star_particle_system.cpp
-@@ -137,6 +137,10 @@
- } // FS::Star_particle_system::launch_new_star
- 
- // **************************************************
-+
-+const float FS::Star_particle_system::lifespan = 1500.0;
-+
-+// **************************************************
- // **************************************************
- // **************************************************
- // **************************************************
---- a/src/Star_particle_system.h
-+++ b/src/Star_particle_system.h
-@@ -77,7 +77,7 @@
-         static const int STAR_WIDTH = 30;
-         static const int STAR_HEIGHT = 30;
-         // This is a float so that we get floating-point division in update.
--        static const float lifespan = 1500.0;   // in ms
-+        static const float lifespan;   // in ms
-     
-         // A particle is basically a lightweight sprite.
-         // Unlike a usual sprite, we don't need to worry about
diff --git a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch b/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
deleted file mode 100644
index 2be91b65a16d..000000000000
--- a/games-arcade/fishsupper/files/fishsupper-0.1.6-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/main.cpp.old	2012-06-24 18:35:27.661894094 +0200
-+++ b/src/main.cpp	2012-06-24 18:35:41.041954632 +0200
-@@ -293,7 +293,7 @@
-     
-     if (!ok)
-     {
--        fs_dir = new char[ strlen(".") ];
-+        fs_dir = new char[ strlen(".") + 1];
-         strcpy(fs_dir, ".");
-     } // if ... else
-     
diff --git a/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild b/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
deleted file mode 100644
index e73b4a0b1d7d..000000000000
--- a/games-arcade/fishsupper/fishsupper-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A simple arcade/puzzle game, loosely based on the retro classic Frogger"
-HOMEPAGE="https://sourceforge.net/projects/fishsupper/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="CC-BY-SA-2.5 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,video,opengl,X]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[wav]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon data/images/fs_sprite_042.png ${PN}.png
-	make_desktop_entry ${PN} "Fish Supper"
-}
diff --git a/games-arcade/fishsupper/metadata.xml b/games-arcade/fishsupper/metadata.xml
deleted file mode 100644
index 06f43265c42e..000000000000
--- a/games-arcade/fishsupper/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fishsupper</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/frozen-bubble-2.2.1_beta1-r1 b/games-arcade/frozen-bubble-2.2.1_beta1-r1
new file mode 100644
index 000000000000..bf33172e71f1
--- /dev/null
+++ b/games-arcade/frozen-bubble-2.2.1_beta1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-lang/perl-5.12 dev-libs/glib:2 >=dev-perl/Alien-SDL-1.413 dev-perl/Compress-Bzip2 dev-perl/File-ShareDir dev-perl/File-Slurp dev-perl/File-Which dev-perl/IPC-System-Simple >=dev-perl/SDL-2.511 media-libs/sdl-image[gif,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-pango media-libs/sdl-ttf virtual/libiconv virtual/perl-Getopt-Long virtual/perl-IO virtual/pkgconfig dev-perl/Locale-Maketext-Lexicon virtual/perl-ExtUtils-CBuilder virtual/perl-ExtUtils-ParseXS dev-perl/Module-Build >=sys-apps/sed-4 dev-lang/perl:=
+DESCRIPTION=A Puzzle Bubble clone written in perl (now with network support)
+EAPI=6
+HOMEPAGE=http://www.frozen-bubble.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.12 dev-libs/glib:2 >=dev-perl/Alien-SDL-1.413 dev-perl/Compress-Bzip2 dev-perl/File-ShareDir dev-perl/File-Slurp dev-perl/File-Which dev-perl/IPC-System-Simple >=dev-perl/SDL-2.511 media-libs/sdl-image[gif,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-pango media-libs/sdl-ttf virtual/libiconv virtual/perl-Getopt-Long virtual/perl-IO dev-lang/perl:=
+SLOT=0
+SRC_URI=http://www.frozen-bubble.org/data/frozen-bubble-2.2.1-beta1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4dd24c11237a97b45ff2a91a8923c153
diff --git a/games-arcade/frozen-bubble/Manifest b/games-arcade/frozen-bubble/Manifest
deleted file mode 100644
index 7c1cff27837b..000000000000
--- a/games-arcade/frozen-bubble/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX frozen-bubble-2.2.1_beta1-Werror.patch 734 BLAKE2B fae9324386d2b0a185dc201970a7157bd2effee029f220ec4d0fc3e502fc712182a4edef0c02cbe0a59809c359ba6ccb70ee235837f4cafecb5950f2583ee1d5 SHA512 37f9f3f6e070a1f7af818f36ab2f9fb542937bd8034a42d962f34c80011b5c9f7fbef94b4ff065ca8a732e5a78615968108637c09a63c775518d9b7ebeea1b2e
-AUX frozen-bubble-2.2.1_beta1-fix-buffer-size.patch 2787 BLAKE2B fa2194d333263f3b521d971c95498d86838bf1188bf4d049a52a83d9afb6e42debd6736c021e35859b11a1283612eecd468ae81fddc4a3331b55a79e6bd47c90 SHA512 413012993a3f9cf16f4db1b66dec1b87c5a62c5b8e8fabb9d4bd689dea935e71ce9c12b213cd0687f2d6f106828d90486d84258385da778122ad6c8e6a61e23c
-DIST frozen-bubble-2.2.1-beta1.tar.bz2 22424798 BLAKE2B 70d23961c45e10cca38afcd7bdbf407dcefde1248af87df7768fe99fc0d926740096942007ba871d57db6095f3ca4bfa126f30ab60514ba3c6eb5fb7759d96aa SHA512 a5d1432195bc41b2823678986fe71223acf5c740636a871758e6337072c74a84bca7aa7088af7b299586e4e261521ae0b3341805692ab684d93e85f52174b1ac
-EBUILD frozen-bubble-2.2.1_beta1-r1.ebuild 1714 BLAKE2B 31329a6a2f4e350ca79f67b5ac1800318127a4a4b88bb84ec2775a141fbfa943cec9e8625a7b725227a4fbdb43d6e43c7f9595cf643724c5709d6f4d6f9f4066 SHA512 aaf0b5701a8a8a79bb306fa34cf24b2d665c604fbbb885940704618c38bbe449259f0f5a3529c7d26fab5816b795a473d9ec8c194e6cb4ba5e5c3036909f92cc
-MISC metadata.xml 540 BLAKE2B 63ce258abd43c328f0837722d96017f63013cf9135e33e0767a5bd2998d24133d3600ea8cd71d1a51bf5a6b80fa07073874d1f28b9168c36671f15ab72af56ae SHA512 71aabe570ce8682e1d3b9ee9fc2c8c9efd06eef8f33623310180e811fbf06b4a9d0456cf2ea78bda6cbd69a208f8abf1dac3855bcbf41aa121b7acbb4ba33ccc
diff --git a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch b/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch
deleted file mode 100644
index 0573e50fee94..000000000000
--- a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-Werror.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Feb 10 14:48:58 UTC 2013
-Subject: remove Werror compiler flag wrt #456654
-
---- a/inc/My/Builder.pm
-+++ b/inc/My/Builder.pm
-@@ -123,7 +123,7 @@
-             push @ofiles, $cbuilder->compile(
-                 source               => catfile($server_directory, $cfile),
-                 extra_compiler_flags => [
--                    qw(-g -Wall -Werror -pipe), # verbatim from Makefile
-+                    qw(-Wall), # verbatim from Makefile
-                     '-I' . $server_directory, # does not seem to be necessary
-                     $cbuilder->split_like_shell(`pkg-config glib-2.0 --cflags`),
-                     $cbuilder->split_like_shell(`pkg-config glib-2.0 --libs`),
diff --git a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-fix-buffer-size.patch b/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-fix-buffer-size.patch
deleted file mode 100644
index b1b3bfcb1edb..000000000000
--- a/games-arcade/frozen-bubble/files/frozen-bubble-2.2.1_beta1-fix-buffer-size.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From aa2ce32185b4477e659ed7c70d09c440610ef67b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 2 Feb 2018 12:44:15 +0100
-Subject: [PATCH] Fix buffer size when formatting current date
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-gcc-8 and glibc-2.26.9000 reports this error:
-
-server/log.c:64:54: error: '%03d' directive output may be truncated writing between 3 and 11 bytes into a region of size between 0 and 49 [-Werror=format-truncation=]
-     snprintf(current_date, sizeof(current_date), "%s.%03d", buf, (int)(1000 * (time-seconds)));
-                                                      ^~~~
-
-This patch fixes two mistakes in the get_current_date() function:
-
-First strftime() can fail and then buf content is undefined. The patch
-makes sure the buf content is properly null-termited.
-
-Second if strftime() uses up the the whole buf array, no space will be
-left for appending miliseconds to current_date value in the subsequent
-snprintf() call. The patch increases current_data size so that things
-will always fit.
-
-In reality, all this should not matter because sane strftime() will
-return fixed-lenght string. But for all the cases and for sake of the
-compiler check this patch should be applied.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- server/log.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/server/log.c b/server/log.c
-index 2fe7b7c..f696752 100644
---- a/server/log.c
-+++ b/server/log.c
-@@ -52,15 +52,17 @@ double get_current_time_exact(void)
-     return (double) now.tv_sec + now.tv_usec / 1e6;  // bad bad idea to use float as precision is not down to the seconds then
- }
- 
--char current_date[50];
-+char current_date[70];
- char* get_current_date(void) 
- {
-     struct tm * lt;
-     char buf[50];
-     double time = get_current_time_exact();
-     time_t seconds = (time_t)time;
-+    size_t length;
-     lt = localtime(&seconds);
--    strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", lt);
-+    length = strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", lt);
-+    buf[length] = '\0';
-     snprintf(current_date, sizeof(current_date), "%s.%03d", buf, (int)(1000 * (time-seconds)));
-     return current_date;
- }
-diff -up frozen-bubble-2.2.1-beta1/server/log.h~ frozen-bubble-2.2.1-beta1/server/log.h
---- frozen-bubble-2.2.1-beta1/server/log.h~	2010-08-07 15:36:27.000000000 +0200
-+++ frozen-bubble-2.2.1-beta1/server/log.h	2018-02-08 14:09:52.472451694 +0100
-@@ -23,7 +23,7 @@
- time_t get_current_time(void);
- double get_current_time_exact(void);
- 
--extern char current_date[50];
-+extern char current_date[70];
- char* get_current_date(void);
- 
- enum output_types { OUTPUT_TYPE_DEBUG, OUTPUT_TYPE_CONNECT, OUTPUT_TYPE_INFO, OUTPUT_TYPE_ERROR };
diff --git a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild b/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild
deleted file mode 100644
index 9315ab5159ba..000000000000
--- a/games-arcade/frozen-bubble/frozen-bubble-2.2.1_beta1-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MY_P="${P/_/-}"
-
-inherit desktop gnome2-utils perl-module toolchain-funcs
-
-DESCRIPTION="A Puzzle Bubble clone written in perl (now with network support)"
-HOMEPAGE="http://www.frozen-bubble.org/"
-SRC_URI="http://www.frozen-bubble.org/data/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/perl-5.12
-	dev-libs/glib:2
-	>=dev-perl/Alien-SDL-1.413
-	dev-perl/Compress-Bzip2
-	dev-perl/File-ShareDir
-	dev-perl/File-Slurp
-	dev-perl/File-Which
-	dev-perl/IPC-System-Simple
-	>=dev-perl/SDL-2.511
-	media-libs/sdl-image[gif,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-pango
-	media-libs/sdl-ttf
-	virtual/libiconv
-	virtual/perl-Getopt-Long
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-perl/Locale-Maketext-Lexicon
-	virtual/perl-ExtUtils-CBuilder
-	virtual/perl-ExtUtils-ParseXS
-	dev-perl/Module-Build
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	perl-module_src_prepare
-	eapply "${FILESDIR}"/${P}-Werror.patch
-	eapply "${FILESDIR}"/${P}-fix-buffer-size.patch
-}
-
-src_configure() {
-	LD=$(tc-getCC) perl-module_src_configure
-}
-
-src_compile() {
-	LD=$(tc-getCC) perl-module_src_compile
-}
-
-src_install() {
-	mydoc="AUTHORS Changes HISTORY README" perl-module_src_install
-	newdoc server/README README.server
-	newdoc server/init/README README.server.init
-
-	local res
-	for res in 16 32 48 64; do
-		newicon -s ${res}  share/icons/frozen-bubble-icon-${res}x${res}.png ${PN}.png
-	done
-
-	make_desktop_entry ${PN} Frozen-Bubble
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/frozen-bubble/metadata.xml b/games-arcade/frozen-bubble/metadata.xml
deleted file mode 100644
index 7f5d7f12567e..000000000000
--- a/games-arcade/frozen-bubble/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Full-featured, colorful animated penguin eyecandy, 100 levels of 1p game, hours and hours of 
-2p game, a level-editor, 3 professional quality 20-channels music tracks, 15 stereo sound 
-effects, 7 unique graphical transition effects.
-
-You need this game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/funnyboat-1.5-r2 b/games-arcade/funnyboat-1.5-r2
new file mode 100644
index 000000000000..888feef04681
--- /dev/null
+++ b/games-arcade/funnyboat-1.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A side scrolling shooter game starring a steamboat on the sea
+EAPI=6
+HOMEPAGE=http://funnyboat.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2 MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygame-1.6.2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/funnyboat/funnyboat-1.5-src.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=213ec935db304147d1c7cb7ffac3acc2
diff --git a/games-arcade/funnyboat/Manifest b/games-arcade/funnyboat/Manifest
deleted file mode 100644
index 5687f30dd70e..000000000000
--- a/games-arcade/funnyboat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST funnyboat-1.5-src.zip 3839990 BLAKE2B 30576f2bb20a236d518a5aca1b173d0e6f876a8411eef87d85950059536b3c6f1801b6f5a498d854ce6f390911ecc3a604f3c9bd438692943721b064f9c6d708 SHA512 7d38070e73825602d6f0a82e810fe8937fe919ce12f6e802ee25147ca1a2333c2b90821d92e20b8e071070505099bf9ec562e8c7b8cd8d241c3021b840e707cc
-EBUILD funnyboat-1.5-r2.ebuild 1022 BLAKE2B 4a331176a7aa4fcd8c1499a770bbdf1e72d0250b7d105e919cd78fd57085ead0a28b97d2e8b9f0f30e0c8c825f8c7837fc646a68b1e4b0138527c774149e2d13 SHA512 ac6255baed93c06813c03ccd503a79e6085bbf693488574491369b191a57bafe56703665613d6c9e696760a332b702a4df05c2e7d8fa162928ec1af154058bb8
-MISC metadata.xml 332 BLAKE2B 0f043d28ad918706a08b16364c276af4e7cb3c7f686d799ccf40e54a673d87eceb011a1c72bff3332ce2ca2a9ea62268365f00c26b5bbc5d1f0f4a367522441f SHA512 840d32294f544c648307a82c390a64aea38a6f2931734e377d576ceff26047d9dbff9486d60b0164570a4826fbd148a5af14528c336aa41c4ad6dd51790095b7
diff --git a/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild b/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
deleted file mode 100644
index 64866dc95d95..000000000000
--- a/games-arcade/funnyboat/funnyboat-1.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A side scrolling shooter game starring a steamboat on the sea"
-HOMEPAGE="http://funnyboat.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	>=dev-python/pygame-1.6.2[${PYTHON_USEDEP}]"
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r data *.py
-	python_optimize "${ED%/}"/usr/share/${PN}
-
-	dodoc *.txt
-
-	make_wrapper ${PN} "${EPYTHON} main.py" /usr/share/${PN}
-
-	newicon -s 32 data/kuvake.png ${PN}.png
-	make_desktop_entry ${PN} "Trip on the Funny Boat"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/funnyboat/metadata.xml b/games-arcade/funnyboat/metadata.xml
deleted file mode 100644
index 5d2ebb097195..000000000000
--- a/games-arcade/funnyboat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">funnyboat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/gav-0.9.0-r1 b/games-arcade/gav-0.9.0-r1
new file mode 100644
index 000000000000..e19b13b0dbc8
--- /dev/null
+++ b/games-arcade/gav-0.9.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/sdl-image[jpeg,png] media-libs/sdl-net media-libs/libsdl[joystick,video]
+DESCRIPTION=GPL Arcade Volleyball
+EAPI=6
+HOMEPAGE=http://gav.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-image[jpeg,png] media-libs/sdl-net media-libs/libsdl[joystick,video]
+SLOT=0
+SRC_URI=mirror://sourceforge/gav/gav-0.9.0.tar.gz mirror://gentoo/fabeach.tgz mirror://gentoo/florindo.tgz mirror://gentoo/inverted.tgz mirror://gentoo/naive.tgz mirror://gentoo/unnamed.tgz mirror://gentoo/yisus.tgz mirror://gentoo/yisus2.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=93cb214a464f9c35223c91f019136ab1
diff --git a/games-arcade/gav/Manifest b/games-arcade/gav/Manifest
deleted file mode 100644
index eb00599926d9..000000000000
--- a/games-arcade/gav/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX gav-0.9.0-gcc43.patch 205 BLAKE2B c0f25a3f0eed1ca502a349f212bdc2609404721d500cada1b048459adda9fd4242a1e9fef5e8bb5b31feb944fb643aabbc442c31205e1a888a510d4a1e5fa5af SHA512 bce41254f527e007fb44d8616ab2cfce7f55236bb23cc9d456b8757e7521f38ad2926617a996c9b6677d91cbc3cfcd8eb1c4f43cdf53861d946cd53115761b2b
-AUX gav-0.9.0-ldflags.patch 750 BLAKE2B ef3184794f42513fbe582c48b1b82d0c33b71fb8f72d709ff187ee2f247a509eb332561de786e94c62b64ce0f2ca51a342870365db8eeda82ea04a99f902093d SHA512 95239c11a59311920d255449bb5ed40c962ab331bc705b1107a42d18b6581aa800c7c08562d0887f844bb231c87d639ec087b925f8ffc44a4e20dd63a3fd6a5a
-DIST fabeach.tgz 163750 BLAKE2B d5cf3ef38925515caae67d78bc1623bd1ee5669d1d25d122023bbfe1deb59ef7f12859d4bcac95bc43f3a3c4b88208742b91b3acb73a16945f0e8356059a8e6a SHA512 c0ce8e20a2bece7beeb66a036abcffa1394fcddc0aa255fe244e86548b2c0d7ec4a72a903f2108a44e84590d9986ee6729d67e5ec103b867bbde01772d524978
-DIST florindo.tgz 175052 BLAKE2B 5c03691265fec40b3a20903383f070ccfe8527e06cb18cf5e65f32fcf16d17e8e6e56890790802ffeb9262f9933291a0bb1ca22c38f54cbcd5a00e346b4304b7 SHA512 91a42c209d9370f42a7918ea0b6b63ed9c2dcacdbf3051dc2535293b2e2a9b1b53795a7db476fd5c7b3da9682b5ddaf8a2ceab50bc4bdeefde33416de82197dc
-DIST gav-0.9.0.tar.gz 137729 BLAKE2B 15b27ed4019dd9306e629721e59c075b2189c180cc5b4ec866ce1007578ca9e9f8a85bfcb1d22bb7fecd4a6b39b4c62c48ed7e9268e22475bced8c4c8c925a34 SHA512 e702269371dc8ed4ce4415a24a703ef6c3604af69f2e0c548a48f282d812b4f3f76f74cb36a6036889b9e3628b844d2fa41e2cfde5b0fe647bceadc64c087a9f
-DIST inverted.tgz 35554 BLAKE2B 0bdd8ac39ec47ce9c3135cf3b59da1265726f5ea99ffbe9c64d05e314afa7bb26ea2c4ac87c5daa978c6ac9f2cdf2db6125aadac46437b9b8f4970459895f550 SHA512 a05bf4d580dcf509cfacf7bf8c8ab12e363dfcf646f24761daffd251bdaa15bc1df087b9d6618f70e1e6b17ac8bdbcaca18d6fe982938df2016dc4eaaafe0c04
-DIST naive.tgz 80169 BLAKE2B c2273b0056194d50ff7499c9440c0dd45175609bcb4ccab90957239e5c5230c845735a9b4963becdfa35a87aab33b2609bba38a00406a3c37e6c766a9dd5c225 SHA512 c962b4fa1dac20f1f1af46e816ed5fc1d46b58438391f1f496a24960a464b515ed296490bf113e5f6c428ea7f740e0bbc9d4343088f5a9da4c00909a5d584c9a
-DIST unnamed.tgz 156406 BLAKE2B db88b9863ca309b9b3236dd5940642912cd4a7fd1584b842171b65033f8c47fcc6d0eb9185d3759059f4648442b446c47c0dac21c1cb37a07850703ca04f1996 SHA512 530084b5e49e40447cb68545fb4b01f837e74efa3bfb9a110f13037a7f6c135e23f9ed49837abe918a8b393226f90a2d206e5bfd2f4e60335ebf7bc4e8341673
-DIST yisus.tgz 131021 BLAKE2B b095277fdf33968b2b5d28b2e737a465a09f34b6c570d0bdb7e3be2a0c36d8d0ae4d62d14e427a139e035343faf6b1972677fa94c4aa4b787a3ce79ab3c0a137 SHA512 2494e10998bf73c369e6591edeca4c466dfdba1901ca69d96838e0310eb36c94690b9fd6df3c0aa91e0ac611ec414acf402f532145eb795a43e15406aed4c604
-DIST yisus2.tgz 117923 BLAKE2B 57770e7326cbe203aca03d37411c8f9267e9ebbd3a104d91e5e4519eb22439066bf8ef7a5eb46476103731faf0c9726eda74351c01a5ae50c6265db49409d2e6 SHA512 a063908230e9085536322481bf511cc3f3df3997d27dd83e9f976762670e2bdbebc634c2566549fe856ddc93302422cf8676147937d2cbbcf7262e722c999f4d
-EBUILD gav-0.9.0-r1.ebuild 1485 BLAKE2B 50430334e0d1ce99ad94ba96222e6a0aafcab743d3a2d95a764400e8074526fb612145d1521b13fb745de490851944df6b16af39675dfd30814dffe6548df5da SHA512 54da3dc7b644b905280dc9a01ad482a091e4a7dce42acc304a21a899bf624de0ccfcf2253e123a4b9c4cef7f6959fd93f87e1d4d184b45a640b354856ca7b734
-MISC metadata.xml 326 BLAKE2B 8975ed6ba9c69a5ca31562e37d19841bd3e8ed53604b2d2dee7d188d510f167d8c154ae1337bf7195cdc9aca9badc3e86bf210e4fdc89016cb8b134660977845 SHA512 be67de8c13d7163c370e9f884dc50665720cd899c4f7d76859734751bf494f561a93fe344f04753180e27c0f854c4020dec2d9611f44d547c7b613aad705d9d7
diff --git a/games-arcade/gav/files/gav-0.9.0-gcc43.patch b/games-arcade/gav/files/gav-0.9.0-gcc43.patch
deleted file mode 100644
index c9b8a6e588bf..000000000000
--- a/games-arcade/gav/files/gav-0.9.0-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Configuration.cpp
-+++ b/Configuration.cpp
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <string>
- #include <iostream>
-+#include <cstring>
- #include "Configuration.h"
- #include "ControlsArray.h"
- 
diff --git a/games-arcade/gav/files/gav-0.9.0-ldflags.patch b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
deleted file mode 100644
index dd49e6161660..000000000000
--- a/games-arcade/gav/files/gav-0.9.0-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/CommonHeader.old	2010-10-12 13:08:23.000000000 +0200
-+++ b/CommonHeader	2010-10-12 13:08:48.000000000 +0200
-@@ -31,9 +31,9 @@
- endif
- 
- ifdef NET
--LDFLAGS= `sdl-config --libs` -lSDL_image -lSDL_net -lm
-+LDLIBS= `sdl-config --libs` -lSDL_image -lSDL_net -lm
- else
--LDFLAGS= `sdl-config --libs` -lSDL_image -lm
-+LDLIBS= `sdl-config --libs` -lSDL_image -lm
- endif
- 
- SRCS	= 	$(wildcard *.cpp)
---- a/Makefile.Linux.old	2010-10-12 14:36:47.000000000 +0200
-+++ b/Makefile.Linux	2010-10-12 14:37:02.000000000 +0200
-@@ -38,8 +38,7 @@
- 	$(MAKE) -C $(@D:%_module.o=%)
- 
- gav:	$(ALL_OBJ) $(OFILES)
--	$(CXX) -o gav $(OFILES) $(ALL_OBJ) $(LDFLAGS)
--	strip gav
-+	$(CXX) $(LDFLAGS) -o gav $(OFILES) $(ALL_OBJ) $(LDLIBS)
- 
- clean:
- 	for i in $(SUBDIRS) ; do \
diff --git a/games-arcade/gav/gav-0.9.0-r1.ebuild b/games-arcade/gav/gav-0.9.0-r1.ebuild
deleted file mode 100644
index d039cac137a7..000000000000
--- a/games-arcade/gav/gav-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="GPL Arcade Volleyball"
-HOMEPAGE="http://gav.sourceforge.net/"
-# the themes are behind a lame php-counter script.
-SRC_URI="mirror://sourceforge/gav/${P}.tar.gz
-	mirror://gentoo/fabeach.tgz
-	mirror://gentoo/florindo.tgz
-	mirror://gentoo/inverted.tgz
-	mirror://gentoo/naive.tgz
-	mirror://gentoo/unnamed.tgz
-	mirror://gentoo/yisus.tgz
-	mirror://gentoo/yisus2.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-net
-	media-libs/libsdl[joystick,video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	local d
-
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-
-	for d in . automa menu net ; do
-		cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed"
-	done
-
-	eapply "${FILESDIR}"/${P}-gcc43.patch
-	sed -i \
-		-e "/^CXXFLAGS=/s: -g : ${CXXFLAGS} :" CommonHeader \
-		|| die "sed failed"
-
-	# Now, move the additional themes in the proper directory
-	mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes
-
-	# no reason to have executable files in the themes
-	find themes -type f -exec chmod a-x \{\} \;
-}
-
-src_compile() {
-	# bug #41530 - doesn't like the hot parallel make action.
-	emake -C automa
-	emake -C menu
-	emake -C net
-	emake
-}
-
-src_install() {
-	dodir /usr/bin
-	emake ROOT="${D}" install
-	insinto /usr/share/${PN}
-	doins -r sounds
-	einstalldocs
-}
diff --git a/games-arcade/gav/metadata.xml b/games-arcade/gav/metadata.xml
deleted file mode 100644
index 474d81b5edf8..000000000000
--- a/games-arcade/gav/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gav</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/gish-demo-1.6-r1 b/games-arcade/gish-demo-1.6-r1
new file mode 100644
index 000000000000..dc1c5ac16d78
--- /dev/null
+++ b/games-arcade/gish-demo-1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=Play as an amorphous ball of tar that rolls and squishes around
+EAPI=6
+HOMEPAGE=http://www.chroniclogic.com/gish.htm
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl media-libs/libvorbis virtual/opengl x11-libs/libX11 >=media-libs/openal-1.6.372
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=http://www.chroniclogic.com/demos/gishdemo.tar.gz -> gish-demo-1.6.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_=880a00b48c69ccc07d6290fba4f1bc7f
diff --git a/games-arcade/gish-demo/Manifest b/games-arcade/gish-demo/Manifest
deleted file mode 100644
index 952d80898446..000000000000
--- a/games-arcade/gish-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gish-demo-1.6.tar.gz 12712912 BLAKE2B bb482ba341e688056a45077d6a6832e13e1a9785cbefbb7e76b7875e9df22f33f324a515ca3465bb3f4c4a34d1577b5eddf5ff7793d35556958b3f11d81f9f7f SHA512 2d6f37b8a7971ada524c75bafcbe7e92fd3dbb96677774b0295aad2553e6094027f9b43da8318f20071679412f95dd66ab9738178ffec4f853cf1845d536a0a6
-EBUILD gish-demo-1.6-r1.ebuild 853 BLAKE2B 5b61acfa8fe5adc8bd4a13399e10eed2b892a3c5a27de3eed586087aa246c30c84239e4f4f84d6d89590ccc32ee62ea32489eaba819644731ab49c35f0300ba5 SHA512 65d510e99125d1154dbe0b7377428018bbcf660070676a753f23f9f07fc94b4389ac1e2067ce24190e5b86991c307107548174964ba2d95e177284e9f955dc4d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild b/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
deleted file mode 100644
index 1116e16d52ec..000000000000
--- a/games-arcade/gish-demo/gish-demo-1.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Play as an amorphous ball of tar that rolls and squishes around"
-HOMEPAGE="http://www.chroniclogic.com/gish.htm"
-SRC_URI="http://www.chroniclogic.com/demos/gishdemo.tar.gz -> ${P}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/gish"
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/libvorbis
-	virtual/opengl
-	x11-libs/libX11
-	>=media-libs/openal-1.6.372
-"
-DEPEND=""
-
-S="${WORKDIR}/gishdemo"
-
-src_install() {
-	local dir=/opt/${PN}
-	local gishbin=gishdemo
-	use amd64 && gishbin=gishdemo_64
-
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/${gishbin}
-	make_wrapper gish ./${gishbin} "${dir}"
-
-	einstalldocs
-}
diff --git a/games-arcade/gish-demo/metadata.xml b/games-arcade/gish-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/gish-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/gnake-0.94b-r1 b/games-arcade/gnake-0.94b-r1
new file mode 100644
index 000000000000..ef1af15696f3
--- /dev/null
+++ b/games-arcade/gnake-0.94b-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=An ncurses-based Nibbles clone
+EAPI=6
+HOMEPAGE=http://lightless.org/gnake
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=mirror://gentoo/Gnake.0.94b.tar.gz
+_md5_=bdae1be3982434f3ae9a9ba573a7f8e4
diff --git a/games-arcade/gnake/Manifest b/games-arcade/gnake/Manifest
deleted file mode 100644
index 7269367d211e..000000000000
--- a/games-arcade/gnake/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Gnake.0.94b.tar.gz 6656 BLAKE2B 2b230246b6dbb3ae9dcb3ed1dabf9f49c594180cb4e624e8e7cfb7c36823f64a0c60ec378773fea3fd1af5e036b8df98a3603b648e71f14a8e5523982aad5e83 SHA512 c5fb84cd8dc0a1b88f9eb6139f898515d109e2de0786284a4fa85f5efc0967ef02c2458d0e7f783d31fbd9a41e0f4114f7bd00717042ac9b2ca9ce4dc18e7fb7
-EBUILD gnake-0.94b-r1.ebuild 519 BLAKE2B c7cc497bd3fb9d48ebb788d08c7c9c2b71dc836dc33f8609eb2bae652e53ae683531d6ccdd8b12e5e6758564d6a78a4411853085a6e999c5cfbadaf9b5894f08 SHA512 4a37dfc20344b12c4b64d7d0d35224ed84a64de1e5b1cbfc42d2615e41101ff2148c67363a55f0c631ac4b8eaf4301cb98d44b2a551c7c0c678ecf0b6aa5c381
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gnake/gnake-0.94b-r1.ebuild b/games-arcade/gnake/gnake-0.94b-r1.ebuild
deleted file mode 100644
index a1cce857258b..000000000000
--- a/games-arcade/gnake/gnake-0.94b-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An ncurses-based Nibbles clone"
-HOMEPAGE="http://lightless.org/gnake"
-SRC_URI="mirror://gentoo/Gnake.${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake LDLIBS="$(pkg-config ncurses --libs)" gnake
-}
-
-src_install() {
-	dobin gnake
-	einstalldocs
-}
diff --git a/games-arcade/gnake/metadata.xml b/games-arcade/gnake/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/gnake/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/gnome-nibbles-3.24.0 b/games-arcade/gnome-nibbles-3.24.0
new file mode 100644
index 000000000000..ab8237bfa150
--- /dev/null
+++ b/games-arcade/gnome-nibbles-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50.2 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Nibbles clone for Gnome
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Nibbles
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40.0:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=media-libs/clutter-1.22.0:1.0 >=media-libs/clutter-gtk-1.4.0:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.18.0:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8bdcd524038763103f29814d5eb5012a
diff --git a/games-arcade/gnome-nibbles/Manifest b/games-arcade/gnome-nibbles/Manifest
deleted file mode 100644
index 9a2d53986c6c..000000000000
--- a/games-arcade/gnome-nibbles/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-nibbles-3.24.0.tar.xz 1614604 BLAKE2B 04ba4f761bf21af466cb7761a8d7ac511f92871548df9e8ff8950efe6ea95c3674e00360dc9c3e02ce670dc66ae7639094c9c8c53fe0a0134089db976976ce99 SHA512 716a79541fa8dd0f86cce5bc211574d4ad50f762bb2b74a2881ad4adcdde47520784f67672e2da3fb33fbc60928d710a2afebb8997d6dd10f633289e0d8163b7
-EBUILD gnome-nibbles-3.24.0.ebuild 753 BLAKE2B 565574cace28e1371697bd7feae61748410817f7429efef86021708a04237e6ac697b15a90f9649a96a68646628d76861e20d580124e0aba772b4d05a1079a5a SHA512 9025a2dc26d2e6ffb63803b89a9a632dc6d79f77ce69fba88d8bdcf3d0e9179bbc4266958cc32d7ae2c05e4f8f893d40b733ff563786f30b5e2655ad9b4a22b4
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild
deleted file mode 100644
index 73d8d93cec93..000000000000
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Nibbles clone for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40.0:2
-	dev-libs/libgee:0.8=
-	dev-libs/libgnome-games-support:1
-	>=media-libs/clutter-1.22.0:1.0
-	>=media-libs/clutter-gtk-1.4.0:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.18.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50.2
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-arcade/gnome-nibbles/metadata.xml b/games-arcade/gnome-nibbles/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-arcade/gnome-nibbles/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/gnome-robots-3.22.3 b/games-arcade/gnome-robots-3.22.3
new file mode 100644
index 000000000000..2ea97990af04
--- /dev/null
+++ b/games-arcade/gnome-robots-3.22.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.36.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Avoid the robots and make them crash into each other
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Robots
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.36.2:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-robots/3.22/gnome-robots-3.22.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9642cede293a0fd41cd9888cbf14072b
diff --git a/games-arcade/gnome-robots/Manifest b/games-arcade/gnome-robots/Manifest
deleted file mode 100644
index 71f0beec25bc..000000000000
--- a/games-arcade/gnome-robots/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-robots-3.22.3.tar.xz 540824 BLAKE2B 2f6943b97878d37da8c8a59cc7752b2c0eba35bc9eea1cf4b8a221fbae59ec4730af2ae71b25f2e946ee1edcabdb1a72a67cb1754350728b737fa26e3f9193e3 SHA512 d521527d9ceab16f4e3c64677044c87e46f38291ff126cc2280f69100750cb0317e6ad45e8a0abaa4dad38b67b958cac66653c33ba7760a410354f9190c02399
-EBUILD gnome-robots-3.22.3.ebuild 608 BLAKE2B 862f3d74b4608cca0fc24c879020ddfa4ce92cd7f3377784f3294a9164ee548b58c6e16d122debb1b666d66e81b8451fbf02c9b0a6065b45ae2858c72ed11ea1 SHA512 85d173f670859d9720ebcfb25f6a8a01520ab4bd465ae8502c52825a8d5df8e5e2c3f1c6e5bc5aac9b284b3b22d435056975882df28bef3fe273eeef2346c126
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild b/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
deleted file mode 100644
index 6ed2c64fda21..000000000000
--- a/games-arcade/gnome-robots/gnome-robots-3.22.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Avoid the robots and make them crash into each other"
-HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgnome-games-support:1
-	>=gnome-base/librsvg-2.36.2:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-arcade/gnome-robots/metadata.xml b/games-arcade/gnome-robots/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-arcade/gnome-robots/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/gnujump-1.0.8-r1 b/games-arcade/gnujump-1.0.8-r1
new file mode 100644
index 000000000000..96fd2d24870b
--- /dev/null
+++ b/games-arcade/gnujump-1.0.8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl x11-libs/libX11
+DESCRIPTION=Xjump clone with added features
+EAPI=6
+HOMEPAGE=http://gnujump.es.gnu.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://gnu/gnujump/gnujump-1.0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=82ad64e2486d47674ea130e82b28e5bc
diff --git a/games-arcade/gnujump/Manifest b/games-arcade/gnujump/Manifest
deleted file mode 100644
index c8e64b886727..000000000000
--- a/games-arcade/gnujump/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnujump-1.0.8.tar.gz 2508641 BLAKE2B 2e6af8b316cedd37a0d8272ccafe548a62932bfede68bd8debc54d98ce3089c925192ae70f5fe9716fee0a82d3fe6b7cc3b8ca2d506abc2401138b5b7e7032d8 SHA512 fb8a06e17f700ea1e8c264b23a9f286d595cf48cc78efbe60ffdad298bc33ff0ecb2035a1db8281886614fbc8280d2b0c86a2099d55e31bff970f3b3c3caa421
-EBUILD gnujump-1.0.8-r1.ebuild 645 BLAKE2B 5dbdbd10b96b854afb47a197e6fc07cb3129089cc852a04761dbb1e9db2bdfc64a9e988f079272b2e051d9af29bed43e8df4c884644ba1565d80d21da38cadd3 SHA512 ac4c1e29b53b14caa68f636e1da28f16ccfbf94daf8417ecf79ce788cab4e8d10dbcd86d54950e8b5f8f38623f0b19d0fbf0877fbc4aeca409add52083c888c3
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild b/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
deleted file mode 100644
index 271171a2cf0a..000000000000
--- a/games-arcade/gnujump/gnujump-1.0.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="Xjump clone with added features"
-HOMEPAGE="http://gnujump.es.gnu.org"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	virtual/opengl
-	x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	append-libs -lm
-}
-
-src_install() {
-	default
-	einstalldocs
-
-	newicon skins/xjump/hero1.0.png ${PN}.png
-	make_desktop_entry ${PN} "GNUjump"
-}
diff --git a/games-arcade/gnujump/metadata.xml b/games-arcade/gnujump/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/gnujump/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/grande-KXL-0.6-r1 b/games-arcade/grande-KXL-0.6-r1
new file mode 100644
index 000000000000..35eec3c8f1a8
--- /dev/null
+++ b/games-arcade/grande-KXL-0.6-r1
@@ -0,0 +1,12 @@
+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=ZANAC type 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/grande-KXL-0.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4a195d60a7a4f6113ffbdef6a63bda69
diff --git a/games-arcade/grande-KXL/Manifest b/games-arcade/grande-KXL/Manifest
deleted file mode 100644
index 95a4baa4d52f..000000000000
--- a/games-arcade/grande-KXL/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX grande-KXL-0.6-cflags.patch 387 BLAKE2B 6ea42eaaa8f3fc9d97b5de7c613f0998a7fb4b2088ef2d9949013a6d8b74e064c9913c9e8b4dda06650ea214902340d36b19d2545fa0366ddcba688fa433a797 SHA512 a330b5c8b97d941d13c90f5b78709df823d1242765890439a195f6788443c9d13bd5062399d1452eec9f311e6dd88e72d932398f99cdacaa94bc6d080550167c
-AUX grande-KXL-0.6-configure.in.patch 407 BLAKE2B 4e743c52625cffcc44c95657d5dce6bb2c87b6c74e1f6838336210114b15d3aa66dca309673c075293dc8596e56d99d2dbbc1a0c05deaee007cc31026c1962e2 SHA512 a6c5b0c86b40bb8a2236e7df366a5da2510ead498d6648d5c0377f26151854ba99fec0fc0c37be011ca847ba752c135ea3996d5d3a15e5f4bd1d06c85f9fbf2f
-DIST grande-KXL-0.6.tar.gz 240869 BLAKE2B a9109dd37d72ffcfd02b9f160acd89c17d5ae13d53948ecc79718f420cb3826491a6f6b024ca65a12ada76b24110f01a52f502db2de8a736f628eda5c0054a4d SHA512 17916e54b2b2bad25d789bc3d4f182f3f104fd4e5cf7b745bb9613f76ec04a2a3d2740ca89b507ecdb653f1d42b793115e76b5b34d53b96fec3d55574632b980
-EBUILD grande-KXL-0.6-r1.ebuild 729 BLAKE2B d5dbb090529b5f97b832d53ed3f78911271101592872ca5aa4817cdd1524a8210b8aafdb9f0b2f581d57dc7b6541d1daaee51050d15a1a3b6f6dbfee18c92901 SHA512 825f22c2358d13c1176dc6eb8d379e8291daf2c775c8daf5a7bbcdc76256d767efe7641484d46e5028ecc068b114e566d5ab610e3a1c76d5f76ac86c3e670a9d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
deleted file mode 100644
index 94f6ce759b75..000000000000
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Aug  8 19:37:19 UTC 2012
-Subject: build system
-
-respect CFLAGS
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -8,7 +8,7 @@
- 
- SUBDIRS = bmp wav stg
- 
--CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@ @INST_FLAG@ @SCORE_FLAG@
-+AM_CFLAGS = @X_CFLAGS@ @KXL_CFLAGS@ @INST_FLAG@ @SCORE_FLAG@
- LIBS = @X_LIBS@ -lX11 @KXL_LIBS@ -lKXL
- 
- install-data-local:
diff --git a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch b/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
deleted file mode 100644
index 19fec93f61a5..000000000000
--- a/games-arcade/grande-KXL/files/grande-KXL-0.6-configure.in.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -17,12 +17,8 @@
- AC_CHECK_HEADERS(unistd.h)
- 
- dnl installation & score path
--if test "x${prefix}" = "xNONE"; then
--  inst_path="${ac_default_prefix}/games/grande"
--else
--  inst_path="${prefix}/games/grande"
--fi
--score_path="/var/games"
-+inst_path="${datadir}/grande"
-+score_path="${localstatedir}"
- 
- dnl check if installation was disabled
- AC_ARG_ENABLE( install,
diff --git a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild b/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
deleted file mode 100644
index 899a615e6527..000000000000
--- a/games-arcade/grande-KXL/grande-KXL-0.6-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="ZANAC type game"
-HOMEPAGE="http://triring.net/ps2linux/games/kxl/kxlgames.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-games/KXL"
-RDEPEND="${DEPEND}
-	media-fonts/font-adobe-100dpi"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-configure.in.patch
-	"${FILESDIR}"/${P}-cflags.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-	rm aclocal.m4 || die
-	eautoreconf
-}
-
-src_install() {
-	dodir /var/lib
-	default
-
-	newicon src/bmp/boss1.bmp ${PN}.bmp
-	make_desktop_entry grande Grande /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-arcade/grande-KXL/metadata.xml b/games-arcade/grande-KXL/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/grande-KXL/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/gunocide2ex-1.0 b/games-arcade/gunocide2ex-1.0
new file mode 100644
index 000000000000..6190017fd1a9
--- /dev/null
+++ b/games-arcade/gunocide2ex-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis]
+DESCRIPTION=fast-paced 2D shoot'em'up
+EAPI=5
+HOMEPAGE=http://g2ex.sourceforge.net/
+KEYWORDS=~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/g2ex/g2ex-setup.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_=4c962a3e92501cec0c8378651b0c50b8
diff --git a/games-arcade/gunocide2ex/Manifest b/games-arcade/gunocide2ex/Manifest
deleted file mode 100644
index 7e6ef920203d..000000000000
--- a/games-arcade/gunocide2ex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gunocide2ex-1.0-build.patch 5419 BLAKE2B 63ad2cb0bfb48a3d5dbca05135896663f2bc4326e9d8905f140e938054d31600ad2ac7fc6c8c765fd5c90d1faade9c27574d8a848d321269102bdbb9abd71854 SHA512 92c3c2c16b7c4e57e11d79827db349cfb3df20e09c89e7daf8fc178475ea64851f6d79fd259824fe8c98fbed4901c0189ead7f76d3f3c834080369d1231f9692
-AUX gunocide2ex-1.0-glibc2.10.patch 377 BLAKE2B 63fc32459bc8e9eae71e220ee109e0ad5337f6d2714c6e1abf8ed802abf177df109d8572f05064381de65c9f436e01738b3621cbfb61301df90754f6da155b3c SHA512 66c166995981d841ce9a0ee0d6e56d5cc09c3856ccf72abeb4e42457ab6773ca1fdb0000e8be15445152b628dc8719bcb38c0fff30a9602a3592f3f2b6484ada
-DIST g2ex-setup.run 30844481 BLAKE2B 3d59d14e594c1f742d8f39098baeb68c4898f6d04aceefa1b6eeaf6c31378eda492b5984394c1b833e7b47b1360889e74f4e944fbf9721ac8f3456116bd469ca SHA512 e3c861843d88c3b09fa2e579d1be4b0590c04b7b401c7d592cf6b7150fc395445056ba599c0bc6f72ba7044cfc097070751d32bb66aa790e72e2b1c45407f2b2
-EBUILD gunocide2ex-1.0.ebuild 1621 BLAKE2B c3e2afb8399bdbf1c38b50ed6f6f34a70b80cfb51930cfb908338933000d7f2777c67b30299b1439fa71d04244f48c92f289911fa69596535825831f2d6b8de0 SHA512 d99245d55e2c8d5b481ae2c40fb582a50586f719723b2a76c356d69e60d111d12e2db796ff2154305fe54c2895664e6928f38c84c3879c0a0a4353c22b074d5c
-MISC metadata.xml 327 BLAKE2B 78befc8fb90a335e458fc40d096a8dd59c04da0c72b039f7ad816d37693558514d77a40f9bbec5966aa611d2f323a1e12ac44b2dcefda015260e669f3e622887 SHA512 0ad645742ce134798ac8178d859ccdeedc9b060f7d5065b825ac9c9158130e7221c068264ce82e95f066294c045a9440a9aca241484115057ad3a709afad905f
diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
deleted file mode 100644
index 9abce6c01a2b..000000000000
--- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-build.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-diff -ur work.orig/src/cEffects.cpp work/src/cEffects.cpp
---- work.orig/src/cEffects.cpp	2002-01-12 16:19:00.000000000 -0500
-+++ work/src/cEffects.cpp	2009-06-10 18:14:27.000000000 -0400
-@@ -180,7 +180,6 @@
- 	{

- 		if(!i->update())

- 			i=lEffects.erase(i);

--		if(i==NULL)break;

- 	}

- 

-     for(p=lParticles.begin();p!=lParticles.end();++p)

-@@ -190,8 +189,6 @@
- 		if(!p->active())

- 		{

- 			p=lParticles.erase(p);

--			if(p==NULL)

--				break;

- 		}

- 	}

- 

-diff -ur work.orig/src/cFont.cpp work/src/cFont.cpp
---- work.orig/src/cFont.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cFont.cpp	2009-06-10 18:19:15.000000000 -0400
-@@ -62,7 +62,7 @@
- }

- 

- ///l�dt einen TTF-Font ein

--bool cFont::load(char *path,int size)

-+bool cFont::load(const char *path,int size)

- {

- 	font = TTF_OpenFont(path,size);

- 	if(font==NULL)

-diff -ur work.orig/src/cFont.h work/src/cFont.h
---- work.orig/src/cFont.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cFont.h	2009-06-10 18:19:27.000000000 -0400
-@@ -34,7 +34,7 @@
- 	static void		delInstance();
- 	static bool		initttf();
- 
--	bool			load(char *path,int size);
-+	bool			load(const char *path,int size);
- 	void			setcolor(int r,int g,int b);
- 	void			setshader(int r,int g,int b);
- 	void			print(SDL_Surface *screen,int posx,int posy,const char *fmt, ...);
-diff -ur work.orig/src/cParticleSys.cpp work/src/cParticleSys.cpp
---- work.orig/src/cParticleSys.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cParticleSys.cpp	2009-06-10 18:14:27.000000000 -0400
-@@ -81,9 +81,6 @@
- 		if(time-p->getstarttime()>p->getlifetime())
- 		{
- 			p=lParticles.erase(p);
--			if(p==NULL)
--				break;
--			
- 		}
- 	}
- 
-diff -ur work.orig/src/cSound.cpp work/src/cSound.cpp
---- work.orig/src/cSound.cpp	2002-01-12 16:27:34.000000000 -0500
-+++ work/src/cSound.cpp	2009-06-10 18:17:44.000000000 -0400
-@@ -92,7 +92,7 @@
- }

- 

- ///spielt eine ogg-datei ab

--bool cSound::playogg(char *path)

-+bool cSound::playogg(const char *path)

- {

- 	if(!sound_on)

- 		return true;

-diff -ur work.orig/src/cSound.h work/src/cSound.h
---- work.orig/src/cSound.h	2002-01-08 12:30:57.000000000 -0500
-+++ work/src/cSound.h	2009-06-10 18:17:50.000000000 -0400
-@@ -35,7 +35,7 @@
- 
- 	bool			init();
- 	void				close();
--	bool			playogg(char *path);
-+	bool			playogg(const char *path);
- 	void				stopogg();
- 	bool			loadwav(int index,char *path);
- 	void				playwav(int index);
-diff -ur work.orig/src/cSprite.cpp work/src/cSprite.cpp
---- work.orig/src/cSprite.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSprite.cpp	2009-06-10 18:18:34.000000000 -0400
-@@ -29,7 +29,7 @@
- 
- ///l�dt ein BMP in das image-Surface
- ///gibt false zur�ck falls es schief geht
--bool cSprite::loadBMP(char *path)
-+bool cSprite::loadBMP(const char *path)
- {
- 	image=SDL_LoadBMP(path);
- 	if(!image)
-@@ -73,4 +73,4 @@
- int cSprite::getheight()
- {
- 	return image->h;
--}
-\ No newline at end of file
-+}
-diff -ur work.orig/src/cSprite.h work/src/cSprite.h
---- work.orig/src/cSprite.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSprite.h	2009-06-10 18:18:44.000000000 -0400
-@@ -26,7 +26,7 @@
- 	cSprite();
- 	~cSprite();
- 
--	bool 	loadBMP(char *path);
-+	bool 	loadBMP(const char *path);
- 	void 	render(SDL_Surface *screen,int x,int y);
- 	void 	setColorKey(int r,int g,int b);
- 
-diff -ur work.orig/src/cSpriteAnim.cpp work/src/cSpriteAnim.cpp
---- work.orig/src/cSpriteAnim.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSpriteAnim.cpp	2009-06-10 18:20:09.000000000 -0400
-@@ -145,7 +145,7 @@
- }

- 

- ///einladen einer Animation aus einer Datei

--bool cSpriteAnim::load(char *path)

-+bool cSpriteAnim::load(const char *path)

- {

- 	FILE 	*file;

- 	char	buffer[512];

-@@ -248,4 +248,4 @@
- {

- 	if(anim==NULL)return -1;

- 	return gfx_sprite[anim->getAct()].getwidth();

--}
-\ No newline at end of file
-+}

-diff -ur work.orig/src/cSpriteAnim.h work/src/cSpriteAnim.h
---- work.orig/src/cSpriteAnim.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cSpriteAnim.h	2009-06-10 18:20:16.000000000 -0400
-@@ -53,7 +53,7 @@
- 	cSpriteAnim();
- 	~cSpriteAnim();
- 
--	bool	load(char *path);
-+	bool	load(const char *path);
- 	void	setColorKey(int r,int g,int b);
- 	void	render(SDL_Surface *screen,cAnim *anim,int x,int y);
- 	int		getMaxNum();
-diff -ur work.orig/src/cUtil.cpp work/src/cUtil.cpp
---- work.orig/src/cUtil.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cUtil.cpp	2009-06-10 18:16:29.000000000 -0400
-@@ -85,7 +85,7 @@
- }

- 

- ///liest einen wert aus einer config-datei

--char* cUtil::getconfigvalue(char *path,char *value)

-+char* cUtil::getconfigvalue(const char *path,const char *value)

- {

- 	FILE	*file;

- 	char	buffer[512];

-diff -ur work.orig/src/cUtil.h work/src/cUtil.h
---- work.orig/src/cUtil.h	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/cUtil.h	2009-06-10 18:16:39.000000000 -0400
-@@ -31,7 +31,7 @@
- 

- 	void	updatetime();

- 	float 	sync(float Faktor);

--	char*	getconfigvalue(char *path,char *value);

-+	char*	getconfigvalue(const char *path,const char *value);

- 	void	drawpixel(SDL_Surface *screen, int x, int y,Uint8 R, Uint8 G,Uint8 B);

- 	bool	collision(SDL_Rect objekt1,SDL_Rect objekt2);	

- 

-diff -ur work.orig/src/mmgr.cpp work/src/mmgr.cpp
---- work.orig/src/mmgr.cpp	2002-01-02 07:57:46.000000000 -0500
-+++ work/src/mmgr.cpp	2009-06-10 18:14:23.000000000 -0400
-@@ -59,6 +59,7 @@
- #include <time.h>

- #include <stdarg.h>

- #include <new>

-+using namespace std;
- 

- #ifndef	WIN32

- #include <unistd.h>

diff --git a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch b/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
deleted file mode 100644
index 6b659c76a82d..000000000000
--- a/games-arcade/gunocide2ex/files/gunocide2ex-1.0-glibc2.10.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/mmgr.cpp
-+++ src/mmgr.cpp
-@@ -228,9 +228,9 @@
- 

- static	const char	*sourceFileStripper(const char *sourceFile)

- {

--	char	*ptr = strrchr(sourceFile, '\\');

-+	char	*ptr = strrchr((char *)sourceFile, '\\');

- 	if (ptr) return ptr + 1;

--	ptr = strrchr(sourceFile, '/');

-+	ptr = strrchr((char *)sourceFile, '/');

- 	if (ptr) return ptr + 1;

- 	return sourceFile;

- }

diff --git a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild b/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
deleted file mode 100644
index 6b208fb284eb..000000000000
--- a/games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker toolchain-funcs games
-
-DESCRIPTION="fast-paced 2D shoot'em'up"
-HOMEPAGE="http://g2ex.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g2ex/g2ex-setup.run"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself
-	mkdir binary || die
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
-	edos2unix config.cfg
-	sed -i \
-		-e "s:/usr/local/games/gunocide2ex/config\.cfg:${GAMES_SYSCONFDIR}/${PN}.cfg:" \
-		-e "s:/usr/local/games/gunocide2ex/hscore\.dat:${GAMES_STATEDIR}/${PN}-hscore.dat:" \
-		-e "s:memleaks.log:/dev/null:" \
-		src/*.{h,cpp} || die
-	sed -i \
-		-e "s:/usr/local/games:${GAMES_DATADIR}:" \
-		src/*.{h,cpp} $(find gfx -name '*.txt') || die
-}
-
-src_compile() {
-	cd src
-	emake CXXFLAGS="$CXXFLAGS $(sdl-config --cflags)" $(echo *.cpp | sed 's/\.cpp/.o/g')
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -o ${PN} *.o -lpthread -lSDL -lSDL_ttf -lSDL_mixer || die
-}
-
-src_install() {
-	dogamesbin src/${PN}
-	dosym ${PN} "${GAMES_BINDIR}/g2ex"
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r gfx sfx lvl credits arial.ttf
-	insinto "${GAMES_SYSCONFDIR}"
-	newins config.cfg ${PN}.cfg
-	insinto "${GAMES_STATEDIR}"
-	newins hscore.dat ${PN}-hscore.dat
-	dodoc history doc/MANUAL_DE
-	dohtml doc/manual_de.html
-	newicon g2icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gunocide II EX"
-	prepgamesdirs
-}
diff --git a/games-arcade/gunocide2ex/metadata.xml b/games-arcade/gunocide2ex/metadata.xml
deleted file mode 100644
index 3ae017fcc5cc..000000000000
--- a/games-arcade/gunocide2ex/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">g2ex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/holotz-castle-1.3.14-r1 b/games-arcade/holotz-castle-1.3.14-r1
new file mode 100644
index 000000000000..f90a01c75af3
--- /dev/null
+++ b/games-arcade/holotz-castle-1.3.14-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=virtual/opengl virtual/glu media-libs/sdl-mixer media-libs/libsdl media-libs/sdl-ttf media-libs/sdl-image
+DESCRIPTION=2D platform game
+EAPI=6
+HOMEPAGE=http://www.mainreactor.net/holotzcastle/en/index_en.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/sdl-mixer media-libs/libsdl media-libs/sdl-ttf media-libs/sdl-image
+SLOT=0
+SRC_URI=http://www.mainreactor.net/holotzcastle/download/holotz-castle-1.3.14-src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e9507033825a9e09b040bb9c0a105e57
diff --git a/games-arcade/holotz-castle/Manifest b/games-arcade/holotz-castle/Manifest
deleted file mode 100644
index 61fa0df300c8..000000000000
--- a/games-arcade/holotz-castle/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX holotz-castle-1.3.14-build.patch 2278 BLAKE2B 1fc9e92fcbce33277a9535becb700d8159db7dd66581efe87ed272399b67c704535422c6d3484d3e7480cb1934aaf5dd2704e401d9a867867817c02827ac540a SHA512 fd19155ff5f372306b987a4998b0ef9a3ae194bdc75c99d5f276cae50910fef5998dfd244c6ca4cae0b33741334d072876bff7710fabf365712531502345d101
-AUX holotz-castle-1.3.14-gcc44.patch 292 BLAKE2B 9a287237f52ef832839280134263a10c95752bdd131dc9340c1b2731c844f1af9e40785f1219816d1ac5bbdfde1e58013de8c960c3db400c50ab23a17bcdeece SHA512 89ea8aa06c23adc21a88031f02da88476e086ab9ee3147bee1a545cbc6a9b631de2d8b504b0b1b3081a3a62c11df7720ac124ceda788518937652f2ca5a2a118
-AUX holotz-castle-1.3.14-underlink.patch 540 BLAKE2B 443ee944d5f92d81fca16dd7d1ed450edb1e8bc9f93e97fc89dc40b30c8e99dcbd7035b20a11868c9575e3af3304369086c07dcbf012a4bc5d4c6cebca298705 SHA512 29d01cd2404018def02cc7bc44afb9752f7b6fe58f1f8dcf01ce6d41865eae663e26fa159206f55a1d70320aaf5a1556012c0fd0199fdb001f9257571b93d46d
-DIST holotz-castle-1.3.14-src.tar.gz 3691364 BLAKE2B 82ec9336410634d5649eaabe55f69b4cce94d983b1713aa2e7472cec59cd7c1b843a4512a2e11b79c74cc869d96259ea9e21e4bd6d88ddbeeaf8437b63ab13b8 SHA512 129f15a51b13bc80ca068b1ec18cc4ae8bb5b80f11f852b81bff4492dab5bf4edbae714fcaafb197cdedf2b079070ab2f8750790b0b1680204ee7520f1d74576
-EBUILD holotz-castle-1.3.14-r1.ebuild 1157 BLAKE2B 09579ecdefcdab731b4002fe3421f8da07d4624017bf8be63400eedb35aceebb80d45341b210fd1cee18ae073221fb9acf4333f2933a473b0d365da1686df5ff SHA512 dc67b5ad93ae62a8f93084b72a64905a10555f6672a5af2dc19f3c5c802ced5e6b968daf35585119dfc454049f1be053ccf6285b4bbc8ce8eb7fffc0d6a26283
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
deleted file mode 100644
index cdf814546e1d..000000000000
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-build.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- a/JLib/Makefile
-+++ b/JLib/Makefile
-@@ -19,7 +19,7 @@
- endif
- 
- # Define -D_JLIB_DEBUG to debug JLib. Compile the app to debug also with this flag
--CFLAGS=-I. -I/usr/local/include/SDL -O3 -ffast-math -fPIC -Wall -Wshadow `$(SDL_CONFIG) --cflags`
-+CXXFLAGS+=-I. -Wall -Wshadow `$(SDL_CONFIG) --cflags`
- 
- # Sample LDFLAGS for applications
- # LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
-@@ -28,15 +28,14 @@
- 
- # JLib
- libJLib: $(JLIB_OBJS)
--	g++-4.1 -shared -L/usr/lib -fPIC -o $@.so $? \
--	&& ar rvus $@.a $? \
-+	$(AR) rvus $@.a $?
- 
- $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
--	g++-4.1 $(CFLAGS) -c -o $@ $<
-+	$(CXX) $(CXXFLAGS) -c -o $@ $<
- $(UTIL)/%.o: $(UTIL)/%.cpp
--	g++-4.1 $(CFLAGS) -c -o $@ $<
-+	$(CXX) $(CXXFLAGS) -c -o $@ $<
- $(MATH)/%.o: $(MATH)/%.cpp
--	g++-4.1 $(CFLAGS) -c -o $@ $<
-+	$(CXX) $(CXXFLAGS) -c -o $@ $<
- 
- .PHONY: install
- install:
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -30,7 +30,7 @@
- 
- DEFINES = -DHC_DATA_DIR=\"$(HC_DATA)\" -DHCED_DATA_DIR=\"$(HCED_DATA)\"
- 
--all: JLib HC HCed
-+all: HC HCed
- 
- HC_OBJ_MAIN=HolotzCastle.o
- HC_OBJS=HCUtil.o HCTimer.o HCLoadSaveSlot.o HCPlaylist.o HCPreferences.o HCTheme.o HCText.o \
-@@ -42,23 +42,23 @@
- 
- # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
- # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
--CFLAGS=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -I/usr/local/include/ -I/usr/local/include/SDL -O3 -Wall -Werror -Wshadow $(CPU_OPTS) -ffast-math -c
--LDFLAGS=-L. -ffast-math -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
-+CXXFLAGS+=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -Wall -Wshadow
-+LDLIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
- 
- 
- JLib: 
- 	$(MAKE) -C ../JLib;
- 
- %.o: %.cpp %.h
--	g++ $(CFLAGS) $(DEFINES) $< -o $@
-+	$(CXX) -c $(CXXFLAGS) $(DEFINES) $< -o $@
- 
- HC: $(HC_OBJS) $(HC_OBJ_MAIN) ../JLib/libJLib.a
--	g++ $(LDFLAGS) $? -o $@;\
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $? $(LDLIBS);\
- 	mv HC ../holotz-castle
- 
- # HCed (Holotz's Castle editor).
- HCed: $(HC_OBJS) $(HCED_OBJ_MAIN) ../JLib/libJLib.a
--	g++ $(LDFLAGS) $? -o $@;\
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $? $(LDLIBS);\
- 	mv HCed ../holotz-castle-editor
- 
- install:
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
deleted file mode 100644
index ecf9d5c32de9..000000000000
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/JLib/JLib/Util/JFS.cpp
-+++ b/JLib/JLib/Util/JFS.cpp
-@@ -887,7 +887,7 @@
- 
- 		// Si es un directorio lo importa recursivamente
- 		struct dirent64 **namelist;
--		n = scandir64(filename, &namelist, 0, alphasort);
-+		n = scandir64(filename, &namelist, 0, alphasort64);
- 
- 		if (n < 0)
- 		{
diff --git a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch b/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
deleted file mode 100644
index efcf379fb129..000000000000
--- a/games-arcade/holotz-castle/files/holotz-castle-1.3.14-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.old	2011-06-22 06:09:53.195025702 +0200
-+++ b/src/Makefile	2011-06-22 06:10:54.774927134 +0200
-@@ -43,7 +43,7 @@
- # Definir -D_JLIB_DEBUG para debug con JLib. Ponerlo también en el Makefile de JLib.
- # Define -D_JLIB_DEBUG for JLib debug mode. Put it also in JLib's Makefile.
- CXXFLAGS+=-fno-strict-aliasing -I. -I../JLib `$(SDL_CONFIG) --cflags` -Wall -Wshadow
--LDLIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs`
-+LDLIBS=-L. -lSDL_image -lSDL_ttf -lSDL_mixer `$(SDL_CONFIG) --libs` -lm -lz
- 
- 
- JLib: 
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
deleted file mode 100644
index 16ed5d364bad..000000000000
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="2D platform game"
-HOMEPAGE="http://www.mainreactor.net/holotzcastle/en/index_en.html"
-SRC_URI="http://www.mainreactor.net/holotzcastle/download/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/sdl-mixer
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-libs/sdl-image
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-src"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${P}-underlink.patch
-)
-
-src_compile() {
-	tc-export AR
-	emake -C JLib
-	emake -C src HC_BASE=/usr/share/${PN}/
-}
-
-src_install() {
-	dobin holotz-castle holotz-castle-editor
-	insinto /usr/share/${PN}/game
-	doins -r res/*
-	insinto /usr/share/${PN}/editor
-	doins -r HCedHome/res/*
-	newicon res/icon/icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Holotz's Castle" /usr/share/pixmaps/${PN}.bmp
-	make_desktop_entry ${PN}-editor "Holotz's Castle - Editor" \
-		/usr/share/pixmaps/${PN}.bmp
-	dodoc doc/MANUAL*.txt
-	doman man/*.6
-}
diff --git a/games-arcade/holotz-castle/metadata.xml b/games-arcade/holotz-castle/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/holotz-castle/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/insaneodyssey-000311-r1 b/games-arcade/insaneodyssey-000311-r1
new file mode 100644
index 000000000000..32fb71795bbf
--- /dev/null
+++ b/games-arcade/insaneodyssey-000311-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image
+DESCRIPTION=Help West Muldune escape from a futuristic mental hospital
+EAPI=6
+HOMEPAGE=http://members.fortunecity.com/rivalentertainment/iox.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image
+SLOT=0
+SRC_URI=mirror://gentoo/io000311.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=4a66e348891eb0ae3e0eb5f7c6389398
diff --git a/games-arcade/insaneodyssey/Manifest b/games-arcade/insaneodyssey/Manifest
deleted file mode 100644
index 8445079c8599..000000000000
--- a/games-arcade/insaneodyssey/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX insaneodyssey-000311-datafiles.patch 1605 BLAKE2B 2418e72f6b74dad8c00b26235ffbb8df1394d90e639994d080be3845c02f7d278c262405682d9c8ca2ac8a15b6dd5695224461fdc13f96b61dc01ea70ed20da4 SHA512 b0a7a32f5463474435e17d56169e7a5f79a624e508df8142760ba24c22625707aa409f2a5381502676a6af86b2857a2db739e36cdb2471cf4a98181e5532be8d
-AUX insaneodyssey-000311-gcc6.patch 388 BLAKE2B 4976b873e3a74992cab91d155a8ab280d689c067cbb6e66944cf8b7a4a0c82c1f0e18fab1f6c3f9339b49fd0d73ef98f4a5382bb60844afe849cde3ef5d7a99b SHA512 7f634c129bcdd1a54ec196792dbfe18b0d26823907efc92c3389b5f3280c8243cd23d8e980744673bb2cabbf7c44203e4b7ec320ebe729300566adf39d6ee1f3
-DIST io000311.tar.gz 839950 BLAKE2B 4974471c69541afcb98764a3bf7c71c72afba7e9301f540eb1af85611bada547e87b491205f9fb9ba41e6e8e52326eb5e0b4cf07bf3d02259280ea6b2e5be162 SHA512 9fbf79daf1886c31a6309036cf382c2e175e3c280d6d5aa822971e977e97227f4290474c272afd7ed8218b2cc7e66b407b37522207b30225a41488201a244d96
-EBUILD insaneodyssey-000311-r1.ebuild 1428 BLAKE2B 4abc6a58c24847da2364fa937e0bbfa752a2399e1be021dde475dcf528e3cc8706c405d9d7e99765ebd976f378e7a92399c6b750fd7a4bc4af2472cc7ad6a79b SHA512 46273e06fdddd0c40caef61f986573732a6508a398103491f6584d514af76dc8021c556439f5f3521a919df7f7debd5912590aa93695b743e4500530888c4a69
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
deleted file mode 100644
index 3aab4eeaf9da..000000000000
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-datafiles.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/io.cpp.orig	2004-06-01 19:11:16.000000000 +0300
-+++ b/io.cpp	2004-06-01 19:21:14.000000000 +0300
-@@ -42,7 +42,11 @@
- {
- 	SDL_Surface *image, *surface;
- 
--	image = IMG_Load(datafile);
-+	char data_path[100];
-+	strcpy(data_path, "/usr/share/games/insaneodyssey/");
-+	strcat(data_path, datafile);
-+
-+	image = IMG_Load(data_path);
- 	if ( image == NULL ) {
- 		fprintf(stderr, "Couldn't load image %s\n",
- 					datafile);
-@@ -67,7 +71,11 @@
- {
- 	SDL_Surface *image, *surface;
- 
--	image = IMG_Load(datafile);
-+	char data_path[100];
-+	strcpy(data_path, "/usr/share/games/insaneodyssey/");
-+	strcat(data_path, datafile);
-+
-+	image = IMG_Load(data_path);
- 	if ( image == NULL ) {
- 		fprintf(stderr, "Couldn't load image %s\n", datafile);
- 		return(NULL);
-@@ -87,8 +95,12 @@
- {
-         SDL_Surface *image;
- 
-+	char data_path[100];
-+	strcpy(data_path, "/usr/share/games/insaneodyssey/");
-+	strcat(data_path, datafile);
-+
-         /* Load the BMP file into a surface */
--        image = IMG_Load(datafile);
-+        image = IMG_Load(data_path);
-         if ( image == NULL ) {
-                 fprintf(stderr, "Couldn't load %s: %s\n", datafile,
-                                                         SDL_GetError());
-@@ -493,7 +493,11 @@
-  if ( fp != NULL )
-     while( !feof(fp) && j < MAXTILES )
-     {
--    	fscanf ( fp, "%d %d %d\n", &tileatt[j].nexttile, &tileatt[j].bits, &tileatt[j].wait );
-+	int nexttile, bits, wait;
-+    	fscanf(fp, "%d %d %d\n", &nexttile, &bits, &wait);
-+    	tileatt[j].nexttile = nexttile;
-+	tileatt[j].bits     = bits;
-+	tileatt[j].wait     = wait;
-        	j++;
-     }
-  else
diff --git a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch b/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
deleted file mode 100644
index 4fd35438d24b..000000000000
--- a/games-arcade/insaneodyssey/files/insaneodyssey-000311-gcc6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bugs.gentoo.org/600894
-
---- a/io.cpp
-+++ b/io.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-+#include <cmath>
- 
- #include <SDL/SDL.h>
- 
-@@ -894,7 +895,7 @@
- 	else
- 	{	
- 	   if ( jumping )
--	      yspeed = -jumpheight - abs(xspeed)/4;
-+	      yspeed = -jumpheight - std::abs(xspeed)/4;
- 	}
- 
-     	short TempX = (x + width/2) / TILESIZE;
diff --git a/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild b/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
deleted file mode 100644
index 0383afc0b2b3..000000000000
--- a/games-arcade/insaneodyssey/insaneodyssey-000311-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Help West Muldune escape from a futuristic mental hospital"
-HOMEPAGE="http://members.fortunecity.com/rivalentertainment/iox.html"
-# Upstream has download issues.
-#SRC_URI="http://members.fortunecity.com/rivalentertainment/io${PV}.tar.gz"
-SRC_URI="mirror://gentoo/io${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	cd ${PN}
-
-	# Modify data load code and paths to game data
-	eapply "${FILESDIR}"/${P}-datafiles.patch
-
-	eapply "${FILESDIR}"/${P}-gcc6.patch
-
-	sed -i \
-		-e "/lvl/s:^:/usr/share/${PN}/:" \
-		-e "s:night:/usr/share/${PN}/night:" \
-		levels.dat || die
-	sed -i \
-		-e "s:tiles.dat:/usr/share/${PN}/tiles.dat:" \
-		-e "s:sprites.dat:/usr/share/${PN}/sprites.dat:" \
-		-e "s:levels.dat:/usr/share/${PN}/levels.dat:" \
-		-e "s:IO_T:/usr/share/${PN}/IO_T:" \
-		-e "s:tiles.att:/usr/share/${PN}/tiles.att:" \
-		-e "s:shot:/usr/share/${PN}/shot:" \
-		io.cpp || die
-	sed -i \
-		-e 's:\[32:[100:' \
-		io.h || die
-}
-
-src_install() {
-	cd ${PN}
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins *bmp *png *dat *att *lvl *wav *mod *IT
-	newicon west00r.png ${PN}.png
-	make_desktop_entry ${PN} "Insane Odyssey"
-}
diff --git a/games-arcade/insaneodyssey/metadata.xml b/games-arcade/insaneodyssey/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/insaneodyssey/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/jardinains-2.0-r1 b/games-arcade/jardinains-2.0-r1
new file mode 100644
index 000000000000..845fe6e582d5
--- /dev/null
+++ b/games-arcade/jardinains-2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Arkanoid with Gnomes
+EAPI=5
+HOMEPAGE=http://www.jardinains2.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=jardinains
+RDEPEND=sys-libs/libstdc++-v3:5 amd64? ( sys-libs/libstdc++-v3:5[multilib] ) >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/JN2_1_FREE_LIN.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_=6d00f5de8c2c3f9a2a48a43741db8b5f
diff --git a/games-arcade/jardinains/Manifest b/games-arcade/jardinains/Manifest
deleted file mode 100644
index ec5e4c081a20..000000000000
--- a/games-arcade/jardinains/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX strings-pt.patch 8378 BLAKE2B ea79456d7e2f51b476dc13e838de3322db052c249e6c30c1c71806d62b3e99a86544530cd5cb30daa19f4b07cf8d90be62e38c747b54afc5dddceb891ffe783c SHA512 ed7b93a0aea20d164f00aed1760fbf8ec775e3e9e65262099c4c16dcec1c91dc24f6ad845da43b4dba554237e5c8a95831a206dabb9847b57addae6c298e2dc4
-DIST JN2_1_FREE_LIN.tar.gz 17433159 BLAKE2B de257584d5e0babc4c0304aec2451e92ec288c77e8aff68eaad63b43238126b4059dc56a1632b66b2bfd4a9f0408cf492a77c56de2521e12f630d498a751919b SHA512 ddb6e48e071b42b7871cb6396c61fdf9bfb85e9bb9f88720e8ac1b7bff499c43784de6bf3f67d3fe61bc05ed0e3f6a24f646aa6c54e387b95e744c16525978e8
-EBUILD jardinains-2.0-r1.ebuild 1624 BLAKE2B 52a73cbed121fcf66ad9ee2a5c3993a313440d9e5fa4a550f8074ee082bf4c09b7196efac1006b20f3bd043a05f2517ae6a9d2fa2236adf9058381cd428dec5c SHA512 0e89af86b9f73c2396eee0b497d9322e74cd2410a3a4f858677229d6e7785c1b683b02f628c6910f1339b199eb37434d434ab5cf82d7a7c07d2bf28e4d4715b7
-MISC metadata.xml 620 BLAKE2B d7544b15c6c62f4c3d1694e30afb4bf4a7a23402d83a594f35ab1f16a7eef3046121656ded24364b6e09dc93e98c17558e1ecc2e60e19edb6b8db6e95b2f00fd SHA512 4400b85a7b410885b2528a18cde41b35cd4a4034e5aecf2f1ad26c0300ed5d8e4bb01646d5be30f9c198d4d70b0bb9cc45bf52f7664cb9a51c3d704a56fa25b5
diff --git a/games-arcade/jardinains/files/strings-pt.patch b/games-arcade/jardinains/files/strings-pt.patch
deleted file mode 100644
index 246017a3f5bc..000000000000
--- a/games-arcade/jardinains/files/strings-pt.patch
+++ /dev/null
@@ -1,303 +0,0 @@
---- data/strings.xml	2006-11-11 23:45:28.000000000 +0000
-+++ data/strings.xml	2007-02-02 14:14:14.000000000 +0000
-@@ -35,5 +35,5 @@
- 		<es>Espa�ol</es>

- 		<it>Italiano</it>

--		<pt>Portuguese</pt>

-+		<pt>Portugu�s</pt>

- 		<pl>Polski</pl>

- 	</message>

-@@ -61,5 +61,5 @@
- 		<es>Parar</es>

- 		<it>Uscita</it>

--		<pt>Parado</pt>

-+		<pt>Sair</pt>

- 		<pl>Koniec</pl>

- 	</message>

-@@ -74,5 +74,5 @@
- 		<es>Juego Nuevo</es>

- 		<it>Nuovo Gioco</it>

--		<pt>Jogo Novo</pt>

-+		<pt>Novo Jogo</pt>

- 		<pl>Nowa Gra</pl>

- 	</message>

-@@ -113,5 +113,5 @@
- 		<es>Modo De La Ventana</es>

- 		<it>Modo Della Finestra</it>

--		<pt>Modalidade Da Janela</pt>

-+		<pt>Modo de Janela</pt>

- 		<pl>Tryb Okienkowy</pl>

- 	</message>

-@@ -165,5 +165,5 @@
- 		<es>Pantalla Completa</es>

- 		<it>Schermo Pieno</it>

--		<pt>Tela Cheia</pt>

-+		<pt>Jogar em Ecr� Completo</pt>

- 		<pl>Pelny Ekran</pl>

- 	</message>

-@@ -178,5 +178,5 @@
- 		<es>Pantalla Completa/Ventana</es>

- 		<it>Schermo Pieno/Finestra</it>

--		<pt>Tela Cheia/Janela</pt>

-+		<pt>Ecr� Completo/Janela</pt>

- 		<pl>Pelny Ecran/Okno</pl>

- 	</message>

-@@ -218,5 +218,5 @@
- 		<es>Regresar</es>

- 		<it>Andare Indietro</it>

--		<pt>Ir Para Tr�s</pt>

-+		<pt>Voltar</pt>

- 		<pl>Wstecz</pl>

- 	</message>

-@@ -244,5 +244,5 @@
- 		<es>Anular</es>

- 		<it>Annullamento</it>

--		<pt>Cancelamento</pt>

-+		<pt>Cancelar</pt>

- 		<pl>Poniechaj</pl>

- 	</message>

-@@ -257,5 +257,5 @@
- 		<es>Continuar Jugando</es>

- 		<it>Continuare A Giocare</it>

--		<pt>Continuar Jogando</pt>

-+		<pt>Continuar a Jogar</pt>

- 		<pl>Kontynuuj Gre</pl>

- 	</message>

-@@ -270,5 +270,5 @@
- 		<es>Terminar y Regresar</es>

- 		<it>Rinunciato Al Menu</it>

--		<pt>Parado Ao Menu</pt>

-+		<pt>Sair para o Menu</pt>

- 		<pl>Wyjdz Do Menu</pl>

- 	</message>

-@@ -283,5 +283,5 @@
- 		<es>Terminar de Jugar</es>

- 		<it>Uscita Jardinains 2</it>

--		<pt>Parado Jardinains 2</pt>

-+		<pt>Sair do Jardinains 2</pt>

- 		<pl>Zakoncz Jardinains 2</pl>

- 	</message>

-@@ -296,5 +296,5 @@
- 		<es>Pausa</es>

- 		<it>Pausa</it>

--		<pt>Pausado/pt>

-+		<pt>Pausa</pt>

- 		<pl>Gra Przerwana</pl>

- 	</message>

-@@ -322,5 +322,5 @@
- 		<es>Calidad de los gr�ficos</es>

- 		<it>Qualit� dei grafici</it>

--		<pt>Qualidade dos gr�ficos</pt>

-+		<pt>Qualidade dos Gr�ficos</pt>

- 		<pl>Jakosc Grafiki</pl>

- 	</message>

-@@ -335,5 +335,5 @@
- 		<es>Conductor de los gr�ficos</es>

- 		<it>Driver dei grafici</it>

--		<pt>Excitador dos gr�ficos</pt>

-+		<pt>Controlador dos Gr�ficos</pt>

- 		<pl>Sterowniki Graficzne</pl>

- 	</message>

-@@ -361,5 +361,5 @@
- 		<es>Crear A Nuevo Jugador</es>

- 		<it>Generare Il Nuovo Giocatore</it>

--		<pt>Criar O Jogador Novo</pt>

-+		<pt>Criar um Jogador Novo</pt>

- 		<pl>Utworz Nowego Gracza</pl>

- 	</message>

-@@ -374,5 +374,5 @@
- 		<es>Entrar Contrase�a</es>

- 		<it>Digitare La Parola d'Accesso</it>

--		<pt>Incorporar A Senha</pt>

-+		<pt>Introduzir A Senha</pt>

- 		<pl>Wpisz Haslo</pl>

- 	</message>

-@@ -387,5 +387,5 @@
- 		<es>Volver A Entrar La Contrase�a</es>

- 		<it>Digitare Ancora La Parola d'Accesso</it>

--		<pt>Incorporar A Senha Outra Vez</pt>

-+		<pt>Re-Introduzir A Senha</pt>

- 		<pl>Wprowadz Haslo Ponownie</pl>

- 	</message>

-@@ -400,5 +400,5 @@
- 		<es>Las Contrase�as No Emparejan!</es>

- 		<it>Parole d'Accesso Male!</it>

--		<pt>As Senhas N�o Combinam!</pt>

-+		<pt>As Senhas N�o Coincidem!</pt>

- 		<pl>Hasla Nie Sa Identyczne!</pl>

- 	</message>

-@@ -426,5 +426,5 @@
- 		<es>Contrase�a Incorrecta</es>

- 		<it>Parola d'Accesso Errata</it>

--		<pt>Senha Incorreta</pt>

-+		<pt>Senha Incorrecta</pt>

- 		<pl>Niepoprawne Haslo</pl>

- 	</message>

-@@ -439,5 +439,5 @@
- 		<es>Incorporar Nombre Del Jugador</es>

- 		<it>Introdurre Nome Del Giocatore</it>

--		<pt>Dar Entrada Nome Do Jogador</pt>

-+		<pt>Introduzir o Nome Do Jogador</pt>

- 		<pl>Wprowadz Imie Gracza</pl>

- 	</message>

-@@ -452,5 +452,5 @@
- 		<es>�Nombre No Existe!</es>

- 		<it>Nessun Nome Introdotto!</it>

--		<pt>Nenhum Nome Dado Entrada Com!</pt>

-+		<pt>Nenhum Nome Introduzido!</pt>

- 		<pl>Nie Podano Imienia!</pl>

- 	</message>

-@@ -465,5 +465,5 @@
- 		<es>�El Jugador Existe!</es>

- 		<it>Il Giocatore Gi� Esiste!</it>

--		<pt>O Jogador Existe J�!</pt>

-+		<pt>O Jogador J� Existe!</pt>

- 		<pl>Gracz Juz Istnieje!</pl>

- 	</message>

-@@ -478,5 +478,5 @@
- 		<es>�No Se Puede Crear!</es>

- 		<it>Non Ha Potuto Generare!</it>

--		<pt>N�o Podia Criar O Jogador!</pt>

-+		<pt>N�o Consegui Criar O Jogador!</pt>

- 		<pl>Utworzenie Gracza Niemozliwe!</pl>

- 	</message>

-@@ -504,5 +504,5 @@
- 		<es>Fin</es>

- 		<it>Gioco Sopra</it>

--		<pt>Jogo Sobre</pt>

-+		<pt>Fim do Jogo</pt>

- 		<pl>Koniec Gry</pl>

- 	</message>

-@@ -517,5 +517,5 @@
- 		<es>Nuevo Juego De Este Nivel</es>

- 		<it>Nuovo Gioco (Questo Livello)</it>

--		<pt>Jogo Novo Deste N�vel</pt>

-+		<pt>Jogo Novo a partir Deste N�vel</pt>

- 		<pl>Nowa Gra Od Tego Poziomu</pl>

- 	</message>

-@@ -583,5 +583,5 @@
- 		<es>Cuenta Mejor</es>

- 		<it>Segno Migliore</it>

--		<pt>Contagem Superior</pt>

-+		<pt>Pontos M�ximos</pt>

- 		<pl>Najlepszy Wynik</pl>

- 	</message>

-@@ -687,5 +687,5 @@
- 		<es>PROYECTILES</es>

- 		<it>PROIETTILI</it>

--		<pt>PROJECTILES</pt>

-+		<pt>PROJ�CTEIS</pt>

- 		<pl>POCISKI</pl>

- 	</message>

-@@ -739,5 +739,5 @@
- 		<es>PRIMAS</es>

- 		<it>INDENNIT�</it>

--		<pt>B�NUS</pt>

-+		<pt>B�NUS</pt>

- 		<pl>BONUSY</pl>

- 	</message>

-@@ -804,5 +804,5 @@
- 		<es>Solamente Sonido</es>

- 		<it>Suono Soltanto</it>

--		<pt>Som Somente</pt>

-+		<pt>Apenas Som</pt>

- 		<pl>Tylko Dzwieki</pl>

- 	</message>

-@@ -817,5 +817,5 @@
- 		<es>Solamente M�sica</es>

- 		<it>Suono Musica</it>

--		<pt>Som M�sica</pt>

-+		<pt>Apenas M�sica</pt>

- 		<pl>Tylko Muzyka</pl>

- 	</message>

-@@ -856,5 +856,5 @@
- 		<es>�Solamente $19,99 USD!</es>

- 		<it>Suono $19,99 USD!</it>

--		<pt>Som $19,99 USD!</pt>

-+		<pt>S� $19,99 USD!</pt>

- 		<pl>Tylko $19,99 USD!</pl>

- 	</message>

-@@ -882,5 +882,5 @@
- 		<es>�M�s Primas!</es>

- 		<it>Pi� Indennit�!</it>

--		<pt>Mais B�nus!</pt>

-+		<pt>Mais B�nus!</pt>

- 		<pl>Wiecej Bonusow!</pl>

- 	</message>

-@@ -923,5 +923,5 @@
- 		<es>�Cl�que Aqu� Para Comprar!</es>

- 		<it>Clicca Qui Per Comprare!</it>

--		<pt>Estalar aqui para comprar!</pt>

-+		<pt>Clicar Aqui Para Comprar!</pt>^M
- 		<pl>Kliknij tu, aby kupic!</pl>

- 	</message>

-@@ -989,5 +989,5 @@
- 		<es>�Abandonar el Juego Actual?</es>

- 		<it>Abbandonare il Gioco Corrente?</it>

--		<pt>Abandonar o Jogo Atual?</pt>

-+		<pt>Abandonar o Jogo Actual?</pt>

- 		<pl>Koniec Biezacej Gry?</pl>

- 	</message>

-@@ -1004,5 +1004,5 @@
- 		<es>Suprimir</es>

- 		<it>Cancellare</it>

--		<pt>Suprimir</pt>

-+		<pt>Apagar</pt>

- 		<pl>Usunac</pl>

- 	</message>

-@@ -1030,5 +1030,5 @@
- 		<es>Estad�stica</es>

- 		<it>Statistiche</it>

--		<pt>Statistics</pt>

-+		<pt>Estat�sticas</pt>

- 		<pl>Statystyka</pl>

- 	</message>

-@@ -1043,5 +1043,5 @@
- 		<es>Tiempo Perdi�</es>

- 		<it>Tempo Perso</it>

--		<pt>Tempo Perdeu</pt>

-+		<pt>Tempo Total</pt>

- 		<pl>Czas Stracony</pl>

- 	</message>

-@@ -1069,5 +1069,5 @@
- 		<es>a�o</es>

- 		<it>anno</it>

--		<pt>anos</pt>

-+		<pt>ano</pt>

- 		<pl>rok</pl>

- 	</message>

-@@ -1199,5 +1199,5 @@
- 		<es>Tramposo?</es>

- 		<it>Frode?</it>

--		<pt>Fraude?</pt>

-+		<pt>Ajudas?</pt>

- 		<pl>Oszukac?</pl>

- 	</message>

-@@ -1212,5 +1212,5 @@
- 		<es>N�mero de Juegos</es>

- 		<it>Numero di Giochi</it>

--		<pt>N�mero dos Jogos</pt>

-+		<pt>N�mero de Jogos</pt>

- 		<pl>Gra Ogolny</pl>

- 	</message>

-@@ -1225,5 +1225,5 @@
- 		<es>N�mero de Niveles</es>

- 		<it>Numero di Livelli</it>

--		<pt>N�mero dos N�veis</pt>

-+		<pt>N�mero de N�veis</pt>

- 		<pl>Poziomy Ogolem</pl>

- 	</message>

-@@ -1251,5 +1251,5 @@
- 		<es>�Los paquetes del juego modificado est�n disponibles solamente en la versi�n completa de Jardinains 2!</es>

- 		<it>I pacchetti su ordinazione del gioco sono disponibili soltanto nella versione completa di Jardinains 2!</it>

--		<pt>Os blocos feitos sob encomenda do jogo est�o dispon�veis somente na vers�o cheia de Jardinains 2!</pt>

-+		<pt>Os blocos modificados do jogo est�o dispon�veis somente na vers�o completa do Jardinains 2!</pt>

- 		<pl>Custom game packs are available only in the full version of Jardinains 2!</pl>

- 	</message>

-@@ -1293,5 +1293,5 @@
- 		<es>Ningunos Rastros de la Bola</es>

- 		<it>Nessun Tracce della Sfera</it>

--		<pt>Nenhumas Fugas de Esfera</pt>

-+		<pt>Nenhuns rastos de Esfera</pt>

- 		<pl>Pilka Proste</pl>

- 	</message>

diff --git a/games-arcade/jardinains/jardinains-2.0-r1.ebuild b/games-arcade/jardinains/jardinains-2.0-r1.ebuild
deleted file mode 100644
index e98d0da5f03b..000000000000
--- a/games-arcade/jardinains/jardinains-2.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Arkanoid with Gnomes"
-HOMEPAGE="http://www.jardinains2.com"
-SRC_URI="mirror://gentoo/JN2_1_FREE_LIN.tar.gz"
-
-LICENSE="jardinains"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/jardinains/jardinains"
-
-DEPEND=""
-RDEPEND="sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-	>=virtual/glu-9.0-r1[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/${PN}"
-
-src_unpack() {
-	unpack JN2_1_FREE_LIN.tar.gz
-	cd "${WORKDIR}" || die
-	mv "Jardinains 2!" ${P} || die
-}
-
-src_prepare() {
-	# clean Mac fork files (bug #295782)
-	find . -type f -name "._*" -exec rm -f '{}' +
-	epatch "${FILESDIR}"/strings-pt.patch
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe jardinains
-	insinto "${dir}"
-	doins -r LICENSE.txt data help
-
-	games_make_wrapper jardinains ./jardinains "${dir}" "${dir}"
-
-	make_desktop_entry jardinains "Jardinains 2"
-	touch "${D}${dir}/data/prefs.xml"
-	prepgamesdirs
-	chmod g+rw "${D}${dir}/data/prefs.xml"
-	chmod -R g+rw "${D}${dir}/data/players"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Due to the way this software is designed all user preferences for"
-	elog "graphics, audio and other in game data are shared among all users"
-	elog "of the computer. For that reason some files in the installation"
-	elog "folder are writable by any user in the games group."
-}
diff --git a/games-arcade/jardinains/metadata.xml b/games-arcade/jardinains/metadata.xml
deleted file mode 100644
index 523866a841c9..000000000000
--- a/games-arcade/jardinains/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>Jardinains 2!, the sequel to Jardinains 1! (surprisingly
-	enough) is a fairly straightforward game. You have a paddle. You have a
-	ball. You have a whole bunch of bricks. Inside these bricks live ‘nains.
-	‘Nains are cute little critters who pop out of their bricks every now and
-	then to have some fun and give you a headache. </longdescription>
-</pkgmetadata>
diff --git a/games-arcade/jumpnbump-1.50-r2 b/games-arcade/jumpnbump-1.50-r2
new file mode 100644
index 000000000000..e5ac2cf78dc8
--- /dev/null
+++ b/games-arcade/jumpnbump-1.50-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-net X? ( x11-libs/libXext ) kde? ( kde-apps/kdialog ) music? ( media-libs/sdl-mixer[mod] ) >=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 funny multiplayer game about cute little fluffy bunnies
+EAPI=6
+HOMEPAGE=http://www.jumpbump.mine.nu/
+IUSE=X fbcon kde svga tk +music
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-net X? ( x11-libs/libXext ) kde? ( kde-apps/kdialog ) music? ( media-libs/sdl-mixer[mod] ) tk? ( dev-lang/tcl:0= dev-lang/tk:0= )
+SLOT=0
+SRC_URI=http://www.jumpbump.mine.nu/port/jumpnbump-1.50.tar.gz mirror://gentoo/jumpnbump-1.50-autotool.patch.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=605870343dfe7821b219f9eb98ee0390
diff --git a/games-arcade/jumpnbump/Manifest b/games-arcade/jumpnbump/Manifest
deleted file mode 100644
index 6e1a92f98365..000000000000
--- a/games-arcade/jumpnbump/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jumpnbump-1.50-autotool.patch.bz2 94692 BLAKE2B 40fa60260426cc1461e3e31d220a8f7261c7ad9e079fb17011fff72dc7ad2d52f66fb040263502d6082f3609bda0c783dd5c8b6a1d226d4fa22a1f77e6bfe5c4 SHA512 3749f3bda969d9ab2225019d8a6333d23402c8e284c3278aad23f76d5436326fed1efcae28a8922f814e0cf8417ea20fc51abb34f70bd6d37afca803475214fa
-DIST jumpnbump-1.50.tar.gz 397208 BLAKE2B f62a30723d8a08976ba06b1941d62544a764b4d5cbce6b076d0f096af099d9db35a451c413f3c490e2aff0388c92456e46a70cdc6a9404449a19dc4a77be0db3 SHA512 a343e514efa42aacd2c0fd113269ebf27418ea851dad21cecfa16a765639cc6a5de43fbdb9ad2f0282740f369b7e457a236fc3e918b486af10222c733f5c8fb0
-EBUILD jumpnbump-1.50-r2.ebuild 1282 BLAKE2B db863041ba35be6c23b2cbf7b25b25a3f022b61330c9d928e744cdbd9f4acd16ef2bcd4b03d2b67cb1707684b43ca6a02ff843e52ff23f28868b37e41b917f33 SHA512 dfc145c876b15655efc71f522c59443e0f99411dd121be441213a2f39cf07fb26ca71ce6f4d5f0c083cc2aaa137e24c4b9a1f26df6a438bfcdd5ec0834c95be1
-MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
diff --git a/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild b/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild
deleted file mode 100644
index 476381cf4757..000000000000
--- a/games-arcade/jumpnbump/jumpnbump-1.50-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A funny multiplayer game about cute little fluffy bunnies"
-HOMEPAGE="http://www.jumpbump.mine.nu/"
-SRC_URI="
-	http://www.jumpbump.mine.nu/port/${P}.tar.gz
-	mirror://gentoo/${P}-autotool.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X fbcon kde svga tk +music"
-
-DEPEND="
-	media-libs/sdl-mixer
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-net
-	X? ( x11-libs/libXext )
-	kde? ( kde-apps/kdialog )
-	music? ( media-libs/sdl-mixer[mod] )
-"
-RDEPEND="${DEPEND}
-	tk? (
-		dev-lang/tcl:0=
-		dev-lang/tk:0=
-	)
-"
-
-src_prepare() {
-	default
-	eapply ../${P}-autotool.patch
-	rm -f configure
-	eautoreconf
-	sed -i \
-		-e "/PREFIX/ s:PREFIX.*:\"/usr/share/${PN}/jumpbump.dat\":" \
-		globals.h \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	# clean up a bit.  It leaves a dep on Xdialog but ignore that.
-	use fbcon || rm -f "${D}${GAMES_BINDIR}/jumpnbump.fbcon"
-	use kde || rm -f "${D}${GAMES_BINDIR}/jumpnbump-kdialog"
-	use svga || rm -f "${D}${GAMES_BINDIR}/jumpnbump.svgalib"
-	use tk || rm -f "${D}${GAMES_BINDIR}/jnbmenu.tcl"
-	newicon sdl/jumpnbump64.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Jump n Bump"
-}
diff --git a/games-arcade/jumpnbump/metadata.xml b/games-arcade/jumpnbump/metadata.xml
deleted file mode 100644
index 1329ada5712f..000000000000
--- a/games-arcade/jumpnbump/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="music">Enable playing of background music</flag>
-</use>
-</pkgmetadata>
diff --git a/games-arcade/jvgs-0.5-r1 b/games-arcade/jvgs-0.5-r1
new file mode 100644
index 000000000000..8c606fe0ff22
--- /dev/null
+++ b/games-arcade/jvgs-0.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] media-libs/freetype:2 sys-libs/zlib:= virtual/opengl dev-lang/swig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An open-source platform game with a sketched and minimalistic look
+EAPI=6
+HOMEPAGE=http://jvgs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=WTFPL-2
+RDEPEND=dev-lang/lua:0 media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] media-libs/freetype:2 sys-libs/zlib:= virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/jvgs/jvgs-0.5-src.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_=534ebde084ade76bd372944b1296ee0b
diff --git a/games-arcade/jvgs/Manifest b/games-arcade/jvgs/Manifest
deleted file mode 100644
index 6e4e4bfbf2c0..000000000000
--- a/games-arcade/jvgs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX jvgs-0.5-fix-build-system.patch 1028 BLAKE2B 644c07ed7374ec7677ca0f744d08e10a08e1d49a1c0d4bab7d9b87ce78ebb138582238873353ce25471e4a95555b016010ca04fe5672ef8bf256cdb74ea3a378 SHA512 0f049df4b986d380634837e1e5bc4e21d0fb228a7c61cc6765ebec7cc74f3e37ef71260a2d7a7cc830ac9ea22258702f9cad29d3941bf2dff0f3f6ea56817dc8
-DIST jvgs-0.5-src.tar.gz 25917861 BLAKE2B 8b7716a16cd7dfdb3f8f7eb2292a121b142a4487f8fb58d046db81cc579b61b3db56728f5ecef8272ec74d8cf898da5c3ee12fa7c492fd219de977ea37bc9ee9 SHA512 0a0a8e7a0e7dce6f61bcd328f579212115eb95e3dce8ca223c1d8a3432d9083bf9a313f02f46b799991aa32f10cb9c14e8ecb63a4578b1ffaabc374ba139b28d
-EBUILD jvgs-0.5-r1.ebuild 806 BLAKE2B 3876e62f5d64f88bab39f2ae7cd2b4d95147d080dd2c61a84d2594691d63e8653861c8f02ef6b164fb7040c729b618dbd08b8085574081b52487b1e5a5d5affe SHA512 8ecc3dfc55514602b30deaa694385fc0fe0b75e8e398bf5b7147846d765c331ad74807e93e2335b8d743db81fd29fb58cf5e701562ae10f1396174704bc3689d
-MISC metadata.xml 327 BLAKE2B 3dfc4352c43df34b847d4ddbaefb6a830d685e7a4cdeabbc870665799e7d9b43a58b4e9c0c71bf1fbaafeb3148732dbb988971310041db7afb669a9235bf7994 SHA512 d37e6f081f28683f1071e57de49287534e6797902e24c681f87477af286a6227eb76abd63bd3091b077270e44061cd0676e49fecf4e74f54d455281fa67946bd
diff --git a/games-arcade/jvgs/files/jvgs-0.5-fix-build-system.patch b/games-arcade/jvgs/files/jvgs-0.5-fix-build-system.patch
deleted file mode 100644
index 5f5ba191bb7e..000000000000
--- a/games-arcade/jvgs/files/jvgs-0.5-fix-build-system.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-* Respect user CXXFLAGS
-* Build out-of-source
-
---- a/src/bind/CMakeLists.txt
-+++ b/src/bind/CMakeLists.txt
-@@ -1,16 +1,25 @@
--ADD_CUSTOM_TARGET(
--     swig
--     ${SWIG_EXECUTABLE} -lua -c++ -o ${JVGS_BINARY_DIR}/src/bind/jvgslua.cpp ${JVGS_BINARY_DIR}/src/bind/jvgslua.i
-+ADD_CUSTOM_COMMAND(
-+    OUTPUT
-+        ${CMAKE_CURRENT_BINARY_DIR}/jvgslua.cpp
-+    COMMAND
-+        ${SWIG_EXECUTABLE} -lua -c++ -o ${CMAKE_CURRENT_BINARY_DIR}/jvgslua.cpp ${CMAKE_CURRENT_SOURCE_DIR}/jvgslua.i
-+    VERBATIM
- )
- 
- ADD_LIBRARY(
-     bind STATIC
--    jvgslua.cpp
-+    ${CMAKE_CURRENT_BINARY_DIR}/jvgslua.cpp
-     ScriptManager.cpp
- )
- 
- ADD_DEPENDENCIES( bind swig )
- 
-+TARGET_INCLUDE_DIRECTORIES(
-+    bind
-+    PRIVATE
-+    ${CMAKE_CURRENT_SOURCE_DIR}
-+)
-+
- TARGET_LINK_LIBRARIES(
-     bind
-     ${LUA_LIBRARIES}
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,4 @@
--SET( CMAKE_CXX_FLAGS "-DTIXML_USE_STL -ggdb" )
-+SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTIXML_USE_STL" )
- 
- INCLUDE_DIRECTORIES(
-     ${SDL_INCLUDE_DIR}
diff --git a/games-arcade/jvgs/jvgs-0.5-r1.ebuild b/games-arcade/jvgs/jvgs-0.5-r1.ebuild
deleted file mode 100644
index 779b57dd7400..000000000000
--- a/games-arcade/jvgs/jvgs-0.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils
-
-DESCRIPTION="An open-source platform game with a sketched and minimalistic look"
-HOMEPAGE="http://jvgs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/jvgs/${P}-src.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/lua:0
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/freetype:2
-	sys-libs/zlib:=
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	dev-lang/swig"
-
-S=${WORKDIR}/${P}-src
-PATCHES=( "${FILESDIR}"/${PN}-0.5-fix-build-system.patch )
-
-src_install() {
-	dobin src/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r main.lua resources
-
-	newicon resources/drawing.svg ${PN}.svg
-	make_desktop_entry ${PN} ${PN}
-
-	einstalldocs
-}
diff --git a/games-arcade/jvgs/metadata.xml b/games-arcade/jvgs/metadata.xml
deleted file mode 100644
index 88e6fd346456..000000000000
--- a/games-arcade/jvgs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">jvgs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/kajaani-kombat-0.7-r1 b/games-arcade/kajaani-kombat-0.7-r1
new file mode 100644
index 000000000000..7e9fe99588df
--- /dev/null
+++ b/games-arcade/kajaani-kombat-0.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-net media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] sys-libs/ncurses:0 sys-libs/readline:0
+DESCRIPTION=A rampart-like game set in space
+EAPI=6
+HOMEPAGE=http://kombat.kajaani.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-net media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] sys-libs/ncurses:0 sys-libs/readline:0
+SLOT=0
+SRC_URI=http://kombat.kajaani.net/dl/kajaani-kombat-0.7.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e388e5f814908423f51455cbb90a324e
diff --git a/games-arcade/kajaani-kombat/Manifest b/games-arcade/kajaani-kombat/Manifest
deleted file mode 100644
index e4434e107ad8..000000000000
--- a/games-arcade/kajaani-kombat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.7-makefile.patch 551 BLAKE2B 4b301ca00a4643f00654e81f3a4396d43106bc2f0f5bbae98d71818a3559472607358a6dd9c2b77a9def3c7772df2ad6ae59e33529de368474b9c4a33a9fee77 SHA512 4d319affec25fe585c0f0af14ed872e71b155be2bab3aabbb72ad01b80395f44b35b13abc765390e19e070305339322598942fa1997463632ee07f4a160ba823
-AUX kajaani-kombat-0.7-ldflags.patch 440 BLAKE2B f63321ed06c0ed26cfe28a1a62650ce9b9b37b29898961fb08b58b5119b023c3335798e36130ad144569c2996e7c4f188caf9cadc3d4a37c01a3bb03bd39d11d SHA512 30a8e6293349a30f6dbcc469fb14377d9461df60227e01d18dfc267f254be62b7cee89bcb6df0b24ec5bcb9cb198701e5b9e0d465f699be4880432a0402b2c71
-DIST kajaani-kombat-0.7.tar.gz 1805504 BLAKE2B 664210a44e5dd5b27ca7b47ca9cb9445373d1243c01fcfb227251c6b48fb8b9e2ebd608eec2244f1b12f47bf5c886482bf70a0700538bbf415d93df41c34fcfe SHA512 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
-EBUILD kajaani-kombat-0.7-r1.ebuild 906 BLAKE2B 646f8e6b2fe996bc36c1b8b944646be6a829da8bcd8bfd71b2a774cb137770da35b4359a514f9b209fce4f2dee8c26033667b6813c6956ebaa42511204bdacab SHA512 e22f5d2be756d6a5c26bf6d9555df51b06b316d3fd940594f5233fa8ac8b0c43ebb31ccb5fda01552a6dfa2ba899671b41690cf04b6cf3eb46c1094523d3e234
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kajaani-kombat/files/0.7-makefile.patch b/games-arcade/kajaani-kombat/files/0.7-makefile.patch
deleted file mode 100644
index d67f394fa623..000000000000
--- a/games-arcade/kajaani-kombat/files/0.7-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.orig	2005-02-28 22:55:55.000000000 -0500
-+++ b/Makefile	2005-02-28 22:58:45.000000000 -0500
-@@ -39,8 +39,8 @@
- endif
- ## UNIX RELEASE (default option)
- ifeq ($(sys), )
--	MEDIA=-D MEDIA_PATH=\"./\"
--	DEBUG= -O $(MEDIA)
-+	MEDIA=-D MEDIA_PATH=\"GENTOODIR\"
-+	DEBUG= $(CFLAGS) $(MEDIA)
- endif
- 
- 
-@@ -55,7 +55,7 @@
- 
- server_objs = game_obj.o terrain.o msg.o game_server.o server_main.o coord.o block.o connects.o player.o config.o
- 
--CXXFLAGS=`sdl-config --cflags` -Wall $(DEBUG)
-+CXXFLAGS+=`sdl-config --cflags` $(MEDIA)
- 
- all: client
- 
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
deleted file mode 100644
index 268dcf24ce37..000000000000
--- a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2010-10-15 15:48:06.000000000 +0200
-+++ b/Makefile	2010-10-15 15:48:18.000000000 +0200
-@@ -85,7 +85,7 @@
- client_net.o: client_net.h client_net.cpp globals.h monitor_queue.h msg.h
- 
- client: $(client_objs)
--	$(CXX) $(client_objs) -o kajaani-kombat $(client_libs)
-+	$(CXX) $(LDFLAGS) $(client_objs) -o kajaani-kombat $(client_libs)
- server: $(server_objs)
- 	$(CXX) $(server_objs) -o kajaani-kombat-server $(server_libs)
- 
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
deleted file mode 100644
index 1d80c8699c66..000000000000
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A rampart-like game set in space"
-HOMEPAGE="http://kombat.kajaani.net/"
-SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-net
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/ncurses:0
-	sys-libs/readline:0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${PV}-makefile.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:GENTOODIR:/usr/share/${PN}/:" \
-		Makefile || die
-	sed -i \
-		-e 's/IMG_Load/img_load/' \
-		gui_screens.cpp || die
-}
-
-src_install() {
-	dobin kajaani-kombat
-	insinto "/usr/share/${PN}"
-	doins *.{png,ttf,ogg}
-	einstalldocs
-	doman kajaani-kombat.6
-}
diff --git a/games-arcade/kajaani-kombat/metadata.xml b/games-arcade/kajaani-kombat/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/kajaani-kombat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/kobodeluxe-0.5.1-r1 b/games-arcade/kobodeluxe-0.5.1-r1
new file mode 100644
index 000000000000..47f7a90cfc4f
--- /dev/null
+++ b/games-arcade/kobodeluxe-0.5.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=media-libs/libsdl media-libs/sdl-image[png] opengl? ( virtual/opengl )
+DESCRIPTION=An SDL port of xkobo, a addictive space shoot-em-up
+EAPI=6
+HOMEPAGE=http://www.olofson.net/kobodl/
+IUSE=opengl
+KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image[png] opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=http://www.olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e545e86aa8ae4eafc4446ce1e19918d2
diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
deleted file mode 100644
index 4cd8de944a2c..000000000000
--- a/games-arcade/kobodeluxe/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289be82b4ea3965d85338ab81c79f07785273a6d767cf471deace08722b3ab9b8581a45201e30343b9e6ad784d820256b7dd9 SHA512 77624a0e18958d76c938e9d1becb72803079364612056687fb955cc912bda9b4443c7e6245abb6a32cc3ff96b04c63993e3cd114f73115254efe7b50f749a45c
-AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
-DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
-EBUILD kobodeluxe-0.5.1-r1.ebuild 1240 BLAKE2B bf7875f2773598a895ff9749090ed2f8401ba16003899c72b24df371fe1098b2ad3014eea11b3039cf6bda82d9e4a4567cbeadec9ed1d94ce62f3ee4bc561ff9 SHA512 dbcd2e12238fe34d2dfd9cfdd89a67dbed625eeffba442088c556e66ec996a91f68b51c9e56aabb6e2fcbe5cc4c3481ad02c4b08ee3b95fa63577c1475c0dd98
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
deleted file mode 100644
index c6c06d9ce2a6..000000000000
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/graphics/window.cpp
-+++ b/graphics/window.cpp
-@@ -398,7 +398,7 @@
- 		 */
- 		if(token)
- 		{
--			char *tok = strchr(txt, token);
-+			const char *tok = strchr(txt, token);
- 			if(tok)
- 				tokpos = tok-txt;
- 			else
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
deleted file mode 100644
index 7a9ef355a821..000000000000
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/enemies.h
-+++ b/enemies.h
-@@ -70,9 +70,9 @@
- extern const enemy_kind bomb2;
- extern const enemy_kind bombdeto;
- extern const enemy_kind cannon;
--extern const enemy_kind pipe1;
-+extern const enemy_kind pipeone;
- extern const enemy_kind core;
--extern const enemy_kind pipe2;
-+extern const enemy_kind pipetwo;
- extern const enemy_kind rock;
- extern const enemy_kind ring;
- extern const enemy_kind enemy_m1;
-@@ -430,7 +430,7 @@
- 
- inline int _enemy::is_pipe()
- {
--	return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
-+	return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo)));
- }
- 
- 
---- a/enemy.cpp
-+++ b/enemy.cpp
-@@ -713,7 +713,7 @@
- 
- void _enemy::kill_cannon()
- {
--	enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
-+	enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y));
- 	sound.g_base_node_explo(x, y);
- 	release();
- }
-@@ -755,10 +755,10 @@
- 
- void _enemy::kill_core()
- {
--	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
--	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
--	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
--	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
-+	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
-+	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
-+	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
-+	enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
- 	enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
- 	sound.g_base_core_explo(x, y);
- 	release();
-@@ -851,7 +851,7 @@
- 		screen.set_map(x1, y1, m ^ a);
- 	release();
- }
--const enemy_kind pipe1 = {
-+const enemy_kind pipeone = {
- 	0,
- 	&_enemy::make_pipe1,
- 	&_enemy::move_pipe1,
-@@ -978,19 +978,19 @@
- 	}
- 	p ^= a;
- 	if(p & U_MASK)
--		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
-+		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
- 	if(p & R_MASK)
--		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
-+		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
- 	if(p & D_MASK)
--		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
-+		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
- 	if(p & L_MASK)
--		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
-+		enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
- 	manage.add_score(10);
- 	release();
- }
- 
- 
--const enemy_kind pipe2 = {
-+const enemy_kind pipetwo = {
- 	0,
- 	&_enemy::make_pipe2,
- 	&_enemy::move_pipe2,
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
deleted file mode 100644
index 846176da162e..000000000000
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_P="KoboDeluxe-${PV/_/}"
-DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
-HOMEPAGE="http://www.olofson.net/kobodl/"
-SRC_URI="http://www.olofson.net/kobodl/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[png]
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./icons.tar.gz
-}
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-glibc29.patch \
-		"${FILESDIR}"/${P}-glibc2.10.patch
-	# Fix paths
-	sed -i \
-		-e 's:\$(datadir)/kobo-deluxe:$(datadir)/kobodeluxe:' \
-		-e 's:\$(sharedstatedir)/kobo-deluxe/scores:$(localstatedir)/kobodeluxe:' \
-		configure || die "sed configure failed"
-	sed -i \
-		-e 's:kobo-deluxe:kobodeluxe:' \
-		data/gfx/Makefile.in \
-		data/sfx/Makefile.in || die "sed data/Makefile.in failed"
-}
-
-src_configure() {
-	econf $(use_enable opengl)
-}
-
-src_install () {
-	default
-	newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png
-	make_desktop_entry kobodl "Kobo Deluxe"
-	keepdir /var/lib/${PN}
-}
diff --git a/games-arcade/kobodeluxe/metadata.xml b/games-arcade/kobodeluxe/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/kobodeluxe/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/komi-1.04-r1 b/games-arcade/komi-1.04-r1
new file mode 100644
index 000000000000..a09c28bcf4ba
--- /dev/null
+++ b/games-arcade/komi-1.04-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
+DESCRIPTION=Komi the Space Frog - simple SDL game of collection
+EAPI=6
+HOMEPAGE=http://komi.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://sourceforge/komi/komi-1.04.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=2319b06f53e427d5283e611c9c943df3
diff --git a/games-arcade/komi/Manifest b/games-arcade/komi/Manifest
deleted file mode 100644
index f405f426999d..000000000000
--- a/games-arcade/komi/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.04-DESTDIR.patch 974 BLAKE2B be10af269f5c812e921cf2d7e355b2d4d9380ac4b70910cb43f488572f753da34b3b162aa7e7aa5138eefc62ba17c3e678a59e9954f50165cc3954d0d33defdc SHA512 225ff9737d8cbb76d20be02fded66a12f70d0e65dddfd979f5b72fe1f1dffb74b47ccb065235b1c2ea7d71a198e10bbad144fb22ce4743e4d9842c138b696598
-AUX komi-1.04-install.patch 384 BLAKE2B fcc975cbbc6fce54edb399b73d0f0672e30ab6cf7db8bb68c80468fb4a17c19331444c4d7c3428e0c812dac9468b1fce9cb87e65adcea49a733aca2e875249e3 SHA512 65174431b1668e842795af8f0e17d8e1ea004af29068cc968494ee81bf5fe3c9308192c772f6f37f97388cd1630b7e67f65a8c0973365e7aa2b260c9104e03e0
-DIST komi-1.04.tar.gz 954526 BLAKE2B b7be781da0143f4cd563e885ff7688c2f50b5c1be6fbd8d383aeda06873b25a2081ae58b750a00a70d140757a57ec49652ff5e8c4ebf6ba0f306539707c06c31 SHA512 60babb3642bea7598089b342ba582b2f63f6aa051352ad9b2fa5bad0222a32306775a207712d2e7a9242be5e3ff5b4734f5b62708e451e7230499c6812d4c8a3
-EBUILD komi-1.04-r1.ebuild 918 BLAKE2B 7361900135a1206de147ecfc4a855441fbf20d64f81ba2d0c0d307f32cf943a11e44d7ea5d1f68081b3c007f0b30f7ef5b9557562aa24b90e8aaf36144181eab SHA512 5b1498f26459c6b83ace2efbfcc27ffddb02f4484e3416512ad5a8056e8b97010a0ccd1dabf285d9c28ae0f76df1c3cab61cfdfeb83b8498a87ca12966da0f52
-MISC metadata.xml 327 BLAKE2B 0a50ef4f37ade105c52d1bce332efbbcd2d7b38622c65d684930e75db0a0333ba7ee0f022ee5fb5d60feb3d6e7ab22b6c0186699bf3cbff9d7c341d9bcc64c2d SHA512 15af3d90fcfbbcb824625719c4adf55d6b57cfb1d31903731678d5b3170770595e9d1a0dcb0e0151c463cad0493931f49db0d210136e51c269571649cbbc4476
diff --git a/games-arcade/komi/files/1.04-DESTDIR.patch b/games-arcade/komi/files/1.04-DESTDIR.patch
deleted file mode 100644
index 4060d51f3a7d..000000000000
--- a/games-arcade/komi/files/1.04-DESTDIR.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Makefile.orig	2004-12-11 01:36:11.000000000 -0800
-+++ b/Makefile	2004-12-11 01:36:14.000000000 -0800
-@@ -13,9 +13,7 @@
- MIXER=-lSDL_mixer
- SDL_LIB=$(shell sdl-config --static-libs) $(MIXER)
- 
--CFLAGS=-Wall -pedantic -std=c99 -O2 \
--	$(shell sdl-config --cflags) \
--	-DDATAPATH=\"$(DATAPATH)\"
-+CFLAGS= $(ECFLAGS) $(shell sdl-config --cflags) -DDATAPATH=\"$(DATAPATH)\"
- 
- all:	komi
- 
-@@ -24,15 +22,13 @@
- 	-rm *.o
- 
- install:
--	install -d $(DATAPATH)
--	cp -R komidata/* $(DATAPATH)
--	chmod -R 644 $(DATAPATH)
--	chmod 755 $(DATAPATH)
--	install -d $(BINPATH)
--	cp komi $(BINPATH)
--	chmod 755 $(BINPATH)komi
--	install -d $(MANPATH)
--	cp komi.6 $(MANPATH)komi.6
-+	install -d $(DESTDIR)$(DATAPATH)
-+	cp -R komidata/* $(DESTDIR)$(DATAPATH)
-+	chmod -R 644 $(DESTDIR)$(DATAPATH)
-+	chmod 755 $(DESTDIR)$(DATAPATH)
-+	install -d $(DESTDIR)$(BINPATH)
-+	cp komi $(DESTDIR)$(BINPATH)
-+	chmod 755 $(DESTDIR)$(BINPATH)/komi
- 
- komi:	komi.o
- 	$(CC) $(CFLAGS) komi.o -o komi $(SDL_LIB)
diff --git a/games-arcade/komi/files/komi-1.04-install.patch b/games-arcade/komi/files/komi-1.04-install.patch
deleted file mode 100644
index 30395eaff72b..000000000000
--- a/games-arcade/komi/files/komi-1.04-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2015-01-05 11:35:24.794160467 +0100
-+++ b/Makefile	2015-01-05 11:36:23.181058180 +0100
-@@ -24,8 +24,6 @@
- install:
- 	install -d $(DESTDIR)$(DATAPATH)
- 	cp -R komidata/* $(DESTDIR)$(DATAPATH)
--	chmod -R 644 $(DESTDIR)$(DATAPATH)
--	chmod 755 $(DESTDIR)$(DATAPATH)
- 	install -d $(DESTDIR)$(BINPATH)
- 	cp komi $(DESTDIR)$(BINPATH)
- 	chmod 755 $(DESTDIR)$(BINPATH)/komi
diff --git a/games-arcade/komi/komi-1.04-r1.ebuild b/games-arcade/komi/komi-1.04-r1.ebuild
deleted file mode 100644
index 5e0804c4843e..000000000000
--- a/games-arcade/komi/komi-1.04-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Komi the Space Frog - simple SDL game of collection"
-HOMEPAGE="http://komi.sourceforge.net"
-SRC_URI="mirror://sourceforge/komi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-DESTDIR.patch \
-		"${FILESDIR}"/${P}-install.patch
-	sed -i \
-		-e "/^BINPATH/s:=.*:=/usr/bin/:" \
-		-e "/^DATAPATH/s:=.*:=/usr/share/${PN}/:" \
-		-e '/^SDL_LIB/s:$: $(LDFLAGS):' \
-		-e '/^SDL_LIB/s:--static-:--:' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake ECFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	newicon komidata/sprites_komi.bmp ${PN}.bmp
-	make_desktop_entry komi Komi /usr/share/pixmaps/${PN}.bmp
-	doman komi.6
-}
diff --git a/games-arcade/komi/metadata.xml b/games-arcade/komi/metadata.xml
deleted file mode 100644
index f1df7f6e2a86..000000000000
--- a/games-arcade/komi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">komi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/late-0.1.0-r1 b/games-arcade/late-0.1.0-r1
new file mode 100644
index 000000000000..7ad7082e0bf3
--- /dev/null
+++ b/games-arcade/late-0.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image[jpeg]
+DESCRIPTION=A game, similar to Barrack by Ambrosia Software
+EAPI=6
+HOMEPAGE=http://late.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[jpeg]
+SLOT=0
+SRC_URI=mirror://sourceforge/late/late-0.1.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=c993bd66f42ba9e4b12393252c7cb338
diff --git a/games-arcade/late/Manifest b/games-arcade/late/Manifest
deleted file mode 100644
index fc68d23fff7f..000000000000
--- a/games-arcade/late/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX late-0.1.0-gcc43.patch 190 BLAKE2B 4105d416951cb0c7cf15476dabd35695f2da4f491069f308b705316960c51702ba3407575b82d1a56eddb636cb69265c3ad980c90603f4944bd1bfdf5d7d8d43 SHA512 0c75110c749029b56838d0b67f6ccfb18a8861c5ddd7f4256ee4644b6a176ba9b53f3dea80035e9576904344ea6e867bfcd11087d9463898fe8b1b2458afb652
-AUX late-0.1.0-gcc46.patch 283 BLAKE2B 0e25d7738f81b3d2d626094bbe5c59426f5c859b9432ca5bdb2e4f50ebf1c06df9ec2170a76ffaa032a4c7f383d4c832930fe5369de9cb931c6d0e1763b96398 SHA512 4284066e07331e77dda457ecbb62d387eebda33cd98a1bc4095cbac11871ff5728d4a9ae9737882b0f411958d0318eadf54f661ad85884902bee8ff5ac6836b8
-DIST late-0.1.0.tar.bz2 1560232 BLAKE2B c8d80639fba66d605ea37dbd3ad1fb790b50854f7b2223b4bba0c4f6b94fed2471a725e3e9be66a74526ef4666464377e773b93b0de5dba0b3bcf6fd5ad33fac SHA512 6b3f4d27a723ae450bd8dda375c8663c1a3f457ffbe0a91f5eb96efdd797c2370ec68894df7a4d31e7124b28f3b41b3b952805901427c6ea3502b0d4d13cd72e
-EBUILD late-0.1.0-r1.ebuild 723 BLAKE2B b8c39431169cb32b5f5d1fe2aad1fbf46b8070df6aff4239aa05a403c374b306f1ef0ca2725c3f27673746a8fd8248e8aaa13e43f4ed0c61f6abef70010ca4b7 SHA512 ea9e650288fca7c34d765553f945dfef35826bdac51f67eac04b749661e4a2f8bfd627779cb81cd00b214ed927d64a0ddda42d3401d915313c5a873f84288e92
-MISC metadata.xml 327 BLAKE2B 58b2f933988e0ce86eee474e029e339643df2c448488e33b8dce5a97f3e117d8b3197a7e2276c4f208d0de17a2abc7ee5b01c97ec813c1986f039dc2509a19d9 SHA512 8646246369ce084393463912bb6b8305f6f3336de50adc223faeb9c87f3d4d87750515d8f0fc9b03d2f2d10840357f559bbb9d8f302affe06aa4d6a68d80f3d9
diff --git a/games-arcade/late/files/late-0.1.0-gcc43.patch b/games-arcade/late/files/late-0.1.0-gcc43.patch
deleted file mode 100644
index 8cfead22a27d..000000000000
--- a/games-arcade/late/files/late-0.1.0-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/init.cpp
-+++ b/src/init.cpp
-@@ -26,6 +26,8 @@
- #include "scorescreen.h"
- #include <fstream>
- #include <iostream>
-+#include <cstdlib>
-+#include <cstring>
- using namespace std; 
- 
- 
diff --git a/games-arcade/late/files/late-0.1.0-gcc46.patch b/games-arcade/late/files/late-0.1.0-gcc46.patch
deleted file mode 100644
index 95d18ba7ed11..000000000000
--- a/games-arcade/late/files/late-0.1.0-gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru late-0.1.0.orig/src/ball.h late-0.1.0/src/ball.h
---- late-0.1.0.orig/src/ball.h	2003-08-07 18:26:13.000000000 -0400
-+++ late-0.1.0/src/ball.h	2011-04-07 21:32:14.189799689 -0400
-@@ -25,6 +25,7 @@
- class ball;
- 
- #include "square.h"
-+#include <cstddef>
- 
- class ball_base
- {
diff --git a/games-arcade/late/late-0.1.0-r1.ebuild b/games-arcade/late/late-0.1.0-r1.ebuild
deleted file mode 100644
index dd837c5f6220..000000000000
--- a/games-arcade/late/late-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A game, similar to Barrack by Ambrosia Software"
-HOMEPAGE="http://late.sourceforge.net/"
-SRC_URI="mirror://sourceforge/late/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[jpeg]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
-	sed -i \
-		-e "/chown/d" \
-		Makefile.in \
-		|| die "sed failed"
-}
-
-src_install () {
-	default
-	newicon graphics/latebg2.jpg ${PN}.jpg
-	make_desktop_entry late Late /usr/share/pixmaps/${PN}.jpg
-}
diff --git a/games-arcade/late/metadata.xml b/games-arcade/late/metadata.xml
deleted file mode 100644
index 9bdb3fcf19ef..000000000000
--- a/games-arcade/late/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">late</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/lbreakout-010315-r1 b/games-arcade/lbreakout-010315-r1
new file mode 100644
index 000000000000..20ed8a87a988
--- /dev/null
+++ b/games-arcade/lbreakout-010315-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.1.5
+DESCRIPTION=Breakout clone written with the SDL library
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LBreakout/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.1.5
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/lbreakout-010315.tar.gz
+_md5_=0cce95ef170705d671731d50139210f0
diff --git a/games-arcade/lbreakout/Manifest b/games-arcade/lbreakout/Manifest
deleted file mode 100644
index 91c252f8e5bf..000000000000
--- a/games-arcade/lbreakout/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lbreakout-010315.tar.gz 655418 BLAKE2B f8d893c16de045f172e2ece3158420a880fff4775e81f714d390cc92cfbc6296cc968442388097d6be7fd23e19be614d872fe4b9e730284dcb7044d06bf9d72f SHA512 92421ceb4e643df2123d084b0d2c5edfd311e39dd8da85c01da5cfd872f787a6969e514efab2c5f110979434e773fce211e755e4c45438c4469ab9095cb595b7
-EBUILD lbreakout-010315-r1.ebuild 617 BLAKE2B 3106ce3654440c8c5dfc431d0c006f7541d6616136972f24d8f90d267a54c1c9e686f0c66273044e2badf6c02971f82301fdbe04a791c5a29fbad65dfadf9a60 SHA512 7eddaf43df8189c64e390dc5b2a8284132ee03631b4756ced32d19db617df33a3f913dacbe6967bc8a59b09cbb8a31b18ed9c0f960af0c60acc855e4ed7c53ff
-MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild b/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
deleted file mode 100644
index 4a465d929cfc..000000000000
--- a/games-arcade/lbreakout/lbreakout-010315-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Breakout clone written with the SDL library"
-HOMEPAGE="http://lgames.sourceforge.net/LBreakout/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^sdir=/s:$datadir/games:$datadir:' \
-		-e '/^hdir=/s:/var/lib/games:$localstatedir:' \
-		configure \
-		|| die "sed failed"
-}
-
-src_install() {
-	HTML_DOCS="lbreakout/manual/*"
-	default
-}
diff --git a/games-arcade/lbreakout/metadata.xml b/games-arcade/lbreakout/metadata.xml
deleted file mode 100644
index 2cbba7c09d17..000000000000
--- a/games-arcade/lbreakout/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lgames</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/lbreakout2-2.6.5-r1 b/games-arcade/lbreakout2-2.6.5-r1
new file mode 100644
index 000000000000..3d1ffabb3a74
--- /dev/null
+++ b/games-arcade/lbreakout2-2.6.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
+DEPEND=media-libs/libpng:0= sys-libs/zlib media-libs/libsdl[sound,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1: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=Breakout clone written with the SDL library
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LBreakout2/
+IUSE=nls themes
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:0= sys-libs/zlib media-libs/libsdl[sound,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/lbreakout2-2.6.5.tar.gz mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-levelsets-20141220.tar.gz themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/lbreakout2-themes-20141220.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_=8bbe78288015b6b9d768a1d9b22845ef
diff --git a/games-arcade/lbreakout2/Manifest b/games-arcade/lbreakout2/Manifest
deleted file mode 100644
index 2f8131a095b5..000000000000
--- a/games-arcade/lbreakout2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX lbreakout2-2.6.5-gentoo.patch 2112 BLAKE2B ede968faa5aee77cf8325a176d5249ae29c87f2e1aaedaddbf9f24c7a763c2e711fd999c914b97f7cd468b4738df832538eb9a7528f01280e42fee6adc1d2587 SHA512 e3f4ce13d67b9c84ef813aa09957ac2615724986821846544839b92f616b66bdf2da1d3239c4a48c8eaf071d0e98fcaf9f2c2cab6a314ea91f5671ef75367b58
-DIST lbreakout2-2.6.5.tar.gz 3491519 BLAKE2B b382b391f3aa12f975ed52ec9f7de21f864c2171e0b6d1469ae1224b3cb240ff8a680ebae9ea37a85aa95c432c164058e8a9a0a1d094bbef572670bdbd17ca4e SHA512 45c54bc9401131c96eba5fdcc08ca1324904fb50d3967acf7f29034045cbcd4c1d0b65f38eb33d8aace4cfe35f2a2e7a6c2319e4a6d6a1b41274dbe293a1747b
-DIST lbreakout2-levelsets-20141220.tar.gz 372221 BLAKE2B 16da9ee84e856734645a2ddf1665a8ebf8a52aa63be5d91e20f359bfb270d7bed16e7a4903c0847543141120d8d633bf84ceda867000354eedf201e389faf0db SHA512 482c1e95a37735f7bca510fa34d0f046e89b5aa9528b9af9dfff5bcb3fe656140285a95670caae2565cc9ebd30c3dc87a1fe77a6b75061ce9349ee7e36aa13d5
-DIST lbreakout2-themes-20141220.tar.gz 34006503 BLAKE2B 5262e04368d1c77b2690f70ded0c3da17b7ce31175271f22142b0418dfabb840561f4dbd97d16a12da6addb9d15e22e5ca97f96c8380bd0e7983642ee55fd1e3 SHA512 6088ff4bd9dfbbeb91c74e4adb500593af88ea6796bdec577afb43fc4ea9819c4f2dae76b6b7a8ad1ce2ec32ef575e41a6fa924463107a5dcd211f50bb94a906
-EBUILD lbreakout2-2.6.5-r1.ebuild 2005 BLAKE2B e402954c7874795c2059ca39e8969062d39736806171ba70ae7176538ef51813b1e8b501e2992b2334571f2a12fa18d438f613bf69a7d6acb1ebbc2e47028ab8 SHA512 6f37d8c4e9313d957f151d774151f1c9f69e37cde09c0e50cd9ca02049afd7d7939deb6299905bb7eac41831555c199c0320546b0707b3a0f121785dd60873ad
-MISC metadata.xml 413 BLAKE2B 483149bf4aab9f2a8fea8fbaa6cdcf8ea0c029750acc79b8c4203f27f139a96bf80f5c73c972802ac9eea89f29e98c71214d7a723b82d81290a776fd49480ad7 SHA512 152c0d0d5ac6e3babb26c8eba16c31ed687e0a39ee7b6a86442a1a1efcb4f2d63ccd7f6062857df78047dca8466f548548d40c8baf8359cbaf1758ac03eb1661
diff --git a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch b/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
deleted file mode 100644
index 365274c581b9..000000000000
--- a/games-arcade/lbreakout2/files/lbreakout2-2.6.5-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- lbreakout2-2.6.1.orig/Makefile.am
-+++ lbreakout2-2.6.1/Makefile.am
-@@ -1,13 +1,8 @@
- SUBDIRS = intl m4 po common gui game server client docs
- 
- EXTRA_DIST = config.rpath AUTHORS COPYING ChangeLog INSTALL README \
--README-SDL.txt TODO lbreakout2.spec touchall lbreakout32.gif \
--lbreakout48.gif lbreakout2.desktop.in win32_mancomp win32_preparchive
--
--desktopdir = $(datadir)/applications
--desktop_DATA = lbreakout2.desktop
--icondir = $(datadir)/icons
--icon_DATA = lbreakout48.gif
-+README-SDL.txt TODO lbreakout2.spec touchall \
-+win32_mancomp win32_preparchive
- 
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt \
- TODO lbreakout2.spec ABOUT-NLS
---- lbreakout2-2.6.1.orig/common/gettext.h
-+++ lbreakout2-2.6.1/common/gettext.h
-@@ -24,6 +24,7 @@
- 
- /* Get declarations of GNU message catalog functions.  */
- # include <libintl.h>
-+# include <locale.h>
- 
- #else
- 
---- lbreakout2-2.6.1.orig/configure.in
-+++ lbreakout2-2.6.1/configure.in
-@@ -80,8 +80,6 @@
- [  --enable-netdebug           Enable net packet debugging.], netdebug_flag="-DNET_DEBUG_MSG" )
- AC_SUBST(netdebug_flag)
- 
--dnl set localedir
--localedir=$datadir/locale
- locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
- 
- dnl installation&highscore path
---- lbreakout2-2.6.1.orig/docs/Makefile.am
-+++ lbreakout2-2.6.1/docs/Makefile.am
-@@ -7,11 +7,11 @@
- warp.jpg screen.jpg
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(doc_dir)/lbreakout2
-+	$(mkinstalldirs) $(DESTDIR)$(doc_dir)
- 	@for file in *.jpg; do\
--	  $(INSTALL_DATA) $$file $(DESTDIR)$(doc_dir)/lbreakout2/$$file;\
-+	  $(INSTALL_DATA) $$file $(DESTDIR)$(doc_dir)/$$file;\
- 	done
--	$(INSTALL_DATA) index.html $(DESTDIR)$(doc_dir)/lbreakout2/index.html
-+	$(INSTALL_DATA) index.html $(DESTDIR)$(doc_dir)/index.html
- 
- win32-install-script:
- 	@for file in $(EXTRA_DIST); do \
---- lbreakout2-2.6.1.orig/po/Makefile.in.in
-+++ lbreakout2-2.6.1/po/Makefile.in.in
-@@ -24,7 +24,7 @@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
- datarootdir = @datarootdir@
--localedir = $(datadir)/locale
-+localedir = @localedir@
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild b/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
deleted file mode 100644
index 5c9a684ab321..000000000000
--- a/games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic gnome2-utils
-
-levels_V=20141220
-themes_V=20141220
-
-DESCRIPTION="Breakout clone written with the SDL library"
-HOMEPAGE="http://lgames.sourceforge.net/LBreakout2/"
-SRC_URI=" mirror://sourceforge/lgames/${P}.tar.gz
-	mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-levelsets-${levels_V}.tar.gz
-	themes? ( mirror://sourceforge/lgames/add-ons/lbreakout2/${PN}-themes-${levels_V}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="nls themes"
-
-RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-net
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd "${S}/client/levels"
-	unpack ${PN}-levelsets-${levels_V}.tar.gz
-
-	if use themes ; then
-		mkdir "${WORKDIR}/themes"
-		cd "${WORKDIR}/themes"
-		unpack ${PN}-themes-${themes_V}.tar.gz
-
-		# Delete a few duplicate themes (already shipped with lbreakout2
-		# tarball). Some of them have different case than built-in themes, so it
-		# is harder to just compare if the filename is the same.
-		rm -f absoluteB.zip oz.zip moiree.zip
-		for f in *.zip; do
-			unzip -q "$f"  &&  rm -f "$f" || die
-		done
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -O?
-	econf \
-		--enable-sdl-net \
-		--localedir=/usr/share/locale \
-		--with-docdir="/usr/share/doc/${PF}/html" \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	if use themes ; then
-		insinto /usr/share/lbreakout2/gfx
-		doins -r "${WORKDIR}/themes/"*
-	fi
-
-	newicon client/gfx/win_icon.png ${PN}.png
-	newicon -s 32 client/gfx/win_icon.png ${PN}.png
-	make_desktop_entry lbreakout2 LBreakout2
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/lbreakout2/metadata.xml b/games-arcade/lbreakout2/metadata.xml
deleted file mode 100644
index 4e3b6dfb6f34..000000000000
--- a/games-arcade/lbreakout2/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="themes">Install additional themes</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">lgames</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-arcade/marbleblast-demo-1.3 b/games-arcade/marbleblast-demo-1.3
new file mode 100644
index 000000000000..5f65244f20ac
--- /dev/null
+++ b/games-arcade/marbleblast-demo-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=race marbles through crazy stages
+EAPI=5
+HOMEPAGE=http://www.garagegames.com/pg/product/view.php?id=3
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MARBLEBLAST
+RDEPEND=games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ggdev-1.homelan.com/marbleblast/MarbleBlastDemo-1.3.sh.bin
+_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_=32389da544d809c4489561ae329b8b82
diff --git a/games-arcade/marbleblast-demo/Manifest b/games-arcade/marbleblast-demo/Manifest
deleted file mode 100644
index dbd08550a750..000000000000
--- a/games-arcade/marbleblast-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MarbleBlastDemo-1.3.sh.bin 10800892 BLAKE2B 87fe4ae6f07365f2ed3cc6f6c4006c9a7ca4f8bdcd07cc0a20a5f575130c65666edab45ad6ff191ced8d29556c3e2c662d93b0d4938de8a3571af04698cae66b SHA512 24bd5f03c8868ab83e2bcfe27ab60f86727e972f04cafe4d5ff940a77adf4a362c3de1b0391b5763aed8dc946af7b769da60654b2ea53133521b200a99ebdde8
-EBUILD marbleblast-demo-1.3.ebuild 819 BLAKE2B b53c47de135619c4edebbfa160cdea05a154f5ce05926145816613c52acd72b3c7b07dbca74f2069d988475715850205e4bdfd8ebf01799ab6a75579c9fcbf44 SHA512 3dd6560b3e307eca3f5e90686f26ce89f9f65373ac7099d1c93f1e47f870bf2bbff1ffc95c516120e53e94d54de98e7287218b13a5dd955da6fe582b9b49fa77
-MISC metadata.xml 1469 BLAKE2B 44f92ff998c0bc156b588ec6b95bc493e85bbf622d4dad4ba915b85283ccd01c6f459344c76510a1ecd92005d2668da0d2e573f209a7eed97a7068bab03fe7c5 SHA512 c11947aebdc32a03efd9645466df5e946a386d262a6e529e289cdc213e93d993ff67300d9d96b69af647a84947777dc6f90db9a0a5568d02ba81689ff90b2b45
diff --git a/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild b/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
deleted file mode 100644
index a99f38dc06b0..000000000000
--- a/games-arcade/marbleblast-demo/marbleblast-demo-1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker games
-
-DESCRIPTION="race marbles through crazy stages"
-HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=3"
-SRC_URI="ftp://ggdev-1.homelan.com/marbleblast/MarbleBlastDemo-${PV}.sh.bin"
-
-LICENSE="MARBLEBLAST"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/marbleblastdemo.bin
-	${dir:1}/lib/lib*"
-
-src_install() {
-	dodir "${dir}" "${GAMES_BINDIR}"
-
-	tar -zxf MarbleBlast.tar.gz -C "${D}/${dir}" || die "extracting MarbleBlast.tar.gz"
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/marbleblastdemo
-	dosym "${dir}"/marbleblastdemo "${GAMES_BINDIR}"/marbleblast-demo
-
-	dodoc README_DEMO.txt
-
-	prepgamesdirs
-}
diff --git a/games-arcade/marbleblast-demo/metadata.xml b/games-arcade/marbleblast-demo/metadata.xml
deleted file mode 100644
index 581d9cab5924..000000000000
--- a/games-arcade/marbleblast-demo/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Marble Blast is an arcade action game with simple yet addictive gameplay, 
-suitable for players of any age. In the rich cartoon landscape of Marble 
-Blast, players will race their marbles through moving platforms, dangerous 
-hazards, sparkling treasures and power up enhancements in an effort to 
-complete each course in record time.
-
-Marble Blast introduces new players to the game with a set of 
-progressively more difficult beginner training levels, each designed to 
-showcase a power up or game hazard. The hazards players will face in 
-Marble Blast include powerful fans, whirling tornados, land mines, 
-pinball-style bumpers, narrow catwalks, moving pistons, dizzying chasms, 
-and more.
-
-To get past these obstacles, players can find and use five different 
-ability enhancing power ups - the SuperSpeed, SuperJump, SuperBounce, 
-Shock Asbsorber and Gyrocopter. Some levels contain gravity modifiers, 
-which allow the player to change the direction of gravity.
-
-Marble Blast comes with 72 whimsical and challenging levels, as well as 
-the ability for advanced players to craft and share their own levels. 
-Marble Blast is sure to provide many hours of fun for the whole family.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/marbleblastgold-demo-1.4.1 b/games-arcade/marbleblastgold-demo-1.4.1
new file mode 100644
index 000000000000..b5722c9f0776
--- /dev/null
+++ b/games-arcade/marbleblastgold-demo-1.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=race marbles through crazy stages
+EAPI=5
+HOMEPAGE=http://www.garagegames.com/pg/product/view.php?id=15
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=MARBLEBLAST
+RDEPEND=sys-libs/glibc games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ggdev-1.homelan.com/marbleblastgold/MarbleBlastGoldDemo-1.4.1.sh.bin
+_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_=615b7e78862b6d24ef1ea7a30191c714
diff --git a/games-arcade/marbleblastgold-demo/Manifest b/games-arcade/marbleblastgold-demo/Manifest
deleted file mode 100644
index b8cf7a51b5b8..000000000000
--- a/games-arcade/marbleblastgold-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MarbleBlastGoldDemo-1.4.1.sh.bin 11180534 BLAKE2B 1b0b1fca99bf7bdbb4beb5572d4ec10c634a6dffe8ce1576452011f1283196cd983adbb4d01b9c24590bd97cd2f9145bb67007cb76f0867335c8f4fc8f3e7d7e SHA512 16f03cdcf3cd6440048d8640c2a91078637d018f15a49764eca914259d65196f5a16a90abc11283d0e4b9af1b290d7ab880e96caae2dd6c813ac6d3d8414ec2c
-EBUILD marbleblastgold-demo-1.4.1.ebuild 904 BLAKE2B 630af85f2133966e89aff109e34f96a3e7ce87a83bb5e12a70988b9b20a4d2900de814a8c7c4725310143d2ad7d59cf9e94207809d299b1313b7cf04a2add6c5 SHA512 a10852eb114248edfc76003d2c4f9851a4543a7e6d3a4c6804f5549187e306611871bbd078a870eba4bcd56bbaf506960e8f71c314a069f774a344e60a986629
-MISC metadata.xml 1615 BLAKE2B 4880aa111ff55d0b7c88faad0ce24759bc1f7420d0bcb0ea56dbd96cf2da3a5a3702c11df328264cdc322ed49d956522ea83955b23f7b9a85e89cff189efae62 SHA512 4fb1d433646a33670f1165e257dc5767e10b2b1d6fb8ca79c90a9dac234f88f215db790177933d341f1564f34093bf3facbd5b245a4cfe9a148a05497c8eb036
diff --git a/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild b/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
deleted file mode 100644
index db76c45ef6a0..000000000000
--- a/games-arcade/marbleblastgold-demo/marbleblastgold-demo-1.4.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker games
-
-DESCRIPTION="race marbles through crazy stages"
-HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=15"
-SRC_URI="ftp://ggdev-1.homelan.com/marbleblastgold/MarbleBlastGoldDemo-${PV}.sh.bin"
-
-LICENSE="MARBLEBLAST"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/marbleblastgolddemo.bin
-	${dir:1}/lib/*"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "${dir}" "${GAMES_BINDIR}"
-
-	tar -zxf MarbleBlast.tar.gz -C "${D}/${dir}" || die "extracting MarbleBlast.tar.gz"
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/marbleblastgolddemo
-	dosym "${dir}"/marbleblastgolddemo "${GAMES_BINDIR}"/marbleblastgold-demo
-
-	insinto "${dir}"
-	doins MarbleBlast.xpm
-
-	dodoc README.txt
-
-	prepgamesdirs
-}
diff --git a/games-arcade/marbleblastgold-demo/metadata.xml b/games-arcade/marbleblastgold-demo/metadata.xml
deleted file mode 100644
index 9b3bdd524a91..000000000000
--- a/games-arcade/marbleblastgold-demo/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Marble Blast Gold is an arcade action game with simple yet 
-addictive gameplay, suitable for players of any age. In the 
-rich cartoon landscape of Marble Blast Gold, players will race 
-their marbles through moving platforms, dangerous hazards, 
-sparkling treasures and power up enhancements in an effort to 
-complete each course in record time.
-
-Marble Blast Gold introduces new players to the game with a set 
-of progressively more difficult beginner training levels, each 
-designed to showcase a power up or game hazard. The hazards 
-players will face in Marble Blast include powerful fans, 
-whirling tornados, land mines, pinball-style bumpers, narrow 
-catwalks, moving pistons, dizzying chasms, and more.
-
-To get past these obstacles, players can find and use five 
-different ability enhancing power ups - the SuperSpeed, 
-SuperJump, SuperBounce, Shock Absorber and Gyrocopter. Some 
-levels contain gravity modifiers, which allow the player to 
-change the direction of gravity.
-
-Marble Blast Gold comes with 100 whimsical and challenging 
-levels, as well as the ability for advanced players to craft 
-and share their own levels. Each level has "gold standard" set 
-for the high score, so you can test your skills against the 
-record 'gold' times. Marble Blast Gold is sure to provide many 
-hours of fun for the whole family.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/metadata.xml b/games-arcade/metadata.xml
deleted file mode 100644
index 992ba13fea49..000000000000
--- a/games-arcade/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-arcade category contains arcade games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-arcade enthält Arcadespiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-arcade contiene juegos arcade.
-	</longdescription>
-	<longdescription lang="ja">
-		games-arcadeカテゴリーにはアーケード・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-arcade categorie bevat arcadespellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-arcade chứa các trò chơi dạng "arcade".
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-arcade contiene giochi arcade.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-arcade contém jogos de arcade.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-arcade zawiera gry zręcznościowe.
-	</longdescription>
-	<longdescription lang="ru">
-		Категория games-arcade содержит игры-аркады.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-arcade/methane-1.5.1 b/games-arcade/methane-1.5.1
new file mode 100644
index 000000000000..b0a9c5da65ae
--- /dev/null
+++ b/games-arcade/methane-1.5.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-games/clanlib:2.3[opengl,mikmod] virtual/pkgconfig
+DESCRIPTION=Port from an old amiga game
+EAPI=5
+HOMEPAGE=http://methane.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-games/clanlib:2.3[opengl,mikmod] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/methane/methane-1.5.1.tgz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9f4ad259913c35cc8667207576206389
diff --git a/games-arcade/methane/Manifest b/games-arcade/methane/Manifest
deleted file mode 100644
index 0a5c77f21481..000000000000
--- a/games-arcade/methane/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX methane-1.5.1-gentoo.patch 2873 BLAKE2B 3cb70f3813614b9a82a56cbced6d8186969e4c098af7056be04b1cf29784a776476c03125e178d535ec2e6fcbe470cbb805e0fa3ba168c458020e9a8e9b6c018 SHA512 21d117144cd1bc1813cea80ed07f18f046a1600449bc1be231cec46e6a2c185c30b572ccdc921e8333e0d32ace2c65b1821c61a726f8ced4be094cafa5fb3768
-DIST methane-1.5.1.tgz 1057881 BLAKE2B c783d8153e96cbf0f8f3593cd5ddccd0a9ec8222f61667d411cd3be7159ecf5a3364ad0212b77590b256fc33094e7ea73b83bdcb048aaea6d506e3e146b1412a SHA512 3506f288179a127f8508bd9d4225618d8dcd93794c559822ed2836bb46a318ce3c199f951f564064091b1125375118f2d64c50a27059dcd0e49c8379fa8c3155
-EBUILD methane-1.5.1.ebuild 1095 BLAKE2B 99f469e627db95dcff7aac65e6395900cacaa473c253687b06f3b53509cfa70fa2763f94ab8c3a5675c0e958de8a6cf5a7f52ae2a8926c166aa82602a99fb10f SHA512 7a2ce47530e10eb6f614b338a40ebd670db1a1ac1eaf28ced845a61db021422c46c94f523e4b27b994e954a4b37d0e12bb377746a0379521e79d2ef60005d0f2
-MISC metadata.xml 330 BLAKE2B 29205dbe4c0acf2e057c19d5c24057eff9fd7727fee56876d2bf9705baf2613ba80c59a6bcaf80d2346629259d4287ae7697c63466aa4f053ab3105f7efad5bf SHA512 fbb2b283c78c2952bb974a7b247ad80e4d1a9c1d8af47fa13e3d48fc91c9372c09b04212c55c6b06bbc939ea55e64c42bdd6fbae7cbb60c8fa6ed60f48305960
diff --git a/games-arcade/methane/files/methane-1.5.1-gentoo.patch b/games-arcade/methane/files/methane-1.5.1-gentoo.patch
deleted file mode 100644
index 9e49ecdff25c..000000000000
--- a/games-arcade/methane/files/methane-1.5.1-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- Makefile.old	2012-11-26 18:58:48.201837870 +0100
-+++ Makefile	2012-11-27 12:30:16.038998128 +0100
-@@ -1,5 +1,5 @@
--METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2 clanSound-2.2 clanMikMod-2.2`
--METHANE_LIBS = `pkg-config --libs clanCore-2.2 clanDisplay-2.2 clanApp-2.2 clanGL-2.2 clanGL1-2.2 clanSWRender-2.2  clanSound-2.2 clanMikMod-2.2`
-+METHANE_FLAGS = -DENABLE_SOUND `pkg-config --cflags clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3 clanSound-2.3 clanMikMod-2.3`
-+METHANE_LIBS = `pkg-config --libs clanCore-2.3 clanDisplay-2.3 clanApp-2.3 clanGL-2.3 clanGL1-2.3 clanSWRender-2.3  clanSound-2.3 clanMikMod-2.3`
- 
- OBJF = build/game.o build/baddie.o build/methane.o build/target.o build/maps.o build/gfxoff.o build/mapdata.o build/objlist.o build/doc.o build/bitdraw.o build/global.o build/suck.o build/power.o build/goodie.o build/bititem.o build/player.o build/weapon.o build/bitgroup.o build/boss.o build/sound.o build/gasobj.o build/misc.o
- 
-@@ -10,7 +10,7 @@
- 	@echo "================================="
- 
- methane: ${OBJF}
--	g++ ${CXXFLAGS} ${OBJF}	-o methane ${METHANE_LIBS}
-+	$(CXX) ${LDFLAGS} ${CXXFLAGS} ${OBJF} -o methane ${METHANE_LIBS}
- 
- clean:
- 	@rm -Rf build
-@@ -23,6 +23,6 @@
- build/%.o : sources/%.cpp
- 	@echo "  Compiling $<..."
- 	@if [ ! -d build ]; then mkdir build; fi
--	gcc ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
-+	$(CXX) ${CXXFLAGS} ${METHANE_FLAGS} -c $< -o $@
- 
- 
---- sources/methane.cpp.old	2012-11-27 13:49:22.993003266 +0100
-+++ sources/methane.cpp	2012-11-27 17:37:23.051913777 +0100
-@@ -80,15 +80,15 @@
- 				return 0;
- 			}
- 
--			CL_AutoPtr<CL_SetupSound> setup_sound;
--			CL_AutoPtr<CL_SoundOutput> sound_output;
--			CL_AutoPtr<CL_SetupMikMod> setup_mikmod;
-+			CL_UniquePtr<CL_SetupSound> setup_sound;
-+			CL_UniquePtr<CL_SoundOutput> sound_output;
-+			CL_UniquePtr<CL_SetupMikMod> setup_mikmod;
- 
- 			if (GLOBAL_SoundEnable)
- 			{
--				setup_sound = new CL_SetupSound;
--				sound_output = new CL_SoundOutput(44100);
--				setup_mikmod = new CL_SetupMikMod;
-+				setup_sound = cl_move(CL_UniquePtr<CL_SetupSound>(new CL_SetupSound));
-+				sound_output = cl_move(CL_UniquePtr<CL_SoundOutput>(new CL_SoundOutput(44100)));
-+				setup_mikmod = cl_move(CL_UniquePtr<CL_SetupMikMod>(new CL_SetupMikMod));
- 			}
- 
- 			// Set the video mode
---- sources/target.cpp.old	2012-11-28 21:34:32.666878913 +0100
-+++ sources/target.cpp	2012-11-28 21:35:16.371247221 +0100
-@@ -132,7 +132,7 @@
- 	CL_GraphicContext gc = m_pWindow->get_gc();
- 
- 	// Find the resources directory:
--	CL_String resource_dir = CL_Directory::get_resourcedata("methane");
-+	CL_String resource_dir = "@GENTOO_DATADIR@/methane/";
- 	CL_String dataname("page_01.png");
- 	CL_String filename = resource_dir + dataname;
- 	if (!CL_FileHelp::file_exists(filename))
diff --git a/games-arcade/methane/metadata.xml b/games-arcade/methane/metadata.xml
deleted file mode 100644
index 4df86fb4c243..000000000000
--- a/games-arcade/methane/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">methane</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/methane/methane-1.5.1.ebuild b/games-arcade/methane/methane-1.5.1.ebuild
deleted file mode 100644
index 5eb599ba6769..000000000000
--- a/games-arcade/methane/methane-1.5.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-DESCRIPTION="Port from an old amiga game"
-HOMEPAGE="http://methane.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-games/clanlib:2.3[opengl,mikmod]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}:" \
-		sources/target.cpp || die
-
-	# fix weird parallel make issue wrt #450422
-	mkdir build || die
-	append-cxxflags -Wno-narrowing # build with gcc5 (bug #573788)
-}
-
-src_install() {
-	dogamesbin methane
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins resources/*
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}"/methanescores
-	fperms g+w "${GAMES_STATEDIR}"/methanescores
-	newicon docs/puff.gif ${PN}.gif
-	make_desktop_entry ${PN} "Super Methane Brothers" /usr/share/pixmaps/${PN}.gif
-	dodoc authors.txt history.txt readme.txt
-	dohtml docs/*
-	prepgamesdirs
-}
diff --git a/games-arcade/missile-1.0.1-r1 b/games-arcade/missile-1.0.1-r1
new file mode 100644
index 000000000000..c3b543a41cbd
--- /dev/null
+++ b/games-arcade/missile-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer >=sys-apps/sed-4
+DESCRIPTION=The game Missile Command for Linux
+EAPI=6
+HOMEPAGE=http://missile.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://sourceforge/missile/missile-1.0.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_=a9ba35cdc2e001e6b336ec5325f456b6
diff --git a/games-arcade/missile/Manifest b/games-arcade/missile/Manifest
deleted file mode 100644
index 9cf5ad13b9ce..000000000000
--- a/games-arcade/missile/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX missile-1.0.1-ldflags.patch 441 BLAKE2B 165f02176acb378833043931c696459c449b4c77389a84cefb62a11cb77c7c743157e29d7c2de927f57babcb6790c307676bae6d022a181963cf29b9da923992 SHA512 f29ce3eacbde93ec61a327462ab8096a1530752bec6391f98b5999af9b3fec5cd0ffc6a02e592a74ea5d7f535b3e6224bf9bb10537a55ab0c9bdbdd85e50d0f2
-DIST missile-1.0.1.tar.gz 214933 BLAKE2B a1131971051008b9be4d79b3b92d630653cc045988c62ba1090f482bccd62ba4f63320882e75c889c64c9b54bad0c5270400c0b9f54dfc6be4cb1e3ac2f42a36 SHA512 32d30213d433fd3d02d74c4614747bdc2e3012c77793dfb7b869d774b7f43f4d0eb6b1a0e5db805d976e7919404c57cbbaa20f21954dfd4475ddaa6c2f6c0cc2
-EBUILD missile-1.0.1-r1.ebuild 1040 BLAKE2B 79710c97bb71b8ec2b23bbd43d5f015457e4b2880254ad983ba3936a6cdd4df8a556f7aafe0fe914a1d6fac73cbd8d7014976f1c0107ec5b98b724a36ecbe182 SHA512 58f6dcc1aac56aec4500e3ba83a38563de5485aedae66322bbf3d7c4a6faee98ca8d1b36157f9c4624da7292508b6863cf1f289d87e93c7e2d0862f5fbf16e36
-MISC metadata.xml 330 BLAKE2B 9b2dd9925eec0680e98ae011358f7530aa05d1155883f3d97f2814bbbb30726c27a0f37a731f4ad379a8f2f34428f659373f93adf070ccc4dae6c168c6f0dba0 SHA512 ab5f1e51dec4ccf1f6d4d78282b5fe1ed115cabc124ca34ec0ab11246a76017ec60c1df83fedf4e88a6b35ab48a6d1f5e0b5dc8785c4031aba868c37d280b3a4
diff --git a/games-arcade/missile/files/missile-1.0.1-ldflags.patch b/games-arcade/missile/files/missile-1.0.1-ldflags.patch
deleted file mode 100644
index 744b8192c5b9..000000000000
--- a/games-arcade/missile/files/missile-1.0.1-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.old	2010-09-22 09:11:48.000000000 +0200
-+++ b/Makefile	2010-09-22 09:13:08.000000000 +0200
-@@ -125,10 +125,10 @@
- 	fi
- 
- $(PROGRAM):	$(OBJECTS)
--	$(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(LIBS)
- 
- static : $(OBJECTS)
--	$(CC) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(CFLAGS) $(STATIC_LIBS)
- 
- 
- %.o : %.c %.h
diff --git a/games-arcade/missile/metadata.xml b/games-arcade/missile/metadata.xml
deleted file mode 100644
index d0eaca34447e..000000000000
--- a/games-arcade/missile/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">missile</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/missile/missile-1.0.1-r1.ebuild b/games-arcade/missile/missile-1.0.1-r1.ebuild
deleted file mode 100644
index 2e9d9e9874db..000000000000
--- a/games-arcade/missile/missile-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="The game Missile Command for Linux"
-HOMEPAGE="http://missile.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e '/^CC/d' \
-		-e "s:\$(game_prefix)/\$(game_data):/usr/share/${PN}:" \
-		-e "s/-O2/${CFLAGS}/" \
-		-e 's/-lSDL_image $(SND_LIBS)/-lSDL_image -lm $(SND_LIBS)/g' \
-		Makefile || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r data/*
-	newicon -s 48 icons/${PN}_icon_black.png ${PN}.png
-	make_desktop_entry ${PN} "Missile Command"
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/moleinvasion-0.4-r2 b/games-arcade/moleinvasion-0.4-r2
new file mode 100644
index 000000000000..04342f8ef428
--- /dev/null
+++ b/games-arcade/moleinvasion-0.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[opengl,video] virtual/opengl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+DESCRIPTION=Mole infested 2D platform game
+EAPI=6
+HOMEPAGE=http://moleinvasion.tuxfamily.org/
+IUSE=music
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-0.4.tar.bz2 music? ( mirror://gentoo/moleinvasion-music-20090731.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=003ef87e5d8b5968949d50fc5e1bf514
diff --git a/games-arcade/moleinvasion/Manifest b/games-arcade/moleinvasion/Manifest
deleted file mode 100644
index cf53ea6b11ea..000000000000
--- a/games-arcade/moleinvasion/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX moleinvasion-0.4-opengl.patch 439 BLAKE2B 35f32fa286716f2a93555346332858bdcdcbda73dec5561f8499000098b838b9ea9b4e67a2ed0fcf096cf9a1ccf527439989f7c9eea483238e4a002966ce57fd SHA512 2599574c0b8d6d9c3824f2f79b4f86da87b7eb53447fdfce53161f4f14daa1aac5b0916052c43ad1d8952c4e5d22ea02216e24c2299f1ef282e2535621171f21
-AUX moleinvasion-0.4-underlink.patch 295 BLAKE2B 83670e6acb629ec16fbe23e9dedd1fc86c95fc7b598f140c906531af2a01061d783cbe883b943864c69fbb836d6c7c3cc2b35653ca10e0ad564c1c71e04b4dd9 SHA512 96f113a1b4863f24c2dd2ae4afb67ca90a59db3856e69f98ecdbdf651f915c43555a96e30bcf6cb729cc63ef866cd79996e4b0ce7ca56f2758694920c56179ab
-DIST MoleInvasion-0.4.tar.bz2 11213919 BLAKE2B be42f4530f86e347ca2d6d3e94203e698328c96150a82f8307080ecfef288e631dcf14f9b86003a40792e49d6ed899cd867b1ad9dc43272e9c29a784a1a48bb6 SHA512 e1d661758391c24b9daab8ba183a265b77f4b2454c8a55f8405b63a78e040491d0c1421a64736a590a574c364e43a8989ef1b958fa565419938d0c8daadbe03f
-DIST moleinvasion-music-20090731.tar.gz 83772534 BLAKE2B 46b5cedb23604a178cb5fa8dab4546219f5318490b607093f2a0be831fbbe1b7c901b6db474e2a2f590993b11934e0286f62068268b0251368da6b33070e8c25 SHA512 ca3a2d32705afbc878bd370ceb07367a175eae0ea722e92d2993b4a1c6605763922279c15bb0cc42cf1ed15d5c7f1b13c9f8e000adbebf1f709bfbd92b5e791c
-EBUILD moleinvasion-0.4-r2.ebuild 1107 BLAKE2B 7ec10fefc0ce81fea498e2c305695552e926d51b11a74ec351156b3fe7b59b615bc920fcf9f88a8e45a285819cebf55d9f73e93c35e2a651f12bc73fed706dd6 SHA512 4c89a1d7e71a8ce5228348136420eee82a33fafd48b520cfb26bd9463703d3ed6cfdd2fde6d047d2168e0fa70330a9b0bda086741dd985ab4dfb1dacd1f0c172
-MISC metadata.xml 333 BLAKE2B 0682ce190ac920412cd383e548d541d1f7065ae269090fad7123fcfeef0b5c3678e0e3ade79db7c2735345b1c0ba6a565f33b89c239b2b549d865e923fdc9e6e SHA512 3ffaaeb4a0358f39d4fa18f074b91134d40bbca73244de5a8a2f5049c851130a8483c23e0917d662c42e79c5a516a820796682bc0d995497ad64fb8be6e94f19
diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-opengl.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-opengl.patch
deleted file mode 100644
index 357f1bc2b466..000000000000
--- a/games-arcade/moleinvasion/files/moleinvasion-0.4-opengl.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/MoleInvasion.c
-+++ src/MoleInvasion.c
-@@ -159,6 +159,7 @@
- 	else
- 		printf("Video mode set to %ux%u at %u bpp\n",800, 600, bpp);
- 
-+	if(g_opengl) {
- 	/* pour opengl */
- 	glEnable (GL_TEXTURE_2D);
- 	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-@@ -169,6 +170,7 @@
-         glEnable( GL_BLEND );
- 	glMatrixMode(GL_PROJECTION);
- 	/* fin opengl */
-+	}
- 
- 	/* titre */
- 	SDL_WM_SetCaption ("Mole Invasion", NULL);
diff --git a/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch b/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch
deleted file mode 100644
index 7ee61f91e378..000000000000
--- a/games-arcade/moleinvasion/files/moleinvasion-0.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2011-06-14 22:12:00.920386798 +0200
-+++ b/Makefile	2011-06-14 22:12:22.118716548 +0200
-@@ -11,7 +11,7 @@
- EDTOB = editor
- EDWOB = editworld
- 
--LINLIBS=$(LDLIBS) -lGL
-+LINLIBS=$(LDLIBS) -lGL -ldl
- LINEXE = ../lin/moleinvasion
- LINEDT = ../lin/editor
- LINEDW = ../lin/editworld
diff --git a/games-arcade/moleinvasion/metadata.xml b/games-arcade/moleinvasion/metadata.xml
deleted file mode 100644
index 82c310972ccf..000000000000
--- a/games-arcade/moleinvasion/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="music">Download and install the music files</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
deleted file mode 100644
index 885dd1d1524f..000000000000
--- a/games-arcade/moleinvasion/moleinvasion-0.4-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Mole infested 2D platform game"
-HOMEPAGE="http://moleinvasion.tuxfamily.org/"
-SRC_URI="ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-${PV}.tar.bz2
-	music? ( mirror://gentoo/${PN}-music-20090731.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="music"
-
-DEPEND="media-libs/libsdl[opengl,video]
-	virtual/opengl
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	use music && mv -f "${WORKDIR}"/music ../
-	sed -i \
-		-e '/^CFLAGS/s:= -g:+=:' \
-		-e '/^LDFLAGS/d' \
-		-e "/^FINALEXEDIR/s:/usr.*:/usr/bin:" \
-		-e "/^FINALDATADIR/s:/usr.*:/usr/share/${PN}:" \
-		Makefile || die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-opengl.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-data
-	newicon ../gfx/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Mole Invasion"
-	doman ../debian/*.6
-}
diff --git a/games-arcade/mrrescue-1.02b-r1 b/games-arcade/mrrescue-1.02b-r1
new file mode 100644
index 000000000000..9e2e6b734bde
--- /dev/null
+++ b/games-arcade/mrrescue-1.02b-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Arcade 2d action game based around evacuating civilians from burning buildings
+EAPI=6
+HOMEPAGE=http://tangramgames.dk/games/mrrescue/
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0 MIT ZLIB
+RDEPEND=games-engines/love:0
+SLOT=0
+SRC_URI=https://github.com/SimonLarsen/mrrescue/releases/download/v1.02b/mrrescue-1.02b-love.zip https://dev.gentoo.org/~hasufell/distfiles/mrrescue.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_=323a892aafa369c18c1257c0457c0372
diff --git a/games-arcade/mrrescue/Manifest b/games-arcade/mrrescue/Manifest
deleted file mode 100644
index d5e45442a553..000000000000
--- a/games-arcade/mrrescue/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST mrrescue-1.02b-love.zip 11874167 BLAKE2B fce98b602fa276fb922671e6f197d7ad2f7d50539efe2a8c6dcb99b1e904a17039559b7390717ad7be443c291ca37296214a5efb93fa02b9db979a87db75c408 SHA512 24186570c89694889c1d9f17522dd201f20bae2c43237f366397065a7023c89bab3bb9cdc6677cf09bc7cbeaf9926710a3db15818eee9ce8024fedbfcb8fb516
-DIST mrrescue.png 4738 BLAKE2B ca440b008c8870f822c52778aa2ee5eb78a5ec318f133b9d3deba990c49870bcc69d2d6638b3072baedd8cfa27d1ec8a2fc320eda3da643ce2d022a4aff540c7 SHA512 9395e239e300397ed791573758242d75003caaf8c1d66c4f7a0299114ee4f1b40376bb2d532ed4a02fa97f773408ad5ef00ba228ee976fd30ddaa2f60ea80b9c
-EBUILD mrrescue-1.02b-r1.ebuild 931 BLAKE2B e4fc09c921745160045972311589a3213e5b37f4c134011abe5165346920079ed04dc80fc07d43f19b15ebfe65c98efb000678e5a362eab984b34e0ab83d1600 SHA512 966851e87880a62027ec9d76f5cf36d5e84b77b622163149657accd6bc3b2e2271565ec4eb0e425ce777c48de47ed7cf28ad7ee3561652e2312a98c6d9d2445e
-MISC metadata.xml 338 BLAKE2B d2f1a16a96f9ca0b31afedba78fec26f446d2a5d8a1984e6040059cf6e62749fc52806089c0d35c5bd08bbe720cc21be6c0c0f8e81dd5d32d5cebae0624a0d18 SHA512 91e9e003edb4f15c5cb51d1ec9e70941155bb7efc4de7d34272e4c3254e27e59081bb0c843909b0831c1888df4051ca9d8315f7f7251c4d3342dcdd7007daa16
diff --git a/games-arcade/mrrescue/metadata.xml b/games-arcade/mrrescue/metadata.xml
deleted file mode 100644
index 8b23901e939a..000000000000
--- a/games-arcade/mrrescue/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">SimonLarsen/mrrescue</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild b/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild
deleted file mode 100644
index f8e65e459789..000000000000
--- a/games-arcade/mrrescue/mrrescue-1.02b-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="Arcade 2d action game based around evacuating civilians from burning buildings"
-HOMEPAGE="http://tangramgames.dk/games/mrrescue/"
-SRC_URI="https://github.com/SimonLarsen/mrrescue/releases/download/v${PV}/${P}-love.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-LICENSE="CC-BY-SA-3.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-engines/love:0"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${P}-love"
-
-src_install() {
-	local dir=/usr/share/love/${PN}
-
-	exeinto "${dir}"
-	doexe ${PN}.love
-
-	einstalldocs
-
-	doicon -s 64 "${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-arcade/netris-0.52-r2 b/games-arcade/netris-0.52-r2
new file mode 100644
index 000000000000..53fa1b19c381
--- /dev/null
+++ b/games-arcade/netris-0.52-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=Classic networked version of T*tris
+EAPI=6
+HOMEPAGE=http://www.netris.org/
+KEYWORDS=~amd64 ~mips ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=ftp://ftp.netris.org/pub/netris/netris-0.52.tar.gz mirror://debian/pool/main/n/netris/netris_0.52-9.diff.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=228ce291a40346545e8a631cf5394229
diff --git a/games-arcade/netris/Manifest b/games-arcade/netris/Manifest
deleted file mode 100644
index 01b092e6b623..000000000000
--- a/games-arcade/netris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST netris-0.52.tar.gz 33135 BLAKE2B e6958494b3f1e269b87d5e6833355af98c3936e282870afd8153711603b8115998cebe91f5e86afacc58b20cc8ad9ea2fae69906fa544948de7cb6ad77425cfd SHA512 842ad8602394dee929c3c4ba222f9f5ffe628e52348c3faf7c9098bbd5b0b0279fffc7927320f8ee8a5102537c995a8ed605d851f1cd32e4bd8976a7889c84e1
-DIST netris_0.52-9.diff.gz 14482 BLAKE2B 746410106ca944949e1c589f9bc1dcb011269a70339bfff8adcd2ca6eefb51f32cc77b61cc6b25f64a75629e915bf2dc0a8fcc6a9e76d0f7c4dae1d651e8e77f SHA512 4bed230091ddecf5a0dc043981ec9b0a177bee01262715b9cb9a2af0adefe2db52555416b795a70dd496e6fb0b132586bc7f32d2a480f1cfd6c4d40304076109
-EBUILD netris-0.52-r2.ebuild 1249 BLAKE2B 6b08a3e8d84fe8fd60f4e2edb956636fb7260f4d5da45f5f62405950edf9ba8d2b6fcf6d927d89156d712d232aa1c8542dc9e3fa6f0452c202fca2c993c82bd3 SHA512 2ba751c4e8aa8d8b0f28895ceb2569efdc6737fe60513847a19544836b1258001b80a4d41f52e8c229a235282c8721970a61f0b60d259a1598a55a86730ddc7e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/netris/metadata.xml b/games-arcade/netris/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/netris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/netris/netris-0.52-r2.ebuild b/games-arcade/netris/netris-0.52-r2.ebuild
deleted file mode 100644
index 16cf7b4c01d3..000000000000
--- a/games-arcade/netris/netris-0.52-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DEB_VER="9"
-DESCRIPTION="Classic networked version of T*tris"
-HOMEPAGE="http://www.netris.org/"
-SRC_URI="ftp://ftp.netris.org/pub/netris/${P}.tar.gz
-	mirror://debian/pool/main/n/netris/netris_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	tc-export CC CXX LD AR RANLIB
-
-	eapply "${WORKDIR}"/netris_${PV}-${DEB_VER}.diff
-	eapply "${S}"/debian/patches/[01]*
-
-	# bug #185332
-	sed -i \
-		-e '/sys\/time/ i\
-#include <sys/types.h> \
-#include <time.h>
-' \
-		-e '/netint2/ s/short/int16_t/' \
-		-e '/netint4/ s/long/int32_t/' \
-		netris.h || die
-	sed -i \
-		-e 's/volatile //g' \
-		-e '/Be more forgiving/d' \
-		-e 's/static myRandSeed/static int myRandSeed/' \
-		util.c || die
-	sed -i \
-		-e 's/\(long pauseTimeLeft\)/\1 = 0/' \
-		game.c || die
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^COPT/d' \
-		-e '/^CFLAGS/d' \
-		-e 's/(LFLAGS)/(LDFLAGS) $(LFLAGS)/' \
-		Configure || die
-}
-
-src_configure() {
-	bash ./Configure -O || die
-}
-
-src_install() {
-	dobin netris sr
-	dodoc FAQ README robot_desc
-}
diff --git a/games-arcade/nibbles-0.0.4 b/games-arcade/nibbles-0.0.4
new file mode 100644
index 000000000000..28465acc4b91
--- /dev/null
+++ b/games-arcade/nibbles-0.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=An ncurses-based Nibbles clone
+EAPI=5
+HOMEPAGE=http://www.earth.li/projectpurple/progs/nibbles.html
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.earth.li/projectpurple/files/nibbles-v0.0.4.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_=7ef617c8bab27fce864563dc61970454
diff --git a/games-arcade/nibbles/Manifest b/games-arcade/nibbles/Manifest
deleted file mode 100644
index e2b4724f2cf1..000000000000
--- a/games-arcade/nibbles/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX nibbles-0.0.4-as-needed.patch 503 BLAKE2B 3d026b46844c1555a7df9516846b8ba2ea048a3a06ba017f9461930254fdcf7480abffedf8b94da095cb8fd50bda8f73756f06b26d10b41564de9eada7745254 SHA512 3cda4a99fe731cc5c860ec914f78cbcf3dbe6438e9d8d973037b252652a8fe257227809fef64829e07bf49e6cfeda5557575b22c602cc0f0c39882354f1b3181
-DIST nibbles-v0.0.4.tar.gz 18610 BLAKE2B 264331c2ef612d1421c370df601da3d8bd5b04c34f7a41e8a8b78480a308d9e8b24177db3666785603efefabd873af04b24bf31d1b320e3fac7698b1b98e2ee0 SHA512 a10af4f20af371c2a8ab4cf69c4a73120670815467177d3bc2a05aa198e9edf80cc1d47edf40d06059baf6e51cf7018ed4830a3a5bda6a35868548403f5f414b
-EBUILD nibbles-0.0.4.ebuild 1029 BLAKE2B 374f3849f7fe6a69170f794ef83cfec94fe5ccf49be744dfe6d898ae63689413b4327a3260d47d50458fb2bfe0b71c07a9884ae3893dcc0c279d9cccf0c1eb20 SHA512 dc88a354455ddc2bb79737ef07f482252f032bce8af3443790418eb858973e195992b30fadd215b68f916930ab120da80156eccb29f8f766670d01e758e6aaf0
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch b/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch
deleted file mode 100644
index 7e27d1fb9cac..000000000000
--- a/games-arcade/nibbles/files/nibbles-0.0.4-as-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.old	2009-02-02 12:40:36.000000000 +0100
-+++ Makefile	2009-02-02 12:41:22.000000000 +0100
-@@ -1,19 +1,14 @@
--CC = gcc -Wall -g
--
- SRCS = player.c main.c loadMap.c cmdline.c ncdrawlib.c scoring.c 
- OBJS = $(SRCS:.c=.o)
--LIBS = -lncurses
-+LDLIBS = -lncurses
- 
- INSTALL=/usr/bin/install -c
- INSTALL_FOLDER=/usr/games
- 
- all: nibbles
- 
--.c.o:
--	$(CC) -c $*.c -o $*.o
--
- nibbles: $(OBJS)
--	$(CC) $(LIBS) $(OBJS)  -o $@
-+	$(CC) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $@
- 
- clean: 
- 	rm -f *~ *.o nibbles
diff --git a/games-arcade/nibbles/metadata.xml b/games-arcade/nibbles/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/nibbles/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/nibbles/nibbles-0.0.4.ebuild b/games-arcade/nibbles/nibbles-0.0.4.ebuild
deleted file mode 100644
index fe523f359b3d..000000000000
--- a/games-arcade/nibbles/nibbles-0.0.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P=${PN}-v${PV}
-DESCRIPTION="An ncurses-based Nibbles clone"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/nibbles.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e "s#/usr/local/games/nibbles.levels#${GAMES_DATADIR}/${PN}#" \
-		nibbles.h || die
-
-	sed -i \
-		-e "s#/var/lib/games/nibbles.score#${GAMES_STATEDIR}/nibbles.scores#" \
-		scoring.h || die
-
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_install() {
-	dogamesbin nibbles
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins nibbles.levels/*
-
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/nibbles.scores"
-
-	dodoc HISTORY CREDITS TODO README
-
-	prepgamesdirs
-
-	fperms 664 "${GAMES_STATEDIR}/nibbles.scores"
-}
diff --git a/games-arcade/ninvaders-0.1.1-r1 b/games-arcade/ninvaders-0.1.1-r1
new file mode 100644
index 000000000000..333a08e55980
--- /dev/null
+++ b/games-arcade/ninvaders-0.1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:0=
+DESCRIPTION=ASCII space invaders clone
+EAPI=6
+HOMEPAGE=http://ninvaders.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/ninvaders/ninvaders-0.1.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=539283765616b32492e1a80415235bd3
diff --git a/games-arcade/ninvaders/Manifest b/games-arcade/ninvaders/Manifest
deleted file mode 100644
index fc70611339ee..000000000000
--- a/games-arcade/ninvaders/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ninvaders-0.1.1-compile.patch 271 BLAKE2B 99ae9f36673555fbd5054a3214c4c32a1c3ca352149decc28a236f3a77d61f0b588ef62deeda919d0baa5eee30ec0dfd47c4bcb504f4c96f52baf65d5e58451f SHA512 a49a531b9c0109ff65d8519940a23f480a69e281fdf0b9b630532f65fb24eff77b95e8d16b21b32befe7f179a459fe3cf1635a5e978d988e2958c606ca3e2454
-DIST ninvaders-0.1.1.tar.gz 31275 BLAKE2B 7e27c230a94eb9841ab69f11b0b9a9c4ddcbd3079083ad82a08685778bd9dc21b2eafb91fa50e9762f0594846adbb33fef71d24ff48239271b2d58cbbf921d81 SHA512 7987063084d9a9f042b419e7552debf3f173b82ba3832c2575ae8461fb5f787d6a476c305d5c2d591b4574748c6ba50e42391796c384f225685c22f044553087
-EBUILD ninvaders-0.1.1-r1.ebuild 574 BLAKE2B 89c96b71b936f632a9b51a1e5a79119df9f1f7e5d1d8c879f8c007de6be2bc68ac225dd48b8f1caffe15ee87973fd0a6cc7e6f36a2a34043e84990abca7a1f78 SHA512 97c4cc5b792b88e466e00a86af1a643bc2bf6b32c0d379d23afe63de409ee9ffce0a6e9cbc364b7f1a0ece54574b6fee9b1f331fe8d16c395427c743c1c8cf51
-MISC metadata.xml 332 BLAKE2B c7b1b070cd77955f5196efefea2f9fd6acfbc7c50a319adf794e75325e201dcbdefcbb8086020248d27b145a4d1307372f5c4d3d8aad97213abc395e2da2f99c SHA512 5786e2e02e612dfd952bb1985b87a502c861d5c9e0aa2b0360df210ab9516bb88dde5b946e21fef795b62d3a99f64d28e402529bc10f749da9c8a57908a07595
diff --git a/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch b/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch
deleted file mode 100644
index 768ffccc6530..000000000000
--- a/games-arcade/ninvaders/files/ninvaders-0.1.1-compile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/aliens.c.orig	2016-01-21 13:21:51.730154342 -0500
-+++ b/aliens.c	2016-01-21 13:22:09.488543075 -0500
-@@ -163,7 +163,7 @@
- 	aliens.right=-1;
- 	aliens.bottom=-1;
- 	shipnum=0;
--	for (k=0;k<11;k++) {
-+	for (k=0;k<ALIENS_MAX_NUMBER_X;k++) {
- 		lowest_ship[k]=-1;
- 	}
- 	
diff --git a/games-arcade/ninvaders/metadata.xml b/games-arcade/ninvaders/metadata.xml
deleted file mode 100644
index 451fd4c6895b..000000000000
--- a/games-arcade/ninvaders/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ninvaders</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/ninvaders/ninvaders-0.1.1-r1.ebuild b/games-arcade/ninvaders/ninvaders-0.1.1-r1.ebuild
deleted file mode 100644
index 84d3b0553b62..000000000000
--- a/games-arcade/ninvaders/ninvaders-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="ASCII space invaders clone"
-HOMEPAGE="http://ninvaders.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ninvaders/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-compile.patch )
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	newbin nInvaders ninvaders
-	einstalldocs
-}
diff --git a/games-arcade/njam-1.25-r1 b/games-arcade/njam-1.25-r1
new file mode 100644
index 000000000000..5dcc6699089d
--- /dev/null
+++ b/games-arcade/njam-1.25-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/libsdl media-libs/sdl-net
+DESCRIPTION=Multi or single-player network Pacman-like game in SDL
+EAPI=6
+HOMEPAGE=http://njam.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-mixer media-libs/sdl-image media-libs/libsdl media-libs/sdl-net
+SLOT=0
+SRC_URI=mirror://sourceforge/njam/njam-1.25-src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c98b9575ad81726be5080652c23935e2
diff --git a/games-arcade/njam/Manifest b/games-arcade/njam/Manifest
deleted file mode 100644
index e7bcc39a6b7e..000000000000
--- a/games-arcade/njam/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX njam-1.25-format-security.patch 499 BLAKE2B d960f3a2f45cf02cefa7bca36a55f3ed1bbfa8af43378d0610b3d4613f10e26207f0c2ce33664ae778e2dd6e3cac59bc9ba9a795f053421e5824c7fefa1dff53 SHA512 18ddb018ce34ca1e5658025147b5ad61f5a8b6308c79003fcf4bf6cb2e003bdc26322fb18d8aea648d4df047c1928dbe1302e1790d87bc8c71e0b7fa7e8ef1e4
-AUX njam-1.25-gcc45.patch 670 BLAKE2B 068369a02f7ea0a88b3742e575989289ca9b7309db0bf24013c12f0103d7f56f5dbdd390904910d2f671f822d70a1c61c0441ba9e8f27f30d66f7eab0adaf6b4 SHA512 93c9b554ad062c4d2fae70a61f13d7f5a2880b303ec04c05a14b92dac3d0c74711ad2360f05ebc7799fb8d48c59c1bdbff30448f7edbd5c589a8d060bcde2c09
-DIST njam-1.25-src.tar.gz 1665803 BLAKE2B 7e505bd2b6d1d50046c98a3e0edbe5cdd4831ee8d8525562d2b85296f98881f7aaab7154c2482c24be88015a81dc82d3d1b89693d6e7cc16a163a6f342f3b5e3 SHA512 d19c249ade34ede322245718fbc6fc79c5a0ed5f5da50989f88de48410dda3d7ae29f8968185166dfdc1dd23dae8126efe4a5f3c76c3731b90afd1c798f66917
-EBUILD njam-1.25-r1.ebuild 1140 BLAKE2B eae7fc402f766de7bcb952e21120252a460f24ec17e1bb604a1c0875b9cd5249e89fc9d3f96ab701cbb7707adee1a290b24da402f687b4b88d0973cc9b292854 SHA512 97c11e0e54f3d9e5fa9943ebe13a4e438f2e70610cdf5f8ff4446e7c40901f735984b31836dad00689e52a74d53876fabe5b00636a7652144e7deac7d775ba5c
-MISC metadata.xml 327 BLAKE2B 165132496b7120650cde5669a05c9ec7b34a5a6432678a3f54f4ef0f6ebdc2941b56a201f6d49e6b5444ec09825fe3b8bf546d7cf091312ece4a06c1dff04840 SHA512 027848c8ee1cd2adbc90422ab871e50bee2c7fd87aa87fba19208d3814410455177cd722a0a305bb02d911bc380a90901cf65df25ddf037cc48cdc2799d8fb21
diff --git a/games-arcade/njam/files/njam-1.25-format-security.patch b/games-arcade/njam/files/njam-1.25-format-security.patch
deleted file mode 100644
index 66c8b17085ba..000000000000
--- a/games-arcade/njam/files/njam-1.25-format-security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up njam-1.25-src/src/njamgame.cpp~ njam-1.25-src/src/njamgame.cpp
---- njam-1.25-src/src/njamgame.cpp~	2005-12-13 12:56:42.000000000 +0100
-+++ njam-1.25-src/src/njamgame.cpp	2014-06-14 11:54:12.320854217 +0200
-@@ -227,8 +227,7 @@ void NjamEngine::StartGame(GameType Gt)
- 	 	SDL_Surface *temp = IMG_Load(filename);
- 	 	if (!temp)
- 	 	{
--			printf("Loading file: %s", filename);
--			printf(SDL_GetError());
-+			printf("Error loading file %s: %s\n", filename, SDL_GetError());
- 			return;
- 	 	}
- 
diff --git a/games-arcade/njam/files/njam-1.25-gcc45.patch b/games-arcade/njam/files/njam-1.25-gcc45.patch
deleted file mode 100644
index c6515ef0aaa9..000000000000
--- a/games-arcade/njam/files/njam-1.25-gcc45.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix buiding with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318411
-
---- a/src/njamedit.cpp
-+++ b/src/njamedit.cpp
-@@ -114,7 +114,7 @@
- 				key = SDLK_a;
- 			else if (CheckForSave())
- 			{
--				LogFile::LogFile("Saving maps");
-+				LogFile("Saving maps");
- 				m_Maps.Save(filename);
- 				level_type_was = level_type;
- 				changed = false;
-@@ -131,7 +131,7 @@
- 					char types[2][5] = { "COOP", "DUEL" };
- 					sprintf(buf, "levels/%s.%s\0", filename, types[level_type]);
- 					sprintf(filename, "%s\0", buf);
--					LogFile::LogFile("Saving maps");
-+					LogFile("Saving maps");
- 					m_Maps.Save(filename);
- 					level_type_was = level_type;
- 					changed = false;
diff --git a/games-arcade/njam/metadata.xml b/games-arcade/njam/metadata.xml
deleted file mode 100644
index c64fdbbaa6d3..000000000000
--- a/games-arcade/njam/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">njam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/njam/njam-1.25-r1.ebuild b/games-arcade/njam/njam-1.25-r1.ebuild
deleted file mode 100644
index 2bdb8acf9b96..000000000000
--- a/games-arcade/njam/njam-1.25-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-MY_P="${P}-src"
-DESCRIPTION="Multi or single-player network Pacman-like game in SDL"
-HOMEPAGE="http://njam.sourceforge.net/"
-SRC_URI="mirror://sourceforge/njam/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-mixer
-	media-libs/sdl-image
-	media-libs/libsdl
-	media-libs/sdl-net"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:hiscore.dat:/var/${PN}/\0:" \
-		src/njam.cpp \
-		|| die "sed failed"
-	sed -i \
-		-e "/hiscore.dat/ s:\$(DEFAULT_LIBDIR):/var:" \
-		Makefile.in \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-gcc45.patch
-	eapply "${FILESDIR}"/${P}-format-security.patch #542124
-
-	# njam segfaults on startup with -Os
-	replace-flags "-Os" "-O2"
-}
-
-src_install() {
-	default
-
-	HTML_DOCS="${ED}/usr/share/njam/html/*"
-	rm -rf "${ED}/usr/share/njam/html/"
-	rm -f "${ED}"/README "${ED}"/levels/readme.txt
-
-	newicon data/njamicon.bmp njam.bmp
-	make_desktop_entry njam Njam /usr/share/pixmaps/njam.bmp
-}
diff --git a/games-arcade/notpacman-1.0.4-r1 b/games-arcade/notpacman-1.0.4-r1
new file mode 100644
index 000000000000..3d2ad910d1eb
--- /dev/null
+++ b/games-arcade/notpacman-1.0.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A mashup of "Not" and "Pacman"
+EAPI=6
+HOMEPAGE=http://stabyourself.net/notpacman/
+KEYWORDS=~amd64 ~x86
+LICENSE=WTFPL-2
+RDEPEND=>=games-engines/love-0.7.2:0.7 media-libs/devil[png]
+SLOT=0
+SRC_URI=http://stabyourself.net/dl.php?file=notpacman-1004/notpacman-linux.zip -> notpacman-1.0.4.zip https://dev.gentoo.org/~hasufell/distfiles/notpacman.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_=2a57f4d0cafdbf5f13e0885fd3753df9
diff --git a/games-arcade/notpacman/Manifest b/games-arcade/notpacman/Manifest
deleted file mode 100644
index 30bdcd4f22b3..000000000000
--- a/games-arcade/notpacman/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST notpacman-1.0.4.zip 439775 BLAKE2B 223017b71220330167d948c46649ea6b98f6a0b165a2879c348ca5e20ce4ba0b60af6486a598bfd2b327b2e32bb9ff1f70e005b90395b1d0cc50c5d23ad8294a SHA512 c64d74cad972c22fe7674b55c0155fcd6e0176c580f53645a0cef7ae1e2c3453807f13fd9bbc9992cdc1176bc1687800f957ef5c11034a2ffe0774ec0118a863
-DIST notpacman.png 1556 BLAKE2B d745ece089b9d829a47202e0e5d9a0cc4bd7365625fd0771b44d28c59d14ac903df586ec395c08a84115bf50e5842b6749239e37ec246fe6d112092db8aa541d SHA512 38fca81429255a5857476cbbcccb188ae4cc7fae4c044b45d82206ffcb41da5737e20135be2a6ab15ec1ff5faa74e5208a33a4966b3e9e99293c0ccb276b0c1b
-EBUILD notpacman-1.0.4-r1.ebuild 936 BLAKE2B 0a163227a863d06d95e414a6c0248e0408c8b266890b706fc9d5dc694f2f3ccfa0b2752deabe324dc58fbb8e60676b82bc0ebdfc8a52c3c9a89a287ef8f342e7 SHA512 d48039e89176ca1ad0676f9d6bd35a6dbceeb26df78e1ae07903a94661f04004d2b7394fe2da117b3083d342b1862a3875fc9ce2ac016b31737db808eb7cba45
-MISC metadata.xml 642 BLAKE2B 4be7dc3ed30e6fb7af83b8aa2a3cd862c1a7f7e76a97d32fc73485b7b691b77ae0908ff48a986b2e636f39271daf5ab324832046fa869ef3deb1b445da492b60 SHA512 171e756db4c5639b7855c5715fd394ab9c7f8c84a5720257a4655673cbe5f91a3664796bd5f64f52a3f687fad0513c2542df4939b43436a42d80bae99fc2e723
diff --git a/games-arcade/notpacman/metadata.xml b/games-arcade/notpacman/metadata.xml
deleted file mode 100644
index 64f4a5d2c1c1..000000000000
--- a/games-arcade/notpacman/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Ever wondered how Pacman would be like with physics? No? Well, it's
-		revolutionary. This mashup of "Not" and "Pacman" puts The Pac and
-		the Ghosts in a in a Pacworld cage, at mercy of gravity and the
-		level's shape, controlled solely by you. Ghosts still don't like
-		you very much, so you should be careful to make Pacman avoid them.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild b/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild
deleted file mode 100644
index d8e99a5e1408..000000000000
--- a/games-arcade/notpacman/notpacman-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="A mashup of \"Not\" and \"Pacman\""
-HOMEPAGE="http://stabyourself.net/notpacman/"
-SRC_URI="http://stabyourself.net/dl.php?file=notpacman-1004/notpacman-linux.zip -> ${P}.zip
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LVSLOT="0.7"
-RDEPEND=">=games-engines/love-0.7.2:${LVSLOT}
-	 media-libs/devil[png]
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	local dir=/usr/share/love/${PN}
-
-	exeinto "${dir}"
-	newexe not_pacman.love ${PN}.love
-
-	einstalldocs
-
-	doicon -s 32 "${DISTDIR}"/${PN}.png
-	make_wrapper ${PN} "love-${LVSLOT} ${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-arcade/nottetris2-1-r1 b/games-arcade/nottetris2-1-r1
new file mode 100644
index 000000000000..1f0bbe8ce357
--- /dev/null
+++ b/games-arcade/nottetris2-1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=The spiritual successor of the classic Tetris mixed with physics
+EAPI=6
+HOMEPAGE=http://stabyourself.net/nottetris2/
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-NC-SA-3.0
+RDEPEND=>=games-engines/love-0.7.2:0.7 media-libs/devil[png]
+SLOT=0
+SRC_URI=http://stabyourself.net/dl.php?file=nottetris2/nottetris2-linux.zip -> nottetris2-1.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c01ff9152693ce636a0a9e74a0708a23
diff --git a/games-arcade/nottetris2/Manifest b/games-arcade/nottetris2/Manifest
deleted file mode 100644
index a9225825af28..000000000000
--- a/games-arcade/nottetris2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nottetris2-1.zip 2774048 BLAKE2B 2bc1edc06aeca837d39b226b5a288506a98a4a9bd2e7f884fba57c8335944689758c6cb74d2985fc8450bdba19759a177ad3036d816035770638e6520d896201 SHA512 63478640fadf91134dec86f88d6422a317b4523ececff836e40984500f2771d564012cbd587a46b300e084c3c64531f3758c648edf3d683b136c9da69924a187
-EBUILD nottetris2-1-r1.ebuild 759 BLAKE2B 42db242dde6a5a837175d717a782469b96e31b536c74174851ac656a6ffa037f97ea286d127e515a2b863cf32d6fc2f7990379b67727bcac6a021586ccb9b34f SHA512 02c69275bb65f96517d74889ffe0da2f57c0c59860953c4ef709b833541dc1a99eb91b48c6cbb8995568c314b89748f73b0c7aeeb06b4b605461fbf521780af9
-MISC metadata.xml 756 BLAKE2B 8afda50ed483b95a2ba5f023b97e712dfd5facb6e8b12ecc74482a5fccb97129c9b8fff9356cf55312a0c7da3c0e7cffb2d581c0a36522012a3589ed9cb6cbea SHA512 bdbf35cb4e16381e9f53e8290a43517819ab59694425068d82a5adc6ce8c798f9de9db23181875eae41852ca08ac114f82bc750b72567989c50ed5f23a64f49b
diff --git a/games-arcade/nottetris2/metadata.xml b/games-arcade/nottetris2/metadata.xml
deleted file mode 100644
index be520c29e0f5..000000000000
--- a/games-arcade/nottetris2/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Not Tetris 2 is the spiritual successor of the classic Tetris
-		mixed with physics. The result is a fun spinoff in which blocks
-		are no longer bound to the usual grid. Blocks can be rotated and
-		placed at any angle, resulting in a complete mess if not careful.
-		And with the newest cutting edge technology, Not tetris 2 allows
-		line clears when the lines are sufficiently filled. The old mode
-		is still available for play and is now called Stack.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/nottetris2/nottetris2-1-r1.ebuild b/games-arcade/nottetris2/nottetris2-1-r1.ebuild
deleted file mode 100644
index 47c906bb7ce3..000000000000
--- a/games-arcade/nottetris2/nottetris2-1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="The spiritual successor of the classic Tetris mixed with physics"
-HOMEPAGE="http://stabyourself.net/nottetris2/"
-SRC_URI="http://stabyourself.net/dl.php?file=nottetris2/nottetris2-linux.zip -> ${P}.zip"
-
-LICENSE="CC-BY-NC-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LVSLOT="0.7"
-RDEPEND=">=games-engines/love-0.7.2:${LVSLOT}
-	 media-libs/devil[png]
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	local dir=/usr/share/love/${PN}
-
-	exeinto "${dir}"
-	newexe "Not Tetris 2.love" ${PN}.love
-
-	newdoc "Not Readme.txt" README
-
-	make_wrapper ${PN} "love-${LVSLOT} ${PN}.love" "${dir}"
-	make_desktop_entry ${PN}
-}
diff --git a/games-arcade/openbubbles-1.2-r1 b/games-arcade/openbubbles-1.2-r1
new file mode 100644
index 000000000000..34bc4ae3fd35
--- /dev/null
+++ b/games-arcade/openbubbles-1.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-gfx
+DESCRIPTION=A clone of Evan Bailey's game Bubbles
+EAPI=6
+HOMEPAGE=https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/
+KEYWORDS=~amd64 ~hppa ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-gfx
+SLOT=0
+SRC_URI=https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/openbubbles-1.2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=3f792ef99100889700614622569ed251
diff --git a/games-arcade/openbubbles/Manifest b/games-arcade/openbubbles/Manifest
deleted file mode 100644
index fc3cd29a3617..000000000000
--- a/games-arcade/openbubbles/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX openbubbles-1.2-glibc2.10.patch 686 BLAKE2B a4d0cf9ecc4d4a84b6d0370fd4634bdfce74c3916927c769298bff76ab51fa74cbcc0bdf79f26fa952b6ec46e9846500652193d1611ebecb7cb13c6fdf584154 SHA512 e84d23518dac940a761f8beea750117324d2b01a50c7efef551e14f886b7ec021e6a246f0292a173d6d08c972b0a6a6904bf7e481366bcb0c010f3862e2333bd
-DIST openbubbles-1.2.tar.bz2 1090220 BLAKE2B 8ff4a8b877f2834aded15cf3f60706485f0c9534036ea008b74628185af6035769cba3589b54b24f8fa62fc1397944bbe1b0ad55fef01e0f5471696634a05c4c SHA512 fe546f12e6d045cb37f4c9f88dd42fc627d614933525066bd3eb867e5d8732f2f23fe117ff1a444fc3c33d471ae51099c865d9082134e0e8a051ce8a3df58244
-EBUILD openbubbles-1.2-r1.ebuild 725 BLAKE2B c00b5b3aef12ae71df577fdf0c1ac5a8da53f77257205f2a2ed942b2bc668685472cc4d18c19fe389b11acaa484c75dc66a61cb653bf7930fa4000fdc983bc7d SHA512 7bed861d04f5b66f1ab87142ae0bc31a39525b8488f2c460266c33fe7b2b14ff5270b6dc40982423daae27679b13e654d55e3b20f7adf499635250cf8c9291a8
-MISC metadata.xml 1193 BLAKE2B 619aa83309d60272fe979af37d6597814ea9de739570b74cd9d99948be95d44e95a77d3503da692953fe6cca569b9799d51da094af6e616cdbbe94c377bb1b94 SHA512 ebd0c3dd44e4adc2a0c3ce8dc43a17766e8d7487e9087e823872e4d8cac5ff09562892460fe4c332b939a195eb700df95fdd1128b13f03f36b7f5a4a8a53a438
diff --git a/games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch b/games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch
deleted file mode 100644
index df2bcebc58b8..000000000000
--- a/games-arcade/openbubbles/files/openbubbles-1.2-glibc2.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/BFont.cpp
-+++ b/src/BFont.cpp
-@@ -319,7 +319,7 @@
-     int i   = 0;

- 

-     /* Calculate the space occupied by the text without spaces */

--    while ((p=strchr(&text[pos+1],SPACE)) != NULL) {

-+    while ((p=strchr((char *)&text[pos+1],SPACE)) != NULL) {

-             i++;

-             pos = p - text;

-     }

-@@ -359,7 +359,7 @@
-             xpos=0;

-             pos = -1;

-             while ( spaces > 0 ) {

--                p = strstr(&text[pos+1]," ");

-+                p = strstr((char *)&text[pos+1]," ");

-                 strtmp = NULL;

-                 strtmp = (char *) calloc ((p - &text[pos+1]) + 1,sizeof(char));

-                 if (strtmp != NULL) 

diff --git a/games-arcade/openbubbles/metadata.xml b/games-arcade/openbubbles/metadata.xml
deleted file mode 100644
index e6ae0aed3cb8..000000000000
--- a/games-arcade/openbubbles/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-This is a clone of Evan Bailey's game Bubbles. Why did I reinvent the wheel? In
-this case, the wheel is made in Game Maker, so anyone who wants to do any
-serious programming would not be able to unless they A) ran Windows and B) ran a
-program that doesn't give the user very great power. OpenBubbles is written in
-C++ using SDL, so the programmer has some pretty powerful tools at his/her
-disposal; in addition, because SDL is cross-platform, OpenBubbles can be ported
-to any (major) platform, including Windows. Of course, I only run Unix, so I
-will only be producing Unix source code. Though it was a relatively minor issue,
-Evan's license is only semi-free because it doesn't permit commercial use of the
-source code. Now, you are free to make as much money as you want off of
-improvements of OpenBubbles (provided, of course, that you share them with me
-and everyone else under the GPL, too).
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild b/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild
deleted file mode 100644
index d1381cd3c74d..000000000000
--- a/games-arcade/openbubbles/openbubbles-1.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A clone of Evan Bailey's game Bubbles"
-HOMEPAGE="https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/"
-SRC_URI="https://web.archive.org/web/20101126190910/http://www.freewebs.com/lasindi/openbubbles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-gfx"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-glibc2.10.patch )
-
-src_install() {
-	default
-	newicon data/bubble.png ${PN}.png
-	make_desktop_entry ${PN} "OpenBubbles"
-}
diff --git a/games-arcade/openmortal-0.7-r2 b/games-arcade/openmortal-0.7-r2
new file mode 100644
index 000000000000..69ef04f1e986
--- /dev/null
+++ b/games-arcade/openmortal-0.7-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=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 spoof of the famous Mortal Kombat game
+EAPI=6
+HOMEPAGE=http://openmortal.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net >=media-libs/freetype-2.4.0:2 dev-lang/perl
+SLOT=0
+SRC_URI=mirror://sourceforge/openmortal/openmortal-0.7.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0eeb45ce9b49d84dfc1017ffee2e9134
diff --git a/games-arcade/openmortal/Manifest b/games-arcade/openmortal/Manifest
deleted file mode 100644
index 4289613553ce..000000000000
--- a/games-arcade/openmortal/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX openmortal-0.7-freetype.patch 394 BLAKE2B b9373aa4e5aa0906a614bf161a6809f13633e4ff7a9ec4694cf0751ba2f6bd2e28f3b3b9099786141fe9cdef4b1c8d7bccdbd3c492b52ad5147c4fed61b2ebec SHA512 52bc47058c41aeb688450c37541f428f7adf8c122c965db0b8c94abc76f5a43f9705d34bdaa17cf5dfe428e23c74532ff03c907b552dea19da3575d21b1d9a74
-AUX openmortal-0.7-freetype_pkgconfig.patch 470 BLAKE2B c09d5876913205eb879bb366a233152139e3cc6c7ace4bcc1d48f4dccfcab7e7be55117205f12426c95462ff3062818c00fa067d96c758e30030761db702ecc1 SHA512 9145794e5c9b3fa30c7bedd85919ccaee852597297e4985a58ab7834ecfc5ba143f377f73bd20c5e3915c4e25ef89d8aa96eb5aace175a8c2379fbf3b6f8cf7c
-AUX openmortal-0.7-gcc41.patch 305 BLAKE2B 1f6cba83ed4af95978045404edfd6396d438ca26f5b9f0d5b159dfb37978a1f50a3a18857db82b3bf74dd74a979563d0f7949e544f4527a57237662502c4c77c SHA512 0bc8c0924a86b4e024602c67bb4136ba67e0dc9d58381a2c00f07ce02845e1d389186c4864720a16cdf828a287ca9d6488e3420512daf7e3585988b0449a930b
-DIST openmortal-0.7.tar.bz2 51197736 BLAKE2B b4744bde2a9695cc5a1323f4e258fe7cf191d7e15e086e37f476feed0ed4039c27a58ee8d0a28b00945a2ba985dc0591bcf1832f070ace6b65ae04826df7ea3b SHA512 8af0b64a3d894dfdbdddafdbdc4c853dc2bfc9b52fd507db2818e67af5ad6cdbbb45f2e42e32103e841759225b1b8c4f33ac5a8ad70e4763698c54803fb81fce
-EBUILD openmortal-0.7-r2.ebuild 856 BLAKE2B ca7468ec3757986ba86b3b5c10cc9fc71f4e804a22ca3f5b56aea1e074b48057bc9cc9e2baf37d47211e05d09f1389ca9f726f53cd1897d43ab6eb3385754500 SHA512 31e6dbee577b50d80fd5c0aee48115c2d64bfd9830eb76922ab1e6d8b884f19cee18238430269b31cb7681590ac7eb1332c70172f496a875ff11cb5a3e8df283
-MISC metadata.xml 333 BLAKE2B d6fb63cdba371534a7ae3217ea7d659aba14bdeff1b63bcf9adcca55f0c1975fea3d88beaa695bd95b7c6675c37f049b0c97d2b7666c86acd673e1b1476c6ff3 SHA512 3cf6883bbe8b14f392d0207792ef501bd2c7fa5395a82d1606341b9f44f639879756bc90645cf7bac038ede44865afde59b1622ee0657e1980b6ec3ccd68cefd
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
deleted file mode 100644
index 3a342c88979d..000000000000
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- openmortal-0.7/src/sge_tt_text.cpp.old
-+++ openmortal-0.7/src/sge_tt_text.cpp
-@@ -37,9 +37,9 @@
- 
- #ifndef _SGE_NOTTF
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftoutln.h>
--#include <freetype/ttnameid.h>
-+#include FT_FREETYPE_H
-+#include FT_OUTLINE_H
-+#include FT_TRUETYPE_IDS_H
- 
- /* The structure used to hold glyph information (cached) */
- struct glyph {
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
deleted file mode 100644
index fe683899f2e9..000000000000
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- openmortal-0.7/configure.in
-+++ openmortal-0.7/configure.in
-@@ -25,6 +25,7 @@
- AC_C_CONST
- AC_PROG_CXX
- 
-+PKG_PROG_PKG_CONFIG
- 
- dnl
- dnl Switches
-@@ -122,11 +123,8 @@
- 
- dnl Check for Freetype 2 library
- 
--FT2_VERSION=2.1.0
--AC_CHECK_FT2(
--	$FT2_VERSION,
--	:,
--	AC_MSG_ERROR([*** FreeType 2 version $FT2_VERSION not found!])
-+PKG_CHECK_MODULES(FT2, freetype2,,
-+	AC_MSG_ERROR([*** FreeType2 not found!])
- )
- CXXFLAGS="$CXXFLAGS $FT2_CFLAGS"
- LIBS="$LIBS $FT2_LIBS"
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
deleted file mode 100644
index 2620c153e837..000000000000
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/OnlineChat.cpp.old
-+++ b/src/OnlineChat.cpp
-@@ -56,7 +56,7 @@
- class CChallengeMenu: public Menu
- {
- public:
--	CChallengeMenu::CChallengeMenu( std::string a_sChallenger )
-+	CChallengeMenu( std::string a_sChallenger )
- 	: Menu( "You have been challenged!" ),
- 	m_sChallenger( a_sChallenger )
- 	{
diff --git a/games-arcade/openmortal/metadata.xml b/games-arcade/openmortal/metadata.xml
deleted file mode 100644
index 1e665c7eee56..000000000000
--- a/games-arcade/openmortal/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">openmortal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/openmortal/openmortal-0.7-r2.ebuild b/games-arcade/openmortal/openmortal-0.7-r2.ebuild
deleted file mode 100644
index 0153c5d051ac..000000000000
--- a/games-arcade/openmortal/openmortal-0.7-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A spoof of the famous Mortal Kombat game"
-HOMEPAGE="http://openmortal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/sdl-net
-	>=media-libs/freetype-2.4.0:2
-	dev-lang/perl
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-freetype.patch \
-		"${FILESDIR}/${P}"-freetype_pkgconfig.patch
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon data/gfx/icon.png ${PN}.png
-	make_desktop_entry ${PN} OpenMortal
-}
diff --git a/games-arcade/opensonic-0.1.4-r2 b/games-arcade/opensonic-0.1.4-r2
new file mode 100644
index 000000000000..d9140a11e646
--- /dev/null
+++ b/games-arcade/opensonic-0.1.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/allegro:0=[X,jpeg,png,vorbis] media-libs/libogg:= media-libs/libpng:0= media-libs/libvorbis:= sys-libs/zlib:= virtual/jpeg:0 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A free open-source game based on the Sonic the Hedgehog universe
+EAPI=6
+HOMEPAGE=http://opensnc.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/allegro:0=[X,jpeg,png,vorbis] media-libs/libogg:= media-libs/libpng:0= media-libs/libvorbis:= sys-libs/zlib:= virtual/jpeg:0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/opensnc/files/Open%20Sonic/0.1.4/opensnc-src-0.1.4.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_=f9dff812192bbacfa1bc7e108098445c
diff --git a/games-arcade/opensonic/Manifest b/games-arcade/opensonic/Manifest
deleted file mode 100644
index dc6e1b85b156..000000000000
--- a/games-arcade/opensonic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX opensonic-0.1.4-r1-cmake.patch 4658 BLAKE2B 029d9d971a86ca7692aecef178de3ef35b29c409cf047e453a4e085d094b274abe07e606449174fbc40dfe7da5bad0dce519f7058020e0f1aece2f6bec34a96f SHA512 4764d967664c2c775696a4ccbfb17cf8d3051b1b96cc1f2c6314b8054059334374fca5d39153ec565f22b5716f34c4d0ff45f4c7b00500e2590437025f10fd06
-DIST opensnc-src-0.1.4.tar.gz 10525059 BLAKE2B d5cb825512dfeb614d146e6e7ec45cc3eb56dae0f2cf6c2582e022a1e8ac54e6c87f7bee8795b0e520fa6c24433cb7a748889892cd288f122d7b885e6e91c790 SHA512 239c7b4c7f9663e4d46c54d8bdaefed8d12274b71feaf9c637feb04f3567465f265c50bf3419f4c881ae3fa48a62ab339fe8a0b005c2b080b53d54ebf1e2f29d
-EBUILD opensonic-0.1.4-r2.ebuild 1219 BLAKE2B 705624d47ac5464a2de067b4e113cd2dbb5a6aa5c73b5d22700b643b2566f4214f182ec464726fa49fc0430a62e1f320847ff98737788471c817f0d710de010a SHA512 50c39b104eb0fc2cee336263ceb8ae8c7ff8029b19e4660afde6f6dfc2f1b50c0e14b4ff5882040a4a8ce7271892149a53565f0c207f7a16c168036a66a3247c
-MISC metadata.xml 330 BLAKE2B b93fe5bb5919cb60eb4e5f2179880bdd9848b9a5b33c368815feea1ee36d36494e169cd8839bedc2db9d15dea8d819d2ad6398769fa69ae7d61a2b142228caf2 SHA512 5ac408fe48351e3db869e0cf5af951fd441690505d16d826c4010d2d575fde0b7de6f9f9ef2594cd2006692e0682b2e62f8cb5726db5c80bc7974f942b7cd79c
diff --git a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch b/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
deleted file mode 100644
index 53d76faafae2..000000000000
--- a/games-arcade/opensonic/files/opensonic-0.1.4-r1-cmake.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From: hasufell <julian.ospald@googlemail.com>
-Date: Sat Apr 28 16:38:56 UTC 2012
-Subject: build system
-
-use allegro-config
-remove "-O2" from pre-defined CFLAGS
-make paths modifiable
-add rules for icon, desktop-file and game-wrapper
-fix compilation for as-needed
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,16 +35,14 @@
- MESSAGE("Using CFLAGS='${CFLAGS}'")
- 
- IF(UNIX)
--  SET(ALLEGRO_UNIX_LIBS "$ENV{_ALLEGRO_LIBS}")
-+  exec_program(allegro-config ARGS --libs OUTPUT_VARIABLE ALLEGRO_LIBRARY)
-+  SET(ALLEGRO_UNIX_LIBS "${ALLEGRO_LIBRARY}")
-   IF(NOT ALLEGRO_UNIX_LIBS)
--    MESSAGE(FATAL_ERROR "Please do not invoke CMake directly. Run ./configure instead.")
-+	  MESSAGE(FATAL_ERROR "Allegro libs not found!")
-   ENDIF(NOT ALLEGRO_UNIX_LIBS)
- ENDIF(UNIX)
- 
- 
--
--
--
- # Finding the required libraries:
- 
- # Allegro: liballeg
-@@ -53,7 +51,8 @@
-   MESSAGE(FATAL_ERROR "Fatal error: couldn't find the Allegro game programming library (liballeg)! ${RTFM}")
- ELSE(NOT LALLEG)
-   IF(UNIX)
--    SET(ALLEGRO_UNIX_VERSION "$ENV{_ALLEGRO_VERSION}")
-+    exec_program(allegro-config ARGS --version OUTPUT_VARIABLE ALLEGRO_VERSION)
-+    SET(ALLEGRO_UNIX_VERSION "${ALLEGRO_VERSION}")
-     IF(NOT ALLEGRO_UNIX_VERSION STREQUAL ALLEGRO_RECOMMENDED_VERSION)
-       MESSAGE("\nWARNING: your Allegro version is ${ALLEGRO_UNIX_VERSION}. The recommended version is ${ALLEGRO_RECOMMENDED_VERSION}.\n         ${GAME_NAME} may not compile properly!.\n")
-     ENDIF(NOT ALLEGRO_UNIX_VERSION STREQUAL ALLEGRO_RECOMMENDED_VERSION)
-@@ -249,9 +248,8 @@
- IF(UNIX)
-   SET(GAME_SRCS ${GAME_SRCS} src/misc/iconlin.c)
-   ADD_EXECUTABLE(${GAME_UNIXNAME} ${GAME_SRCS})
--  SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES LINK_FLAGS ${ALLEGRO_UNIX_LIBS})
--  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng)
--  SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall -O2 ${CFLAGS} ${CFLAGS_EXTRA}")
-+  TARGET_LINK_LIBRARIES(${GAME_UNIXNAME} m logg vorbisfile vorbis ogg jpgalleg z png loadpng ${ALLEGRO_UNIX_LIBS})
-+  SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES COMPILE_FLAGS "-Wall")
- ENDIF(UNIX)
- 
- 
-@@ -407,19 +405,43 @@
- SET_TARGET_PROPERTIES(${GAME_UNIXNAME} PROPERTIES PROJECT_NAME "${GAME_NAME}")
- 
- 
--
- # Installing on *nix
- IF(UNIX)
--  SET(GAME_INSTALL_DIR "/usr/share/${GAME_UNIXNAME}")
--  SET(GAME_FINAL_DIR "/usr/bin")
-+  SET(GAME_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/${GAME_UNIXNAME}" CACHE PATH "")
-+  SET(GAME_FINAL_DIR "bin" CACHE PATH "")
-+  SET(GAME_LIBDIR "games/lib" CACHE PATH "")
-+  SET(GAME_DOCDIR "share/doc/${GAME_UNIXNAME}-${GAME_VERSION}" CACHE PATH "")
-+  SET(GAME_HTMLDIR "share/doc/${GAME_UNIXNAME}-${GAME_VERSION}/html" CACHE PATH "")
-+  SET(GAME_ICONDIR "share/pixmaps" CACHE PATH "")
-+  SET(GAME_DESKTOPDIR "share/applications" CACHE PATH "")
-+
-+  FILE(WRITE ${GAME_UNIXNAME}.sh
-+"#!/bin/sh
-+cd ${GAME_LIBDIR}
-+exec ./${GAME_UNIXNAME} \"$@\"
-+"
-+)
- 
--  INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
--  INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_INSTALL_DIR})
--  INSTALL(FILES license.txt readme.html DESTINATION ${GAME_INSTALL_DIR})
--  INSTALL(DIRECTORY objects sprites config images levels licenses musics quests samples screenshots themes languages DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
-+  FILE(WRITE ${GAME_UNIXNAME}.desktop
-+"[Desktop Entry]
-+Name=${GAME_NAME}
-+Type=Application
-+Comment=A free open-source clone of the Sonic the Hedgehog universe
-+Exec=${GAME_UNIXNAME}
-+TryExec=${GAME_UNIXNAME}
-+Icon=${GAME_UNIXNAME}
-+Categories=Game;ArcadeGame;
-+"
-+)
- 
--  INSTALL(CODE "MESSAGE(\"Creating files at ${GAME_FINAL_DIR}...\")")
--  INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"cmake\" \"-E\" \"copy\" \"${GAME_INSTALL_DIR}/${GAME_UNIXNAME}\" \"${GAME_FINAL_DIR}/${GAME_UNIXNAME}\")")
-+  INSTALL(CODE "MESSAGE(\"Installing ${GAME_NAME} ${GAME_VERSION}... Make sure you have root privileges.\")")
-+  INSTALL(TARGETS ${GAME_UNIXNAME} RUNTIME DESTINATION ${GAME_LIBDIR})
-+#  INSTALL(FILES license.txt DESTINATION ${GAME_DOCDIR})
-+  INSTALL(FILES readme.html DESTINATION ${GAME_HTMLDIR})
-+  INSTALL(FILES icon.png DESTINATION ${GAME_ICONDIR} RENAME ${GAME_UNIXNAME}.png)
-+  INSTALL(FILES ${GAME_UNIXNAME}.desktop DESTINATION ${GAME_DESKTOPDIR})
-+  INSTALL(DIRECTORY objects sprites config images levels musics quests samples themes languages DESTINATION ${GAME_INSTALL_DIR} PATTERN ".svn" EXCLUDE)
-+  INSTALL(PROGRAMS ${GAME_UNIXNAME}.sh DESTINATION ${GAME_FINAL_DIR} RENAME ${GAME_UNIXNAME})
- 
-   INSTALL(CODE "MESSAGE(\"Done! Please run ${GAME_UNIXNAME} to start ${GAME_NAME}.\")")
- ENDIF(UNIX)
diff --git a/games-arcade/opensonic/metadata.xml b/games-arcade/opensonic/metadata.xml
deleted file mode 100644
index f62cdf642eee..000000000000
--- a/games-arcade/opensonic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">opensnc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild b/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
deleted file mode 100644
index 3e0e1b0c35a2..000000000000
--- a/games-arcade/opensonic/opensonic-0.1.4-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PN=opensnc
-MY_P=${MY_PN}-src-${PV}
-
-DESCRIPTION="A free open-source game based on the Sonic the Hedgehog universe"
-HOMEPAGE="http://opensnc.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/opensnc/files/Open%20Sonic/${PV}/opensnc-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror" # unsure about legality of graphics
-
-DEPEND="
-	media-libs/allegro:0=[X,jpeg,png,vorbis]
-	media-libs/libogg:=
-	media-libs/libpng:0=
-	media-libs/libvorbis:=
-	sys-libs/zlib:=
-	virtual/jpeg:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}"/${PN}-0.1.4-r1-cmake.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAME_INSTALL_DIR="${EPREFIX}"/usr/share/${PN}
-		-DGAME_FINAL_DIR="${EPREFIX}"/usr/bin
-		-DGAME_LIBDIR="${EPREFIX}"/usr/$(get_libdir)/${PN}
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local f
-	while IFS="" read -d $'\0' -r f; do
-		dosym ../../share/${PN}/${f##*/} \
-			/usr/$(get_libdir)/${PN}/${f##*/}
-	done < <(find "${ED%/}"/usr/share/${PN}/ -mindepth 1 -maxdepth 1 -type d -print0)
-}
diff --git a/games-arcade/opentyrian-2.1.20130907-r1 b/games-arcade/opentyrian-2.1.20130907-r1
new file mode 100644
index 000000000000..238a1b640504
--- /dev/null
+++ b/games-arcade/opentyrian-2.1.20130907-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl media-libs/sdl-net app-arch/unzip dev-vcs/mercurial
+DESCRIPTION=Open-source port of the DOS game Tyrian, vertical scrolling shooter
+EAPI=6
+HOMEPAGE=https://bitbucket.org/opentyrian/opentyrian/wiki/Home
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-net
+SLOT=0
+SRC_URI=http://darklomax.org/tyrian/tyrian21.zip http://www.camanis.net/opentyrian/releases/opentyrian-2.1.20130907-src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0aa65e27008a1539af68b71e55ca1296
diff --git a/games-arcade/opentyrian/Manifest b/games-arcade/opentyrian/Manifest
deleted file mode 100644
index 03f7c8c83d2e..000000000000
--- a/games-arcade/opentyrian/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 2.1.20130907-cflag-idiocy.diff 583 BLAKE2B 2b0da43af2c1ccb5f508573413d1c047186c8d596bd709aefcdee1fe79936774e1c1c01863bffeed6e1c5506f2897021c5f70988cef59d6c1d7397b8150b5f4e SHA512 fd12ebaabd2191baa248019b122acad205f1803b0abde19ae54d410550529bff93d42dfe26543d295efe3b4c6cd74e1d77681467dc8321832561b07bda92d9c4
-AUX 2.1.20130907-datapath.diff 886 BLAKE2B a388fdbe60a5c1abb4bea213af34854e470b80f2648352e9be0beec88081450e04069da5bfc5b817a720e5fd6a98f5643695b9e5dd9823ce7397da4b0349075b SHA512 dcc5bf8e1c1384e7615112bf60f317f8bd3bae11e1fff1bce80a8a638fc6b719f4787f69d01f64dab2aecab4ef3007cb708e1b2891b6cb7c6213b2d495924d2a
-DIST opentyrian-2.1.20130907-src.tar.gz 297517 BLAKE2B 9d6d357cdda59da22ed039be0a5038cf744045dcb30fe0528137a5ac70a4cd512b24eeee3fe233b4ff2a819bf2aa4187e5109d88c72d18db7e1d64e8ad8db5d8 SHA512 1a560f2061496fbbb57b6334ab207b00a6b2e6a4d6164c6df6ad535ae9d0435c32c3db51d3ce2a0a79eb66d72723d112c1993f59b781750f9bd97afb643a0b67
-DIST tyrian21.zip 4754048 BLAKE2B 6bef66fbc34a4d2d865fe7088a6942a29348153d0d10347860952a152b882fd9eef1748fbfa9fd32d030593d2f8c21e1cd227dd6ca540488ba5093b95a95fb33 SHA512 639aa773778386c14ce508feb4729512d00f80182a3bb0fe8bba4ee38bce91da1867ca93f1a7e5e30ff127da077eed275d8dd6ba82042b627b84f1606e2d6bce
-EBUILD opentyrian-2.1.20130907-r1.ebuild 1471 BLAKE2B 3053ae0a6fe984e254b140da11ee1e597baa2a5d8f9fe1859f3ae2ab214ccca0e0732ed1ab27e4c24dcec173ea9262a1ebf386a0810be3aa4b5857064968cc71 SHA512 f29aa8a0bd8ad1fb4a4b574bb35a8843b295823125ae3eec2ce3f773e7688a330a578ac3c0520ad0726d3aa9656eee136cd63bd036971e3f3b98a0eefc70ec64
-MISC metadata.xml 464 BLAKE2B a4a91082f78e099c81a2726c4b5511e13a989b490e6e99761d6aa229493d9a2423e8b8d221654462ce863d44519cb96a33072e8e511a1c79191e0eff8a47d9c5 SHA512 98a768457cc15fd1a16e5fd6ab54bfa7a969ca51f8edcfdc93326c8b36b358eec1da67937b15fcee92d436e464b42fc57ead8f1a1c7c1bdcc94435e713cac379
diff --git a/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff b/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff
deleted file mode 100644
index 39ccf1c79f66..000000000000
--- a/games-arcade/opentyrian/files/2.1.20130907-cflag-idiocy.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr opentyrian-2.1.20130907.ORIG/Makefile opentyrian-2.1.20130907/Makefile
---- opentyrian-2.1.20130907.ORIG/Makefile	2013-12-08 17:38:06.982842189 +0000
-+++ opentyrian-2.1.20130907/Makefile	2013-12-08 17:38:26.843842798 +0000
-@@ -21,11 +21,6 @@
- 
- # FLAGS ####################################################
- 
--ifneq ($(MAKECMDGOALS), release)
--    EXTRA_CFLAGS += -g3 -O0 -Werror
--else
--    EXTRA_CFLAGS += -g0 -O2 -DNDEBUG
--endif
- EXTRA_CFLAGS += -MMD -pedantic -Wall -Wextra -Wno-missing-field-initializers
- ifeq ($(WITH_NETWORK), true)
-     EXTRA_CFLAGS += -DWITH_NETWORK
diff --git a/games-arcade/opentyrian/files/2.1.20130907-datapath.diff b/games-arcade/opentyrian/files/2.1.20130907-datapath.diff
deleted file mode 100644
index 5b0143ed9a50..000000000000
--- a/games-arcade/opentyrian/files/2.1.20130907-datapath.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -uNr opentyrian-2.1.20130907.ORIG/Makefile opentyrian-2.1.20130907/Makefile
---- opentyrian-2.1.20130907.ORIG/Makefile	2013-12-08 17:40:23.470846371 +0000
-+++ opentyrian-2.1.20130907/Makefile	2013-12-08 17:40:49.355847165 +0000
-@@ -49,6 +49,10 @@
- ALL_LDFLAGS += $(LDFLAGS)
- LDLIBS += $(EXTRA_LDLIBS) $(SDL_LDLIBS)
- 
-+ifneq ($(DATA_PATH), )
-+	CFLAGS += -DDATA_PATH=\"$(DATA_PATH)\"
-+endif
-+
- # RULES ####################################################
- 
- .PHONY : all release clean
-diff -uNr opentyrian-2.1.20130907.ORIG/src/file.c opentyrian-2.1.20130907/src/file.c
---- opentyrian-2.1.20130907.ORIG/src/file.c	2013-12-08 17:40:23.468846371 +0000
-+++ opentyrian-2.1.20130907/src/file.c	2013-12-08 17:40:49.355847165 +0000
-@@ -34,7 +34,7 @@
- #ifdef TARGET_MACOSX
- 		tyrian_game_folder(),
- #endif
--		"/usr/share/opentyrian/data"
-+		DATA_PATH
- 	};
- 	
- 	static const char *dir = NULL;
diff --git a/games-arcade/opentyrian/metadata.xml b/games-arcade/opentyrian/metadata.xml
deleted file mode 100644
index 161bc1494dc2..000000000000
--- a/games-arcade/opentyrian/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">opentyrian/opentyrian</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild b/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild
deleted file mode 100644
index 5b9619682157..000000000000
--- a/games-arcade/opentyrian/opentyrian-2.1.20130907-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Open-source port of the DOS game Tyrian, vertical scrolling shooter"
-HOMEPAGE="https://bitbucket.org/opentyrian/opentyrian/wiki/Home"
-SRC_URI="http://darklomax.org/tyrian/tyrian21.zip
-	 http://www.camanis.net/${PN}/releases/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-net"
-
-# Yes, mercurial is needed to set the build version stamp.
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-vcs/mercurial"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-datapath.diff"
-	"${FILESDIR}/${PV}-cflag-idiocy.diff"
-)
-
-src_compile() {
-	emake DATA_PATH="/usr/share/${PN}" || die "Compilation failed"
-}
-
-src_install() {
-	dobin opentyrian || die "Failed to install game binary"
-	dosym ../../usr/bin/opentyrian /usr/bin/tyrian || die "Failed to symlink"
-	dodoc CREDITS NEWS README || die "Failed to install documentation"
-	domenu linux/opentyrian.desktop || die "Failed to install desktop file"
-	for i in linux/icons/*.png ; do
-		local size=`echo ${i} | sed -e 's:.*-\([0-9]\+\).png:\1:'`
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins ${i} opentyrian.png || die "Failed to install program icon"
-	done
-	insinto "/usr/share/${PN}"
-	cd "${WORKDIR}/tyrian21"
-	rm *.exe dpmi16bi.ovl loudness.awe || die "Failed to remove win32 binaries"
-	doins * || die "Failed to install game data"
-}
diff --git a/games-arcade/orthorobot-0-r1 b/games-arcade/orthorobot-0-r1
new file mode 100644
index 000000000000..b0efe8866ca8
--- /dev/null
+++ b/games-arcade/orthorobot-0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Perspective based puzzle game, where you flatten the view to move across gaps
+EAPI=6
+HOMEPAGE=http://stabyourself.net/orthorobot/
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-NC-ND-3.0
+RDEPEND=>=games-engines/love-0.8.0:0
+SLOT=0
+SRC_URI=http://stabyourself.net/dl.php?file=orthorobot/orthorobot-source.zip -> orthorobot-0.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=154432b9bf1724ad39ff8eefce43e92d
diff --git a/games-arcade/orthorobot/Manifest b/games-arcade/orthorobot/Manifest
deleted file mode 100644
index 8c14019dcea5..000000000000
--- a/games-arcade/orthorobot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST orthorobot-0.zip 3429026 BLAKE2B d21023045cce73142f03179719591f4f0e58a3a968a1094da07611ec77cac37bcf822ddd3748699c21718e27534ee2e993a1f4cab038dd745fc94337f277a374 SHA512 cf73bfd7d136c0d408dcee80db1193c4ae1d418128b8879a67c5fbfc013ce33ffab4255c0ea2e7d2a70f22301192fb77bd5b3105d69ff511d2d5a5b99fbd0cf0
-EBUILD orthorobot-0-r1.ebuild 977 BLAKE2B fefeb5915d4acd6e51d9d7fa9724e5dc0db41eddb1f42666016cead27b93b6e3e5b1576578ccc250945495f0960b10dc656495bcb6af8cb9511378bb7e96014c SHA512 12cea3e84b373df31b1664d379492515283409aa4ad7288001be45991f155d3a8f8f07e0ec4d5182551b279f06316dc81a974ae6ffd2b8d11ee8abec54350d98
-MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-arcade/orthorobot/metadata.xml b/games-arcade/orthorobot/metadata.xml
deleted file mode 100644
index 5b159fbcadd1..000000000000
--- a/games-arcade/orthorobot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/orthorobot/orthorobot-0-r1.ebuild b/games-arcade/orthorobot/orthorobot-0-r1.ebuild
deleted file mode 100644
index 69e0533a32ca..000000000000
--- a/games-arcade/orthorobot/orthorobot-0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Perspective based puzzle game, where you flatten the view to move across gaps"
-HOMEPAGE="http://stabyourself.net/orthorobot/"
-SRC_URI="http://stabyourself.net/dl.php?file=${PN}/${PN}-source.zip -> ${P}.zip"
-
-LICENSE="CC-BY-NC-ND-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=games-engines/love-0.8.0:0"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	default
-	#it is only one .love file (but with crappy name), so we can use asterisk
-	mv *.love "${P}.zip" || die 'mv failed'
-	unpack "./${P}.zip"
-	rm "${P}.zip" || die 'rm failed'
-}
-
-src_prepare() {
-	default
-	# fix error on quit
-	sed -i -e 's/love.event.push("q")/love.event.push(fadegoal)/' menu.lua || die 'sed failed'
-}
-
-src_install() {
-	local dir="/usr/share/love/${PN}"
-	insinto "${dir}"
-	doins -r .
-	make_wrapper "${PN}" "love ${dir}"
-	make_desktop_entry "${PN}"
-}
diff --git a/games-arcade/oshu-2.0.0 b/games-arcade/oshu-2.0.0
new file mode 100644
index 000000000000..c1e9ba5ecdb6
--- /dev/null
+++ b/games-arcade/oshu-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-libs/libsdl2-2.0.5:= media-libs/sdl2-image:= x11-libs/cairo:= x11-libs/pango:= !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.0
+DESCRIPTION=Lightweight osu! port
+EAPI=6
+HOMEPAGE=https://github.com/fmang/oshu
+IUSE=libav osu-skin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-NC-4.0
+RDEPEND=>=media-libs/libsdl2-2.0.5:= media-libs/sdl2-image:= x11-libs/cairo:= x11-libs/pango:= !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.mg0.fr/oshu/releases/oshu-2.0.0.tar.gz osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> oshu-skin-v1.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_=f9996c79566af24c72f200f54baf9f4a
diff --git a/games-arcade/oshu/Manifest b/games-arcade/oshu/Manifest
deleted file mode 100644
index 672a3f0606a7..000000000000
--- a/games-arcade/oshu/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX oshu-2.0.0-use_unpacked_osu-skin.patch 1233 BLAKE2B fb8a41b0fc8c8891e3d1dbe1cca6da320049c30a24b146612e2dcbf5490458b8c5db1ed410e9378552f4f048148b2770caf1f87ca60431b92f5d9f9b12885761 SHA512 4e5a0cfb995710c16f6acba7a02e4f0c25de9fc83b28de8c42279fe8e3dea01c33a2e22e9b43e05ab9996534710199315f36e836e24a41ea212e17b08c30e461
-DIST oshu-2.0.0.tar.gz 144088 BLAKE2B c4383746624f4de62e158a2f94d4e5c1a3e2f037fd05d80607932414f20a031103bd73f108644a93faadf61c21f3d2505da3afd2ea7ea43bd59e32966724928b SHA512 ed2b8294b06d239948c563135d997b422191be681ff86714a244ca64079251508a5a62e23cf3ae1e0ac2b3128b6401901233714eab7787989296ca1700192643
-DIST oshu-skin-v1.tar.gz 2224947 BLAKE2B 0b463133dd7ab54421551627d12932f5257848b1130d57af8c2ff6b6836a49c9322b8f2f7e95de540909390d0139e547650a6bb321614cf92fac464b09075674 SHA512 d562294ac5e122a9d9971e3ab92f6168d848177cc5e22a94bbc450fde2b3b14007796a24d33722da9b6675467b109ce128ba94dca5dcc7c61c91c1e373032618
-EBUILD oshu-2.0.0.ebuild 1206 BLAKE2B 03af462af767ca12bed363b6080d692c8b0cc58763346956688f8f6f1a40fc2e673113c24eed5e458645f5d673a5b086465ad8c758c5aba1eaa3548fffb3a631 SHA512 d8300aeac277c59968a265759bc5ca15b6b18ad62e5a36994b1ccaeefd6fd160bcdcaafd42c7501460103126fad7aa321df12d9dbbbf1a650b054d1705ca2ab2
-MISC metadata.xml 423 BLAKE2B 0c302dedd0ac0c3bb3295da6a5ae4e568e848f25d2e03f3276fc37f3053ad46df131a4cff5c7ee2b83061f312c06b090b6a66fad5fd64137d2f9d97ec241143c SHA512 c30495d814265e4a2a18c4ef01e4ea7436d0cdcc14838932aa6d52d87354db8e6bff45519f7a8e333c92bd699b4e903cc1b7aad614455314788007a227857bf6
diff --git a/games-arcade/oshu/files/oshu-2.0.0-use_unpacked_osu-skin.patch b/games-arcade/oshu/files/oshu-2.0.0-use_unpacked_osu-skin.patch
deleted file mode 100644
index 3786c2ed8adf..000000000000
--- a/games-arcade/oshu/files/oshu-2.0.0-use_unpacked_osu-skin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 1dffc1a763f33af12715f4abcf8fd2043055a9a2
-Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
-Date:   Sun Apr 1 23:21:55 2018 +0200
-
-    share/skins/CMakeLists.txt: Use already unpacked osu-skin
-
-diff --git a/share/skins/CMakeLists.txt b/share/skins/CMakeLists.txt
-index 54e20e5..2501757 100644
---- a/share/skins/CMakeLists.txt
-+++ b/share/skins/CMakeLists.txt
-@@ -24,22 +24,10 @@ if ("minimal" IN_LIST OSHU_ENABLED_SKINS)
- endif ("minimal" IN_LIST OSHU_ENABLED_SKINS)
- 
- if ("osu" IN_LIST OSHU_ENABLED_SKINS)
--	file(
--		DOWNLOAD "https://www.mg0.fr/oshu/skins/osu-v1.tar.gz" "${CMAKE_CURRENT_BINARY_DIR}/osu.tar.gz"
--		EXPECTED_HASH SHA256=bc645534371bf5ccba66d4a6729dc1deffb6f148b6ce115efd305f9ffab1d183
--	)
--	add_custom_command(
--		OUTPUT osu/README.md
--		COMMAND "${CMAKE_COMMAND}" -E tar xf osu.tar.gz
--		COMMAND "${CMAKE_COMMAND}" -E touch osu/README.md
--		DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/osu.tar.gz"
--		COMMENT "Unpacking the osu skin"
--		VERBATIM
--	)
- 	add_custom_target(osu-skin DEPENDS osu/README.md)
- 	add_dependencies(skins osu-skin)
- 	install(
--		DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/osu"
-+		DIRECTORY osu
- 		DESTINATION "${OSHU_SKINS_INSTALL_DIRECTORY}"
- 	)
- endif ("osu" IN_LIST OSHU_ENABLED_SKINS)
diff --git a/games-arcade/oshu/metadata.xml b/games-arcade/oshu/metadata.xml
deleted file mode 100644
index 3e59d136eb7a..000000000000
--- a/games-arcade/oshu/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>contact@hacktivis.me</email>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<use>
-	<flag name="osu-skin">Include more complete osu-skin (other is minimal)</flag>
-</use>
-</pkgmetadata>
diff --git a/games-arcade/oshu/oshu-2.0.0.ebuild b/games-arcade/oshu/oshu-2.0.0.ebuild
deleted file mode 100644
index 24f021264b5a..000000000000
--- a/games-arcade/oshu/oshu-2.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MIN_VERSION="3.9.0"
-
-inherit cmake-utils eutils
-
-DESCRIPTION="Lightweight osu! port"
-HOMEPAGE="https://github.com/fmang/oshu"
-SRC_URI="https://www.mg0.fr/oshu/releases/${P}.tar.gz
-	osu-skin? ( https://www.mg0.fr/oshu/skins/osu-v1.tar.gz -> ${PN}-skin-v1.tar.gz )"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-3 CC-BY-NC-4.0"
-SLOT="0"
-IUSE="libav osu-skin"
-
-RDEPEND="
-	>=media-libs/libsdl2-2.0.5:=
-	media-libs/sdl2-image:=
-	x11-libs/cairo:=
-	x11-libs/pango:=
-	!libav? ( media-video/ffmpeg:= )
-	libav? ( media-video/libav:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-RESTRICT="test"
-
-src_prepare() {
-	if use osu-skin; then
-		epatch "${FILESDIR}/oshu-2.0.0-use_unpacked_osu-skin.patch"
-		mv "${WORKDIR}/osu" share/skins/
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		'-DOSHU_DEFAULT_SKIN='$(usex osu-skin 'osu' 'minimal')
-		'-DOSHU_SKINS=minimal'$(usex osu-skin ';osu' '')
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-arcade/pachi-1.0 b/games-arcade/pachi-1.0
new file mode 100644
index 000000000000..36f93b92d391
--- /dev/null
+++ b/games-arcade/pachi-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod] >=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=platform game inspired by games like Manic Miner and Jet Set Willy
+EAPI=5
+HOMEPAGE=http://dragontech.sourceforge.net/index.php?main=pachi&lang=en
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-mixer[mod] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/pachi-1.0.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0f3a82c624b14ca33f6c1008a882abab
diff --git a/games-arcade/pachi/Manifest b/games-arcade/pachi/Manifest
deleted file mode 100644
index 581f270df189..000000000000
--- a/games-arcade/pachi/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.0-autotools.patch 1161 BLAKE2B 848b3366f103a245cdfe8c8bc2cf79e96eb7d3fd0f1d06d7e7a904cd592382e4447e9083b8395bd9a297864d429eb47abf310b736a5ddc1cae18cf233e94f67f SHA512 45f3818c4bf9a0fae123b11f3641f47be77886eb85849984b1a8fe391ae1b333ee7ac0d5ffe294ee986efe262762d995e2ff5b2786a9dc2c26123c200cfb3c57
-DIST pachi-1.0.tar.bz2 3101484 BLAKE2B 31c15f1c0fac503abbba67c0483e60d1b12d84d7d0cb5eaebda01e0942ead1d202841942711306c800cfe8346a3e31ed10671555184d52d345464640a90d5c1c SHA512 9b09baa47ceb051d80ea621d2449afd2d9de959e707d2a1b3119ce8f0c623ebc1afb1678389c647b066fb2211f3f7eb27d713ee33514e2739ba48f9bf14c7952
-EBUILD pachi-1.0.ebuild 941 BLAKE2B 37f9fa99223c405ee3d3a8fc282421a78304b1a5a2fac5f24311ebf2493c9612f16c3baa7e02ce2674d2e6d196a73cb42c835b8ae7d74167197a782cf460a3c5 SHA512 48234f533b4cf89020a55501c9274e5af806936a75b67d61368343db5c7e05332836853897d9408bf403519ccea30837d546248952d5a509161d6ae54bca598a
-MISC metadata.xml 333 BLAKE2B e14155543715b12b61b84d111606a7630315a349d0ad1ed68a4323ec50ff225f6cd9ed3a3bbc980e1246982bb25444884a1e63386c9526d31fb7b31b28f95892 SHA512 9f7e4e3994f529f9905dcf550cfb3ab0a4f0998a689a52e34d1bb2b5916273e7827937900606316cdd465e90752ab5a1bd0cf248f6288fc3d1be3f3d35982567
diff --git a/games-arcade/pachi/files/1.0-autotools.patch b/games-arcade/pachi/files/1.0-autotools.patch
deleted file mode 100644
index 0d0185f142f3..000000000000
--- a/games-arcade/pachi/files/1.0-autotools.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -1,5 +1,7 @@
- # Process this file with autoconf to produce a configure script.
-+AC_PREREQ([2.54])
- AC_INIT(src/faes.cpp, 0.1, T-1000@Bigfoot.com)
-+AC_CANONICAL_SYSTEM
- AM_INIT_AUTOMAKE(pachi, 0.1)
- AM_CONFIG_HEADER(config.h)
- 
-@@ -44,7 +46,7 @@
- 	SCOREDIR="."
- else
- 	DATADIR="$datadir/$PACKAGE"
--	SCOREDIR="/var/lib/games/$PACKAGE"
-+	SCOREDIR="$localstatedir/$PACKAGE"
- fi
- 
- eval DATAPATH=`eval echo "$DATADIR"`
---- data/Makefile.am
-+++ data/Makefile.am
-@@ -10,13 +10,13 @@
- objects_v2.dat \
- rooms_v2.dat
- 
--score_DATA = \
-+score_DATA_ = \
- scores.dat
- 
--EXTRA_DIST = $(dat_DATA) $(score_DATA)
-+EXTRA_DIST = $(dat_DATA) $(score_DATA_)
- 
- install-data-local:
--	for file in $(score_DATA); do\
--	    chgrp $(group) $(scoredir)/$$file; \
--	    chmod $(perms) $(scoredir)/$$file; \
--	done					    
-+	$(mkinstalldirs) $(DESTDIR)$(scoredir)
-+	for file in $(score_DATA_); do                                       \
-+		$(INSTALL) -g $(group) -m $(perms) $$file $(DESTDIR)$(scoredir); \
-+	done
---- Makefile.am
-+++ Makefile.am
-@@ -1 +1 @@
--SUBDIRS = src Tgfx data fonts music sounds docs
-+SUBDIRS = src Tgfx data fonts music sounds
diff --git a/games-arcade/pachi/metadata.xml b/games-arcade/pachi/metadata.xml
deleted file mode 100644
index 542b2bdb6342..000000000000
--- a/games-arcade/pachi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dragontech</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/pachi/pachi-1.0.ebuild b/games-arcade/pachi/pachi-1.0.ebuild
deleted file mode 100644
index f1cc4a2b7bbf..000000000000
--- a/games-arcade/pachi/pachi-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="platform game inspired by games like Manic Miner and Jet Set Willy"
-HOMEPAGE="http://dragontech.sourceforge.net/index.php?main=pachi&lang=en"
-# Upstream doesn't version their releases.
-# (should be downloaded and re-compressed with tar -jcvf)
-#SRC_URI="mirror://sourceforge/dragontech/pachi_source.tgz"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/Pachi
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-autotools.patch
-	rm -f missing
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon Tgfx/icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Pachi /usr/share/pixmaps/${PN}.bmp
-	prepgamesdirs
-}
diff --git a/games-arcade/pacmanarena-0.15-r1 b/games-arcade/pacmanarena-0.15-r1
new file mode 100644
index 000000000000..4c312b9d4d14
--- /dev/null
+++ b/games-arcade/pacmanarena-0.15-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] media-libs/sdl-net app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=3D Pacman clone with a few surprises. Rockets, bombs and explosions abound
+EAPI=6
+HOMEPAGE=http://pacmanarena.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] media-libs/sdl-net
+SLOT=0
+SRC_URI=mirror://sourceforge/pacmanarena/pacman-arena-0.15.tar.bz2 mirror://sourceforge/pacmanarena/pacman-data-0.0.zip
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=db85c450907dc49ebe741319274893e6
diff --git a/games-arcade/pacmanarena/Manifest b/games-arcade/pacmanarena/Manifest
deleted file mode 100644
index 3cc584225bec..000000000000
--- a/games-arcade/pacmanarena/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pacmanarena-0.15-underlink.patch 317 BLAKE2B e0cd8d59918c75a149abf32b5d1979d29ed15189c57a4e13858442de826cb23aa2abb094c03055481cfb1dc750d01967b115e56ca032d275d6a37d7dfc282e80 SHA512 afffb103e4394f7cd367e4fe1b2acab034786539b025f6d86118bbf88610b49cb60975ba92be0534fb025def49973e3442df325a00fd11b742c765cbcd2611e1
-DIST pacman-arena-0.15.tar.bz2 100112 BLAKE2B c4324ec83ad5033a40061935c8cfe982b4f36e7e466fbd10e836728fd0cdf01bda812a86f9cdfbd33c2a4f67b577026a836390e9ce61953372aab7dcded6aa19 SHA512 40e8092cf223d075dbb5654766f095ce57d61ff329aee5dc0f3c95655e3894ac507d8b48014326b7fd9265c81b9340624aaa349641efbdcde55bda0b1098f398
-DIST pacman-data-0.0.zip 11994364 BLAKE2B cc83c490387bfe859bb7e41068c00ea4c4f7fd4ed8ab718cff3d1fbb6c5eb5590837eb73b43a6b3be8cd76e3ef8f8b6b3ca8229a2bb645c48580cc302f02b88e SHA512 f3619ab876ff9c0f354fff9e9b0acefaa1a1a094e8ef215fe1b57f617f79540ae87681dae0ec3c1df672615064be345f74e52a6f2f241bfe70d78f5b8c7fadc7
-EBUILD pacmanarena-0.15-r1.ebuild 1156 BLAKE2B fcc651259b78970cbb6265d264a7774d0eebe55edd0a5c60ac313a6eceec221c71ecd255cc7a3ba355226e76f6cfbab3ee8700cc7829b61d9f6a88576d6404da SHA512 9140cc8a57f6873d8f858b949e8169e9b91204906e50b3f3cd745056ab68cd93075321345aceb943d9120a1a232537d107b55c42ba1354a7cfc51ba0fe59c601
-MISC metadata.xml 334 BLAKE2B 034963dd5af81911ac555bc717bbedf63c92413161b71d0771774ee6ad88317aaccfdee893c17a8a630a14aad726fc7dc9acbb19383b21468dd29f3b768e6780 SHA512 0ac8a4136638b425aa6122eaedb145adde764ecbe83e0388800c1f690abb27be59dd9b49933849e56111df0fc9741d71d8fe580f923bc6bf504ea8c66bd523c9
diff --git a/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch b/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch
deleted file mode 100644
index 6c32d8793be7..000000000000
--- a/games-arcade/pacmanarena/files/pacmanarena-0.15-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac.old	2011-05-24 08:45:49.197656941 +0200
-+++ b/configure.ac	2011-05-24 08:46:13.685193761 +0200
-@@ -101,6 +101,7 @@
- AC_CHECK_LIB(GLU, gluNewQuadric, [ LDFLAGS="$LDFLAGS -lGLU" ],
- 		[AC_MSG_ERROR([OpenGL libraries not found])
- 		])
-+LDFLAGS="$LDFLAGS -lm"
- 
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
diff --git a/games-arcade/pacmanarena/metadata.xml b/games-arcade/pacmanarena/metadata.xml
deleted file mode 100644
index 45f414393de5..000000000000
--- a/games-arcade/pacmanarena/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pacmanarena</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild b/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
deleted file mode 100644
index e803d7748359..000000000000
--- a/games-arcade/pacmanarena/pacmanarena-0.15-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="3D Pacman clone with a few surprises. Rockets, bombs and explosions abound"
-HOMEPAGE="http://pacmanarena.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/pacman-arena-${PV}.tar.bz2
-	mirror://sourceforge/${PN}/pacman-data-0.0.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/pacman"
-
-src_unpack() {
-	unpack pacman-arena-${PV}.tar.bz2
-	cd "${S}"
-	unpack pacman-data-0.0.zip
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^CFLAGS/ s:pacman:${PN}:" \
-		-e '1i CC=@CC@' \
-		Makefile.in || die
-	sed -i \
-		-e '/CFLAGS/s:-g::' \
-		configure || die
-	eapply "${FILESDIR}"/${P}-underlink.patch
-	eautoreconf
-}
-
-src_install() {
-	newbin pacman ${PN}
-	insinto /usr/share/${PN}
-	doins -r gfx sfx
-	newicon gfx/pacman_arena1.tga ${PN}.tga
-	make_desktop_entry ${PN} "Pacman Arena" /usr/share/pixmaps/${PN}.tga
-	einstalldocs
-}
diff --git a/games-arcade/penguin-command-1.6.11-r1 b/games-arcade/penguin-command-1.6.11-r1
new file mode 100644
index 000000000000..f10f43979aad
--- /dev/null
+++ b/games-arcade/penguin-command-1.6.11-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[jpeg,png]
+DESCRIPTION=A clone of the classic Missile Command game
+EAPI=6
+HOMEPAGE=http://www.linux-games.com/penguin-command/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[mod] media-libs/sdl-image[jpeg,png]
+SLOT=0
+SRC_URI=mirror://sourceforge/penguin-command/penguin-command-1.6.11.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=3b9f5d11349f991ded77149310c5c9df
diff --git a/games-arcade/penguin-command/Manifest b/games-arcade/penguin-command/Manifest
deleted file mode 100644
index 9da2d69dac80..000000000000
--- a/games-arcade/penguin-command/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST penguin-command-1.6.11.tar.gz 1123574 BLAKE2B 98c800a5a9081c843ecaddac57a1d1bd08f6b65a1539ecf206ff43ed13864cb2e94d77717ae88eb223a651c60c850b6aaf27a199bfc2d2b6394e04d63e3f9769 SHA512 ba41a7fbf3c07149fb6f6cf60091afda9de3c9f8f04e541d7b62ba744b04e5db7eecc5aa2391a71b72ccf6f544d397a5994a6f7aee0907211ced1686fe517646
-EBUILD penguin-command-1.6.11-r1.ebuild 595 BLAKE2B 7d38a0294d52fce6bc7de92902b448ea2790b3410dd8f6a5f8133de937b1672abf033e914d2cff17a7650c50dae1d7c751582e6cc470de246b59318b6f590470 SHA512 f6ab6011949f525d829b8422f65477843e327a17edbc16f9245d1a3e9fbd1be6159fca9797b3a64523139d3fa0484512b85d0ce474355c6914802558d36b97cd
-MISC metadata.xml 338 BLAKE2B 9aa912c5237f8f99636f2dac62569a21c3fe222b90c936a24d5b4afa81e3a60bb5bd66c1d21b50dd0e825fc3646c07b784f752e458727b5c0cb55725e0167326 SHA512 0176df19657b155dd98ab5f40138c4838b2f666fb73c285a1a9c77569a70960bf8ac493cd5243e055f10ee0210ac4bcd338cef2d7dc08c2058cd6adf8622e4e7
diff --git a/games-arcade/penguin-command/metadata.xml b/games-arcade/penguin-command/metadata.xml
deleted file mode 100644
index 5b50d1792bff..000000000000
--- a/games-arcade/penguin-command/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">penguin-command</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild b/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild
deleted file mode 100644
index c442fae3b31e..000000000000
--- a/games-arcade/penguin-command/penguin-command-1.6.11-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A clone of the classic Missile Command game"
-HOMEPAGE="http://www.linux-games.com/penguin-command/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-mixer[mod]
-	media-libs/sdl-image[jpeg,png]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default
-	newicon data/gfx/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Penguin Command" ${PN}
-}
diff --git a/games-arcade/pengupop-2.2.5-r1 b/games-arcade/pengupop-2.2.5-r1
new file mode 100644
index 000000000000..dabb13e7859b
--- /dev/null
+++ b/games-arcade/pengupop-2.2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[sound,video] sys-libs/zlib >=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=Networked multiplayer-only Puzzle Bubble clone
+EAPI=6
+HOMEPAGE=http://freshmeat.net/projects/pengupop
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://gentoo/pengupop-2.2.5.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_=8525523646ace39a7f669741739cbc1b
diff --git a/games-arcade/pengupop/Manifest b/games-arcade/pengupop/Manifest
deleted file mode 100644
index aa5d8149a56b..000000000000
--- a/games-arcade/pengupop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pengupop-2.2.5-underlink.patch 569 BLAKE2B c0f08dbd63f97f58cba1bac6553863250c35036452be487c19e4294dcc5df8a9816acc68087a1f02db3e56c718f95c5da17bc47bc2ab4dd95d2fc77bab95cd48 SHA512 c7dac9f94d99b0ef2e42f8d6e409afaeddb29ef6d85e9b01d3a8b4b6a3e4d73808c909e2dbb7f7d0c30dbcc06ed6d72e304b3dc9ada71aedc782982fa49cc444
-DIST pengupop-2.2.5.tar.gz 1676224 BLAKE2B 5527d956a9ae0d3a2c4a31e2bb5f4059bd79c8c6ab2ccc81b2ec35c698f8e40bbdf7a68b6799bd202f39b2e5d39e690de6e71aa97c6ff307d03679f8aae8f755 SHA512 1886898288cb9b2be949a031bf2baae80332c5ca93bead91ed8c50d0aaea81715cf0eaeb09a63af298e82e1409f9f39527742707839526283e57809484be4abf
-EBUILD pengupop-2.2.5-r1.ebuild 956 BLAKE2B d3db85dbf59876d8a40c5a26e530210262118bca9ea5a5aa55a9416870134662af7d3ac98b47ddfe18fa969a11a2e37600627de52e1c12fe0528c5e5981a6caa SHA512 f4bc51a6a69351b62f5903215446384e29048697cdd84346838bb817016566912948c8799e32f973ff33bd64696982a21963a9f33b5ed4ef3ddca3628ee9e366
-MISC metadata.xml 329 BLAKE2B 12f9759170dea648244936ee92bb4c3f3777382ff1bfb6866de215b068e79a3d4c20386c6c98af482c711627fc1c068fef9034c46b4fe2b254d5d220897eb90b SHA512 68b5c8588a25954a6f833ada9d10ddaeb9296618fbb84355d6242f41e5a2ea859b8a677f0cefcaafe10a1465012de6f578c0d794e31dd97fa1f9917451240243
diff --git a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch b/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch
deleted file mode 100644
index fbbb704a6a30..000000000000
--- a/games-arcade/pengupop/files/pengupop-2.2.5-underlink.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.am.old	2011-06-14 21:44:40.242317771 +0200
-+++ b/Makefile.am	2011-06-14 21:44:49.216882568 +0200
-@@ -17,7 +17,7 @@
- nodist_pengupop_SOURCES = images.h
- 
- if LINUX
--pengupop_LDADD = -lSDL -lz
-+pengupop_LDADD = -lSDL -lz -lm
- 
- endif
- if WIN32
-@@ -25,7 +25,7 @@
- endif
- if DARWIN
- pengupop_LDFLAGS = -framework Carbon -framework CoreServices -framework AudioUnit -framework QuickTime -framework Cocoa -framework IOKit -framework OpenGL -framework SDL SDLMain.m
--pengupop_LDADD = -lz -lstdc++
-+pengupop_LDADD = -lz -lstdc++ -lm
- 
- all-local: Pengupop.dmg
- 
diff --git a/games-arcade/pengupop/metadata.xml b/games-arcade/pengupop/metadata.xml
deleted file mode 100644
index cd8cab841358..000000000000
--- a/games-arcade/pengupop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">pengupop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild b/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
deleted file mode 100644
index 6938c534c5c9..000000000000
--- a/games-arcade/pengupop/pengupop-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop gnome2-utils
-
-DESCRIPTION="Networked multiplayer-only Puzzle Bubble clone"
-HOMEPAGE="http://freshmeat.net/projects/pengupop"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-underlink.patch
-
-	sed -i \
-		-e '/Icon/s/\.png//' \
-		-e '/^Encoding/d' \
-		-e '/Categories/s/Application;//' \
-		pengupop.desktop || die
-
-	sed -i \
-		-e 's/-g -Wall -O2/-Wall/' \
-		Makefile.am || die
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	domenu pengupop.desktop
-	doicon -s 48 pengupop.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/performous-1.1-r1 b/games-arcade/performous-1.1-r1
new file mode 100644
index 000000000000..bc2a383b15a8
--- /dev/null
+++ b/games-arcade/performous-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= virtual/jpeg:0 media-libs/libpng:0= media-libs/libsdl2[joystick,video] virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango media-libs/libepoxy midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv ) sys-apps/help2man sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=SingStar GPL clone
+EAPI=5
+HOMEPAGE=https://performous.org/
+IUSE=midi songs tools webcam
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 songs? ( CC-BY-NC-SA-2.5 CC-BY-NC-ND-2.5 )
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/libxmlpp:2.6 media-libs/portaudio dev-libs/boost[threads(+)] dev-libs/glib:2 dev-libs/libxml2:2 gnome-base/librsvg:2 media-gfx/imagemagick:0= virtual/jpeg:0 media-libs/libpng:0= media-libs/libsdl2[joystick,video] virtual/ffmpeg virtual/opengl virtual/glu sys-libs/zlib virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/pango media-libs/libepoxy midi? ( media-libs/portmidi ) webcam? ( media-libs/opencv )
+SLOT=0
+SRC_URI=https://github.com/performous/performous/archive/1.1.tar.gz -> performous-1.1.tar.gz songs? ( mirror://sourceforge/performous/ultrastar-songs-restricted-3.zip mirror://sourceforge/performous/ultrastar-songs-jc-1.zip mirror://sourceforge/performous/ultrastar-songs-libre-3.zip mirror://sourceforge/performous/ultrastar-songs-shearer-1.zip )
+_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_=b31decb7328166c2b60f0cfc2acf01c0
diff --git a/games-arcade/performous/Manifest b/games-arcade/performous/Manifest
deleted file mode 100644
index 2cfae6c8b535..000000000000
--- a/games-arcade/performous/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX performous-1.1-gentoo.patch 474 BLAKE2B ff4bdbc43a1129bb4b2d44ac5e818f3f6dccd35ca743345f0934b3cfce66c25c914daf93a4463fa0a30622410737a5983602d1d19fa172bd41e01f3a321ac77a SHA512 b00f13c16dd87645ae3baea80a7430bc0ce46d827ef72ecad21ddac8318f4356bffffd24bd03710a529ca215f20b924f27bc69dd2b3e4870ae19388c8b857338
-AUX performous-1.1-linguas.patch 1033 BLAKE2B b7fd8f8560d9e9dd1fb6120f8d0e72c11529f226fecaf482dc3ae351d28977b196816e8c84db0c9ab1c724b78bc4a757d6b1f854dffbc9ebb3aaea1a05eaaf80 SHA512 d3ca1b7fb271618ea1866328aedb7a49a92ea08b4e3d1d4f3755e0868dc380b97462158cda19c8d1e2e2dd4afb59a6db533a12510699c2082f4e4ff31b069597
-DIST performous-1.1.tar.gz 3965473 BLAKE2B 021660aa785d0535396a75e8c4cc5cc368ba5745b67fae527e7901ef6601d95887206aae7f74b52bf6b3da3e827bfbd3094e8a393917b9936af266b54766b0b2 SHA512 6659aa03960e68d7af65b072e179e42b122d2a39d25229c6daf765146379a115a52e51c1dc2bc69081ea17fe7a22f1d7007b7cf9e09bc32d134c3ad8e3444dd1
-DIST ultrastar-songs-jc-1.zip 242698201 BLAKE2B 39c37160c1ce305252c7b94910aae4ed930d6762716b985f35d64b502bcb8c0310ff830384a652bb1b8a72dea5dd08eebbfd89ae047861bd88e2fc983a863d84 SHA512 2f1b8416990c39617269cd6bb7271abdd4ebae65a9bac3dbb3f37cca26876bb7c79460a37597943a10a2d8bfcb5d2d9e2bf24084fe517a418e69f5c6111f6aea
-DIST ultrastar-songs-libre-3.zip 5289866 BLAKE2B 2c3fc640ad808b12987e9b50510df644ab8dd1ae41a4b9e5056950c7aa1823678a4b568a60a260b93a4bdf06f199fac1b99bd22e4e39301bf34f337c08d68b69 SHA512 820e3637a7b778c92ed1a8b925802134fa2146879b3e03e88cd412de5414635c90fe256dfaf984cfa3e8b07b7da8531dc3061b7c4e1bb4422127b469b2345e66
-DIST ultrastar-songs-restricted-3.zip 10242651 BLAKE2B de923f72bdd3081f2870457fd734ae2f8c11a84a74344af165aa5c6cf7b812c98fd53b3ab18ac9ac51f488fbf3fe274289205724c9f8547a31245536bea3c6b1 SHA512 70b987fec3705d6610625c1f30a7ff683a51bb6b7ee3174609c80dc31c1bccdb23dcb2c6ae8154e1b1d9ef115b914e27e73925878a3c5460b997fdde813456b8
-DIST ultrastar-songs-shearer-1.zip 50411551 BLAKE2B b91896197b6750dce6998ad309a9aca42aaf11b48c92bd1c30a67befcaf4ac64b6c5207f492e0f8588b986033d297a37bc8c9e505baea809591aa3255034fed4 SHA512 add9df22b78967fd6f19699e8569f976423e931a32ea7a62cfec2f94470b9120f05832560215a000ecec8dd65508b057fac8ac90efd3a768ed74ddced186a73b
-EBUILD performous-1.1-r1.ebuild 2474 BLAKE2B eaecbe32cbf0d321090972037a54065d559063b57abe80e5570cbfd74deeffb603d0b25f539fc3b43b207913cae9bcb3a7fa4d1dd0cca61457264981740bbf03 SHA512 cc07a9970af2e12bb8eb4bb0f1279c5213c5937398f5108c89d89a4260ad75e1a608892ea45b418a3fdf20ef7ea1f56335615e3c6f677fa9aa7b4bdba34f82ad
-MISC metadata.xml 856 BLAKE2B d467d86270f2f571d310ceac4934aea595a62fa9e234e8897ef0b22871df612cdb335e7e3298a0991db6c98b78ea68b04882de8696150d5acb65944d9ff80c3d SHA512 24da96b0da902a2d54d92e2f74d8c57fdd1e84f35b96d416cb15898485f0387c70f3430e21ba7eebd5bc289f76f02695d246746abe7eb041f9f7e2e0e8e1e4e0
diff --git a/games-arcade/performous/files/performous-1.1-gentoo.patch b/games-arcade/performous/files/performous-1.1-gentoo.patch
deleted file mode 100644
index a73663a88c41..000000000000
--- a/games-arcade/performous/files/performous-1.1-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru performous-1.0.orig/game/CMakeLists.txt performous-1.0/game/CMakeLists.txt
---- performous-1.0.orig/game/CMakeLists.txt	2014-10-28 19:11:45.000000000 -0400
-+++ performous-1.0/game/CMakeLists.txt	2015-03-31 03:01:30.806061643 -0400
-@@ -141,7 +141,7 @@
- 	set(BIN_INSTALL .)  # Straight to Program Files/Performous with no bin subfolder.
- 	set(SUBSYSTEM_WIN32 WIN32)
- else()
--	set(BIN_INSTALL bin)
-+	set(BIN_INSTALL @GENTOO_BINDIR@)
- endif()
- 
- # Build main executable
diff --git a/games-arcade/performous/files/performous-1.1-linguas.patch b/games-arcade/performous/files/performous-1.1-linguas.patch
deleted file mode 100644
index f8f1349ea3b9..000000000000
--- a/games-arcade/performous/files/performous-1.1-linguas.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ru performous-1.0.orig/lang/CMakeLists.txt performous-1.0/lang/CMakeLists.txt
---- performous-1.0.orig/lang/CMakeLists.txt	2014-10-28 19:11:45.000000000 -0400
-+++ performous-1.0/lang/CMakeLists.txt	2015-02-22 04:25:40.502252942 -0500
-@@ -9,5 +9,13 @@
- 	file(MAKE_DIRECTORY "${mobuild}")
- 	add_custom_command(OUTPUT "${mofile}" COMMAND "${Msgfmt_BIN}" -v "${pofile}" -o "${mofile}" MAIN_DEPENDENCY "${pofile}" COMMENT "Building ${language} locale" VERBATIM)
- 	add_custom_target("locale_${language}" ALL DEPENDS "${mofile}")  # Make sure the mofiles are always built
--	install(FILES "${mofile}" DESTINATION "${LOCALE_DIR}/${language}/LC_MESSAGES")
- endforeach(language)
-+foreach(language $ENV{LINGUAS})
-+       set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
-+       if (EXISTS ${pofile})
-+               set(mofile ${CMAKE_CURRENT_BINARY_DIR}/${language}.mo)
-+               install(FILES ${mofile} DESTINATION
-+{LOCALE_DIR}/${language}/LC_MESSAGES RENAME ${CMAKE_PROJECT_NAME}.mo)
-+       endif()
-+endforeach(language)
-+
diff --git a/games-arcade/performous/metadata.xml b/games-arcade/performous/metadata.xml
deleted file mode 100644
index 2ee1cd7690b5..000000000000
--- a/games-arcade/performous/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Performous is an open-source rhythm/performance platform that contains singing, guitar/bass playing, drumming and dancing all in one game.
-	</longdescription>
-	<use>
-		<flag name="midi">Enable MIDI I/O support</flag>
-		<flag name="songs">Install a few demo songs</flag>
-		<flag name="tools">Enable building of song extraction utilities for SingStar and Guitar Hero</flag>
-		<flag name="webcam">Enable Webcam support</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">performous</remote-id>
-		<remote-id type="github">performous/performous</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/performous/performous-1.1-r1.ebuild b/games-arcade/performous/performous-1.1-r1.ebuild
deleted file mode 100644
index 6b8850506d52..000000000000
--- a/games-arcade/performous/performous-1.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CMAKE_REMOVE_MODULES="yes"
-CMAKE_REMOVE_MODULES_LIST="FindALSA FindBoost FindFreetype FindGettext FindJpeg FindPng FindTiff FindZ"
-
-inherit desktop cmake-utils epatch gnome2-utils
-
-MY_PN="Performous"
-MY_P="${MY_PN}-${PV}"
-SONGS_PN="ultrastar-songs"
-
-DESCRIPTION="SingStar GPL clone"
-HOMEPAGE="https://performous.org/"
-SRC_URI="
-	https://github.com/performous/performous/archive/${PV}.tar.gz -> ${P}.tar.gz
-	songs? (
-		mirror://sourceforge/performous/${SONGS_PN}-restricted-3.zip
-		mirror://sourceforge/performous/${SONGS_PN}-jc-1.zip
-		mirror://sourceforge/performous/${SONGS_PN}-libre-3.zip
-		mirror://sourceforge/performous/${SONGS_PN}-shearer-1.zip
-	)
-"
-
-LICENSE="
-	GPL-2
-	songs? (
-		CC-BY-NC-SA-2.5
-		CC-BY-NC-ND-2.5
-	)
-"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="midi songs tools webcam"
-
-RDEPEND="
-	dev-cpp/glibmm:2
-	dev-cpp/libxmlpp:2.6
-	media-libs/portaudio
-	dev-libs/boost[threads(+)]
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	gnome-base/librsvg:2
-	media-gfx/imagemagick:0=
-	virtual/jpeg:0
-	media-libs/libpng:0=
-	media-libs/libsdl2[joystick,video]
-	virtual/ffmpeg
-	virtual/opengl
-	virtual/glu
-	sys-libs/zlib
-	virtual/libintl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/pango
-	media-libs/libepoxy
-	midi? ( media-libs/portmidi )
-	webcam? ( media-libs/opencv )
-"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	sys-devel/gettext
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-linguas.patch
-	sed -i \
-		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-		-e '/ Z /s/ Z/ ZLIB/g' \
-		-e 's/Z_FOUND/ZLIB_FOUND/g' \
-		-e 's/Z_LIBRARIES/ZLIB_LIBRARIES/g' \
-		-e 's/Jpeg/JPEG/' \
-		-e 's/Png/PNG/' \
-		{game,tools}/CMakeLists.txt || die
-
-	strip-linguas -u lang
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable tools TOOLS)
-		$(cmake-utils_use_enable webcam WEBCAM)
-		$(cmake-utils_use_enable midi MIDI)
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DSHARE_INSTALL="/usr/share/${PN}"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	if use songs ; then
-		insinto "/usr/share/${PN}"
-		doins -r "${WORKDIR}/songs"
-	fi
-	dodoc docs/{Authors,instruments}.txt
-	newicon -s scalable data/themes/default/icon.svg ${PN}.svg
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/primateplunge-1.1-r2 b/games-arcade/primateplunge-1.1-r2
new file mode 100644
index 000000000000..ef381bd563ef
--- /dev/null
+++ b/games-arcade/primateplunge-1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer >=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=Help poor Monkey navigate his way down through treacherous areas
+EAPI=6
+HOMEPAGE=https://www.aelius.com/primateplunge/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=Primate-Plunge
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://www.aelius.com/primateplunge/primateplunge-1.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8d91ba1eaac150b7772e6d5d81e37138
diff --git a/games-arcade/primateplunge/Manifest b/games-arcade/primateplunge/Manifest
deleted file mode 100644
index cb4060d693f0..000000000000
--- a/games-arcade/primateplunge/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX primateplunge-1.1-AC_SUBST.patch 619 BLAKE2B 3252eb57e4c3352f3706abb6cf6ebc26fd8d8151548e8c4aa32eaace0dbcb0c5b90d313f9631f84e0eb46781143922da10638318e118925d95f2cf0a318c9fab SHA512 f8d584b8a305ac54b91a6746613361f60cb74e6c756f1067f6d3e6ffec71f3358c64f5901e44c3a1d423d5b8624e5c34086fe7f3d63df9cb86db0d558a08b7c2
-DIST primateplunge-1.1.tar.gz 5245884 BLAKE2B a1496eea4c99dd52f301aa50b6831ce6efffa78e45b97be13e93f64d4c4dd814b87fac17612fb82f994ee125375c75a47d3968b379c7622d78c76cadf5567e3b SHA512 bdc6be0faf28375941e67895c498f59a529521ba46d6b23ea94d3b16ead1541738d7aa5cfa5fa5cf269e7e474ca9002180e7b0663e1b4531300d21564df41b8c
-EBUILD primateplunge-1.1-r2.ebuild 746 BLAKE2B 71a599054b1bbed857c16ee88d2a2ddc7557292c017c375b163accae381c962f05ddce0b7515426358f7978b179edd689b95cd45ceb7749df663610618471c61 SHA512 d8c9cfa96356ab6b932aa9bff4f2b6c9736aa38b1478519a31084b0e9900fe7e12eca6ce09bee4a0ccdd6fe938ef9ffd01fadb098540ce6202060378d5580c51
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/primateplunge/files/primateplunge-1.1-AC_SUBST.patch b/games-arcade/primateplunge/files/primateplunge-1.1-AC_SUBST.patch
deleted file mode 100644
index 562f62f98585..000000000000
--- a/games-arcade/primateplunge/files/primateplunge-1.1-AC_SUBST.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure.ac.orig
-+++ b/configure.ac
-@@ -7,12 +7,12 @@
- 
- AC_INIT([primateplunge], [1.1], [primateplunge@aelius.com])
- 
--AC_CONFIG_SRCDIR( src/game.c )
-+AC_CONFIG_SRCDIR(src/game.c)
- AC_CANONICAL_SYSTEM
- 
- dnl Version 1.7 of automake is recommended
--AM_INIT_AUTOMAKE( 1.7 )
--AM_CONFIG_HEADER( src/config.h )
-+AM_INIT_AUTOMAKE(1.7)
-+AM_CONFIG_HEADER(src/config.h)
- 
- 
- 
-@@ -29,7 +29,6 @@
- 			[ PREFSFILE="~/.primateplunge" ]
- )
- 
--AC_SUBST( GAMEDATADIR )
- AC_DEFINE_DIR( GAMEDATADIR, GAMEDATADIR, [Location of game resource files] )
- AC_DEFINE_UNQUOTED( PREFSFILE, "$PREFSFILE", [Location of preferences file] )
- 
diff --git a/games-arcade/primateplunge/metadata.xml b/games-arcade/primateplunge/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/primateplunge/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild b/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
deleted file mode 100644
index a2cab33ca840..000000000000
--- a/games-arcade/primateplunge/primateplunge-1.1-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Help poor Monkey navigate his way down through treacherous areas"
-HOMEPAGE="https://www.aelius.com/primateplunge/"
-SRC_URI="https://www.aelius.com/${PN}/${P}.tar.gz"
-
-LICENSE="Primate-Plunge"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="mirror bindist" #465850
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-AC_SUBST.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc TIPS
-	newicon graphics/idle.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Primate Plunge" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-arcade/pycadia-0.5.1-r1 b/games-arcade/pycadia-0.5.1-r1
new file mode 100644
index 000000000000..c12e647fa58f
--- /dev/null
+++ b/games-arcade/pycadia-0.5.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=dev-python/pygame-1.5.5 dev-python/pygtk:2
+DESCRIPTION=Pycadia. Home to vector gaming, python style
+EAPI=6
+HOMEPAGE=http://www.anti-particle.com/pycadia.shtml
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pygame-1.5.5 dev-python/pygtk:2
+SLOT=0
+SRC_URI=http://www.anti-particle.com/downloads/pycadia-0.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=31423351e7b0d2255b71b126f5e05fd4
diff --git a/games-arcade/pycadia/Manifest b/games-arcade/pycadia/Manifest
deleted file mode 100644
index 2d99ace867b0..000000000000
--- a/games-arcade/pycadia/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pycadia-0.5.1.tar.gz 2768619 BLAKE2B 688fe8e148078e990ded8870569cf844fc9817e07c5136dc0b8960d2c39a72ca66443feee08c907104bf150c3475fcc0e626833252ce6f5c12b332f483d41079 SHA512 bfe7369263f21d672800eeaf567d7dcb5027b24d2f0d0534d68ad28ae71c916eca2ebf4b2f888645c8bfce12a2ba4bf23dacf673e32a7ba76d564006bdc3e0d2
-EBUILD pycadia-0.5.1-r1.ebuild 931 BLAKE2B 845baa0416b6e911dd02a3e5024ce24bdf42d85f0835d2fa9aa1b6cd7174580d184434ffe0ec103d66f2f02d2a5633c18ce7d311195422fae7519f88348b56d0 SHA512 dd902c965088a36b63e4d6a5ac99170a90c7e5a812d96070bfeff7c5c3de7158ffdea568b1219d091aa4a22e524070e6b790fdedc917fae64769406dde98d126
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/pycadia/metadata.xml b/games-arcade/pycadia/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/pycadia/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/pycadia/pycadia-0.5.1-r1.ebuild b/games-arcade/pycadia/pycadia-0.5.1-r1.ebuild
deleted file mode 100644
index 4ddccdf135a9..000000000000
--- a/games-arcade/pycadia/pycadia-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Pycadia. Home to vector gaming, python style"
-HOMEPAGE="http://www.anti-particle.com/pycadia.shtml"
-SRC_URI="http://www.anti-particle.com/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pygame-1.5.5
-	dev-python/pygtk:2
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${A}
-	{
-		echo "#!/bin/sh"
-		echo "cd /usr/share/${PN}"
-		echo "exec python2 ./pycadia.py \"\${@}\""
-	} > "${T}/pycadia"
-}
-
-src_install() {
-	dobin "${T}/pycadia"
-
-	insinto "/usr/share/${PN}"
-	doins -r {glade,pixmaps,sounds} *.py pycadia.conf
-
-	exeinto "/usr/share/${PN}"
-	doexe pycadia.py spacewarpy.py vektoroids.py
-
-	newicon pixmaps/pysteroids.png ${PN}.png
-	make_desktop_entry ${PN} Pycadia
-
-	dodoc doc/{TODO,CHANGELOG,README}
-}
diff --git a/games-arcade/pydance-1.1.0-r1 b/games-arcade/pydance-1.1.0-r1
new file mode 100644
index 000000000000..49a22da1b774
--- /dev/null
+++ b/games-arcade/pydance-1.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-python/pygame media-libs/libvorbis media-libs/sdl-mixer
+DESCRIPTION=A DDR clone for linux written in Python
+EAPI=6
+HOMEPAGE=http://www.icculus.org/pyddr/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PDEPEND=games-arcade/pydance-songs
+RDEPEND=dev-python/pygame media-libs/libvorbis media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://www.icculus.org/pyddr/pydance-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=966df85bb25024450cde29896f61e598
diff --git a/games-arcade/pydance-songs-20040410-r1 b/games-arcade/pydance-songs-20040410-r1
new file mode 100644
index 000000000000..9a3015b7ef85
--- /dev/null
+++ b/games-arcade/pydance-songs-20040410-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Music for the pyDDR game
+EAPI=6
+HOMEPAGE=http://icculus.org/pyddr/
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+SLOT=0
+SRC_URI=mirror://gentoo/pydance-songs-20040410.tar.bz2
+_md5_=ceb4c73ab3a98ac70da4adaf4e21bea1
diff --git a/games-arcade/pydance-songs/Manifest b/games-arcade/pydance-songs/Manifest
deleted file mode 100644
index 58a03426011a..000000000000
--- a/games-arcade/pydance-songs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pydance-songs-20040410.tar.bz2 3780065 BLAKE2B 23cd831fd0c2259a1e72c6e21d068edab0f203dddb550eaf62edb0d2f7120650cc3a8303d88260fb279030614896485484c77b7273de5ba352377504e1bfe85c SHA512 09d68efba0a21e65a0c2bfc8d66eef3ffbe186506a1c9041560b7295ea1ea386c236f2bd6fcb343001e1c0f3a8a520a4b1b2deaaf1c40afd30b7180ac91b8f5b
-EBUILD pydance-songs-20040410-r1.ebuild 366 BLAKE2B 0dcc23a97f10c0334d2b3a8b3f315a83713eca199ba3e2b47ec95fa8ba9c3e43d22ee2ee1150c9fad455c37c059f80b9de858409e8ac78dd5c1557e0943ff411 SHA512 6c9184d856a37449e84bf091e2b49f3c1f4622e3acd42d389fffc589c5a8da8a89beb322a999518b9879b7578862fd0f8c73b0405097b3c19c6571bd22f99b80
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/pydance-songs/metadata.xml b/games-arcade/pydance-songs/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/pydance-songs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/pydance-songs/pydance-songs-20040410-r1.ebuild b/games-arcade/pydance-songs/pydance-songs-20040410-r1.ebuild
deleted file mode 100644
index 4d7dacb4abd7..000000000000
--- a/games-arcade/pydance-songs/pydance-songs-20040410-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Music for the pyDDR game"
-HOMEPAGE="http://icculus.org/pyddr/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto "/usr/share/pydance/songs"
-	doins *
-}
diff --git a/games-arcade/pydance/Manifest b/games-arcade/pydance/Manifest
deleted file mode 100644
index bbc200f97d16..000000000000
--- a/games-arcade/pydance/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pydance-1.1.0.tar.gz 8957236 BLAKE2B 57ab896b95a8f653a075e6c7453e8e2adfc8c18e8271fc502667d7643736bfe3a8d62c3ebfbe8e84713ed235bbadff60080fd578f478c61741df881694e1c7d4 SHA512 738787626d83adc635e7e4644f159e3ce793da7b38cf094ffd73cabb088d3414a1aa9deda423784174b2c0381e50dd0d74bbcfb9d939044e85c35866b3818c7d
-EBUILD pydance-1.1.0-r1.ebuild 1036 BLAKE2B e2d52e63f679bd9abc2528a128fbae325555b9380c106ea15b3aaa797ce3f66390019c090e59b42ed7d9a889e52add0299497da66f48f50505ac40ec27370525 SHA512 1d0bc2088d06e3ef0669a2376d3876d8bf7ee03ae9f52ad4c7c3064015a0c0b15769bee0023f378e6c7f67ad279eda9b3c01cfc7c6b2fb0cffb53c680f7822f4
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/pydance/metadata.xml b/games-arcade/pydance/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/pydance/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/pydance/pydance-1.1.0-r1.ebuild b/games-arcade/pydance/pydance-1.1.0-r1.ebuild
deleted file mode 100644
index f3d5b1901227..000000000000
--- a/games-arcade/pydance/pydance-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A DDR clone for linux written in Python"
-HOMEPAGE="http://www.icculus.org/pyddr/"
-SRC_URI="http://www.icculus.org/pyddr/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygame
-	media-libs/libvorbis
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-PDEPEND="games-arcade/pydance-songs"
-
-src_prepare() {
-	default
-	sed -i -e "s:1\.0\.1:1.0.2:" \
-		pydance.py constants.py docs/man/pydance.6 || die
-	sed -i -e 's:/usr/share/games/pydance/:/usr/share/pydance/:g' pydance.posix.cfg || die
-}
-
-src_install() {
-	local dir=/usr/share/${PN}
-
-	insinto "${dir}"
-	doins *.py
-	cp -R CREDITS {sound,images,utils,themes} "${D}${dir}/" || die
-
-	insinto /etc/
-	newins pydance.posix.cfg pydance.cfg
-
-	make_wrapper pydance "python2 ./pydance.py" "${dir}"
-
-	dodoc BUGS CREDITS ChangeLog HACKING README TODO
-	HTML_DOCS="docs/manual.html docs/images" einstalldocs
-	doman docs/man/*
-}
diff --git a/games-arcade/retrobattle-1.0.0-r1 b/games-arcade/retrobattle-1.0.0-r1
new file mode 100644
index 000000000000..741eabc12d50
--- /dev/null
+++ b/games-arcade/retrobattle-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-mixer[wav]
+DESCRIPTION=A NES-like platform arcade game
+EAPI=6
+HOMEPAGE=http://remar.se/andreas/retrobattle/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-mixer[wav]
+RESTRICT=test
+SLOT=0
+SRC_URI=http://remar.se/andreas/retrobattle/files/retrobattle-src-1.0.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2b1cc5c101b4b0c3c29f3de07f73d895
diff --git a/games-arcade/retrobattle/Manifest b/games-arcade/retrobattle/Manifest
deleted file mode 100644
index 01315bf1f60b..000000000000
--- a/games-arcade/retrobattle/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX retrobattle-1.0.0-build.patch 734 BLAKE2B 4ffa45c16de1e4b61d96bf18c5cf79565bf3fb68b1bda293cf1e0a35a06d610f4e7a562d04c2781cfa39b24b723f17c97d03eea93d5d31e0fd48ed4d5d7e0934 SHA512 ef1bfaa78911b6a5d69a03ad0779fece864a521faf3cba99e60214ca46845f019c5a077562a396a3775441020275454955e83ecbb9bedf691dedbf1a178b0549
-AUX retrobattle-1.0.0-gcc6.patch 727 BLAKE2B ba3cf4079f453451e4c75cd219a9069d0aa8ba983a5c54a9429c3528fbb303cea5d74e39737cb8faf9e1b1ffbfc2b6fe12c4d339fb255c8d33bcc8f877d9902c SHA512 c6abf9dea211fa362ed3e2c65bdc4617e0f3419bf206fa2cff92bf6a5f37f0b616ee658468213329aa3de704ec61c0f53b0f450171f8543cb21f620a1e3d6747
-AUX retrobattle-1.0.0-sound.patch 435 BLAKE2B c415d1713858f5c5087c10fa29786ce8ba8127ebb72da6d9f0802609d1740e9265022526ea1bbb04f97b4173a00cbccb07fbfbbc015800a688b64e9c42c0aa42 SHA512 e25737a8fd55ae7e54015a122754811e748e5cb26adf866ddd912547c72acf1ea8a70b33724bd17ee35c959051d4210047aaee8a7a88ebe85ab0c4a1083386a1
-DIST retrobattle-src-1.0.0.tar.bz2 4007959 BLAKE2B efe20ccfc813b5c17b49694ab01a1a341fa2bf2bb45a0aaca99eb5bb1a814f12bfa6354308c0d9cc9937a159a20568312ddead0748b75803d97f9e9d0d86c99a SHA512 2d006fc9a62e57d7fb3c0f0e535a5c702204b6341566064d7683526923839e8a43e14b308e76a8a1f6794f7c682f6344975956877f80bbcbc33ee61cd640ff9e
-EBUILD retrobattle-1.0.0-r1.ebuild 840 BLAKE2B d2af53b2b528cb0347ec1a963180c090ceff766f564a91ea860026737f6217207ce2cf238d9c37b9112dba3b8dcc93d22d5731b70bfe7483dee994b63f54a35f SHA512 2ae9eb08d4b88991242c9828f79064f283547708f643c8e4aef8818dfce7bbf7574feb0d6d2a73ad1a7be11015f686598b8c83297ed94ec202fd912414749160
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-build.patch b/games-arcade/retrobattle/files/retrobattle-1.0.0-build.patch
deleted file mode 100644
index 3673ef01e17f..000000000000
--- a/games-arcade/retrobattle/files/retrobattle-1.0.0-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Sat Aug 4 12:15:53 2012 +0200
-
-    respect CXX, CFLAGS and LDFLAGS
-
---- src/Makefile
-+++ src/Makefile
-@@ -1,10 +1,10 @@
--CFLAGS =	`sdl-config --cflags` -g -Wall -I. -DENABLE_BINRELOC
--CPPFLAGS =	$(CFLAGS)
-+CXXFLAGS +=	$(shell sdl-config --cflags) -I. 
-+CPPFLAGS +=	-DENABLE_BINRELOC
- 
- # Uncomment the first LIBS line and comment out the other LIBS line to
- # compile without SDL_Mixer
- #LIBS =		`sdl-config --libs`
--LIBS =		`sdl-config --libs` -lSDL_mixer
-+LIBS =		$(shell sdl-config --libs) -lSDL_mixer
- 
- RETROINSTALLDIR ?= /opt
- 
-@@ -25,7 +25,7 @@
- 
- 
- retrobattle:	$(RETRO)
--		g++ -o $@ $^ $(LIBS)
-+		$(CXX) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 		mv $@ ..
- 
- clean:
diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch b/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
deleted file mode 100644
index 62af1f4718ef..000000000000
--- a/games-arcade/retrobattle/files/retrobattle-1.0.0-gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/GameLogic.h
-+++ src/GameLogic.h
-@@ -52,8 +52,8 @@
-   /* Fixed interval time-based animation */
-   static const int maximumFrameRate = 60;
-   static const int minimumFrameRate = 15;
--  static const float updateInterval = 1.0 / maximumFrameRate;
--  static const float maxCyclesPerFrame = maximumFrameRate / minimumFrameRate;
-+  static const float updateInterval;
-+  static const float maxCyclesPerFrame;
- 
-   float lastFrameTime;
-   float cyclesLeftOver;
---- src/GameLogic.cc
-+++ src/GameLogic.cc
-@@ -206,3 +206,6 @@
- {
-   sprintf(buf, "%s/data/gfx/%s", datadir, file);
- }
-+
-+const float GameLogic::updateInterval = 1.0 / maximumFrameRate;
-+const float GameLogic::maxCyclesPerFrame = maximumFrameRate / minimumFrameRate;
diff --git a/games-arcade/retrobattle/files/retrobattle-1.0.0-sound.patch b/games-arcade/retrobattle/files/retrobattle-1.0.0-sound.patch
deleted file mode 100644
index 591ce66e9f69..000000000000
--- a/games-arcade/retrobattle/files/retrobattle-1.0.0-sound.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Aug  5 16:22:22 UTC 2012
-Subject: sound
-
-resolves crackling background music
-
---- src/SoundManager.cc
-+++ src/SoundManager.cc
-@@ -25,7 +25,7 @@
- SoundManager::SoundManager(char *datadir)
- {
- #ifndef NO_SDL_MIXER
--  if(Mix_OpenAudio(22050, AUDIO_S16SYS, 2, 1024))
-+  if(Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 1024))
-     {
-       printf("SDL_mixer says: %s\n", Mix_GetError());
-     }
diff --git a/games-arcade/retrobattle/metadata.xml b/games-arcade/retrobattle/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-arcade/retrobattle/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild b/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
deleted file mode 100644
index 411ae4f57017..000000000000
--- a/games-arcade/retrobattle/retrobattle-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="A NES-like platform arcade game"
-HOMEPAGE="http://remar.se/andreas/retrobattle/"
-SRC_URI="http://remar.se/andreas/retrobattle/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# test is incomplete
-RESTRICT="test"
-
-DEPEND="media-libs/libsdl[X,sound,video]
-	media-libs/sdl-mixer[wav]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-{build,sound,gcc6}.patch )
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}"/${MY_P}/data
-
-	newbin "${WORKDIR}"/${MY_P}/${PN} ${PN}.bin
-	make_wrapper ${PN} "${PN}.bin \"/usr/share/${PN}\""
-
-	make_desktop_entry ${PN}
-	dodoc "${WORKDIR}"/${MY_P}/{manual.txt,README}
-}
diff --git a/games-arcade/ri-li-2.0.1-r1 b/games-arcade/ri-li-2.0.1-r1
new file mode 100644
index 000000000000..409382ad27d7
--- /dev/null
+++ b/games-arcade/ri-li-2.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[mod] >=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=Drive a toy wood engine and collect all the coaches
+EAPI=6
+HOMEPAGE=http://ri-li.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=91c06791b4a392c422c24b0a2033518c
diff --git a/games-arcade/ri-li/Manifest b/games-arcade/ri-li/Manifest
deleted file mode 100644
index 34d44b8765bd..000000000000
--- a/games-arcade/ri-li/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ri-li-2.0.1-gcc43.patch 8620 BLAKE2B 069966fe27a3bbccf6a2ee8d15e591d1537accb6713fb07b2d6e964ecff52eb8de95e03a6d858b6e7dd3499f4724b6fc69c44792a93502893aa4c703495cac36 SHA512 30e7641c7aeb24e5904dc70115d72b9392db0a54bcf0b327b64c5225ad76ea3eecb492f688a2fc4c0142984862fa5fda85477e97fbb391f20adf7947354b1c53
-DIST Ri-li-2.0.1.tar.bz2 13745398 BLAKE2B 29fdc812387c5fc3d9868ea137b556e08c0b6239ed4cebc8ed92f2530005191f2916dd143d8b417c2654ec902409307ca7f486d17374eabcac555de3714f888b SHA512 6d56c00dae90b50bca81ca739c628335b4ad7642c19a3b3c28630ddb91bd847ca6d383cace66ef436a1dda7497c9d3939de2626071bae40d423b2444fed97863
-EBUILD ri-li-2.0.1-r1.ebuild 740 BLAKE2B e17e855b7881231f068ea71fe93e2192abcf48ea587c8771ab8740ea60a70df27d6af07103fc5b353553290c06edf12523e14158a6e605b8cd2865221ddb5dfb SHA512 f50da34038c1fd16ab3dfa52727978ff2b12b6ccd98ba873670e5976d490a241eb9a8b104320246ab4aa69cac706018260869c6c1abae3c2128f5144514a86dd
-MISC metadata.xml 328 BLAKE2B a4415f172fe6ff0b8c76d6d97aefc4e3d910c61b7ae1db25dcb729d36f791f87c5aeba81382e9474b5565032a29bc376acc9105b91a0e335e6f4ad5a44e67a46 SHA512 fecf94d4aa2ffbc8fbf439f3a5efb839d6789d65c76e64455c58b2d0c9491cb0982dcf1ed1cfff9409212a52fc9bcf4b7ef39a67a5186540f7a0412a519a8bbf
diff --git a/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch b/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
deleted file mode 100644
index 3782627c83bd..000000000000
--- a/games-arcade/ri-li/files/ri-li-2.0.1-gcc43.patch
+++ /dev/null
@@ -1,291 +0,0 @@
---- a/src/audio.cc
-+++ b/src/audio.cc
-@@ -22,7 +22,7 @@
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <string.h>
- 
- #include "audio.h"
-@@ -57,7 +57,7 @@
-   char PathFile[512];
- 
-   if(Mix_OpenAudio(22050,AUDIO_S16,1,1024)) {
--    cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<endl;
-+    std::cerr <<"Enable to init Sound card ! "<<SDL_GetError()<<std::endl;
-     return false;
-   }
-   
---- a/src/ecran.cc
-+++ b/src/ecran.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
---- a/src/editeur.cc
-+++ b/src/editeur.cc
-@@ -25,7 +25,7 @@
- #include <windows.h>
- #endif
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -374,7 +374,7 @@
-     
-     // Sauve le niveau
-     if(Niveau.Save()==false) {
--      cerr <<"ERREUR Saving levels!"<<endl;
-+      std::cerr <<"ERREUR Saving levels!"<<std::endl;
-       exit(-1);
-     }
-     
---- a/src/jeux.cc
-+++ b/src/jeux.cc
-@@ -25,7 +25,7 @@
- #include <windows.h>
- #endif
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- a/src/loco.cc
-+++ b/src/loco.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -23,7 +23,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <iostream.h>
-+#include <iostream>
- #include <string.h>
- #include <SDL/SDL.h>
- #include <SDL/SDL_mixer.h>
-@@ -115,7 +115,7 @@
-  
-   // Initilise SDL
-   if( SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_AUDIO|SDL_INIT_NOPARACHUTE) < 0 ) {
--    cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<endl;
-+    std::cerr <<"Impossible d'initialiser SDL:"<<SDL_GetError()<<std::endl;
-     exit(-1);
-   }
-   // Ferme le programme correctement quant quit
-@@ -125,7 +125,7 @@
-   sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
- 
-   if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
--    cerr <<"Impossible d'utiliser 8bits pour la vid�o !"<<endl;
-+    std::cerr <<"Impossible d'utiliser 8bits pour la vid�o !"<<std::endl;
-     exit(-1);
-   }
-   
-@@ -145,7 +145,7 @@
-   sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption);
- 
-   if(sdlVideo==NULL) {
--    cerr <<"Impossible de passer dans le mode vid�o 800x600 !"<<endl;
-+    std::cerr <<"Impossible de passer dans le mode vid�o 800x600 !"<<std::endl;
-     exit(-1);
-   }
-   // Change le nom de la fenetre
---- a/src/menu.cc
-+++ b/src/menu.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -92,7 +92,7 @@
-   // Teste la resolution video
-   sdlVideoInfo=(SDL_VideoInfo*)SDL_GetVideoInfo();
-   if(sdlVideoInfo->vfmt->BitsPerPixel==8) {
--    cerr <<"Impossible d'utiliser 8bits pour la vid�o !"<<endl;
-+    std::cerr <<"Impossible d'utiliser 8bits pour la vid�o !"<<std::endl;
-     exit(-1);
-   }
-   
-@@ -112,7 +112,7 @@
-   if(Pref.FullScreen) vOption|=SDL_FULLSCREEN;
-   sdlVideo=SDL_SetVideoMode(800,600,sdlVideoInfo->vfmt->BitsPerPixel,vOption);
-   if(sdlVideo==NULL) {
--    cerr <<"Impossible de passer dans le mode vid�o 800x600 !"<<endl;
-+    std::cerr <<"Impossible de passer dans le mode vid�o 800x600 !"<<std::endl;
-     exit(-1);
-   }
-   
---- a/src/mouse.cc
-+++ b/src/mouse.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include "mouse.h"
- #include "preference.h"
---- a/src/sprite.cc
-+++ b/src/sprite.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -84,7 +84,7 @@
-   strcpy(PathFile,Langue[Pref.Langue]);
-   GetPath(PathFile);
-   if(FileExiste(PathFile)==false) {
--    cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<endl;
-+    std::cerr <<"Impossible de trouver "<<Langue[Pref.Langue]<<std::endl;
-     return false;
-   }
-   L=ChargeFichier(PathFile,Buf);
-@@ -128,7 +128,7 @@
-   // *** Charge le fichier des langues ***
-   // *************************************
-   if(FileExiste(PathFile)==false) {
--    cerr <<"Impossible de trouver 'language.dat'"<<endl;
-+    std::cerr <<"Impossible de trouver 'language.dat'"<<std::endl;
-     return false;
-   }
-   L=ChargeFichier(PathFile,Buf);
-@@ -163,7 +163,7 @@
-   strcpy(PathFile,"sprites.dat");
-   GetPath(PathFile);
-   if(FileExiste(PathFile)==false) {
--    cerr <<"Impossible de trouver 'sprites.dat'"<<endl;
-+    std::cerr <<"Impossible de trouver 'sprites.dat'"<<std::endl;
-     return false;
-   }
-   L=ChargeFichier(PathFile,Buf);
-@@ -352,7 +352,7 @@
-     Image[i]=SDL_CreateRGBSurface((Dim[i].bpp-3)*SDL_SRCALPHA,Dim[i].L,Dim[i].H,Dim[i].bpp*8,
- 				  0xff,0xff00,0xff0000,0xff000000*(Dim[i].bpp-3));
-     if(Image[i]<=NULL) {
--      cerr <<"Impossible de cr�er une Surface SDL!"<<endl;
-+      std::cerr <<"Impossible de cr�er une Surface SDL!"<<std::endl;
-       return false;
-     }
-     
-@@ -486,7 +486,7 @@
-   Image[0]=SDL_CreateRGBSurface((Dim[0].bpp-3)*SDL_SRCALPHA,Dim[0].L,Dim[0].H,Dim[0].bpp*8,
- 				0xff,0xff00,0xff0000,0xff000000*(Dim[0].bpp-3));
-   if(Image[0]<=NULL) {
--    cerr <<"Impossible de cr�er une Surface SDL!"<<endl;
-+    std::cerr <<"Impossible de cr�er une Surface SDL!"<<std::endl;
-     return false;
-   }
-   return true;
---- a/src/tableau.cc
-+++ b/src/tableau.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include "preference.h"
---- a/src/utils.cc
-+++ b/src/utils.cc
-@@ -21,7 +21,7 @@
- //    with this program; if not, write to the Free Software Foundation, Inc.,
- //    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
--#include <iostream.h>
-+#include <iostream>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -77,7 +77,7 @@
- 
-   file=fopen(Path,"r");
-   if(!file) {
--    cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl;
-+    std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl;
-     perror("fopen");
-     return -1;
-   }
-@@ -93,7 +93,7 @@
- 
-   Buf=new unsigned char [L+1];
-   if(Buf==NULL) {
--    cerr <<"ERREUR: Memoire insuffisante!"<<endl;
-+    std::cerr <<"ERREUR: Memoire insuffisante!"<<std::endl;
-     fclose(file);
-     return -1;
-   }
-@@ -104,7 +104,7 @@
-   while(Compt>1024) {
-     AfficheChargeur();
-     if( fread(Po,1,1024,file) != 1024 ) {
--      cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<endl;
-+      std::cerr <<"ERREUR de lecture du fichier '"<<Path<<"'"<<std::endl;
-       perror("fread");
-       fclose(file);
-       delete [] Buf;
-@@ -169,14 +169,14 @@
-   
-   file=fopen(Path,"w");
-   if(!file) {
--    cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<endl;
-+    std::cerr <<"ERREUR: Impossible d'ouvrir '"<<Path<<"'"<<std::endl;
-     perror("fopen");
-     return false;
-   }
-   
-   while(L>512) {
-     if( fwrite(Buf,1,512,file) != 512 ) {
--      cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl;
-+      std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl;
-       perror("fwrite");
-       fclose(file);
-       return false;
-@@ -187,7 +187,7 @@
- 
-   if(L>0) {
-     if( fwrite(Buf,1,(size_t)L,file) != (size_t)L ) {
--      cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<endl;
-+      std::cerr <<"ERREUR d'ecriture du fichier '"<<Path<<"'"<<std::endl;
-       perror("fwrite");
-       fclose(file);
-       return false;
-@@ -250,7 +250,7 @@
-   sprintf(Path,"/usr/share/games/Ri-li/%s",Provi);
-   if(FileExiste(Path)) return;
-   
--  cerr <<"Impossible de trouver le fichier '"<<Provi<<endl;
-+  std::cerr <<"Impossible de trouver le fichier '"<<Provi<<std::endl;
-   exit(-1);
- }
- #endif
diff --git a/games-arcade/ri-li/metadata.xml b/games-arcade/ri-li/metadata.xml
deleted file mode 100644
index 4e3107e82d1b..000000000000
--- a/games-arcade/ri-li/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ri-li</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild b/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
deleted file mode 100644
index 9fc7f0cd4a6a..000000000000
--- a/games-arcade/ri-li/ri-li-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="Drive a toy wood engine and collect all the coaches"
-HOMEPAGE="http://ri-li.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ri-li/Ri-li-${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Ri-li-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gcc43.patch
-	mv configure.{in,ac}
-	rm aclocal.m4
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -f "${ED}/usr/share/Ri-li/"*ebuild
-	newicon data/Ri-li-icon-48x48.png ${PN}.png
-	make_desktop_entry Ri_li Ri-li
-}
diff --git a/games-arcade/rockdodger-0.6.0a-r1 b/games-arcade/rockdodger-0.6.0a-r1
new file mode 100644
index 000000000000..c33bfa0929bc
--- /dev/null
+++ b/games-arcade/rockdodger-0.6.0a-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer
+DESCRIPTION=Dodge the rocks for as long as possible until you die
+EAPI=5
+HOMEPAGE=http://spacerocks.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/spacerocks/rockdodger-0.6.0a.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_=6c9c245e6056d5c8b008fa185fa006f3
diff --git a/games-arcade/rockdodger/Manifest b/games-arcade/rockdodger/Manifest
deleted file mode 100644
index e145bc210704..000000000000
--- a/games-arcade/rockdodger/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.6.0a-sec.patch 660 BLAKE2B ff9277217038b07e9ec4d8df3c09b024761d507881c080616218397a56a30088a1b99494b26ee1d054b80881ed5c9b30aca7fa44fe0210a96f94f14ec5b3a82e SHA512 aed20b03bac5e717a8eaad580b8f5580b26a862cc43ce0e7d5a6d4dcccc1d447ef2efedf333c94b52fa2782018375aa06c57861e6742efe8a8bf70c57b4f2c9a
-AUX rockdodger-0.6.0a-gcc41.patch 516 BLAKE2B 4ed4ab15db86db0e22ce52174d576d9d8e1997142d8f02eb02b6d89f9612ca70cb77d3fa4f97c190837ad954a02e2cc858822313aeb57ac3cc3b4186e1c40293 SHA512 83dee968da1ae24514ffeb5a8aafb8bb9c1c4c94ed54ff2b2dc3dac3084948b88fae21b834918d8514d04ec8c027602540b5e62b72017048e3dcb6e970be5df3
-AUX rockdodger-0.6.0a-underlink.patch 315 BLAKE2B bacc643f6955230cb590f8d87626f3ad2dfa6f31acaec0a8d313ad86082089e9784edaddeab76828a71a522cc758893da0dd65313890d3e9281ab5243fbac79b SHA512 96613eb9716845e3cd4ae164b30063871a3f199d468f4b0f909fe8d7829a3e9649022ee9a93ee20190e522ce8df1d6ba1d09b8977c7600ee378c408e54584aff
-DIST rockdodger-0.6.0a.tar.gz 410223 BLAKE2B 5ccda4400468d6a7209adfdad3045773bf31581e34dfb77bff7d314ca9d9fa18e6c5a24996259782c002cf8ea611f92388c9ca46be4e0c7492a526421e8e8163 SHA512 d517cc844df21e8772b13d0226841a64bede0cc2f5461fb83d313f49cd99192dcf6af4597e3d1f3e1c60f578437e355ce665e0288415da803a503fb12d8462eb
-EBUILD rockdodger-0.6.0a-r1.ebuild 1444 BLAKE2B 1b7696ef113dc07537686fbcf4a06050f0237386b1190277713221a8a55615049224b47210bad2c5fec42d14abe947f2f6457d44745fecf5542f06a87db88c25 SHA512 7be5fb25dde2cd3d3c784cf5580ea929969979fec34a9c40e2715edeaa859dec774258d9382c9a2f10ce53823f03991b9f99ee6348b110de97f9f1217276c67c
-MISC metadata.xml 333 BLAKE2B 86aa43a28193b28b46fa52ba9a898a26a8f53b43e1c927062d29f34f8bdf952355ed6a333b0336278fce760dd5506588e103e96f7ef9449e0be26c72b6fe446a SHA512 fa4831b21647e72987ac3b956d81b5efc4308004c76213a046bd026a9939687b5f98c633a1f39d693a502f9557248e9810ba7301334cb3e82c9570e29efd6a6c
diff --git a/games-arcade/rockdodger/files/0.6.0a-sec.patch b/games-arcade/rockdodger/files/0.6.0a-sec.patch
deleted file mode 100644
index e870cf2d2974..000000000000
--- a/games-arcade/rockdodger/files/0.6.0a-sec.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- main.c.old	2002-11-17 23:56:12.000000000 +0100
-+++ main.c	2004-10-29 22:32:00.000000000 +0200
-@@ -459,7 +459,7 @@ FILE *hs_fopen(char *mode) {/*{{{*/
-     else {
- 	char s[1024];
- 	umask(0177);
--	sprintf(s,"%s/.rockdodger_high",getenv("HOME"));
-+	snprintf(s,1024,"%s/.rockdodger_high",getenv("HOME"));
- 	if (f=fopen(s,mode)) {
- 	    umask(mask);
- 	    return f;
-@@ -478,7 +478,7 @@ void read_high_score_table() {/*{{{*/
- 	for (i=0; i<8; i++) {
- 	    char s[1024];
- 	    int highscore;
--	    if (fscanf (f, "%d %[^\n]", &highscore, s)!=2)
-+	    if (fscanf (f, "%d %1023[^\n]", &highscore, s)!=2)
- 		break;
- 	    if (high[i].allocated)
- 		free(high[i].name);
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
deleted file mode 100644
index 59e01bba17c3..000000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-gcc41.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- main.c.old	2006-04-24 16:16:13.000000000 +0200
-+++ main.c	2006-04-24 16:16:21.000000000 +0200
-@@ -206,7 +206,6 @@
- struct bangdots bdot[MAX_BANG_DOTS], *bdotptr=bdot;
- struct spacedot sdot[MAX_SPACE_DOTS];
- 
--struct greeble greeb[MAX_GREEBLES];
- struct greeble {
-     int active;
-     float x,y; // When landed, these represent an offset from the host rock
-@@ -214,6 +213,7 @@
-     int landed;
-     int boredom; // Goes up while landed
- };
-+struct greeble greeb[MAX_GREEBLES];
- // }}}
- 
- void init_greeblies() {
diff --git a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch b/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
deleted file mode 100644
index 87cd8453476c..000000000000
--- a/games-arcade/rockdodger/files/rockdodger-0.6.0a-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2011-06-20 21:25:56.788323912 +0200
-+++ Makefile	2011-06-20 21:26:11.970287694 +0200
-@@ -27,7 +27,7 @@
- #SOUNDLIBRARIES=
- SOUNDLIBRARIES=-lSDL_mixer
- 
--LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES)
-+LIBRARIES=`sdl-config --libs` -lSDL_image $(SOUNDLIBRARIES) -lm
- 
- all:	$(EXENAME)
- 
diff --git a/games-arcade/rockdodger/metadata.xml b/games-arcade/rockdodger/metadata.xml
deleted file mode 100644
index 2bf107eefc84..000000000000
--- a/games-arcade/rockdodger/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">spacerocks</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild b/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
deleted file mode 100644
index 1938ead0b154..000000000000
--- a/games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Dodge the rocks for as long as possible until you die"
-HOMEPAGE="http://spacerocks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/spacerocks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Modify highscores & data directory and add our CFLAGS to the Makefile
-	sed -i \
-		-e "s:\./data:${GAMES_DATADIR}/${PN}:" \
-		-e "s:/usr/share/rockdodger/\.highscore:${GAMES_STATEDIR}/rockdodger.scores:" \
-		-e 's:umask(0111):umask(0117):' main.c \
-		|| die " sed main.c failed"
-	sed -i \
-		-e "s:-g:${CFLAGS}:" \
-		-e 's:cc:$(CC):' \
-		-e '/-o/s:\$+:$(LDFLAGS) $+:' \
-		Makefile \
-		|| die "sed Makefile failed"
-
-	# The 512 chunksize makes the music skip
-	sed -i \
-		-e "s:512:1024:" sound.c \
-			|| die "sed sound.c failed"
-	epatch \
-		"${FILESDIR}"/${PV}-sec.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins data/*
-
-	newicon spacerocks.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Rock Dodger" ${PN}
-
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}"/${PN}.scores
-	fperms 660 "${GAMES_STATEDIR}"/${PN}.scores
-	prepgamesdirs
-}
diff --git a/games-arcade/rocksndiamonds-4.1.0.0 b/games-arcade/rocksndiamonds-4.1.0.0
new file mode 100644
index 000000000000..aab0426f125d
--- /dev/null
+++ b/games-arcade/rocksndiamonds-4.1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=media-libs/libsdl2[joystick,video] media-libs/sdl2-mixer[mod,mp3,timidity] media-libs/sdl2-net media-libs/sdl2-image[gif] media-libs/smpeg app-arch/unzip
+DESCRIPTION=A Boulderdash clone
+EAPI=6
+HOMEPAGE=http://www.artsoft.org/rocksndiamonds/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl2[joystick,video] media-libs/sdl2-mixer[mod,mp3,timidity] media-libs/sdl2-net media-libs/sdl2-image[gif] media-libs/smpeg
+SLOT=0
+SRC_URI=http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-4.1.0.0.tar.gz http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz mirror://gentoo/rnd_jue-v8.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_=690763e00adec3dc5a41ecc361acfe63
diff --git a/games-arcade/rocksndiamonds/Manifest b/games-arcade/rocksndiamonds/Manifest
deleted file mode 100644
index ff73dd2ebbea..000000000000
--- a/games-arcade/rocksndiamonds/Manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-AUX rocksndiamonds-4.1.0.0-CVE-2011-4606.patch 961 BLAKE2B 10eae087eb32a90ae0f05df568aaaf9d9360badc056b77d2a1f00be4df24d7cfa884234860adb69aa4a21b8a6367c46b2d4b612c0205be10bfd1ba226c4e5f1e SHA512 5a76f0e16dd7e6bc7157050dae77f05b7b02130d2ee08051d6ef1574b201da0498d7bd14a480dd33a062ee323eb572291f9f20d44fc1bc48603980763f7763de
-AUX rocksndiamonds-4.1.0.0-YN.patch 700 BLAKE2B 92cdef21f6a301b37671fd2748b72f0b774861644fe75b480a99230ea0b4df6525207d09e661125e42aa20375ac4da0be96c5dc308a58ad237969a736f87bcb7 SHA512 3781a5ac8c43fdf6372c5e74b3ab3e57eeaff6adb814a590330a457b1ef8c37447d93e549745fa96fec3fc45e463d7669982aeda58fabd6ac8e20708746f6859
-AUX rocksndiamonds-4.1.0.0-music-info-url.patch 2598 BLAKE2B 9edde25c6306eebf10e365828b367fb090972e16aba53010c5ea1bba4628e4ec1cebcf13a80e5a68e19c00d84db0b0347e891411f3dc19a4b117b5c82b6c39bd SHA512 64a6908f7cf9e9d332634e8222c71b30fecbc550e49433d619a58f4a1a5c688e757c1c035bfc1a6d1c2a672921219e3390b87b8b96f0b4abefcc2048bec94038
-DIST BD2K3-1.0.0.zip 4715324 BLAKE2B 72e25038c41a7a1c29a896459db97954d18731d6980f5096c28ebddb09c0b6d7bdb68a8c56f17d26c71085e4ae883d2ceaad8e95b5525cbf532d18f32ecdd638 SHA512 80f172584d2077a3ade0749790802ef9cecde75283d6b889e7d2fedf9b55fd1fd7f1f1fd5596b17d5b2a542172699a929ea626086e77d28fde11487440c43622
-DIST Boulder_Dash_Dream-1.0.0.zip 10923437 BLAKE2B 976156c763281b993550a08361c5b6279a471e24568205c0369cc3f57d99e97db84d914a560c909b30fe92b8c8c10931cf6a8a8de4da181edac410a770d922b7 SHA512 f2765f52653b4f9d6c4a6548076281f6749d08c2dfd220345bdc0058b94d51c49ef81acdc87ff71bc1b3f337f3cc6a1d08b9e5a02d6aaeaeac5d894f97ba3d8e
-DIST Contributions-1.2.0.zip 9499312 BLAKE2B a90a84d230ab1032819bc3821871eb027ed83a8e289b01692f80185c42d50429ca8c6928b72b1ae5ea102ba2a0d25cd25391dc53b0cdb37ef4504233292dc2da SHA512 463e629bd4f592e24a82d20f1f249cea9e266a7c370bb5b079add8daa125d1af69a69746b696dd92f89b90e50972c6b2ba007aab87beed4cd980c0c7bdb81920
-DIST Snake_Bite-1.0.0.zip 6506066 BLAKE2B 852f7815939100f78d6a7ce27df565277f6467cc63c069f77d4e067f0144df092c3b6e73a64d0a9743033d90b20d390761046b253c188fd65873f7b28bf8b451 SHA512 82131cb68c9654cb49ddbb46b0c15f13ce98af4f3b2a46e1cc4f2980eea45a707297c74787f365996321f39a9f7656a9492c3d437e3da0d71a295447c868960e
-DIST Sokoban-1.0.0.zip 295339 BLAKE2B e263e311e58dcc21d11dd10b0fa7af0f871405d932c2e1ea6d580ec58098c6a498202b516cbd3d2f1dd795521b419de61c8c9a195f4b2ea781a35ac645cd9c59 SHA512 b63be5b00c4c0b153bb6fc45fde556c26cd49fa672b279cce2f61b572d9c056d5e10a565530bdf539024d75ffdd38efe68310e98b8f810d9c5dfc17b24ec376b
-DIST rnd-contrib-1.0.0.tar.gz 3389242 BLAKE2B bcdc926a7164788c8c640bf1aced57fbe9d71d99332751d2c4e30460427cb09a30ee3e45f2e6b6a1d83cce9bdf4c92ab187a2385a57bdc2a893735bd19c64b9b SHA512 8bd82f9c34e6e2d2b7ea22fc5899e72a64587469bfb1336d0d33e6ee2bcd04b3b6adca958861b0e29e18e8dac74651c642126511cacb247072e367783a5c6a08
-DIST rnd_jue-v8.tar.bz2 17244645 BLAKE2B 92d0cf646296b065c9ebe54d8d5ecb831eeb49748e47b6d2f019c2fd359d1e6ef5d3cd0472f1247e5c41b6b5aa7154b9e3baae000defc83b24470163a9dfc416 SHA512 cbff4cd16c812d77fe8446da4016d8f75dfa8675298a745062ff53a7783a39a59cffd886fedf1097023e72e111f10ddd56f280a109058a1a8ee069d664d2c59c
-DIST rockslevels-dx-1.0.tar.gz 211151 BLAKE2B 637a600f9197925d82e7ef344c90f04e8508c6b114fd07ad00977d91a856ff85dc29207e5f22c659382ee0759f8607e9dc8ad0c0de3826d57b74d494320b57ad SHA512 2e1bc4484a76bf638e8ce285972b20b6377e0483abb2475e2343d48de1f84ee102f430049d685b89bc1087e0f20b9b6e29370f8e6cae66b480d3650be9991f44
-DIST rockslevels-emc-1.0.tar.gz 3824268 BLAKE2B 0feadd5d9c6225c8574576281d07e14ff98fc9a33c67d3fa5083219ce39daaa1902a5ed652b5379fa4e58ee2428a8a452d66520571206143fd0fcd54f71b977a SHA512 9abad888fa00bc305444367c5ab8ffdad95eaca22613573e44d5ecd93b1a9a1cbc931497c064002d90fd3174c4661d0b009ede7746b2fe8da0a00072303a1301
-DIST rockslevels-sp-1.0.tar.gz 373564 BLAKE2B 3f724ea55bbdaae80a35d6a9f5d8751a9228862fbe1ba45419343b1968510e10d3c82cc01844e35bc35561e65df3bc7e5ec2a0b807e1f56359dc7dccc16e3cb0 SHA512 2d44e9238a72846b9d4fbab90288aa3b23af4957ffe0d42d95c523fd22f3587572864b3fc0b277894d2f3f56d6eff52ea009e5b2d59aebc34163a1067662d729
-DIST rocksndiamonds-4.1.0.0.tar.gz 3850621 BLAKE2B 9c85aced223b855eec0300634d2fb30513d8b2d1856d8e134594f7de1669cf64f487a87335e28f7b8abb0c13492573ac5bd3261cfc5274287e75d0ace258ab93 SHA512 4949c2e9a601c8e005b006b13b82e36f7f001321051d392bc34aa4c234c6cddfa9fae16e58d83070072cac1429e13f1fb96d2c4b2ecd35a309065ca3c1c869c2
-EBUILD rocksndiamonds-4.1.0.0.ebuild 2488 BLAKE2B 86402f119e6ba7782ec8dc2387579cdafb4ad8bbf32cf63798e4f052a2c31cba940d56a3db14e911e0ea09e0d4b7cbc6b954d309bbd994e68d869096c59d1ca4 SHA512 1986c566cebafaa1d84f97457bd908f93ff6c215410297d330fbe89168b047049f223edc5376d50cd4f56809728492033eefa35485360218913c881e377697fd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-CVE-2011-4606.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-CVE-2011-4606.patch
deleted file mode 100644
index 1aaa9e43dcc3..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-CVE-2011-4606.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up rocksndiamonds-4.0.0.1/src/libgame/setup.c.CVE-2011-4606 rocksndiamonds-4.0.0.1/src/libgame/setup.c
---- rocksndiamonds-4.0.0.1/src/libgame/setup.c.CVE-2011-4606	2017-01-12 07:53:09.497075662 -0500
-+++ rocksndiamonds-4.0.0.1/src/libgame/setup.c	2017-01-12 07:58:19.319076661 -0500
-@@ -1311,11 +1311,13 @@ void sortTreeInfo(TreeInfo **node_first)
- #define MODE_W_ALL		(S_IWUSR | S_IWGRP | S_IWOTH)
- #define MODE_X_ALL		(S_IXUSR | S_IXGRP | S_IXOTH)
- 
-+#define MODE_R_PRIVATE		(S_IRUSR)
- #define MODE_W_PRIVATE		(S_IWUSR)
-+#define MODE_X_PRIVATE		(S_IXUSR)
- #define MODE_W_PUBLIC_FILE	(S_IWUSR | S_IWGRP)
- #define MODE_W_PUBLIC_DIR	(S_IWUSR | S_IWGRP | S_ISGID)
- 
--#define DIR_PERMS_PRIVATE	(MODE_R_ALL | MODE_X_ALL | MODE_W_PRIVATE)
-+#define DIR_PERMS_PRIVATE	(MODE_R_PRIVATE | MODE_X_PRIVATE | MODE_W_PRIVATE)
- #define DIR_PERMS_PUBLIC	(MODE_R_ALL | MODE_X_ALL | MODE_W_PUBLIC_DIR)
- #define DIR_PERMS_PUBLIC_ALL	(MODE_R_ALL | MODE_X_ALL | MODE_W_ALL)
- 
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
deleted file mode 100644
index 70c95bd076dc..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-YN.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up rocksndiamonds-4.0.0.1/src/tools.c.yesno rocksndiamonds-4.0.0.1/src/tools.c
---- rocksndiamonds-4.0.0.1/src/tools.c.yesno	2017-01-12 07:47:09.921343574 -0500
-+++ rocksndiamonds-4.0.0.1/src/tools.c	2017-01-12 07:51:45.059649653 -0500
-@@ -3901,6 +3901,18 @@ static int RequestHandleEvents(unsigned
- 		result = 0;
- 		break;
- 
-+              case KSYM_y:
-+              case KSYM_Y:
-+                if (req_state & REQ_ASK)
-+                  result = TRUE;
-+                break;
-+
-+              case KSYM_n:
-+              case KSYM_N:
-+                if (req_state & REQ_ASK)
-+                  result = FALSE;
-+                break;
-+
- 	      default:
- 		HandleKeysDebug(key);
- 		break;
diff --git a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch b/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
deleted file mode 100644
index f913be382e94..000000000000
--- a/games-arcade/rocksndiamonds/files/rocksndiamonds-4.1.0.0-music-info-url.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up rocksndiamonds-4.1.0.0/src/files.c.url rocksndiamonds-4.1.0.0/src/files.c
---- rocksndiamonds-4.1.0.0/src/files.c.url	2018-04-10 15:44:08.000000000 -0400
-+++ rocksndiamonds-4.1.0.0/src/files.c	2018-04-17 16:30:19.726734512 -0400
-@@ -10127,11 +10127,13 @@ static struct MusicFileInfo *get_music_f
-     { "artist_header",	&tmp_music_file_info.artist_header	},
-     { "album_header",	&tmp_music_file_info.album_header	},
-     { "year_header",	&tmp_music_file_info.year_header	},
-+    { "url_header",	&tmp_music_file_info.url_header		},
- 
-     { "title",		&tmp_music_file_info.title		},
-     { "artist",		&tmp_music_file_info.artist		},
-     { "album",		&tmp_music_file_info.album		},
-     { "year",		&tmp_music_file_info.year		},
-+    { "url",		&tmp_music_file_info.url		},
- 
-     { NULL,		NULL					},
-   };
-@@ -10247,11 +10249,13 @@ void LoadMusicInfo()
-     checked_free(music_file_info->artist_header);
-     checked_free(music_file_info->album_header);
-     checked_free(music_file_info->year_header);
-+    checked_free(music_file_info->url_header);
- 
-     checked_free(music_file_info->title);
-     checked_free(music_file_info->artist);
-     checked_free(music_file_info->album);
-     checked_free(music_file_info->year);
-+    checked_free(music_file_info->url);
- 
-     free(music_file_info);
- 
-diff -up rocksndiamonds-4.1.0.0/src/main.h.url rocksndiamonds-4.1.0.0/src/main.h
---- rocksndiamonds-4.1.0.0/src/main.h.url	2018-04-10 15:44:08.000000000 -0400
-+++ rocksndiamonds-4.1.0.0/src/main.h	2018-04-17 16:30:19.727734490 -0400
-@@ -3463,11 +3463,13 @@ struct MusicFileInfo
-   char *artist_header;
-   char *album_header;
-   char *year_header;
-+  char *url_header;
- 
-   char *title;
-   char *artist;
-   char *album;
-   char *year;
-+  char *url;
- 
-   int music;
- 
-diff -up rocksndiamonds-4.1.0.0/src/screens.c.url rocksndiamonds-4.1.0.0/src/screens.c
---- rocksndiamonds-4.1.0.0/src/screens.c.url	2018-04-17 16:30:19.728734467 -0400
-+++ rocksndiamonds-4.1.0.0/src/screens.c	2018-04-17 16:34:00.653803869 -0400
-@@ -3060,6 +3060,19 @@ void HandleInfoScreen_Music(int button)
-       ystart += ystep_head;
-     }
- 
-+    if (!strEqual(list->url, UNKNOWN_NAME))
-+    {
-+      if (!strEqual(list->url_header, UNKNOWN_NAME))
-+        DrawTextSCentered(ystart, font_head, list->url_header);
-+      else
-+        DrawTextSCentered(ystart, font_head, "from the website");
-+
-+      ystart += ystep_head;
-+
-+      DrawTextFCentered(ystart, font_text, "%s", list->url);
-+      ystart += ystep_head;
-+    }
-+
-     DrawTextSCentered(ybottom, FONT_TEXT_4,
- 		      "Press any key or button for next page");
- 
diff --git a/games-arcade/rocksndiamonds/metadata.xml b/games-arcade/rocksndiamonds/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/rocksndiamonds/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.0.0.ebuild b/games-arcade/rocksndiamonds/rocksndiamonds-4.1.0.0.ebuild
deleted file mode 100644
index f6f2cdcddcf4..000000000000
--- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.0.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="A Boulderdash clone"
-HOMEPAGE="http://www.artsoft.org/rocksndiamonds/"
-SRC_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/${P}.tar.gz
-	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Contributions-1.2.0.zip
-	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/BD2K3-1.0.0.zip
-	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Boulder_Dash_Dream-1.0.0.zip
-	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/rnd-contrib-1.0.0.tar.gz
-	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Snake_Bite-1.0.0.zip
-	http://www.artsoft.org/RELEASES/rocksndiamonds/levels/Sokoban-1.0.0.zip
-	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-emc-1.0.tar.gz
-	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-sp-1.0.tar.gz
-	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/levels/rockslevels-dx-1.0.tar.gz
-	mirror://gentoo/rnd_jue-v8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl2[joystick,video]
-	media-libs/sdl2-mixer[mod,mp3,timidity]
-	media-libs/sdl2-net
-	media-libs/sdl2-image[gif]
-	media-libs/smpeg
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-PATCHES=(
-	# From Fedora:
-	"${FILESDIR}"/${PN}-4.1.0.0-YN.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-music-info-url.patch
-	"${FILESDIR}"/${PN}-4.1.0.0-CVE-2011-4606.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"
-	unpack \
-		rockslevels-emc-1.0.tar.gz \
-		rockslevels-sp-1.0.tar.gz \
-		rockslevels-dx-1.0.tar.gz
-	cd levels
-	unpack \
-		rnd_jue-v8.tar.bz2 \
-		BD2K3-1.0.0.zip \
-		rnd-contrib-1.0.0.tar.gz \
-		Snake_Bite-1.0.0.zip \
-		Contributions-1.2.0.zip \
-		Boulder_Dash_Dream-1.0.0.zip \
-		Sokoban-1.0.0.zip
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:\$(MAKE_CMD):$(MAKE) -C $(SRC_DIR):' \
-		-e '/^MAKE/d' \
-		-e '/^CC/d' \
-		Makefile || die
-
-	sed -i \
-		-e '/^LDFLAGS/s/=/+=/' \
-		src/Makefile || die
-}
-
-src_compile() {
-	replace-cpu-flags k6 k6-1 k6-2 i586
-
-	local makeopts="RO_GAME_DIR=/usr/share/${PN} RW_GAME_DIR=/usr/share/${PN}"
-	emake -j1 clean
-	emake ${makeopts} OPTIONS="${CFLAGS}" sdl2
-}
-
-src_install() {
-	dobin rocksndiamonds
-	insinto "/usr/share/${PN}"
-	doins -r docs graphics levels music sounds
-
-	einstalldocs
-	newicon graphics/gfx_classic/RocksIcon32x32.png ${PN}.png
-	make_desktop_entry rocksndiamonds "Rocks 'N' Diamonds" /usr/share/pixmaps/${PN}.png
-}
diff --git a/games-arcade/sable-1.0-r1 b/games-arcade/sable-1.0-r1
new file mode 100644
index 000000000000..e2e6635cad07
--- /dev/null
+++ b/games-arcade/sable-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer
+DESCRIPTION=A frantic 3D space shooter
+EAPI=6
+HOMEPAGE=http://jeuxlibres.net/showgame/sable.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://gentoo/sable-1.0-src.tgz mirror://gentoo/sable.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=d2f1b08ba5c8870ebd67a8afa84537b1
diff --git a/games-arcade/sable/Manifest b/games-arcade/sable/Manifest
deleted file mode 100644
index 45b8cfe9d640..000000000000
--- a/games-arcade/sable/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX sable-1.0-gentoo.patch 1424 BLAKE2B 7774ac368893959acf2eeb9f3218df9b4f0a7597f7225ca4bd93e337fa55765dcddac6d754c9c1602345b42ac0eaaa7356a5f6e159b8979bf343912e3b5d7ea3 SHA512 d601bb708f982cc22c32b7006a6abeba866dcad577abe26662d7aa23c1c80360f8dad1424bec2b46e6e00619e3f01ffda0e9af77dd96432f8d0f3f2d26b27a35
-DIST sable-1.0-src.tgz 247200 BLAKE2B 5a6d0f4cc36d1f3b6f0ab5d4b6bb6e222cd95faaa722eab0c9aa4946d62857339d9a66020f505785850ff7435703e3b997365f490b0ef0222d213cc1a7d3bfb2 SHA512 ec8a8b76695b7767f04405c3bdb24f6f506116a775124e771c0c58a64f0412afd26aa88b1153945ceb36705a63b1fe905569b0b050dcf4a25880834cca158bb9
-DIST sable.png 1669 BLAKE2B 487ee36ebb2fe777f6c8ac06a0075c1fb5fe581a73cc7457700384a28beb725bd8d1ac8ab6f35a49cc2fab86afc7dda0207e5ba4ca7f436566d6296af182cf41 SHA512 08aa0ac33cefcab317df7876838141c21f3fca79995922e6f773f2b4a3f7c460d1e594b4ca742666ddefe9102a64e20f2f3839cc166b94207e0e512d42ee78dd
-EBUILD sable-1.0-r1.ebuild 778 BLAKE2B 6d6f0a2ad80f241ca08f0d5ef301066b50bd2fa44e5e03174f9c14c4b3fa6c5b12ade49b67999f06be7f530c734273e469f246152fd5fd64d628fd6f4c5006ab SHA512 7a566f9c10b306baf43ea39332d228af6d446683e48ec81421fbaeb527d708d4ad9c98784749af7beb96c41ff2facc06f5d90add85cfbce5bece1a2f2d5d1de2
-MISC metadata.xml 761 BLAKE2B 86627886615bed5d2d5cb8593327f675d64c3ca52273a49bcabb427de132e543fd7e70339ae6605617bc7bc3bac954261ec3ec3c1c83bdaf5c648f591bcbc552 SHA512 ccebc168e2f7c941ec65238b69f28743e40c75e0c4e9a588d404a74119704448f5b692ddfbd329e8a5a8efd151d6b10de88a5000bda78459d97902852716f7eb
diff --git a/games-arcade/sable/files/sable-1.0-gentoo.patch b/games-arcade/sable/files/sable-1.0-gentoo.patch
deleted file mode 100644
index b809936ff964..000000000000
--- a/games-arcade/sable/files/sable-1.0-gentoo.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ru sable.orig/src/Makefile sable/src/Makefile
---- sable.orig/src/Makefile	2006-03-14 00:57:31.000000000 -0500
-+++ sable/src/Makefile	2009-01-21 15:15:02.000000000 -0500
-@@ -1,30 +1,10 @@
--# are we on OSX?
--ifeq ($(shell uname), Darwin)
--OSX:=1
--endif
--
--# C options
--CC = gcc
--NOOSXFLAGS = -c `sdl-config --cflags` -O2 -Wall -DSABLE_RESOURCEDIR=\"$(INSTALL_RESDIR)/sable/\" -Iinclude $(CFLAGS)
--ifdef OSX
--FLAGS = $(NOOSXFLAGS) -D_SABLE_OSX_
--else
--FLAGS = $(NOOSXFLAGS)
--endif
--
--# C++ options.
--CXX = g++
--CXXFLAGS = $(FLAGS)
-+NOOSXFLAGS = -c `sdl-config --cflags` -DSABLE_RESOURCEDIR=\"$(INSTALL_RESDIR)/sable/\" -Iinclude
-+
-+CFLAGS += $(NOOSXFLAGS)
-+CXXFLAGS += $(NOOSXFLAGS)
- 
- # Linker options.
--LD = g++
--LDFLAGS = 
--NOOSXLIBS =  -lSDL_image -lSDL_mixer
--ifdef OSX
--LIBS = `sdl-config --static-libs` $(NOOSXLIBS)
--else
--LIBS = `sdl-config --libs` $(NOOSXLIBS) -lGL -lGLU
--endif
-+LIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU
- 
- COBJS = vcontrol/vcontrol.o \
- 	bcplrandom.o \
-@@ -35,7 +15,7 @@
- OBJS = $(COBJS) $(CXXOBJS)
- 
- sable: $(OBJS)
--	$(LD) $(LDFLAGS) -o sable $(OBJS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o sable $(OBJS) $(LIBS)
- 
- clean:
- 	rm -f sable *.o vcontrol/*.o svaf/*.o
-@@ -44,7 +24,7 @@
- 	find . -name \*.c\* | xargs makedepend -Y. -Iinclude >& /dev/null
- 
- $(COBJS): %.o: %.c
--	$(CC) $(FLAGS) -o $@ $<
-+	$(CC) $(CFLAGS) -o $@ $<
- 
- $(CXXOBJS): %.o: %.cpp
- 	$(CXX) $(CXXFLAGS) -o $@ $<
diff --git a/games-arcade/sable/metadata.xml b/games-arcade/sable/metadata.xml
deleted file mode 100644
index 2c66a7711fa8..000000000000
--- a/games-arcade/sable/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Sable is a frantic 3d space shooter inspired by games such as After Burner and
-Space Harrier. You pilot a ship through an obstacle-laden landscape and attack
-or evade swarms of enemies.
-
-The game itself is quite easy to play. The arrow keys move your ship, and the
-space bar fires your cannons. Holding down the space bar produces a rapid-fire
-effect. Avoid enemy craft, enemy shots, and the pylons. Pylons are destroyable
-but require concentrated fire to destroy.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/sable/sable-1.0-r1.ebuild b/games-arcade/sable/sable-1.0-r1.ebuild
deleted file mode 100644
index 9ff9a086c60e..000000000000
--- a/games-arcade/sable/sable-1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A frantic 3D space shooter"
-HOMEPAGE="http://jeuxlibres.net/showgame/sable.html"
-SRC_URI="mirror://gentoo/${P}-src.tgz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl[joystick,opengl,sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	emake INSTALL_RESDIR="/usr/share"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r models sfx textures
-	einstalldocs
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} Sable
-}
diff --git a/games-arcade/savagewheels-1.6.1-r1 b/games-arcade/savagewheels-1.6.1-r1
new file mode 100644
index 000000000000..e2c197866650
--- /dev/null
+++ b/games-arcade/savagewheels-1.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/libsdl sound? ( !fmod? ( media-libs/sdl-mixer[mod,modplug] ) fmod? ( >=media-libs/fmod-4.38.00 ) ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=2D car crashing game similar to the old classic Destruction Derby.
+EAPI=6
+HOMEPAGE=https://github.com/petarov/savagewheels
+IUSE=fmod sound
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=media-libs/libsdl sound? ( !fmod? ( media-libs/sdl-mixer[mod,modplug] ) fmod? ( >=media-libs/fmod-4.38.00 ) )
+REQUIRED_USE=fmod? ( sound )
+SLOT=0
+SRC_URI=https://github.com/petarov/savagewheels/archive/1.6.1.tar.gz -> savagewheels-1.6.1.tar.gz https://github.com/petarov/savagewheels/releases/download/v1.4/savagewheels-gamedata.tar.gz -> savagewheels-gamedata-1.4.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=04b7ac94a2f855415fb11e8575df25d5
diff --git a/games-arcade/savagewheels/Manifest b/games-arcade/savagewheels/Manifest
deleted file mode 100644
index 3ebd9eefc35c..000000000000
--- a/games-arcade/savagewheels/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX savagewheels.in 1488 BLAKE2B 5676996a1785b8653eaed1d2a606ac0a56fd55361e280517564d93c0aba1984bfbc603232a1225504c99a73bcb422659bf75121af8b7e2421a9b339550344024 SHA512 b13ff4b2739e3f5cb797c9364687c9077852863f9a3a1176fc03e3f9f030293366b177b1a494a8b12ee69ba6ee7aac8589475a5b2246135038ad3138990f2088
-DIST savagewheels-1.6.1.tar.gz 596480 BLAKE2B a1e236418e3e2af1634360c0a6c3e5debf0b429960f4dde0c3ed31a0450c9de73b0b67a833d66523004115ddd61dc32e156fcd64bd783c5cca8c3281e1684639 SHA512 0e535f5f86b1656fa20a2de3dbc9c107f9daacfd37308ca4e2e15df43b177161767a2834c0ed1b9cb93eed0b642092e4f840abf451d2de5082d3c4c721bedc0e
-DIST savagewheels-gamedata-1.4.0.tar.gz 13183072 BLAKE2B 1fdd20cd3bdd5589d17d131d13d1dbe56889f05972c162583a4b9b7cdb3eadea32b7d7a1130f2eb239ec87e1cb3dc6f02d6d15504463b399e12271348106702f SHA512 102214e18edb911b168e41999d239e3070255720f250e8ea640d365b3f7fc4c772cbf322f4558ba6c05fd56d904613c758918e25712e89eb2aca3e948c26fc65
-EBUILD savagewheels-1.6.1-r1.ebuild 1400 BLAKE2B ee2ddd5e6974a2b2389acaa5e1dcc104ba36062f44d085de51ac780909cca2217c558d7fc78f374237c667043c2a25fee2bc32366dfdd73b1335128913a3ca04 SHA512 2d7fbac6c6db683dee92c09087cabfd1603128095c55b985d47773b259c40317eb79bdbe9060a130e6379c007c327987e8b45dfdff0baefaeae3b7fa747e0e7e
-MISC metadata.xml 342 BLAKE2B 6f4cbacd74ec408ccba1de7cfbe4eb899ffaa4c30bb3ecc2a1500398c29f15795bde02fe21043ee3e671eeb50503931b23ac7ee95dbdf13770d0a365bfbada97 SHA512 5f3c0b7396ba31bef6d4dd9b936a2554b12aecf87cf95968c9b976709de808999598e3caa2be38c96d8a37be80850f95c67d0e71c0387a1b2bfe4982e3345d07
diff --git a/games-arcade/savagewheels/files/savagewheels.in b/games-arcade/savagewheels/files/savagewheels.in
deleted file mode 100644
index c1b4c689f71c..000000000000
--- a/games-arcade/savagewheels/files/savagewheels.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-export SAVAGEWHEELS_SYS_DATADIR="${SAVAGEWHEELS_SYS_DATADIR-@CMAKE_INSTALL_DATADIR@}"
-export SAVAGEWHEELS_LIBEXECDIR="${SAVAGEWHEELS_LIBEXECDIR-@CMAKE_INSTALL_LIBEXECDIR@}"
-export SAVAGEWHEELS_USR_CONFDIR="${SAVAGEWHEELS_USR_CONFDIR-${HOME}/.config/savagewheels}"
-export SAVAGEWHEELS_USR_DATADIR="${SAVAGEWHEELS_USR_DATADIR-${HOME}/.local/share/savagewheels}"
-
-if [ ! -d ${SAVAGEWHEELS_USR_CONFDIR} ]; then
-    if [ -e ${SAVAGEWHEELS_USR_CONFDIR} ]; then
-        printf "${SAVAGEWHEELS_USR_CONFDIR} exists but is not a directory.\n" >&2
-        printf "  Please remove.\n" >&2
-        exit 1
-    fi
-    mkdir -p ${SAVAGEWHEELS_USR_CONFDIR}
-    if [ $? -ne 0 ]; then
-        printf "Failed to create ${SAVAGEWHEELS_USR_CONFDIR}\n" >&2
-        exit 1
-    fi
-fi
-
-if [ ! -d ${SAVAGEWHEELS_USR_DATADIR} ]; then
-    if [ -e ${SAVAGEWHEELS_USR_DATADIR} ]; then
-        printf "${SAVAGEWHEELS_USR_DATADIR} exists but is not a directory.\n" >&2
-        printf "  Please remove.\n" >&2
-        exit 1
-    fi
-    mkdir -p ${SAVAGEWHEELS_USR_DATADIR}
-    if [ $? -ne 0 ]; then
-        printf "Failed to create ${SAVAGEWHEELS_USR_DATADIR}\n" >&2
-        exit 1
-    fi
-fi
-
-if [ ! -e ${SAVAGEWHEELS_USR_CONFDIR}/bindings.xml ]; then
-    cp ${SAVAGEWHEELS_SYS_DATADIR}/bindings.xml ${SAVAGEWHEELS_USR_CONFDIR}
-    if [ $? -ne 0 ]; then
-        printf "Failed to create ${SAVAGEWHEELS_USR_CONFDIR}/bindings.xml\n" >&2
-        exit 1
-    fi
-fi
-
-exec ${SAVAGEWHEELS_LIBEXECDIR}/savagewheels "$@"
diff --git a/games-arcade/savagewheels/metadata.xml b/games-arcade/savagewheels/metadata.xml
deleted file mode 100644
index 00392a14830e..000000000000
--- a/games-arcade/savagewheels/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="fmod">Enable the fmod music and sound effects library</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">petarov/savagewheels</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild
deleted file mode 100644
index 7d06e4db88b4..000000000000
--- a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="2D car crashing game similar to the old classic Destruction Derby."
-HOMEPAGE="https://github.com/petarov/savagewheels"
-
-GAMEDATA="${PN}-gamedata-1.4.0"
-
-SRC_URI="
-	https://github.com/petarov/savagewheels/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/petarov/savagewheels/releases/download/v1.4/${PN}-gamedata.tar.gz -> ${GAMEDATA}.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="fmod sound"
-
-RDEPEND="
-	media-libs/libsdl
-	sound? (
-		!fmod? ( media-libs/sdl-mixer[mod,modplug] )
-		fmod? ( >=media-libs/fmod-4.38.00 )
-	)"
-
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="fmod? ( sound )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cp "${FILESDIR}/${PN}.in" "${S}" || die
-	mkdir "${WORKDIR}/${GAMEDATA}" ||
-		die "Failed to make directory: ${WORKDIR}/${GAMEDATA}"
-	cd "${WORKDIR}/${GAMEDATA}" ||
-		die "Unable to change into directory: ${WORKDIR}/${GAMEDATA}"
-	unpack "${GAMEDATA}.tar.gz"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DATADIR=share/${PN}
-		-DCMAKE_INSTALL_LIBEXECDIR=libexec/${PN}
-		$(usex sound $(usex fmod '-DSOUND=FMOD -DFMOD_PATH=/opt/fmodex/api' '-DSOUND=YES') '-DSOUND=NO')
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/${GAMEDATA}/."
-}
diff --git a/games-arcade/sdb-1.0.2-r1 b/games-arcade/sdb-1.0.2-r1
new file mode 100644
index 000000000000..cf6e41c03c3f
--- /dev/null
+++ b/games-arcade/sdb-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/opengl media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer
+DESCRIPTION=A 2D top-down action game; escape a facility full of walking death machines
+EAPI=6
+HOMEPAGE=http://sdb.gamecreation.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://gcsociety.sp.cs.cmu.edu/~frenzy/sdb-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e32355ad287f5341d66f0fb43b4fda1f
diff --git a/games-arcade/sdb/Manifest b/games-arcade/sdb/Manifest
deleted file mode 100644
index 6e545909480f..000000000000
--- a/games-arcade/sdb/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX sdb-1.0.2-endian.patch 9118 BLAKE2B de2bbe81f5d1fcf571a5b8eedf97892ff6eaccaa7a0acb74427740f27fdfb8f517cc38c1ccdaee59480fb1e224f8c7a768355af50bfd1cb66fea338eea2133a0 SHA512 65b623d93e2369353cc2c900e38b8dfb56e6896cf34447305870c3c01a97770371ecff6c9586f7b758c64b1de4f85da3e0c79264587be325e226488545ea0754
-AUX sdb-1.0.2-gcc43.patch 173 BLAKE2B a00d2ea25dc4f90ddf02bac62c099c9b47089f16c123384e00495050a26bb30f06131892f496f93349a55574810e8c0e4406ea6ca6eda703d890e3c141115392 SHA512 663b0edd244f6fd50166f053f1631f9a2fe239f97ee16bf77a7b79d5afcf3503c5f2a55370b79b5413e91be6dca23d580cc1afc9875385a8ed04981e7dfc2552
-AUX sdb-1.0.2-ldflags.patch 322 BLAKE2B edfffa4f3821726f15729d93e6e52eec5c70ef87e716fa61a081e156d7ef55197dd064af6ad68397a0df0d5509a9d271f10c3c125dc63282e30916860c6e8d0e SHA512 45795b614ec967237a1d5a24075f7238e041a21b18a3e7a4f5608e4d5fc33734b05f80993aa54a044783a8a8b099e065db278ca5dfbda23704d848133b14dc2a
-DIST sdb-1.0.2.tar.gz 10342311 BLAKE2B faedcd26a55df724514b4222f617146e4590861166c49e45768982aa4ea2bb427cca5ae1c3a622eac4ba5d2b1b65fe948792902703cdf2be9e09b8171968c5b3 SHA512 670d43717224d564bfecac44a3570167e19b7b4c50a21afab6903b0b0f2f6092a5551fd2cc63b659d2c2eadff5156c97876b96db3a10beabbbadc689b1d46efc
-EBUILD sdb-1.0.2-r1.ebuild 1154 BLAKE2B 003f66329d1918d69c1726981fb22af69724066453be51dfdede9cb686d4d10b53a882accef74f8358b7ad4a8beae328fdf5ae488f46c096437a62fc6a517df4 SHA512 b1b13ddc7606536b4325d77f6960ff30d9a7dff7a788a0c1e2b11d65b0f61ea5c1362ce451ab12d351db2c254daeed1c8e77753e0ed89b83cb4077ab5510c949
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/sdb/files/sdb-1.0.2-endian.patch b/games-arcade/sdb/files/sdb-1.0.2-endian.patch
deleted file mode 100644
index e7b33970274f..000000000000
--- a/games-arcade/sdb/files/sdb-1.0.2-endian.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-diff -Naur sdb-1.0.2.orig/src/byteswap.h sdb-1.0.2/src/byteswap.h
---- sdb-1.0.2.orig/src/byteswap.h	1970-01-01 01:00:00.000000000 +0100
-+++ sdb-1.0.2/src/byteswap.h	2005-06-11 14:02:33.401905848 +0200
-@@ -0,0 +1,187 @@
-+/*	$OpenBSD: endian.h,v 1.14 2004/01/11 19:17:31 brad Exp $	*/
-+
-+/*-
-+ * Copyright (c) 1997 Niklas Hallqvist.  All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ * 1. Redistributions of source code must retain the above copyright
-+ *    notice, this list of conditions and the following disclaimer.
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ *    notice, this list of conditions and the following disclaimer in the
-+ *    documentation and/or other materials provided with the distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+/*
-+ * Generic definitions for little- and big-endian systems.  Other endianesses
-+ * has to be dealt with in the specific machine/endian.h file for that port.
-+ *
-+ * This file is meant to be included from a little- or big-endian port's
-+ * machine/endian.h after setting BYTE_ORDER to either 1234 for little endian
-+ * or 4321 for big..
-+ */
-+
-+#ifndef _BYTESWAP_H_
-+#define _BYTESWAP_H_
-+
-+#undef LITTLE_ENDIAN
-+#define LITTLE_ENDIAN	1234
-+#undef BIG_ENDIAN
-+#define BIG_ENDIAN	4321
-+#undef PDP_ENDIAN
-+#define PDP_ENDIAN	3412
-+
-+#ifdef __GNUC__
-+
-+#define __swap16gen(x) __extension__({					\
-+	unsigned short __swap16gen_x = (x);					\
-+									\
-+	(unsigned short)((__swap16gen_x & 0xff) << 8 |			\
-+	    (__swap16gen_x & 0xff00) >> 8);				\
-+})
-+
-+#define __swap32gen(x) __extension__({					\
-+	unsigned int __swap32gen_x = (x);					\
-+									\
-+	(unsigned int)((__swap32gen_x & 0xff) << 24 |			\
-+	    (__swap32gen_x & 0xff00) << 8 |				\
-+	    (__swap32gen_x & 0xff0000) >> 8 |				\
-+	    (__swap32gen_x & 0xff000000) >> 24);			\
-+})
-+
-+#else /* __GNUC__ */
-+
-+/* Note that these macros evaluate their arguments several times.  */
-+#define __swap16gen(x)							\
-+    (unsigned short)(((unsigned short)(x) & 0xff) << 8 | ((unsigned short)(x) & 0xff00) >> 8)
-+
-+#define __swap32gen(x)							\
-+    (unsigned int)(((unsigned int)(x) & 0xff) << 24 |				\
-+    ((unsigned int)(x) & 0xff00) << 8 | ((unsigned int)(x) & 0xff0000) >> 8 |	\
-+    ((unsigned int)(x) & 0xff000000) >> 24)
-+
-+#endif /* __GNUC__ */
-+
-+/*
-+ * Define MD_SWAP if you provide swap{16,32}md functions/macros that are
-+ * optimized for your architecture,  These will be used for swap{16,32}
-+ * unless the argument is a constant and we are using GCC, where we can
-+ * take advantage of the CSE phase much better by using the generic version.
-+ */
-+#ifdef MD_SWAP
-+#if __GNUC__
-+
-+#define swap16(x) __extension__({					\
-+	unsigned short __swap16_x = (x);					\
-+									\
-+	__builtin_constant_p(x) ? __swap16gen(__swap16_x) :		\
-+	    __swap16md(__swap16_x);					\
-+})
-+
-+#define swap32(x) __extension__({					\
-+	unsigned int __swap32_x = (x);					\
-+									\
-+	__builtin_constant_p(x) ? __swap32gen(__swap32_x) :		\
-+	    __swap32md(__swap32_x);					\
-+})
-+
-+#endif /* __GNUC__  */
-+
-+#else /* MD_SWAP */
-+#define swap16 __swap16gen
-+#define swap32 __swap32gen
-+#endif /* MD_SWAP */
-+
-+#define swap16_multi(v, n) do {						\
-+	size_t __swap16_multi_n = (n);					\
-+	unsigned short *__swap16_multi_v = (v);				\
-+									\
-+	while (__swap16_multi_n) {					\
-+		*__swap16_multi_v = swap16(*__swap16_multi_v);		\
-+		__swap16_multi_v++;					\
-+		__swap16_multi_n--;					\
-+	}								\
-+} while (0)
-+
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+
-+#define letohf(x) (x)
-+
-+/* Can be overridden by machine/endian.h before inclusion of this file.  */
-+#ifndef _QUAD_HIGHWORD
-+#define _QUAD_HIGHWORD 1
-+#endif
-+#ifndef _QUAD_LOWWORD
-+#define _QUAD_LOWWORD 0
-+#endif
-+
-+#define htobe16 swap16
-+#define htobe32 swap32
-+#define betoh16 swap16
-+#define betoh32 swap32
-+
-+#define htole16(x) (x)
-+#define htole32(x) (x)
-+#define letoh16(x) (x)
-+#define letoh32(x) (x)
-+
-+#endif /* BYTE_ORDER */
-+
-+#if BYTE_ORDER == BIG_ENDIAN
-+
-+inline float letohf(float in) {
-+	float retVal;
-+	char* p = (char*)&retVal;
-+	char* i = (char*)&in;
-+	p[0] = i[3];
-+	p[1] = i[2];
-+	p[2] = i[1];
-+	p[3] = i[0];
-+
-+	return retVal;
-+}
-+
-+/* Can be overridden by machine/endian.h before inclusion of this file.  */
-+#ifndef _QUAD_HIGHWORD
-+#define _QUAD_HIGHWORD 0
-+#endif
-+#ifndef _QUAD_LOWWORD
-+#define _QUAD_LOWWORD 1
-+#endif
-+
-+#define htole16 swap16
-+#define htole32 swap32
-+#define letoh16 swap16
-+#define letoh32 swap32
-+
-+#define htobe16(x) (x)
-+#define htobe32(x) (x)
-+#define betoh16(x) (x)
-+#define betoh32(x) (x)
-+
-+#endif /* BYTE_ORDER */
-+
-+#define htons htobe16
-+#define htonl htobe32
-+#define ntohs betoh16
-+#define ntohl betoh32
-+
-+#define	NTOHL(x) (x) = ntohl((unsigned int)(x))
-+#define	NTOHS(x) (x) = ntohs((unsigned short)(x))
-+#define	HTONL(x) (x) = htonl((unsigned int)(x))
-+#define	HTONS(x) (x) = htons((unsigned short)(x))
-+
-+#endif /* _SYS_ENDIAN_H_ */
-+
-diff -Naur sdb-1.0.2.orig/src/md2.cpp sdb-1.0.2/src/md2.cpp
---- sdb-1.0.2.orig/src/md2.cpp	2005-06-11 13:54:13.616884720 +0200
-+++ sdb-1.0.2/src/md2.cpp	2005-06-11 14:28:34.726548424 +0200
-@@ -27,6 +27,7 @@
-  */
- 
- #include "sdb.h"
-+#include "byteswap.h"
- 
- void ModelObject::draw()
- {
-@@ -145,6 +146,23 @@
-     errorMessage(8, "FLAGRANT SYSTEM ERROR", "Unable to load model %s", strFileName);
- 
-   fread(&m_Header, 1, sizeof(tMd2Header), m_FilePointer);
-+  m_Header.magic            = letoh32(m_Header.magic);
-+  m_Header.version          = letoh32(m_Header.version);
-+  m_Header.skinWidth        = letoh32(m_Header.skinWidth);
-+  m_Header.skinHeight       = letoh32(m_Header.skinHeight);
-+  m_Header.frameSize        = letoh32(m_Header.frameSize);
-+  m_Header.numSkins         = letoh32(m_Header.numSkins);
-+  m_Header.numVertices      = letoh32(m_Header.numVertices);
-+  m_Header.numTexCoords     = letoh32(m_Header.numTexCoords);
-+  m_Header.numTriangles     = letoh32(m_Header.numTriangles);
-+  m_Header.numGlCommands    = letoh32(m_Header.numGlCommands);
-+  m_Header.numFrames        = letoh32(m_Header.numFrames);
-+  m_Header.offsetSkins      = letoh32(m_Header.offsetSkins);
-+  m_Header.offsetTexCoords  = letoh32(m_Header.offsetTexCoords);
-+  m_Header.offsetTriangles  = letoh32(m_Header.offsetTriangles);
-+  m_Header.offsetFrames     = letoh32(m_Header.offsetFrames);
-+  m_Header.offsetGlCommands = letoh32(m_Header.offsetGlCommands);
-+  m_Header.offsetEnd        = letoh32(m_Header.offsetEnd);
- 
-   if(m_Header.version != 8)
-     errorMessage(8, "FLAGRANT SYSTEM ERROR", "Invalid file format (version not 8) %s", strFileName);
-@@ -197,12 +215,22 @@
-   
-   // Read in all the texture coordinates in one fell swoop
-   fread(m_pTexCoords, sizeof(tMd2TexCoord), m_Header.numTexCoords, m_FilePointer);
-+  for (int i=0; i < m_Header.numTexCoords; ++i) {
-+    m_pTexCoords[i].u = letoh16(m_pTexCoords[i].u);
-+    m_pTexCoords[i].v = letoh16(m_pTexCoords[i].v);
-+  }
- 
-   // Move the file pointer to the triangles/face data offset
-   fseek(m_FilePointer, m_Header.offsetTriangles, SEEK_SET);
-   
-   // Read in the face data for each triangle (vertex and texCoord indices)
-   fread(m_pTriangles, sizeof(tMd2Face), m_Header.numTriangles, m_FilePointer);
-+  for (int i=0; i < m_Header.numTriangles; ++i) {
-+    for (int j=0; j < 3; ++j) {
-+      m_pTriangles[i].vertexIndices[j]  = letoh16(m_pTriangles[i].vertexIndices[j]);
-+      m_pTriangles[i].textureIndices[j] = letoh16(m_pTriangles[i].textureIndices[j]);
-+    }
-+  }
-       
-   // Move the file pointer to the vertices (frames)
-   fseek(m_FilePointer, m_Header.offsetFrames, SEEK_SET);
-@@ -213,6 +241,10 @@
- 
-     // Read in the first frame of animation
-     fread(pFrame, 1, m_Header.frameSize, m_FilePointer);
-+    for (int j=0; j < 3; ++j) {
-+      pFrame->scale[j]     = letohf(pFrame->scale[j]);
-+      pFrame->translate[j] = letohf(pFrame->translate[j]);
-+    }
- 
-     m_pFrames[i].pVertices = new tMd2Triangle [m_Header.numVertices];
-       
-diff -Naur sdb-1.0.2.orig/src/sdb.h sdb-1.0.2/src/sdb.h
---- sdb-1.0.2.orig/src/sdb.h	2005-06-11 13:54:13.610885632 +0200
-+++ sdb-1.0.2/src/sdb.h	2005-06-11 14:26:02.116748640 +0200
-@@ -57,11 +57,7 @@
- #include <sys/time.h>
- #endif
- 
--#if SDL_BYTEORDER == SDL_BIG_ENDIAN
--#define MD2_SUFFIX ".md2b"
--#else
- #define MD2_SUFFIX ".md2"
--#endif
- 
- using namespace std;
- 
diff --git a/games-arcade/sdb/files/sdb-1.0.2-gcc43.patch b/games-arcade/sdb/files/sdb-1.0.2-gcc43.patch
deleted file mode 100644
index 731ce7df3b52..000000000000
--- a/games-arcade/sdb/files/sdb-1.0.2-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/sdb.h
-+++ b/src/sdb.h
-@@ -35,6 +35,7 @@
- #include <vector>
- #include <fstream>
- #include <iostream>
-+#include <climits>
- 
- #ifndef __APPLE__
- #include <SDL/SDL.h>
diff --git a/games-arcade/sdb/files/sdb-1.0.2-ldflags.patch b/games-arcade/sdb/files/sdb-1.0.2-ldflags.patch
deleted file mode 100644
index 653fb814f4c0..000000000000
--- a/games-arcade/sdb/files/sdb-1.0.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.old	2010-09-21 10:30:41.000000000 +0200
-+++ b/src/Makefile	2010-09-21 10:30:58.000000000 +0200
-@@ -40,7 +40,7 @@
- 	rm -f $(OBJ) $(BIN)
- 
- $(BIN): $(OBJ)
--	$(CPP) $(LINKOBJ) -o $(BIN) $(LIBS)
-+	$(CPP) $(LDFLAGS) $(LINKOBJ) -o $(BIN) $(LIBS)
- 
- main.o: main.cpp
- 	$(CPP) -c main.cpp -o main.o $(CXXFLAGS)
diff --git a/games-arcade/sdb/metadata.xml b/games-arcade/sdb/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/sdb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/sdb/sdb-1.0.2-r1.ebuild b/games-arcade/sdb/sdb-1.0.2-r1.ebuild
deleted file mode 100644
index 155c5d3a4e9c..000000000000
--- a/games-arcade/sdb/sdb-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A 2D top-down action game; escape a facility full of walking death machines"
-HOMEPAGE="http://sdb.gamecreation.org/"
-SRC_URI="http://gcsociety.sp.cs.cmu.edu/~frenzy/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:models/:/usr/share/${PN}/models/:" \
-		-e "s:snd/:/usr/share/${PN}/snd/:" \
-		-e "s:sprites/:/usr/share/${PN}/sprites/:" \
-		-e "s:levels/:/usr/share/${PN}/levels/:" \
-		src/sdb.h src/game.cpp || die "setting game paths"
-	eapply \
-		"${FILESDIR}"/${P}-endian.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	emake \
-		-C src \
-		CXXFLAGS="${CXXFLAGS} $(sdl-config --cflags)"
-}
-
-src_install() {
-	dobin src/sdb
-	insinto /usr/share/${PN}
-	doins -r levels models snd sprites
-	newicon sprites/barrel.png ${PN}.png
-	make_desktop_entry sdb "Shotgun Debugger"
-	einstalldocs
-}
diff --git a/games-arcade/sdl-sopwith-1.7.5-r2 b/games-arcade/sdl-sopwith-1.7.5-r2
new file mode 100644
index 000000000000..f8a9882e42c8
--- /dev/null
+++ b/games-arcade/sdl-sopwith-1.7.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=media-libs/libsdl-1.1.3[video] >=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 the classic Sopwith game using LibSDL
+EAPI=6
+HOMEPAGE=http://sdl-sopwith.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.1.3[video]
+SLOT=0
+SRC_URI=mirror://sourceforge/sdl-sopwith/sopwith-1.7.5.tar.gz https://src.fedoraproject.org/rpms/sopwith/raw/master/f/sopwith.png
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2c0d72913c773cbdff60f22b0ebf760c
diff --git a/games-arcade/sdl-sopwith/Manifest b/games-arcade/sdl-sopwith/Manifest
deleted file mode 100644
index 4e5efd348f38..000000000000
--- a/games-arcade/sdl-sopwith/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX sdl-sopwith-1.7.5-nogtk.patch 984 BLAKE2B 7478a4ef1b23322f9a89209223dca44c7e663e1530d2ae74eac7f7b72e7435ed28dbe6cf866aa0555c23b98d396f1e1b2c303a578dfe963b1d417bfbefcd6dc8 SHA512 10340a42b1da8e633505f9273976ab781e22529090f55932402fd3ff58c493c32cb66ebd5196f65a832cb6d0d98b941010670b74e2af202f2f6352e4fb6e1f18
-AUX sdl-sopwith-1.7.5-video-fix.patch 674 BLAKE2B d89107969ab7e8c97f460e49bd40cae2b9ba52d3c67905d83bbcf5c155ea68bcf0be0661617cedb79795be5247d780f890e9d92f645be360aa1b1f06c09bf0c3 SHA512 024958855d22d038fc9b00d1daa311360211b2b1f3510f0c2dbe43104a2aee8907a764bb2b11b0d367b248bafc7a4a4afebdf6fe116430733ba8ffb7ba6917ef
-DIST sopwith-1.7.5.tar.gz 280883 BLAKE2B 57a2d6cf90d1bba1ac5dedbcebaa7b2f58004cee1ee7682d43be800184809e7949603490e93944d8aa1e4b9e6d33f24a9bdb386dadda945b9f9f3b9c4e8ed48c SHA512 ea78706d0190648be269142a29d10340c5181563959b0a329b802b9d9128a9dcb1e01760737269ec22883adf5b6c02c5049c8fc7b44e4eaa9f381b87abc7acae
-DIST sopwith.png 675 BLAKE2B a380311db8861a75d8cbb035616523d1a21a220be758bda931340f65d658af0e844b0247e478da746d654249cd7a28ab9b681fc82b9798f909b379f38242d03f SHA512 7bcfec11930a623ff9077203640b4415e222570d32ffecdb943f5c78ed8fb11db4fefa42298b895c4aa29b46f963a82cdb90492beaf89a04d119e6e756f5ec57
-EBUILD sdl-sopwith-1.7.5-r2.ebuild 1033 BLAKE2B ec5a77ad3b6d2fb76c14ddc64d11672e278282a1d314a53079c5b2a52487defbad1d305ef84d8dd8176414c50a7ea77faac0c9d124e3db7f9903fe47d9edb544 SHA512 239d6a09d3eb99b044e51fc5c7bed5d7d9ae27a5dc879a38a48490da67cb65f893ee981c18552ed4de723ee752568618ef27adf84a78f38b6e8e759194986574
-MISC metadata.xml 334 BLAKE2B 42211acca53017e9d0c385214962d41899d10fdc4af43e7c016bb729d1576569bbd9ebb00ee1c41655283ffe0d8ae411fb121b51ab15f3ad32285bb7b310698f SHA512 3f9e062ee8d945112f164669980a7c8a8bf5982c6f0f889d100319b7959564752502b6a7b6cc30665829f6865e0f0a81a083cbf462182f5918e9386e6aafca39
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
deleted file mode 100644
index a5dbc59f3c72..000000000000
--- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-nogtk.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/configure.in.old
-+++ b/configure.in
-@@ -61,11 +61,6 @@
- 	SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS sdl"
- ],)
- 
--PKG_CHECK_MODULES(GTK, glib-2.0 >= 2.0 gtk+-2.0 >= 2.0, [
--	SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith"
--	SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk"
--],)
--
- AC_SUBST(SOPWITH_BINS)
- AC_SUBST(SOPWITH_SUBDIRS)
- 
-@@ -71,7 +71,7 @@
- 
- dnl check for TCPIP support
- 
--AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE(TCPIP),,)
-+AC_CHECK_HEADER(netinet/ip.h, AC_DEFINE([TCPIP], [1], [TCP/IP support]),,)
- 
- dnl generate Makefiles
- 
---- a/src/Makefile.am.old
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- bin_PROGRAMS = @SOPWITH_BINS@
- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
- 
--CFLAGS = @CFLAGS@ -I..
-+AM_CFLAGS = @SDL_CFLAGS@ -I..
- 
- COMMON_SRC =       \
- video.h	    swcollsn.c  swgames.h   swmain.h    swutil.h 	\
---- a/src/sdl/Makefile.am.old
-+++ b/src/sdl/Makefile.am
-@@ -1,4 +1,4 @@
--CFLAGS=@CFLAGS@ @SDL_CFLAGS@ -I..
-+AM_CFLAGS = @SDL_CFLAGS@ -I..
- 
- noinst_LIBRARIES = libsdlsopwith.a
- 
diff --git a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch b/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
deleted file mode 100644
index e9da16c43905..000000000000
--- a/games-arcade/sdl-sopwith/files/sdl-sopwith-1.7.5-video-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream patch: fix segfault while video device detection.
-Discovered here - https://bugs.gentoo.org/show_bug.cgi?id=458504
-
---- a/src/sdl/video.c.orig	2013-02-21 11:48:57.000000000 -0400
-+++ b/src/sdl/video.c	2013-02-21 11:49:35.000000000 -0400
-@@ -364,11 +364,17 @@
- 	int n;
- 	int w, h;
- 	int flags = 0;
-+        int status;
- 
- 	printf("CGA Screen Emulation\n");
- 	printf("init screen: ");
- 
--	SDL_Init(SDL_INIT_VIDEO);
-+	status = SDL_Init(SDL_INIT_VIDEO);
-+        if (status == -1)
-+        {
-+          fprintf(stderr, "Unable to locate video device. Exiting.\n");
-+          exit(1);
-+        }
-
- 	srand(time(NULL));
- 	set_icon(symbol_plane[rand() % 2][rand() % 16]);
diff --git a/games-arcade/sdl-sopwith/metadata.xml b/games-arcade/sdl-sopwith/metadata.xml
deleted file mode 100644
index a7ff32dedabd..000000000000
--- a/games-arcade/sdl-sopwith/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sdl-sopwith</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild b/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
deleted file mode 100644
index 72ea6fb30eba..000000000000
--- a/games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop toolchain-funcs
-
-MY_P="${P/sdl-/}"
-DESCRIPTION="Port of the classic Sopwith game using LibSDL"
-HOMEPAGE="http://sdl-sopwith.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	https://src.fedoraproject.org/rpms/sopwith/raw/master/f/sopwith.png
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.3[video]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm acconfig.h || die
-
-	eapply "${FILESDIR}"/${P}-nogtk.patch
-	# bug 458504
-	eapply "${FILESDIR}"/${P}-video-fix.patch
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog FAQ NEWS README TODO doc/*txt
-	rm -rf "${ED}/usr/share/doc/sopwith"
-
-	newicon "${DISTDIR}"/sopwith.png ${PN}.png
-	make_desktop_entry sopwith "Sopwith" ${PN}
-}
diff --git a/games-arcade/sdlroids-1.3.4-r4 b/games-arcade/sdlroids-1.3.4-r4
new file mode 100644
index 000000000000..f999a464e776
--- /dev/null
+++ b/games-arcade/sdlroids-1.3.4-r4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-mixer
+DESCRIPTION=Asteroids Clone for X using SDL
+EAPI=6
+HOMEPAGE=http://david.hedbor.org/projects/sdlroids/
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://sourceforge/sdlroids/sdlroids-1.3.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=ca3ec1c275b1c0ab44120b296d0e9def
diff --git a/games-arcade/sdlroids/Manifest b/games-arcade/sdlroids/Manifest
deleted file mode 100644
index 499d6f9fbba8..000000000000
--- a/games-arcade/sdlroids/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.3.4-sound.patch 658 BLAKE2B c7a9a46881e1f8f9d9c48e843338bc9c61a1a3cda4d8f3ca27f9e47410f0e40eca039bbf3069c8be2bdb23f97e9b02a1dc3e955e07b5191c54dceafc12f29782 SHA512 4d01491aa3a57c9ea43cb15e815e761e78cae50c8f4c7abce4b02c2343ad7671b688d81da94bbca8036d081b427a08791e0332e3fb3fdad71ba41b15f291a619
-DIST sdlroids-1.3.4.tar.bz2 136588 BLAKE2B e2dd15c0437184af557f96daaa11d9b50ae991e7c29ccd3e4a27f2668719d0f7ef8244e681bdac2d8726b1493175ab4a3f754daf0f471f606bcb5cbe1b5aa1c8 SHA512 abd202e462ac96781481defb9442f3ee69cbfafb5b4e82ae435dca23068257c3e65ba4886c0c41f2568a8568b52267ded24b8684efb3f7cafd21754103cc31b4
-EBUILD sdlroids-1.3.4-r4.ebuild 745 BLAKE2B 9263dcceb1ae7c01de6e13b017a8d2f8db323946487780682391aaf99585d44cd9510682a371ad404aa3d006ef0e5f0888448acaad0d5be30ae58ad157ed4e15 SHA512 2a39cee0143bacdd2feabb02053a3d5d646829f413ac2cd2d710fcb5df3b9ca11a6960eb737d50e380000e39b2e44ea3c987a73c9025c02814f7174aa0593db4
-MISC metadata.xml 331 BLAKE2B 6d663f6943fa4c3419e12335c8d6c4913ad7658635d37889373a3b90bb7fb810cc80478d41eee57e2cda6099b7b3b748bd7583b248be2543293e6d48d5ccbe42 SHA512 b126b6b4997b53170da871ca8cf66be75350ad1b2492a62f99b8a512eab5ce63a8ededd8794ca480ecf711a4e585e0b81d77b4f1fa0dcee500c54bd48878305b
diff --git a/games-arcade/sdlroids/files/1.3.4-sound.patch b/games-arcade/sdlroids/files/1.3.4-sound.patch
deleted file mode 100644
index eb2eb0c2ada4..000000000000
--- a/games-arcade/sdlroids/files/1.3.4-sound.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/sdlsound.c.orig	2004-07-02 23:03:03.000000000 -0700
-+++ b/sdlsound.c	2004-07-02 23:05:37.000000000 -0700
-@@ -205,9 +205,9 @@
- int load_sample(int num) {
-   
-   if((samples[num] = Mix_LoadWAV(samplename[num])) ||
--     Mix_LoadWAV(datafilename(NULL, samplename[num])) || 
--     Mix_LoadWAV(datafilename(DATADIR, samplename[num])) || 
--     Mix_LoadWAV(datafilename(bindir, samplename[num])))
-+     (samples[num] = Mix_LoadWAV(datafilename(NULL, samplename[num]))) || 
-+     (samples[num] = Mix_LoadWAV(datafilename(DATADIR, samplename[num]))) || 
-+     (samples[num] = Mix_LoadWAV(datafilename(bindir, samplename[num]))))
-     return 1;
-   return 0;
- }
diff --git a/games-arcade/sdlroids/metadata.xml b/games-arcade/sdlroids/metadata.xml
deleted file mode 100644
index baad890bb595..000000000000
--- a/games-arcade/sdlroids/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sdlroids</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild b/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
deleted file mode 100644
index 83678ee1a7b4..000000000000
--- a/games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Asteroids Clone for X using SDL"
-HOMEPAGE="http://david.hedbor.org/projects/sdlroids/"
-SRC_URI="mirror://sourceforge/sdlroids/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/$(SOUNDSDIR)/$(DESTDIR)$(SOUNDSDIR)/' \
-		-e 's/$(GFXDIR)/$(DESTDIR)$(GFXDIR)/' Makefile.in \
-		|| die "sed failed"
-	eapply "${FILESDIR}"/${PV}-sound.patch
-}
-
-src_install() {
-	default
-	newicon icons/sdlroids-48x48.xpm ${PN}.xpm
-	make_desktop_entry ${PN} SDLRoids ${PN}
-}
diff --git a/games-arcade/sdlsasteroids-3.0.1-r1 b/games-arcade/sdlsasteroids-3.0.1-r1
new file mode 100644
index 000000000000..3b0d2bec4210
--- /dev/null
+++ b/games-arcade/sdlsasteroids-3.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=virtual/opengl media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf
+DESCRIPTION=Rework of Sasteroids using SDL
+EAPI=6
+HOMEPAGE=http://sdlsas.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=virtual/opengl media-libs/sdl-mixer media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=mirror://sourceforge/sdlsas/SDLSasteroids-3.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=ca56d0412fff2812d7374e3a865fdf7f
diff --git a/games-arcade/sdlsasteroids/Manifest b/games-arcade/sdlsasteroids/Manifest
deleted file mode 100644
index 1f3c0c8ccd8f..000000000000
--- a/games-arcade/sdlsasteroids/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX sdlsasteroids-3.0.1-gcc43.patch 422 BLAKE2B abe2fb65829d30b3f9d66eb585621e7ad4409831887cec96b6872e0bdd311ad9061b8be3208adf2f50adf2eafc87bc048834fbf91a65ab8401b939530e47b147 SHA512 3915518301cbf842de73f59caf70f8bf318d6824120386c1bc3844f454fe05676feab62e6f05adb17b13dd8f1c965da19d30c53391a0350c1f2849eac6a6aa59
-AUX sdlsasteroids-3.0.1-ldflags.patch 374 BLAKE2B 2b4ae7b2ca09f5573a1bbd317cb0cf9170eba0b56a9f04ed3bf825d4217d7b209c98983b1e757b71786ba0a25cc7a7a60485d7c418fc3bfce937f84d0a07ae22 SHA512 6e7ae0cb9b78f311d628859d0804ab635ff6c92106e9692591d83c13298fb491c0d75df188ab5a93d21170b3ebb9cae29a392b93343ade3eafc702dd4b320525
-DIST SDLSasteroids-3.0.1.tar.gz 531781 BLAKE2B 83d2f84623dd369bd0e36ddfec3a328f50b5ef1a9daf2bd4f6d2e5ff4bfd38f2832ff5378961c66fbf149fe82e45e48ad12aaf8a95abf4244a59fc7321403682 SHA512 5758e1a8540dd16b0993146e706d2f600713cf80500de32b5102e23933fad7e5f5d5b31bf7ebe0efcc89223f54ec67505728e5d3b8e2c8691b8efce671fcbdbc
-EBUILD sdlsasteroids-3.0.1-r1.ebuild 1232 BLAKE2B b6d1d0df6e42e54a06c0bdb09eeba1659f35d9186759bf93ae4d08d5c2a0b6c0df1233bedd3b9cf18d3adfa88a891d0d8b23d65b5cee946e50cbd6f3cab1d4ca SHA512 cd4a6419e04e1448cc5aff7565b17857dabba6876348fd526b0d85d8f138a2fcbe9bff153d9671f07ab2dc256c8f492edb10522f1dfa7b411c39ab3df76851f0
-MISC metadata.xml 329 BLAKE2B dba011e413928b68ccfbc07eb71a2cca9eb7071165c8d3f53ea47bcd54ffa03f16c670fbc41c1c0fc3b7de36da510109b3884f2b6a0e996bc8c3c5479ffac3f5 SHA512 4f3b7531ceb47a03591edb619cccddec6bb2f86bc9c66be1e88cb745d0b44220ab5e542f6d56bdb89494c341120c673f2e0cc34de6aeae2f1599cbb9b800f75d
diff --git a/games-arcade/sdlsasteroids/files/sdlsasteroids-3.0.1-gcc43.patch b/games-arcade/sdlsasteroids/files/sdlsasteroids-3.0.1-gcc43.patch
deleted file mode 100644
index 9863f0c051e9..000000000000
--- a/games-arcade/sdlsasteroids/files/sdlsasteroids-3.0.1-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/sbitmap.h
-+++ b/src/sbitmap.h
-@@ -36,7 +36,7 @@
-   void LoadImage(char* path);
-   void LoadSurface(SDL_Surface* surface);
- 
--  void put(float x, float y, float rotate = 1.0f, float rotate = 1.0f, float layer = 0.0f);
-+  void put(float x, float y, float sf = 1.0f, float rotate = 1.0f, float layer = 0.0f);
-   void putA(float x, float y, float layer = 0.0f, float alpha = 1.0f);
-   
-   inline float width() const
diff --git a/games-arcade/sdlsasteroids/files/sdlsasteroids-3.0.1-ldflags.patch b/games-arcade/sdlsasteroids/files/sdlsasteroids-3.0.1-ldflags.patch
deleted file mode 100644
index 581010b51388..000000000000
--- a/games-arcade/sdlsasteroids/files/sdlsasteroids-3.0.1-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.old	2010-09-22 08:44:57.000000000 +0200
-+++ b/src/Makefile	2010-09-22 08:45:43.000000000 +0200
-@@ -26,7 +26,7 @@
- 
- 
- $(SASTEROIDS): $(SASTEROIDS_O)
--	g++ -Wall -o $(SASTEROIDS) $(SASTEROIDS_O) $(DEFINES) $(DEBUG) $(OPTS) $(CFLAGS) $(LIBS)
-+	g++ $(LDFLAGS) -Wall -o $(SASTEROIDS) $(SASTEROIDS_O) $(DEFINES) $(DEBUG) $(OPTS) $(CFLAGS) $(LIBS)
- 
- 
- .cpp.o:
diff --git a/games-arcade/sdlsasteroids/metadata.xml b/games-arcade/sdlsasteroids/metadata.xml
deleted file mode 100644
index 11957fc04bd7..000000000000
--- a/games-arcade/sdlsasteroids/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sdlsas</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild b/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild
deleted file mode 100644
index 24ecc1564280..000000000000
--- a/games-arcade/sdlsasteroids/sdlsasteroids-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Rework of Sasteroids using SDL"
-HOMEPAGE="http://sdlsas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdlsas/SDLSasteroids-${PV}.tar.gz"
-
-LICENSE="GPL-2 freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/sdl-mixer
-	media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/SDLSasteroids-${PV}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e 's/make /$(MAKE) /' \
-		-e 's/--strip//' \
-		Makefile || die
-	sed -i \
-		-e '/^CC/d' \
-		-e 's/g++/$(CXX)/' \
-		-e 's/CC/CXX/' \
-		-e 's/CFLAGS/CXXFLAGS/' \
-		src/Makefile || die
-}
-
-src_compile() {
-	emake \
-		GAMEDIR="/usr/share/${PN}" \
-		OPTS="${CXXFLAGS}"
-}
-
-src_install() {
-	dodir /usr/share/man/man6/
-	emake \
-		GAMEDIR="${D}/usr/share/${PN}" \
-		BINDIR="${D}/usr/bin" \
-		MANDIR="${D}/usr/share/man/" \
-		install
-	dodoc ChangeLog README README.xast TODO description
-	newicon graphics/sprite/bigast.png ${PN}.png
-	make_desktop_entry sasteroids "Sasteroids" ${PN}
-}
diff --git a/games-arcade/skystreets-0.2.4 b/games-arcade/skystreets-0.2.4
new file mode 100644
index 000000000000..8f16141c6bc1
--- /dev/null
+++ b/games-arcade/skystreets-0.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[opengl,video] media-libs/sdl-image
+DESCRIPTION=A remake of the old DOS game Skyroads
+EAPI=5
+HOMEPAGE=http://freecode.com/projects/skystreets
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=OSL-2.0
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[opengl,video] media-libs/sdl-image games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/skystreets-0.2.4.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=698db8ca6092866a6c2c8c2b4cab25bb
diff --git a/games-arcade/skystreets/Manifest b/games-arcade/skystreets/Manifest
deleted file mode 100644
index ebf5bf991e17..000000000000
--- a/games-arcade/skystreets/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.2.4-gl.patch 240 BLAKE2B 6f3b25ba5ea166b58c6fd89b9b0ea8e0a2bfb846fd6e94707e159f1305e1137593ab930ba5ba38efc2dd2835dd926fb5e0c2e6cd3fa7c6d31f5aff05580d615c SHA512 2199f827f414bf44b1d52cc48293ec9070445d39f91c153ad748e0b6dde9dbad41ed7aecb142c18f49ff0a7e8e2b850f24536861a330a955025a9dc940552785
-AUX skystreets-0.2.4-as-needed.patch 437 BLAKE2B f6f97ad09aaae150d8edf40941fe65dc3c28a16a7dd5becd45584ef19e8fe489c8a4c1dc0db55c45ccb11070d2a32cad8c0ba36b04eeb165f499b7c4b4e930aa SHA512 a62e31cb23e766ef53460f6dde86e35040218e94939607622d0d9a625d5c291007b6cd59a7e3267e109cbb6d2c20f31b841a5340a19a570852b9f20cd1b6e18b
-DIST skystreets-0.2.4.tar.bz2 1838860 BLAKE2B b52af4fc799b4ab7063030c6281faa0cae66c9a64c3f6797ad8907f5ba72fa7dcb0bc4db8c21260464f4af4aca2e91c06277913117997c36edd538ae2a0b149e SHA512 b27ac359f3f4e187aa3fa6d576574301baee56a90a7502b10976924b7def95a65adac47940637b02467ad3902df981e33871cfb7f81e583f478b7319e6baafe6
-EBUILD skystreets-0.2.4.ebuild 667 BLAKE2B ed81d7cd9318a2875993a5b5874006c81195354abb03ca6a85772605864d4a507b9c80caa8fd14496f1ad62da23151956c3baca268fad4cb20b71a00003483f1 SHA512 fa9751500a315225ea7f85b5f9ffd3d98455cf993c84b91d162970d8fbb25be608272aee942890a0b5f43f5cb95848d4e23051ecad0718999b38eddb7c7b44dc
-MISC metadata.xml 330 BLAKE2B 3a6ed60562a802028d6c3f2d22f30903952817a4e3fd6e7c49f04d5855c852ae48b2747dc673474f17614951c75f0c4f7ea48fb19bcc5f2d70d8dac065332520 SHA512 6b25b5c3f1337101ef3bafd5e88f5b134605c7fff1759c859db1948ab23423f02bd128cc407cb4af451923e9031fa5558339ec0e32b1e9378fd8abbd0e85d325
diff --git a/games-arcade/skystreets/files/0.2.4-gl.patch b/games-arcade/skystreets/files/0.2.4-gl.patch
deleted file mode 100644
index 6ff5548a5fa3..000000000000
--- a/games-arcade/skystreets/files/0.2.4-gl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- game.cpp.old	2004-12-31 01:02:13.351382184 +1100
-+++ game.cpp	2004-12-31 01:02:26.415396152 +1100
-@@ -8,6 +8,7 @@
- #include <windows.h>
- #endif
- 
-+#define GL_GLEXT_PROTOTYPES 1
- #include <GL/gl.h>
- #include "SDL.h"
- #include <string.h>
diff --git a/games-arcade/skystreets/files/skystreets-0.2.4-as-needed.patch b/games-arcade/skystreets/files/skystreets-0.2.4-as-needed.patch
deleted file mode 100644
index 414cd3d61ce4..000000000000
--- a/games-arcade/skystreets/files/skystreets-0.2.4-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.old	2009-02-02 18:04:04.000000000 +0100
-+++ Makefile.in	2009-02-02 18:04:37.000000000 +0100
-@@ -78,7 +78,7 @@
- EXTRA_DIST = *.h CODE BUGS
- INCLUDES = `sdl-config --cflags` -Wall -O2 -DDATAPATH=\"$(pkgdatadir)\"
- #LDFLAGS = -lSDL_image -lm
--LDFLAGS = -lSDL_image -lGL -lGLU -lm
-+LDADD = -lSDL_image -lGL -lGLU -lm
- # LDFLAGS = `sdl-config --libs` -lSDL_image -lm
- SUBDIRS = audio gfx levels
- AUTOMAKE_OPTIONS = dist-bzip2
diff --git a/games-arcade/skystreets/metadata.xml b/games-arcade/skystreets/metadata.xml
deleted file mode 100644
index 47eeb6f42b45..000000000000
--- a/games-arcade/skystreets/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">skystreets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/skystreets/skystreets-0.2.4.ebuild b/games-arcade/skystreets/skystreets-0.2.4.ebuild
deleted file mode 100644
index 405cb2fa532b..000000000000
--- a/games-arcade/skystreets/skystreets-0.2.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A remake of the old DOS game Skyroads"
-HOMEPAGE="http://freecode.com/projects/skystreets"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="OSL-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-image"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gl.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_install() {
-	default
-	newicon gfx/sunscene.png ${PN}.png
-	make_desktop_entry ${PN} SkyStreets
-	prepgamesdirs
-}
diff --git a/games-arcade/slimevolley-2.4.2-r1 b/games-arcade/slimevolley-2.4.2-r1
new file mode 100644
index 000000000000..3d787a496610
--- /dev/null
+++ b/games-arcade/slimevolley-2.4.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-ttf media-libs/sdl-image[png] net? ( media-libs/sdl-net ) virtual/libintl sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A simple volleyball game
+EAPI=6
+HOMEPAGE=http://slime.tuxfamily.org/index.php
+IUSE=net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-ttf media-libs/sdl-image[png] net? ( media-libs/sdl-net ) virtual/libintl
+SLOT=0
+SRC_URI=http://downloads.tuxfamily.org/slime/v242/slimevolley_2.4.2.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_=e8978cba956ad27bf1efab7a54f809a0
diff --git a/games-arcade/slimevolley/Manifest b/games-arcade/slimevolley/Manifest
deleted file mode 100644
index bc7ec350773a..000000000000
--- a/games-arcade/slimevolley/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX slimevolley-2.4.2-nodatalocal.patch 746 BLAKE2B ff7a336c459395724931e613fab39c212fd06f578342ef7628a934a7b066c085af909bdd35dccac54b6b698f4628b594766caa8c8c814c30837da443a73fcec3 SHA512 e679365056b118e8cf6c5a6828709f8beed67eb2e84a1ce5082abfc0498f82624bbce6584f663cf371eaf81201e6c5bfb1619fedc99ab6395e3b87472e61bd1e
-AUX slimevolley-2.4.2-underlink.patch 232 BLAKE2B 29e3d0ed66ace5a588d6e0133a2427eebd225ff77100336426db8ad892f52ec552bc562f6edf6c8834e5915094558940254a5ef9c5e6444a7ffa415654bec7f6 SHA512 402baf0b3955d86768ea40a0eaa289cd160f06551392e653255c32f47d4aed22c33f57a67e98fb3fe28500ed6914f9b8e465737b5aa958fd3332721fb2fe419f
-DIST slimevolley_2.4.2.tar.bz2 2402839 BLAKE2B 5f3ca09b11721076c115af78117e8185b9c243efc23369f7fac4c5243e942b3b0cddd403f727cad1400a7ffbd77c080bad0d1ee123dfc015be7a98337bfbda36 SHA512 7a72329d9e22396f2e304d40370896b2c1a0ae22d5bf1769a46cad8fb1131b1ae9c16de0e5f847b8a31004df074cdeb710a28bfd1e1d94beceb1c8eb0a750680
-EBUILD slimevolley-2.4.2-r1.ebuild 905 BLAKE2B b9961b1b837685914f1854f772876c051137285b1333e9a63639e721bbd22b3ca4705f40ca47af2878f7ddd1c0464aa03fd3a7509e93a66de3a49c5af9e84dc1 SHA512 4d793d5df21368617eb6792d8e5ec98efd8d00b96b04ea84e0016adbc576f88a12c09a15bb0c16f0f65291cfc1cb811568768f1110f1ac7aa4cccd9e0995ec27
-MISC metadata.xml 307 BLAKE2B 3bd3dcad0f6b179a7477a9f6c0a30060dff7d0a959c0270083ce111d5f9f8e5ebc0817f44db3e98979eca1f936b4ec7a33914c38ad78a735b97507848ccb431c SHA512 53bd5a746338b99640591dd7fd27b7ed24d44396d2c382a73b7f45b7d0bfa7236bb66229ad2a02135eec39ca524700aa2b0a68b7ad9f19c6f7c750de340b0924
diff --git a/games-arcade/slimevolley/files/slimevolley-2.4.2-nodatalocal.patch b/games-arcade/slimevolley/files/slimevolley-2.4.2-nodatalocal.patch
deleted file mode 100644
index a1ab7616a645..000000000000
--- a/games-arcade/slimevolley/files/slimevolley-2.4.2-nodatalocal.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru slimevolley-2.4.1.orig/src/themes_std.c slimevolley-2.4.1/src/themes_std.c
---- slimevolley-2.4.1.orig/src/themes_std.c	2008-11-30 04:36:52.000000000 -0500
-+++ slimevolley-2.4.1/src/themes_std.c	2010-05-05 13:00:23.875723904 -0400
-@@ -30,7 +30,6 @@
- #include "audio.h"
- #include "themes.h"
- 
--#define DATA_LOCAL "data"
- #define DOSS_THEMES "themes"
- #define DOSS_SLIMES "slimes"
- #define SLIME_D_NOM "slimeJD%d.png"
-@@ -74,10 +73,7 @@
- 	chemin[0] = '\0';
- 
- 	if(var_env == NULL) {
--		if(access(DATA_LOCAL, R_OK | X_OK) == 0) {
--			strncpy(chemin, DATA_LOCAL, sizeof(chemin) - 1);
--		
--		} else if(access(DATA_DIR, R_OK | X_OK) == 0) {
-+		if(access(DATA_DIR, R_OK | X_OK) == 0) {
- 			strncpy(chemin, DATA_DIR, sizeof(chemin) - 1);
- 		}
- 	
diff --git a/games-arcade/slimevolley/files/slimevolley-2.4.2-underlink.patch b/games-arcade/slimevolley/files/slimevolley-2.4.2-underlink.patch
deleted file mode 100644
index 1aad45f6cf5f..000000000000
--- a/games-arcade/slimevolley/files/slimevolley-2.4.2-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/CMakeLists.txt.old	2011-06-20 20:42:26.545500925 +0200
-+++ b/CMakeLists.txt	2011-06-20 20:42:34.407999223 +0200
-@@ -42,6 +42,7 @@
- 	${SDL_LIBRARY}
- 	${SDLTTF_LIBRARY}
- 	${SDLIMAGE_LIBRARY}
-+	m
- )
- 
- INCLUDE(FindGettext.cmake)
diff --git a/games-arcade/slimevolley/metadata.xml b/games-arcade/slimevolley/metadata.xml
deleted file mode 100644
index 668a9c261470..000000000000
--- a/games-arcade/slimevolley/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-<flag name="net">Enable network support</flag>
-</use>
-</pkgmetadata>
diff --git a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild b/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
deleted file mode 100644
index e4a8fe67dfab..000000000000
--- a/games-arcade/slimevolley/slimevolley-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="A simple volleyball game"
-HOMEPAGE="http://slime.tuxfamily.org/index.php"
-SRC_URI="http://downloads.tuxfamily.org/slime/v242/${PN}_${PV}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="net"
-
-RDEPEND="
-	media-libs/libsdl[X,sound,video]
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]
-	net? ( media-libs/sdl-net )
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-DOCS="docs/README docs/TODO"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-nodatalocal.patch
-	"${FILESDIR}"/${P}-underlink.patch
-)
-
-S="${WORKDIR}/${PN}"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DCMAKE_INSTALL_PREFIX=/usr"
-		"-DDATA_DIR=/usr/share/slimevolley"
-		$(use net && echo "-DNO_NET=0" || echo "-DNO_NET=1")
-	)
-	cmake-utils_src_configure
-}
diff --git a/games-arcade/snake3d-0.9 b/games-arcade/snake3d-0.9
new file mode 100644
index 000000000000..1d77c0e2fdde
--- /dev/null
+++ b/games-arcade/snake3d-0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/sdl-net virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl
+DESCRIPTION=variant of the snake game
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/worms3d/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-net virtual/opengl media-libs/freeglut virtual/glu media-libs/libsdl games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/worms3d/snake3d-0.9.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_=0a53f64a594c40aee1ceb148adf3d791
diff --git a/games-arcade/snake3d/Manifest b/games-arcade/snake3d/Manifest
deleted file mode 100644
index cd14d5cbd501..000000000000
--- a/games-arcade/snake3d/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX snake3d-0.9-amd64.patch 860 BLAKE2B 49aa7d5647f603b6c8606e44ae847b3271f49c045a42bd68bada1b2d1ae403c015fdff22e2f41e74a902b1e7d6c4eef85f628d9a8ddbce69f25e6413ca440da4 SHA512 a7012bc3742e90c2c78a2f56a54f1a162a0840d31189f96557d267448076d653d2f68666634e2faa489dbe01d2a6c49fe786017aa21c7622c7be84c3d9b91a74
-AUX snake3d-0.9-build.patch 881 BLAKE2B 131b30c31b00bb3f736241d322d5204fc7b97ff67ba0da6bed04625f3abcf9d213873de763e971d68cff530ba4e80a0b9719e56d1504fe8dbf3c882bbb573fd7 SHA512 dc26cf5102f59c2ab8fcf54a2b91262dad4639236a8acdc4cfb879f211625d2fb9e1bbb9b62eb74f9c0d9c023ca63106535e200ff8cb4914a7e9b9444fc4563a
-DIST snake3d-0.9.tar.gz 62900 BLAKE2B 8520ddf52705cf086374c707f319fef5f3d9d964a05f367da8aab19c46f4f8e42947e104cdc4f3d7db20901308d995470f29a840af22500fd6c4c4d2ab7a301b SHA512 2bc2d3e68fd782d58c5f702727a8a72fb67096e7ff78e1e00f3a79767bad627fe3a2ceec05a621e8d5b4b3ba009a01814c93b7d21f180512b13411bf61ac1065
-EBUILD snake3d-0.9.ebuild 733 BLAKE2B 386654ee29beca8ceb1ce4067faf02c2adfa83ed38c615cf1f1e7d0ed717a1b6f602092eb6c4ec4f7b2220f92d7fcdae1b963ba242fbb90b10c5f2844b211baa SHA512 bfc0509ba04abc50ce5b2c2881d6678a8d74420b386b9d1299b69697575a4c3c700dc69dd3cdcd3d187275b0eb8a4750722bebb612d5899ef3e972f1b15bcdcf
-MISC metadata.xml 608 BLAKE2B 293c3db365ab9938fab9796ea2caf9498f33007e10fcd6561a40edfa4c5a72902be3d786a89d6412d61ad4357abe96d9ab477fe47115119644d79fa478747999 SHA512 38171efa331066de83f6fc6933ea805ce19ad8467dc9d06759ff1630cbff1de8d61069723bd481752a16a5399fe324c6d7c36d805778b0ac2939ead2150bf802
diff --git a/games-arcade/snake3d/files/snake3d-0.9-amd64.patch b/games-arcade/snake3d/files/snake3d-0.9-amd64.patch
deleted file mode 100644
index d2b5f2c79acd..000000000000
--- a/games-arcade/snake3d/files/snake3d-0.9-amd64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/functions.cpp.old	2007-03-31 11:04:10.000000000 +0200
-+++ src/functions.cpp	2007-03-31 11:11:52.000000000 +0200
-@@ -107,8 +107,8 @@
- 	    pointer = end;
- 	}
- 
--	memcpy(str, i, (int)pointer - (int)i);
--	str[(int)pointer - (int)i] = 0;
-+	memcpy(str, i, ssize_t(pointer - i));
-+	str[pointer - i] = 0;
- 
- 	drawString(x, y, str);
- 
-@@ -501,15 +501,21 @@
- 
- Uint32 timer(Uint32 interval, void* value) {
-     
-+    union {
-+    	void *value;
-+	int   p_mode;
-+    } p_modeConv;
-+    p_modeConv.value = value;
-+
-     //if ((int)value != gameModeValue)
--    if ((int)value != p_mode)
-+    if (p_modeConv.p_mode != p_mode)
- 	return 0;
- 
-     SDL_Event event;
-     SDL_UserEvent userevent;
- 
-     userevent.type = SDL_USEREVENT;
--    userevent.code = (int)value;
-+    userevent.code = p_modeConv.p_mode;
-     userevent.data1 = NULL;
-     userevent.data2 = NULL;
- 
diff --git a/games-arcade/snake3d/files/snake3d-0.9-build.patch b/games-arcade/snake3d/files/snake3d-0.9-build.patch
deleted file mode 100644
index f7d8c4404df4..000000000000
--- a/games-arcade/snake3d/files/snake3d-0.9-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/Makefile
-+++ src/Makefile
-@@ -1,10 +1,10 @@
- OBJ = board.o snake.o game.o menu.o snake3d.o global.o consts.o cube.o functions.o preferences.o rooms2.o network.o userInput.o server.o packets.o client.o classic2d.o
--CXXFLAGS = -g -Wall -I/usr/X11R6/include/ `sdl-config --cflags`
-+CXXFLAGS += -Wall $(shell sdl-config --cflags)
- CXX = g++
- CC = g++
- #LDFLAGSMAC = -framework GLUT -framework OpenGL -framework Cocoa -bind_at_load -L/sw/lib/ -lSDL -lSDLmain
- LDFLAGSMAC = `sdl-config --libs` -framework GLUT -framework OpenGL -lSDL_net
--LDFLAGS = -L/usr/X11R6/lib/ -lGL -lglut -lGLU -lSDL -lSDL_net
-+LIBS = -lGL -lglut -lGLU $(shell sdl-config --libs) -lSDL_net
- 
- all: snake3d
- 
-@@ -18,7 +18,7 @@
- 	g++ $(LDFLAGSMAC) $(OBJ) -o ../snake3d 
- 
- snake3d.linux: $(OBJ)
--	g++ $(LDFLAGS) $(OBJ) -o ../snake3d 
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(OBJ) $(LIBS) -o ../snake3d
- 
- 
- clean:
diff --git a/games-arcade/snake3d/metadata.xml b/games-arcade/snake3d/metadata.xml
deleted file mode 100644
index 261d7fab00c9..000000000000
--- a/games-arcade/snake3d/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-snake3d is a variant of the snake game. You are a snake in a 3d world trying to
-eat as many icosahedrons as possible, which makes your tail longer. There are
-other snakes (network players) in the world which will try to fail you.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">worms3d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/snake3d/snake3d-0.9.ebuild b/games-arcade/snake3d/snake3d-0.9.ebuild
deleted file mode 100644
index 57db6998ed0b..000000000000
--- a/games-arcade/snake3d/snake3d-0.9.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="variant of the snake game"
-HOMEPAGE="https://sourceforge.net/projects/worms3d/"
-SRC_URI="mirror://sourceforge/worms3d/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-net
-	virtual/opengl
-	media-libs/freeglut
-	virtual/glu
-	media-libs/libsdl"
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-amd64.patch \
-		"${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX) -C src snake3d.linux
-}
-
-src_install() {
-	dogamesbin ${PN}
-	dodoc ChangeLog README TODO
-	prepgamesdirs
-}
diff --git a/games-arcade/solarwolf-1.5-r1 b/games-arcade/solarwolf-1.5-r1
new file mode 100644
index 000000000000..30b56faacd56
--- /dev/null
+++ b/games-arcade/solarwolf-1.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Action/arcade recreation of SolarFox
+EAPI=6
+HOMEPAGE=http://www.pygame.org/shredwheat/solarwolf/
+KEYWORDS=~alpha ~amd64 ~hppa ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/pygame-1.5.6 media-libs/sdl-mixer[mod,vorbis]
+SLOT=0
+SRC_URI=http://www.pygame.org/shredwheat/solarwolf/solarwolf-1.5.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_=1b4367dae10b41f8322c256d25ebfe97
diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
deleted file mode 100644
index d8bce2e450ac..000000000000
--- a/games-arcade/solarwolf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
-EBUILD solarwolf-1.5-r1.ebuild 798 BLAKE2B ba969bfbaacf80d6a40385f4e6f60e603b0389287a1f71f541a9a9f87f98d9674ea63d167e07ff1b13a14669a074d6b45076d9c6740f1bf87ba8bb9b98894c28 SHA512 6e250abdab04450254a5d29bdb6aa8962c3a9194ade5eab8669b95db6ab9a620c1388a8a7a757ccc2f2b58de601d885b028c67add97a44373f5e12a4ab416218
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/metadata.xml b/games-arcade/solarwolf/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/solarwolf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild
deleted file mode 100644
index dc3d846b8b7a..000000000000
--- a/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Action/arcade recreation of SolarFox"
-HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
-SRC_URI="http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pygame-1.5.6
-	media-libs/sdl-mixer[mod,vorbis]
-"
-DEPEND=""
-
-src_prepare() {
-	default
-	find . -name .xvpics -print0 | xargs -0 rm -fr
-	gunzip dist/${PN}.6.gz || die #619948
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data *py
-	make_wrapper ${PN} "python2 ./solarwolf.py" /usr/share/${PN}
-	doicon dist/${PN}.png
-	make_desktop_entry ${PN} SolarWolf
-	einstalldocs
-	doman dist/${PN}.6
-}
diff --git a/games-arcade/spacerider-0.13-r1 b/games-arcade/spacerider-0.13-r1
new file mode 100644
index 000000000000..ef42d8b2e418
--- /dev/null
+++ b/games-arcade/spacerider-0.13-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-gfx media-libs/sdl-mixer media-libs/sdl-image[jpeg] media-libs/sdl-net media-libs/sdl-ttf
+DESCRIPTION=Space-shooter written in C++, using the SDL
+EAPI=6
+HOMEPAGE=http://www.hackl.dhs.org/spacerider/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-gfx media-libs/sdl-mixer media-libs/sdl-image[jpeg] media-libs/sdl-net media-libs/sdl-ttf
+SLOT=0
+SRC_URI=mirror://gentoo/spacerider-0.13.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=1e4ae2a7db821235c4e32ad38b0e2622
diff --git a/games-arcade/spacerider/Manifest b/games-arcade/spacerider/Manifest
deleted file mode 100644
index 11d28caf20db..000000000000
--- a/games-arcade/spacerider/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX spacerider-0.13-font.patch 409 BLAKE2B e01077b6e2fafd317618218b54596036928c36812043976610f9109205aefb497f5b47ab814fe89e17ca0d1f191c2f78017d9c2c06518b78788d002a702d17ea SHA512 efbb6b47b19dcc653b380eaabfd817518887cc77aadb54e9dcfb7dc9c37e3a91c156eab7076eea90ffee698c1b9d1ac745a1638e023d35778eb35482d8f8dec5
-AUX spacerider-0.13-gcc41.patch 468 BLAKE2B 0c3b75a8a573ecacf808bb597429ca12ca59501b58bbf2aa73f64ce150a594659184ff32ff88770ea038eac232936491c750e75be81611ce8cd91910007a8922 SHA512 0cbd0c0003554bf90d8261af1c5db1617489bc5427b1e52caa0d56350df07939f007ba035cbdbb209176e3bbcec125c9171714631400ad5cad2323b8059f0765
-AUX spacerider-0.13-gcc49.patch 775 BLAKE2B 4b77bee14741fc4258d0fb3e8af69e9cceff2ac3886f97acab65c1e84dad27ccfc602aa0fb4d535b91d2c1947fc5adc1671cc725799e88ac60d78a01ebf791a5 SHA512 6ef7af29e88365fe3e34517ae6ee193a9b3765c77ecc883c8a34480c1944900388a9f89ca253031f673adae9552ff68eac5ec5af2203beff6835005a3f23bfb3
-AUX spacerider-0.13-gentoo.patch 737 BLAKE2B 7660dd666c6a838b7a8b64cd173f1a5dc7393163a42c2cdb919a8c719600e3cbb1b08ee2230f2d4675fa9702cf56ad556337eccee0fd66c3b82ef012aa641a47 SHA512 89bcf2565833ab462fdcdd16a97a5a339dcb82ad7e685754dfc3dca5c37093c10c787615338791c62b431222734953b2add3545fa41812ea0c6f63f7c02ce267
-AUX spacerider-0.13-ovflfix.patch 347 BLAKE2B 977a25efb7badce88c80f4ee5c68768910aa2139b94f3cd56ee996aac26053c749eea7d671f5bf02d055251060f3f9536493de513f79c617e96a1db4f8b90c91 SHA512 227d519c51555fa99a162e2abc939b53feb0abc817667c5b2edc502ff6e7265a0f86a750498dbed5f0741f7d5e6840b86c0421fc7770b10a7ac862cdaafb1af1
-DIST spacerider-0.13.tar.bz2 283861 BLAKE2B 89687ca24a663addb81af0c775201e1a57e6d524e9fb99766d4003a4401dc406e50c8d103600c57c7d4b30ee620b3ec60089f05aaa4e0ad9da72a6f5e64fd527 SHA512 4f8d506abfe242039247d5c4e43c012ded14f3b18de710aea0c9c6d933cb60fde3116008723d44acadd490b3666e107506fad6ee027d2b31c47d118185e0c03e
-EBUILD spacerider-0.13-r1.ebuild 1049 BLAKE2B 0855a5400194c53dc8d5bd7984feaf491feecd192f64c64fe8357eca3bc00ae7108beff6c2d294498102b1145ee86b34be58aa31581095b5ddf688c6cafbed59 SHA512 916debef11bf13ee5eda029b5c067525a94baafd7b72308884ebd2c76259ff3ecf6dcd6725aad7c0dbaf9383aad0b1293d08bbddbfc06a0f5e556242b21e8fa6
-MISC metadata.xml 357 BLAKE2B 92788e73f724c0a4de633ee3b5a4f4b07c487b82de01a57ef7d2829b5f3f75617eda10727e8499f3d243360a7afcec28427e495f72d2ba48d6e32893865d3a33 SHA512 51a7291b12ee0c0f12cf55a0d24d8e2dd3cf44f9ef2023caa9c457b659dc677a9882512472525073c17717a7f56180c94a88a40d3db2d33bd843e31ca862739d
diff --git a/games-arcade/spacerider/files/spacerider-0.13-font.patch b/games-arcade/spacerider/files/spacerider-0.13-font.patch
deleted file mode 100644
index 87732a106633..000000000000
--- a/games-arcade/spacerider/files/spacerider-0.13-font.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Ugly brute-force method for avoiding a double-free segfault on exit.
-Better patch welcome.
-
---- a/spacerider.cpp.orig	2015-03-31 23:24:17.770966147 -0400
-+++ b/spacerider.cpp	2015-03-31 23:24:41.592174463 -0400
-@@ -306,8 +306,6 @@
- 		/* free screen */
- 		SDL_FreeSurface(screen);
- 	}
--	/* call the TTF-Library cleanup function */
--	TTF_Quit();
- 
- 	/* call the NET-Library cleanup function */
- 	SDLNet_Quit();
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch b/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch
deleted file mode 100644
index e5524b6e6430..000000000000
--- a/games-arcade/spacerider/files/spacerider-0.13-gcc41.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/spacerider.cpp.old	2007-02-18 11:25:38.000000000 +0100
-+++ b/spacerider.cpp	2007-02-18 11:27:00.000000000 +0100
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- }
- 
-+int send_score_thread(void *param);
- 
- Spacerider::Spacerider(const int argc, char *argv[]) : fullscreen(FULLSCREEN), game_over(false), online_highscore(ONLINE_HIGHSCORE), score_sent(false), name_input(true), highscore_thread_started(false), scroll(0), last_enemy(0), score(0), lives(LIVES), fps(FPS) 
- {
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch b/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
deleted file mode 100644
index b4d5ca6d5764..000000000000
--- a/games-arcade/spacerider/files/spacerider-0.13-gcc49.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/effect.cpp.orig	2015-03-31 22:36:53.336131373 -0400
-+++ b/effect.cpp	2015-03-31 22:37:04.359755281 -0400
-@@ -18,7 +18,7 @@
- void Effect::add(const int x, const int y)
- {
- 	object_struct *effect;
--	if((effect = add_object(x, y)) == NULL)
-+	if((effect = add_object(x, y, 0, 0)) == NULL)
- 	{
- 		return;
- 	}
---- a/object.h.orig	2015-03-31 22:35:22.939214561 -0400
-+++ b/object.h	2015-03-31 22:37:19.654233441 -0400
-@@ -172,7 +172,7 @@
- 	return object->next;
- }
- 
--template <class T>struct Object<T>::object_struct *Object<T>::add_object(const int x, const int y, const int speedx = 0, const int speedy = 0)
-+template <class T>struct Object<T>::object_struct *Object<T>::add_object(const int x, const int y, const int speedx, const int speedy)
- {
- 	object_struct *object;
- 
diff --git a/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch b/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch
deleted file mode 100644
index ecfdcc513cd0..000000000000
--- a/games-arcade/spacerider/files/spacerider-0.13-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -3,12 +3,12 @@
- BINDIR=/usr/bin/
- MANDIR=/usr/share/man/man1/
- DATADIR=/usr/share/games/spacerider/
--CXX=g++
-+CXX?=g++
- CP=cp
- MKDIR=mkdir -p
- INSTALL=install
- RM=rm -f
--CXXFLAGS=-Wall -fomit-frame-pointer -O3 `sdl-config --cflags`
-+CXXFLAGS+=$(shell sdl-config --cflags)
- OBJS=main.o globals.o spacerider.o music.o sprite.o enemy.o effect.o visible.o box.o features.o font.o image.o bullet.o
- OUTPUT=spacerider
- LIBS=`sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_net -lSDL_gfx
-@@ -22,8 +22,7 @@
- 
- 
- $(OUTPUT): $(OBJS)
--	$(CXX) $(CXXFLAGS) -o $(OUTPUT) $(OBJS) $(LIBS)
--	strip $(OUTPUT)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(OUTPUT) $(OBJS) $(LIBS)
- 
- %.o: %.cpp
- 	$(CXX) $(CXXFLAGS) -c $<
diff --git a/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch b/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch
deleted file mode 100644
index c590400f649f..000000000000
--- a/games-arcade/spacerider/files/spacerider-0.13-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/spacerider.cpp.old	2010-10-29 10:12:19.000000000 +0200
-+++ b/spacerider.cpp	2010-10-29 10:13:47.000000000 +0200
-@@ -112,7 +112,7 @@
- 				break;
- 			case 'n':
- 				/* specify a name for the online-highscore */
--				strncpy(name, optarg, 128);
-+				strncpy(name, optarg, sizeof (name));
- 				online_highscore = true;
- 				break;
- 			case 't':
diff --git a/games-arcade/spacerider/metadata.xml b/games-arcade/spacerider/metadata.xml
deleted file mode 100644
index 6d3980e569e5..000000000000
--- a/games-arcade/spacerider/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-spacerider is a space-shooter written in C++, using the SDL.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/spacerider/spacerider-0.13-r1.ebuild b/games-arcade/spacerider/spacerider-0.13-r1.ebuild
deleted file mode 100644
index 8cf24d976f7d..000000000000
--- a/games-arcade/spacerider/spacerider-0.13-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Space-shooter written in C++, using the SDL"
-HOMEPAGE="http://www.hackl.dhs.org/spacerider/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2" # stupid php script
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-mixer
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-net
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-gcc49.patch \
-		"${FILESDIR}"/${P}-font.patch
-	sed -i \
-		-e "s:/usr/share/games/spacerider:/usr/share/${PN}:" \
-		globals.cpp || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto "/usr/share/${PN}"
-	doins -r data
-	einstalldocs
-	newman ${PN}.{1,6}
-	newicon data/sprites/star_monster1/1.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Spacerider /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-arcade/spout-1.3-r1 b/games-arcade/spout-1.3-r1
new file mode 100644
index 000000000000..4aeb52633d29
--- /dev/null
+++ b/games-arcade/spout-1.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DEPEND=>=media-libs/libsdl-1.2.6
+DESCRIPTION=Abstract Japanese caveflier / shooter
+EAPI=6
+HOMEPAGE=http://freshmeat.net/projects/spout/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=media-libs/libsdl-1.2.6
+SLOT=0
+SRC_URI=http://rohanpm.net/files/old/spout-unix-1.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=0df36a69309862cf448bb6228ba45327
diff --git a/games-arcade/spout/Manifest b/games-arcade/spout/Manifest
deleted file mode 100644
index 41920a399fbc..000000000000
--- a/games-arcade/spout/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spout-unix-1.3.tar.bz2 92144 BLAKE2B 4512a3f47fddfbed7471fe81f8a7fa296f44aa12b3e3b69c0d665a4f95c82508460ab007a798c098ccbea68f1ccc827699f8428203e1217ea7a493e96810771c SHA512 46ed12a617a4084e8a5d1da56799fe7784ed288a254385b109ced6138ce904e658a44af445c1577112a3701a0b108fc886e3d06df41743b0d82b028eb8a846d6
-EBUILD spout-1.3-r1.ebuild 960 BLAKE2B 3a01a39fccda8a3fee2df1db0f3629d9d37a5aa777381fd2cc650f5f1a8dbb8ed51a548d98b1175a24d83fd81a50d6e54e02c21a1b98b771fd7e23ca2ade0d4b SHA512 debffeaa7e28627861ab768ad0caa241500cb282ff95e42a3c3938695bbcef36ce1f7df1cf92227668061472d3917490c331516aa6397617ba49f56fee7b7cce
-MISC metadata.xml 326 BLAKE2B 850fd4b72c1d6f35416e4950315f83ad45cb8f30baad1c103497f5829b36417e578ef45e43218b2cac33a464a728580fb4fa7ff0a769e0d634d0bdd237d5b6bd SHA512 6dcfdd1cb6906123842e4cc0262237fff7f99f1744cf1a798e42d42da560e866b16f898a71d996cdcdd27d818f92dbd19745a023cd963f9d762e49003beb92ea
diff --git a/games-arcade/spout/metadata.xml b/games-arcade/spout/metadata.xml
deleted file mode 100644
index 2e04b38a71db..000000000000
--- a/games-arcade/spout/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">spout</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/spout/spout-1.3-r1.ebuild b/games-arcade/spout/spout-1.3-r1.ebuild
deleted file mode 100644
index b9ba1a3b7a60..000000000000
--- a/games-arcade/spout/spout-1.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop readme.gentoo-r1
-
-MY_P="spout-unix-${PV}"
-DESCRIPTION="Abstract Japanese caveflier / shooter"
-HOMEPAGE="http://freshmeat.net/projects/spout/"
-SRC_URI="http://rohanpm.net/files/old/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2.6"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-To play in fullscreen mode, do 'spout f'.
-To play in a greater resolution, do 'spout x', where
-x is an integer; the larger x is, the higher the resolution.
-
-To play:
-* Accelerate - spacebar, enter, z, x
-* Pause - escape
-* Exit - shift+escape
-* Rotate - left or right
-"
-
-src_install() {
-	dobin spout
-	doicon spout.png
-	make_desktop_entry spout "Spout"
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-arcade/stardork-0.7-r1 b/games-arcade/stardork-0.7-r1
new file mode 100644
index 000000000000..ee1c58b5bf87
--- /dev/null
+++ b/games-arcade/stardork-0.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=An ncurses-based space shooter
+EAPI=6
+HOMEPAGE=http://stardork.sourceforge.net/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/stardork/stardork-0.7.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=13094b5bf3c82a83bca7e3766ec94508
diff --git a/games-arcade/stardork/Manifest b/games-arcade/stardork/Manifest
deleted file mode 100644
index a5f5e8e2e8f6..000000000000
--- a/games-arcade/stardork/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stardork-0.7.tar.gz 3951 BLAKE2B a35e8ceed5b5a6eb210408d6a7a32e2c38a3e2bbd05458055e44a1866b1bd0d2f222a6dce8ee8cbf6fe11d0c0541095ae0d9bad8e0b883ea74fd255e96364019 SHA512 3726b55cc2f107a0d69580b3c30406ea2596769433db915d4b3bded4345611c9d67596cbf373b19671960909d0bfdfc997d5c41d677f0309317445aeadcae733
-EBUILD stardork-0.7-r1.ebuild 593 BLAKE2B e65d8708d524c06dcd4f1dabff799f4a39d0160c7983d7174f0648cece2b3369724e1cb906af291479974910a5a593c4c797d60a7e90c90e95fbed05fa360a34 SHA512 dd679250b1555a16e44b5897b240552a6f0cc1a514090d8095c9618a39a9e7112e71ec09033639efe739e10df6db01366c5eb7ab5b1c310aba0e78907a83cca5
-MISC metadata.xml 331 BLAKE2B a08b7d4e1bf2c2afac8b4aaf9ac40efb25aa1cfd8227a1a51371a9fc893a7219f21438134d479f739b7f9e5d7fe668199c9392fdfd08b7248423092f69da0351 SHA512 b02a062748ef75daffb05cb8fbd3ea3eddea2f60b2aa64fbb6d7edb6529f260c60ec56d32f799e437d6dae4ce4b09c381afe8fee145d7c82672e52c830d1caed
diff --git a/games-arcade/stardork/metadata.xml b/games-arcade/stardork/metadata.xml
deleted file mode 100644
index 9ec7c6ba6559..000000000000
--- a/games-arcade/stardork/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">stardork</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/stardork/stardork-0.7-r1.ebuild b/games-arcade/stardork/stardork-0.7-r1.ebuild
deleted file mode 100644
index d2458f6571f1..000000000000
--- a/games-arcade/stardork/stardork-0.7-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="An ncurses-based space shooter"
-HOMEPAGE="http://stardork.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stardork/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	rm -f Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$(pkg-config ncurses --libs)" ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	einstalldocs
-}
diff --git a/games-arcade/supertransball2-1.5-r1 b/games-arcade/supertransball2-1.5-r1
new file mode 100644
index 000000000000..724fd58911ec
--- /dev/null
+++ b/games-arcade/supertransball2-1.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-sound media-libs/sge app-arch/unzip
+DESCRIPTION=Thrust clone
+EAPI=6
+HOMEPAGE=http://www.braingames.getput.com/stransball2/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-sound media-libs/sge
+SLOT=0
+SRC_URI=http://braingames.bugreport.nl/stransball2/stransball2-v15-linux.zip mirror://debian/pool/main/s/supertransball2/supertransball2_1.5-8.debian.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b0de973d27cb4423fae1289a32dc43f8
diff --git a/games-arcade/supertransball2/Manifest b/games-arcade/supertransball2/Manifest
deleted file mode 100644
index dfc7559f0a85..000000000000
--- a/games-arcade/supertransball2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST stransball2-v15-linux.zip 302212 BLAKE2B 8b45e32f37c805e75ba0d19ef004d75baea689fe87e946d50301cef01230492fd531b4100bc6200a261c24463443b2811faea8d200d15b15af0c884dbc285d2a SHA512 e87655dfca039c0c8553372b4da139f1d8fa420aad1909b422318dc049a9f7972c8d2398b83fde677b3eaf21d2d70fad73d7ec0c4b7bcbeacbf3544e6e575f6a
-DIST supertransball2_1.5-8.debian.tar.xz 26148 BLAKE2B 50ada1b6976da9686aa5cabd5e3a04222e30f9c69565018eebe51271842842dab88829c0672d7375995e3835c3be4983c8990e736278177d7d10596ed2453a0c SHA512 efbb8517b73d4413755663f96aa01eb679b43876091920a6d9a9fc0a31d001828aa536ac59e74172fa519d14b1dff117c150c022fb8f3898efbee2901a418a53
-EBUILD supertransball2-1.5-r1.ebuild 1346 BLAKE2B 5614b4f90e27a8da89bafa0562b8fc5414aeb9fefb9f7b76e37baf2bd5b295fcdd0feff5cb9b57875737d6f8561a9aca8844fbce40549ca58e20da9f81706e45 SHA512 eb13c56975274f9b2f88cfe4abe7221422e4206ba272848d6b2a912af0f73a5315f413b033b0109a40561ccab86e7811e319a8fd364a7f592e0794341f9d117f
-MISC metadata.xml 732 BLAKE2B 02a55b153806bf73c5f777a196d4bcaa79f3bf4155eda30b792b56ba1289df14c5d8597e38b1a2b122d7b53c4792e589a01b57bf31fafbae99333b3dead5e9f8 SHA512 ff6eef56c6c80e08bac6a0d2ce6f848d22e90c1326a2a3e0927c04fdabe38cd0736b8f3555cd8f0743d1ba6cc5094946488cb0b9cf1c1db4ee4176f3bde79e8d
diff --git a/games-arcade/supertransball2/metadata.xml b/games-arcade/supertransball2/metadata.xml
deleted file mode 100644
index e1b87682aaf5..000000000000
--- a/games-arcade/supertransball2/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-"Super Transbal 2" is the sequel of "Transball" and "Transball 2", Inspired in
-THRUST type of games (and concretely in ZARA THRUSTA for the Amiga 500). In each
-level of Transball, the goal is to find the SPHERE, capture it and carry it to
-the upper part of the level. The main obstacle is the gravity, that impulses you
-towards the ground. But many other obstacles, canons, tanks, doors, etc. will
-try to make difficult your journey...
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild b/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
deleted file mode 100644
index 96768ec7e1cd..000000000000
--- a/games-arcade/supertransball2/supertransball2-1.5-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit epatch desktop versionator
-
-MY_PV="$(delete_all_version_separators)"
-MY_P="stransball2-v${MY_PV}"
-FILE="${MY_P}-linux"
-
-DESCRIPTION="Thrust clone"
-HOMEPAGE="http://www.braingames.getput.com/stransball2/"
-SRC_URI="http://braingames.bugreport.nl/stransball2/${FILE}.zip
-	mirror://debian/pool/main/s/${PN}/${PN}_${PV}-8.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-sound
-	media-libs/sge
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${P}/sources"
-
-src_unpack() {
-	unpack ${A}
-	mv -f "${FILE}" ${P}
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/usr/share/games:/usr/share:" \
-		"${WORKDIR}"/debian/patches/0001-Fix-unix-paths-and-Makefile.patch || die
-
-	epatch "${WORKDIR}"/debian/patches/*.patch
-
-	sed -i \
-		-e "s: -I/usr/local/include/SDL::" \
-		-e "s:-g3 -O3:\$(CXXFLAGS):" \
-		-e "s:c++:\$(CXX):" \
-		Makefile || die "sed Makefile failed"
-}
-
-src_install() {
-	cd ..
-	dobin ${PN}
-
-	doicon ../debian/${PN}.png
-	make_desktop_entry ${PN} "Super Transball 2"
-	dodoc readme.txt
-	doman ../debian/supertransball2.6
-
-	insinto "/usr/share/${PN}"
-	doins -r demos graphics maps sound
-}
diff --git a/games-arcade/supertux-0.5.1 b/games-arcade/supertux-0.5.1
new file mode 100644
index 000000000000..c90985255c91
--- /dev/null
+++ b/games-arcade/supertux-0.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:= virtual/opengl media-libs/libvorbis media-libs/openal >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7 virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DESCRIPTION=A game similar to Super Mario Bros.
+EAPI=6
+HOMEPAGE=https://supertux.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0
+RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:= virtual/opengl media-libs/libvorbis media-libs/openal >=media-libs/libsdl2-2.0.1[joystick,video] >=media-libs/sdl2-image-2.0.0[png,jpeg] >=net-misc/curl-7.21.7
+SLOT=0
+SRC_URI=https://github.com/SuperTux/supertux/releases/download/v0.5.1/SuperTux-v0.5.1-Source.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_=67691f5894e5bda83431da8914d5660a
diff --git a/games-arcade/supertux/Manifest b/games-arcade/supertux/Manifest
deleted file mode 100644
index 520ddb9e7622..000000000000
--- a/games-arcade/supertux/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX supertux-0.4.0-desktop.patch 347 BLAKE2B fd34f3607975c4715dbba48e87c1090b992927e8ef5cd94a9054ea62de4bd79dcaa1b74e14a7af55aba68c06abc61311cfef2e2fd5ac79c78b86698dcc1579c4 SHA512 cc73bafd7862c52e7e52a2bb6b9198e731ae3c63a2c15a99df291a121c82b0f3daf5ffcbd565a3ba8bbbabf1d339ff88cfcd01549a0ea8846ad9a0c98961cec0
-AUX supertux-0.4.0-icon.patch 546 BLAKE2B c5e26bdb22cee7ffd8a3d9a9f87e0c2a486c4eb6857a7f9754106bac3fdcd80d2e95c7b62af2dcb32f34abd25af93d4de5d69a449ee1232ebc87a27d6319b6c0 SHA512 538adade8a8fafb187f893cdf870a9b212df52cc0c7d54d94438cfc4f4ddcaf871817aacac306656a6201dae70581de608a76694530e3d1138c70e5937f5fb6c
-AUX supertux-0.4.0-license.patch 599 BLAKE2B a89b596876956f260de582d7f31e1b8ded03471e5fbefd0cf9214dd95a54c889b295707becfbf9f98d32269e414acf498713cae47ae882604e8683eac926086a SHA512 d3609c7d0053d8f2bdaf4f91449ba71d8c2a2509bb6718393e06add5ff9b59a3dc78f70fcdb7ace4f73eab9325ab5ef64cf9399c0e65a9b31f5fc4bfeb6bb751
-AUX supertux-0.5.0-obstack.patch 958 BLAKE2B 41da812369a4a64040e7759a4c56a7b3fb42898f50fc58ef03d76a9c27cc904db9909223eee98f9f5a7f12b5c0fde295701633eab308fe495333df3989071de7 SHA512 aecba33369bb255c9fef8e0ed873d7c457ddd85340f2788bd3f517b1a126e943e0ec1085239f1fea7eb242d0344efaa5ddeaa14865cc61a6863dab44b854f9ed
-AUX supertux-0.5.0-tinygettext.patch 920 BLAKE2B 9558c2df82a03e1893ae10c0f283f257fda90493947e4fbaec24a6e4d540e0dcf28505be92be3224b4cb5f6ca978abc09adac0b86503132203e9ce0cacf2b1c2 SHA512 eaf1c0ca534cb6d0cd216bd69283856bdad46830210edb6b00d4d382b2a2045eede8e96fa7b1832e8e2246144452b59a82966621441362c56c8bd3ace758097e
-AUX supertux-0.5.1-ninja.patch 1045 BLAKE2B 2f59d8fdf05e1994ae9690cdce001ea6235f8c06e7438eba41b54264e631188210591adce6d212f08a497c31cca9f08542b4dff1cac4568b0fdb4410eaaecdb6 SHA512 8b877ab382913d74db9890bf19867efc0c6ff4a5901a679ffbfbe72142341e61c804e1f4def1bd1157f3f144b50f2eca143420b08940eeaaed93a9b8fc1c8d5d
-DIST SuperTux-v0.5.1-Source.tar.gz 90564367 BLAKE2B ba6549c135655d59ebbbed1431baf30cce1e0fb1bcdaee3dd050732992a02bb4dbd25b5399c83d3a7145f8afd20b3e8f4471007d424d2bc40c906d6121678123 SHA512 1a841cec9b71ff482aa271ec94f0563052ed33c65b26958c15c818f897f184356605a115abb70bdb8302f8cdb6e6107cf336790c3929cbc7e3dc78d31b4e2c8a
-EBUILD supertux-0.5.1.ebuild 1502 BLAKE2B fdda1513fc69f1c990243b3375e6e5f11dc46bef8434331a6b28aa0b3e78db1c2af81765a1b71d69b953721b68e24d64de1cc4a074773421e2312d09894851f7 SHA512 af5b234a5893f3162a88e006758f3d3ffc8631a3dd18d422a9ca598fbc00ff933fe62ed51ddbcfefecbfca9d10e74a609b06575d14398f842f5477e551292c01
-MISC metadata.xml 389 BLAKE2B 960cbba61ef7e12c35b66f36620ba2570e159517b06a520b0c233496c0910b2949f4f87b789f3c948621b6beb2ba0a4d5e8bdb277516213cbbc115d31af58698 SHA512 e61b89a6c0da8bf74f2b126e185fbf4be02b7ac7bc80082bd4c6e80384ab00db73a196af1ed9448a31435dbb62768b7eee8c8e64a40c51a6257bffe8170deb65
diff --git a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch b/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
deleted file mode 100644
index 74a087263368..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-desktop.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/supertux2.desktop
-+++ b/supertux2.desktop
-@@ -35,7 +35,7 @@
- Comment[pt]=Joga este clássico de plataformas 2D
- Comment[pt_BR]=Encarne o pinguin Tux neste jogo inspirado em clássicos de Pular&Correr
- Comment[hu]=Egy klasszikus 2D-s oldalnézeti játék
--Icon=supertux.png
-+Icon=supertux
- Exec=supertux2
- Terminal=false
- StartupNotify=false
diff --git a/games-arcade/supertux/files/supertux-0.4.0-icon.patch b/games-arcade/supertux/files/supertux-0.4.0-icon.patch
deleted file mode 100644
index 66be0ebe493b..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-icon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -571,7 +571,7 @@
- 
-   SET(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_SUBDIR_BIN}/supertux2")
- 
--  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.xpm DESTINATION "share/pixmaps/")
-+  INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/images/engine/icons/supertux.png DESTINATION "share/pixmaps/")
- 
- ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND DISABLE_CPACK_BUNDLING)
- ENDIF(WIN32 AND NOT UNIX)
diff --git a/games-arcade/supertux/files/supertux-0.4.0-license.patch b/games-arcade/supertux/files/supertux-0.4.0-license.patch
deleted file mode 100644
index e35f85ce416f..000000000000
--- a/games-arcade/supertux/files/supertux-0.4.0-license.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -578,7 +578,7 @@
- 
- INSTALL(TARGETS supertux2_exe DESTINATION ${INSTALL_SUBDIR_BIN})
- 
--INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/NEWS.md DESTINATION ${INSTALL_SUBDIR_DOC})
- 
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
- 
diff --git a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch b/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
deleted file mode 100644
index 1b05369f67f3..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.0-obstack.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- supertux-0.5.0/CMakeLists.txt
-+++ supertux-0.5.0/CMakeLists.txt
-@@ -382,7 +382,6 @@
- include_directories(${CMAKE_BINARY_DIR}/)
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
--include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
- include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/)
- 
- IF(WIN32)
-@@ -392,7 +391,7 @@
- 
- ## Build list of sources for supertux binary
- 
--FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/obstack/*.c external/findlocale/findlocale.c)
-+FILE(GLOB SUPERTUX_SOURCES_C RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/findlocale/findlocale.c)
- 
- FILE(GLOB SUPERTUX_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} src/*/*.cpp src/supertux/menu/*.cpp src/video/sdl/*.cpp)
- FILE(GLOB SUPERTUX_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PROJECT_BINARY_DIR}/tmp/*.rc")
diff --git a/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch b/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch
deleted file mode 100644
index 3bedc38eb803..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.0-tinygettext.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- SuperTux-v0.5.0-Source/external/tinygettext/CMakeLists.txt
-+++ SuperTux-v0.5.0-Source/external/tinygettext/CMakeLists.txt
-@@ -59,7 +59,7 @@
- )
- 
- ## Reveal library type choice to users
--option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" ON)
-+option(BUILD_SHARED_LIBS "Produce dynamic library instead of static archive" OFF)
- 
- # TinyGetText library compilation
- 
-@@ -128,17 +128,7 @@
- ## Debug options
- 
- option(WERROR "Stops on first compiler warning in debug mode" OFF)
--option(WARNINGS "Enable long list of warnings for compiler to check" ON)
--
--CHECK_CXX_FLAG(std=c++0x)
--CHECK_CXX_FLAG(O3)
--IF(NOT MSVC)
--    #MSVC is excessivly verbose when Wall is activated
--    CHECK_CXX_FLAG(Wall)
--ENDIF()
--CHECK_CXX_FLAG(Wextra)
--CHECK_CXX_FLAG(Weffc++)
--CHECK_CXX_FLAG(pedantic)
-+option(WARNINGS "Enable long list of warnings for compiler to check" OFF)
- 
- if(WARNINGS)
-   CHECK_CXX_FLAG(Wabi)
diff --git a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch b/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
deleted file mode 100644
index d5181177fdcd..000000000000
--- a/games-arcade/supertux/files/supertux-0.5.1-ninja.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Allow building with ninja instead of CMake, see also:
-
-  https://bugs.gentoo.org/649458
-  https://cmake.org/pipermail/cmake/2015-April/060234.html
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -332,7 +332,10 @@
-   -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-   -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-   -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX}
--  -DINSTALL_INC_DIR=include)
-+  -DINSTALL_INC_DIR=include
-+  BUILD_BYPRODUCTS
-+  squirrel/lib/libsquirrel_static.a
-+  squirrel/lib/libsqstdlib_static.a)
- 
- IF(WIN32)
- 	ADD_LIBRARY(squirrel_lib SHARED IMPORTED)
-@@ -370,7 +373,9 @@
-   -DHAVE_SDL=ON
-   -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX}
-   -DSDL2_INCLUDE_DIRS=${SDL2_INCLUDE_DIRS}
--  -DLIB_SUFFIX=${LIB_SUFFIX})
-+  -DLIB_SUFFIX=${LIB_SUFFIX}
-+  BUILD_BYPRODUCTS
-+  tinygettext/lib${LIB_SUFFIX}/libtinygettext.a)
- 
- ADD_LIBRARY(tinygettext_lib STATIC IMPORTED)
- SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}")
diff --git a/games-arcade/supertux/metadata.xml b/games-arcade/supertux/metadata.xml
deleted file mode 100644
index f4836cbdbe41..000000000000
--- a/games-arcade/supertux/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">super-tux</remote-id>
-		<remote-id type="github">SuperTux/supertux</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/supertux/supertux-0.5.1.ebuild b/games-arcade/supertux/supertux-0.5.1.ebuild
deleted file mode 100644
index c1773f3228cd..000000000000
--- a/games-arcade/supertux/supertux-0.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-inherit cmake-utils flag-o-matic
-
-MY_P="SuperTux-v${PV}-Source"
-
-DESCRIPTION="A game similar to Super Mario Bros."
-HOMEPAGE="https://supertux.org/"
-SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-games/physfs
-	dev-libs/boost:=
-	media-libs/glew:=
-	virtual/opengl
-	media-libs/libvorbis
-	media-libs/openal
-	>=media-libs/libsdl2-2.0.1[joystick,video]
-	>=media-libs/sdl2-image-2.0.0[png,jpeg]
-	>=net-misc/curl-7.21.7"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.0-{desktop,license,icon}.patch
-	"${FILESDIR}"/${PN}-0.5.0-{obstack,tinygettext}.patch
-	"${FILESDIR}"/${PN}-0.5.1-ninja.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# This is not a developer release so switch the logo to the non-dev one.
-	sed -e 's@logo_dev@logo@' \
-		-i data/images/objects/logo/logo.sprite || die
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DWERROR=OFF
-		-DINSTALL_SUBDIR_BIN=bin
-		-DINSTALL_SUBDIR_DOC=share/doc/${PF}
-		-DINSTALL_SUBDIR_SHARE=share/${PN}2
-		-DENABLE_SQDBG="$(usex debug)"
-		-DENABLE_BOOST_STATIC_LIBS=OFF # bug! Please check if this is still required.
-		-DUSE_SYSTEM_PHYSFS=ON
-	)
-	cmake-utils_src_configure
-}
diff --git a/games-arcade/syobon-1.0.1-r1 b/games-arcade/syobon-1.0.1-r1
new file mode 100644
index 000000000000..3b90731e482f
--- /dev/null
+++ b/games-arcade/syobon-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] virtual/pkgconfig
+DESCRIPTION=Syobon Action (also known as Cat Mario or Neko Mario)
+EAPI=6
+HOMEPAGE=http://zapek.com/?p=189
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://download.zapek.com/software/syobon/syobon_1.0.1_src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=048edf46c3a5dbb0d59f683b56473d98
diff --git a/games-arcade/syobon/Manifest b/games-arcade/syobon/Manifest
deleted file mode 100644
index a55aba692267..000000000000
--- a/games-arcade/syobon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST syobon_1.0.1_src.tar.gz 2721153 BLAKE2B 4e5dd2689f531478aef2bc5f6723da1b0c2bcf04bd532775f6883660aedcd4226f9f42dc1ce5d19baa0d4544b4ff3084195a06ffef732cc9adbae412f1c7fd6a SHA512 9a8ff389bb23563a16f1b56aefdb93cf0ee5be74c6d48276ce76a17159bc021f517a69eb300a1c17ee81d4112ba26f0d386a1e2e37bced681044c3a3ca4f7ca5
-EBUILD syobon-1.0.1-r1.ebuild 772 BLAKE2B 6512720e67757b7b7a819dc5d0d8b6f2f40bd7e05e0de7f3884d51dd3f0e1499d3bc7e4b750304be0ce8b21eea84ae3a6da21af2619203757c6edfd7e97ff886 SHA512 27130ae3a6ea68707e492510c1741c745ed1daf2b1439ce7ed2ec692c7ce542690e5b1b7e74afeff332fb965722c742caaae09a76f6ae74632cb6b359be52cbc
-MISC metadata.xml 447 BLAKE2B a8c3653a831764ec241f5e4448fa03df5b3e13fc18e188864027dac2302195719428f2c7553159140624d496bc94c5b76f83192bcfb5b4e485d2d186845bf0d9 SHA512 e05cc20ab94d71e669fd1b3048226a34585c76bfd30d92e1cc997301d8f100242c190c8770eb28a61b338347a5c0666e76c564e46a2692304f0d67246a0eb2f5
diff --git a/games-arcade/syobon/metadata.xml b/games-arcade/syobon/metadata.xml
deleted file mode 100644
index 2febf6c19b63..000000000000
--- a/games-arcade/syobon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Syobon Action (also known as Cat Mario or Neko Mario) is a platform game with a similar gameplay experience as Super Mario Bros, except it's a lot more difficult.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/syobon/syobon-1.0.1-r1.ebuild b/games-arcade/syobon/syobon-1.0.1-r1.ebuild
deleted file mode 100644
index c0bb5d581bbb..000000000000
--- a/games-arcade/syobon/syobon-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_P="${PN}_${PV}_src"
-
-DESCRIPTION="Syobon Action (also known as Cat Mario or Neko Mario)"
-HOMEPAGE="http://zapek.com/?p=189"
-SRC_URI="http://download.zapek.com/software/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,video,joystick]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake GAMEDATA="/usr/share/${PN}"
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto "/usr/share/${PN}"
-	doins -r BGM SE res
-	einstalldocs
-
-	make_desktop_entry ${PN}
-}
diff --git a/games-arcade/tecnoballz-0.92 b/games-arcade/tecnoballz-0.92
new file mode 100644
index 000000000000..5364ba9b6074
--- /dev/null
+++ b/games-arcade/tecnoballz-0.92
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 >=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 exciting Brick Breaker
+EAPI=5
+HOMEPAGE=http://linux.tlk.fr/games/TecnoballZ/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 games-misc/games-envd
+SLOT=0
+SRC_URI=http://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-0.92.tgz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9ec3d67c79c1f4e5b3e093cb4b413e72
diff --git a/games-arcade/tecnoballz/Manifest b/games-arcade/tecnoballz/Manifest
deleted file mode 100644
index 36cb99b2d9d0..000000000000
--- a/games-arcade/tecnoballz/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tecnoballz-0.92-automake.patch 3753 BLAKE2B eebbb25a20b0916413f294764a6c5c88c686634bf722dbaf549ddb2829fb6fafab41bf41a3bcdec81c706acec3190c59acd67f3c4d9133674e083e439d1b127e SHA512 d18460a5129f97315384061858aa8f0b7d899daf3420ed442bc76840c013a732add50309d437c9dca37902b1d8820a7ff58839785017f4d314f614195c7e51d2
-AUX tecnoballz-0.92-gcc43.patch 456 BLAKE2B 01496e6a99ccf11507f0c0bdb6542551a99e7e25ef7f4cfd0005668ead93bab8f8e74ca4b7ef086f93c9f1d512422e76c62ee651a5e0a3af6c571caba2ba1ea1 SHA512 2fd980efff3bc9f1c68cd8c882cce877e1539c02fefeb241ff7c495fe2c4e872d143271cbaec45a576fd125c01fe45c4652201db9d20fb47eb51e7a372f1a2e7
-AUX tecnoballz-0.92-gcc6.patch 1583 BLAKE2B 27cab826c7f5fbd0cabd127618ab86136663865bb8d9090a78d5910c63763480d990fca36115b93a3c3743ef0fd2e61e1982fe97edd1c22dcb98ac7ae065505c SHA512 ffaa131b2d23c6cbb2cdba16443d898dd3719b54eac7f71b3c24678b4050520df19155ae92d1b095f9da4bf33cc80496ff57a4f4bcf78073dd220ce0face0c89
-DIST tecnoballz-0.92.tgz 2763879 BLAKE2B a9414c402781e9d65da5e3c0cfe4815fd80978ff874fa245237baca960278c85ba33ff2a59debf0cd6547d75e20f39afc058bd1204405ecef27d62bb8bdfdbb7 SHA512 e3868e846cdebaed6ee78050560be86557c6d01ee6512375a09eccbcf70f0cd12e419c6997a348794a41dfb75f0f3cb70321f1bb9a9bf1156a90976b0e401e13
-EBUILD tecnoballz-0.92.ebuild 1132 BLAKE2B a941c72e6338ed2ceed871a43bf668a323465be7cf558532da858253e51f163d7ea5cecca8cdfd9d4f3eb3b6b5bfe7416592bfa4b22730af3cc886feee0b0346 SHA512 f28c04a33233d2178440cf1fcaf26eb3e16daa9d4913fc2432ab855be4bb527b175c19b9a9a1fdefb703855e0bebb830530a5169dd2a739ad0da76ca1f59fbd6
-MISC metadata.xml 639 BLAKE2B ba0f916050e1914e47eec668152e2d935e537d68a54bb5d75613fe8b3a4162e8bcff96e6910230d55aa3899d2131757002d28f925aa38b9ed983467a8c070353 SHA512 edcb9678cca9ef9f537c4f2716799a5aa6a5890188173c06d9702fa99cb68411003d0aeb04e4df90faeb6efcdd024c4e494a51ed8645b7217fc073aa9916b8a5
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch
deleted file mode 100644
index b2f0379e4899..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-automake.patch
+++ /dev/null
@@ -1,116 +0,0 @@
---- Makefile.am.old	2008-10-07 10:42:11.000000000 +0200
-+++ Makefile.am	2008-10-07 10:49:35.000000000 +0200
-@@ -1,18 +1,6 @@
- 
--gamesdir = $(prefix)/games
--scoredir = /var/games/tecnoballz
--score = tecnoballz.hi
-+localstate_DATA = tecnoballz.hi
- 
--SUBDIRS = src 
-+SUBDIRS = src man
- 
--pkgdatadir = $(mandir)/man6
--dist_pkgdata_DATA = man/tecnoballz.6
--
--install-data-hook:
--	-chown root:games "$(DESTDIR)/$(gamesdir)/tecnoballz"
--	-chmod 2755 "$(DESTDIR)/$(gamesdir)/tecnoballz"
--	$(INSTALL) -d $(DESTDIR)/$(scoredir)
--	$(INSTALL) $(score) $(DESTDIR)/$(scoredir) 
--	-chown root:games "$(DESTDIR)/$(scoredir)/$(score)"
--	-chmod 664 "$(DESTDIR)/$(scoredir)/$(score)"
- 
---- src/Makefile.am.old	2008-10-07 11:16:44.000000000 +0200
-+++ src/Makefile.am	2008-10-07 11:18:32.000000000 +0200
-@@ -1,14 +1,12 @@
- 
- NULL =
--gamesdir = $(prefix)/games
--scoredir = /var/games/tecnoballz
- score = tecnoballz.hi
- 
- SUBDIRS = TecnoballZ 
- 
--games_PROGRAMS = tecnoballz
-+bin_PROGRAMS = tecnoballz
- tecnoballz_SOURCES = $(SOURCES_MAIN) 
--tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(scoredir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ 
-+tecnoballz_CXXFLAGS = -DDATADIR=\"$(datadir)/tecnoballz\" -DSCOREFILE=\"$(localstatedir)/$(score)\" @XLIB_CFLAGS@ @SDL_CFLAGS@ @MIKMOD_FLAGS@ 
- tecnoballz_LDADD = @XLIB_LIBS@ @SDL_LIBS@ @MM_LIBS@ @MIKMOD_LIBS@ -L.
- 
- SOURCES_MAIN = \
---- src/TecnoballZ/Makefile.am.old	2008-10-07 17:17:47.000000000 +0200
-+++ src/TecnoballZ/Makefile.am	2008-10-07 17:20:03.000000000 +0200
-@@ -1,6 +1,6 @@
- NULL =
- 
--SUBDIRS = lores hires textures sounds musics
-+SUBDIRS = lores hires textures sounds musics texts
- 
- pkgdatadir = $(datadir)/tecnoballz
- dist_pkgdata_DATA = \
-@@ -14,4 +14,5 @@
-   tilemap-guardians_40.data \
-   tilemap-menu_20.data \
- 	tilemap-menu_40.data \
-+	levels-data.xml \
- 	$(NULL)
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ src/TecnoballZ/texts/Makefile.am	2008-10-07 17:30:18.000000000 +0200
-@@ -0,0 +1,11 @@
-+textsdir = $(pkgdatadir)/texts
-+texts_DATA = main_menu_en.txt \
-+	main_menu_fr.txt \
-+	popup_menu_en.txt \
-+	popup_menu_fr.txt \
-+	scrolltext_en.txt \
-+	scrolltext_fr.txt \
-+	shop_en.txt \
-+	shop_fr.txt \
-+	short_info_messages_en.txt \
-+	short_info_messages_fr.txt
---- configure.ac.old	2008-10-08 23:10:26.000000000 +0200
-+++ configure.ac	2008-10-08 23:11:08.000000000 +0200
-@@ -50,21 +50,6 @@
- 
- LDFLAGS_="${LDFLAGS_save}"
- 
--AC_CHECK_LIB(vorbisfile, ov_raw_seek, [
--	MM_LIBS="${MM_LIBS} -lvorbisfile"
--],[
--	AC_MSG_ERROR(Could not find the vorbisfile lib : -lvorbisfile)
--])
--AC_CHECK_LIB(ogg, ogg_stream_packetin, [
--	MM_LIBS="${MM_LIBS} -logg"
--],[
--	AC_MSG_ERROR(Could not find the ogg lib : -logg)
--])
--AC_CHECK_LIB(smpeg, SMPEG_play, [
--	MM_LIBS="${MM_LIBS} -lsmpeg"
--],[
--	AC_MSG_ERROR(Could not find the smpeg lib : -lsmpeg)
--])
- AC_SUBST(MM_LIBS)
- 
- AC_CHECK_LIB(mikmod, Player_Stop, [
-@@ -81,5 +81,8 @@
- 
- 
- dnl  Output makefiles
--AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile)
-+AC_OUTPUT(Makefile src/Makefile src/TecnoballZ/Makefile src/TecnoballZ/hires/Makefile src/TecnoballZ/lores/Makefile src/TecnoballZ/textures/Makefile src/TecnoballZ/musics/Makefile src/TecnoballZ/sounds/Makefile
-+	src/TecnoballZ/texts/Makefile
-+	man/Makefile
-+	man/fr/Makefile)
- 
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ man/Makefile.am	2008-10-08 10:36:15.000000000 +0200
-@@ -0,0 +1,2 @@
-+SUBDIRS = fr
-+man_MANS = tecnoballz.6
---- /dev/null	2008-09-26 15:07:13.448004290 +0200
-+++ man/fr/Makefile.am	2008-10-08 10:36:15.000000000 +0200
-@@ -0,0 +1,2 @@
-+mandir = @mandir@/fr
-+man_MANS = tecnoballz.6
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch
deleted file mode 100644
index ae190abd64c6..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/surface_sdl.h.old	2008-10-07 10:16:25.000000000 +0200
-+++ include/surface_sdl.h	2008-10-07 10:16:38.000000000 +0200
-@@ -46,7 +46,7 @@
-   ~surface_sdl ();
-   SDL_Surface* get_surface ();
-   char* get_pixel_data ();
--  char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
-+  char* get_pixel_data (Uint32 coord_x, Uint32 coord_y);
-   Uint32 get_row_size ();
-   Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
-   void clear (Uint32 color = 0);
diff --git a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch b/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch
deleted file mode 100644
index f06a2ac2a0db..000000000000
--- a/games-arcade/tecnoballz/files/tecnoballz-0.92-gcc6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=610974
-Commit: https://github.com/brunonymous/tecnoballz/commit/29c5f137555897c8fb73b4780295524b214b24a2
-
---- a/include/tiles_background.h
-+++ b/include/tiles_background.h
-@@ -47,7 +47,7 @@
-     static tiles_background* tiles_background_singleton;
-     static Sint32 table_pos1[16];
-     static Sint32 table_pos2[16];
--    static char couleurs[448];
-+    static unsigned char couleurs[448];
-     static const Sint32 TILES_32_WIDTH = 32;
-     static const Sint32 TILES_32_HEIGHT = 32;
-     static const Sint32 TILES_64_WIDTH = 64;
-@@ -63,7 +63,7 @@
-      * or TILES_32x32_WITH_4_COLORS */
-     Uint32 type_of_tiles;
-     /** 4 color palette index */
--    Uint32 palette_index;
-+    Sint32 palette_index;
- 
-     bitmap_data *current_tiles;
-     Uint32 *map_tiles;
---- a/src/tiles_background.cc
-+++ b/src/tiles_background.cc
-@@ -663,8 +663,8 @@
- 
-     }
-   palette_index = pal_index;
--  char *color = &couleurs[0];
--  unsigned char *colPT = (unsigned char *) (color) + pal_index;
-+  unsigned char *color = &couleurs[0];
-+  unsigned char *colPT = (color) + pal_index;
-   SDL_Color *pal = display->get_palette ();
-   SDL_Color *lighted = pal + 1;
-   SDL_Color *dark = lighted + 128;
-@@ -702,7 +702,7 @@
-  * 4 * 4    : 16 composantes by palette
-  * 112 * 4  : 448 composantes
- */
--char
-+unsigned char
- tiles_background::couleurs[448] = {
-                                     0x00, 0x40, 0x20, 0x40, 0x00, 0x60, 0x40, 0x60, 0x00, 0x80, 0x60, 0x80,
-                                     0x00, 0xA0, 0x80, 0xA0, 0x00, 0x00, 0x20, 0x40, 0x00, 0x20,
diff --git a/games-arcade/tecnoballz/metadata.xml b/games-arcade/tecnoballz/metadata.xml
deleted file mode 100644
index 5dbd2510d79a..000000000000
--- a/games-arcade/tecnoballz/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-A exciting Brick Breaker with 50 levels of game and 11 special levels,
-distributed on the 2 modes of game to give the player a sophisticated system of
-attack weapons with an enormous power of fire that can be build by gaining
-bonuses. Numerous decors, musics and sounds complete this great game. This
-game was ported from the Commodore Amiga.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild b/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
deleted file mode 100644
index 3ece75e8838e..000000000000
--- a/games-arcade/tecnoballz/tecnoballz-0.92.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools games
-
-DESCRIPTION="An exciting Brick Breaker"
-HOMEPAGE="http://linux.tlk.fr/games/TecnoballZ/"
-SRC_URI="http://linux.tlk.fr/games/TecnoballZ/download/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]
-	media-libs/libmikmod:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc6.patch \
-		"${FILESDIR}"/${P}-automake.patch
-	mv man/${PN}.fr.6 man/fr/${PN}.6 || die
-	# don't combine explicit and implicit rules for make 3.82 (bug #334629)
-	sed -i -e '/supervisor.c /s/.c /.cc /' src/Makefile.am || die
-	sed -i -e '/^CXXFLAGS=/d' configure.ac || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	fperms g+w "${GAMES_STATEDIR}"/${PN}.hi || die
-	make_desktop_entry ${PN} Tecnoballz
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	has_version "media-libs/sdl-mixer[mikmod]" \
-		|| ewarn "To have background music, emerge sdl-mixer with USE=mikmod"
-	games_pkg_postinst
-}
diff --git a/games-arcade/thinktanks-demo-1.1-r3 b/games-arcade/thinktanks-demo-1.1-r3
new file mode 100644
index 000000000000..0303215dae22
--- /dev/null
+++ b/games-arcade/thinktanks-demo-1.1-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Tank combat game with lighthearted, fast paced pandemonium
+EAPI=6
+HOMEPAGE=http://www.garagegames.com/pg/product/view.php?id=12
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=THINKTANKS
+RDEPEND=media-libs/libsdl[video,joystick,abi_x86_32(-)] media-libs/libogg[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v1.1.sh.bin
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=72494249f263f835f73c50334e10ecf7
diff --git a/games-arcade/thinktanks-demo/Manifest b/games-arcade/thinktanks-demo/Manifest
deleted file mode 100644
index e4aa43c86512..000000000000
--- a/games-arcade/thinktanks-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ThinkTanksDemo_v1.1.sh.bin 12115802 BLAKE2B 398df35dc7f6020cadfcf36209ddec3c10229f62539f0a6cead3c5b815a36816a2d51e9d09315ccae2e60855a3e7e1310196276758b41e66c7b32e7f102ddfbc SHA512 9134c44c4e02df4bd7edbd3946125598c87dc3adbeff318f0b265dd2c5fbcebd49bd810d848cc5da29c86ad323fdb2c9adc0006b26680b0bd78b4d0de54419a1
-EBUILD thinktanks-demo-1.1-r3.ebuild 1144 BLAKE2B fa96fca23a1659748aba95a423e5a9dd244de6d9ca479fa6374abd40a7f71a402c1643860677c223fca089e9b07e2b73b0c11732298d15747566de0fbd339b32 SHA512 960d72cd762c9f24f90a21f3d801185558e52528af5fe046f70e16ca62583ac5df448bb5310bdbd1b37fa6e1b6714ef7d4c32d5d9322e51533eb626d01f5c557
-MISC metadata.xml 2343 BLAKE2B 81e0b71bd2aa43d390cabc4cf316034817c03a694c561aa223959401a3b90637225ea6b2b2748feee5d9e270a158b92acd9ee689f870f62753c863f7942991b2 SHA512 bdf46a6c55e6cbddc81b70134d0d906dc2e0c28714c0278affcd60465c8ab1b5e9ad440e463db1c6a589b080d8a3e7c88a2ee1f857d29f1515f5b92f9146b234
diff --git a/games-arcade/thinktanks-demo/metadata.xml b/games-arcade/thinktanks-demo/metadata.xml
deleted file mode 100644
index 736bc171d9e2..000000000000
--- a/games-arcade/thinktanks-demo/metadata.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-ThinkTanks is a tank combat game designed to be a blast for the new and 
-experienced gamer alike with lighthearted, fast paced pandemonium. Either 
-battling against brain-hungry bots in solo play or going head-to-head against 
-others online, ThinkTanks has something for everyone.
-
-You find yourself in a ThinkTank... just one of many brain slaves imprisoned by 
-Alien Mind Control-- only you have managed to escape their brain rays. But the 
-moment you are free, you are besieged on all sides by insane bot-tanks. You must 
-destroy or be destroyed and keep on your toes at all times. Luckily you can 
-collect powerups that give you wacky weapons to help you stay alive. As you 
-progress through each level, the bot tanks get smarter, stronger and crazier as 
-Alien Mind Control reprograms the bot tanks to match your wits. Your goal is to 
-beat the bosses, then rescue your brain-brethren and continue the fight on other 
-worlds.
-
-Upon entering, you are immediately engaged by heavy artillery. This is 
-no-holds-barred warfare and to the victor go the points. You can be catapulted or 
-thrust in any direction by rolling over the boost and jump pads to escape attack 
-or rush the enemy. The lush, green hills are scattered with bots on the warpath, 
-bots choking in their own smoke, floating orbs with special powers and 
-ammunition, boulders, trees, AND the dreaded pit of doom. The goal here is to 
-keep your brain intact, and triumph over bots of every shape, size, speed and 
-skill.
-
-You are cast into a veritable feeding frenzy of tanks. You need to simultaneously 
-track the position of your tank relative to the scrum ball using your radarscope, 
-while navigating your tank along the bumpy terrain. If you are quick enough to 
-pick up the ball yourself, you must make a mad dash to the goal, evading the 
-thirsty pack of mad bots heavy on your trail. You win by capturing the most scrum 
-balls in the allotted time.
-
-Both On-line BattleMode and Scrum games have team-play variants and online chat 
-that allow players to play together cooperatively.
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild b/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild
deleted file mode 100644
index a672cd15f03e..000000000000
--- a/games-arcade/thinktanks-demo/thinktanks-demo-1.1-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop unpacker
-
-DESCRIPTION="Tank combat game with lighthearted, fast paced pandemonium"
-HOMEPAGE="http://www.garagegames.com/pg/product/view.php?id=12"
-SRC_URI="ftp://ggdev-1.homelan.com/thinktanks/ThinkTanksDemo_v${PV}.sh.bin"
-
-LICENSE="THINKTANKS"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="
-	media-libs/libsdl[video,joystick,abi_x86_32(-)]
-	media-libs/libogg[abi_x86_32(-)]
-	media-libs/libvorbis[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-"
-DEPEND=""
-
-S="${WORKDIR}"
-dir="/opt/${PN}"
-
-QA_PREBUILT="${dir:1}/ThinkTanks.bin"
-
-src_install() {
-	dodir "${dir}" "/usr/bin"
-
-	tar -zxf ThinkTanks.tar.gz -C "${ED}/${dir}" || die
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/thinktanksdemo
-	dosym "${dir}"/thinktanksdemo /usr/bin/thinktanks-demo
-	# Using system libraries
-	rm -rf "${ED}/${dir}"/lib
-
-	insinto "${dir}"
-	doins icon.xpm
-
-	newicon icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Thinktanks (Demo)" /usr/share/pixmaps/${PN}.xpm
-
-	dodoc ReadMe_Linux.txt
-}
diff --git a/games-arcade/tomatoes-1.55-r2 b/games-arcade/tomatoes-1.55-r2
new file mode 100644
index 000000000000..118c990cf8a5
--- /dev/null
+++ b/games-arcade/tomatoes-1.55-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod]
+DESCRIPTION=How many tomatoes can you smash in ten short minutes?
+EAPI=5
+HOMEPAGE=http://tomatoes.sourceforge.net/about.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/tomatoes/tomatoes-linux-src-1.55.tar.bz2 mirror://sourceforge/tomatoes/tomatoes-linux-1.5.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=170747b34b3a011637e3faf890c35b6e
diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
deleted file mode 100644
index d11ce04e52c5..000000000000
--- a/games-arcade/tomatoes/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX tomatoes-1.55-c_str.patch 573 BLAKE2B eccedf249d78074ce6292d580ad71cf9ff9b55f70d03976f26225f144b06c090714c4815c925cfc425bd8094e28fb1e5d0a5bf3ed6a48b6400c892afc922a812 SHA512 fce01efcdea6f14c497b747158e03e57fc39f532ddad7f8da80d6c94be6e9ec6b46b43e908e96f9b3744029ff285699f72b91a73b21b3e213d7054bf4e14f927
-AUX tomatoes-1.55-gcc43.patch 278 BLAKE2B 6597c2e500add91cf58f3a45e88d26b684f90b6a7a4644063701958cd5ba9b7f2d7c296f4c0adbd7718e72fdfc0198cfb0531d256f4d6c37d2ac54afa8b39ae1 SHA512 b0f6e5c3468902f73b2f88327f510b726082af6ace75d15f1d72c95d7ff19cfefef5558f2cdb2e0cf363a80f3c624c912825a1abb251608577bd617972b88e1c
-AUX tomatoes-1.55-underlink.patch 977 BLAKE2B 15d602a7a1618e331a4fe62ee72c22ff91af47cd1dfbf11f6b7039d7e43599c97d9a79705091f65cf1f2be5adbc8d8ed11f0246a8386134bc5694de901302175 SHA512 c6b1fb64b0196f0eb6a6f0d6a779d437d09901737670f66309598a84706615e1c9e48e60a7f6db15ce10f9237c1bdf8589cec39c46a4659fd4fcb3fe39225aa8
-DIST tomatoes-linux-1.5.tar.bz2 8807421 BLAKE2B ee2128018d13d274b0ed5b27f9339b4e9d47a15753411c30d4174607c252d10d64a40e40b25454adb6f14ec96845b92cf9b0fe57b3bdcbbb70fe905ec0bf1c0e SHA512 517f592bb3c3fb43cb740c58011f06b7a71c96eaff74ce1088db8dbd4aafa3463bba516547cd010e9ef2ca947fd36962c3d13ece6e979cab8adf01ffa991c308
-DIST tomatoes-linux-src-1.55.tar.bz2 62947 BLAKE2B 22561900842dfe4cb56128ddaf471fac56a2c93b4c24ce3cca7045d10235ab60b81184c9617f9f4d10877df23e6db0d5abc0dc032d38788993daab1a2c49ab1e SHA512 b5a6287659746179f0418630c55d34dc34897b532687007386b0b540ec728cc2492813f0d454314994a26a3629a24c802630085f64b969d1e6ea9ec936f5fe35
-EBUILD tomatoes-1.55-r2.ebuild 1590 BLAKE2B 8fcbf3ecad477c5f4e3d80082be96ee75f951233d7be70f7538692ccc91e737e55cfdb50968bdde922f579009a35e9e6ed6da21928af30e39298e74368b1aa4d SHA512 253966b1037eeb4e4143ed467f93e18df6eda3e0cb89a8a4e462b71925d72aff3faba5b685bb18b4a6be03173e200ca43f2c4fe6c6f48e764dc9bde98e07a068
-MISC metadata.xml 331 BLAKE2B 312d2ef06020a89fa08e79d82b22727eff32e689182f3f142bbc788555d2b05ddf93414a616deff188bc6d2ae35561da8fd832c2541c404d6136da144950c5b9 SHA512 adee588bcc930244c19ea9a3ac34b70c3afbbbed2b68d61289742fd7ca3d97eae5724cef90d350a4e5b8ff8b594f8d25fc1a5fbc672459034d0a492bb155223d
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
deleted file mode 100644
index dd6927e54153..000000000000
--- a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/config.cpp.orig	2004-09-27 11:35:48.000000000 +0200
-+++ src/config.cpp	2006-02-13 00:00:01.000000000 +0100
-@@ -78,6 +78,7 @@
- // makefile.
- char *get_config_location(bool write) {
- #ifdef LINUX
-+	static char *config_path = NULL;
- 	// Get the path to the config file
- 	string tmp = get_tomatoes_dir() + "config.cfg";
- 
-@@ -90,8 +91,11 @@
- 		}
- 		fclose(ftest);
- 	}
--
--	return (char*)tmp.c_str();
-+       if (!config_path) {
-+		config_path = new char[tmp.length()+1];
-+		strcpy(config_path,tmp.c_str());
-+	}
-+	return config_path;
- #endif
- 
- 	// Return the CONFIG_DIR
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
deleted file mode 100644
index cd85e31e5936..000000000000
--- a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/config.cpp
-+++ src/config.cpp
-@@ -27,8 +27,9 @@
- 
- *************************************************************************/
- 
--#include <stdio.h>
--#include <stdlib.h>
-+#include <cstring>
-+#include <cstdio>
-+#include <cstdlib>
- #include "config.h"
- #include "init.h"
- 
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
deleted file mode 100644
index c028c79ba4a7..000000000000
--- a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- makefile.old	2011-06-18 17:35:38.947020335 +0200
-+++ makefile	2011-06-18 17:37:42.337811088 +0200
-@@ -48,7 +47,7 @@
- LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg
- else
- CFLAGS = -MMD -O3 -march=$(MARCH) -Wall $(SDL_FLAGS)
--LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -s
-+LDLIBS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -lm
- endif
- endif
- 
-@@ -58,7 +57,7 @@
- OBJS := $(subst src/,obj/,$(OBJS))
- 
- # Include directories
--INCLUDES = -I./include
-+INCLUDES = -I./include $(SDL_FLAGS)
- 
- 
- # Targets
-@@ -69,7 +68,7 @@
- -include $(DEPS)
- 
- $(TARGET): $(OBJS)
--	$(CC) -o $(TARGET) $(OBJS) $(LDFLAGS)
-+	$(CXX) -o $(TARGET) $(OBJS) $(LDFLAGS) $(LDLIBS)
- 
- clean:
- 	rm -f $(OBJS) $(TARGET)
-@@ -80,7 +79,7 @@
- rebuild: veryclean all
- 
- obj/%.o: src/%.cpp
--	$(CC) $(CFLAGS) $(INCLUDES) $(DIR_DEFINES) -c $< -o $@
-+	$(CXX) $(CXXFLAGS) $(INCLUDES) $(DIR_DEFINES) -c $< -o $@
- 
- # Compress the exe with UPX
- compress: $(TARGET)
diff --git a/games-arcade/tomatoes/metadata.xml b/games-arcade/tomatoes/metadata.xml
deleted file mode 100644
index b774279148e4..000000000000
--- a/games-arcade/tomatoes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">tomatoes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
deleted file mode 100644
index dd5658f861bf..000000000000
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DATA_PV=1.5
-DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
-HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
-SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
-	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv ../tomatoes-1.5/* . || die "mv failed"
-	mv icon.png ${PN}.png
-
-	epatch \
-		"${FILESDIR}"/${P}-c_str.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-
-	sed -i \
-		-e "/^MPKDIR = /s:./:${GAMES_DATADIR}/${PN}/:" \
-		-e "/^MUSICDIR = /s:./music/:${GAMES_DATADIR}/${PN}/music/:" \
-		-e "/^HISCOREDIR = /s:./:${GAMES_STATEDIR}/${PN}/:" \
-		-e "/^CONFIGDIR = /s:./:${GAMES_SYSCONFDIR}/${PN}/:" \
-		-e "/^OVERRIDEDIR = /s:./data/:${GAMES_DATADIR}/${PN}/data/:" \
-		makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	dogamesbin tomatoes
-	dodoc README README-src
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r tomatoes.mpk music
-
-	doicon ${PN}.png
-	make_desktop_entry tomatoes "I Have No Tomatoes"
-
-	dodir "${GAMES_STATEDIR}"/${PN}
-	touch "${D}${GAMES_STATEDIR}"/${PN}/hiscore.lst || die "touch failed"
-	fperms 660 "${GAMES_STATEDIR}"/${PN}/hiscore.lst
-
-	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	doins config.cfg
-
-	prepgamesdirs
-}
diff --git a/games-arcade/trailblazer-0.9 b/games-arcade/trailblazer-0.9
new file mode 100644
index 000000000000..2e079ae0dd07
--- /dev/null
+++ b/games-arcade/trailblazer-0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=media-libs/libsdl-1.2.7[video]
+DESCRIPTION=Guide a ball through a succession of levels while avoiding holes
+EAPI=5
+HOMEPAGE=http://www.autismuk.freeserve.co.uk/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.7[video] games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.autismuk.freeserve.co.uk/trailblazer-0.9.tgz
+_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_=09694ddac07bcacb6772768b6c5ce609
diff --git a/games-arcade/trailblazer/Manifest b/games-arcade/trailblazer/Manifest
deleted file mode 100644
index 3e42c34f58a2..000000000000
--- a/games-arcade/trailblazer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX trailblazer-0.9-ldflags.patch 317 BLAKE2B 49b4737c6527b209d12260314569224909ae9eba4a4b7643b426fdebf438ffc975f3a812380fa8bedfb7a4a3d1e36cc82cda0f2381a5cfcf42dee284c83b86ec SHA512 ba7885017a4e1d6a653119d591205a9e640d9c17c7a8b79226ce1c8f6b3ff3e1a6727a7b2d78cb7cfe21263c290288c8e140d6abcce751e1d9c79feeed5c2ff2
-AUX trailblazer-0.9-underlink.patch 320 BLAKE2B 06f88c4d95d5cafd818611d3f2c991cc82213a6e7f655f0ae8a2017d6404495568edb279e8cd509eaa2c437918dc33df83b160bc5950877ce974c0d582d789ac SHA512 c7f1f69b86e81e26257cffed457c921bbf4d8e991249913b5f6a3a04bd5b24974f46e34484c96ce7f2c2b261e69ce711e5b14cb86c2026cbdfacfda783e3c05d
-DIST trailblazer-0.9.tgz 20753 BLAKE2B f2cce7647ac9f5b9c2f048f6395f735a6c19432aafbbcea4e7210826a0773bf012a2772da1e44219d12d0ef1a96dc3f410404f0887bd0cbf8c1c5285ef708e22 SHA512 fddb379c2aee41e85042f4100bf08b2f1ca6393716fef1afa964c25dbcabfcd7df1d5c678c23b0f0f3ae1e1c757b01945e04934f67273434d0b51d441114f884
-EBUILD trailblazer-0.9.ebuild 1068 BLAKE2B f3b991d6fea73440b58f2341c83520a529b4916a685766e77cde058ef8b194000208d01178f1ce41bd107cd0ec19bf7ee49130524708ccb694de28472ffa54c0 SHA512 5eb1c4c2dfd506ff807d8d0c4dc0a8594cc66e877ca1909c144a90f1129ffd99745b292f6611c4d7eaf73e3d75d0e00e97ec613cf7f6a5a5c3a77aa335a4060b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-ldflags.patch b/games-arcade/trailblazer/files/trailblazer-0.9-ldflags.patch
deleted file mode 100644
index 034a74e75f9e..000000000000
--- a/games-arcade/trailblazer/files/trailblazer-0.9-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-09-30 23:56:21.000000000 +0200
-+++ Makefile	2010-09-30 23:56:35.000000000 +0200
-@@ -9,7 +9,7 @@
- bdir = /tmp/trailblazer-$(version)
- 
- all:
--	$(CC) $(sources) -o trailblazer $(cflags) $(libs) 
-+	$(CC) $(LDFLAGS) $(sources) -o trailblazer $(cflags) $(libs) 
- 
- install:
- 	cp trailblazer /usr/bin
diff --git a/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch b/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch
deleted file mode 100644
index 31e9a1000324..000000000000
--- a/games-arcade/trailblazer/files/trailblazer-0.9-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2011-06-20 20:49:09.928013768 +0200
-+++ Makefile	2011-06-20 20:49:18.725566328 +0200
-@@ -3,7 +3,7 @@
- #
- 
- sources = game.c main.c road.c map.c gfx.c
--libs = `sdl-config --libs`
-+libs = `sdl-config --libs` -lm
- cflags = -O2 -Wall `sdl-config --cflags`
- version = 0.9
- bdir = /tmp/trailblazer-$(version)
diff --git a/games-arcade/trailblazer/metadata.xml b/games-arcade/trailblazer/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/trailblazer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/trailblazer/trailblazer-0.9.ebuild b/games-arcade/trailblazer/trailblazer-0.9.ebuild
deleted file mode 100644
index 5638d0339bc1..000000000000
--- a/games-arcade/trailblazer/trailblazer-0.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Guide a ball through a succession of levels while avoiding holes"
-HOMEPAGE="http://www.autismuk.freeserve.co.uk/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2.7[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch
-
-	sed -i \
-		-e "s:-O2:${CFLAGS}:" \
-		Makefile || die "sed Makefile failed"
-
-	sed -i \
-		-e "s:/usr/share/trailblazer/trail\.dat:${GAMES_DATADIR}/${PN}/trail.dat:" \
-		-e "s:/usr/share/trailblazer/trail\.time:${GAMES_STATEDIR}/trail.time:" \
-		map.c || die "sed map.c failed"
-}
-
-src_install() {
-	dogamesbin trailblazer
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins trail.dat
-	dodoc README
-
-	dodir "${GAMES_STATEDIR}" \
-		&& touch "${D}${GAMES_STATEDIR}/trail.time"
-
-	prepgamesdirs
-	fperms 660 "${GAMES_STATEDIR}/trail.time"
-}
diff --git a/games-arcade/triplexinvaders-1.08-r1 b/games-arcade/triplexinvaders-1.08-r1
new file mode 100644
index 000000000000..5bb6d077fae8
--- /dev/null
+++ b/games-arcade/triplexinvaders-1.08-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=app-arch/unzip
+DESCRIPTION=An Alien Invaders style game with 3d graphics
+EAPI=6
+HOMEPAGE=http://triplexinvaders.infogami.com
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyopengl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://acm.jhu.edu/~arthur/invaders/triplexinvaders-1.08.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7b0bce9c1d2ec55bdb23b82b03553b89
diff --git a/games-arcade/triplexinvaders/Manifest b/games-arcade/triplexinvaders/Manifest
deleted file mode 100644
index 98cc47b913ab..000000000000
--- a/games-arcade/triplexinvaders/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX triplexinvaders-1.08-gentoo.patch 2313 BLAKE2B 0e5880be3bf8e1bbb79d5fade576cffe7a6a3137eb92e67888883d93446d305750baa9eb33f626f535de4f86ebc2f2040b2c26a0662e320f5b54480f04a7746d SHA512 912c1879cc2fe177decbe166c616c231c5496f240ecb4492a34952931f45ec549de700ed836aeb56c9b871074eac5adfd48a92d1ca21f07c4037b2ac2dceb429
-DIST triplexinvaders-1.08.zip 354188 BLAKE2B 5bce384ab55edd1dc0e3ed385002447c6cc81da95091b38e654fcb28c4df8f3c39907dfb23afadceaacd51491c53d4a8c937e09079905df2dd63ebe10a403164 SHA512 c763cf650046612152c9305a2067f52feedfeac5f16dd292031a184563f40efc9d95553bc01d59c5c6382394fd2a2d3fe971471cf775fe64c3b1f3c4842a0780
-EBUILD triplexinvaders-1.08-r1.ebuild 1023 BLAKE2B 70dcb43aab815ebb92640c33ecb175645955cc0727f8de1ef4923b7244e1de9731c2c20c8707c32a6e7b889558e124a508a4f0cacfde91a438f7489d17c19e0d SHA512 0b08c9efe793853cf442b63ba1a68f510c990c53d2bd0cf3221a1c284940d6d8ae300dadf884da28f99ab759fc3ea5d3a6429ed9caa63ba2e1e4fd3a28c71918
-MISC metadata.xml 454 BLAKE2B 677d6dbcf7b8dbe4126aadce45c160731d1e159c53ecc0f0159c2f4e709603b23d8cce9b658d15f11778cc8d6ccf0725b8470118f2940eb0251ea43eee00f22f SHA512 bfd1ac0a3820beb15f021ab53527d316be512ed123f8eb7253c03efe82a569298b3474c7618e999cb134ea90aebb9d508909e5e938657e751fd9ac18552e6276
diff --git a/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch b/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
deleted file mode 100644
index 85c88afcfe8a..000000000000
--- a/games-arcade/triplexinvaders/files/triplexinvaders-1.08-gentoo.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/sound.py.old	2007-04-14 21:52:02.000000000 +0200
-+++ b/sound.py	2007-04-14 21:52:27.000000000 +0200
-@@ -16,7 +16,7 @@
- 
- 
- def reloadMusic():
--   pygame.mixer.music.load(os.path.join('sound', choice(music)))
-+   pygame.mixer.music.load(os.path.join('@GENTOO_DATADIR@/sound', choice(music)))
-    pygame.mixer.music.set_endevent(ENDMUSIC)
-    pygame.mixer.music.play()
-    
-@@ -24,7 +24,7 @@
- 
- def getSound(name, volume=0.4):
-    if name not in LoadedSounds:
--      sound = pygame.mixer.Sound(os.path.join('sound', '%s.ogg' % name))
-+      sound = pygame.mixer.Sound(os.path.join('@GENTOO_DATADIR@/sound', '%s.ogg' % name))
-       sound.set_volume(volume)
-       LoadedSounds[name] = sound
-    return LoadedSounds[name]
---- a/util.py.old	2007-04-14 21:56:30.000000000 +0200
-+++ b/util.py	2007-04-14 21:56:48.000000000 +0200
-@@ -30,7 +30,7 @@
- LoadedTextures = weakref.WeakValueDictionary()
- 
- def loadTexture(name):
--    filename = os.path.join('textures', '%s.png' % name)
-+    filename = os.path.join('@GENTOO_DATADIR@/textures', '%s.png' % name)
-     textureSurface = pygame.image.load(filename)
-     textureData = pygame.image.tostring(textureSurface, "RGBA", True)
-     texid = glGenTextures(1)
-@@ -47,7 +47,7 @@
- 
- def getModel(name):
-    if name not in LoadedModels:
--      model = wavefront.load(os.path.join('models', '%s.obj' % name), name)
-+      model = wavefront.load(os.path.join('@GENTOO_DATADIR@/models', '%s.obj' % name), name)
-       LoadedModels[name] = model
-    return LoadedModels[name]
- 
---- a/hiscore.py.old	2007-04-14 22:04:04.000000000 +0200
-+++ b/hiscore.py	2007-04-14 22:04:25.000000000 +0200
-@@ -5,7 +5,7 @@
- # copy the highscores to the user's homedir
- highscorefile = os.path.join(configdir, 'hiscores')
- if not os.path.exists(highscorefile):
--    oldpath = 'hiscores'
-+    oldpath = '@GENTOO_DATADIR@/hiscores'
-     shutil.copy(oldpath, highscorefile)
- 
- def write(score, name):
---- a/options.py.old	2007-04-14 22:05:23.000000000 +0200
-+++ b/options.py	2007-04-14 22:05:42.000000000 +0200
-@@ -5,7 +5,7 @@
- # copy the options to the user's homedir
- optionfile = os.path.join(configdir, 'options.conf')
- if not os.path.exists(optionfile):
--    oldpath = 'options.conf'
-+    oldpath = '@GENTOO_DATADIR@/options.conf'
-     shutil.copy(oldpath, optionfile)
- 
- execfile(optionfile)
diff --git a/games-arcade/triplexinvaders/metadata.xml b/games-arcade/triplexinvaders/metadata.xml
deleted file mode 100644
index 6ae220aaf948..000000000000
--- a/games-arcade/triplexinvaders/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription lang="en">
-In Triplex Invaders, the player pilots a spaceship against a never ending horde
-of enemy ships. It has psychedelic 3d graphics (but 2d gameplay).
-</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild b/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild
deleted file mode 100644
index b3774eb8c6f9..000000000000
--- a/games-arcade/triplexinvaders/triplexinvaders-1.08-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="An Alien Invaders style game with 3d graphics"
-HOMEPAGE="http://triplexinvaders.infogami.com"
-SRC_URI="http://acm.jhu.edu/~arthur/invaders/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	dev-python/pyopengl[${PYTHON_USEDEP}]
-"
-DEPEND="app-arch/unzip"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch
-	sed -i -e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		sound.py \
-		util.py \
-		hiscore.py \
-		options.py || die "sed failed"
-}
-
-src_install() {
-	local libdir=/usr/$(get_libdir)
-
-	insinto "${libdir}/${PN}"
-	doins -r *.py
-	insinto "/usr/share/${PN}"
-	doins -r models sound options.conf hiscores
-	make_wrapper ${PN} "python2 ./invaders.py" "${libdir}/${PN}"
-	einstalldocs
-	make_desktop_entry ${PN}
-}
diff --git a/games-arcade/tuxanci-20110429-r1 b/games-arcade/tuxanci-20110429-r1
new file mode 100644
index 000000000000..4b2d058d3eca
--- /dev/null
+++ b/games-arcade/tuxanci-20110429-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Tuxanci is first tux shooter inspired by game Bulanci
+EAPI=6
+HOMEPAGE=http://www.tuxanci.org/
+IUSE=debug dedicated +ipv6 nls opengl physfs +sound
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
+SLOT=0
+SRC_URI=http://dev.gentooexperimental.org/~scarabeus/tuxanci-20110429.tar.xz
+_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_=b649a1c74ce7105885fbafec38b6fbd7
diff --git a/games-arcade/tuxanci-99999999 b/games-arcade/tuxanci-99999999
new file mode 100644
index 000000000000..ed578765ed00
--- /dev/null
+++ b/games-arcade/tuxanci-99999999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Tuxanci is first tux shooter inspired by game Bulanci
+EAPI=6
+HOMEPAGE=http://www.tuxanci.org/
+IUSE=debug dedicated +ipv6 nls opengl physfs +sound
+LICENSE=GPL-2
+RDEPEND=!dedicated? ( >=media-libs/fontconfig-2.7.0 media-libs/libsdl[X,opengl?] media-libs/sdl-ttf[X] >=media-libs/sdl-image-1.2.10[png] sound? ( >=media-libs/sdl-mixer-1.2.11[vorbis] ) ) physfs? ( dev-games/physfs[zip] ) !physfs? ( >=dev-libs/libzip-0.9 )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b649a1c74ce7105885fbafec38b6fbd7
diff --git a/games-arcade/tuxanci/Manifest b/games-arcade/tuxanci/Manifest
deleted file mode 100644
index 8c5f61856d6d..000000000000
--- a/games-arcade/tuxanci/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST tuxanci-20110429.tar.xz 4283540 BLAKE2B c45aef1a6f89284dc1d41de1718342f0f7d3303d7281698291c74acf5aee262c8ed782d73f955ad3e22a88015adb077d8950e3ce69c7295a9fe97116518045e2 SHA512 72305be823981699e9ac38c090dda2baafd45bd36554eba65bd438646e0b0b8a3ab17a7516610db17e225292c39e0cdabb383193f8b07d2d31d638483feafeea
-EBUILD tuxanci-20110429-r1.ebuild 1479 BLAKE2B aaa850ba078f09a4a717ea4b03bd37c4fe3db3e33246cc76eaade3bb0e874854c35758b81a9e5404e79b75929ce67ee1f010928a40af91612467c1bd922c92d5 SHA512 23f75fb0604b979537eab263d3dbf6ec9f51d841abe28b0712debebf15df085110c199e427cdb91f3653c9502f56635141d192a494a45274359a7ac3b1116491
-EBUILD tuxanci-99999999.ebuild 1479 BLAKE2B aaa850ba078f09a4a717ea4b03bd37c4fe3db3e33246cc76eaade3bb0e874854c35758b81a9e5404e79b75929ce67ee1f010928a40af91612467c1bd922c92d5 SHA512 23f75fb0604b979537eab263d3dbf6ec9f51d841abe28b0712debebf15df085110c199e427cdb91f3653c9502f56635141d192a494a45274359a7ac3b1116491
-MISC metadata.xml 432 BLAKE2B 80a36c8203e39b5c0615892040b4f98bcaf5c43b7531cca6a1709db0fe2b94f68eda72e52c7a32005b7a6b54880884ed27c5f8be1ee36b7ef0712cccab48717d SHA512 d8b287f078d5b18855fdc12c57b353cc5ff1f655d1c6d6fe3a4beb738119c4b295c580ed72346a41e76ad98a6cec86cfbd9938d461fe6d9ff329f0e7f857d6a1
diff --git a/games-arcade/tuxanci/metadata.xml b/games-arcade/tuxanci/metadata.xml
deleted file mode 100644
index 6c319f2cbfce..000000000000
--- a/games-arcade/tuxanci/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="sound">Enable sound</flag>
-		<flag name="physfs">Use <pkg>dev-games/physfs</pkg> instead of <pkg>dev-libs/libzip</pkg> to load compressed data</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild b/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
deleted file mode 100644
index 8fe8dd9427ea..000000000000
--- a/games-arcade/tuxanci/tuxanci-20110429-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci"
-HOMEPAGE="http://www.tuxanci.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/tuxanci.git"
-else
-	SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug dedicated +ipv6 nls opengl physfs +sound"
-
-# >=x11-libs/cairo-1.8.8[X,svg]
-RDEPEND="
-	!dedicated? (
-		>=media-libs/fontconfig-2.7.0
-		media-libs/libsdl[X,opengl?]
-		media-libs/sdl-ttf[X]
-		>=media-libs/sdl-image-1.2.10[png]
-		sound? (
-			>=media-libs/sdl-mixer-1.2.11[vorbis]
-		)
-	)
-	physfs? ( dev-games/physfs[zip] )
-	!physfs? ( >=dev-libs/libzip-0.9 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AUDIO=$(usex sound)
-		-DBUILD_SERVER=$(usex dedicated)
-		-DWITH_NLS=$(usex nls)
-		-DWITH_PHYSFS=$(usex physfs)
-		-DWITH_OPENGL=$(usex opengl)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DDEVELOPER=$(usex debug)
-		-DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/
-		-DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/
-		-DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/
-		-DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/
-		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}
diff --git a/games-arcade/tuxanci/tuxanci-99999999.ebuild b/games-arcade/tuxanci/tuxanci-99999999.ebuild
deleted file mode 100644
index 8fe8dd9427ea..000000000000
--- a/games-arcade/tuxanci/tuxanci-99999999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Tuxanci is first tux shooter inspired by game Bulanci"
-HOMEPAGE="http://www.tuxanci.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://repo.or.cz/tuxanci.git"
-else
-	SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug dedicated +ipv6 nls opengl physfs +sound"
-
-# >=x11-libs/cairo-1.8.8[X,svg]
-RDEPEND="
-	!dedicated? (
-		>=media-libs/fontconfig-2.7.0
-		media-libs/libsdl[X,opengl?]
-		media-libs/sdl-ttf[X]
-		>=media-libs/sdl-image-1.2.10[png]
-		sound? (
-			>=media-libs/sdl-mixer-1.2.11[vorbis]
-		)
-	)
-	physfs? ( dev-games/physfs[zip] )
-	!physfs? ( >=dev-libs/libzip-0.9 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_AUDIO=$(usex sound)
-		-DBUILD_SERVER=$(usex dedicated)
-		-DWITH_NLS=$(usex nls)
-		-DWITH_PHYSFS=$(usex physfs)
-		-DWITH_OPENGL=$(usex opengl)
-		-DENABLE_IPV6=$(usex ipv6)
-		-DDEVELOPER=$(usex debug)
-		-DCMAKE_INSTALL_ICONDIR="${EPREFIX}"/usr/pixmaps/
-		-DCMAKE_INSTALL_DESKTOPDIR="${EPREFIX}"/usr/applications/
-		-DCMAKE_DATA_PATH="${EPREFIX}"/usr/share/
-		-DCMAKE_LOCALE_PATH="${EPREFIX}"/usr/share/locale/
-		-DCMAKE_DOC_PATH="${EPREFIX}"/usr/share/doc/${PF}
-		-DCMAKE_CONF_PATH="${EPREFIX}"/etc
-	)
-	cmake-utils_src_configure
-}
diff --git a/games-arcade/tuxdash-0.8-r1 b/games-arcade/tuxdash-0.8-r1
new file mode 100644
index 000000000000..d95659e8cf64
--- /dev/null
+++ b/games-arcade/tuxdash-0.8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-ttf
+DESCRIPTION=A simple BoulderDash clone
+EAPI=6
+HOMEPAGE=http://www.tuxdash.de/index.php?language=EN
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=http://www.tuxdash.de/ressources/downloads/tuxdash_src_0.8.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=67ea19fe2b4dfca41a5026815644b46a
diff --git a/games-arcade/tuxdash/Manifest b/games-arcade/tuxdash/Manifest
deleted file mode 100644
index f2a1d0065da9..000000000000
--- a/games-arcade/tuxdash/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tuxdash-0.8-fix-build-system.patch 575 BLAKE2B 8975cac0d0bb753a4f1882e68d8d15449685b4ae4f5f97f83b8cae591cfd10f25c2d09fbf53e6843102c0039b3d94e5552884f05295de23e6361f575c3dd2f9d SHA512 bda193ee657973c26bccdd2f2caa8414be454e0e6b016673aad07dce23be300d79103bdbac40ee2aeb0a0dd1ae875f9d0b1b36b20aa4af2b40052b464574dd73
-AUX tuxdash-0.8-fix-c++14.patch 4251 BLAKE2B f3ef29821b2f0a13a4ab67381ccaca9c05adb6742687a9b94063dc618802d21da84ea1bd5965cbaa5cc1a338f0fa22099f3448635f23abfeee0923e67cf26072 SHA512 5314fe0be54a2232ce10d5c518bc30913303aad3d7d5af94a7e3e24661545c3a5ef50eedd2db4ab0cac1021a78064c362b3ef6731703ffb7e5020bfb4787c725
-AUX tuxdash-0.8-fix-paths.patch 1671 BLAKE2B 21498fb303cfade6754bb06fb7d540e8a33f3851d777112f30e729fdb29ae37041c561cccbf3e9e46c93c11b5b1df76c6c9214e7f901b8672f5d2ea895e25a80 SHA512 ff896b3ea57f95e9298a8640a8c2eb31049ab83a7cca1ecf40f73d9e7a1b1ee386f9f41d6a5af0b004015b2c97fa8ef0ed4eb11cc109c5efcd53b55fe0094d93
-DIST tuxdash_src_0.8.tar.bz2 447560 BLAKE2B 023deef628c1a6e0ea602fd87e3fe6347f38308dff45623aa59406d15805b87aafdb21e4756e5f2b90c97b56a76d4052c4aacb1401ff03e1e3157cac170b1536 SHA512 5c42b89ce3121025801d78d35962a2aa3d10e4443f6c929e7df4b45673e6285f37ed353877aa33eaa0edf584f7a428a8f485301ba1476865a498ab699ee81f86
-EBUILD tuxdash-0.8-r1.ebuild 845 BLAKE2B 33145206bd41914bdfa6df243fe7c6c76e9e2a7868f855fc8f0bf91fe81549b845982cf1167dcfa7dec9db2597cfc031ef8af4fd267a1579cd32f90aab382607 SHA512 31e9c0c923cd31d5f71d8dbdddb5400345827faeb52654c8a89259fc4d0147d2767597581cc6c612c6d7330038595bd5c9159e3c3b1373b2f1074e5eddeb255b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/tuxdash/files/tuxdash-0.8-fix-build-system.patch b/games-arcade/tuxdash/files/tuxdash-0.8-fix-build-system.patch
deleted file mode 100644
index 9f861d98e8cc..000000000000
--- a/games-arcade/tuxdash/files/tuxdash-0.8-fix-build-system.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix build system to honour all user variables.
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,4 +1,4 @@
- all:
--	g++ main.cpp -Wall `/usr/bin/sdl-config --libs --cflags` -lSDL_ttf  -o ../TuxDash
-+	$(CXX) main.cpp $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) `/usr/bin/sdl-config --libs --cflags` -lSDL_ttf  -o ../tuxdash
- static:
--	g++ -static main.cpp -Wall `/usr/bin/sdl-config --cflags --static-libs` -lSDL_ttf -lfreetype -lz -o ../TuxDash
-+	$(CXX) -static main.cpp $(LDFLAGS) $(CXXFLAGS) $(CPPFLAGS) `/usr/bin/sdl-config --cflags --static-libs` -lSDL_ttf -lfreetype -lz -o ../tuxdash
diff --git a/games-arcade/tuxdash/files/tuxdash-0.8-fix-c++14.patch b/games-arcade/tuxdash/files/tuxdash-0.8-fix-c++14.patch
deleted file mode 100644
index b37f456f559b..000000000000
--- a/games-arcade/tuxdash/files/tuxdash-0.8-fix-c++14.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Modernise C++ to avoid errors in C++14 mode.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=600084
-
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -66,7 +66,7 @@
- 
- void writeconfig(const map& game_map) {
- 	ofstream config((ostring)TuxHomeDirectory + "/config");	// open config file
--	if(config == NULL) {	// error check
-+	if(!config) {	// error check
- 		cout << "Warning: Couldn't write to file " << (ostring)TuxHomeDirectory + "/config" << endl;
- 		return;
- 	}
-@@ -124,7 +124,7 @@
- 
- void readconfig(class map& game_map) {
- 	ifstream config((ostring)TuxHomeDirectory + "/config");	// open config file
--	if(config==0) {	// error check
-+	if(!config) {	// error check
- 		cout << "Warning: Couldn't find configuration file " << (ostring)TuxHomeDirectory + "/config" << ". Using default values." << endl;
- 		return;
- 	}
---- a/src/map.cpp
-+++ b/src/map.cpp
-@@ -346,13 +346,13 @@
- 	cout << "-- copy map --" << endl;		// print status message
- 	ifstream in_file(path);	// open source file
- 
--	if(in_file == 0) {	// error checking
-+	if(!in_file) {	// error checking
- 		cout << "Couldn't open sourcefile \"" << filename << "\"" << endl;
- 		cout << endl << "-- error in copymap --" << endl;
- 		return 1;
- 	}
- 
--	if(out_file == 0) {	// error checking
-+	if(!out_file) {	// error checking
- 		cout << "Couldn't open target file \"" << temp_path << "\" for writing " << endl;
- 		cout << endl << "-- error in copymap --" << endl;
- 		return 1;
-@@ -390,7 +390,7 @@
- 		path = mapfolder;
- 		path += filename;
- 		file.open(path);	// open file
--		if(file == NULL) {
-+		if(!file) {
- 			cout << "map::savemap :  error while saving map to file '" << path << "'" << endl;
- 			return 1;
- 		}
-@@ -402,7 +402,7 @@
- 		path = savefolder;
- 		path += filename;
- 		file.open(path);	// open file
--		if(file == NULL) {
-+		if(!file) {
- 			cout << "map::savemap : error while saving game to file '" << path << "'" << endl;
- 			return 1;
- 		}
---- a/src/menu.cpp
-+++ b/src/menu.cpp
-@@ -119,7 +119,7 @@
- 
- // add a selection box
- 
--class element* menu_mgm::add_box(int x, int y, const ostring& text, const ostring& value, bool selectable, int size, int xgroup, int ygroup, int max, int width, int height, unsigned char r, unsigned char g, unsigned char b, int value_type, bool dependency, char* depend) {
-+class element* menu_mgm::add_box(int x, int y, const ostring& text, const ostring& value, bool selectable, int size, int xgroup, int ygroup, int max, int width, int height, unsigned char r, unsigned char g, unsigned char b, int value_type, bool dependency, const char* depend) {
- 	class element& newone = add();
- 	newone.value = value;
- 	newone.posx = x;
---- a/src/menu.h
-+++ b/src/menu.h
-@@ -56,7 +56,7 @@
- 		void check_custom_parameters();	// check if parameters are okay
- 		ostring keytoa(SDLKey);	// cast SDLKey to ASCII
- 		class element* add_text(int, int, const ostring&, bool, int, int =-1, int =-1, unsigned char =0, unsigned char =0, unsigned char = 0, int = -1, int = -1);	// add a text element
--		class element* add_box(int, int, const ostring&, const ostring&, bool, int, int, int, int, int, int, unsigned char, unsigned char, unsigned char, int = 0, bool =false, char* =0);	// add a box element
-+		class element* add_box(int, int, const ostring&, const ostring&, bool, int, int, int, int, int, int, unsigned char, unsigned char, unsigned char, int = 0, bool =false, const char* =0);	// add a box element
- 		class element* add_select(int, int, const ostring&, const ostring&, bool, int, int, int, const char* oneoftwo=0);	// add a select element
- 		void draw_window();	// draw the current menu screen with all elements
- 		void selection_mgm(char);	// process user input for menu navigation
---- a/src/surface.cpp
-+++ b/src/surface.cpp
-@@ -92,7 +92,7 @@
- 	else file_tmp = file;
- 
- 	TTF_Font *font = TTF_OpenFont(file_tmp, size);
--	SDL_Color color = {r, g, b, 0};
-+	SDL_Color color = {(Uint8)r, (Uint8)g, (Uint8)b, 0};
- 
- 	area = TTF_RenderText_Solid(font, text, color);
- 
-@@ -118,7 +118,7 @@
- 	SDL_Surface* text_surface;
- 	SDL_Rect temp;
- 	TTF_Font *font_tmp = TTF_OpenFont(font, size);
--	SDL_Color farbe = {r, g, b, 0};
-+	SDL_Color farbe = {(Uint8)r, (Uint8)g, (Uint8)b, 0};
- 	text_surface = TTF_RenderText_Solid(font_tmp, text, farbe);
- 	TTF_CloseFont(font_tmp);
- 	temp = pos;
diff --git a/games-arcade/tuxdash/files/tuxdash-0.8-fix-paths.patch b/games-arcade/tuxdash/files/tuxdash-0.8-fix-paths.patch
deleted file mode 100644
index 72cde9d411f8..000000000000
--- a/games-arcade/tuxdash/files/tuxdash-0.8-fix-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Change paths for Gentoo's filesystem layout.
-
---- a/config
-+++ b/config
-@@ -1,11 +1,11 @@
- # Fullscreen enable/disable
--Fullscreen = 0
-+Fullscreen = 1
- # Width of screen in blocks
- screenX = 21
- # Height of screen in blocks
- screenY = 16
- # Theme Folder - path to a valid theme
--theme = themes/original/
-+theme = /usr/share/tuxdash/themes/original/
- # Distance in X direction, before scrolling starts
- scrolldistX = 3
- # Distance in Y direction, before scrolling starts
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -340,9 +340,7 @@
- 
- 	// set tuxdash's config / working directory
- 	char* HomeDirectory;
--	char* CurrentDirectory;
- 	HomeDirectory = getenv("HOME");	// get users home directory
--	CurrentDirectory = getenv("PWD");	// get TuxDash's working directory
- 	TuxHomeDirectory = new char[strlen(HomeDirectory)+strlen("/.tuxdash")+1];	// align space for the string containing the path to tuxdash's config directory
- 	strcpy(TuxHomeDirectory, HomeDirectory);
- 	strcat(TuxHomeDirectory, "/.tuxdash");
-@@ -355,12 +353,12 @@
- 		}
- 		else {
- 			mkdir((ostring)TuxHomeDirectory + "/themes", 0711);	// create the themes folder. The default themes are not copied there, but the folder is created for possible additional themes added by the player
--			chdir(CurrentDirectory);
-+			chdir("/usr/share/tuxdash");
- 			system((ostring)"cp -r maps savegames config " + TuxHomeDirectory);
- 		}
- 	}
- 	cout << endl << " Using " << TuxHomeDirectory << " for configuration, map and savegame files" << endl;
--	chdir(CurrentDirectory);
-+	chdir("/usr/share/tuxdash");
- 	// finished with check of working directory
- 
- 	int running=1, start, stop, framestart = time(0), frames=0, frame_count = 0;
diff --git a/games-arcade/tuxdash/metadata.xml b/games-arcade/tuxdash/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/tuxdash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild b/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild
deleted file mode 100644
index 77af51944756..000000000000
--- a/games-arcade/tuxdash/tuxdash-0.8-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A simple BoulderDash clone"
-HOMEPAGE="http://www.tuxdash.de/index.php?language=EN"
-SRC_URI="http://www.tuxdash.de/ressources/downloads/${PN}_src_${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.8-fix-build-system.patch
-	"${FILESDIR}"/${PN}-0.8-fix-c++14.patch
-	"${FILESDIR}"/${PN}-0.8-fix-paths.patch
-)
-
-src_prepare() {
-	default
-	rm -f GPL TuxDash || die
-}
-
-src_configure() {
-	tc-export CXX
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	dobin tuxdash
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins -r themes maps fonts savegames config
-}
diff --git a/games-arcade/tuxpuck-0.8.2-r2 b/games-arcade/tuxpuck-0.8.2-r2
new file mode 100644
index 000000000000..d7afe2112850
--- /dev/null
+++ b/games-arcade/tuxpuck-0.8.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis media-libs/freetype:2 virtual/pkgconfig
+DESCRIPTION=Hover hockey
+EAPI=6
+HOMEPAGE=http://home.no.net/munsuun/tuxpuck/
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis
+SLOT=0
+SRC_URI=http://home.no.net/munsuun/tuxpuck/files/tuxpuck-0.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=8708a74f1b25419f7b55b97a0e5dbaa6
diff --git a/games-arcade/tuxpuck/Manifest b/games-arcade/tuxpuck/Manifest
deleted file mode 100644
index d570c5f86d67..000000000000
--- a/games-arcade/tuxpuck/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX tuxpuck-0.8.2-freetype_pkgconfig.patch 377 BLAKE2B 73f974e8e93cb425e72745fa00a1943a30830dae4bfdee5eef75adc240ebf9885b4dd30f1bfb6291fb873a35a0f63595a11b0399e3b028263065b59a9193542b SHA512 b41eb1a0e64aac8a01ceeab8be43bdaa8da394f6e2fa09222eb78baec0d4b9f622340434111237f37afc8b58ea1d887a012c777afddae75a9394a4519b3925f4
-AUX tuxpuck-0.8.2-ldflags.patch 411 BLAKE2B 0b0a20abe1daf4f02e07f23f8cc0273b5b7cf229ea3b9de3cb13ea4611ba5b6b932ebf9286ebcdb19605de672b66300530a6fb3ca776bdfd1a05a377976d7746 SHA512 50e91cfb89be78e7fbf45c361d9bd2bc2ef84770d868978dbc200bb9954b51789478e611f8e1197e418775624ce57c62424a6a456cd62ffe45ccb93aaa58a88a
-AUX tuxpuck-0.8.2-parallel.patch 1705 BLAKE2B a9402f63386287c1d77f58d6998869c5e946016fda93932f851de73e3edae4b3ec3e08fea68f86c98e5e490d5a168c1bb809332d379470c00db0527fd462e972 SHA512 e489e76fe86f62962017615015f9bca7f15e3b001265d7212ae99a27e833152ab6b1a4caacffc32c4143a47e06ee4d010114d70f57548c7d91ccc8e61667b5e0
-AUX tuxpuck-0.8.2-png15.patch 2128 BLAKE2B b9ebbeff8974dbfd0693dea225e9e73c044aaf5c0d8159458c2c8439fb3d1985c223c71a9e69d47d1c648abcf2784ed7a7d6f9a59a880d2e5b485d3498f0172e SHA512 d6d05b8e10736010a80af565d9dd6cc3aa076070796f348d86c0af8a7d008e1fbb9cffd4422d2193bbe880c0a2637f424879c6e9ce84427f01badbd2129c3b4a
-DIST tuxpuck-0.8.2.tar.gz 384009 BLAKE2B e60241c5e6825ae6570a0d3242178578ef1202d3fbb4276726fdfddb894883fe5e25218bb29f6fd8148d273ab91dd36f0624c814756d8375cea5b88f090fcde7 SHA512 875680f7fd9d4257884c58d8a5529082aac4dc10f1a9c9d08acd4e67ddb5e9c66dd84a4fbcc27e3673e329d845b0966ea683412ffe61f0a403d195eac0f32a46
-EBUILD tuxpuck-0.8.2-r2.ebuild 1186 BLAKE2B 7d7ec8016949dbbce3137f8745d474b8cdb2e5e4c3b1d0b9366df7a8773a4a18e678e7a78abb590cd24993e5f899e403cc669d17e18891119969ae8306a4f973 SHA512 c07569fc3b6c69b38e9f7b42dcb4fea01b452a07687c6780f66f3744f814d13e6e69a0be0220a3f557dbffb65a553efe0376441c7e99344250a103842fe326de
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
deleted file mode 100644
index 410024e48dcd..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuxpuck-0.8.2/utils/Makefile
-+++ tuxpuck-0.8.2/utils/Makefile
-@@ -6,7 +6,7 @@
- all : ttf2font data2c anim
- 
- ttf2font : ttf2font.c
--	$(CC) $(CFLAGS) ttf2font.c `freetype-config --cflags --libs` -o ttf2font
-+	$(CC) $(CFLAGS) ttf2font.c `pkg-config --cflags --libs freetype2` -o ttf2font
- 
- data2c : data2c.c
- 	$(CC) $(CFLAGS) data2c.c `sdl-config --cflags --libs` -o data2c
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
deleted file mode 100644
index b4abb60f0fd4..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2010-10-05 10:34:57.000000000 +0200
-+++ b/Makefile	2010-10-05 10:35:28.000000000 +0200
-@@ -20,7 +20,7 @@
- 
- $(NAME) : $(OBJS)
- 	cd data; $(MAKE)
--	$(CC) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) data/libdata.a `sdl-config --libs` -lm -lpng \
- 	-ljpeg -lz -lvorbisfile -lvorbis -logg -o $(NAME)
- 
- w32icon.o : data/icons/tuxpuck.ico
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
deleted file mode 100644
index 7d9b199f55cf..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-parallel.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/data/Makefile.old	2015-01-07 14:22:34.852150894 +0100
-+++ b/data/Makefile	2015-01-07 14:57:44.079822614 +0100
-@@ -15,20 +15,29 @@
- 	ar r libdata.a $(OBJS)
- 	ranlib libdata.a
- 
--$(SOURCES):
--	cd ../utils/; $(MAKE)
-+monos_fnt.c:
- 	../utils/ttf2font ttfs/mono.ttf monos.fnt 30 30
- 	../utils/data2c monos.fnt monos_fnt
-+	rm monos.fnt
-+monob_fnt.c:
- 	../utils/ttf2font ttfs/mono.ttf monob.fnt 45 45
- 	../utils/data2c monob.fnt monob_fnt
--	rm *.fnt
-+	rm monob.fnt
-+title_jpg.c:
- 	../utils/data2c jpgs/title.jpg title_jpg
-+board_jpg.c:
- 	../utils/data2c jpgs/board.jpg board_jpg
-+logo_jpg.c:
- 	../utils/data2c jpgs/logo.jpg logo_jpg
-+pad_png.c: pngs/pad.png
- 	../utils/data2c pngs/pad.png pad_png
-+puck_png.c: pngs/puck.png
- 	../utils/data2c pngs/puck.png puck_png
-+scoreboard_png.c:
- 	../utils/data2c pngs/scoreboard.png scoreboard_png
-+mousebar_png.c:
- 	../utils/data2c pngs/mousebar.png mousebar_png
-+glass_png.c:
- 	../utils/data2c pngs/glass.png glass_png
- 	../utils/data2c pngs/piece1.png piece1_png
- 	../utils/data2c pngs/piece2.png piece2_png
-@@ -37,15 +46,22 @@
- 	../utils/data2c pngs/piece5.png piece5_png
- 	mv glass_png.c temp; cat temp piece?_png.c > glass_png.c
- 	rm piece?_png.c temp
-+crash_ogg.c:
- 	../utils/data2c sounds/crash.ogg crash_ogg
-+nock_ogg.c:
- 	../utils/data2c sounds/nock.ogg nock_ogg
-+tux_eyes_spr.c:
- 	# Tux
- 	../utils/anim tux/eyes.ac tux_eyes.spr
- 	../utils/data2c tux_eyes.spr tux_eyes_spr
- 	rm tux_eyes.spr
-+tux_png.c: tux/tux.png
- 	../utils/data2c tux/tux.png tux_png
-+tux_apps_ogg.c:
- 	../utils/data2c tux/apps.ogg tux_apps_ogg
-+tux_boos_ogg.c:
- 	../utils/data2c tux/boos.ogg tux_boos_ogg
-+arcana_png.c:
- 	# Arcana
- 	../utils/data2c arcana/arcana.png arcana_png
- clean :
diff --git a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch b/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
deleted file mode 100644
index 5860d2b1c171..000000000000
--- a/games-arcade/tuxpuck/files/tuxpuck-0.8.2-png15.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/png.c.old	2011-09-14 16:25:54.415338149 +0200
-+++ b/png.c	2011-09-14 17:41:02.190803110 +0200
-@@ -38,6 +38,8 @@
-   png_color_16 *transv;
-   SDL_RWops *src = NULL;
-   Uint32 size;
-+  int num_palette;
-+  png_colorp png_palette;
- 
-   memcpy(&size, data, sizeof(Uint32));
-   if (memcounter)
-@@ -74,7 +76,7 @@
-    * the normal method of doing things with libpng).  REQUIRED unless you
-    * set up your own error handlers in png_create_read_struct() earlier.
-    */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     SDL_SetError("Error reading the PNG file.");
-     goto done;
-   }
-@@ -142,9 +144,9 @@
-       Rmask = 0x000000FF;
-       Gmask = 0x0000FF00;
-       Bmask = 0x00FF0000;
--      Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+      Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
-     } else {
--      int s = (info_ptr->channels == 4) ? 0 : 8;
-+      int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
-       Rmask = 0xFF000000 >> s;
-       Gmask = 0x00FF0000 >> s;
-       Bmask = 0x0000FF00 >> s;
-@@ -152,7 +154,7 @@
-     }
-   }
-   surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			     bit_depth * info_ptr->channels, Rmask, Gmask,
-+			     bit_depth * png_get_channels(png_ptr, info_ptr), Rmask, Gmask,
- 			     Bmask, Amask);
-   if (surface == NULL) {
-     SDL_SetError("Out of memory");
-@@ -197,12 +199,15 @@
- 	palette->colors[i].g = i;
- 	palette->colors[i].b = i;
-       }
--    } else if (info_ptr->num_palette > 0) {
--      palette->ncolors = info_ptr->num_palette;
--      for (i = 0; i < info_ptr->num_palette; ++i) {
--	palette->colors[i].b = info_ptr->palette[i].blue;
--	palette->colors[i].g = info_ptr->palette[i].green;
--	palette->colors[i].r = info_ptr->palette[i].red;
-+    } else {
-+      png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+      if (num_palette > 0) {
-+        palette->ncolors = num_palette;
-+	for (i = 0; i < num_palette; ++i) {
-+	  palette->colors[i].b = png_palette[i].blue;
-+	  palette->colors[i].g = png_palette[i].green;
-+	  palette->colors[i].r = png_palette[i].red;
-+	}
-       }
-     }
-   }
diff --git a/games-arcade/tuxpuck/metadata.xml b/games-arcade/tuxpuck/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/tuxpuck/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild b/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
deleted file mode 100644
index 092a49327277..000000000000
--- a/games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Hover hockey"
-HOMEPAGE="http://home.no.net/munsuun/tuxpuck/"
-SRC_URI="http://home.no.net/munsuun/tuxpuck/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	media-libs/libvorbis
-"
-DEPEND="${RDEPEND}
-	media-libs/freetype:2
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# Bug #376741 - Make unpack call compatible with both
-	# PMS and <sys-apps/portage-2.1.10.10.
-	cd man || die
-	unpack ./${PN}.6.gz
-	cd .. || die
-	sed -i \
-		-e 's/-Werror//' \
-		-e '/^CC/d' \
-		Makefile \
-		utils/Makefile \
-		data/Makefile \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-png15.patch \
-		"${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
-}
-
-src_compile() {
-	emake -C utils
-	emake -C data
-	emake
-}
-
-src_install() {
-	dobin tuxpuck
-	doman man/tuxpuck.6
-	dodoc *.txt
-	doicon data/icons/${PN}.ico
-	make_desktop_entry ${PN} "TuxPuck" /usr/share/pixmaps/${PN}.ico
-	einstalldocs
-}
diff --git a/games-arcade/vor-0.5.7-r1 b/games-arcade/vor-0.5.7-r1
new file mode 100644
index 000000000000..a97b1de30286
--- /dev/null
+++ b/games-arcade/vor-0.5.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod] >=sys-apps/sed-4
+DESCRIPTION=Variations on Rockdodger: Dodge the rocks until you die
+EAPI=6
+HOMEPAGE=http://jasonwoof.org/vor
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=https://jasonwoof.com/downloads/vor/vor-0.5.7.tgz
+_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_=6e68ae4668a2c75f8b7ab03f8351b05f
diff --git a/games-arcade/vor/Manifest b/games-arcade/vor/Manifest
deleted file mode 100644
index a8471772c47a..000000000000
--- a/games-arcade/vor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vor-0.5.7.tgz 358032 BLAKE2B 96813207a8529d6a7ae5863811fa02666d51b4108afd96cf5b4aed0405d6cc32668f0a7abfbc571141877803a15678c46c8664fe3599cd12e0c6fe95ab5d880f SHA512 32dbfe95971298f9f0191cc95fdb5e9ec34c5f6771df1566554b128644770bfba618df3aac7242e647c8af2f41fc59c9e5620a4c56932d3af72197f6a19f0bce
-EBUILD vor-0.5.7-r1.ebuild 743 BLAKE2B 8f3d66e038bf230e67fb4a470949aa7d13c6c22960e9caae716d4e6826d45388ac0a2a50b693c8363c905ce7d8a2e59a0158d904e004821c618371d2e1b1b1d5 SHA512 ee36425ae69fef18b3f69454f61e3eb6c83f50ce2fe308fbe2dd7bcc8561bb234cca316246c846a795d8756897108709cb6465745bb89ba4e603d38bdd451cc9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/vor/metadata.xml b/games-arcade/vor/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/vor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/vor/vor-0.5.7-r1.ebuild b/games-arcade/vor/vor-0.5.7-r1.ebuild
deleted file mode 100644
index 67a35306efe8..000000000000
--- a/games-arcade/vor/vor-0.5.7-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Variations on Rockdodger: Dodge the rocks until you die"
-HOMEPAGE="http://jasonwoof.org/vor"
-SRC_URI="https://jasonwoof.com/downloads/vor/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dodir /usr/bin
-	DOCS="README* todo" default
-	newicon -s 48 data/icon.png ${PN}.png
-	make_desktop_entry ${PN} VoR
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-arcade/watermelons-1.1.1-r1 b/games-arcade/watermelons-1.1.1-r1
new file mode 100644
index 000000000000..988d7ba40df6
--- /dev/null
+++ b/games-arcade/watermelons-1.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A thrilling watermelon bouncing game
+EAPI=5
+HOMEPAGE=http://www.imitationpickles.org/melons/index.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-misc/games-envd
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://gentoo/melons-1.1.1.tgz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a012d9e4917ff7fac3802b06148cb73f
diff --git a/games-arcade/watermelons/Manifest b/games-arcade/watermelons/Manifest
deleted file mode 100644
index 239819da8038..000000000000
--- a/games-arcade/watermelons/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST melons-1.1.1.tgz 318692 BLAKE2B b950e58062f85632cf87a205ede2437ddb9ac573574cb7cd5e73eabd3cbd7af8e2ee9a2dc06a31cb2f322198fb0bcb97b0c292a886711bf4fb868b4f90738a1c SHA512 50bb66de9806fb1bbe946ad5063e68d3327d6184b3e95230573f71053426ed877fc9762ef2b44e6964c9d7b8dc5081e9c3015885800dd6644a1dd88c9c5dc357
-EBUILD watermelons-1.1.1-r1.ebuild 1341 BLAKE2B 8042bdde7e2e08d25d68bae4fe295ee43ec2c98ab5f65169c4da17871a9366b0248a3ea95c57fc9fa85a9c3f0df7b2a5186994c0546fed0526cf7f3cd8d9e2e9 SHA512 3400eec09823777c70f4e9ab9dafa883bfa5cd05f765a9623e04ce75fdd2415ba921827383189737561b766bc8f7fb7d8e4ef306225217e2ffb35132a1e92508
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/watermelons/metadata.xml b/games-arcade/watermelons/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/watermelons/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild b/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
deleted file mode 100644
index 72fec90aec30..000000000000
--- a/games-arcade/watermelons/watermelons-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-MY_PN="melons"
-DESCRIPTION="A thrilling watermelon bouncing game"
-HOMEPAGE="http://www.imitationpickles.org/melons/index.html"
-SRC_URI="mirror://gentoo/${MY_PN}-${PV}.tgz"
-# No version upstream
-#SRC_URI="http://www.imitationpickles.org/${MY_PN}/${MY_PN}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-python/pygame[${PYTHON_USEDEP}]
-	${PYTHON_DEPS}"
-RDEPEND=${DEPEND}
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_PN}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	sed -i \
-		-e "s:melons.hs:${GAMES_STATEDIR}/${PN}/&:" \
-		main.py || die
-
-	cat <<-EOF > "${PN}" || die
-	#!/bin/bash
-	cd "${GAMES_DATADIR}/${PN}"
-	exec ${EPYTHON} main.py
-EOF
-}
-
-src_install() {
-	dogamesbin ${PN}
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data pgu const.py game.py main.py melon.py melons.py menu.py trampoline.py
-	python_optimize "${D}${GAMES_DATADIR}/${PN}"
-	dodoc *.txt
-	dodir "${GAMES_STATEDIR}/${PN}"
-	touch "${D}${GAMES_STATEDIR}"/${PN}/melons.hs
-	fperms 664 "${GAMES_STATEDIR}"/${PN}/melons.hs
-	newicon data/mellon0013.png "${PN}.png"
-	make_desktop_entry ${PN} Watermelons
-	prepgamesdirs
-}
diff --git a/games-arcade/whichwayisup-0.7.9-r2 b/games-arcade/whichwayisup-0.7.9-r2
new file mode 100644
index 000000000000..1d5440a885a2
--- /dev/null
+++ b/games-arcade/whichwayisup-0.7.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip
+DESCRIPTION=A traditional and challenging 2D platformer game with a slight rotational twist
+EAPI=6
+HOMEPAGE=http://hectigo.net/puskutraktori/whichwayisup/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-3.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://hectigo.net/puskutraktori/whichwayisup/whichwayisup_b079.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ae6a27dfad16a33c11dda425138f610e
diff --git a/games-arcade/whichwayisup/Manifest b/games-arcade/whichwayisup/Manifest
deleted file mode 100644
index e27b41e2b46c..000000000000
--- a/games-arcade/whichwayisup/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX whichwayisup-32.xpm 1694 BLAKE2B 079e9f6e3dde54c1d2bb7f576330663fa886bc112f3e20398c3e50521c19ccc4c68647b37e9d3ed4dc88a7f2c2ac60d11c171e3350e7ec84fee0b193e4eeb830 SHA512 e0329876d45aa575abe07024d7f154ff743f1899c4dbb58b8e317ae9173c2aadd63a511924e99115a9f56f42411507f542225e4980d9588e09f7765cf41bf95c
-DIST whichwayisup_b079.zip 1001890 BLAKE2B bfc8f15376ae7c93cc3921a7c0537d44bca44cbfd5e19533912c56151b8811a40e96271e0f3b8634a6fc4625bd32c9668fc3c321f1d2ea0306517067f3d31e24 SHA512 49ac6b8224f3cf7b0711b297c9dd96ff2a0969f7c16fa1da500bef1ea5d793bd900be124a9b9874239c98db6fd2db92917b8ce2ee09b685e184cfd87bf519809
-EBUILD whichwayisup-0.7.9-r2.ebuild 1238 BLAKE2B 9470470daf38683f8a2f0e25872564ffd7117cd80c4eae2191d87db21089879b07d13738c24be27e11b515221a0bcf557ce29d7e222b1f78c71cae17dd0594b3 SHA512 c27361684ecb16ed1ee09f85adf191bec985703a0d6012e318c98859359354e30bb00c249c37fab47741fde4c233ac9285f4b4e3e0657b6473ef28af1b743f6a
-MISC metadata.xml 491 BLAKE2B 7c632e2660757b2796dc732506e95b040890bc30941d152f4b650a2aad266e9aa3c013ce8054d02979c64610559ace6b4ac4b6d8ed9b5277a0dd9c92d9414b4c SHA512 a53511b1c0d5b69a34c5dfb0c302505cda98b9a54edb6b4f74868a48ee7870b1ec83dfedff7833e2997a97160182fb35f610a2f97c3577ca4b4cc297c98eeb1b
diff --git a/games-arcade/whichwayisup/files/whichwayisup-32.xpm b/games-arcade/whichwayisup/files/whichwayisup-32.xpm
deleted file mode 100644
index f5a6ff33c0dc..000000000000
--- a/games-arcade/whichwayisup/files/whichwayisup-32.xpm
+++ /dev/null
@@ -1,67 +0,0 @@
-/* XPM */
-static char * whichwayisup_32_xpm[] = {
-"32 32 32 1",
-" 	c None",
-".	c #03151B",
-"+	c #016C87",
-"@	c #225361",
-"#	c #363636",
-"$	c #387D9A",
-"%	c #0A2B35",
-"&	c #4E4F50",
-"*	c #ECEBEB",
-"=	c #9D866F",
-"-	c #E3D9D3",
-";	c #A8947C",
-">	c #CDCDCD",
-",	c #C5BDA7",
-"'	c #B2A38C",
-")	c #D0C9B4",
-"!	c #AEACAB",
-"~	c #FDFDFD",
-"{	c #020202",
-"]	c #856B5D",
-"^	c #262524",
-"/	c #6E6E6E",
-"(	c #888987",
-"_	c #121111",
-":	c #9E9D9D",
-"<	c #4F6871",
-"[	c #BCBDBD",
-"}	c #023B4A",
-"|	c #6E4C3B",
-"1	c #7D5945",
-"2	c #4F2C21",
-"3	c #401D14",
-"             .+@@#              ",
-"             ++++$              ",
-"           #%&@&@@@.            ",
-"           *=-;>,'-             ",
-"             )*=!~              ",
-"           {{#]]]#{{            ",
-"        {{^^%+@/(%_/#_          ",
-"      {{&:*>@+<&<<%[~[&{        ",
-"     _#:~~~~<+@/@&&(-~~/_       ",
-"    _#>~~[<^{}%%@{_&{<>~:{      ",
-"   _#-~>&{{  }}.+{   {^:~({     ",
-"   ^>~>_^(;>,:((((--,) {(~&     ",
-"  {(~*#{ ,),))))))),,;  _>[{    ",
-" #^*~({  ;',,,,,),,,=|  {&*#    ",
-" _/~~&{  ;;',)),)),=1]   ^*/{   ",
-" _(~*^_  =;;'),,))=|11   {>[_   ",
-" _!~*_{  ====',,,=|1|2   {:-^   ",
-" _:~*^{  ;;;';')=|]1##   {:*^   ",
-" {(~*^{  ;=;=;=]||12&2   {:~^   ",
-" _&~~&{  ==;==|321^:/^   {[~^   ",
-"  _>~/{  =';;13222&~#3  {#~>_   ",
-"  {/~!{  =;=|3333_[~^#  {:~(^   ",
-"  ^_>~^{ ''|3222_#~*^| {#~*^    ",
-"   {#~:{&'123232{/~*^^{_>~/{    ",
-"    {&*&^|323333{(~*&{#>~:{     ",
-"     {&!#       {(~~[!*~:{{     ",
-"      {^#_      {/~*~~~:{{      ",
-"        __{{    {#~~~~~:^{      ",
-"                 _>~~~~~-/_{    ",
-"                 {#([*~~~~[&_{  ",
-"                   {{^&(:[**!&{ ",
-"                        {{_^&&#{"};
diff --git a/games-arcade/whichwayisup/metadata.xml b/games-arcade/whichwayisup/metadata.xml
deleted file mode 100644
index e60b4379f974..000000000000
--- a/games-arcade/whichwayisup/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>A traditional and challenging 2D platformer game with a
-    slight rotational twist. Help a mysterious big-eared salaryman named Guy
-    find his keys in a labyrinth of dangers and bad dialogue.</longdescription>
-</pkgmetadata>
diff --git a/games-arcade/whichwayisup/whichwayisup-0.7.9-r2.ebuild b/games-arcade/whichwayisup/whichwayisup-0.7.9-r2.ebuild
deleted file mode 100644
index 84964d15a797..000000000000
--- a/games-arcade/whichwayisup/whichwayisup-0.7.9-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-single-r1
-
-MY_PV="${PV//./}"
-MY_P="${PN}_b${MY_PV}"
-
-DESCRIPTION="A traditional and challenging 2D platformer game with a slight rotational twist"
-HOMEPAGE="http://hectigo.net/puskutraktori/whichwayisup/"
-SRC_URI="http://hectigo.net/puskutraktori/whichwayisup/${MY_P}.zip"
-
-LICENSE="GPL-2 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:libdir\ =\ .*:libdir\ =\ \"/usr/$(get_libdir)/${PN}\":" \
-		run_game.py || die
-	sed -i \
-		-e "s:data_dir\ =\ .*:data_dir\ =\ \"/usr/share/${PN}\":" \
-		lib/data.py || die
-	rm data/pictures/Thumbs.db
-	python_fix_shebang .
-}
-
-src_install() {
-	newbin run_game.py ${PN}
-
-	insinto "/usr/$(get_libdir)/${PN}"
-	doins lib/*.py
-
-	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
-
-	einstalldocs
-
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-
-	newicon "${FILESDIR}"/${PN}-32.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Which Way Is Up?"
-}
diff --git a/games-arcade/wop-0.4.3-r2 b/games-arcade/wop-0.4.3-r2
new file mode 100644
index 000000000000..1d9f44cfa035
--- /dev/null
+++ b/games-arcade/wop-0.4.3-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf x11-misc/makedepend
+DESCRIPTION=Worms of Prey - A multi-player, real-time clone of Worms
+EAPI=6
+HOMEPAGE=http://wormsofprey.org/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf
+SLOT=0
+SRC_URI=http://wormsofprey.org/download/wop-0.4.3-src.tar.bz2 http://wormsofprey.org/download/wopdata-2005-12-21.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_=55b830f547e669d8c6a03534a121426b
diff --git a/games-arcade/wop/Manifest b/games-arcade/wop/Manifest
deleted file mode 100644
index dde18551c81b..000000000000
--- a/games-arcade/wop/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX wop-0.4.3-fix-build-system.patch 2381 BLAKE2B 8115f6da93c503b1f5271bf0f8cf40c0513b0a3d74ec2387201d4ed2ec52a1518171e382518541315964b3dc6ca19ed99562c660653dcfefb0f5057f5c35d936 SHA512 73c7196caeeaf247bcc70336c8ce105b43ff08948d0f959487fa497c540e3a7447eadabdc8cc9753e7436ae86aad2fbdeb6190e2da75e7f0bf5bd23ff57b0d33
-AUX wop-0.4.3-gcc43.patch 761 BLAKE2B 7800d46a067f23ac40f9fca23699579fbbbe644550394fc41fe6dc8fde9103a8d456c35d29114829f388244dc2410309fbfc5bc26eecf01883d4034e23618bc0 SHA512 24ecbb265e9b38c8515b50a5f897c295e3573d6f5ca2a0f463db178d404456875af65c5ce0e9ea72bebffae3250dec44e4ae86da6558ea60db0760ce5247014a
-AUX wop-0.4.3-gcc6.patch 673 BLAKE2B 0c535efe1aa0b005f30bbf17a075de0f51822d4d0474f635bd0c23e0e667d2e5e94f0735079498d23e0be9035545e09f0b394bf3b4102372159db21775caf17e SHA512 7e0624b4a7a99eacbb854b1e0075ecc06c7b4b10d8a7ad18e01d5908cab7a7c222d8d15d833a2cd85f49d75d3b6aa1709bb7ec6ba69f29ed98ea17778df1a057
-DIST wop-0.4.3-src.tar.bz2 280974 BLAKE2B 8a24aa604ba0eab141e9a59b595ea882a5b0fb22662bb10752d2fdac79e00be4bce4721cdfca479d8f55bcaee5f1f33e7af57573dbd4c7994c88124ac35fd551 SHA512 259f9f455e6fbfae2ffb6e169dcf1661f1353e28a5e51b6e907f2868a50c5f54982b4d383dcfcec201c9a2d0429fb468c44c974695364c5fd28d25328e10c6b8
-DIST wopdata-2005-12-21.tar.bz2 4217006 BLAKE2B 0ebe5dd4ee8ca2ea026313ec9ee6a283699ad144e39a7d1f6984c37720b0beafb98a8864a0695484427c3398969908f3ca16909ef07601046540accb3cfbe103 SHA512 6ebc264d1811091550d664a77aeae68184a058c666db486e4ae411e0849abbd02dd2037a3a1a9a31a73774e5f616c21840b0c1de58636dde0e59bd0e952cb505
-EBUILD wop-0.4.3-r2.ebuild 1117 BLAKE2B 669cb80cf2020b122c7472e7af59231658701b8014e8d4c125a8b1a814e838d2f43a984d916ba6f6f25d20ad71a724274a717ab8fceebcd82f16e7f75e710dd3 SHA512 077eeb187309698d84c354deda455f27212bdf11e7d57f296ba39b08fb7caaa1abace85b16630bed68ca9dd5823e6ab6ab7640b16a1ccdfa7d6c33dd29cbff62
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch b/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch
deleted file mode 100644
index 5af16960a95a..000000000000
--- a/games-arcade/wop/files/wop-0.4.3-fix-build-system.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-* Remove hardcoded user variables
-* Respect LDFLAGS and CPPFLAGS
-* Fix installation dir for arch-independent files
-
---- a/Makefile
-+++ b/Makefile
-@@ -3,22 +3,22 @@
- sinclude Makefile.local
- 
- all:
--	+cd sdlwidgets; make
--	+cd src; make
-+	$(MAKE) -C sdlwidgets
-+	$(MAKE) -C src
- runc:
--	+cd src; make runc
-+	$(MAKE) -C src runc
- runs:
--	+cd src; make runs
-+	$(MAKE) -C src runs
- doc:
--	cd src; make doc
-+	$(MAKE) -C src doc
- clean:
--	cd sdlwidgets; make clean
--	cd src; make clean
-+	$(MAKE) -C sdlwidgets clean
-+	$(MAKE) -C src clean
- 	cd doc; rm -rf html
- unison:
--	cd src; make unison
-+	$(MAKE) -C src unison
- gunison:
--	cd src; make gunison
-+	$(MAKE) -C src gunison
- snapshot-src:
- 	ln -s . wop;                                           \
- 	tar cjvf wop-`date +%F`.tar.bz2                        \
---- a/sdlwidgets/Makefile
-+++ b/sdlwidgets/Makefile
-@@ -9,16 +9,12 @@
- CXXFLAGS ?= -Wall -Wshadow -Wsign-compare -Wparentheses -Wconversion -g -O3 -ansi
- CXXFLAGS += $(shell sdl-config --cflags)
- 
--CXX = g++
--AR = ar cru
--RANLIB = ranlib
--
- sinclude ../src/Makefile.local
- 
- all: $(TARGET)
- 
- $(TARGET): $(OBJECT_FILES) Makefile
--	$(AR) $(TARGET) $(OBJECT_FILES)
-+	$(AR) cru $(TARGET) $(OBJECT_FILES)
- 	$(RANLIB) $(TARGET)
- 
- %.o: %.cpp Makefile
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,14 +18,13 @@
-             -DUSE_SDL -DNEW=new\(std::nothrow\) \
-             -I../sdlwidgets \
-             $(shell sdl-config --cflags) # -g
--LDFLAGS  = -L../sdlwidgets -lsdlwidgets -lz \
-+LIBS      = -L../sdlwidgets -lsdlwidgets -lz \
-            -lm -lSDL_net -lSDL_mixer -lSDL_ttf -lSDL_image \
-            $(shell sdl-config --libs) # -g
- 
- WOPFLAGS = data=../data
- DOXYGENFLAGS = ../doc/doxygen.rc
- 
--CXX = g++
- DOXYGEN = doxygen
- UNISON_SOURCE = ssh://131.188.67.22//homes/staff/pohlt/wop/.unison_data
- 
-@@ -56,10 +55,10 @@
- 
- $(TARGET): $(OBJECT_FILES) Makefile ../sdlwidgets/libsdlwidgets.a
- 	-mkdir ../bin
--	$(CXX) $(OBJECT_FILES) -o $(TARGET) $(LDFLAGS)
-+	$(CXX) $(LDFLAGS) $(OBJECT_FILES) -o $(TARGET) $(LIBS)
- 
- %.o: %.cpp Makefile
--	$(CXX) $(CXXFLAGS) -c $< -o $@
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- clean:
- 	-rm -f $(TARGET) *.o Makefile.depend*
---- a/woprc
-+++ b/woprc
-@@ -30,7 +30,7 @@
- 
- ## path of the data directory
- ##  - optional, default "./data"
--data = ./data
-+data = /usr/share/wop
- 
- ## server name or IP address
- ##  - optional, default "localhost"
diff --git a/games-arcade/wop/files/wop-0.4.3-gcc43.patch b/games-arcade/wop/files/wop-0.4.3-gcc43.patch
deleted file mode 100644
index d4273f18ff6e..000000000000
--- a/games-arcade/wop/files/wop-0.4.3-gcc43.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/src/scusibot.cpp
-+++ b/src/scusibot.cpp
-@@ -5,6 +5,7 @@
- #include "stationarygun.hpp"
- #include "global.hpp"
- #include <vector>
-+#include <algorithm>
- 
- ScusiBot::ScusiBot()
- 	: m_event( Event::EMPTY ), m_count( 0 ), m_state( IDLE ) {
---- a/src/gameinfowindow.cpp
-+++ b/src/gameinfowindow.cpp
-@@ -10,6 +10,8 @@
- #include "avatarworm.hpp"
- #include "wopsprites.hpp"
- #include "wopsprites.cpp"
-+#include "spriteset.cpp"
-+#include "spritesequence.cpp"
- #include "scorekeeper.hpp"
- #include "wopgui.hpp"
- 
---- a/src/map.cpp
-+++ b/src/map.cpp
-@@ -9,6 +9,8 @@
- #include "world.hpp"
- #include "wopsettings.hpp"
- #include "objectpaths.hpp"
-+#include "spriteset.cpp"
-+#include "spritesequence.cpp"
- 
- /**********************************************************/
- 
diff --git a/games-arcade/wop/files/wop-0.4.3-gcc6.patch b/games-arcade/wop/files/wop-0.4.3-gcc6.patch
deleted file mode 100644
index 14eea98c1a4e..000000000000
--- a/games-arcade/wop/files/wop-0.4.3-gcc6.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/global.cpp
-+++ b/src/global.cpp
-@@ -44,10 +44,10 @@
- #define GREEN(s)                 s
- #define RED(s)                   s
- #else
--#define BLACK(s)                 "\033[0;1m"s"\033[0m"
--#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m"s"\033[0m"
--#define GREEN(s)                 "\033[32m"s"\033[0m"
--#define RED(s)                   "\033[31m"s"\033[0m"
-+#define BLACK(s)                 "\033[0;1m" s "\033[0m"
-+#define BLINKINK_BLACK_ON_RED(s) "\033[05;1;41m" s "\033[0m"
-+#define GREEN(s)                 "\033[32m" s "\033[0m"
-+#define RED(s)                   "\033[31m" s "\033[0m"
- #endif
- 
- /**********************************************************/
diff --git a/games-arcade/wop/metadata.xml b/games-arcade/wop/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/wop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/wop/wop-0.4.3-r2.ebuild b/games-arcade/wop/wop-0.4.3-r2.ebuild
deleted file mode 100644
index f0ef50085b68..000000000000
--- a/games-arcade/wop/wop-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-MY_DATA_V="2005-12-21"
-MY_DATA_P="${PN}data-${MY_DATA_V}"
-
-DESCRIPTION="Worms of Prey - A multi-player, real-time clone of Worms"
-HOMEPAGE="http://wormsofprey.org/"
-SRC_URI="
-	http://wormsofprey.org/download/${P}-src.tar.bz2
-	http://wormsofprey.org/download/${MY_DATA_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-build-system.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	tc-export AR CXX RANLIB
-}
-
-src_install() {
-	dobin bin/${PN}
-
-	insinto /usr/share/${PN}
-	doins -r "${WORKDIR}/${MY_DATA_P}"/.
-
-	insinto /etc
-	doins woprc
-
-	newicon "${WORKDIR}/${MY_DATA_P}"/images/misc/icons/wop16.png ${PN}.png
-	make_desktop_entry wop "Worms of Prey"
-
-	dodoc AUTHORS ChangeLog README{,-Libraries.txt} REVIEWS
-}
diff --git a/games-arcade/xbill-2.1-r2 b/games-arcade/xbill-2.1-r2
new file mode 100644
index 000000000000..78172386543e
--- /dev/null
+++ b/games-arcade/xbill-2.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) 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 game about an evil hacker called Bill!
+EAPI=5
+HOMEPAGE=http://www.xbill.org/
+IUSE=gtk
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.xbill.org/download/xbill-2.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2e370a36a16f805688fd6d70e3208bd0
diff --git a/games-arcade/xbill/Manifest b/games-arcade/xbill/Manifest
deleted file mode 100644
index 3aa4155109d8..000000000000
--- a/games-arcade/xbill/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xbill-2.1-gentoo.patch 9281 BLAKE2B 852ac415c5525daeb47f321c2e91d76a2af842b5e934a0082e481a940919cffff3c600cd373c76564741346d580db01eba8ce502ba7f47c627a3c66bf042aa5a SHA512 81bdcb950260b6d8b52b9857d1d09b351b422df5789319873ea6e6f2431559c6a0a5a963a87313ed23b2a496d570c6c02e50df2c22f4195c48506f7711a740b8
-AUX xbill-2.1-gtk2.patch 582 BLAKE2B 6f1c3a23a672f4b1f2acd7fbb3e26df4b762eadbbdbb94fc9d2b0b12afe09cafdef6d6834bfb8cd5b7467575a4be72b985c804e95389a36061b676bd31c1abaa SHA512 628db81665e33431391f8756969c97bcb4514ad91c3248470204c41b386b01b3e2733d7a8a524f282b304e7fa5eafdf77ec6a7e4f1c45cadc09e6a3a355359f7
-DIST xbill-2.1.tar.gz 77610 BLAKE2B aeadc62fa01a3d37b1ae6388987e5d5e3a2d73b9c5afa99b9a2c61155eeb5fb2efc4a36dd2cbeb3fd2f677b385550146d75964afa5f7e83a27f6dc7a16db83c9 SHA512 127604d88258db0ec47084209c656f8817146d70b0fe16f5a1d79883415cf38200594834b39080d78c627104ae6d204f3c12caf127fa094108c4edfbfa98d966
-EBUILD xbill-2.1-r2.ebuild 788 BLAKE2B 956b073a41e85d3529c1bd7ac1881de3c46edabefcff01ab5f073c23fa046fdc5fc39718f128cff2973f88cad9441e6b7290f38d6cd437106bee185d9fc497f1 SHA512 7bb90ea958abc709616dcc1997499d348cca76b6a844620435ec8051b221cda99a9ac70d5cd5dc5593491a5f70c29e5782cf06320a64cbf80d231ef43edbbe3a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbill/files/xbill-2.1-gentoo.patch b/games-arcade/xbill/files/xbill-2.1-gentoo.patch
deleted file mode 100644
index 3446de74c92d..000000000000
--- a/games-arcade/xbill/files/xbill-2.1-gentoo.patch
+++ /dev/null
@@ -1,353 +0,0 @@
-diff -urN xbill-2.1.orig/bitmaps/gentoo.xbm xbill-2.1/bitmaps/gentoo.xbm
---- xbill-2.1.orig/bitmaps/gentoo.xbm	1970-01-01 01:00:00.000000000 +0100
-+++ xbill-2.1/bitmaps/gentoo.xbm	2008-08-23 00:48:57.000000000 +0200
-@@ -0,0 +1,11 @@
-+#define gentoo_width 28
-+#define gentoo_height 24
-+static unsigned char gentoo_bits[] = {
-+   0x00, 0x69, 0x00, 0x00, 0x20, 0x80, 0x03, 0x00, 0x10, 0x00, 0x0e, 0x00,
-+   0x08, 0x00, 0x18, 0x00, 0x04, 0x00, 0x70, 0x00, 0x02, 0xc0, 0xa5, 0x00,
-+   0x02, 0xf0, 0x69, 0x00, 0x02, 0xf8, 0xc1, 0x01, 0x06, 0xe0, 0x5a, 0x01,
-+   0x0c, 0x00, 0xa0, 0x03, 0x38, 0x00, 0x54, 0x01, 0xe0, 0x00, 0xa8, 0x09,
-+   0x00, 0x00, 0x52, 0x04, 0x00, 0x00, 0x2a, 0x06, 0x00, 0x00, 0x14, 0x03,
-+   0x00, 0x80, 0x82, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x20, 0x38, 0x00,
-+   0x00, 0x00, 0x0e, 0x00, 0x00, 0x80, 0x03, 0x00, 0x01, 0xe0, 0x00, 0x00,
-+   0x02, 0x7c, 0x00, 0x00, 0xfe, 0x0f, 0x00, 0x00, 0xf8, 0x01, 0x00, 0x00 };
-diff -urN xbill-2.1.orig/gtk.c xbill-2.1/gtk.c
---- xbill-2.1.orig/gtk.c	2001-10-30 19:28:27.000000000 +0100
-+++ xbill-2.1/gtk.c	2008-08-23 00:57:55.000000000 +0200
-@@ -179,6 +179,7 @@
- #include "bitmaps/hand_down_mask.xbm"
- #include "bitmaps/hand_up.xbm"
- #include "bitmaps/hand_up_mask.xbm"
-+#include "bitmaps/gentoo.xbm"
- 
- typedef struct cursormap {
- 	const char *name;
-@@ -195,7 +196,7 @@
- static cursormap cursors[] = {
- 	CURSOR_ADD(apple), CURSOR_ADD(bsd), CURSOR_ADD(hurd),
- 	CURSOR_ADD(linux), CURSOR_ADD(next), CURSOR_ADD(os2), CURSOR_ADD(palm),
--	CURSOR_ADD(redhat), CURSOR_ADD(sgi), CURSOR_ADD(sun),
-+	CURSOR_ADD(redhat), CURSOR_ADD(sgi), CURSOR_ADD(sun), CURSOR_ADD(gentoo),
- 	CURSOR_ADD(bucket),
- 	CURSOR_ADD_MASKED(hand_up), CURSOR_ADD_MASKED(hand_down),
- 	{NULL, 0, 0, NULL, NULL},
-diff -urN xbill-2.1.orig/Makefile.in xbill-2.1/Makefile.in
---- xbill-2.1.orig/Makefile.in	2001-10-30 19:31:09.000000000 +0100
-+++ xbill-2.1/Makefile.in	2008-08-23 00:50:05.000000000 +0200
-@@ -46,13 +46,13 @@
- 	pixmaps/palm.xpm pixmaps/palmcpu.xpm pixmaps/redhat.xpm \
- 	pixmaps/sgi.xpm pixmaps/sgicpu.xpm pixmaps/spark_0.xpm \
- 	pixmaps/spark_1.xpm pixmaps/sun.xpm pixmaps/suncpu.xpm \
--	pixmaps/toaster.xpm pixmaps/wingdows.xpm
-+	pixmaps/toaster.xpm pixmaps/wingdows.xpm pixmaps/gentoo.xpm
- 
- XBMS =	bitmaps/apple.xbm bitmaps/bsd.xbm bitmaps/bucket.xbm \
- 	bitmaps/hand_down.xbm bitmaps/hand_down_mask.xbm bitmaps/hand_up.xbm \
- 	bitmaps/hand_up_mask.xbm bitmaps/hurd.xbm bitmaps/linux.xbm \
- 	bitmaps/next.xbm bitmaps/os2.xbm bitmaps/palm.xbm bitmaps/redhat.xbm \
--	bitmaps/sgi.xbm bitmaps/sun.xbm
-+	bitmaps/sgi.xbm bitmaps/sun.xbm bitmaps/gentoo.xbm
- 
- MANDIR = man6
- MAN = xbill.6
-diff -urN xbill-2.1.orig/OS.c xbill-2.1/OS.c
---- xbill-2.1.orig/OS.c	2001-10-30 19:28:27.000000000 +0100
-+++ xbill-2.1/OS.c	2008-08-23 00:50:26.000000000 +0200
-@@ -7,7 +7,7 @@
- #define MIN_PC 6		/* OS >= MIN_PC means the OS is a PC OS */
- 
- static const char *osname[] = {"wingdows", "apple", "next", "sgi", "sun",
--			       "palm", "os2", "bsd", "linux", "redhat", "hurd"};
-+			       "palm", "os2", "bsd", "linux", "redhat", "hurd", "gentoo"};
- #define NUM_OS (sizeof(osname) / sizeof(osname[0]))
- 
- static Picture *os[NUM_OS];		/* array of OS pictures*/
-diff -urN xbill-2.1.orig/pixmaps/gentoo.xpm xbill-2.1/pixmaps/gentoo.xpm
---- xbill-2.1.orig/pixmaps/gentoo.xpm	1970-01-01 01:00:00.000000000 +0100
-+++ xbill-2.1/pixmaps/gentoo.xpm	2008-08-23 00:49:01.000000000 +0200
-@@ -0,0 +1,283 @@
-+/* XPM */
-+static char * gentoo_xpm[] = {
-+"28 24 256 2",
-+"  	c None",
-+". 	c #9B91FA",
-+"+ 	c #998FFB",
-+"@ 	c #9D97C7",
-+"# 	c #958EC6",
-+"$ 	c #FEFEFE",
-+"% 	c #FFFFFF",
-+"& 	c #FCFCFE",
-+"* 	c #F3F3FC",
-+"= 	c #C4C0EF",
-+"- 	c #948BE3",
-+"; 	c #958BF1",
-+"> 	c #9992D1",
-+", 	c #D8D6F0",
-+"' 	c #F7F7FC",
-+") 	c #EDEDFB",
-+"! 	c #E4E3FA",
-+"~ 	c #DAD9F8",
-+"{ 	c #9185F7",
-+"] 	c #9287F7",
-+"^ 	c #948BE4",
-+"/ 	c #FAFAFD",
-+"( 	c #F0F0FC",
-+"_ 	c #E7E6FA",
-+": 	c #DCDCF7",
-+"< 	c #D3D2F7",
-+"[ 	c #C9C8F5",
-+"} 	c #9D95F6",
-+"| 	c #9184F7",
-+"1 	c #8F83F4",
-+"2 	c #FCFCFD",
-+"3 	c #F2F2FB",
-+"4 	c #E9E8FA",
-+"5 	c #DFDEF8",
-+"6 	c #D5D4F6",
-+"7 	c #CBCAF4",
-+"8 	c #C1C0F3",
-+"9 	c #BBBAF2",
-+"0 	c #AAA4F4",
-+"a 	c #9388F8",
-+"b 	c #CECDF5",
-+"c 	c #9E95F6",
-+"d 	c #E0E0F8",
-+"e 	c #D6D5F7",
-+"f 	c #CCCBF5",
-+"g 	c #C2C1F2",
-+"h 	c #BBB8F2",
-+"i 	c #B5B2F4",
-+"j 	c #B5B2F2",
-+"k 	c #9084EF",
-+"l 	c #8E82F8",
-+"m 	c #EBE9FD",
-+"n 	c #9184F2",
-+"o 	c #9084F0",
-+"p 	c #998FF6",
-+"q 	c #908AB7",
-+"r 	c #D5D5F5",
-+"s 	c #CCCCF4",
-+"t 	c #C3C2F3",
-+"u 	c #BBB9F2",
-+"v 	c #B5B2F3",
-+"w 	c #AFABF3",
-+"x 	c #C3C2F4",
-+"y 	c #C6C6F4",
-+"z 	c #8E81F4",
-+"A 	c #9186ED",
-+"B 	c #9287ED",
-+"C 	c #9287EB",
-+"D 	c #524C76",
-+"E 	c #CCCBF4",
-+"F 	c #BBB9F3",
-+"G 	c #AFABF4",
-+"H 	c #AAA5F5",
-+"I 	c #D9D8F6",
-+"J 	c #DADAF7",
-+"K 	c #9085EF",
-+"L 	c #C5C2F6",
-+"M 	c #FEFEFF",
-+"N 	c #9D97C9",
-+"O 	c #8C86B3",
-+"P 	c #938AE6",
-+"Q 	c #514C76",
-+"R 	c #CBCBF5",
-+"S 	c #BAB9F2",
-+"T 	c #B4B1F3",
-+"U 	c #AFAAF4",
-+"V 	c #A9A4F5",
-+"W 	c #A59DF6",
-+"X 	c #E0DEF9",
-+"Y 	c #EFEFFC",
-+"Z 	c #9388EA",
-+"` 	c #BCBCF3",
-+" .	c #BCBBF2",
-+"..	c #BEBDF2",
-+"+.	c #FBFBFE",
-+"@.	c #FAFAFF",
-+"#.	c #E7E7F9",
-+"$.	c #DEDEF9",
-+"%.	c #D4D4F7",
-+"&.	c #CAC9F4",
-+"*.	c #C0BFF3",
-+"=.	c #BAB8F2",
-+"-.	c #B4B0F4",
-+";.	c #AEAAF4",
-+">.	c #A9A3F5",
-+",.	c #A39CF6",
-+"'.	c #9F96F5",
-+").	c #958AE3",
-+"!.	c #D2D2F6",
-+"~.	c #D3D2F6",
-+"{.	c #D6D5F6",
-+"].	c #F9F9FD",
-+"^.	c #EFEFFB",
-+"/.	c #E5E5F9",
-+"(.	c #DCDBF8",
-+"_.	c #D2D1F6",
-+":.	c #C8C7F4",
-+"<.	c #BFBEF3",
-+"[.	c #B9B7F2",
-+"}.	c #B3AFF4",
-+"|.	c #ADA9F3",
-+"1.	c #A9A1F5",
-+"2.	c #A29CF6",
-+"3.	c #9E95F7",
-+"4.	c #F3F2FE",
-+"5.	c #968DDE",
-+"6.	c #968EDD",
-+"7.	c #978DDC",
-+"8.	c #988EDB",
-+"9.	c #EAEAFA",
-+"0.	c #FFFFFE",
-+"a.	c #F5F5FD",
-+"b.	c #EBEBFB",
-+"c.	c #E2E2F8",
-+"d.	c #D8D8F8",
-+"e.	c #D0CEF6",
-+"f.	c #C6C5F4",
-+"g.	c #B7B4F3",
-+"h.	c #B1AEF4",
-+"i.	c #ADA8F5",
-+"j.	c #A7A1F5",
-+"k.	c #A19AF6",
-+"l.	c #9D93F7",
-+"m.	c #9890D6",
-+"n.	c #FBFBFD",
-+"o.	c #FAFAFE",
-+"p.	c #F1F1FB",
-+"q.	c #E8E7F9",
-+"r.	c #D5D5F7",
-+"s.	c #C2C1F3",
-+"t.	c #BBBAF3",
-+"u.	c #B5B3F2",
-+"v.	c #B1ACF4",
-+"w.	c #ABA6F4",
-+"x.	c #A69FF5",
-+"y.	c #A199F6",
-+"z.	c #9D96C8",
-+"A.	c #FDFDFD",
-+"B.	c #F5F5FC",
-+"C.	c #ECECFB",
-+"D.	c #E3E3F9",
-+"E.	c #D2D0F6",
-+"F.	c #C8C8F5",
-+"G.	c #BFBEF2",
-+"H.	c #B9B7F3",
-+"I.	c #AAA4F5",
-+"J.	c #9E96F5",
-+"K.	c #9B95C3",
-+"L.	c #9B95C2",
-+"M.	c #CDCCF4",
-+"N.	c #C4C3F3",
-+"O.	c #BCBAF2",
-+"P.	c #B1AEF3",
-+"Q.	c #ACA8F4",
-+"R.	c #958FBC",
-+"S.	c #948EBB",
-+"T.	c #F8F8FC",
-+"U.	c #F1F1FC",
-+"V.	c #E9E9FB",
-+"W.	c #E1E1F9",
-+"X.	c #D9D8F8",
-+"Y.	c #D0D0F6",
-+"Z.	c #C7C7F4",
-+"`.	c #B5B1F4",
-+" +	c #B0ABF4",
-+".+	c #908AB8",
-+"++	c #8E88B6",
-+"@+	c #8E88B5",
-+"#+	c #9892C2",
-+"$+	c #FEFEFD",
-+"%+	c #F1F0FB",
-+"&+	c #EAE9FA",
-+"*+	c #E2E2F9",
-+"=+	c #DBDAF7",
-+"-+	c #CBCAF5",
-+";+	c #BCB9F2",
-+">+	c #B6B4F2",
-+",+	c #8A84B1",
-+"'+	c #8983B0",
-+")+	c #9791BE",
-+"!+	c #F0EFFB",
-+"~+	c #E8E9FB",
-+"{+	c #E2E1F9",
-+"]+	c #DBDAF8",
-+"^+	c #D3D3F7",
-+"/+	c #C5C4F4",
-+"(+	c #D0CFF7",
-+"_+	c #857FAB",
-+":+	c #847EAA",
-+"<+	c #837DA8",
-+"[+	c #F6F6FD",
-+"}+	c #F2F1FC",
-+"|+	c #ECECFA",
-+"1+	c #E6E7F9",
-+"2+	c #E1E0F9",
-+"3+	c #D4D3F6",
-+"4+	c #C5C4F3",
-+"5+	c #D1CFDF",
-+"6+	c #7E78A5",
-+"7+	c #7D77A4",
-+"8+	c #F3F2FB",
-+"9+	c #F0EFFC",
-+"0+	c #E8E8FA",
-+"a+	c #DFDEF9",
-+"b+	c #D3D1F5",
-+"c+	c #C3C3F3",
-+"d+	c #FDFDFE",
-+"e+	c #78729E",
-+"f+	c #77719D",
-+"g+	c #76709C",
-+"h+	c #EAEAFB",
-+"i+	c #E6E6FA",
-+"j+	c #6B6594",
-+"k+	c #736D99",
-+"l+	c #736D98",
-+"m+	c #726C97",
-+"n+	c #7A749F",
-+"o+	c #DADAF8",
-+"p+	c #6F6995",
-+"q+	c #6E6894",
-+"r+	c #6C6693",
-+"s+	c #6C6692",
-+"t+	c #C7C4D5",
-+"u+	c #6D6792",
-+"v+	c #6B658F",
-+"w+	c #6A648E",
-+"x+	c #68628D",
-+"y+	c #67618D",
-+"z+	c #67618B",
-+"A+	c #69638E",
-+"B+	c #68628E",
-+"C+	c #67618C",
-+"D+	c #655F8A",
-+"E+	c #645E89",
-+"F+	c #645E88",
-+"G+	c #635D88",
-+"                      . +                               ",
-+"              @ # $ % % & * = - ;                       ",
-+"          > , % % % % % % ' ) ! ~ { ]                   ",
-+"        ^ % % % % % % % % / ( _ : < [ } |               ",
-+"      1 $ $ $ $ $ $ $ $ $ 2 3 4 5 6 7 8 9 0             ",
-+"    a % $ % $ % $ % $ % $ % b c d e f g h i j k         ",
-+"  l % % % $ $ % % $ $ % m n o p q r s t u v w x y       ",
-+"  z $ % % $ $ % % $ $ v A B C C D D E g F i G H I J     ",
-+"  K G L % % % % % % % M N O   P Q e R g S T U V W X Y   ",
-+"    Z `  ...$ % % % $ % % +.@.#.$.%.&.*.=.-.;.>.,.'.$ $ ",
-+"      ).).!.~.{.% $ $ $ % ].^./.(._.:.<.[.}.|.1.2.3.4.$ ",
-+"        5.6.7.8.9.) $ $ 0.a.b.c.d.e.f.` g.h.i.j.k.l.$ $ ",
-+"              m.n.$ % $ o.p.q.5 r.f s.t.u.v.w.x.y.$ % z.",
-+"            $ $ $ $ $ A.B.C.D.J E.F.G.H.T ;.I.J.$ $ K.L.",
-+"          $ $ % $ $ $ ' ^._ $.e M.N.O.g.P.Q.% % $ R.S.  ",
-+"        $ $ % $ $ $ T.U.V.W.X.Y.Z.<.H.`. +$ % .+++@+    ",
-+"    #+$ $ $ $ $ $+T.%+&+*+=+!.-+t ;+>+% $ $ ,+'+        ",
-+"  )+$ % % $ $ / B.!+~+{+]+^+f /+ .(+$ % _+:+<+          ",
-+"  % $ % & ].[+}+|+1+2+=+3+s 4+9 % % 5+6+7+              ",
-+"'+$ [+B.8+9+C.0+! a+X.b+f c+$ % d+e+f+g+                ",
-+"  $ $ h+~+i+c.a+~ e Y.$ % % j+k+l+m+                    ",
-+"  n+% % ].J o+0.$ $ % % p+q+r+s+                        ",
-+"  l+m+t+% $ $ % u+v+w+x+y+z+                            ",
-+"      A+B+y+C+D+E+F+G+                                  "};
diff --git a/games-arcade/xbill/files/xbill-2.1-gtk2.patch b/games-arcade/xbill/files/xbill-2.1-gtk2.patch
deleted file mode 100644
index 70817b09c7ab..000000000000
--- a/games-arcade/xbill/files/xbill-2.1-gtk2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.in.old	2007-12-05 22:37:57.000000000 +0100
-+++ configure.in	2007-12-05 22:54:57.000000000 +0100
-@@ -88,12 +88,11 @@
- 	[  --enable-gtk            build with the GTK widget set])
- 
- if test "$enable_gtk" != "no"; then
--	AC_CHECK_PROG(GTKCONFIG, gtk-config, yes, no)
-+	PKG_CHECK_MODULES(GTK, gtk+-2.0)
- 
--	if test "X$GTKCONFIG" = X"yes"; then
-+	if test $pkg_failed = no; then
- 		AC_DEFINE(USE_GTK)
--		GTK_CFLAGS="`gtk-config --cflags`"
--		WIDGET_LIBS="$WIDGET_LIBS `gtk-config --libs`"
-+		WIDGET_LIBS="$WIDGET_LIBS $GTK_LIBS"
- 		WIDGET_OBJS="$WIDGET_OBJS gtk.o"
- 	fi
- fi
diff --git a/games-arcade/xbill/metadata.xml b/games-arcade/xbill/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/xbill/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xbill/xbill-2.1-r2.ebuild b/games-arcade/xbill/xbill-2.1-r2.ebuild
deleted file mode 100644
index 1152f2caca38..000000000000
--- a/games-arcade/xbill/xbill-2.1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools games
-
-DESCRIPTION="A game about an evil hacker called Bill!"
-HOMEPAGE="http://www.xbill.org/"
-SRC_URI="http://www.xbill.org/download/${P}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="gtk? ( x11-libs/gtk+:2 )
-	!gtk? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gtk2.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--disable-motif \
-		$(use_enable gtk) \
-		$(use_enable !gtk athena)
-}
-
-src_install() {
-	default
-	newicon pixmaps/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} XBill ${PN}
-	prepgamesdirs
-}
diff --git a/games-arcade/xboing-2.4-r3 b/games-arcade/xboing-2.4-r3
new file mode 100644
index 000000000000..e141fe0c78f1
--- /dev/null
+++ b/games-arcade/xboing-2.4-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=x11-libs/libXpm app-text/rman x11-misc/gccmakedep x11-misc/imake
+DESCRIPTION=Blockout type game where you bounce a ball trying to destroy blocks
+EAPI=6
+HOMEPAGE=http://www.techrescue.org/xboing/
+KEYWORDS=~amd64 ~x86
+LICENSE=xboing
+RDEPEND=x11-libs/libXpm
+SLOT=0
+SRC_URI=http://www.techrescue.org/xboing/xboing2.4.tar.gz mirror://gentoo/xboing-2.4-debian.patch.bz2
+_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_=eb606fbc3ad1878957d7c5f1fbb8dceb
diff --git a/games-arcade/xboing/Manifest b/games-arcade/xboing/Manifest
deleted file mode 100644
index 993ec6a26b0d..000000000000
--- a/games-arcade/xboing/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xboing-2.4-buffer.patch 356 BLAKE2B 7a027064739bf3fe51f4ecad262c5461877186de4fc922340a930339e34b484138897581d70c2f5a64b15305bd6f107bf636ad600077c6104d02bde4f4f2c1d1 SHA512 8cd226cf2058d44bfb9055dec90b75eae32d68be40bf4e6a97d51edb443d425fd6de18efd82a3f254a5cf5e4bf4a815e21f45b7f51620adacd65bbb44309c038
-AUX xboing-2.4-sleep.patch 397 BLAKE2B cb872777d74f62474c24e58c6cd84888620a761b55904763cb8d1d7efc5ce72596904798a526713129121bcb867b581292cb74c1e9f98c64d5c5b30b3d5e6423 SHA512 3d77c9ac4502c34e3a004b260e01a14f34115dfff7a73bcef0fcfe8e7bcc94cbb959e408d4c6ccc5329f1fb2b2b90500b5c8e51d4e8899a202754645e599f8c0
-DIST xboing-2.4-debian.patch.bz2 7740 BLAKE2B 284aedee90ca6bca940be405c10e5440d9df9237d6cc6f11c51204f3c1e2f383589a918997461c0399747d33e9f7142016323e101c4b48b1c3e35704cab20902 SHA512 bffd9b747b1e8840aef872988f9ef8b341a56e63d390e386a8ca71358318ba9c0b37bebd91b1f036b52c56e70acf98ec35f92f4c0fa1e19e2f8c4fcc83c1e7d9
-DIST xboing2.4.tar.gz 588811 BLAKE2B 1d29c457108c70608ec2c2ea7d4856553e3e174e7a8852f3da671c64e9e6a6349ee511841facc937bf6252cdd0e094ece7fe09e548835b7a288514aa7ece82d2 SHA512 4b6987329bfe79b3b9709ca02974d0043c6e35210aa73903940efbd09e94b1873ce09b1bea014646029b77e9bd063279935843adceb6635817f15c8025a0c454
-EBUILD xboing-2.4-r3.ebuild 1394 BLAKE2B a3027d506e00a68d4de1ef939fc9046b494c4e6a1fff60520422574ca8cdfc826c58711cd25023610fc1f91504f01c236fab3f3f9477635d5bf30830283382f7 SHA512 4150f4ad241b3504a7b3959189a7bd26f9d9b782cfa96202ee1ebcadef3757152c334078b819cc830ec5a662000bd0f2380a65d9d2e9a20c64d5f7dd95c25c3d
-MISC metadata.xml 214 BLAKE2B 86c649fbb74ec8627ccee25d0b0d3cbac3b6f9ba8e164327c15faf02abca8583969e3e2a35bb629643500d079e873cdb8093c5ed3d7bb5c4348269d485088ae2 SHA512 eb9f85ca2fca14bf2aae5fe6001c2d7d1cf93e00bd4de8dac2f71f23ad3c7a7c8fcd65593b1adf77a07260cc546339846f4b33ec99032e353da07d1b3bff8f08
diff --git a/games-arcade/xboing/files/xboing-2.4-buffer.patch b/games-arcade/xboing/files/xboing-2.4-buffer.patch
deleted file mode 100644
index 381ae69982d9..000000000000
--- a/games-arcade/xboing/files/xboing-2.4-buffer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xboing.orig/init.c xboing/init.c
---- xboing.orig/init.c	1996-11-22 02:28:46.000000000 +0100
-+++ xboing/init.c	2013-02-02 19:57:55.000000000 +0100
-@@ -266,7 +266,7 @@
- #endif
- {
- 	/* Create all required font structures */
--	char str[80];
-+	char str[200];
- 
- 	/* Font used for titles */
-     if (!(titleFont = XLoadQueryFont(display, TITLE_FONT)))
diff --git a/games-arcade/xboing/files/xboing-2.4-sleep.patch b/games-arcade/xboing/files/xboing-2.4-sleep.patch
deleted file mode 100644
index 80723465185f..000000000000
--- a/games-arcade/xboing/files/xboing-2.4-sleep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru xboing.debian/misc.c xboing/misc.c
---- xboing.debian/misc.c	2013-02-02 20:07:07.000000000 +0100
-+++ xboing/misc.c	2013-02-02 20:11:51.000000000 +0100
-@@ -116,9 +116,7 @@
-     long SyncTime;
-     static unsigned long accu;
- 
--#ifdef __alpha__
-     ms *= 1000;	/* convert from milliseconds to microseconds for usleep */
--#endif
-   
-     gettimeofday(&st, NULL);
-     XSync(display, False);
diff --git a/games-arcade/xboing/metadata.xml b/games-arcade/xboing/metadata.xml
deleted file mode 100644
index 84503c2b1c29..000000000000
--- a/games-arcade/xboing/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person"><email>dilfridge@gentoo.org</email></maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xboing/xboing-2.4-r3.ebuild b/games-arcade/xboing/xboing-2.4-r3.ebuild
deleted file mode 100644
index 2d0088210afb..000000000000
--- a/games-arcade/xboing/xboing-2.4-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils user
-
-DESCRIPTION="Blockout type game where you bounce a ball trying to destroy blocks"
-HOMEPAGE="http://www.techrescue.org/xboing/"
-SRC_URI="http://www.techrescue.org/xboing/${PN}${PV}.tar.gz
-	mirror://gentoo/xboing-${PV}-debian.patch.bz2"
-
-LICENSE="xboing"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake
-"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup(){
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/xboing-${PV}-debian.patch
-	epatch "${FILESDIR}"/xboing-${PV}-buffer.patch
-	epatch "${FILESDIR}"/xboing-${PV}-sleep.patch
-	sed -i '/^#include/s:xpm\.h:X11/xpm.h:' *.c || die
-	eapply_user
-}
-
-src_configure() {
-	xmkmf -a || die
-	sed -i -e "s:GENTOO_VER:${PF/${PN}-/}:" Imakefile || die
-}
-
-src_compile() {
-	emake \
-		CXXOPTIONS="${CXXFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XBOING_DIR="/usr/share/${PN}"
-}
-
-src_install() {
-	make \
-		PREFIX="${D}" \
-		BINDIR="${D}/usr/bin" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		XBOING_DIR="/usr/share/${PN}" \
-		install || die
-	newman xboing.man xboing.6
-	dodoc README docs/*.doc
-
-	fowners root:gamestat /var/games/xboing.score /usr/bin/xboing
-	fperms 660 /var/games/xboing.score
-	fperms 2755 /usr/bin/xboing
-}
diff --git a/games-arcade/xbubble-0.5.8-r1 b/games-arcade/xbubble-0.5.8-r1
new file mode 100644
index 000000000000..b2774154e47a
--- /dev/null
+++ b/games-arcade/xbubble-0.5.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXt media-libs/libpng:0= nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=A Puzzle Bobble clone similar to Frozen-Bubble
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/xbubble/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXt media-libs/libpng:0= nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/xbubble/xbubble-0.5.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=b76a67f0d346d8e5c245eb86f587ab83
diff --git a/games-arcade/xbubble/Manifest b/games-arcade/xbubble/Manifest
deleted file mode 100644
index 80b4c9ce7f7d..000000000000
--- a/games-arcade/xbubble/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xbubble-0.5.8-libpng14.patch 419 BLAKE2B 0111cee77be12e9eb12714aec7c79276c7b316bb47344104e6a171863dd60ef56c287fe460f89552ea448cb26498dffd46d4f4b0ba2b27a2416868390b58bcca SHA512 65e011385081d93ef4d633298726fd1783cc75505610bd54609fdadb7d390366a040856cfddca6444ecaaafb97b6cae69156e6ad96235eb01487680ffe34dd29
-AUX xbubble-0.5.8-locale.patch 252 BLAKE2B ed7312a3e4cd175dd45c3c1e7f8a0b8fc69a8bbd1d7889f722e024cddfa38e6ad82388160e5e03c064d3a60b3c77fcfb15f229c51a35d46b59056544d910e7be SHA512 0154b666cc21496304ed7fab382980e67bc7429ff74bbb5e92cdf2ed42db265b51e4fead878a6d96899eed58e4e5a35af0b2316178bb95ecbb2780fe01947014
-AUX xbubble-0.5.8-png15.patch 698 BLAKE2B 4481e2bf43876e043bc15dc6fff24a931f138628afa252db9e4eaf8a17899fbe2d8bcf8493780163f1c6ee9d1efb077e2240fb7ae4cc950ba40f6766eaa0ed77 SHA512 13f993dbd9e209de6fc13e6f2d656a95e285acec28058d3049f5b4019600a12848ac52e766781ee33273b60b57794897135d57298ae65bdc7348dbddc66a7440
-AUX xbubble-0.5.8-xpaths.patch 204 BLAKE2B 795352b16d86bf722041bba0fa047c12bf20108e175acd58bc30efc6a437387aa31ed97809ef7bf3d937aa205ae05b31776ec925e1025b348fba0af7c0625e4c SHA512 dd6854ef5ca24fa2bc89c3239d79fa0b122525776f4a3df8581566178ac139031abf4b46cea07cca8bbd1a0bbddf2227f20d6a2e4075dc68e7542018fcb69bfd
-DIST xbubble-0.5.8.tar.gz 5544359 BLAKE2B d52d5fd59c795087d6208656227e696b76424a34aa2dee8aced4a63f5105d7b9e95177a63ae71187c0ba07b6a58464c8ecb40b5252980971e9b3dc3799e0717a SHA512 132052d8e57218a2991ce0a0383f69f8818deafbf56046acaa3bc1c8ed7f31e5fb6b9b045df11eb3eaf77a8347b16ad663bb0f727823995e5df6d3adfcb75df2
-EBUILD xbubble-0.5.8-r1.ebuild 1095 BLAKE2B bad7066d4966047dabeff7c5bc49421def0b9e69486d3df928f8dadcaa3a9119f094465047a1e2bbaeef525acdcc19a76789e91c36f922f84331fb9fe4791a0d SHA512 bb6f43667345d1aa0c67146f7b959817315bb6e22d75790d2fbf558e6d3c5e8b8bd4be0ceda6a23c517806b7fdff1fb790fc0d7f08a95ccee7e15d47edbf5f63
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch b/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
deleted file mode 100644
index 4fe12672db65..000000000000
--- a/games-arcade/xbubble/files/xbubble-0.5.8-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308731
-
---- a/src/loadpng.c
-+++ b/src/loadpng.c
-@@ -55,7 +55,7 @@ unsigned char * load_png_file( const cha
-   }
-   /* ensure that we opened a PNG file */
-   fread( header, 1, 8, fd );
--  if ( ! png_check_sig( header, 8 ) ) {
-+  if ( png_sig_cmp( header, 0, 8 ) ) {
-     fclose(fd);
-     fprintf(stderr,_("File %s does not have a valid PNG signature.\n"), file);
-     return NULL;
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch b/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
deleted file mode 100644
index 99c03b0c82af..000000000000
--- a/games-arcade/xbubble/files/xbubble-0.5.8-locale.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gettext.h.orig	2008-10-07 12:01:37.000000000 -0400
-+++ b/src/gettext.h	2008-10-07 12:01:45.000000000 -0400
-@@ -24,6 +24,7 @@
- 
- /* Get declarations of GNU message catalog functions.  */
- # include <libintl.h>
-+# include <locale.h>
- 
- #else
- 
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch b/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
deleted file mode 100644
index bbbae5c31076..000000000000
--- a/games-arcade/xbubble/files/xbubble-0.5.8-png15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/loadpng.c.old	2011-09-14 09:58:40.503566961 +0200
-+++ b/src/loadpng.c	2011-09-14 10:03:39.708531447 +0200
-@@ -73,7 +73,7 @@
-     return NULL;
-   }
-   /* libpng does a longjmp here when it encounters an error */
--  if ( setjmp( png_ptr->jmpbuf ) ) {
-+  if ( setjmp( png_jmpbuf(png_ptr) ) ) {
-     png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
-     fclose(fd);
-     return NULL;
-@@ -95,7 +95,7 @@
-     png_set_gray_to_rgb(png_ptr);
- 
-   /* detect alpha layer */
--  if (( info_ptr->color_type & PNG_COLOR_MASK_ALPHA )||
-+  if (( png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA )||
-       ( png_get_valid( png_ptr, info_ptr, PNG_INFO_tRNS )))
-     *has_alpha = 1;
-   else
diff --git a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch b/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
deleted file mode 100644
index 4db0b8f10ccf..000000000000
--- a/games-arcade/xbubble/files/xbubble-0.5.8-xpaths.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-the x_libraries variable isnt always defined
-http://bugs.gentoo.org/92688
-
---- a/configure
-+++ b/configure
-@@ -4511,3 +4511,5 @@
- fi
-+if test x"$x_libraries" != x; then
- LIBS="-L$x_libraries $LIBS"
-+fi
- 
diff --git a/games-arcade/xbubble/metadata.xml b/games-arcade/xbubble/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/xbubble/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild b/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
deleted file mode 100644
index 67c8f575299f..000000000000
--- a/games-arcade/xbubble/xbubble-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A Puzzle Bobble clone similar to Frozen-Bubble"
-HOMEPAGE="http://www.nongnu.org/xbubble/"
-SRC_URI="http://www.ibiblio.org/pub/mirrors/gnu/ftp/savannah/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXt
-	media-libs/libpng:0=
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NetworkProtocol README TODO )
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-xpaths.patch \
-		"${FILESDIR}"/${P}-locale.patch \
-		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}-png15.patch
-	sed -i \
-		-e '/^AM_CFLAGS/d' \
-		src/Makefile.in || die
-	sed -i \
-		-e '/^localedir/s:=.*:=/usr/share/locale:' \
-		configure po/Makefile.in.in || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon data/themes/fancy/Bubble_black_DEAD_01.png ${PN}.png
-	make_desktop_entry ${PN} XBubble
-}
diff --git a/games-arcade/xevil-2.02_p2-r1 b/games-arcade/xevil-2.02_p2-r1
new file mode 100644
index 000000000000..f48e9056a534
--- /dev/null
+++ b/games-arcade/xevil-2.02_p2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/libXpm app-arch/unzip
+DESCRIPTION=3rd person, side-view, fast-action, kill-them-before-they-kill-you game
+EAPI=5
+HOMEPAGE=http://www.xevil.com/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXpm games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.xevil.com/download/stable/xevilsrc2.02r2.zip mirror://debian/pool/main/x/xevil/xevil_2.02r2-7.diff.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_=4c2a4512cf477bb035e61e0e347732cc
diff --git a/games-arcade/xevil/Manifest b/games-arcade/xevil/Manifest
deleted file mode 100644
index 1d7addc19389..000000000000
--- a/games-arcade/xevil/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xevil-2.02_p2-glibc-2.10.patch 645 BLAKE2B 0d65a0ceef77ed1843679b12c90c2f84e1060934cf7c695c5ef4191fb398e6c6ec039ccfed83fb46a42c7d61be22b531ef58779772d63852addb14a154b73a32 SHA512 e14396ede761833d2fe2171fb7679040617c8809846a56f80cc8848a6444bcc1f85b571c7fb917b736cd3d9bf3059bc986ca06d188307e8f24d98720611440e9
-DIST xevil_2.02r2-7.diff.gz 31205 BLAKE2B b90dcff021633e92ad8ab41f9715b05aa2661be68ad2bce303ac9c86056b265852e1112739b5da030eb3b5e90afded0858fbcf8f083e64154005a04ee8535f2c SHA512 03fbe2aa62b3856bef6af824444c484dced8a627087ba68ad946c3bfce7d0c0b5138902ea7668927d22ad37925daa07b489a2e70aa680cf477367c87833e1a58
-DIST xevilsrc2.02r2.zip 1857315 BLAKE2B e2d2272e81cc676089343288a95b56960837d6c50e68b89bb2fd563d23ed4b511fec2f7af34522fe003dfd626d5f75483872f9a827e29a75a7fcd57101a2e926 SHA512 ce9422da914234290797258f22fa5f8d6502dc5930eac1c3ce92d708196050ce5d75761c987e2d28b167699460b9c8fd72596242983a0b8ba6d2008c72b2354f
-EBUILD xevil-2.02_p2-r1.ebuild 1094 BLAKE2B 185279c7e3444dcfbbede5c0c59bb02cc1ed346696d3cb59ff883c8f2a267971805fc87b52d3cc343f5d492fb3faa4ea1d584143dc5325d9a0130187d7c35e9c SHA512 9fcd56d12a95c7c83287caf2ae9cbdf7dea70b245d6f9936854aa311fc48f17a4b4e07c5d15cedce66e93aed31ea447614775b419046707c86cb4d941a2b7ac8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch b/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch
deleted file mode 100644
index 5375f2208a0d..000000000000
--- a/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur cmn.old/utils.h cmn/utils.h
---- cmn.old/utils.h	2009-08-22 02:16:21.000000000 +0300
-+++ cmn/utils.h	2009-08-22 02:26:33.000000000 +0300
-@@ -238,13 +238,13 @@
-      same. */
- 
-   static char* strchr(const char* cs,int c)
--    {return ::strchr(cs,c);}
-+    {return const_cast<char*>(::strchr(cs,c));}
- 
-   static char* strrchr(const char* cs,int c)
--    {return ::strrchr(cs,c);}
-+    {return const_cast<char*>(::strrchr(cs,c));}
- 
-   static char* strstr(const char* cs,const char* ct)
--    {return ::strstr(cs,ct);}
-+    {return const_cast<char*>(::strstr(cs,ct));}
- 
-   static void strcpy(char* s,const char* ct)
-     {::strcpy(s,ct);}
diff --git a/games-arcade/xevil/metadata.xml b/games-arcade/xevil/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/xevil/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
deleted file mode 100644
index 71b2f1c6fee3..000000000000
--- a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DEB_PATCH=7
-MY_PV=${PV/_p/r}
-DESCRIPTION="3rd person, side-view, fast-action, kill-them-before-they-kill-you game"
-HOMEPAGE="http://www.xevil.com/"
-SRC_URI="http://www.xevil.com/download/stable/xevilsrc${MY_PV}.zip
-	mirror://debian/pool/main/x/xevil/xevil_${MY_PV}-${DEB_PATCH}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	edos2unix readme.txt x11/*.{cpp,h} cmn/*.{cpp,h} makefile config.mk
-	epatch "${WORKDIR}"/xevil_${MY_PV}-${DEB_PATCH}.diff
-	sed -i \
-		-e 's:-static::' \
-		-e 's/CC="g++"/CC=$(CXX)/' \
-		-e "s:CFLAGS=\":CFLAGS=\"${CXXFLAGS} :g" \
-		-e 's:-lXpm:-lXpm -lpthread:g' \
-		-e "s:LINK_FLAGS=\":LINK_FLAGS=\"${LDFLAGS} :" \
-		config.mk || die
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-}
-
-src_install() {
-	dogamesbin x11/REDHAT_LINUX/xevil
-	newgamesbin x11/REDHAT_LINUX/serverping xevil-serverping
-	dodoc readme.txt
-	prepgamesdirs
-}
diff --git a/games-arcade/xgalaga-2.1.1.0 b/games-arcade/xgalaga-2.1.1.0
new file mode 100644
index 000000000000..71304a467b7f
--- /dev/null
+++ b/games-arcade/xgalaga-2.1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXext x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=A clone of the classic game Galaga for the X Window System
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/xgalaga
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXpm x11-libs/libXext x11-libs/libXt games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/xgalaga/xgalaga-2.1.1.0.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_=e8a887a439e1a5d84bb1e083574aeeab
diff --git a/games-arcade/xgalaga/Manifest b/games-arcade/xgalaga/Manifest
deleted file mode 100644
index b4dd759817b7..000000000000
--- a/games-arcade/xgalaga/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xgalaga-2.1.1.0.tar.gz 331621 BLAKE2B 290881eb89cacc7a2be469af8da2c11d710dea45f165daa43d4a10a310e681c9f6ffb012e057e266f1e50c5629122ca38cfd97e31a788104e7710f02d756f59d SHA512 087db9e0501cedb042bb673a217f9de32640d3e4f4f529a29fd25ed682a1aece9ae1beacdc2ee77fc93ac931411a1051e2cd19873578ccffe5f03a083bffe513
-EBUILD xgalaga-2.1.1.0.ebuild 1270 BLAKE2B 2f312b99ca63124cb1da72e0e7ddccb981c4e2bb317ef73bab24eec0f785db1f90998715b27c275c1cc857e8a6cd32e4845968cc1e938c38b4d72a38b7151279 SHA512 2dca4cde2f85ac9ccb179037af473138d1fb88d6a423ebee2387a8ef79b7ae75a4ccc6af3bfe37f0119191843e70f9d01797e373c46ab06fed49374ee5577a46
-MISC metadata.xml 330 BLAKE2B b3e61a8f4911203a72c70798959045a62572b4a814bbf8f03ccf17f8da74eaa4c542883da6f2ff780c7e83ab26398ff95a46b36a41c22785903b0299707e6e9c SHA512 2c0045dadc3b72dda9b7f3389aebb5a2d38b91f2cd63891a9bd97e2f23971c916ce515cbbda6b0c6f2b8a600fc56bd77d9db749d223eee5cd6edc99525217545
diff --git a/games-arcade/xgalaga/metadata.xml b/games-arcade/xgalaga/metadata.xml
deleted file mode 100644
index 70dbf6fb8a56..000000000000
--- a/games-arcade/xgalaga/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xgalaga</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild b/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
deleted file mode 100644
index 4d3b86a97566..000000000000
--- a/games-arcade/xgalaga/xgalaga-2.1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A clone of the classic game Galaga for the X Window System"
-HOMEPAGE="https://sourceforge.net/projects/xgalaga"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	sed -i \
-		-e "/LEVELDIR\|SOUNDDIR/ s:prefix:datadir/${PN}:" \
-		-e "/\/scores/ s:prefix:localstatedir/${PN}:" \
-		configure \
-		|| die "sed configure failed"
-	sed -i \
-		-e "/SOUNDDEFS/ s:(SOUNDSRVDIR):(SOUNDSRVDIR)/bin:" \
-		-e 's:make ;:$(MAKE) ;:' \
-		Makefile.in \
-		|| die "sed Makefile.in failed"
-}
-
-src_install() {
-	dogamesbin xgalaga xgal.sndsrv.oss xgalaga-hyperspace
-	dodoc README README.SOUND CHANGES
-	newman xgalaga.6x xgalaga.6
-
-	insinto "${GAMES_DATADIR}/${PN}/sounds"
-	doins sounds/*.raw
-
-	insinto "${GAMES_DATADIR}/${PN}/levels"
-	doins levels/*.xgl
-
-	make_desktop_entry ${PN} XGalaga
-
-	dodir "${GAMES_STATEDIR}/${PN}"
-	touch "${D}${GAMES_STATEDIR}/${PN}/scores"
-	fperms 660 "${GAMES_STATEDIR}/${PN}/scores"
-	prepgamesdirs
-}
diff --git a/games-arcade/xjump-2.7.5 b/games-arcade/xjump-2.7.5
new file mode 100644
index 000000000000..45dbf50a630b
--- /dev/null
+++ b/games-arcade/xjump-2.7.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=An X game where one tries to jump up as many levels as possible
+EAPI=5
+HOMEPAGE=http://packages.debian.org/stable/games/xjump
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXaw x11-libs/libXpm x11-libs/libXt games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://debian/pool/main/x/xjump/xjump_2.7.5.orig.tar.gz mirror://debian/pool/main/x/xjump/xjump_2.7.5-6.1.debian.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_=06988e4193d3a9843fa370b6cd8715a1
diff --git a/games-arcade/xjump/Manifest b/games-arcade/xjump/Manifest
deleted file mode 100644
index 1279b77ea5d8..000000000000
--- a/games-arcade/xjump/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xjump-2.7.5-ldflags.patch 407 BLAKE2B d4a09bcb067facb9066156cfe2d5c4ec533492ab5e74d802c5976efa176c75c83e52077333b53dd741f2718f92b78d869b04c8994a5a171a01e3a3d1773a6b0f SHA512 8c21088e09053906c20f13027832d1cd0778c6707b6764a93c6cc5de904a2aa80a80ac5fa8372885889beca82f4cbb8c637ca0c186f05e54d441d2f15957b6af
-DIST xjump_2.7.5-6.1.debian.tar.gz 9803 BLAKE2B 0a51a579aec18c71561f32d1f6321c383c8137dbe3923f3afdf00100f1c47ec062e2200a04a3281f32124f5fe72094abb6a1fc6a86de00c4886d872a21fe9a79 SHA512 c4962acd25c4cabef37acd3b5d39867a955f2fa769cc203fb00edfe37f37ce25369099b589a282189847e7bffeb874b4eaf8deea9320a9083da7e95425625cf8
-DIST xjump_2.7.5.orig.tar.gz 15940 BLAKE2B 9a022f9c6f522d8977268cd00709cc7a8aed9cf6ead042d1c75c0c0e7c011a1898690fa74e957198c5916806da4cc3d80d7d235342e7e41a33c2086553b91075 SHA512 6ce846d6681bf8b084edc06f8415a57f66d1778ec9af8b9b170f4f37292a8172b3507a08c85032a5b8588b50a7f2eefe205add4c779edd7c7ef8fb6d818d9300
-EBUILD xjump-2.7.5.ebuild 1271 BLAKE2B 12b4cd0d1c8ce41aa8223c558efb9c89489243374780e65a1e0d4e3b5df315152afec05fc9cc05398c1b16362442244fd3b9505ec8c94b413604478fd0a09f83 SHA512 99a3286a1ab129622da893a7be10d0ba73c12c06cc651356dc4ba5676b50ec712e85e5d8f1e57998e6728140801792d39e097fb83ef74f18e3b1014120edd4f0
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch b/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
deleted file mode 100644
index a30736811318..000000000000
--- a/games-arcade/xjump/files/xjump-2.7.5-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-10-01 07:05:03.000000000 +0200
-+++ Makefile	2010-10-01 07:05:39.000000000 +0200
-@@ -28,7 +28,7 @@
- ##########################################################
- 
- xjump : main.o game.o key.o misc.o record.o resource.o
--	$(CC) $(CFLAGS) -o xjump \
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o xjump \
- 		main.o game.o key.o misc.o record.o resource.o\
- 		-lXaw -lXmu -lXt -lXpm -lXext -lX11 $(LDIR)
- 
diff --git a/games-arcade/xjump/metadata.xml b/games-arcade/xjump/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/xjump/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xjump/xjump-2.7.5.ebuild b/games-arcade/xjump/xjump-2.7.5.ebuild
deleted file mode 100644
index a8f98a997109..000000000000
--- a/games-arcade/xjump/xjump-2.7.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DEBIAN_PATCH="6.1"
-DESCRIPTION="An X game where one tries to jump up as many levels as possible"
-HOMEPAGE="http://packages.debian.org/stable/games/xjump"
-SRC_URI="mirror://debian/pool/main/x/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}-${DEBIAN_PATCH}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXpm
-	x11-libs/libXt"
-
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${P}.orig
-
-src_prepare() {
-	# Where we will keep the highscore file:
-	HISCORE_FILENAME=xjump.hiscores
-	HISCORE_FILE="${GAMES_STATEDIR}/${HISCORE_FILENAME}"
-
-	epatch \
-		"${WORKDIR}"/debian/patches/0*.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# set up where we will keep the highscores file:
-	sed -i \
-		-e "/^CC/d" \
-		-e "/^CFLAGS/d" \
-		-e "s,/var/games/xjump,${GAMES_STATEDIR}," \
-		-e "s,/record,/${HISCORE_FILENAME}," \
-		Makefile || die
-}
-
-src_install() {
-	dogamesbin xjump
-	dodoc README.euc
-
-	# Set up the hiscores file:
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${HISCORE_FILE}"
-	fperms 660 "${HISCORE_FILE}"
-	prepgamesdirs
-}
diff --git a/games-arcade/xrick-021212-r2 b/games-arcade/xrick-021212-r2
new file mode 100644
index 000000000000..a0933c133624
--- /dev/null
+++ b/games-arcade/xrick-021212-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=Clone of the Rick Dangerous adventure game from the 80's
+EAPI=6
+HOMEPAGE=http://www.bigorno.net/xrick/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-1+ xrick
+RDEPEND=media-libs/libsdl[video]
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.bigorno.net/xrick/xrick-021212.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=66f11f5285dbbbdef043e38c8a1f117f
diff --git a/games-arcade/xrick/Manifest b/games-arcade/xrick/Manifest
deleted file mode 100644
index 15a2fff52d07..000000000000
--- a/games-arcade/xrick/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xrick-021212-exit.patch 702 BLAKE2B 58323696fb2abde318706e0d37c50d31d7bc65ce3a86163991019d2d43675dcc5d6562d65e13d96a0476164bc1dfd6db1270e63e405449d798cb5996dc9e6b6d SHA512 8d22419f6912297a900d3ad7101684af1c52c093ea3ea513aea52220b41b5b2a5c2b474883da887b4160b16ab3c9f90a885e48694a48a68470083b643be6d551
-AUX xrick-021212-fullscreen.patch 950 BLAKE2B e46b147ef3283f64d985b2e6fa1445b31c27c29a28a6a5859ff420ebc3bda2a15e633f85799cd2c32751ec25e726c6a57f13cead5d6b0829572f3a1a29e10ec8 SHA512 694d56f9094483bf5e11b905bb21408a684669b3c6d1fc150de8c1300b56ca2349dfbceefff5c936328eb202776bc3f5b6ea74b54ffbb082de27aa7827d7ce7c
-AUX xrick-021212-zlib.patch 372 BLAKE2B 9811ee9464790c7cb804a06a3f8cc71dff3489ae00bf30f7f56e8bf10f88d7d2eed5c92abda943a47d7913a4885f5f04b0fbfa41afc7653028fa23f86dbcaf35 SHA512 48933852c71f2979ae865fb72e89edeb7a3d314710472bd572e37877ff5fc627ecaa9c39661f8968c19d1e8b3e820600ab0d9985da029739cb78abedd2ff7d0f
-DIST xrick-021212.tgz 1648538 BLAKE2B d8ba387f4645d4ef0fd97b346ee202fb8573fd694e4f278791115ea5a2ab6ca509a8fffec3c5754e0160eec919aaa7a90509858bd80ae0244f28c32055070636 SHA512 7a6547dfce586512c3c4aa7fd5aa0d7d8bd223dbec6a9211e858034bd73d44f168266441d8f3475cddbed8f3a19c7c0df31345b62e2ecfb860664e54facb48bf
-EBUILD xrick-021212-r2.ebuild 1189 BLAKE2B 2d46e88e5a217eb37cf643849b0ffe95396985046eac28784a60f3e8cfb10cc2441f1eae8076a8cb2b596f50e25b47e2f61810aeacb046f0adcce2b2e92ad102 SHA512 55bf54b1fd439bd6ed6d5ffe4ef026201ab74558dd7af431a796a86889ea4d902c8691c78451db95f116d2b78c726ce81734ddbd4fc1ee94268402b358f8a057
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xrick/files/xrick-021212-exit.patch b/games-arcade/xrick/files/xrick-021212-exit.patch
deleted file mode 100644
index 4486a969b346..000000000000
--- a/games-arcade/xrick/files/xrick-021212-exit.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur xrick-021212/src/sysjoy.c xrick-021212.patched/src/sysjoy.c
---- xrick-021212/src/sysjoy.c	2010-10-23 00:33:33.000000000 +0400
-+++ xrick-021212.patched/src/sysjoy.c	2010-10-23 00:42:25.000000000 +0400
-@@ -56,6 +56,7 @@
- {
-   if (j)
-     SDL_JoystickClose(j);
-+  j = NULL;
- }
- 
- #endif /* ENABLE_JOYSTICK */
-diff -ur xrick-021212/src/xrick.c xrick-021212.patched/src/xrick.c
---- xrick-021212/src/xrick.c	2010-10-23 00:33:33.000000000 +0400
-+++ xrick-021212.patched/src/xrick.c	2010-10-23 00:40:47.000000000 +0400
-@@ -29,7 +29,7 @@
- 		data_setpath("/usr/games/lib/xrick/data.zip");
- 	game_run();
- 	data_closepath();
--	sys_shutdown();
-+    /* sys_shutdown is called via atexit */
- 	return 0;
- }
- 
diff --git a/games-arcade/xrick/files/xrick-021212-fullscreen.patch b/games-arcade/xrick/files/xrick-021212-fullscreen.patch
deleted file mode 100644
index 97271a33a28e..000000000000
--- a/games-arcade/xrick/files/xrick-021212-fullscreen.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur xrick-021212/src/sysvid.c xrick-021212.patched/src/sysvid.c
---- xrick-021212/src/sysvid.c	2002-12-24 16:33:43.000000000 +0300
-+++ xrick-021212.patched/src/sysvid.c	2011-01-14 03:03:16.636668016 +0300
-@@ -145,10 +145,14 @@
-     IFDEBUG_VIDEO(sys_printf("xrick/video: SDL says, use these modes:\n"););
-     for (i = 0; modes[i]; i++) {
-       IFDEBUG_VIDEO(sys_printf("  %dx%d\n", modes[i]->w, modes[i]->h););
--      if (modes[i]->w <= modes[mode]->w && modes[i]->w >= SYSVID_WIDTH &&
--	  modes[i]->h * SYSVID_WIDTH >= modes[i]->w * SYSVID_HEIGHT) {
-+      if ((!fszoom && modes[i]->w <= modes[mode] &&
-+	   modes[i]->w >= SYSVID_WIDTH) ||
-+	  (fszoom && modes[i]->w > modes[mode]->w)) {
- 	mode = i;
--	fszoom = modes[mode]->w / SYSVID_WIDTH;
-+	if (modes[i]->h * SYSVID_WIDTH >= modes[i]->w * SYSVID_HEIGHT)
-+	  fszoom = modes[mode]->w / SYSVID_WIDTH;
-+	else
-+	  fszoom = modes[mode]->h / SYSVID_HEIGHT;
-       }
-     }
-     if (fszoom != 0) {
diff --git a/games-arcade/xrick/files/xrick-021212-zlib.patch b/games-arcade/xrick/files/xrick-021212-zlib.patch
deleted file mode 100644
index bd7d6287925f..000000000000
--- a/games-arcade/xrick/files/xrick-021212-zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/include/unzip.h.old	2012-03-24 16:13:16.012854948 +0100
-+++ b/include/unzip.h	2012-03-24 16:15:42.744346771 +0100
-@@ -49,6 +49,10 @@
- #include "zlib.h"
- #endif
- 
-+#ifdef _Z_OF
-+#define OF _Z_OF
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/games-arcade/xrick/metadata.xml b/games-arcade/xrick/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/xrick/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xrick/xrick-021212-r2.ebuild b/games-arcade/xrick/xrick-021212-r2.ebuild
deleted file mode 100644
index 9e95cbe3a4b2..000000000000
--- a/games-arcade/xrick/xrick-021212-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Clone of the Rick Dangerous adventure game from the 80's"
-HOMEPAGE="http://www.bigorno.net/xrick/"
-SRC_URI="http://www.bigorno.net/xrick/${P}.tgz"
-
-LICENSE="GPL-1+ xrick"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="mirror bindist" # bug #149097
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unpack ./xrick.6.gz
-}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}*.patch
-	sed -i \
-		-e "/^run from/d" \
-		-e "/data.zip/ s:the directory where xrick is:$(get_libdir)/${PN}.:" \
-		xrick.6 || die
-
-	sed -i \
-		-e "s:data.zip:/usr/$(get_libdir)/${PN}/data.zip:" \
-		src/xrick.c || die
-
-	sed -i \
-		-e "s/-g -ansi -pedantic -Wall -W -O2/${CFLAGS}/" \
-		-e '/LDFLAGS/s/=/+=/' \
-		-e '/CC=/d' \
-		-e "/CPP=/ { s/gcc/\$(CC)/; s/\"/'/g }" \
-		Makefile || die
-}
-
-src_install() {
-	dobin xrick
-	insinto /usr/"$(get_libdir)"/${PN}
-	doins data.zip
-	newicon src/xrickST.ico ${PN}.ico
-	make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico
-	dodoc README KeyCodes
-	doman xrick.6
-}
diff --git a/games-arcade/xscavenger-1.4.4-r1 b/games-arcade/xscavenger-1.4.4-r1
new file mode 100644
index 000000000000..2976fe31ea82
--- /dev/null
+++ b/games-arcade/xscavenger-1.4.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libXext x11-misc/imake
+DESCRIPTION=Lode-Runner-like arcade game
+EAPI=6
+HOMEPAGE=http://www.xdr.com/dash/scavenger.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXext
+SLOT=0
+SRC_URI=http://www.xdr.com/dash/xscavenger-1.4.4.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e38c46e6377921db4994ae8bc9b816cc
diff --git a/games-arcade/xscavenger/Manifest b/games-arcade/xscavenger/Manifest
deleted file mode 100644
index 07b8dfa819a5..000000000000
--- a/games-arcade/xscavenger/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.4.4-gentoo.patch 5762 BLAKE2B 626debb4f67b0c9b90a783887ae2601cf2750c7358ba03638176e0afe7f2b51fe1e450e6ad56dbdfadbfd4413a31e6014c22b46409afec5ea438546b12338b78 SHA512 95e5c803b4d60b110be44254d1ceb78ea4ba3c7c72d6d95d856616902160141975ee57ee40c4a8c785220d71821531a02d2b823cfa5dca2cbbdd6b8b9bb842a5
-DIST xscavenger-1.4.4.tgz 193346 BLAKE2B eb86b97fad8a9d261935579d298f43e7063fbd0624e8fd654c72b4130e98db38541d54c59938375c8d6df4b50193436f86826c49b8bafe123b4be5c80d3f75d8 SHA512 5f200912b9114ea0c09f0bfcc3f06be2e7c2e1700a744319081f5f3a22c8b93663477076af27837326acf9830af6f597cf8f8fb44562db7d00128321487841ec
-EBUILD xscavenger-1.4.4-r1.ebuild 894 BLAKE2B 0eb536645b6e2fedd209d7236a87034c48e2f96857f20be25cfe708670f09f5d7baf7b5cb9239f5b9055443d08617e08c887f5ad60768617c897769a1e007fd6 SHA512 74ca79787d535b16b741ce5fa3c9a5856aabfc0e51b4ff9cdd3bf1be068a700ce263eee5fa497575986aeb19b9cf8ad1d22815742669db262c17c03857a89020
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/xscavenger/files/1.4.4-gentoo.patch b/games-arcade/xscavenger/files/1.4.4-gentoo.patch
deleted file mode 100644
index df5936ed3de8..000000000000
--- a/games-arcade/xscavenger/files/1.4.4-gentoo.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff -urN xscavenger-1.4.4.orig/src/Imakefile xscavenger-1.4.4/src/Imakefile
---- xscavenger-1.4.4.orig/src/Imakefile
-+++ xscavenger-1.4.4/src/Imakefile
-@@ -1,20 +1,36 @@
- # set this to the path where data files should be stored.  LIBDIR
- # is automatically defined by imake, usually to /usr/X11R6/lib/X11, so
- # this should be a good default.
--LIBNAME = $(LIBDIR)/scavenger
-+LIBNAME = GENTOO_DATADIR/scavenger
- 
- SRCS = anim.c edit.c scav.c x.c sound.c
- OBJS = $(SRCS:.c=.o)
- 
-+# the "subst" hack below is because imake uses the C preprocessor, which
-+# will interpret an unquoted "/*" as a comment beginning.
-+#LIB_DATA = $(subst S,/,..SdataS*)
- LIB_DATA = \
--	../data/badguy.lbm   ../data/brownblue.lbm ../data/death.raw \
--	../data/dig.raw      ../data/fall.raw      ../data/levels.scl \
--        ../data/microman.lbm ../data/pop.raw       ../data/redbrick.lbm \
--	../data/reddevil.lbm ../data/regularguy.lbm ../data/spiralthing.lbm \
-+	../data/badguy.lbm	\
-+	../data/brownblue.lbm	\
-+	../data/death.raw	\
-+	../data/dig.raw		\
-+	../data/fall.raw	\
-+	../data/flashspiral.lbm	\
-+	../data/gems.lbm	\
-+	../data/jungle.lbm	\
-+	../data/levels.scl	\
-+	../data/microman.lbm	\
-+	../data/pop.raw		\
-+	../data/redbrick.lbm	\
-+	../data/reddevil.lbm	\
-+	../data/regularguy.lbm	\
-+	../data/spiralthing.lbm	\
- 	../data/victory.raw
- 
- LOCAL_LIBRARIES = $(XLIB)
- EXTRA_DEFINES = -DLIBNAME=\"$(LIBNAME)\"
- 
--ComplexProgramTarget(scavenger)
-+AllTarget(scavenger)
-+NormalProgramTarget(scavenger,$(OBJS),,,$(XLIB))
-+InstallProgram(scavenger,GENTOO_BINDIR)
- InstallMultipleFlags($(LIB_DATA),$(LIBNAME),-m 644)
-diff -urN xscavenger-1.4.4.orig/src/scav.c xscavenger-1.4.4/src/scav.c
---- xscavenger-1.4.4.orig/src/scav.c
-+++ xscavenger-1.4.4/src/scav.c
-@@ -240,15 +240,19 @@
- 
- 
- 
-+/* 14 Dec 2002: re-wrote to be more portable - don't assume two's-complement
-+ * representation for integers, and fix bug when sizeof(long) > 4.
-+ */
- long readlong()
- {
--long val1=0;
--
--	val1=myci()<<24L;
--	val1|=myci()<<16L;
--	val1|=myci()<<8;
--	val1|=myci();
-+	long val1=0;
-+	int i,j;
- 
-+	for (i=0; i<4; i++) {
-+		j = myci();
-+		if (j==-1) return -1L;
-+		val1 = (val1<<8) + j;
-+	}
- 	return val1;
- }
- int rbs()
-@@ -309,7 +313,7 @@
- 	bmw=bmh=byteswide=0;
- 	while( (type=readlong()) )
- 	{
--		if(type==0xffffffffL) break;
-+		if(type==-1L) break;
- 		size=readlong();
- 		if(size&1) size++;
- 		if(type==BMHD)
-@@ -402,16 +406,16 @@
- 	input=open(resourcename,O_RDONLY);
- 	if(input<0) return -1;
- 	got=read(input,buff,8);
--	if(got!=8) return -2;
--	if (strncmp(buff,"SCAV",4)) return -3;
-+	if(got!=8) {close(input);return -2;}
-+	if (strncmp(buff,"SCAV",4)) {close(input);return -3;}
- 	max=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7];
--	if(num>=max) return 0;
-+	if(num>=max) {close(input);return 0;}
- 	lseek(input,(num+1)<<3,SEEK_SET);
- 	got=read(input,buff,8);
- 	offset=(buff[0]<<24) | (buff[1]<<16) | (buff[2]<<8) | buff[3];
- 	length=(buff[4]<<24) | (buff[5]<<16) | (buff[6]<<8) | buff[7];
- 	if(len>length) len=length;
--	if(!offset || !len) return 0;
-+	if(!offset || !len) {close(input);return 0;}
- 	lseek(input,offset,SEEK_SET);
- 	got=read(input,put,len);
- 	close(input);
-@@ -448,8 +452,8 @@
- 	input=open(resourcename,O_RDONLY);
- 	if(input==-1) return -4;
- 	got=read(input,buff,8);
--	if(got!=8) return -2;
--	if(strncmp(buff,"SCAV",4)) return -3;
-+	if(got!=8) {close(input);return -2;}
-+	if(strncmp(buff,"SCAV",4)) {close(input);return -3;}
- 	output=creat(bakname,00600);
- 	if(output==-1) {close(input);return -6;}
- 
-@@ -473,12 +477,12 @@
- 		for(i=0;i<max;i++)
- 			if(headers[i+i])
- 				headers[i+i]+=delta;
--	if (write(output,"SCAV",4) != 4) return -200;
--	if (!rlout(output,max))	return -200;
-+	if (write(output,"SCAV",4) != 4) {close(input);close(output);return -200;}
-+	if (!rlout(output,max))	{close(input);close(output);return -200;}
- 	headers[num+num]=0;
- 	headers[num+num+1]=len;
- 	for(i=0;i<max+max;i++)
--		if (!rlout(output,headers[i])) return -200;
-+	    if (!rlout(output,headers[i])) {close(input);close(output);return -200;}
- 
- 	if(offset)
- 	{
-@@ -487,8 +491,8 @@
- 		while(count)
- 		{
- 			got=count>1024 ? 1024 : count;
--			if (read(input,copybuff,got) != got) return -200;
--			if (write(output,copybuff,got) != got) return -200;
-+			if (read(input,copybuff,got) != got) {close(input);close(output);return -200;}
-+			if (write(output,copybuff,got) != got) {close(input);close(output);return -200;}
- 			count-=got;
- 		}
- 		lseek(input,length,SEEK_CUR);
-@@ -498,17 +502,17 @@
- 	{
- 		got=read(input, copybuff, 1024);
- 		if (!got) break;
--		if (write (output, copybuff, got) != got) return -200;
-+		if (write (output, copybuff, got) != got) {close(input);close(output);return -200;}
- 		offset += got;
- 	}
- 	if(len)
- 	{
--		if (write (output, take, len) != len) return -200;
-+	    if (write (output, take, len) != len) {close(input);close(output);return -200;}
- 		lseek (output, (num+1) << 3, SEEK_SET);
--		if (!rlout (output, offset)) return -200;
-+		if (!rlout (output, offset)) {close(input);close(output);return -200;}
- 	}
- 	close (input);
--	if (fsync(output)) return -200;
-+	if (fsync(output)) {close(output);return -200;}
- 	if (close(output)) return -200;
- 	err=rename(bakname,resourcename);
- 	if(err) return -1;
-@@ -1382,6 +1386,7 @@
- 			break;
- 		}
- 	}
-+	close(file);
- }
- 
- void remslash(char *str)
-@@ -1416,6 +1421,8 @@
- 			return -3;
- 		}
- 	} while(len);
-+	close(input);
-+	close(output);
- 	return 0;
- }
- 
-@@ -1448,7 +1455,7 @@
- 			printf("Failed to create directory %s, exiting\n",temp);
- 			exit(1);
- 		}
--	}
-+	} else close(file);
- 
- 	sprintf(resourcename,"%s/%s/%s",localname,localdirname,LEVELSNAME);
- 	file=open(resourcename,O_RDONLY);
-@@ -1485,7 +1492,7 @@
- 			printf("Couldn't create %s\n",temp);
- 			exit(1);
- 		}
--	}
-+	} else close(file);
- }
- 
- void makercname(char *str)
diff --git a/games-arcade/xscavenger/metadata.xml b/games-arcade/xscavenger/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-arcade/xscavenger/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild b/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
deleted file mode 100644
index 6a578398112d..000000000000
--- a/games-arcade/xscavenger/xscavenger-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop epatch toolchain-funcs
-
-DESCRIPTION="Lode-Runner-like arcade game"
-HOMEPAGE="http://www.xdr.com/dash/scavenger.html"
-SRC_URI="http://www.xdr.com/dash/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-misc/imake
-"
-
-S="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	default
-	epatch "${FILESDIR}/${PV}-gentoo.patch"
-	sed -i \
-		-e "s:GENTOO_DATADIR:/usr/share:" \
-		-e "s:GENTOO_BINDIR:/usr/bin:" \
-		Imakefile \
-		|| die
-}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ../{CREDITS,DOC,README,TODO,changelog}
-	make_desktop_entry scavenger "XScavenger"
-}
diff --git a/games-arcade/xsfcave-0.5-r1 b/games-arcade/xsfcave-0.5-r1
new file mode 100644
index 000000000000..0e3c5c5cd5a7
--- /dev/null
+++ b/games-arcade/xsfcave-0.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=x11-libs/libXext x11-libs/libSM
+DESCRIPTION=A X11 sfcave clone
+EAPI=6
+HOMEPAGE=http://xsfcave.idios.org
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=public-domain
+RDEPEND=x11-libs/libXext x11-libs/libSM
+SLOT=0
+SRC_URI=mirror://sourceforge/scrap/xsfcave-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=f97b5feca54f489c514fb5365a41f5f9
diff --git a/games-arcade/xsfcave/Manifest b/games-arcade/xsfcave/Manifest
deleted file mode 100644
index 3494684f8066..000000000000
--- a/games-arcade/xsfcave/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xsfcave-0.5.tar.gz 88113 BLAKE2B bddf18277b8df3c3e17f8d9cd18ad517d95adbeb9479cf1552fe3e69f097344a229bbbb33348c34fd082194f4a3db3a8921dfd4644d983ba30320f7c9c961068 SHA512 5dd5c7e581362b1d4faf2edd73f5ea6a068d05a94b6fac7813fa2cae323453ed3380c9e40b92a2ed9b3672ab931d5a2951d2ad7fc74cf64588e6e9fe7723f09a
-EBUILD xsfcave-0.5-r1.ebuild 444 BLAKE2B 3b5abd4777869fa9c5d5c122b41c815898be4881c1eb7c0db6fd6391b8f1bf2ac7ceaf6cc5c3a0df4f6823cfb6422af25f28ba6a79b8bbea20a699caeb6cfbcb SHA512 9cac05246213cd666769a5d429c6bd6afebfb2a09e7156e6ec0395200678a62ce814887ff82076e37ce64a20419b537123b9f939352569f67f7a40b3d8f60b9b
-MISC metadata.xml 579 BLAKE2B 879e8e393b026691db4293d4e66354dc1613cce3e23cfad38ac0fe149da05733ad5b76f7e6f0de92c3c540e398785c36db15c85c87c963081f0e9df2b29cf98b SHA512 3bca9dd2cb0d9a5f8795a213f9ba45a19ccfd5cadc516f26367a7cec5506bf9dfc511f308ea9d4eca780aba075ea41dbae88ab8142fe3384d3cfd4d598885a4f
diff --git a/games-arcade/xsfcave/metadata.xml b/games-arcade/xsfcave/metadata.xml
deleted file mode 100644
index 2eaca6d18e4d..000000000000
--- a/games-arcade/xsfcave/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-xsfcave is a X11 sfcave clone. The game consist of surviving in a tunel by not
-hitting in the walls and obstacles. The first versions of the game are greatly
-influenced by the Java version of this game.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">scrap</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/xsfcave/xsfcave-0.5-r1.ebuild b/games-arcade/xsfcave/xsfcave-0.5-r1.ebuild
deleted file mode 100644
index 5d28c027ce64..000000000000
--- a/games-arcade/xsfcave/xsfcave-0.5-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A X11 sfcave clone"
-HOMEPAGE="http://xsfcave.idios.org"
-SRC_URI="mirror://sourceforge/scrap/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="x11-libs/libXext
-	x11-libs/libSM"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	default
-	make_desktop_entry "${PN}"
-}
diff --git a/games-arcade/xtux-20030306-r1 b/games-arcade/xtux-20030306-r1
new file mode 100644
index 000000000000..0510e31bed99
--- /dev/null
+++ b/games-arcade/xtux-20030306-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libXpm
+DESCRIPTION=Multiplayer Gauntlet-style arcade game
+EAPI=6
+HOMEPAGE=http://xtux.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXpm media-fonts/font-adobe-75dpi
+SLOT=0
+SRC_URI=mirror://sourceforge/xtux/xtux-src-20030306.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=26a208fb7ff196e7456c8195b25c3a20
diff --git a/games-arcade/xtux/Manifest b/games-arcade/xtux/Manifest
deleted file mode 100644
index 61a1f6012969..000000000000
--- a/games-arcade/xtux/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xtux-20030306-ldflags.patch 805 BLAKE2B 1d3cda6f7bfb2619507caad5fb5fb769dbfe89fd7e377c9e747e0ec4a515f03079d9c4d34c9ac204f21d504812662676322c643feae68f80ddb9eded0c10668b SHA512 089d03e2ef4072b0d134940771820f151e4e51d95c8f01230a78933e0160fa204dd277b4b0bbd7a4288dbb6fabf1ebe7a976f0ead2096b8eaa21daf82f6c97eb
-AUX xtux-20030306-particles.patch 1411 BLAKE2B 22db279e8bdca02029be6a115dc0329893dc69ffd39fcbf773fead770db1cac85c52086bf9bf7e5b23774981f94c86b6858653673f797f082aa3b205bf165443 SHA512 4288325e2e24cbbc2b0407c526d733b028d670d4ce182957392d16675b666c2a9ef44c23227f3acae526bcb439df1e73f13772612ee2c25ac5f373c7863927fd
-DIST xtux-src-20030306.tar.gz 1640928 BLAKE2B 0db135f741a978a943035df5b78773bbb3fbbeecc2fd740525614e4f942e7e23b67a6fa5640fa82c2c32d2aa2abe73badc9d341ab0ec06922513a8ed0783ce7a SHA512 edb137b4d6b0fe7d673e8eedffbd9c521800a8e51aff0a36e5aa02d46a157d42142326b334b9c7358cfb5debf4b78a2a9951f82121dd538cfe288cf292a269d4
-EBUILD xtux-20030306-r1.ebuild 1241 BLAKE2B dcc32bf27f2df307d4d940ac5d971164c31eb5a6a5fd866798c9a54adbd52f40e6452afa68bf76ee6b4450e7f4e86069546bb31a0fe707195f2231e4c6922dec SHA512 dcb83c916fc67c3fc01067473e31fd8d608183f3203701c1f46ca27025b04ef5aae5fa0f99718bc00c3ad1ce11c693e8f0ac6e2b0c57ee5f464f501b7efb163b
-MISC metadata.xml 327 BLAKE2B c3a5163b1311672e516ad8cec744bc8813705ef58da277f566101f8699cf1db7bd519bf80d35b5410ee32185ba3a38ae3f4a04dacd49ed5cfda24dfa45ddea19 SHA512 cda1520a7e746d0b8e78cfe62b83466123b01bc02186b63d365f170bce8477be0f408a73d1436b916538c7c1906a77e73114f8d81fb799d48e7bdb4b0fd5c418
diff --git a/games-arcade/xtux/files/xtux-20030306-ldflags.patch b/games-arcade/xtux/files/xtux-20030306-ldflags.patch
deleted file mode 100644
index 4a4877a6d65a..000000000000
--- a/games-arcade/xtux/files/xtux-20030306-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/client/Makefile.old	2010-09-30 18:08:16.000000000 +0200
-+++ b/src/client/Makefile	2010-09-30 18:08:41.000000000 +0200
-@@ -48,7 +48,7 @@
- 
- #Apps
- client: $(OBJECTS)
--	$(CC) -o $(BINARY) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
-+	$(CC) -o $(BINARY) $(LDFLAGS) $(CFLAGS) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(X11LIB) $(XPMLIB) $(SOCKLIB) $(GGZLIB)
- 
- # OBJECTS
- .c.o:	client.h $*.c
---- a/src/server/Makefile.old	2010-09-30 18:09:55.000000000 +0200
-+++ b/src/server/Makefile	2010-09-30 18:10:16.000000000 +0200
-@@ -41,7 +41,7 @@
- 
- #Apps
- server:	$(OBJECTS)
--	$(CC) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
-+	$(CC) $(LDFLAGS) -o $(BINARY) $(OBJECTS) $(XTUXLIB) $(MATHLIB) $(SOCKLIB) $(GGZLIB)
- 
- # OBJECTS
- .c.o:	server.h $*.h $*.c
diff --git a/games-arcade/xtux/files/xtux-20030306-particles.patch b/games-arcade/xtux/files/xtux-20030306-particles.patch
deleted file mode 100644
index 9a340821dd6e..000000000000
--- a/games-arcade/xtux/files/xtux-20030306-particles.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r xtux.old/src/client/particle.c xtux/src/client/particle.c
---- xtux.old/src/client/particle.c	2008-09-02 20:34:24.000000000 +0200
-+++ xtux/src/client/particle.c	2008-09-02 20:35:40.000000000 +0200
-@@ -340,11 +340,11 @@
- 	ptl->pos[i].y = src_y;
- 	d = dir + 128;
- 	d += i%SHARD_ANGLE - SHARD_ANGLE/2;
--	ptl->vel[i].x = sin_lookup[dir + 64 + rand()%64] * SHARD_EXP_VEL;
--	ptl->vel[i].y = -cos_lookup[dir + 64 + rand()%64] * SHARD_EXP_VEL;
-+	ptl->vel[i].x = sin_lookup[(dir + 64 + rand()%64) % DEGREES] * SHARD_EXP_VEL;
-+	ptl->vel[i].y = -cos_lookup[(dir + 64 + rand()%64) % DEGREES] * SHARD_EXP_VEL;
- 	vel = SHARD_MIN_VEL + (SHARD_MAX_VEL*rand()/(RAND_MAX+SHARD_MIN_VEL));
--	ptl->vel[i].x += vel * sin_lookup[d] * 10;
--	ptl->vel[i].y += vel * -cos_lookup[d] * 10;
-+	ptl->vel[i].x += vel * sin_lookup[d % DEGREES] * 10;
-+	ptl->vel[i].y += vel * -cos_lookup[d % DEGREES] * 10;
-     }
- 
-     ptl = particles_new(color2, PTL_TOP, num_sh2);
-@@ -357,8 +357,8 @@
- 	ptl->vel[i].x = sin_lookup[rand()%256] * SHARD_EXP_VEL;
- 	ptl->vel[i].y = -cos_lookup[rand()%256] * SHARD_EXP_VEL;
- 	vel = SHARD_MIN_VEL + (SHARD_MAX_VEL*rand()/(RAND_MAX+SHARD_MIN_VEL));
--	ptl->vel[i].x += vel * sin_lookup[d] * 20;
--	ptl->vel[i].y += vel * -cos_lookup[d] * 20;
-+	ptl->vel[i].x += vel * sin_lookup[d % DEGREES] * 20;
-+	ptl->vel[i].y += vel * -cos_lookup[d % DEGREES] * 20;
-     }
- 
-     /* "Extra" particles (ie bullet holes) */
diff --git a/games-arcade/xtux/metadata.xml b/games-arcade/xtux/metadata.xml
deleted file mode 100644
index b9b705622a97..000000000000
--- a/games-arcade/xtux/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xtux</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/xtux/xtux-20030306-r1.ebuild b/games-arcade/xtux/xtux-20030306-r1.ebuild
deleted file mode 100644
index 35368df77f3f..000000000000
--- a/games-arcade/xtux/xtux-20030306-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Multiplayer Gauntlet-style arcade game"
-HOMEPAGE="http://xtux.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtux/xtux-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libXpm"
-RDEPEND="${DEPEND}
-	media-fonts/font-adobe-75dpi
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-
-	find data/ -type d -name .xvpics -exec rm -rf \{\} +
-	sed -i \
-		-e "s:-g -Wall -O2:${CFLAGS}:" \
-		src/{client,common,server}/Makefile \
-		|| die "sed failed"
-	sed -i \
-		-e "s:./tux_serv:tux_serv:" \
-		src/client/menu.c \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}/${P}-particles.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	# Not parallel-make friendly (bug #247332)
-	emake DATADIR="/usr/share/xtux/data" common
-	emake DATADIR="/usr/share/xtux/data" ggz
-	emake DATADIR="/usr/share/xtux/data" server
-	emake DATADIR="/usr/share/xtux/data" client
-}
-
-src_install () {
-	dobin xtux tux_serv
-	insinto "/usr/share/xtux"
-	doins -r data/
-	dodoc AUTHORS CHANGELOG README README.GGZ doc/*
-	newicon data/images/icon.xpm ${PN}.xpm
-	make_desktop_entry xtux "Xtux"
-}
diff --git a/games-arcade/yarsrevenge-0.99-r1 b/games-arcade/yarsrevenge-0.99-r1
new file mode 100644
index 000000000000..f39de7c63df2
--- /dev/null
+++ b/games-arcade/yarsrevenge-0.99-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[sound,joystick,video]
+DESCRIPTION=Remake of the Atari 2600 classic Yar's Revenge
+EAPI=6
+HOMEPAGE=http://freshmeat.net/projects/yarsrevenge/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,joystick,video]
+SLOT=0
+SRC_URI=http://www.autismuk.freeserve.co.uk/yar-0.99.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=da978b585bcb30546481d521271174e6
diff --git a/games-arcade/yarsrevenge/Manifest b/games-arcade/yarsrevenge/Manifest
deleted file mode 100644
index 9c53d738b413..000000000000
--- a/games-arcade/yarsrevenge/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.99-math.patch 182 BLAKE2B 18d5fd5b465ef6bd67caa435184b5dabb96114128b50c824ca12c01066b3138391008e96500b1c0b1b9e92f28a73c994cddb7a7ab770c428703964b6e5bd3cfd SHA512 6688e2c6a4a2537af94823d0bc845f6d764cb755689309712d29af951a092b4df030645792c248752e88a5013730dc34a6256be1219a57d0a3498738aeeb3a0a
-AUX yarsrevenge-0.99-gcc43.patch 219 BLAKE2B 23b1aa4f4e15abb04b1391ac65b0258bc65a778ea646824ba5ed49ecc4405dfa09f93bd323bd0cb4a3b531be89de8af3d8b14b4735f027958a89a102569eb5d0 SHA512 2cd2549113930e0868fb551ad7a2e024278a8012b013b44762059303cb967d9c57d557e67702b5b01d0195fa885533770820a18c0e742838122e77473c86f93f
-AUX yarsrevenge-0.99-gcc44.patch 258 BLAKE2B 71defcf5d287e3611b54850c50ebbceff81fbd0b84420dfac44c618cce1bb4db9014f532e6daced744b846fe634e8ccf040395192195b589d16f85909b9b8eef SHA512 dc3fbec65cd49950141bbd64b7b4a711217b0ac267166c71a9d175f1ba20fcedad97c1b89476d5c6f3a1630c5eae68d0f44738dba4383bb576edd059acd060e8
-DIST yar-0.99.tar.gz 535043 BLAKE2B 8760a039b987d701cfbeccf7612b14d60a1867b737999afb94383d9123cd82fe385dc12d410d333dceb07f580c75b7a515131f4b1ce2be25ee1725e6961150be SHA512 c520b9c6c7ff2c60c2e7e18e6c0d2ff376334706fb190ce0d015acba21815680029a30d7a573d0b4c41da2d9f932108417804141bf4557bc99550e30f699e8bb
-EBUILD yarsrevenge-0.99-r1.ebuild 654 BLAKE2B 73d35237b0560d7daabe2c120c167acfb99cb6c641b83192f8c768af648160f32bc0a803881d609bbd462a589347d704bbb9b34b746689768f0e101e9a73e008 SHA512 4a06a7235e5dd96c3d26661f2ff39aaa4da23d0447c803c200a57036f3f575a11ad98e69db3eda7c388a03fe8400fdd09b2d86a98755ebfe4a9a92f1df437a00
-MISC metadata.xml 501 BLAKE2B ea182028d3c0df8a6c1ecaa82bc71ccab959b16316e1d1044f12d9ffbad8c4ec40aadac0fa2a3f46e65cfebfa33c64eac58fc44822ff702e6ca68d0496715caa SHA512 c822cb194e0fbc444a4b5a577d2abb319d010318cf2107507c87d24ca9ade92e2ce1afddac8d196f3f23667a3401224868ae157a559d761bc09ef668aa5406f3
diff --git a/games-arcade/yarsrevenge/files/0.99-math.patch b/games-arcade/yarsrevenge/files/0.99-math.patch
deleted file mode 100644
index 5e1136972325..000000000000
--- a/games-arcade/yarsrevenge/files/0.99-math.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/yar/graphics.cpp.orig	2004-06-02 14:14:38.174071320 -0400
-+++ b/yar/graphics.cpp		2004-06-02 14:14:50.352219960 -0400
-@@ -18,2 +18,3 @@
- #include "yar.hxx"
-+#include <cmath>
- 
diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
deleted file mode 100644
index 511fad0091e1..000000000000
--- a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/yar/sgw.hxx
-+++ b/yar/sgw.hxx
-@@ -24,6 +24,7 @@
- 

- #include <iostream>

- #include <string>

-+#include <cstdlib>

- 

- #define DEFAULT_SCX		(1024)					// Default Screen Size and Depth

- #define DEFAULT_SCY		(768)

diff --git a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch b/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
deleted file mode 100644
index 29a52125c904..000000000000
--- a/games-arcade/yarsrevenge/files/yarsrevenge-0.99-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/yar/game.cpp
-+++ b/yar/game.cpp
-@@ -15,6 +15,7 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstdio>
- #include "yar.hxx"
- 
- 
diff --git a/games-arcade/yarsrevenge/metadata.xml b/games-arcade/yarsrevenge/metadata.xml
deleted file mode 100644
index 9a4a1e47a78a..000000000000
--- a/games-arcade/yarsrevenge/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-A rather weird shoot-em-up game that originated on the Atari 2600. It's more
-fun than it looks. Just released so might be tweaked.
-</longdescription>
-	<upstream>
-		<remote-id type="freshmeat">yarsrevenge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild b/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
deleted file mode 100644
index b6923570b8f4..000000000000
--- a/games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Remake of the Atari 2600 classic Yar's Revenge"
-HOMEPAGE="http://freshmeat.net/projects/yarsrevenge/"
-SRC_URI="http://www.autismuk.freeserve.co.uk/yar-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,video]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/yar-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-math.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-)
-
-src_install() {
-	default
-	make_desktop_entry "${PN}" "Yar's Revenge"
-}
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 53bbeeebfef3..605dc2a83708 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/ace-1.4-r1 b/games-board/ace-1.4-r1
new file mode 100644
index 000000000000..abe23bbe5606
--- /dev/null
+++ b/games-board/ace-1.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libpng:0 x11-libs/libX11 x11-base/xorg-proto >=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=DJ Delorie's Ace of Penguins solitaire games
+EAPI=6
+HOMEPAGE=http://www.delorie.com/store/ace/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:0 x11-libs/libX11
+SLOT=0
+SRC_URI=http://www.delorie.com/store/ace/ace-1.4.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_=07c9db39a118e1eee467900a47f0d60e
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
deleted file mode 100644
index 28e3d8d5a6e2..000000000000
--- a/games-board/ace/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX ace-1.4-CC.patch 662 BLAKE2B abc2e95dc31d2dc4d887dc54d62ca6dec6c6b7d0f1b857be549b3a9d70944a213b3c0cfa90467c724c2274774f663297855912dca0f608faab2a014186f79087 SHA512 5ff66c1ff2dc913cc7ba7fe4fecd890819789299a2ced5a12058d6616cf892d8dadf76185c9d8d60f54f148e361c892d18e8cc1c6646ffab61257208d7b43a08
-AUX ace-1.4-clang.patch 340 BLAKE2B 2387de1b53557adcd4d70004fe41038d36b8c37945fdd60d73ef9b2756e95f6c30851bac425ae2c6aebc3edbca9b863fb17da36ec85906fd35611a90a35abf03 SHA512 df2f335d7d4e6e0e349c8724678a2cf8592e9435cc184bbdd906cb9b099b01c7b4e9ab8e2f4af257b4dde695649def75a2612df62fd2101411561c17cbca2d0f
-AUX ace-1.4-gold.patch 3339 BLAKE2B 904aa238a703730ac9d188025d6ecaddd79e3683d43ec231b11e28c33094d45ccc6346f322418bde5d7aa22e56056680666cf835adf748bccef5bbad24f43c84 SHA512 907a2c6378bf9bc6aeba0c0945ef4e1a60a2403c491d6a54faaf6c90561375787afb3fba15faf05d28e04eb9478ece1357b9f0e91c2f9b4cef33909f59b70d37
-AUX ace-1.4-libpng15.patch 853 BLAKE2B ffbcda5c4d25fd404291f0b2d3e98e53f50108b6b6ef7ea135949087402e656b21a21da82cf3def5f12fc75e7a412becd46f4363aa604a184ddb0c20562ab84c SHA512 f746ad95efac927d55dff5122d759de4c8a3947a85b960642e6967e6ef8362e45d05fe5504b159b97bebeb92e2d86f4fea4f00e50fa7c59a8861d9aca8f62013
-AUX ace-1.4-no-xpm.patch 571 BLAKE2B 009d9c7efc8b26e25905f4562c019b7cab1bd0b9df853b256042dbeb869b8be0252fba6275331772dc080f43066fe8b3fffc797a7962c9bf5e665605ef2a2f9a SHA512 1316313302dbc2a2456f4ba3afcba1e35a0f12c3907b04ae55c5e246254886693633b3bd04defd718ad9e2ac04d7d02c80eec89089f7624615e74d18229764b5
-DIST ace-1.4.tar.gz 530490 BLAKE2B 62d32bcada9a945d0a409757ca24c8c5c032e905528d56a51b95f82844c6c8057d39763016fa05015877f23313d842effeaaa362507bb049816d7cf6bdf01a1a SHA512 cd382db95dc17d75a76809c7f1e096e14f5863c1166aa5db7f93204ce949a9ed21979212946b9d3a09667f4a93b30f4cc44a220940f9b5dd8996f28ecb4a6dcc
-EBUILD ace-1.4-r1.ebuild 968 BLAKE2B ba98eff8fea59d109ef6b2f71b20c03df8e7129f71e06ee66c22a5a2a047eb1488b4ab2af539b44dde5a5896e26befad27af9cb5121800e1c226b1d866227102 SHA512 0199ed734756903d0c3279a87b8386346aed6b30b5ab02f5667b6e388e7074efb9d0638777d0cb95f00c7fac7d6f2cdc9ea978cc6c54b15975c29defa689b8f9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/ace/ace-1.4-r1.ebuild b/games-board/ace/ace-1.4-r1.ebuild
deleted file mode 100644
index 66185f9eb84a..000000000000
--- a/games-board/ace/ace-1.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
-HOMEPAGE="http://www.delorie.com/store/ace/"
-SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libpng:0
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-xpm.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-	"${FILESDIR}"/${P}-gold.patch
-	"${FILESDIR}"/${P}-CC.patch
-	"${FILESDIR}"/${P}-clang.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		--program-prefix=ace-
-}
-
-src_install() {
-	default
-
-	dodoc docs/*
-	newicon docs/as.gif ${PN}.gif
-	cd "${D}/usr/bin" || die
-	local p
-	for p in *
-	do
-		make_desktop_entry $p "Ace ${p/ace-/}" /usr/share/pixmaps/${PN}.gif
-	done
-}
diff --git a/games-board/ace/files/ace-1.4-CC.patch b/games-board/ace/files/ace-1.4-CC.patch
deleted file mode 100644
index ec9045d25765..000000000000
--- a/games-board/ace/files/ace-1.4-CC.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jan  4 17:19:04 UTC 2013
-Subject: build system
-
-
---- ace-1.4/lib/Makefile.am
-+++ ace-1.4/lib/Makefile.am
-@@ -25,7 +25,7 @@
- 	./make-imglib -n cards -i $(srcdir)/png -d images.d $(srcdir)/images.in images.c
- 
- make-imglib : make-imglib.c
--	$(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/make-imglib.c -o make-imglib -lpng -lz
- 
- text2c : text2c.c
--	$(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o text2c -lpng -lz
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $(srcdir)/text2c.c -o text2c -lpng -lz
diff --git a/games-board/ace/files/ace-1.4-clang.patch b/games-board/ace/files/ace-1.4-clang.patch
deleted file mode 100644
index b021efe517de..000000000000
--- a/games-board/ace/files/ace-1.4-clang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jan  4 17:41:20 UTC 2013
-Subject: fix build with clang
-
---- ace-1.4/lib/make-imglib.c
-+++ ace-1.4/lib/make-imglib.c
-@@ -202,7 +202,7 @@
-   char *rv;
-   if (string) {
-     next = string;
--    return;
-+    return 0;
-   }
-   while (*next && !isgraph(*next)) next++;
-   if (!*next) return 0;
diff --git a/games-board/ace/files/ace-1.4-gold.patch b/games-board/ace/files/ace-1.4-gold.patch
deleted file mode 100644
index 0c51527a8b3d..000000000000
--- a/games-board/ace/files/ace-1.4-gold.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Sep 25 13:18:57 UTC 2012
-Subject: build system
-
-fix gold linker compilation
-https://bugs.gentoo.org/show_bug.cgi?id=435826
-
---- a/configure.in
-+++ b/configure.in
-@@ -44,6 +44,9 @@
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-+AC_PATH_PROG([PKGCONFIG], [pkg-config])
-+AS_IF([test "x$PKGCONFIG" = "x"],
-+    [AC_MSG_ERROR([pkg-config not found!])])
- 
- AC_CHECK_PROGS(BUILD_CC,gcc cc ${CC},gcc)
- AC_CHECK_PROG(AR,${AR:-ar},${AR:-ar},ar)
-@@ -55,6 +58,10 @@
- dnl doesn't work if gd isn't where the compiler can find it
- dnl AC_CHECK_LIB(gd, gdImageCreateFromGif)
- 
-+PKG_CHECK_MODULES([X], [x11])
-+PKG_CHECK_MODULES([Z], [zlib])
-+PKG_CHECK_MODULES([PNG], [libpng])
-+
- dnl Checks for header files.
- 
- AC_PATH_XTRA
-@@ -69,57 +76,6 @@
- AC_FUNC_UTIME_NULL
- AC_CHECK_FUNCS(gettimeofday mkdir strdup strstr)
- 
--opt_gd=
--AC_ARG_WITH(z,[  --with-z=DIR           location of the ZLIB library],opt_z=$withval)
--AC_ARG_WITH(png,[  --with-png=DIR          location of the PNG library],opt_png=$withval)
--
--case "$with_z" in
--  yes|no) AC_MSG_ERROR([
--*** Directory must be specified for --with-z])
--    ;;
--  "")
--    Z_CFLAGS=
--    Z_LIBS=-lz
--    ;;
--  *)
--    if test -f $with_z/include/z.h
--    then
--      Z_CFLAGS=-I$with_z/include
--    else
--      Z_CFLAGS=-I$with_z
--    fi
--    if test -f $with_z/lib/libz.a
--    then
--      Z_LIBS=$with_z/lib/libz.a
--    else
--      Z_LIBS=$with_z/libz.a
--    fi
--    ;;
--esac
--
--case "$with_png" in
--  yes|no) AC_MSG_ERROR([
--*** Directory must be specified for --with-png])
--    ;;
--  "")
--    PNG_CFLAGS=
--    PNG_LIBS=
--    ;;
--  *)
--    if test -f $with_png/lib/png.h
--    then
--      PNG_CFLAGS=-I$with_png/lib
--    else
--      PNG_CFLAGS=-I$with_png/include/X11
--    fi
--    if test -f $with_png/lib/libPng.a
--    then
--      PNG_LIBS="-L$with_png/lib"
--    else
--      PNG_LIBS="-L$with_png"
--    fi
--    ;;
--esac
- 
- AC_SUBST(Z_CFLAGS)
- AC_SUBST(Z_LIBS)
-@@ -127,6 +83,9 @@
- AC_SUBST(PNG_CFLAGS)
- AC_SUBST(PNG_LIBS)
- 
-+AC_SUBST(X_LIBS)
-+AC_SUBST(X_CFLAGS)
-+
- AC_SUBST(PDA)
- 
- AC_OUTPUT(Makefile lib/Makefile games/Makefile tests/Makefile)
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -5,18 +5,19 @@
- 
- CLEANFILES = images.c images.d
- 
--INCLUDES = $(X_CFLAGS) @PDA@
--AM_LDFLAGS = $(X_LIBS)
-+INCLUDES = $(X_CFLAGS) $(PNG_CFLAGS) $(Z_CFLAGS) @PDA@
- 
- BUILD_CC = @BUILD_CC@
- AR = @AR@
- STRIP = @STRIP@
- 
--libcards_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS)
-+libcards_la_LDFLAGS = -version-info 1:0:0
- 
- libcards_la_SOURCES = table.c help.c stack.c imagelib.c xwin.c \
- 	images.c table_rn.c funcs.c
- 
-+libcards_la_LIBADD = $(X_LIBS) $(PNG_LIBS) $(Z_LIBS)
-+
- # table_ai.c table_ck.c table_dc.c table_dg.c \
- #table_dp.c table_in.c table_ky.c table_rd.c table_rs.c
- 
---- a/games/Makefile.am
-+++ b/games/Makefile.am
-@@ -30,8 +30,7 @@
- 
- STRIP = @STRIP@
- 
--INCLUDES = -I$(srcdir)/../lib $(X_CFLAGS) @PDA@
--AM_LDFLAGS = $(X_LIBS)
-+INCLUDES = -I$(srcdir)/../lib @PDA@
- 
- canfield_SOURCES = canfield.c canfield-img.c
- freecell_SOURCES = freecell.c freecell-help.c freecell-img.c
-@@ -52,7 +51,7 @@
- 	solitaire-help.c solitaire-img.c spider-help.c spider-img.c \
- 	taipedit-help.c taipedit-img.c taipei-help.c taipei-img.c
- 
--LDADD = ../lib/libcards.la -lpng -lz -lX11 -lm
-+LDADD = ../lib/libcards.la -lm
- 
- EXTRA_DIST = $(wildcard *.png) $(wildcard *.tp)
- 
diff --git a/games-board/ace/files/ace-1.4-libpng15.patch b/games-board/ace/files/ace-1.4-libpng15.patch
deleted file mode 100644
index 23da6949318e..000000000000
--- a/games-board/ace/files/ace-1.4-libpng15.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/lib/make-imglib.c
-+++ b/lib/make-imglib.c
-@@ -86,7 +86,7 @@
-     png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
-     info_ptr = png_create_info_struct (png_ptr);
- 
--    if (setjmp (png_ptr->jmpbuf)) {
-+    if (setjmp (png_jmpbuf(png_ptr))) {
-       fclose (f);
-       continue;
-     }
---- a/lib/xwin.c
-+++ b/lib/xwin.c
-@@ -824,13 +824,13 @@
-   png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 0, 0, 0);
-   info_ptr = png_create_info_struct (png_ptr);
- 
--  if (setjmp (png_ptr->jmpbuf)) {
-+  if (setjmp (png_jmpbuf(png_ptr))) {
-     fprintf(stderr, "Invalid PNG image!\n");
-     return;
-   }
- 
-   file_bytes = src->file_data;
--  png_set_read_fn (png_ptr, (voidp)&file_bytes, (png_rw_ptr)png_reader);
-+  png_set_read_fn (png_ptr, (png_voidp)&file_bytes, (png_rw_ptr)png_reader);
- 
-   png_read_info (png_ptr, info_ptr);
- 
diff --git a/games-board/ace/files/ace-1.4-no-xpm.patch b/games-board/ace/files/ace-1.4-no-xpm.patch
deleted file mode 100644
index a8762fb00a38..000000000000
--- a/games-board/ace/files/ace-1.4-no-xpm.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/lib/table.c	2008-01-15 15:05:27.000000000 -0500
-+++ b/lib/table.c	2010-09-29 17:34:40.925310980 -0400
-@@ -23,7 +23,6 @@
- #include <X11/Xutil.h>
- #include <X11/keysym.h>
- #include <X11/Xatom.h>
--#include <X11/xpm.h>
- 
- #define CD printf("%d: %d %d %d %d\n", __LINE__, ex, ey, ew, eh)
- #undef CD
-@@ -165,13 +164,6 @@
-   xwin_create (width, height);
- }
- 
--typedef struct PicRec {
--  Pixmap pixmap;
--  Pixmap mask;
--  char **xpm_data;
--  int image_table_index;
--} PicRec;
--
- int get_picture_default_width  = CARD_WIDTH;
- int get_picture_default_height = CARD_HEIGHT;
- 
diff --git a/games-board/ace/metadata.xml b/games-board/ace/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/ace/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/ascal-0.1.1-r1 b/games-board/ascal-0.1.1-r1
new file mode 100644
index 000000000000..0e3df8ffd68c
--- /dev/null
+++ b/games-board/ascal-0.1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-cpp/libglademm dev-cpp/libgnomecanvasmm virtual/libintl sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A game similar to Draughts but with some really cool enhancements
+EAPI=6
+HOMEPAGE=http://ascal.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/libglademm dev-cpp/libgnomecanvasmm virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/ascal/ascal-0.1.1.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_=98d442c496c5aaafa37af56936b8dd4d
diff --git a/games-board/ascal/Manifest b/games-board/ascal/Manifest
deleted file mode 100644
index ba8f53c53c7e..000000000000
--- a/games-board/ascal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ascal-0.1.1-gcc43.patch 859 BLAKE2B 92b07bf43e9e64f9cdd505b9f048e7bd18ef6f9559242670793f2638d21ff43731bd4acbdda1be179fb04249a63b98bb0f854cd7c0e00d32d7119a0ee18aaa76 SHA512 e4d8b1fb25dda182fdbe9bddfee0157332337f6fa9865fa06b2fd8fa7cd16f03d8a25129ff233ea600dd9be32df93a2b591e47d9597fd547764af765f29dbab7
-AUX ascal-0.1.1-install.patch 1738 BLAKE2B 18f5aa5af12d14cd8f5fbf49864922232c1bc5b4cf15b5928bc900aa12bf8129578590f03ce449e8c26a2f44755e331501da9cc753d6964ba54f2738056f20e9 SHA512 a7ac59c7534461fc841ac9a7e60b7151408fe7f92728376a9ee4849c50ca460a67eacc055a67559b4c252b3d8d2f0504f464792a80ead7c5a7ffb325d07cc525
-DIST ascal-0.1.1.tar.bz2 960688 BLAKE2B b65011d9dbd7c6d088dc303312a5159a8e863713c64e10901b1cd34df561612003a9695d723c17c5a59b91e50a306760f3283abeeb333afad87d1fea6f758660 SHA512 4428040396da85dd8598ece34909b1db80fe2f72c36b8e0d23c3f9db5837ee30ec2a10ee74def97a80bafbbf1927cbdb6c598aa5f0a42949d3c490672f8c5165
-EBUILD ascal-0.1.1-r1.ebuild 673 BLAKE2B 0213597bfcd7be4f566f68f38fb58b55de999c4a7bbdb9b5ccc965588ecfe69fb27cdd36721657d6c574e5314905380c05e15770db5964d4ae33ea42e21788a2 SHA512 a46df9297a924eb4adb8c13da154803108dc88c863f3809797b31f2a6833542e5df79dc27310c03937747410dd7ee12995eb8fa1fee15374130f74a0f9d8db4e
-MISC metadata.xml 816 BLAKE2B 8e0ad192aae3d610f2f8d15922134871a049e85c330ab32eefe4948cb903957d90295d94dc6e3f5087ce5b326b4278bd7c62659e580abcf85da21f70005e5aec SHA512 eccb593e64f1dd07427835d43a350796e21445c9fd39df3ef82c01dcf12d008bc4e6551df78637c55191f16849a801f725f57a6368b16372d68013a26a1ff809
diff --git a/games-board/ascal/ascal-0.1.1-r1.ebuild b/games-board/ascal/ascal-0.1.1-r1.ebuild
deleted file mode 100644
index 33cafc7a58d9..000000000000
--- a/games-board/ascal/ascal-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="A game similar to Draughts but with some really cool enhancements"
-HOMEPAGE="http://ascal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ascal/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/libglademm
-	dev-cpp/libgnomecanvasmm
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-install.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf
-}
diff --git a/games-board/ascal/files/ascal-0.1.1-gcc43.patch b/games-board/ascal/files/ascal-0.1.1-gcc43.patch
deleted file mode 100644
index b2a55584fb0b..000000000000
--- a/games-board/ascal/files/ascal-0.1.1-gcc43.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/gui.cpp	2009-01-18 21:11:58.000000000 +0100
-+++ b/src/gui.cpp	2009-01-18 21:12:33.000000000 +0100
-@@ -21,6 +21,7 @@
- #include "shareddata.hpp"
- #include "config.h"
- #include <string>
-+#include <libintl.h>
- 
- gui::gui(shareddata *newData): GuiBoard() {
- 	//clean, cleaner - pointer ;)
---- a/src/gui_board.cpp	2009-01-18 21:13:30.000000000 +0100
-+++ b/src/gui_board.cpp	2009-01-18 21:13:50.000000000 +0100
-@@ -20,6 +20,7 @@
- #include <math.h>
- #include "helper.h"
- #include <stack>
-+#include <libintl.h>
- 
- 
- gui_board::gui_board()   {
---- a/src/board.cpp	2009-01-18 21:14:27.000000000 +0100
-+++ b/src/board.cpp	2009-01-18 21:14:58.000000000 +0100
-@@ -15,6 +15,7 @@
- // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- #include "board.hpp"
-+#include <cstdlib>
- //#define DEBUG
- #include "ourmove.hpp"
- #include "helper.h"
diff --git a/games-board/ascal/files/ascal-0.1.1-install.patch b/games-board/ascal/files/ascal-0.1.1-install.patch
deleted file mode 100644
index 51a82a535eb8..000000000000
--- a/games-board/ascal/files/ascal-0.1.1-install.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -63,9 +63,6 @@
-         AC_DEFINE(DEBUG, 1, [Enable debug msg.])
- 		CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
-         CPPFLAGS="$CPPFLAGS -g -O0"
--else
--    CPPFLAGS=[`echo "$CXXFLAGS" | $SED -e 's/-O[0-9]*//g'`]
--	CPPFLAGS="$CPPFLAGS -O3"
- fi
- 
- AC_ARG_ENABLE(Werror,
-@@ -74,7 +71,7 @@
- )
- 
- if test "$enable_Werror" = yes; then
--        CPPFLAGS="$CPPFLAGS -Werror -Wall"
-+        CPPFLAGS="$CPPFLAGS -Wall"
- fi
- 
- AC_ARG_ENABLE(static,
---- a/m4/Makefile.am
-+++ b/m4/Makefile.am
-@@ -15,6 +15,5 @@
- m4macros = 
- 
- # The following is boilerplate
--m4data_DATA = $(m4macros) 
- EXTRA_DIST =  
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -17,13 +17,12 @@
- 
- ACLOCAL_AMFLAGS = -I m4
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = /usr/share/pixmaps
- pixmap_DATA = ascal.png
- 
--desktopdir = $(datadir)/applications
-+desktopdir = /usr/share/applications
- desktop_in_files = ascal.desktop.in
--desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
- @INTLTOOL_DESKTOP_RULE@
- 
--#include aminclude.am
-\ No newline at end of file
-+#include aminclude.am
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -50,5 +50,5 @@
- 
- 
- 
--INCLUDES = $(ASCAL_CFLAGS) $(GTKMM) -DLOCALEDIR=\""$(datadir)/locale"\" -DASCAL_DATA_PREFIX=\""$(ASCAL_DATA_PREFIX)"\"
-+INCLUDES = $(ASCAL_CFLAGS) $(GTKMM) -DLOCALEDIR=\""/usr/share/locale"\" -DASCAL_DATA_PREFIX=\""$(ASCAL_DATA_PREFIX)"\"
- LIBS = $(ASCAL_LIBS) $(GTKMM)
diff --git a/games-board/ascal/metadata.xml b/games-board/ascal/metadata.xml
deleted file mode 100644
index 3fbc824d750e..000000000000
--- a/games-board/ascal/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Lasca (or Laska) is a game similar to Draughts but with some really cool
-enhancements. You'll find a great description in the help system of Ascal. In
-the meantime the article on Wikipedia and on
-http://research.interface.co.uk/lasca/about.htm will help you understanding the
-rules. Ascal tries to give a great Gnome Version of Lasca for one and two
-players. You can undo moves, save and load games and all that on a nifty
-graphical board.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ascal</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/atakks-1.0-r1 b/games-board/atakks-1.0-r1
new file mode 100644
index 000000000000..c5c27696588e
--- /dev/null
+++ b/games-board/atakks-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl:0
+DESCRIPTION=A clone of Ataxx
+EAPI=6
+HOMEPAGE=http://team.gcu-squad.org/~fab
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl:0
+SLOT=0
+SRC_URI=mirror://gentoo/atakks-1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b45f71d9ea53ed75dffccac1446ff197
diff --git a/games-board/atakks/Manifest b/games-board/atakks/Manifest
deleted file mode 100644
index 1a11868cc1cc..000000000000
--- a/games-board/atakks/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 1.0-warnings.patch 974 BLAKE2B 54ead5cdd8b43c812f11685f053b9a8fa8eaa5aa8da2d4a585bf4b8c90180a7d53036ec6ec230f47ea2beeb0361579d6dc732c435fd1763a8f83af466d9ab3dc SHA512 36911a16c5a9ea3db5a13fb9cb38e6481465016d1d58d1d255730ee35aad44e9356a1493ce93a010d5544b28d8e3ea35d40087e95dc86e577904eb033025b411
-AUX atakks-1.0-as-needed.patch 443 BLAKE2B 8d9ea8a04f2ca9cfc592427bd22223ba77c25796c2c3b6d4a5cf4ffd129e279da4b50d5c2377e0313acda12807ced7b30557fc705d4c272ccdf219338a8ef281 SHA512 6280db8cd198caf320daa85773358f92b0bcf71c243b5ab36ccc989fb7c88fdeab2de8a1dc4ce45c97977b2f5ac026e811db1e1e6b3683759d2e5f639fa2155d
-DIST atakks-1.0.tar.gz 62464 BLAKE2B 1419e4fff60121e0bd793322cd20515335ad82d9b1341ab9ae658aa5e2882af3457440485318b1d872f9f8f483c22b21d8dc55f5d4862694427d08fb52e93e85 SHA512 a4b31635ef74198c86002fc930922266f462926bffa5b1fd7fb8ba1186dbc1efd8ae8c84ac0a429737916d1350b5432967221a67505bfe73d47a6dadd7600e39
-EBUILD atakks-1.0-r1.ebuild 894 BLAKE2B 680740590cd12d1df67781ba1a043539cc345774076c90bf8ea2c6db1ce8b83269447b5ac7cb9ecc71c524edf7a39616d9801ee267c235604b1e7771b2450045 SHA512 6c564d8d03622a883c8e99a86d3753b73be46f8baa360d596245b2c44a6188f39be76a150a8bb1c0ce461a47c81ec77a9a8b4eb2bd92d1f8b4cbdc1595b09359
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/atakks/atakks-1.0-r1.ebuild b/games-board/atakks/atakks-1.0-r1.ebuild
deleted file mode 100644
index 052924ba8c88..000000000000
--- a/games-board/atakks/atakks-1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P=${P/-/_}
-DESCRIPTION="A clone of Ataxx"
-HOMEPAGE="http://team.gcu-squad.org/~fab"
-# no version upstream
-#SRC_URI="http://team.gcu-squad.org/~fab/down/${PN}.tgz"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-warnings.patch
-	"${FILESDIR}"/${P}-as-needed.patch
-)
-
-src_prepare() {
-	default
-
-	# Modify game data paths
-	sed -i \
-		-e "s:SDL_LoadBMP(\":SDL_LoadBMP(\"/usr/share/${PN}/:" \
-		main.c || die
-}
-
-src_compile() {
-	emake E_CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins *bmp
-	newicon icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Atakks /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-board/atakks/files/1.0-warnings.patch b/games-board/atakks/files/1.0-warnings.patch
deleted file mode 100644
index 7123bb4f7dd2..000000000000
--- a/games-board/atakks/files/1.0-warnings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/main.c	2004-06-02 01:26:00.000000000 -0700
-+++ b/main.c	2004-06-02 01:27:30.000000000 -0700
-@@ -13,6 +13,7 @@
- #include<SDL/SDL.h>
- #include<unistd.h>
- #include<stdlib.h>		/* atexit */
-+#include<string.h>
- #include "defs.h"
- void virus(Uint8 posX, Uint8 posY)
- {
-@@ -206,7 +207,7 @@
- int main(int argc, char **argv)
- {
-     struct move hoho;
--    Uint8 caseX, caseY,selx, sely, checked = 0,  canmove = 1;
-+    Uint8 caseX, caseY,selx = 0, sely = 0, checked = 0,  canmove = 1;
-     SDL_Surface *ico;
-     int pions1=0, pions2=0;
-     if (SDL_Init(SDL_INIT_VIDEO) == -1) {
-@@ -238,7 +239,7 @@
- 		 argv[0]);
- #else
- 	    printf
--		("\nSyntax: %s OPTIONS\n\n options:\n-h\t\tPrint help\n-t n1 n2\tSet width=n1 and height=n2\n\-ai\t\tActivate 1 player mode, [i] key during game.\n\n",
-+		("\nSyntax: %s OPTIONS\n\n options:\n-h\t\tPrint help\n-t n1 n2\tSet width=n1 and height=n2\n-ai\t\tActivate 1 player mode, [i] key during game.\n\n",
- 		 argv[0]);
- 
- #endif				/*  */
diff --git a/games-board/atakks/files/atakks-1.0-as-needed.patch b/games-board/atakks/files/atakks-1.0-as-needed.patch
deleted file mode 100644
index e496f5ff0d30..000000000000
--- a/games-board/atakks/files/atakks-1.0-as-needed.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile        2009-02-03 10:02:08.000000000 +0100
-+++ b/Makefile    2009-02-03 10:04:12.000000000 +0100
-@@ -1,10 +1,10 @@
--LDFLAGS= -lSDL -lpthread -s
--CFLAGS= -Wall -ansi # -DDEBUG
-+LDLIBS = -lSDL
-+CFLAGS= $(E_CFLAGS) -DUS -Wall -ansi # -DDEBUG
- all: atakks
- clean:
- 	rm atakks *.o
- atakks: main.o
--	$(CC) $(LDFLAGS) $< -o $@
-+	$(CC) $(LDFLAGS) $< -o $@ $(LDLIBS)
- pkg:
- 	mkdir atakks-src
- 	cp *.bmp main.c Makefile README atakks-src
diff --git a/games-board/atakks/metadata.xml b/games-board/atakks/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/atakks/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/awale-1.5-r1 b/games-board/awale-1.5-r1
new file mode 100644
index 000000000000..f7611717fedb
--- /dev/null
+++ b/games-board/awale-1.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=>=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=Free Awale - The game of all Africa
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/awale/
+IUSE=tk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= )
+SLOT=0
+SRC_URI=mirror://nongnu/awale/awale-1.5.tar.gz https://dev.gentoo.org/~hasufell/distfiles/awale-1.5-no-autoreconf2.patch.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_=572001b3a256236f886a1665d3817371
diff --git a/games-board/awale/Manifest b/games-board/awale/Manifest
deleted file mode 100644
index ab94898987b7..000000000000
--- a/games-board/awale/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX awale-1.5-build.patch 3323 BLAKE2B 7f2a2451b214466aba032891df9209d9b3bd1a458d59068a5a1771e0c76fd5360fda6e92cab4f71a4ced684c2616305333732d67e59412e93ca821b626097200 SHA512 7dccdb24469238d36d7ea0a9d9b27ca2e4b4472ae4918b0361f78e84933db1ebd948197af32c40ec48d014f3baefc4adf1e48f0e277af8b6b8b53e780c9c613e
-DIST awale-1.5-no-autoreconf2.patch.xz 37268 BLAKE2B cec173e9b0be75c5d3d037a171fd796dccca5689e53f2e08d832e15a63d96502b4277f2ca6dbcbe817949cda8243aaacf7d7ede281fa32a34ffbf5f3031042f1 SHA512 857814c6ffe828bb0c3b82c214932ddf95162b7abaac6720db987f2af31a3b144543773a607edc70e0fceb8433f2aa519d3cfaca7474750cb45074aef0c37cb1
-DIST awale-1.5.tar.gz 489357 BLAKE2B d9f5efd10018b1e5f9964abf25189df5186159c7826c23b85f794999c5bc8d8ea93792e83dbde2ae010489a7d90258651e7ab7115e0fc361ce682968c438aed6 SHA512 b3f33068d7d6cfd964051e15cfd84e7f2c8483c30f2ccea35e2dddb34353ea984561fdf28c0d668404d80cda89c6d5fcd0004a1a86d92325e5f6fc2f88197c61
-EBUILD awale-1.5-r1.ebuild 1218 BLAKE2B 673791d5db74798c8ebaa9f715bc335fa928c2ca3da9579fa45474016a1ca20257c6cc1469f7ee5f3e73cd564cd11acd0af797a154c1ef6dab246e861388e332 SHA512 db5025261ef6f307867a574c6e933c65e1f43819c7b6916245ab1b836a398f227e8b0ba32c48c0fb06b4afedab2d8ce022a9534b010f2d19f389bcc38b853083
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-board/awale/awale-1.5-r1.ebuild b/games-board/awale/awale-1.5-r1.ebuild
deleted file mode 100644
index 13e96b998a9c..000000000000
--- a/games-board/awale/awale-1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# do not use autotools related stuff in stable ebuilds
-# unless you like random breakage: 469796, 469798, 424041
-
-EAPI=6
-
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Free Awale - The game of all Africa"
-HOMEPAGE="http://www.nongnu.org/awale/"
-SRC_URI="mirror://nongnu/awale/${P}.tar.gz"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf2.patch.xz" # STABLE ARCH
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-RDEPEND="tk? ( dev-lang/tcl:0= dev-lang/tk:0= )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-
-	mv src/xawale.tcl src/xawale.tcl.in || die
-	mv configure.{in,ac} || die
-	rm aclocal.m4 || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--mandir=/usr/share/man \
-		--with-iconsdir=/usr/share/icons/hicolor/48x48/apps \
-		--with-desktopdir=/usr/share/applications \
-		$(use_enable tk)
-}
-
-src_install() {
-	default
-	use tk && fperms +x /usr/share/${PN}/xawale.tcl
-}
-
-pkg_preinst() {
-	use tk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use tk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use tk && gnome2_icon_cache_update
-}
diff --git a/games-board/awale/files/awale-1.5-build.patch b/games-board/awale/files/awale-1.5-build.patch
deleted file mode 100644
index 0e8ca136a410..000000000000
--- a/games-board/awale/files/awale-1.5-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jan 26 20:04:17 UTC 2013
-Subject: build system
-
-	fix FHS compliance
-	add several switches for icon, desktopdir and tk
-	fix a few macros
-
---- awale-1.5/src/Makefile.am
-+++ awale-1.5/src/Makefile.am
-@@ -1,24 +1,30 @@
- bin_PROGRAMS = awale
- awale_SOURCES = awale.c getopt.c getopt1.c getopt.h
--INCLUDES = -I. -I$(srcdir)
-+AM_CPPFLAGS = -I. -I$(srcdir)
-+
-+if TK_GUI
- bin_SCRIPTS = xawale
- xawale:
- 	echo "#! /bin/sh" >$@
--	echo '`dirname $$0`/../share/awale/xawale.tcl' >>$@
-+	echo "cd \"$(datadir)/awale/\" ; exec \"$(datadir)/awale/xawale.tcl\"" >>$@
- 	chmod ugo+x $@
--appdir = $(prefix)/share/applications
-+appdir = @DESKTOPFILESDIR@
- app_DATA = awale.desktop
- awale.desktop:
- 	echo "[Desktop Entry]" >$@
- 	echo "Name=Free Awale" >>$@
- 	echo "Comment=Awale game" >>$@
- 	echo "Exec=xawale" >>$@
--	echo  'Icon=$(pkgdatadir)/awale.png' >>$@
-+	echo  'Icon=awale' >>$@
- 	echo "Terminal=false" >>$@
- 	echo "Type=Application" >>$@
- 	echo "Categories=Game;BoardGame;" >>$@
- 	chmod 644 $@
- CLEANFILES = xawale awale.desktop
-+
-+xawale.tcl:
-+	sed 's|@my_bindir@|$(bindir)|' < $@.in > $@
-+
- pkgdata_SCRIPTS = xawale.tcl
- dist_pkgdata_DATA = Trou00.gif Trou01.gif Trou02.gif Trou03.gif Trou04.gif Trou05.gif \
-                     Trou06.gif Trou07.gif Trou08.gif Trou09.gif Trou10.gif Trou11.gif \
-@@ -28,3 +34,8 @@
-                     Trou06.gif Trou07.gif Trou08.gif Trou09.gif Trou10.gif Trou11.gif \
-                     Trou12.gif Trou13.gif Trou14.gif Trou15.gif board.gif copyright.gif \
- 		    awale.png awale.ico uk.gif fr.gif sp.gif AwaleBanner.bmp README
-+
-+# icon
-+iconsdir = @ICONSDIR@
-+dist_icons_DATA = awale.png
-+endif
---- awale-1.5/configure.in
-+++ awale-1.5/configure.in
-@@ -1,6 +1,34 @@
--AC_INIT(awale.c)
--AM_INIT_AUTOMAKE(awale, 1.5)
-+AC_INIT([awale], [1.5])
-+AM_INIT_AUTOMAKE([-Wall])
- AC_CONFIG_SRCDIR([src/awale.c])
- AC_PROG_CC
-+
-+
-+# let user specify desktopdir
-+AC_ARG_WITH([desktopdir],
-+    [AS_HELP_STRING([--with-desktopdir=DIR],
-+        [path where desktop files get installed (default: $datadir/applications)])],
-+    [DESKTOPFILESDIR="$withval"],
-+    [DESKTOPFILESDIR='$(datadir)/applications'])
-+
-+# let user specify iconsdir
-+AC_ARG_WITH([iconsdir],
-+    [AS_HELP_STRING([--with-iconsdir=DIR],
-+        [path where icons get installed (default: $datadir/pixmaps)])],
-+    [ICONSDIR="$withval"],
-+    [ICONSDIR='$(datadir)/pixmaps'])
-+
-+# configure-switch for tkgui
-+AC_ARG_ENABLE([tk],
-+    [AS_HELP_STRING([--enable-tk],
-+        [enable tk gui (default: enable)])],
-+    [enable_tk=$enableval],
-+    [enable_tk="no"])
-+
-+AM_CONDITIONAL([TK_GUI], [test "x$enable_tk" = "xyes"])
-+
-+AC_SUBST([ICONSDIR])
-+AC_SUBST([DESKTOPFILESDIR])
-+
- AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
- AC_OUTPUT
-
---- awale-1.5/man/Makefile.am
-+++ awale-1.5/man/Makefile.am
-@@ -1,3 +1,7 @@
--mandir = $(prefix)/share/man
-+if TK_GUI
- man_MANS = awale.6 xawale.6
-+else
-+man_MANS = awale.6
-+endif
-+
- EXTRA_DIST = $(man_MANS)
---- awale-1.5/src/xawale.tcl
-+++ awale-1.5/src/xawale.tcl
-@@ -693,7 +693,7 @@
- 
- switch $tcl_platform(platform) {
- "unix"      {
--    set JOUER [file join [file dirname [info script]] .. .. bin awale] 
-+    set JOUER "@my_bindir@/awale"
-             }
- "macintosh" {
-     set JOUER [file join [file dirname [info script]] .. .. bin awale]
diff --git a/games-board/awale/metadata.xml b/games-board/awale/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-board/awale/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-board/biloba-0.9.3-r1 b/games-board/biloba-0.9.3-r1
new file mode 100644
index 000000000000..3dfe515abb13
--- /dev/null
+++ b/games-board/biloba-0.9.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl:0[X,video,sound] media-libs/sdl-image[png] media-libs/sdl-mixer >=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 board game, up to 4 players, with AI and network
+EAPI=6
+HOMEPAGE=http://biloba.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl:0[X,video,sound] media-libs/sdl-image[png] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://sourceforge/biloba/biloba-0.9.3.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_=b212dbd29da518fde5ab3602dba3288d
diff --git a/games-board/biloba/Manifest b/games-board/biloba/Manifest
deleted file mode 100644
index 1a5c751bd25e..000000000000
--- a/games-board/biloba/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX biloba-0.9.3-no-X11-dep.patch 427 BLAKE2B 1aef6c3df05c53c01e4a4ec1f4064e2be21dabe847106da9c8f5d11483d14e5cdb904c8bc20a32b8b359d21ab0e2580dbb4713294576546a01cb996e9c1d4753 SHA512 21d4af601433eecca31f82926fb94791b4ef2193c3c16fadd210c9fdf0acdfdad562ac93b27811186d1736242e88638a2110e9264d0e2c54facd938bcece9a67
-AUX biloba-0.9.3-not-windows.patch 615 BLAKE2B d706e4624334e4e9137ddfb1a2f30bf878a4b7251ad7d3f1093725c1cb6ed24be06b3dd76d7b7191f6c35c5d463fc94725523f6512ba1d948d0ffa1f81d78a8a SHA512 21d6be2dcba0c12e11bf8e3d086c6e8c90e30eaebcd8a7d758eb64c343f60e90e8a332ae2b988950086d044554cdd2bfd5ea8fefade3494e529875199899a832
-DIST biloba-0.9.3.tar.gz 3162976 BLAKE2B 878e63d188066dbd07499bbfe9c3aaf5f5eb562729844ed648ff73e8eb5b2632faf3533b7a1133b1959cbe2b7d37a38995d453055d91597916d6d19169c7383a SHA512 8729299bb37e05b7c27e0d77d022228c385d3d3c475c77b9b8eb81a6df2c2513ea0055b52b65715922fd964e4bab875e3ab5bec58746095346bf0c96d0cf6bc5
-EBUILD biloba-0.9.3-r1.ebuild 999 BLAKE2B 4480e03225eac1910b5ec6ff58b7cd56d0dc07be9eff8539fc45777c4546eba9399f300ce02dea879c8639801050a5ff8513bd130e12aa7b93af52787a81740b SHA512 ae0e2abd3d3db7e4ff4b0414ca23e1abe9e78be7112015a11517b7a666ba6fd95d129b3b6b328b28149178004d02892b07791c859f26d93bb2326be5d9b71d22
-MISC metadata.xml 329 BLAKE2B af2f4cc4fc9c266f2e2250e7068a1f86ba353f647058bc0e74339d24198ae5e302873d36cec6f2b05b13be04439c51eb4174c0a92e0fe6af66d5e81643a264ad SHA512 f182ec126a8585569dc2b3c285edc90a9d2b0656391c490f8f1d86b49b70a67e8b06e3f49e623961c3a350f380672664d93d2cab7bdd9d7f26184e3b7a7d555c
diff --git a/games-board/biloba/biloba-0.9.3-r1.ebuild b/games-board/biloba/biloba-0.9.3-r1.ebuild
deleted file mode 100644
index d002df044589..000000000000
--- a/games-board/biloba/biloba-0.9.3-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="a board game, up to 4 players, with AI and network"
-HOMEPAGE="http://biloba.sourceforge.net/"
-SRC_URI="mirror://sourceforge/biloba/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl:0[X,video,sound]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	# X11 headers are checked but not used, everything is done through SDL
-	"${FILESDIR}"/${P}-not-windows.patch
-	"${FILESDIR}"/${P}-no-X11-dep.patch
-)
-
-src_prepare() {
-	default
-
-	# "missing" file is old, and warns about --run not being supported
-	rm -f missing
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon -s 64 biloba_icon.png ${PN}.png
-	make_desktop_entry biloba Biloba
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/biloba/files/biloba-0.9.3-no-X11-dep.patch b/games-board/biloba/files/biloba-0.9.3-no-X11-dep.patch
deleted file mode 100644
index adc8395a947d..000000000000
--- a/games-board/biloba/files/biloba-0.9.3-no-X11-dep.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/configure.ac	2006-07-29 11:38:43.000000000 +0200
-+++ b/configure.ac	2006-07-29 11:40:52.000000000 +0200
-@@ -40,14 +40,6 @@
-         ;;
-     *)
-         MATHLIB="-lm"
--        AC_PATH_X
--        AC_PATH_XTRA
--        if test x$have_x = xyes; then
--            CFLAGS="$CFLAGS $X_CFLAGS"
--            SYS_GL_LIBS="$X_LIBS -lGL"
--        else
--            SYS_GL_LIBS="-lGL"
--        fi
-         ;;
- esac
- AC_SUBST(MATHLIB)
diff --git a/games-board/biloba/files/biloba-0.9.3-not-windows.patch b/games-board/biloba/files/biloba-0.9.3-not-windows.patch
deleted file mode 100644
index 035685cfafef..000000000000
--- a/games-board/biloba/files/biloba-0.9.3-not-windows.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.ac	2008-01-14 14:51:11.000000000 +0100
-+++ b/configure.ac	2008-12-28 12:57:13.000000000 +0100
-@@ -73,12 +65,6 @@
-              AC_MSG_ERROR([*** SDL-Mixer not found!]))
- AC_CHECK_HEADER(SDL/SDL_mixer.h, , AC_MSG_ERROR([*** SDL-mixer devel files not found!]))
- 
--AC_ARG_VAR(WINDRES, [Windows Resource compiler tool path])
--AC_PATH_TOOL(WINDRES,windres,
--	[AC_MSG_WARN(Could not find a windres tool in your PATH.)]
--)
--AC_SUBST(WINDRES)
--
- AC_ARG_ENABLE(maemo,
-         [  --enable-maemo   build for the Maemo platform [default=no]],
-         [ac_cv_enable_maemo=$enableval], [ac_cv_enable_maemo=no])
diff --git a/games-board/biloba/metadata.xml b/games-board/biloba/metadata.xml
deleted file mode 100644
index d84b14adc57c..000000000000
--- a/games-board/biloba/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">biloba</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/blokish-0.9.4-r3 b/games-board/blokish-0.9.4-r3
new file mode 100644
index 000000000000..d009f3991703
--- /dev/null
+++ b/games-board/blokish-0.9.4-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/wxGTK:3.0[X,opengl] 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
+DESCRIPTION=Open source clone of the four-player board game Blokus
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/blokish/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/wxGTK:3.0[X,opengl] virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/blokish/blokish_v0.9.4.tgz
+_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	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=1754617c065746540edbe52ccb951b96
diff --git a/games-board/blokish/Manifest b/games-board/blokish/Manifest
deleted file mode 100644
index 1cdedba62685..000000000000
--- a/games-board/blokish/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX blokish-0.9.4-gcc43.patch 195 BLAKE2B 2b254b8af303b1d224b71e245416305e4fc605bfc2197c4ac3ca2b00c632cb2c77d7c7156f1019d8bf74e8e714abf167e6315644bbcd92ba0dd78f85a22740e2 SHA512 4cca822dd7baeb3f81dd541689bde1c2e9fbcd9dfbe9ed33c714284075db8575919638e3f5c5ec62d8875d220a67ec3790d729d06af1b27e9f48b02a885593e0
-AUX blokish-0.9.4-underlink.patch 270 BLAKE2B 3849db25e27397a201ffa6bc9ef26b5ff852c1049f2195a0ff5e012fac589bf5e04ae0a1741e54d01e05f802e8193774e29100a5232cd1c4f11d14814d5b5038 SHA512 bc9c725c6c084a0a033c282401f886196421eb9e76fd0298e7a86f7cc3ffa23bb3bcaff483207498afe80c3e78b3a615ea21c6ba156a6a0f47e810bec58e7f92
-AUX blokish-0.9.4-wxgtk.patch 1469 BLAKE2B 2dad1ea91ddc31eff1150283585179bf7a22d8837ee120123ef588bcfc4a838a15453a5e37ef62055d60de0e45ead4ab4b679bf0c663b434aeb21633b4755e53 SHA512 d495bbc120d4a6ebf93dc49e7090fd224946ceccd543570a6fa7f2d41dc6df41586f38a7bcdd06c7fa754c3201d23ca3f770f95531c6ecbd2e29a10595972143
-DIST blokish_v0.9.4.tgz 165215 BLAKE2B 137a82d8833da4459d394a2832fc32de3157c107d2cfcbd3ff93b8274ee1b218a823c44f70a6b256aa6bfa4367c01561829c29638c331cbdf179bfa069278b7a SHA512 f84e5c31999cfca4bc6504907a889561c0e6c986b6c7bbd0d7325cec248d7e5d7834d841326635a605669b7bffd9fdb8c8fe73a216a738dace0385ae8a98cbec
-EBUILD blokish-0.9.4-r3.ebuild 965 BLAKE2B 8d7ecdf958263c7ce510ff16779abfab4f5528de65f7d4a438018582fe75115849c2444f5bc46d994925cea7624760579a1a18bbdb7f798b07efe7598418f9ce SHA512 b18170cb4367dc5fe34d1a23861002c848269914408761f39f6069c081fd7af61a950003a8ee72d0c8745c2315b7e26a603c15afba2eda4d0a6cca0ba9595024
-MISC metadata.xml 330 BLAKE2B febcfddefec46284254771d629db20864acd22a2dc23ca0c2082386d1270a4f92d549cf8ab9ca0e9690b7e57e90dfbb9cca10e14a1e8ef910a2e8bfe36be1eda SHA512 ab6edc3e5f113ed83a736fae1b3b1460116f684d4fedbc7a84f6d632ad5f977b0f2557c39a7cac99b998df9474b7733ea70ead63fa255aacac3c745c79c0d710
diff --git a/games-board/blokish/blokish-0.9.4-r3.ebuild b/games-board/blokish/blokish-0.9.4-r3.ebuild
deleted file mode 100644
index e45372c8a487..000000000000
--- a/games-board/blokish/blokish-0.9.4-r3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-inherit eutils autotools wxwidgets
-
-MY_P="${PN}_v${PV}"
-DESCRIPTION="Open source clone of the four-player board game Blokus"
-HOMEPAGE="https://sourceforge.net/projects/blokish/"
-SRC_URI="mirror://sourceforge/blokish/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-wxgtk.patch
-)
-
-src_prepare() {
-	default
-
-	# Otherwise $WX_CONFIG is unset:
-	setup-wxwidgets
-
-	sed -i \
-		-e "s:wx-config:${WX_CONFIG}:" \
-		configure.in makefile.am || die
-	mv configure.in configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	doicon src/${PN}.xpm
-	make_desktop_entry ${PN} Blokish ${PN}
-
-	dodoc docs/*
-}
diff --git a/games-board/blokish/files/blokish-0.9.4-gcc43.patch b/games-board/blokish/files/blokish-0.9.4-gcc43.patch
deleted file mode 100644
index f53e5495aa57..000000000000
--- a/games-board/blokish/files/blokish-0.9.4-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/base.h
-+++ b/src/base.h
-@@ -25,6 +25,9 @@
- #include <vector>
- #include <fstream>
- #include <iostream>
-+#include <algorithm>
-+#include <cstdlib>
-+#include <climits>
- 
- enum BlokishID
- {
diff --git a/games-board/blokish/files/blokish-0.9.4-underlink.patch b/games-board/blokish/files/blokish-0.9.4-underlink.patch
deleted file mode 100644
index a4433379e37a..000000000000
--- a/games-board/blokish/files/blokish-0.9.4-underlink.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/makefile.am	2011-06-21 08:43:21.804880067 +0200
-+++ b/makefile.am	2011-06-21 08:43:49.875661081 +0200
-@@ -1,5 +1,5 @@
- INCLUDES = `wx-config --cxxflags`
--LIBS = `wx-config --libs --gl-libs`
-+LIBS = `wx-config --libs --gl-libs` -lGL -lm
- 
- bin_PROGRAMS = blokish
- 
diff --git a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch b/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
deleted file mode 100644
index 1821e0b5f86d..000000000000
--- a/games-board/blokish/files/blokish-0.9.4-wxgtk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru blokish/src/blokish.cpp blokish/src/blokish.cpp
---- blokish/src/blokish.cpp	2007-04-01 17:01:26.000000000 -0400
-+++ blokish/src/blokish.cpp	2015-11-15 21:48:32.426081482 -0500
-@@ -903,7 +903,7 @@
-   void OnSaveGame(wxCommandEvent &event)
-   {
- 		WaitForAIToFinish();
--    wxString filename = wxFileSelector(wxString::FromAscii("Select a filename to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxSAVE);
-+    wxString filename = wxFileSelector(wxString::FromAscii("Select a filename to save as"), wxString::FromAscii(""), wxString::FromAscii("default.sav"), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_SAVE);
-     if(!filename.empty())
-     {
-       std::ofstream outFile(filename.fn_str(), std::ios::binary);
-@@ -915,7 +915,7 @@
-   void OnLoadGame(wxCommandEvent &event)
-   {
- 		WaitForAIToFinish();
--    wxString filename = wxFileSelector(wxString::FromAscii("Select a game to load"), wxString::FromAscii(""), wxString::FromAscii(""), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxOPEN | wxFILE_MUST_EXIST);
-+    wxString filename = wxFileSelector(wxString::FromAscii("Select a game to load"), wxString::FromAscii(""), wxString::FromAscii(""), wxString::FromAscii(".sav"), wxString::FromAscii("*.sav"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
-     if(!filename.empty())
-     {
-       std::ifstream inFile(filename.fn_str(), std::ios::binary);
diff --git a/games-board/blokish/metadata.xml b/games-board/blokish/metadata.xml
deleted file mode 100644
index b7f485dcb3ed..000000000000
--- a/games-board/blokish/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">blokish</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/camato-0.7.4-r1 b/games-board/camato-0.7.4-r1
new file mode 100644
index 000000000000..efb320ab8594
--- /dev/null
+++ b/games-board/camato-0.7.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-ruby/ruby-gtk2
+DESCRIPTION=A map editor for the game gnocatan
+EAPI=6
+HOMEPAGE=http://yusei.ragondux.com/loisirs_jdp_catane_camato-en.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-ruby/ruby-gtk2
+SLOT=0
+SRC_URI=http://yusei.ragondux.com/files/gnocatan/camato-0_7_4.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=65bf3122ee366cec2c164cd7c6afb12b
diff --git a/games-board/camato/Manifest b/games-board/camato/Manifest
deleted file mode 100644
index 45425ba3b6db..000000000000
--- a/games-board/camato/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST camato-0_7_4.tar.gz 39395 BLAKE2B 673c312f90210e7f1882f821da2c751118052594f537d2a9c1a04ceea4d0ba948487da576b5f3b274c889db48e59dd95228ecfb6d9ec03ebf04a5fb16e13822a SHA512 b355dbaf35716f719ffe5469ec73db791b2b516dc1fc7a36efa735babcd7d16b79d6d0ceea2f1308f79ca98fe7e0a3dfd3e4b3a7a15eb64abbd144aac2c3720d
-EBUILD camato-0.7.4-r1.ebuild 628 BLAKE2B a87978b7c7fcc2729d1bd874e39eeaa570621cd46b520287dfd532e0d625f9d4f5648d1ccc34f81b4ae63b25eec0bc561959d84371f95b527be222c8dd2116ae SHA512 054fcc4e42a3acd454461f19e5abdc7219856ea13bc8cda2e0298c8799e6819612ecd272b59047a93a81101f1bbb1746f8bd5682d3750ec400abcc8befa53991
-MISC metadata.xml 377 BLAKE2B 814daedba56f15d61d2f2ef5c3ef0c30fb21cabd5a9bb7827f2ae3c2ee3caa3082710e18320718b072a75d8b0b53191b8ca331d89e5008148ae78d0307bcc9bc SHA512 b4bc750175585e96b34d96ee7b364ac57c7b2f2628ce7194764298c5440aebf36844d838322079c63f25301a78ca6c3e0257122318645694bfa2d3969963249c
diff --git a/games-board/camato/camato-0.7.4-r1.ebuild b/games-board/camato/camato-0.7.4-r1.ebuild
deleted file mode 100644
index 4a062b440be1..000000000000
--- a/games-board/camato/camato-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV=$(replace_all_version_separators _)
-DESCRIPTION="A map editor for the game gnocatan"
-HOMEPAGE="http://yusei.ragondux.com/loisirs_jdp_catane_camato-en.html"
-SRC_URI="http://yusei.ragondux.com/files/gnocatan/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-ruby/ruby-gtk2"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	default
-
-	rm -f Makefile || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r *.rb img
-	dodoc ChangeLog README
-}
diff --git a/games-board/camato/metadata.xml b/games-board/camato/metadata.xml
deleted file mode 100644
index 23c6b657cb4f..000000000000
--- a/games-board/camato/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>Camato is a map editor for the game gnocatan. It is made with Ruby and the library Ruby-GTK.</longdescription>
-</pkgmetadata>
diff --git a/games-board/ccgo-0.3.6.5-r1 b/games-board/ccgo-0.3.6.5-r1
new file mode 100644
index 000000000000..72450e0a9dc3
--- /dev/null
+++ b/games-board/ccgo-0.3.6.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare
+DEPEND=>=dev-cpp/gconfmm-2.6 >=dev-cpp/gtkmm-2.4:2.4 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=An IGS client written in C++
+EAPI=6
+HOMEPAGE=https://ccdw.org/~cjj/prog/ccgo/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-cpp/gconfmm-2.6 >=dev-cpp/gtkmm-2.4:2.4 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://ccdw.org/~cjj/prog/ccgo/src/ccgo-0.3.6.5.tar.gz
+_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_=440682b9a5dc6d145183d4519e50d9e2
diff --git a/games-board/ccgo/Manifest b/games-board/ccgo/Manifest
deleted file mode 100644
index ed329679fd7f..000000000000
--- a/games-board/ccgo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ccgo-0.3.6.5-gcc4.patch 204 BLAKE2B 7cf7b69699dacb14b03308d5959016eda17ed92cf4da86239e3e37a680c5f2efc3f0417ecc01743c53ec229ca2c808eb7aa417718d60f1961c8ff99667c0d4d8 SHA512 86d8f663e3058076f63526217a15f4c8bdc70dc178d48b26a032c38b1bfe02cad4ce28de08889312cd769e39d927e427b14bbbf2631e3455a7e219fbf49ed95d
-DIST ccgo-0.3.6.5.tar.gz 639238 BLAKE2B a0e67cbfe270c7dd4906e01545310e3a93fcf5ff843c987917df36209846fbae4297e3a6f61b5c321a12ce157bcfb516da0ca28a700ca869944127ac05b1eb68 SHA512 268c228eee9c42e49df333bfa0707e7b72c39731ccd64239e3c426958f6c17b65658db91bc7ab89548c4cc647ade791a7c67c30c410a5b3935c8fd3f326bf36b
-EBUILD ccgo-0.3.6.5-r1.ebuild 1251 BLAKE2B cf3613a2c4cccf481ce2c6678496324b9e6614733440945f21cae6ee8304c689fb9d3452f0bfad4da5c6c8592fa8f05e0d5982eccb8b8013c80425b2eb07ad96 SHA512 5cc52c875a524b59f1f2aa84a6b459e7a70ffe4e0b6a6005753716a36b1bb71b9691554fb7866d9dcae0e908b04c7464b2ed22411f374d0a3c35ffbc89ebcbb1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild b/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
deleted file mode 100644
index 9f19d9aa9e48..000000000000
--- a/games-board/ccgo/ccgo-0.3.6.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils toolchain-funcs flag-o-matic
-
-DESCRIPTION="An IGS client written in C++"
-HOMEPAGE="https://ccdw.org/~cjj/prog/ccgo/"
-SRC_URI="https://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-cpp/gconfmm-2.6
-	>=dev-cpp/gtkmm-2.4:2.4
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc4.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Categories/ { s/Application;//; s/$/GTK;/ }' \
-		ccgo.desktop.in || die
-
-	sed -i \
-		-e '/^localedir/s/=.*/=@localedir@/' \
-		-e '/^appicondir/s:=.*:=/usr/share/pixmaps:' \
-		-e '/^desktopdir/s:=.*:=/usr/share/applications:' \
-		Makefile.am || die
-
-	# cargo cult from bug #569528
-	append-cxxflags -std=c++11 -fpermissive
-
-	find . -name '*.hh' -exec sed -i -e '/sigc++\/object.h/d' {} + || die
-	find . -name '*.cc' -exec sed -i -e 's/(bind(/(sigc::bind(/' {} + || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch b/games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch
deleted file mode 100644
index 79f73863670a..000000000000
--- a/games-board/ccgo/files/ccgo-0.3.6.5-gcc4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/gtk/board.cc
-+++ b/gtk/board.cc
-@@ -20,9 +20,7 @@
-  */
- 
- #include <config.hh>
--extern "C" {
- #include <gettext.h>
--}
- #define _(String) Glib::locale_to_utf8(gettext(String))
- 
- #include <board.hh>
diff --git a/games-board/ccgo/metadata.xml b/games-board/ccgo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/ccgo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/cgoban-1.9.14-r2 b/games-board/cgoban-1.9.14-r2
new file mode 100644
index 000000000000..64eb5f20c6ca
--- /dev/null
+++ b/games-board/cgoban-1.9.14-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/imagemagick-tools x11-libs/libX11 x11-libs/libXt x11-base/xorg-proto >=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 Go-frontend
+EAPI=6
+HOMEPAGE=http://cgoban1.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/imagemagick-tools x11-libs/libX11 x11-libs/libXt
+SLOT=0
+SRC_URI=mirror://sourceforge/cgoban1/cgoban-1.9.14.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_=beb1aef9b42d73e973f9d41428e69a8e
diff --git a/games-board/cgoban/Manifest b/games-board/cgoban/Manifest
deleted file mode 100644
index c08e097d601f..000000000000
--- a/games-board/cgoban/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cgoban-1.9.14-cflags.patch 1053 BLAKE2B c0eaaf1b08fedf89b8eb93e37665f6857b8de6421e4ca8c2c43b318ce7488b2334b88a4b07cecd754fdcb8b0e0bbcf9810fb620df05bf93417a8e0a2efd907be SHA512 fef74fd04ea9001e697f11e615705c45ee8660c905b9049debee88cf13e8657518cbbaba5a814a8874956c305c6c5c73592f62ad9a29389482f9c2bd04b120f7
-DIST cgoban-1.9.14.tar.gz 417691 BLAKE2B e6eb97b5368704f5c431b6439faf8a319a586f911843a906215cbfd2c271bad15b4cd9dd9cc28f5bc43b8f76e6d0b46c2e68cf7fd6a07d63fc9e286f48f7a246 SHA512 0a471845dbfb3029c2371ba91375aa19ca23591f355452d87eeef2ed56e948a60aedb21923658e74923f16b40ce00f5d74f40f44facf93695d20615b874b354c
-EBUILD cgoban-1.9.14-r2.ebuild 720 BLAKE2B 99c7f601d3bba2b6964e8266c2181f007d213942faea501572c8b8fe45e0b0f946dc0cb7e9da5b358dcb9807a5138ea407945da9148e9e2c36ca027c94614df0 SHA512 567ae1af4358e2a0e9d2613bac734aec8b08e66a420b715bf29bb720f5cfbad5fd97308a24d8425e21a04a1d8de9404a72ab1da0d1394b836b93e0f4f036fd51
-MISC metadata.xml 330 BLAKE2B f44eb19307bc266f86ef6579284d24583a973b0885e45a9b146ff453c470aea6f6b3d9b4e3a6610075c3522f45ec56dc96f85eac6b1935e8781ecb4692015514 SHA512 70ecac92daf0c24d24deb6bd6ec575d74b078f0ccd9c88108b99b226ffc78d787786f4b39a7888f75f9373712a3f537c12ecf9bb412f76771aa62d004b95ce56
diff --git a/games-board/cgoban/cgoban-1.9.14-r2.ebuild b/games-board/cgoban/cgoban-1.9.14-r2.ebuild
deleted file mode 100644
index ad2c9a790a3d..000000000000
--- a/games-board/cgoban/cgoban-1.9.14-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils autotools
-
-DESCRIPTION="A Go-frontend"
-HOMEPAGE="http://cgoban1.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cgoban1/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/imagemagick-tools
-	x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cflags.patch
-)
-
-src_prepare() {
-	# ${P}-cflags.patch patches configure.ac, not .in:
-	mv configure.{in,ac} || die
-
-	default
-
-	cp cgoban_icon.png ${PN}.png || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	doicon ${PN}.png
-	make_desktop_entry cgoban Cgoban
-}
diff --git a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch b/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
deleted file mode 100644
index a496dbf0602d..000000000000
--- a/games-board/cgoban/files/cgoban-1.9.14-cflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.ac	2012-09-03 18:34:15.358122626 +0200
-+++ b/configure.ac	2012-09-03 18:35:30.279156534 +0200
-@@ -1,8 +1,9 @@
- #for autoconf 2.1x start configure script with next three lines
- 
- AC_PREREQ(2.13)
--AC_INIT(src/cgoban.c)
--AM_INIT_AUTOMAKE(cgoban, 1.9.14)
-+AC_INIT([cgoban], [1.9.14])
-+AC_CONFIG_SRCDIR([src/cgoban.c])
-+AM_INIT_AUTOMAKE([no-define])
- 
- #for autoconf 2.5x start configure script with next four lines
- # AC_PREREQ(2.50)
---- a/configure.ac	2012-09-03 20:17:48.037549487 +0200
-+++ b/configure.ac	2012-09-03 20:18:00.267371203 +0200
-@@ -146,7 +146,7 @@
- ######################################################################
- 
- export VERSION
--AC_DEFINE_UNQUOTED(VERSION,$VERSION)
-+AC_DEFINE_UNQUOTED(VERSION,["$VERSION"])
- AC_PREFIX_DEFAULT(/usr/games)
- 
- dayNum=`echo $date | awk '{ print $1 }'`
---- a/configure.ac	2012-09-03 20:23:29.174470309 +0200
-+++ b/configure.ac	2012-09-03 20:23:51.895996955 +0200
-@@ -169,7 +169,6 @@
- AC_MINIX
- AC_PROG_CPP
- AC_EXEEXT
--WMS_GET_CFLAGS
- 
- AM_CONFIG_HEADER(configure.h)
- AC_SUBST(LIBS)dnl
diff --git a/games-board/cgoban/metadata.xml b/games-board/cgoban/metadata.xml
deleted file mode 100644
index 2e2e621f06d2..000000000000
--- a/games-board/cgoban/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cgoban1</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/cgoban2-2.6.12-r1 b/games-board/cgoban2-2.6.12-r1
new file mode 100644
index 000000000000..0aae52a50f30
--- /dev/null
+++ b/games-board/cgoban2-2.6.12-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=A Java client for the Kiseido Go Server, and a SGF editor
+EAPI=6
+HOMEPAGE=http://www.gokgs.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=>=virtual/jre-1.3
+SLOT=0
+SRC_URI=mirror://gentoo/cgoban-unix-2.6.12.tar.bz2
+_md5_=3e884225c56e941e2d881b1cd20b500f
diff --git a/games-board/cgoban2/Manifest b/games-board/cgoban2/Manifest
deleted file mode 100644
index 53e5446128d7..000000000000
--- a/games-board/cgoban2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cgoban2 324 BLAKE2B 1f16102f3ded47289ac6fe273b1e3bb96e780ea25a309b6ad77b67d274ed3184adfb0cfffd3306b5f8959acdf9b01781dd3da440b6f6050e7a0256c8343a1056 SHA512 67b89373238fde6c8589719b36af7e08d6bfe42c945265f6416e7f7553cb66f90c70f03d48ab99c8d7d7ef039a93e77d285f29a1af96069201b227a8a1970e4b
-DIST cgoban-unix-2.6.12.tar.bz2 1180638 BLAKE2B 6e2d060fa0494d02549a444f83e52c485c165d7906cf46a6f73bec10cb41d462c17cf89fb314abcc2f3808756862ac36b3ad65a5135c374605c6e4dd52bd9e1c SHA512 70725778ea25d4054d6944a25b512fe247ebc2280395cb0f4ee58e2f3c96dc6405ea3ed2ec03637ea3b3f2d4be470110181b117cedc13fad28bf8f66d146f6a3
-EBUILD cgoban2-2.6.12-r1.ebuild 558 BLAKE2B aa3803bf2c9dc8c20c5cdd42982ef945ac8a71efae350466b7c6d3e8af291ac336268ab69dfa8f30dac5c1bc5adb0b7bce9707876dcbfdcc7af7123a4d2aa390 SHA512 df53ce9d38b331d94e07e717686215e10952067ff07468e236b0633a7b1d46e89d34656d2eaa80622f1c505e7a3dfc67f1e5b6606076414e4fb123be3c41c502
-MISC metadata.xml 247 BLAKE2B 6e885a4bc233754242982df43837c623e79b6e0f9149c9bf81b7ab904ae7f25ef2c1e2657c695f37cd57c2883359a78a09d8c3d1467a90634a857021984bc58d SHA512 fd894fe434a856714537ba8d3dcc8b0ae16889f6b44634e8844143ae15450013d9c4558b2df6215edad3762ebc727d166371b35bcccaa7353426388a04d71216
diff --git a/games-board/cgoban2/cgoban2-2.6.12-r1.ebuild b/games-board/cgoban2/cgoban2-2.6.12-r1.ebuild
deleted file mode 100644
index 4a06481597fd..000000000000
--- a/games-board/cgoban2/cgoban2-2.6.12-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Java client for the Kiseido Go Server, and a SGF editor"
-HOMEPAGE="http://www.gokgs.com/"
-SRC_URI="mirror://gentoo/cgoban-unix-${PV}.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.3"
-
-S=${WORKDIR}/cgoban
-
-src_install() {
-	dodir /usr/bin
-	sed -e "s:INSTALL_DIR:/usr/share/${PN}:" \
-		"${FILESDIR}/${PN}" > "${D}/usr/bin/${PN}" || die
-	insinto /usr/share/${PN}
-	doins cgoban.jar
-}
diff --git a/games-board/cgoban2/files/cgoban2 b/games-board/cgoban2/files/cgoban2
deleted file mode 100644
index db6cd5b371d0..000000000000
--- a/games-board/cgoban2/files/cgoban2
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-which java > /dev/null 2>&1 && \
-	java -jar INSTALL_DIR/cgoban.jar "${@}" && \
-	exit 0
-
-echo "No \"java\" binary found in your PATH."
-echo "You should run \"java-config\" to choose your default VM."
-exit 1
diff --git a/games-board/cgoban2/metadata.xml b/games-board/cgoban2/metadata.xml
deleted file mode 100644
index 8301b92ba307..000000000000
--- a/games-board/cgoban2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/chessx-1.4.6 b/games-board/chessx-1.4.6
new file mode 100644
index 000000000000..0faaae13ed9e
--- /dev/null
+++ b/games-board/chessx-1.4.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib:= dev-qt/linguist-tools:5
+DESCRIPTION=Qt5-based Chess Database Utility
+EAPI=7
+HOMEPAGE=http://chessx.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://sourceforge.net/projects/chessx/files/chessx/1.4.6/chessx-1.4.6.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=efc917ba620b09eb40d6adc88aac0b5f
diff --git a/games-board/chessx/Manifest b/games-board/chessx/Manifest
deleted file mode 100644
index 0bf9dd4cd84d..000000000000
--- a/games-board/chessx/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX chessx-1.4.0-zlib.patch 883 BLAKE2B c03baa883587aac6f8abd6453f011387c772217aad235717b64d31eb97e828c9b7d868c72046c9148850c59b4d1d540b106ceb9f826b451e464c61bb44bba6d9 SHA512 326efb6ab3cca94849a1a89b2c51a18f2a6cb51d38cc11fd59e8d443034350851ffaf28412ba57a53a961900eaee4661b0035d8e7cbab2a1e99ea67eb4e2f2cf
-AUX chessx-1.4.6-qt-5.11.patch 1466 BLAKE2B b8b6fbe49be0f361fd0b19f53b55d75354813e65e286d0b031680f769c284d15d930b3fd5aeffefdae3e406ad4971742d378e04c38f7f249200fbe947a29520e SHA512 eeddea13a179b51f618f68a0505cdae6e3c0614f2c24ab01942df7b7f260e146cdbb1c7dae1efc8dbc9a70aebf11d664a9a9d5c3a0562267c8b9633a05702a1a
-DIST chessx-1.4.6.tgz 4223076 BLAKE2B 783ffe0a7396239066870dedcaa4b2b0c491db4f16871afe66bae7a82339916a8a574401499916fc63cf62478efb9b89c30ec85a7aa7c6d002d1119f1a6b23ef SHA512 cfa74e6423e1a2f9bca319e20645ddf8c8df6b46b64493777ca1cc93037e3f7cfc200f99a29236f7c5925448676c312abf34d395e795e7db6ef8a0832c3a523e
-EBUILD chessx-1.4.6.ebuild 927 BLAKE2B 3d1c8b359efe44451de7200c7b3ef77ec73a334839b3e412681598c6ca082a71cdea3af70c436aad92e84b54bb7d59c435594961486006f104ab79137e5fdcd2 SHA512 c5fbe061d17e9ea7956931262d68560f376c8a1df887b4d9f4e0022815510c9a2cbb14b297d63382aed9de58f840cbfeaca7121de873e454eece139d91594b42
-MISC metadata.xml 329 BLAKE2B 199a6f1de51ae4a4a1104bbd4419200e7440abafe3fc5dfe40eafc08c00449461c71131cfdf1d60a0b8375f575290bbdd0af6355ae10a9259c38728e3065e6cf SHA512 41215eff9af3f31175db0f20dd13574378e4124dda8a1670440897391a5b66423c953471d6e22984dbfb3e0abef8ea3d56fa3690b45c189fae2a3c26560ec1a8
diff --git a/games-board/chessx/chessx-1.4.6.ebuild b/games-board/chessx/chessx-1.4.6.ebuild
deleted file mode 100644
index 87b4a82b974f..000000000000
--- a/games-board/chessx/chessx-1.4.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils
-
-DESCRIPTION="Qt5-based Chess Database Utility"
-HOMEPAGE="http://chessx.sourceforge.net/"
-SRC_URI="https://sourceforge.net/projects/chessx/files/chessx/${PV}/${P}.tgz"
-
-LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-zlib.patch
-	"${FILESDIR}"/${P}-qt-5.11.patch
-)
-
-src_prepare() {
-	default
-	"$(qt5_get_bindir)/lrelease" i18n/* || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin release/${PN}
-	dodoc ChangeLog TODO
-	doicon data/images/${PN}.png
-	domenu unix/chessx.desktop
-}
diff --git a/games-board/chessx/files/chessx-1.4.0-zlib.patch b/games-board/chessx/files/chessx-1.4.0-zlib.patch
deleted file mode 100644
index fe6bfb39d508..000000000000
--- a/games-board/chessx/files/chessx-1.4.0-zlib.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/quazip/ioapi.h
-+++ b/src/quazip/ioapi.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* ioapi.h -- IO base function header for compress/uncompress .zip
-    files using zlib + zip or unzip API
- 
---- a/src/quazip/unzip.c
-+++ b/src/quazip/unzip.c
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* unzip.c -- IO for uncompress .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
---- a/src/quazip/unzip.h
-+++ b/src/quazip/unzip.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* unzip.h -- IO for uncompress .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
---- a/src/quazip/zip.c
-+++ b/src/quazip/zip.c
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* zip.c -- IO on .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
---- a/src/quazip/zip.h
-+++ b/src/quazip/zip.h
-@@ -1,3 +1,4 @@
-+#define OF(x) x
- /* zip.h -- IO for compress .zip files using zlib
-    Version 1.01e, February 12th, 2005
- 
diff --git a/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch b/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
deleted file mode 100644
index 379de8836b94..000000000000
--- a/games-board/chessx/files/chessx-1.4.6-qt-5.11.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Luigi Baldoni <aloisio@gmx.com>
-Date: 2018-06-18 13:16:31 +0200
-Subject: Add missing include statements
-References: https://sourceforge.net/p/chessx/bugs/254
-Upstream: submitted
-
-A few explicit include statements are required with Qt 5.11
----
-Index: chessx-1.4.6/src/gui/gamewindow.cpp
-===================================================================
---- chessx-1.4.6.orig/src/gui/gamewindow.cpp
-+++ chessx-1.4.6/src/gui/gamewindow.cpp
-@@ -9,6 +9,7 @@
- #include "settings.h"
- 
- #include <QToolButton>
-+#include <QAction>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)
- #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
-Index: chessx-1.4.6/src/dialogs/savedialog.cpp
-===================================================================
---- chessx-1.4.6.orig/src/dialogs/savedialog.cpp
-+++ chessx-1.4.6/src/dialogs/savedialog.cpp
-@@ -24,6 +24,7 @@
- 
- #include <QLineEdit>
- #include <QCompleter>
-+#include <QButtonGroup>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)
- #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
-Index: chessx-1.4.6/src/dialogs/preferences.cpp
-===================================================================
---- chessx-1.4.6.orig/src/dialogs/preferences.cpp
-+++ chessx-1.4.6/src/dialogs/preferences.cpp
-@@ -33,6 +33,7 @@
- #include <QFileDialog>
- #include <QDesktopServices>
- #include <QTextStream>
-+#include <QAction>
- 
- #if defined(_MSC_VER) && defined(_DEBUG)
- #define DEBUG_NEW new( _NORMAL_BLOCK, __FILE__, __LINE__ )
diff --git a/games-board/chessx/metadata.xml b/games-board/chessx/metadata.xml
deleted file mode 100644
index c641094b989e..000000000000
--- a/games-board/chessx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">chessx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/cockatrice-20170505 b/games-board/cockatrice-20170505
new file mode 100644
index 000000000000..08d1469e5734
--- /dev/null
+++ b/games-board/cockatrice-20170505
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libgcrypt:0 dev-libs/protobuf dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtprintsupport:5 dev-qt/qtcore:5 client? ( dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtsvg:5 ) oracle? ( sys-libs/zlib ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=An open-source multiplatform software for playing card games over a network
+EAPI=6
+HOMEPAGE=https://github.com/Cockatrice/Cockatrice
+IUSE=server +client +oracle
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://github.com/Cockatrice/Cockatrice/archive/2017-05-05-Release-2.3.17.tar.gz -> cockatrice-20170505.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4727b0c35f1b30ad66c57803f5cfecba
diff --git a/games-board/cockatrice/Manifest b/games-board/cockatrice/Manifest
deleted file mode 100644
index f67526750451..000000000000
--- a/games-board/cockatrice/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cockatrice-20170505.tar.gz 7340644 BLAKE2B da3503f5ac02d0a03d59c719af82926e693fc3f2028d096c2b1d8d5145c62439f68e88379281e224d812405b39520e34476a6fd1df75f8202adc463f6ea8b3f8 SHA512 7cf319af46e4e2bd59428cf6635eeefebe70695adb445b24a727050abbc64124c17654ac058429b88a99f09f77639c15f8100d107ee8f54cad2bf0dec7051aa5
-EBUILD cockatrice-20170505.ebuild 1249 BLAKE2B 5447fab0e293d71ec4d92697f91366559cbee58493723348e8f0c8ebb23588a8fab71feaecc50532aea3670924fc598aef9e92f31ddea55d94c09b14db43170b SHA512 d6a722d0325ed0290bb18e44e801a2322ec573a7bc92c41c46c10f4d8f3d2a4984a216a26d4a6fed4f7650be32cd8a9e6af0742017616a3c9536a8306d0d45d8
-MISC metadata.xml 1187 BLAKE2B b04809289e20d3d8e98c474cf7673c4620ee337edaf7a61b94fdb0e56a1957b459350032a725a25bce4fd262768bb1f09937320450902966698d6140978a9656 SHA512 cc3711f5230ae38cdeca3da9d1ed9f23a71f4790567433fc1a60e5035412c2259633fb3a5200d248b0247bc282903fa0f2e8d741900bde1b990ef0ce56f38b0b
diff --git a/games-board/cockatrice/cockatrice-20170505.ebuild b/games-board/cockatrice/cockatrice-20170505.ebuild
deleted file mode 100644
index a8edee2cae16..000000000000
--- a/games-board/cockatrice/cockatrice-20170505.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils gnome2-utils
-
-DESCRIPTION="An open-source multiplatform software for playing card games over a network"
-HOMEPAGE="https://github.com/Cockatrice/Cockatrice"
-SRC_URI="${HOMEPAGE}/archive/2017-05-05-Release-2.3.17.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="server +client +oracle"
-
-DEPEND="
-	dev-libs/libgcrypt:0
-	dev-libs/protobuf
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtcore:5
-	client? (
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtsvg:5 )
-	oracle? (
-		sys-libs/zlib
-	)"
-
-# As the default help/about display the sha1 we need it
-SHA1='c96f234'
-
-S=${WORKDIR}/"Cockatrice-2017-05-05-Release-2.3.17"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CLIENT=$(usex client)
-		-DWITH_ORACLE=$(usex oracle)
-		-DWITH_SERVER=$(usex server)
-		-DICONDIR="/usr/share/icons"
-		-DDESKTOPDIR="/usr/share/applications" )
-
-	# Add date in the help about, come from git originally
-	sed -i 's/^set(PROJECT_VERSION_FRIENDLY.*/set(PROJECT_VERSION_FRIENDLY \"'${SHA1}'\")/' cmake/getversion.cmake || die "Sed failed!"
-	cmake-utils_src_configure
-}
diff --git a/games-board/cockatrice/metadata.xml b/games-board/cockatrice/metadata.xml
deleted file mode 100644
index 4b7993356215..000000000000
--- a/games-board/cockatrice/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>brukie@gmx.net</email>
-			<name>Max-Wilhelm Bruker</name>
-		</maintainer>
-		<changelog>https://github.com/mbruker/Cockatrice/commits/master</changelog>
-		<doc lang="en">http://cockatrice.de/dokuwiki/doku.php</doc>
-		<bugs-to>https://github.com/mbruker/Cockatrice/issues</bugs-to>
-		<remote-id type="github">Cockatrice/cockatrice</remote-id>
-	</upstream>
-	<use>
-		<flag name="server">Compile server support</flag>
-		<flag name="oracle">Build with oracle</flag>
-		<flag name="client">Build with client</flag>
-	</use>
-	<longdescription lang="en">
-		Cockatrice is an open-source multiplatform software for playing card
-		games, such as Magic: The Gathering, over a network. It is fully
-		client-server based to prevent any kind of cheating, though it supports
-		single-player games without a network interface as well. Both client
-		and server are written in Qt 4.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-board/crafty-24.1-r1 b/games-board/crafty-24.1-r1
new file mode 100644
index 000000000000..497125cc013f
--- /dev/null
+++ b/games-board/crafty-24.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Bob Hyatt's strong chess engine
+EAPI=6
+HOMEPAGE=http://www.craftychess.com/
+IUSE=no-opts
+KEYWORDS=~amd64 ~x86
+LICENSE=crafty
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.craftychess.com/crafty-24.1.zip http://www.cis.uab.edu/hyatt/crafty/source/crafty-24.1.zip ftp://ftp.cis.uab.edu/pub/hyatt/documentation/crafty.doc.ascii
+_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_=5c2e23e3cd2356d3a0812a7344ad4da9
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
deleted file mode 100644
index 2a0e0b66492d..000000000000
--- a/games-board/crafty/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX crafty-24.1-numcpus.patch 1564 BLAKE2B 9796e2bb0363500deabd703a64243fe8a771e072dc7e95ddc3e2e50f0c8aec67995c768d69b802213d640cf63aa32a8bb764b15993af414a4770cf07119196ff SHA512 303942f906b0ddedd1f2d2ab2c6808877c793dbc58d5f866c1af9823509fe08085d81cb3ed44f9663fa56aadc6b96a0fa4fbfde0b5ff9f53f1a235185faa2cbf
-DIST crafty-24.1.zip 442680 BLAKE2B a6f2e00e4ce3882b7548ff401eab122a102c3504b640ff6adeba58727fcc06b029ac5e49cc120d5ce394e883cb0f6c12fcb59bb82efd0789c61777f7dc13569d SHA512 4d8088aeb683d69e3ea5e01194eb0dc9b957049823c7f8a1f28686e601f9f270b829319083a8b8170016bfda36a42c592a94b4429d7c4f35a6351fd469f16124
-DIST crafty.doc.ascii 79678 BLAKE2B 776f5b141fa7982af7d95d32da4f1b2acd39794f530616fbfce828e5b5acdd094b83573da0ac684b3fe95462a453d50853dd211c5fff66b4cf99626716547696 SHA512 562698c3954e53f05c009025291bdb748baaa08616437796a08b42198057cff9f9efa7a8caf41574e71dafe60f4c132dc9497ad5ed9a83b8f071d1c31c8583b8
-EBUILD crafty-24.1-r1.ebuild 2047 BLAKE2B 5d7a1a12f2bc7e3bdd48f749c8ec366b413a839e3f49c765682d84681c1839d8ea0ec5ab390e295a2610a626af3e4705117d3b38e36c6fd0a010c440382f3d36 SHA512 a924129a809aa4f6bf38298693a4f96419a3485a9916c776228883a2918f64a8c11cdc318aaf65075953ced7cee85b7b5790319c0148fcb00206956f620b9f9d
-MISC metadata.xml 348 BLAKE2B 0553d91a61ec7b5f0fe5a67b6934b340e88030210d9b105d7f74e9599412a2f855c8b3cfd145c0bf428a0d19463eaeb97cf10aea75b1570db5b788749a0a9d36 SHA512 dac102e7447ff6f41ab290b7e59dfc9a97b2614e8f977f97a54ef1d5d616e8f22cc83607d3f9803693b59b98ecb175dcd527dcc78519451770e80f0a9cf6ed27
diff --git a/games-board/crafty/crafty-24.1-r1.ebuild b/games-board/crafty/crafty-24.1-r1.ebuild
deleted file mode 100644
index 906629747c2b..000000000000
--- a/games-board/crafty/crafty-24.1-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Bob Hyatt's strong chess engine"
-HOMEPAGE="http://www.craftychess.com/"
-SRC_URI="http://www.craftychess.com/${P}.zip
-	http://www.cis.uab.edu/hyatt/crafty/source/${P}.zip
-	ftp://ftp.cis.uab.edu/pub/hyatt/documentation/${PN}.doc.ascii"
-
-LICENSE="crafty"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="no-opts"
-RESTRICT="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/-o crafty/s/CC/CXX/' \
-		-e 's:CXFLAGS:CXXFLAGS:g' \
-		-e 's:-j ::g' \
-		Makefile || die
-	sed -i \
-		-e "s:\"crafty.hlp\":\"/usr/share/${PN}/crafty.hlp\":" option.c || die
-	eapply "${FILESDIR}"/${P}-numcpus.patch
-}
-
-src_compile() {
-	local makeopts="target=UNIX"
-
-	if ! use no-opts ; then
-		if [[ $(tc-getCC) = icc ]] ; then
-			makeopts="${makeopts} asm=X86.o"
-			append-cppflags -D_REENTRANT -tpp6 \
-				-DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
-				-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B -DFAST \
-				-DSMP -DCPUS=4 -DCLONE -DDGT
-			append-flags -O2 -fno-alias -fforce-mem \
-				-fomit-frame-pointer -fno-gcse -mpreferred-stack-boundary=2
-		else
-			if [[ "${CHOST}" == "i686-pc-linux-gnu" ]] \
-			|| [[ "${CHOST}" == "i586-pc-linux-gnu" ]] ; then
-				append-cppflags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
-					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
-					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
-				append-flags -fno-gcse \
-					-fomit-frame-pointer -mpreferred-stack-boundary=2
-			elif [[ "${CHOST}" == "x86_64-pc-linux-gnu" ]] ; then
-				append-cppflags -DCOMPACT_ATTACKS -DUSE_ATTACK_FUNCTIONS \
-					-DUSE_ASSEMBLY_A -DUSE_ASSEMBLY_B \
-					-DFAST -DSMP -DCPUS=4 -DCLONE -DDGT
-				append-flags -fomit-frame-pointer
-			else
-				: # everything else :)
-			fi
-		fi
-	fi
-	append-cppflags -DPOSIX -DSKILL
-	emake ${makeopts} crafty-make LDFLAGS="${LDFLAGS} -pthread"
-}
-
-src_install() {
-	dobin crafty
-	insinto "/usr/share/${PN}"
-	doins crafty.hlp
-	dodoc "${DISTDIR}"/crafty.doc.ascii
-}
diff --git a/games-board/crafty/files/crafty-24.1-numcpus.patch b/games-board/crafty/files/crafty-24.1-numcpus.patch
deleted file mode 100644
index 14365cede2a0..000000000000
--- a/games-board/crafty/files/crafty-24.1-numcpus.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ru crafty-24.1.org/lock.h crafty-24.1/lock.h
---- crafty-24.1.org/lock.h	2015-03-10 16:24:09.064539177 +0100
-+++ crafty-24.1/lock.h	2015-03-10 17:45:37.675995497 +0100
-@@ -42,6 +42,7 @@
-  *                                                                             *
-  *******************************************************************************
-  */
-+#    if defined(__i386__) || defined(__amd64__)
- static void __inline__ LockX86(volatile int *lock) {
-   int dummy;
-   asm __volatile__(
-@@ -71,17 +72,26 @@
-       :"memory");
- }
- 
--#    define LockInit(p)           (p=0)
--#    define LockFree(p)           (p=0)
--#    define Unlock(p)             (UnlockX86(&p))
--#    define Lock(p)               (LockX86(&p))
--#    define lock_t                volatile int
--#  endif
-+#      define LockInit(p)           (p=0)
-+#      define LockFree(p)           (p=0)
-+#      define Unlock(p)             (UnlockX86(&p))
-+#      define Lock(p)               (LockX86(&p))
-+#      define lock_t                volatile int
-+#    else /* Not building for x86 or amd64 platforms */
-+#      define LockInit(p)
-+#      define LockFree(p)
-+#      define Lock(p)
-+#      define Unlock(p)
-+#      define Pause()
-+#      define lock_t volatile int
-+#    endif /* x86 && amd64 platforms or rest of the world. */
-+#  endif                          /*  SMP code */
- #else
- #  define LockInit(p)
- #  define LockFree(p)
- #  define Lock(p)
- #  define Unlock(p)
-+#  define Pause()
- #  define lock_t volatile int
- #endif                          /*  SMP code */
- /* *INDENT-ON* */
diff --git a/games-board/crafty/metadata.xml b/games-board/crafty/metadata.xml
deleted file mode 100644
index a8ab91531634..000000000000
--- a/games-board/crafty/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="no-opts">Don't try to enable crazy CFLAG options</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-board/domination-1.1.1.6-r1 b/games-board/domination-1.1.1.6-r1
new file mode 100644
index 000000000000..82efa1e92d8d
--- /dev/null
+++ b/games-board/domination-1.1.1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=The well-known board game, written in java
+EAPI=5
+HOMEPAGE=http://domination.sourceforge.net
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/domination/Domination_1.1.1.6.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d74338c88afc468e983379f2f0782e45
diff --git a/games-board/domination/Manifest b/games-board/domination/Manifest
deleted file mode 100644
index 3cff1209ba7c..000000000000
--- a/games-board/domination/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Domination_1.1.1.6.zip 6567410 BLAKE2B 5868011017c9aae937d3d21c8568a541a5170a716c6762e2802e5fdb34a31dd7c4c61a0670278b211e6227f42bc996a81547b04d71533c83dfb2f6045dd190cb SHA512 46f4499f285f86cf94914ef62b25a52aa3b9848721c24900ec172f9b41d846dab07e288c564321486d451caee6049b4f4cb0ab475e378aa6df670e656b5b1fe6
-EBUILD domination-1.1.1.6-r1.ebuild 981 BLAKE2B 024a7349183b49b8c16ea63b0103556da37eaa9dd7573b7ddb045ff2ccb1c17fbead0528c906243f001598ce4a30312537e09cb9a2c9687bedf7f4adf7baea0c SHA512 76eecb9f95131f351ef5440d5c942c49c9c58f32fc21a99f842a66f00799b51bfd41ebfee0fb7bd217db0f31a2c8cdcec4fd60d082110a45b16a920a01503720
-MISC metadata.xml 333 BLAKE2B 2064b61753a5170ad5958694ca7f3e23c53df711aa092e21f920834390a95691b1363a7fe6dade20f9724fe3e6a0968ca9ef30364993ce56731f1bb22750faa8 SHA512 1ced4b2460bea74b56f982156c0088c43f26ae33459771ceb6cf904e8957a4c3bb46c16dbd3de20d9aa9b3b816aeb3e1a741b74a1f246e823d17ae78cb6cca24
diff --git a/games-board/domination/domination-1.1.1.6-r1.ebuild b/games-board/domination/domination-1.1.1.6-r1.ebuild
deleted file mode 100644
index 75932d0ed60d..000000000000
--- a/games-board/domination/domination-1.1.1.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="The well-known board game, written in java"
-HOMEPAGE="http://domination.sourceforge.net"
-SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-
-S=${WORKDIR}/Domination
-
-EANT_BUILD_TARGET="game"
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	newbin "${S}"/FlashGUI.sh ${PN}
-	sed -i \
-		-e "s|cd.*|cd \"/usr/share\"/${PN}|" \
-		"${D}/usr/bin"/${PN} \
-		|| die
-	chmod +x "${D}/usr/bin"/${PN} || die
-
-	insinto "/usr/share/${PN}"
-	doins -r "${S}"/*
-	rm -f "${D}/usr/share"/${PN}/*.cmd || die
-	java-pkg_regjar "${D}//usr/share/${PN}"/*.jar
-
-	newicon resources/icon.png ${PN}.png
-	make_desktop_entry ${PN} "Domination"
-}
diff --git a/games-board/domination/metadata.xml b/games-board/domination/metadata.xml
deleted file mode 100644
index a3bf00dd794f..000000000000
--- a/games-board/domination/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">domination</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/eboard-1.1.1-r2 b/games-board/eboard-1.1.1-r2
new file mode 100644
index 000000000000..982e6fa642ee
--- /dev/null
+++ b/games-board/eboard-1.1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libpng:0= x11-libs/gtk+:2 dev-lang/perl virtual/pkgconfig
+DESCRIPTION=chess interface for POSIX systems
+EAPI=6
+HOMEPAGE=http://www.bergo.eng.br/eboard/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:0= x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2 mirror://sourceforge/eboard/eboard-extras-1pl2.tar.gz mirror://sourceforge/eboard/eboard-extras-2.tar.gz mirror://debian/pool/main/e/eboard/eboard_1.1.1-4.1.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=04c7d49219d2b290e7596e06d27f35a4
diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
deleted file mode 100644
index 1eed9a8242c4..000000000000
--- a/games-board/eboard/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX eboard-1.1.1-as-needed.patch 726 BLAKE2B 658dabc65b610d4a618ef9e5729c8616904abc6c231495f5c3c10b0c8e476699bb119db632c2a36ff3be8386b848bb25f12b8fda3e165ebc162ea2da716d68d6 SHA512 03543a8439eec92169fdc97adffb6f258332593240904636f69fe46d6cca89c63069ac794c9c2d66df64a3e0da579c89f6d5e6944afda10f7b4760da370ca6d9
-AUX eboard-1.1.1-gcc44.patch 186 BLAKE2B e07e005b9cd99fef312baeee5d1d996e51c9c371bd8ff2898e8ebdc48f477e5ea90eb49e047d4a6d6369fd791d0a8c5f3a8d1b49f4c0e98264b1634c203688ab SHA512 74642d5990750fe66b04500d76917c08ba20d387bd86f93b2743881834954e6a2a4eb6c2d1030db620aab2f8754daded3f04140acdc11286bb75c5a7c20aa145
-AUX eboard-1.1.1-libpng15.patch 359 BLAKE2B 23c46aadd1d7e62a7a0c02b0baaf481072f922cd07f8efc455f53f55566b221bc43f943b9add694e4333488b5cb3edb76e9310dfeefd073f539b62d99f94ada5 SHA512 20be6a1173314aec40cd5cb84d759699160dd3542aebe554833c4a8b00c44198ecb72b087fb9f828b972f2c2fa35f47853d1a02af20b280d1c41dfccc3cd6599
-AUX eboard-1.1.1-ovflfix.patch 853 BLAKE2B 3f4aca968eb831227ea369a5e0a0d8091c44bfa7885da2f9e39678a1d25daa4ba7abfbbe6a1e90dc0b440769185f276e536bffaf5ae2343d099f7bef530e748f SHA512 8a2e479d0339516269fa407d6ec84da042aab786f6672ee4dc6d6ac60f9524cd32739fd2e75c0271fba601c852b195bac7017c8226e4a2dd97bf3f4ed47d13a4
-DIST eboard-1.1.1.tar.bz2 462386 BLAKE2B 93d702b24cd647029e50389eab8a1d34ef564d16e426534d925e4bc9596ed7c1055a6c519280580e19a26ae5c3c316030fa950b129e6c4e8f425d3708683826c SHA512 0e124abc786996070464c3d9ef5eafa107b990df7593d774bf302e01e0d07427f2a67bc33ab61a188d2902aa35abb8cec6356e4e088f4a6b40e189556b588704
-DIST eboard-extras-1pl2.tar.gz 361237 BLAKE2B b82911ea1cc4106f50ccc6a678ca0291d6b92549c2ac9890a29e6ff25b20bb436a60d254493279d9ef81503d57edab35423c18b4762066f851844507e254fcf7 SHA512 82243ef37c655d0a5d4bce9655be9b7cba35f4fe4e4edf9951a61baf5e2e0816cb3d8dea95ed61ed4d9fb9242fd31efeec498e055c2f0e2500acb3c7699b4555
-DIST eboard-extras-2.tar.gz 598909 BLAKE2B 4c1696bfd6fd6dd8926d38ea4c349b9f76ae8f1c00152ba69a54f5d58e286432ee50c0f7395eeafbd49905a15b7e6a46e97693d07e1c12a08de19d3bf8827d2b SHA512 e936a4a847b46c057677c0304dde41f0d365cc5f4bd23db39acdb45c6cb53d48fdc188e4f471ef4938a361e7f823c8c391c2b0324c290e1f2d8b5cfe430bb19b
-DIST eboard_1.1.1-4.1.diff.gz 17247 BLAKE2B 282cb7602d82e512ad8378ecf7e9bca54f539a65c85244a2455f2ac3d882897c7911ca5a94e0df5c3fb26a74bacf6ed6ab840435509e83fc07ada5e57b89259f SHA512 8856a69a2bad8639f38d7da97d7b2464f97101c4c2e38a340f5f8dabacbcc9aa12b200f2b669fc98134655f8c7f6d5b79fb3d5f3582135ef9a9b1fd0917c3e4f
-EBUILD eboard-1.1.1-r2.ebuild 1601 BLAKE2B 609fe6c2bb5759ed0a13c8933e60029c8f317021f3622e7f7968557f1ac391e8d8538618469cd5ff6df90f7e4e6118bf292763eab4ed42b03bd354be37062f3b SHA512 86f6a5c92c6143d89cad02a3a9f55ac7d667164fd7c5f2ccda2deabadee27d23b704e6cc54e9869d2b7125e148f3f93f641cb74f4eca1b5d2fa9eeefb17375b1
-MISC metadata.xml 329 BLAKE2B 596a8bbc8fd0317bd18db02f1184fa5d5c9edf8189f095836b329305da0bc2ddf5def4a80b0090c58661bc69aba7cab729655a26a7b4831f30c1487453bd8b5c SHA512 291c53cc59c042c10161d9bd7792899796e58dbe3800962f9155c8b8ea88519b9278f7541a85772cd3425ba15641897392a02451467424e8b59d9e7205f33635
diff --git a/games-board/eboard/eboard-1.1.1-r2.ebuild b/games-board/eboard/eboard-1.1.1-r2.ebuild
deleted file mode 100644
index b1bc8ad5f823..000000000000
--- a/games-board/eboard/eboard-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DEB_V=${PV}-4.1
-EXTRAS1="eboard-extras-1pl2"
-EXTRAS2="eboard-extras-2"
-DESCRIPTION="chess interface for POSIX systems"
-HOMEPAGE="http://www.bergo.eng.br/eboard/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://sourceforge/${PN}/${EXTRAS1}.tar.gz
-	mirror://sourceforge/${PN}/${EXTRAS2}.tar.gz
-	mirror://debian/pool/main/e/eboard/${PN}_${DEB_V}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	media-libs/libpng:0=
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}_${DEB_V}.diff
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-gcc44.patch
-	"${FILESDIR}"/${P}-ovflfix.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" \
-		configure || die
-}
-
-src_configure() {
-	./configure \
-		--compiler="$(tc-getCXX)" \
-		--prefix="/usr" \
-		--data-prefix="/usr/share" \
-		--man-prefix="/usr/share/man" \
-		--extra-libs="dl" \
-		$(use_enable nls) || die # not an autoconf script
-}
-
-src_install() {
-	default
-	dodoc Documentation/*.txt
-
-	newicon icon-eboard.xpm ${PN}.xpm
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	cd "${WORKDIR}"/${EXTRAS1}
-	insinto /usr/share/${PN}
-	doins *.png *.wav
-	newins extras1.conf themeconf.extras1
-	newdoc ChangeLog Changelog.extras
-	newdoc README README.extras
-	dodoc CREDITS
-
-	cd "${WORKDIR}"/${EXTRAS2}
-	doins *.png *.wav
-	newins extras2.conf themeconf.extras2
-}
diff --git a/games-board/eboard/files/eboard-1.1.1-as-needed.patch b/games-board/eboard/files/eboard-1.1.1-as-needed.patch
deleted file mode 100644
index 199dd0e70a2d..000000000000
--- a/games-board/eboard/files/eboard-1.1.1-as-needed.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/configure	2009-02-03 14:46:21.000000000 +0100
-+++ b/configure	2009-02-03 14:48:13.000000000 +0100
-@@ -638,7 +638,7 @@
- 
- print CONFIGMAKE "CXX       = $cxx\n";
- print CONFIGMAKE "CXXFLAGS  = @cxxflags\n";
--print CONFIGMAKE "LDFLAGS   = @ldflags\n";
-+print CONFIGMAKE "LDLIBS    = @ldflags\n";
- 
- print CONFIGMAKE "prefix    = \${DESTDIR}$prefix\n";
- print CONFIGMAKE "bindir    = \${DESTDIR}$prefix/bin\n";
---- a/elifekam	2009-02-03 14:48:43.000000000 +0100
-+++ b/elifekam	2009-02-03 14:48:58.000000000 +0100
-@@ -24,7 +24,7 @@
- all: eboard nls-dicts
- 
- eboard: $(OBJS)
--	$(CXX) $(LDFLAGS) -o eboard $(OBJS)
-+	$(CXX) $(LDFLAGS) -o eboard $(OBJS) $(LDLIBS)
- 
- .cc.o: $< $(HEADERS) $(XPMS)
- 	$(CXX) $(CXXFLAGS) -c $< -o $@
diff --git a/games-board/eboard/files/eboard-1.1.1-gcc44.patch b/games-board/eboard/files/eboard-1.1.1-gcc44.patch
deleted file mode 100644
index 60e7d81fcdb2..000000000000
--- a/games-board/eboard/files/eboard-1.1.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/ntext.cc
-+++ b/ntext.cc
-@@ -244,7 +244,7 @@
-     return;
-   }
- 
--  p = strchr(text, '\n');
-+  p = strchr((char *)text, '\n');
-   if (p!=NULL) {
-     *p = 0;
-     i = strlen(text);
diff --git a/games-board/eboard/files/eboard-1.1.1-libpng15.patch b/games-board/eboard/files/eboard-1.1.1-libpng15.patch
deleted file mode 100644
index cd0ccf8b4f20..000000000000
--- a/games-board/eboard/files/eboard-1.1.1-libpng15.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/cimg.cc
-+++ b/cimg.cc
-@@ -94,11 +95,11 @@
-       ct == PNG_COLOR_TYPE_GRAY_ALPHA)
-     png_set_gray_to_rgb(pngp);
- 
--  alloc(pngp->width,pngp->height);
-+  alloc(width,height);
-   if (!ok) { fclose(f); return; }
-   ok = 0;
- 
--  for(i=0;i<pngp->height;i++) {
-+  for(i=0;i<height;i++) {
-     png_read_row(pngp, (png_bytep) (&data[i*rowlen]), NULL);
-   }
- 
diff --git a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch b/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
deleted file mode 100644
index b09c4dba880f..000000000000
--- a/games-board/eboard/files/eboard-1.1.1-ovflfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/proto_xboard.cc	2010-11-03 16:42:15.000000000 +0100
-+++ b/proto_xboard.cc	2010-11-03 16:43:14.000000000 +0100
-@@ -1084,7 +1084,7 @@
-   snprintf(EngineCommandLine,512,"crafty bookpath=%s logpath=%s tbpath=%s",
- 	   BookPath,LogPath,LogPath);
-   if (!global.env.Home.empty())
--    snprintf(EngineRunDir,512,"%s/.eboard/craftylog",global.env.Home.c_str());
-+    snprintf(EngineRunDir, sizeof(EngineRunDir), "%s/.eboard/craftylog", global.env.Home.c_str());
-   else
-     strcpy(EngineRunDir,"/tmp");
- 
---- a/util.cc	2010-11-03 16:42:24.000000000 +0100
-+++ b/util.cc	2010-11-03 16:43:42.000000000 +0100
-@@ -783,7 +783,7 @@
-   int i,n;
-   char cmd[1024];
- 
--  n = snprintf(tmpfile,1024,"/tmp/eb%d-%s",(int) getpid(), origfile);
-+  n = snprintf(tmpfile, sizeof(tmpfile), "/tmp/eb%d-%s", (int) getpid(), origfile);
- 
-   if (n >= 1024) {
-     failure = 1;
diff --git a/games-board/eboard/metadata.xml b/games-board/eboard/metadata.xml
deleted file mode 100644
index c8530dc77a64..000000000000
--- a/games-board/eboard/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">eboard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/four-in-a-row-3.22.2 b/games-board/four-in-a-row-3.22.2
new file mode 100644
index 000000000000..0d538384ba75
--- /dev/null
+++ b/games-board/four-in-a-row-3.22.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.13.2:3 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Make lines of the same color to win
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Four-in-a-row
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.13.2:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/four-in-a-row/3.22/four-in-a-row-3.22.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4becf07d4f3506bd2fe3d0bb550a2821
diff --git a/games-board/four-in-a-row/Manifest b/games-board/four-in-a-row/Manifest
deleted file mode 100644
index 221df69a364d..000000000000
--- a/games-board/four-in-a-row/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST four-in-a-row-3.22.2.tar.xz 1783804 BLAKE2B e4e176fe73dfda5152d53b83de6f645bbf7595b7bb7795546e2a093ea5a6de1ab778cb1bc7a91a6a5871aa60a16f570e93305a17359c6dc42c85acd0fd7da72b SHA512 07b77bd7f9e2dd86a38721261805397462637dbc4ed4d30f4e6489215621eadf8f1dd545d75db43998dcbd7918b1d7bf29a360e5abc6d661db6c867c78a2eb6c
-EBUILD four-in-a-row-3.22.2.ebuild 666 BLAKE2B 04989cd8e333a2a577b39207544740932b32a05f0d116658188d3d543189abfd25b9a293f7f5b1a38f44bbd8e03fb07257b76800c3c278d50b66c8faef13597e SHA512 44ee1f18fea66af03113f5fbe6a2d0e71a73dd3c3fcea6ad4648181b74614533701d5fa7cabed84a5948ee037786d6bec7220636ad1543ce471db8f26311607e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/four-in-a-row/four-in-a-row-3.22.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.22.2.ebuild
deleted file mode 100644
index 0ed42842108f..000000000000
--- a/games-board/four-in-a-row/four-in-a-row-3.22.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Make lines of the same color to win"
-HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
-
-# Code is GPL-2+ but most themes are GPL-3+ and we install them unconditionally, CC-BY-SA-3.0 is user help license in v3.22.1
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
diff --git a/games-board/four-in-a-row/metadata.xml b/games-board/four-in-a-row/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-board/four-in-a-row/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/freedoko-0.7.16 b/games-board/freedoko-0.7.16
new file mode 100644
index 000000000000..9f054f2a56da
--- /dev/null
+++ b/games-board/freedoko-0.7.16
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
+DEPEND=net? ( net-libs/gnet dev-libs/glib:2 ) >=dev-cpp/gtkmm-2.4:2.4 app-arch/unzip virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=FreeDoko is a Doppelkopf-game
+EAPI=6
+HOMEPAGE=http://free-doko.sourceforge.net
+IUSE=+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=net? ( net-libs/gnet dev-libs/glib:2 ) >=dev-cpp/gtkmm-2.4:2.4
+SLOT=0
+SRC_URI=mirror://sourceforge/free-doko/FreeDoko_0.7.16.src.zip backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> freedoko-backgrounds.zip ) kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip ) xskatcards? ( mirror://sourceforge/free-doko/xskat.zip ) pysolcards? ( mirror://sourceforge/free-doko/pysol.zip ) gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip ) openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip ) !xskatcards? ( !kdecards? ( !gnomecards? ( !openclipartcards? ( !pysolcards? ( mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=235c3766bd2bcde105ab5580d471b728
diff --git a/games-board/freedoko/Manifest b/games-board/freedoko/Manifest
deleted file mode 100644
index 8fe216a56b4b..000000000000
--- a/games-board/freedoko/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX freedoko-0.7.16-gentoo.patch 1233 BLAKE2B aed41cd99a5031a81c8566e4ce0055015e11bd68b7e5c195577deb6cfe228077ab3be0060a2d9881829319b3bd83b3618f0a50a2f1e9abb3c64bd8ffdc743683 SHA512 2ee93baa654050af04cea885a5d170933b94f777da669a72b66bfcff7d0a82e7347b58ffcb4966b52b40117f6cc8fc5dc9e0391638184f49f76b954e08a4796d
-DIST FreeDoko_0.7.16.src.zip 21763114 BLAKE2B a02e562badef67d596a5652a384022c0d7e86af766bdde35ce6fa18b212142a6f9008e3f702bdb571efc20cbbbaf1ebf61633a0e09fa97ed7bb5798268daaf34 SHA512 5a656539a6d8b06873532a32869a54a3cab68532b7ee8eb526e92c378ded957478e71ff5c2b1b5674f9433bb62adf2e94bdcf2d3ce13ffc7d846f268adbce314
-DIST freedoko-backgrounds.zip 1067740 BLAKE2B 1f4485007bc78c3d7d497ba556a9f7bf0ff121a228e9d938ee000a12bd3921eef14c40cfbc6806b95c5905bff3f8e823b56c5fc110b290719a0771351f985d5c SHA512 66f118a5440b854c7ad4b1bdfd63e7f3bc16e66c921a6f632637269ca8855a6a45eb05a71bfb9105abda20285e35994ff3c9c50649f70ab6de4a082e092c3a14
-DIST gnome-games.zip 3338038 BLAKE2B cc2ddb0abfcc1557addf896d15daf00150ec08d7bd75ae9c4fdf1e4cd6e5d126e9dcd5e50a7c62f1d74cb881259da8ba96f2f5623ff84041d04c6b5a38b9662e SHA512 42dd63c4eb696d7964b0ad30ff0032c80c93e8bd0a2517b0938005eaf8b12a584d7ce7901c6b3bb0bb55372e484162240c7719d2bf102035870b9c57f1930ec1
-DIST kdecarddecks.zip 3370611 BLAKE2B d097bd95545e57250ea7dc034d40577253cf8e78e539e7b81217a548903817ee792a5ee1115eef7d8238b3e90a70601e272df84fc304b43be4a28697220d545c SHA512 4f3fdac3c672fd1de3db2f6603919a242db73e2445a8dac07d45dcf284cfbb56948925d6e512f15a0b4c762b71758c0755312624a0030a4d8f11dbfe65666c44
-DIST openclipart.zip 1251509 BLAKE2B 66ac2ada7d96726d4f4f9d016feb088814ff95def9950082c04b0a440d86e80701fcb06ee6e04afc431daf759198957281a971124f591346b66d70be916b50db SHA512 8c5e84d8f8f011cfc84f7d012c97e606f80c2254336518c9b9563315bd63971e7211b762effbb841e74603e0f02bb12ae9e91d1be6a4e23c243691b025874ec2
-DIST pysol.zip 26314316 BLAKE2B f8df3be0b4a2f9343af40dd3311f4d58ca33a1392474f837afc2a0e56bcf21e1bd39b3b2914e06f6e226e5e832b2c6cba9f090639e27f38d554da81dbc3e1d58 SHA512 951891631c6890144361d779bc52aed2b94a87e810de65f7ef240193c49a243e2f1a93f3e170eacb19080dd28beb99b279d7e0bc16d7cb54553e27d29e65b1f7
-DIST xskat.zip 666085 BLAKE2B 2141ffec9b76142ab96bc0bd66784578711a44163788b868b9b02cfa9514f123e02a75d6d3c979ba86283b5fdda1604167eff9181c9ce2ee8b324db0b02bb0e1 SHA512 725bb12e983e8c1494748faf78b2e1c76c424806eeb7a88aafecf580aa63703c166907aea2bbd7890d2f972ffacc5dde78d01a82b72ab87cccf1a8e50d1034f9
-EBUILD freedoko-0.7.16.ebuild 2697 BLAKE2B 19cdf1d26ced16f9f79c7b537868e07b859ae1d146a6eef90ded70ee6f2033cff98ecb0674773737c761d4ed89113abb51396959eb6cf7284238300d625a9baa SHA512 5eacdc90fa6fa0473e5fdb808ff3fdc1cf9f82439f8429469aaa79d5d58558805928a6957e12596f499c285b02fef1cee66b95a0d8e9797879f61d8c3ffacd05
-MISC metadata.xml 928 BLAKE2B edb0c7696eaba28ed8ad3bc625d5a8f71525037dd09d5f75cda28b3fc586e1d59edfa5bf230e9f4d30c949fead44cdae048624cfe4eec92aaa3c9f46ace43e11 SHA512 df7bc6dfe2691b80cda7d4f17738e6d939a137658f8ba8453adf3d0003371c07d9c48fc4dce945fbc73978dcc0d7ee0eb0e4a5f46f1d0245ae0d4c8aa5b40847
diff --git a/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch b/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch
deleted file mode 100644
index 68160dcba926..000000000000
--- a/games-board/freedoko/files/freedoko-0.7.16-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/Makefile.old	2017-06-06 13:30:39.005626983 +0200
-+++ b/src/Makefile	2017-06-06 13:31:09.180881871 +0200
-@@ -239,15 +239,7 @@
- # compile FreeDoko
- $(PROGRAM) : show_settings objects $(DIRECTORIES)
- 	@echo 'compiling $(PROGRAM)...'
--# Gentoo users do want to see the real compile line.
--# So remove the next five lines (the echo lines)
--# and remove the '@' in the line after.
--	@echo '$(CXX) $$(OBJECTS)'
--	@echo '        $(INCLUDE_ALL)'
--	@echo '        $(LIBS_ALL)'
--	@echo '       $(CXXFLAGS)'
--	@echo '        -o $@'
--	@$(CXX) \
-+	$(CXX) \
- 	  $(OBJECTS_ALL:%.o=$(FREEDOKO_WORKING_DIRECTORY)/%.o) \
- 	  $(INCLUDE_ALL) \
- 	  $(LIBS_ALL) \
---- a/src/Makefile.rules.old	2017-06-06 13:30:27.071526137 +0200
-+++ b/src/Makefile.rules	2017-06-06 13:31:17.829954904 +0200
-@@ -80,10 +80,7 @@
- 		  $(DEPTH)/Makefile.modules \
- 		  $(DEPTH)/Makefile.local \
- 		  $(DEPTH)/Makefile.os
--# Gentoo users do want to see the real compile line.
--# So remove the next line and remove the '@' in the line after.
--	@echo $(CXX) -c $(SUBDIR)/$<
--	@$(CXX) $(INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
-+	$(CXX) $(INCLUDE) $(CPPFLAGS) $(CXXFLAGS) $(DEPGEN_FLAGS) -o $@ -c $<
- 
- 
- -include $(OBJECTS:%.o=$(TARGET_DIR_LOCAL)%.d)
diff --git a/games-board/freedoko/freedoko-0.7.16.ebuild b/games-board/freedoko/freedoko-0.7.16.ebuild
deleted file mode 100644
index 279bdf73da22..000000000000
--- a/games-board/freedoko/freedoko-0.7.16.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="FreeDoko is a Doppelkopf-game"
-HOMEPAGE="http://free-doko.sourceforge.net"
-SRC_URI="mirror://sourceforge/free-doko/FreeDoko_${PV}.src.zip
-	backgrounds? ( mirror://sourceforge/free-doko/backgrounds.zip -> ${PN}-backgrounds.zip )
-	kdecards? ( mirror://sourceforge/free-doko/kdecarddecks.zip )
-	xskatcards? ( mirror://sourceforge/free-doko/xskat.zip )
-	pysolcards? ( mirror://sourceforge/free-doko/pysol.zip )
-	gnomecards? ( mirror://sourceforge/free-doko/gnome-games.zip )
-	openclipartcards? ( mirror://sourceforge/free-doko/openclipart.zip )
-	!xskatcards? (
-		!kdecards? (
-			!gnomecards? (
-				!openclipartcards? (
-					!pysolcards? (
-						mirror://sourceforge/free-doko/xskat.zip ) ) ) ) )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+xskatcards +gnomecards +kdecards +openclipartcards +pysolcards +backgrounds net"
-
-RDEPEND="net? ( net-libs/gnet dev-libs/glib:2 )
-	>=dev-cpp/gtkmm-2.4:2.4"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/FreeDoko_${PV}
-
-src_unpack() {
-	local cards=0
-
-	unpack_cards() {
-		use $1 && { unpack $2 ; cards=$(( $cards + 1 )); };
-	}
-	unpack FreeDoko_${PV}.src.zip
-	cp /dev/null "${S}"/src/Makefile.local || die
-
-	cd "${S}"/data/cardsets || die
-
-	unpack_cards xskatcards       xskat.zip
-	unpack_cards kdecards         kdecarddecks.zip
-	unpack_cards pysolcards       pysol.zip
-	unpack_cards gnomecards       gnome-games.zip
-	unpack_cards openclipartcards openclipart.zip
-	[ $cards ] || unpack xskat.zip # fall back to xskat
-
-	if use backgrounds ; then
-		cd "${S}"/data/backgrounds || die
-		unpack ${PN}-backgrounds.zip
-	fi
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.16-gentoo.patch
-)
-
-src_prepare() {
-	default
-	export VARTEXFONTS="${T}/fonts" #652028
-	append-cxxflags -std=c++14
-}
-
-src_compile() {
-	export CPPFLAGS="-DPUBLIC_DATA_DIRECTORY_VALUE='\"/usr/share/${PN}\"'"
-	export CPPFLAGS+=" -DMANUAL_DIRECTORY_VALUE='\"/usr/share/doc/${PF}/html\"'"
-	export OSTYPE=Linux
-	export USE_NETWORK=$(use net && echo true || echo false)
-	export USE_SOUND_ALUT=false # still marked experimental
-	emake Version
-	emake -C src FreeDoko
-}
-
-src_install() {
-	newbin src/FreeDoko freedoko
-	insinto /usr/share/${PN}/
-	doins -r data/{backgrounds,cardsets,iconsets,rules,sounds,translations,*png}
-	find "${D}/usr/share/${PN}" -name Makefile -delete
-	dodoc AUTHORS README ChangeLog
-	newicon -s 32 src/FreeDoko.png ${PN}.png
-	make_desktop_entry ${PN} FreeDoko
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/freedoko/metadata.xml b/games-board/freedoko/metadata.xml
deleted file mode 100644
index 55e5a789bd63..000000000000
--- a/games-board/freedoko/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription lang="en">
-The Linux version of the popular german cardgame "Doppelkopf"
-</longdescription>
-  <use>
-    <flag name="kdecards">Install the KDE card set</flag>
-    <flag name="net">Enable network game support</flag>
-    <flag name="pysolcards">Install the PySol card set</flag>
-    <flag name="xskatcards">Install the XSkat card set</flag>
-    <flag name="gnomecards">Install the gnome-games card set</flag>
-    <flag name="openclipartcards">Install the openclipartcards card set</flag>
-    <flag name="backgrounds">Install additional background images</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">free-doko</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-board/fruit-2.1-r1 b/games-board/fruit-2.1-r1
new file mode 100644
index 000000000000..6657102ffbab
--- /dev/null
+++ b/games-board/fruit-2.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=UCI-only chess engine
+EAPI=6
+HOMEPAGE=http://arctrix.com/nas/fruit/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://arctrix.com/nas/fruit/fruit_21_linux.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=da25e490684f7101fd19e53f7c903d5e
diff --git a/games-board/fruit/Manifest b/games-board/fruit/Manifest
deleted file mode 100644
index 1d07168b0415..000000000000
--- a/games-board/fruit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fruit-2.1-gentoo.patch 590 BLAKE2B 0ff77b71537b8b2062413e1fe888014d69371c8cb29260e02cae8e3789b572c9175750be31abd5dfaebbdf517bc2c8f98b3132c8526beaa1cf1ebcbd35c77f79 SHA512 db32e30dcd60df1c0dabcab4589cdfb779ef619d2bdfdb35b77b5b6b224adb0b9826c310b2f3fd97c0591e4c63931dfec733578429c749b691a5dafbc8a954b4
-DIST fruit_21_linux.zip 716762 BLAKE2B ffdc38ca4a3021b69e95c876c419bc85102412ef6632cfc5d8d1370b59fdc6e1bb5e10e5066fd39197d16042286e0cac07ae76a39eb1ed3d96bfe804225a9948 SHA512 80d80141ca3c2a4521b241a750bd237e0971b531bc4e8e89ae3bdcdbb1436b99b35e64f505b9a61413726744646b6b4ce126bcdb53b90adc727f88a50adee889
-EBUILD fruit-2.1-r1.ebuild 795 BLAKE2B 669fa5a30b6173ad0dc3c92e78b8e87ef4b87b037caf4248b6928cb670e9b05e50410495b730b2f67290a683c593922748f06d43df02c9f06109d33a085d1af4 SHA512 655f8e1b74330fb41d4609a72bda62383fc492b7ef04c94edfca6310e95b50bb3f6980cba50452ce3669b824bd4342ba7379f3cd6baff005e543d8b2be48e9fc
-MISC metadata.xml 330 BLAKE2B e38a1b870857c880700f94c087932aee6c4236bdd38e87c61b93837c72235dc5f8e37c322fec5f8b87403a498e459035f13037a1b0711a9902405ea15d8e03e4 SHA512 f568c54581b78f36c6aaaba340be04f0396dbb62f133426b0dddf4a1ed39b0675fd64b6b2d14f9c41bf49851dc25156bf71566ef9b207570cc7e57a92380c4ef
diff --git a/games-board/fruit/files/fruit-2.1-gentoo.patch b/games-board/fruit/files/fruit-2.1-gentoo.patch
deleted file mode 100644
index 815b184d9dc2..000000000000
--- a/games-board/fruit/files/fruit-2.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/option.cpp.old	2007-02-07 23:32:25.000000000 +0100
-+++ b/option.cpp	2007-02-07 23:32:51.000000000 +0100
-@@ -29,7 +29,7 @@
-    { "Ponder", true, "false", "check", "", NULL },

- 

-    { "OwnBook",  true, "true",           "check",  "", NULL },

--   { "BookFile", true, "book_small.bin", "string", "", NULL },

-+   { "BookFile", true, "@GENTOO_DATADIR@/book_small.bin", "string", "", NULL },

- 

-    { "NullMove Pruning",       true, "Fail High", "combo", "var Always var Fail High var Never", NULL },

-    { "NullMove Reduction",     true, "3",         "spin",  "min 1 max 3", NULL },

diff --git a/games-board/fruit/fruit-2.1-r1.ebuild b/games-board/fruit/fruit-2.1-r1.ebuild
deleted file mode 100644
index bb8f7635cf15..000000000000
--- a/games-board/fruit/fruit-2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit versionator
-
-MY_PV="$(replace_all_version_separators '')"
-MY_P="${PN}_${MY_PV}_linux"
-
-DESCRIPTION="UCI-only chess engine"
-HOMEPAGE="http://arctrix.com/nas/fruit/"
-SRC_URI="http://arctrix.com/nas/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_P}/src"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		option.cpp || die
-	sed -i \
-		-e '/^CXX/d' \
-		-e '/^LDFLAGS/d' \
-		Makefile || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto "/usr/share/${PN}"
-	doins ../book_small.bin
-	dodoc ../readme.txt ../technical_10.txt
-}
diff --git a/games-board/fruit/metadata.xml b/games-board/fruit/metadata.xml
deleted file mode 100644
index f9731bb70a84..000000000000
--- a/games-board/fruit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Fruit is a UCI-only chess engine.
-</longdescription>
-</pkgmetadata>
diff --git a/games-board/gambit-1.0.4 b/games-board/gambit-1.0.4
new file mode 100644
index 000000000000..c80a3c6ce1b3
--- /dev/null
+++ b/games-board/gambit-1.0.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/mesa x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Qt-based chess application + engine "gupta"
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gambitchess/
+KEYWORDS=~amd64 ~x86
+LICENSE=CC0-1.0
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 media-libs/mesa x11-libs/libX11
+SLOT=0
+SRC_URI=mirror://sourceforge/project/gambitchess/Gambit-1.0.4/Gambit-1.0.4-src.tar.xz
+_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_=19655e7400b6284b6e73cf140ae6a904
diff --git a/games-board/gambit/Manifest b/games-board/gambit/Manifest
deleted file mode 100644
index 0783c77a7573..000000000000
--- a/games-board/gambit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Gambit-1.0.4-src.tar.xz 1675576 BLAKE2B 4545bee38509d44f80af874473ff562b441e570be3681b166b064574e12bfad8b8a2fb5043b9d0b9089160de2d97407160336cb58864168232cf0921244cf92d SHA512 9ba12e0e9598e2b08228aa009690e6a05677916dcea1413a42be20d620accbe7cef4f4300e3ccc5d4d99e37c7fb85d923df8f5fa9146ee8049bbde2ce66ab7a9
-EBUILD gambit-1.0.4.ebuild 1157 BLAKE2B 81b54e2ebde3e3fbf8fb0232525724a13838f62ab4877ee4b547d74d09292e184e162f2fa21a1fdd3187b9994bb9320866356e4f0cadbc84093924b54dbccd64 SHA512 2bea1801c158aebe969d0b577dd9c2d94cc646630047754f3d14606bc58c70d2e2602555bae4f5199d8e4091eb2eef4402feef85e36ba145575c4f8775be14d1
-MISC metadata.xml 330 BLAKE2B b37539dff6327ec46e89a9a93c5a23c0efdf321cafc5e851e98b9b265f1d561e8c70f96737b455b65958dbbd9b8a8e6efd7b44e9d589e26fb768851e23fb23ef SHA512 284c29ce4b5ae3cb4e7f1b3472cd3430ce474cd395f44b730301b37fed45c57387646e6643ab9ba2f80885e7bf2e36bd9dd018045d7a0ccefa2c73dbcfae2146
diff --git a/games-board/gambit/gambit-1.0.4.ebuild b/games-board/gambit/gambit-1.0.4.ebuild
deleted file mode 100644
index 28abd503a2c2..000000000000
--- a/games-board/gambit/gambit-1.0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=true
-inherit cmake-utils
-
-MY_P="${P^}"
-
-DESCRIPTION="Qt-based chess application + engine \"gupta\""
-HOMEPAGE="https://sourceforge.net/projects/gambitchess/"
-SRC_URI="mirror://sourceforge/project/${PN}chess/${MY_P}/${MY_P}-src.tar.xz"
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-libs/mesa
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}-src"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ENABLE_UPDATE_CHECKER=OFF
-		-DCONFIG_GUPTA_ENGINE_DIRECTORY=/usr/bin
-		-DCONFIG_RESOURCE_PATH_PREFIX=/usr/share/${PN}/
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	emake -C engine/gupta VERBOSE=1 STRIP=/bin/true CFLAGS_RELEASE= release
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r data/*
-
-	doicon artwork/icons/${PN}/${PN}.svg
-	make_desktop_entry ${PN}chess ${PN^} ${PN} Game
-	dodoc doc/contributors.txt
-
-	dobin engine/gupta/gupta
-	dobin ${PN}chess
-}
diff --git a/games-board/gambit/metadata.xml b/games-board/gambit/metadata.xml
deleted file mode 100644
index 2c6e3977dfd1..000000000000
--- a/games-board/gambit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gambitchess</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/gmchess-0.29.6-r2 b/games-board/gmchess-0.29.6-r2
new file mode 100644
index 000000000000..9013f5b2f304
--- /dev/null
+++ b/games-board/gmchess-0.29.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-cpp/gtkmm:2.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 >=sys-apps/sed-4
+DESCRIPTION=Chinese chess with gtkmm and c++
+EAPI=6
+HOMEPAGE=https://github.com/lerosua/gmchess
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/gtkmm:2.4
+RESTRICT=test
+SLOT=0
+SRC_URI=https://gmchess.googlecode.com/files/gmchess-0.29.6.tar.bz2
+_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_=8593c40cf65a40bb0dfc992041d10b7d
diff --git a/games-board/gmchess/Manifest b/games-board/gmchess/Manifest
deleted file mode 100644
index 47f367cd3c46..000000000000
--- a/games-board/gmchess/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gmchess-0.29.6-gentoo-r1.patch 871 BLAKE2B eb99dc2a6b5199c104a608990e5da84ebeb4b04df560a365f9c884e2a7f788d0daac6063680ce1b87b833f2bb3fd0c4592b2507ab4b825e6676a106348f2ed59 SHA512 b7466bcc8b734a7449f99ec0b9fcc16d0820628866945710b681dc5c97b5ba37f359e938aeec76fbe411061c88a706b552a9df48d7e7115a84ddfc05143d7e4c
-DIST gmchess-0.29.6.tar.bz2 1437904 BLAKE2B fdc98a317e62a455c394f3486c61abb49ad76bc2a77fae6f3a71271a56e8fc95e58dbf6cd387401a172bafc19379ca1ee971b6ce3911d0aa6b9d97b400a62d28 SHA512 b6af5205dc087c9fdea4cee81f9002c5dd56282be10b09c99f6f4105730676abff8d036843b7c0232937f43d87d222555a0b9c86e192a5ac8c039509841467a6
-EBUILD gmchess-0.29.6-r2.ebuild 1008 BLAKE2B fdd2dcb5a576955eff24df49e11281976cf267ae65c55bcf11a8e31b3cbbdf2753c7f28e28519b040b9ec831bf3daf87a0dbd76333fd81260144b6bdf50b4dd0 SHA512 c7250791db1360059592710947a7dac2b91e49e678bc8697aac5d5994447c0feca47b11f44c0f49cc29f184cd91b7de9cdffc56a9896041bb68bb4b1a313c10c
-MISC metadata.xml 330 BLAKE2B 04e8696c37299e01d7554cc6f370b25facaeb67a994f97d0829fe77bc15fda99af19e56d304a8424bcdd4791f5512da0d06b3ae4da2400a6b5ae457dbec65bb7 SHA512 172b4a1ec7cb67f32ab991337ecc058be002d35f8867819b54d28d65ba1ade6217318460f7560c96a03357d262d76bc7e6eaf810be78e32b3a0290037ddbaaa2
diff --git a/games-board/gmchess/files/gmchess-0.29.6-gentoo-r1.patch b/games-board/gmchess/files/gmchess-0.29.6-gentoo-r1.patch
deleted file mode 100644
index 6ef990460774..000000000000
--- a/games-board/gmchess/files/gmchess-0.29.6-gentoo-r1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ru gmchess-0.29.6.orig/configure.in gmchess-0.29.6/configure.in
---- gmchess-0.29.6.orig/configure.in	2011-11-28 07:22:56.000000000 -0500
-+++ gmchess-0.29.6/configure.in	2013-05-13 21:30:38.103817044 -0400
-@@ -4,7 +4,7 @@
- AC_PREREQ([2.63])
- AC_INIT(gmchess, 0.29.6, lerosua@gmail.com)
- AC_CONFIG_SRCDIR([src/Pgnfile.cc])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE(gmchess,0.29.6)
- 
- 
-diff -ru gmchess-0.29.6.orig/data/gmchess.desktop.in gmchess-0.29.6/data/gmchess.desktop.in
---- gmchess-0.29.6.orig/data/gmchess.desktop.in	2009-09-07 08:08:47.000000000 -0400
-+++ gmchess-0.29.6/data/gmchess.desktop.in	2013-05-13 21:30:19.444462390 -0400
-@@ -1,4 +1,3 @@
--
- [Desktop Entry]
- Name=Chinese chess
- Name[zh_CN]=天书棋谈
-@@ -10,4 +9,3 @@
- Type=Application
- Categories=GNOME;GTK;Game;BoardGame;
- StartupNotify=true
--Encoding=UTF-8
diff --git a/games-board/gmchess/gmchess-0.29.6-r2.ebuild b/games-board/gmchess/gmchess-0.29.6-r2.ebuild
deleted file mode 100644
index 007c50270126..000000000000
--- a/games-board/gmchess/gmchess-0.29.6-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic libtool gnome2-utils
-
-DESCRIPTION="Chinese chess with gtkmm and c++"
-HOMEPAGE="https://github.com/lerosua/gmchess"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.bz2"
-RESTRICT="test"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-cpp/gtkmm:2.4"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo-r1.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--disable-static \
-		--localedir='/usr/share/locale'
-}
-
-src_install() {
-	emake DESTDIR="${D}" \
-		itlocaledir='/usr/share/locale' \
-		pixmapsdir='/usr/share/pixmaps' \
-		desktopdir='/usr/share/applications' \
-		install
-	dodoc AUTHORS NEWS README
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gmchess/metadata.xml b/games-board/gmchess/metadata.xml
deleted file mode 100644
index 8529633ccba3..000000000000
--- a/games-board/gmchess/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">gmchess</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/gnome-chess-3.24.1 b/games-board/gnome-chess-3.24.1
new file mode 100644
index 000000000000..592080b26bde
--- /dev/null
+++ b/games-board/gnome-chess-3.24.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3 || ( dev-lang/vala:0.36 ) app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Play the classic two-player boardgame of chess
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Chess
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.19:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e1c6b82ce2f60bfdbfbb11dd9f7543d4
diff --git a/games-board/gnome-chess/Manifest b/games-board/gnome-chess/Manifest
deleted file mode 100644
index cfb18bac721c..000000000000
--- a/games-board/gnome-chess/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-chess-3.24.1.tar.xz 2808208 BLAKE2B 6b6eefb8de8e7b91b23752d78d00704546566f060c8971c4fb17b26a28ca44b659891e036f5cc1f42bbfca41d1aaaca153758115eafb4456a3ddb45fe4caf1a8 SHA512 738bae74a547ccf9f0f3dcccaf164af785086ab54190094d602effae0f3f7c07fb6be4eba4aa8706045f70cb12c407a5151bc836d784c0cd254b1c371670e559
-EBUILD gnome-chess-3.24.1.ebuild 902 BLAKE2B 848f9c4ecfb05c94f03ce66d22e7b4541931b2751cad353cf931459e19c7a959dc9da5d0769d3dddec46cdf3ed982a40101b2e722715ac5d09c72b7c5f8ce9de SHA512 170391ed43fa640321a36bbea5a2fec6d035583fd6035f801610fe23a868734c8c5a0a6f55c77b8caeb73ef944da2fffdb8d0a4055bb932c639eee75a21b4b07
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-chess/gnome-chess-3.24.1.ebuild b/games-board/gnome-chess/gnome-chess-3.24.1.ebuild
deleted file mode 100644
index bb10dc861113..000000000000
--- a/games-board/gnome-chess/gnome-chess-3.24.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.36"
-
-inherit gnome2 vala readme.gentoo-r1
-
-DESCRIPTION="Play the classic two-player boardgame of chess"
-HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.19:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DOC_CONTENTS="For being able to play against computer you will
-	need to install a chess engine like, for example, games-board/gnuchess"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/games-board/gnome-chess/metadata.xml b/games-board/gnome-chess/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-board/gnome-chess/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnome-hearts-0.3.1-r2 b/games-board/gnome-hearts-0.3.1-r2
new file mode 100644
index 000000000000..5953d199061f
--- /dev/null
+++ b/games-board/gnome-hearts-0.3.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 >=gnome-base/libglade-2 app-text/rarian dev-util/intltool 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A clone of classic hearts card game
+EAPI=6
+HOMEPAGE=http://www.gnome-hearts.org
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ FDL-1.2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 >=gnome-base/libglade-2
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.jejik.com/files/gnome-hearts/gnome-hearts-0.3.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f4b794fe15ad8dd693d605ffbab1e651
diff --git a/games-board/gnome-hearts/Manifest b/games-board/gnome-hearts/Manifest
deleted file mode 100644
index e251dca48327..000000000000
--- a/games-board/gnome-hearts/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnome-hearts-0.3.1-drop-libgnomeui.patch 2530 BLAKE2B 5e4789ff0f2ca68ba70801ba2f0206844ba15920592e82ef369228570d77111687e9baad67846e79fcc1f044a2a8184eedcd9833600f7677fde52edf714eefba SHA512 784bd6ebfce24fa6691caa1f11bca28a8719854510064a137254f34f26176bccd95753bac870268e4970f1218b6b80970e7495377d85aa2a6e1bb5d450b6a15f
-DIST gnome-hearts-0.3.1.tar.gz 637916 BLAKE2B 6aa4a0c1d0d91316a896cd144e23b9a46066cd2d2c2a69d1fa1eb34094b5742810c5484c5950322a9c5b066ae72c974f9c4f0642baa7986df637654717669114 SHA512 5528c92bba80cc97ce1f51e3b2652b5d6b30c0e90e7a8f023dcdf5c3420b2d1fbab29fc3d974884d8cb351a44b8b97c05242f26b70d5e1d02d593a17452ad19f
-EBUILD gnome-hearts-0.3.1-r2.ebuild 906 BLAKE2B 100f1a121e18dc7eb6eed7b20a79e3f4d72599e92ef605ac62919c81221eb5fbc4dec3e703c1b4b95f815859e95f0eb0314abdc765637ea8c9f30403d9b8faa7 SHA512 613010c8fa35d11d59fa28581e0c148b1dff44b9fe940324ec02c6d2f3ff40375cde85ff2b87af2ded49bfeb4f4abbe0acc146b50000785d3236ea1c64d48b93
-MISC metadata.xml 359 BLAKE2B 433bc74150d0b0d3ef0e89aa88f6216b9ef37c78e508d954f417fbedbca513d2754a7ddc2f5e8dde26c6053ad1d30ec06a6210b150fbf8713d9eea09588e482e SHA512 486453048dbb364dbe94b263c4d79dc95f28f8f10e83b9731949b5033002a7d60408d2e9e8afcc73c40425aa1a45a5053b0ffc66e9cebc067a3e6d0322d426e0
diff --git a/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch b/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
deleted file mode 100644
index 21c4e7b0896a..000000000000
--- a/games-board/gnome-hearts/files/gnome-hearts-0.3.1-drop-libgnomeui.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur gnome-hearts-0.3.1.orig/configure.in gnome-hearts-0.3.1/configure.in
---- gnome-hearts-0.3.1.orig/configure.in	2013-06-09 15:05:11.000000000 +0200
-+++ gnome-hearts-0.3.1/configure.in	2017-01-20 23:20:35.677689797 +0100
-@@ -23,7 +23,7 @@
- fi
- 
- # Check for libraries. gmodule is required to make sure --export-dynamic is used and glade works
--PKG_CHECK_MODULES(GNOME_HEARTS, [libgnomeui-2.0 gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
-+PKG_CHECK_MODULES(GNOME_HEARTS, [gtk+-2.0 libglade-2.0 glib-2.0 gmodule-2.0])
- AC_SUBST(GNOME_HEARTS_CFLAGS)
- AC_SUBST(GNOME_HEARTS_LIBS)
- 
-diff -Naur gnome-hearts-0.3.1.orig/src/events.c gnome-hearts-0.3.1/src/events.c
---- gnome-hearts-0.3.1.orig/src/events.c	2013-06-09 15:01:08.000000000 +0200
-+++ gnome-hearts-0.3.1/src/events.c	2017-01-20 23:35:17.428651148 +0100
-@@ -71,13 +71,13 @@
- /* Open the help file */
- void on_help(GtkWidget *widget, gpointer data)
- {
--	gnome_help_display("gnome-hearts.xml", NULL, NULL);
-+	gtk_show_uri(NULL, "ghelp:gnome-hearts", GDK_CURRENT_TIME, NULL);
- }
- 
- /* Open the preferences help file */
- void on_preferences_help(GtkWidget *widget, gpointer data)
- {
--	gnome_help_display("gnome-hearts.xml", "hearts-prefs", NULL);
-+	gtk_show_uri(NULL, "ghelp:gnome-hearts?hearts-prefs", GDK_CURRENT_TIME, NULL);
- }
- 
- /* About menu item */
-diff -Naur gnome-hearts-0.3.1.orig/src/hearts.c gnome-hearts-0.3.1/src/hearts.c
---- gnome-hearts-0.3.1.orig/src/hearts.c	2013-06-09 15:01:08.000000000 +0200
-+++ gnome-hearts-0.3.1/src/hearts.c	2017-01-20 23:20:21.447210208 +0100
-@@ -534,15 +534,11 @@
- 		setlocale(LC_ALL, "");
- 	#endif
- 
--	/* Initialize GNOME */
-+	/* Initialize GTK+ */
- 	GOptionContext *option_context = g_option_context_new(_("- Play a game of hearts"));
- 	g_option_context_add_main_entries(option_context, option_entries, GETTEXT_PACKAGE);
- 
--	gnome_program_init(PACKAGE, VERSION, LIBGNOMEUI_MODULE,
--			argc, argv,
--			GNOME_PARAM_GOPTION_CONTEXT, option_context,
--			GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
--			GNOME_PARAM_NONE);
-+	gtk_init(&argc, &argv);
- 	
- 	/* init the game's global variables */
- 	game_score_labels = NULL;
-diff -Naur gnome-hearts-0.3.1.orig/src/hearts.h gnome-hearts-0.3.1/src/hearts.h
---- gnome-hearts-0.3.1.orig/src/hearts.h	2013-06-09 15:01:08.000000000 +0200
-+++ gnome-hearts-0.3.1/src/hearts.h	2017-01-20 23:22:33.691604109 +0100
-@@ -26,7 +26,7 @@
- /* headers */
- #include <glib/gi18n.h>
- #include <dirent.h>
--#include <gnome.h>
-+#include <gtk/gtk.h>
- #include <glade/glade.h>
- #include "cards.h"
- #include "cfg.h"
diff --git a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild b/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
deleted file mode 100644
index c325614f353e..000000000000
--- a/games-board/gnome-hearts/gnome-hearts-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A clone of classic hearts card game"
-HOMEPAGE="http://www.gnome-hearts.org"
-SRC_URI="http://www.jejik.com/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	x11-libs/gtk+:2
-	>=gnome-base/libglade-2
-"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make src_test work
-	echo gnome-hearts.desktop.in >> po/POTFILES.skip
-
-	sed -i \
-		-e '/No name/d' \
-		-e '/^Icon/s/.png//' \
-		-e '/^Encoding/d' \
-		gnome-hearts.desktop.in || die
-
-	eapply "${FILESDIR}"/${P}-drop-libgnomeui.patch
-
-	mv configure.in configure.ac || die
-	gnome2_src_prepare
-}
diff --git a/games-board/gnome-hearts/metadata.xml b/games-board/gnome-hearts/metadata.xml
deleted file mode 100644
index ea35640ff889..000000000000
--- a/games-board/gnome-hearts/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnome-mahjongg-3.22.0 b/games-board/gnome-mahjongg-3.22.0
new file mode 100644
index 000000000000..bef82c5b3739
--- /dev/null
+++ b/games-board/gnome-mahjongg-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.13.2:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Disassemble a pile of tiles by removing matching pairs
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Mahjongg
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.13.2:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-mahjongg/3.22/gnome-mahjongg-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=855d73c74a8df35cf116f26d6000f380
diff --git a/games-board/gnome-mahjongg/Manifest b/games-board/gnome-mahjongg/Manifest
deleted file mode 100644
index d5bba326b6f4..000000000000
--- a/games-board/gnome-mahjongg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-mahjongg-3.22.0.tar.xz 4323836 BLAKE2B 7bd009e744ed4a6f8247206292d7a63d3cdc9cb14c0ac31e86d379272a14248b2b22e51fc3605d7ade3d928f23ba920d3aed4e2d8bc044d04ba2f8c51ec1b869 SHA512 3941eedb8df2f20913839fafa458ef3000a24269d7515c65a24162e0d4ff4a2a8f130f7ee27e66bde08ccf8a87ee207e96e8179757e0d557965f8aa20fe59c6a
-EBUILD gnome-mahjongg-3.22.0.ebuild 640 BLAKE2B f9fe0930abf83344580f461334545e1547c05b994776161201ff1c130e006845240e5be02852a79965166c79d7fb4974106203d65092e49d56f4cad304b571ad SHA512 39deff4f3c412b3352e9d22344fcdce9d27c5494e2115b8bd4f69bf893dd423f52b90b4d8e6a14fe266f9712ef4df689aa7da1f774529cfbb8df24d348fd4522
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.22.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.22.0.ebuild
deleted file mode 100644
index b1a78c2822f6..000000000000
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.22.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Disassemble a pile of tiles by removing matching pairs"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.13.2:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mahjongg/metadata.xml b/games-board/gnome-mahjongg/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-board/gnome-mahjongg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnome-mines-3.20.1 b/games-board/gnome-mines-3.20.1
new file mode 100644
index 000000000000..d3a7d46bf119
--- /dev/null
+++ b/games-board/gnome-mines-3.20.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clear hidden mines from a minefield
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Mines
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-mines/3.20/gnome-mines-3.20.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f00da2c085cc27b5e2b89482bc16649
diff --git a/games-board/gnome-mines-3.24.0 b/games-board/gnome-mines-3.24.0
new file mode 100644
index 000000000000..4036201db9a0
--- /dev/null
+++ b/games-board/gnome-mines-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clear hidden mines from a minefield
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Mines
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66a21c411fcf0158f65d10fa6eb21b6e
diff --git a/games-board/gnome-mines/Manifest b/games-board/gnome-mines/Manifest
deleted file mode 100644
index 3fe2e52a2670..000000000000
--- a/games-board/gnome-mines/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnome-mines-3.20.1.tar.xz 3147092 BLAKE2B 899a66905a95a41f007f0b74f8b4054c505b4b46eff6c0ebbefaf1826d36093307a9bbc55e42b6c1abd8a0f9a419a3d1822deb113414bd5eadcba1c3a9896614 SHA512 cdde771736b9110a416ec68d6e4ce2ce10e3de36915b57905f6f5d86a937c75a2dbfafd1ecc0c5f31dd5e267d13444a8a95d38815f400d4597e2fe73a908bd13
-DIST gnome-mines-3.24.0.tar.xz 3145152 BLAKE2B e3867ccadb3966e86075d7fbfa1e4ccbf262e5fb3ae0edf8eb162a6bbb411e4cafb9fd7599156153fc0b10a486e3731beb862299586f31df2393049d3e5bac36 SHA512 6975bd0b60160843441f6143f86e55d732be31583c09f17878d7d09199370b65c42e34d61cf447751de686978eb3fd1dbc74ffcec2dca1adc5ab4ceb208af2c0
-EBUILD gnome-mines-3.20.1.ebuild 689 BLAKE2B 206f912abc192a345aac4c0f8edd7f30e07ee1f6df499803cf03102af2c424006e9d089ef91edb71d3d707288c8b58ae3c0b24b9fe6002a59af3ea6be32b9c05 SHA512 15fd8c2465405beb5f33a850ebd96ee94be75aa83ae8486cc723506a5102cace778ba005379da61d583c6b5ae0eaba43cc8055ef4822a910c6d73467df8aa773
-EBUILD gnome-mines-3.24.0.ebuild 712 BLAKE2B 5779dfe1a6f9c8c2453a6cda669b9d4fae5d79065c8f0d9fe99164b8dd2e16a378eb45af903364e7557047226dac55b6343ba4810ea7ed91a30d0abf416486f2 SHA512 521d4c00fc00fe81130e1104ced511ca0ca9f8750a3f962b22152f202af9bd9bab04a2d2741c2ae63877b60e32353afb1a37fa2182e1d0e92b4c0f1d9a8b7ad3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/gnome-mines/gnome-mines-3.20.1.ebuild b/games-board/gnome-mines/gnome-mines-3.20.1.ebuild
deleted file mode 100644
index 79745f43c60f..000000000000
--- a/games-board/gnome-mines/gnome-mines-3.20.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32.0:2
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mines/gnome-mines-3.24.0.ebuild b/games-board/gnome-mines/gnome-mines-3.24.0.ebuild
deleted file mode 100644
index 8dd488ac7daf..000000000000
--- a/games-board/gnome-mines/gnome-mines-3.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Clear hidden mines from a minefield"
-HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgnome-games-support:1
-	>=gnome-base/librsvg-2.32.0:2
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/gnome-mines/metadata.xml b/games-board/gnome-mines/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-board/gnome-mines/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnono-1.9.1-r1 b/games-board/gnono-1.9.1-r1
new file mode 100644
index 000000000000..944dde7b89dd
--- /dev/null
+++ b/games-board/gnono-1.9.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=gnome-base/libgnomeui virtual/libintl sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A rewrite for GNOME of the Windows card game WUNO
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gnono/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gnome-base/libgnomeui virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/gnono/gnono-1.9.1.tar.bz2
+_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_=22c6541e34f852945d8f7b9098709246
diff --git a/games-board/gnono/Manifest b/games-board/gnono/Manifest
deleted file mode 100644
index 6a02cc2fb4ab..000000000000
--- a/games-board/gnono/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gnono-1.9.1-gentoo.patch 1622 BLAKE2B 48687601d821f70b377b8f45a06876a7932ab201302b52e14c793f099d0db070b56e264a8a2ed93a50b1c67d17edc0c9b031e369d00ea4e2a08ce893bb6e0952 SHA512 f899145fc7789dd4b10422871bdc6a432da75ba3e5433ee43ed6cfea8d3a2b25da0222cccbafdd1a8cd49d15164dd589c9bce6f80a148a432a6c3be05fa88655
-AUX gnono-1.9.1-glib-single-include.patch 3813 BLAKE2B b6b648b5fad1f687c93f09d1df6c2190d1f79603303c43f07e6645b387cc520a21bfa6f647825d7d9f1acc0f209d86acc92a4ee05bfd91db1f1974c216d62118 SHA512 3acc2b25587878b1da4a698d6ccfe3029715b173f4a44e97b8d41e899695a0eaf539906c00dce240602d03a86fe9a05c138de4f847e73eb1ef828d7d13506b3d
-DIST gnono-1.9.1.tar.bz2 421461 BLAKE2B a4beb3c8382266e13b650b53de11fee4954b70d7bb0180b95e9ca3ead445bb18b8b541fa2973ab6d06e0c68d7f13149c0e4eadb378ccb94e9fa01cdaf139e1be SHA512 de67453cab0177d633b674ab2cf99b606373dc01e6d821478e8aa6adf9f0f40b04538e5d564df990739a62fb47225f83eff13ab6c12af26fe05afba309632d62
-EBUILD gnono-1.9.1-r1.ebuild 730 BLAKE2B a4d8b2c38afea866b82184a227b32ff4d0ae1dddc6ae547e03500d7818bb7a720e0c4a6f9ad8c9ed51274433252c699f2a266f86731b39b1ed000c1cf881f272 SHA512 cd377d0c2c5e2dfa03fe28b5a9321b021a17c3f2693eb2ccb0d57a1ee7423b24489e1d21923c5aef542b8305cf35528fb249df537b18e59e88b46d4b3bb44fb9
-MISC metadata.xml 328 BLAKE2B 0a5781d403e17f1062512fd65452e403ef328c76f6819df05b9eaa8c487ab84d8b2350910fb38e873fde5a382bbe66c4c4b0d0f62cb269c7b2f63faf57050f79 SHA512 c7c67d8b49d13c69d7a9ff321f8733676fbf7155fbd98c7db3f60bd986f1ecb23006d6b77322603eaaaeb42bacae46db39c2c5504551f87e8951db25b66cf7ab
diff --git a/games-board/gnono/files/gnono-1.9.1-gentoo.patch b/games-board/gnono/files/gnono-1.9.1-gentoo.patch
deleted file mode 100644
index 68378b9d461c..000000000000
--- a/games-board/gnono/files/gnono-1.9.1-gentoo.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ru gnono-1.9.1.orig/pixmaps/Makefile.am gnono-1.9.1/pixmaps/Makefile.am
---- gnono-1.9.1.orig/pixmaps/Makefile.am	2006-12-15 01:18:18.000000000 -0500
-+++ gnono-1.9.1/pixmaps/Makefile.am	2009-11-03 00:21:57.186128499 -0500
-@@ -1,9 +1,9 @@
- ## Process this file with automake to produce Makefile.in
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = $(pkgdatadir)/pixmaps
- pixmap_DATA = gnono-about.png 
- 
--hicolordir = $(datadir)/icons/hicolor
-+hicolordir = /usr/share/icons/hicolor
- 
- install-data-local:
- 	@for depth in 16x16 22x22 24x24 32x32 48x48 ; do \
-diff -ru gnono-1.9.1.orig/po/Makefile.in.in gnono-1.9.1/po/Makefile.in.in
---- gnono-1.9.1.orig/po/Makefile.in.in	2007-02-18 00:58:11.000000000 -0500
-+++ gnono-1.9.1/po/Makefile.in.in	2009-11-03 00:21:57.187135081 -0500
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
-diff -ru gnono-1.9.1.orig/src/Makefile.am gnono-1.9.1/src/Makefile.am
---- gnono-1.9.1.orig/src/Makefile.am	2007-01-02 00:42:42.000000000 -0500
-+++ gnono-1.9.1/src/Makefile.am	2009-11-03 00:22:15.086296528 -0500
-@@ -3,12 +3,10 @@
- SUBDIRS = xpm
- 
- INCLUDES = \
--	-Wall -Werror \
-+	-Wall \
- 	-DG_LOG_DOMAIN=\"$(PACKAGE)\" \
--	-DG_DISABLE_DEPRECATED \
--	-DGTK_DISABLE_DEPRECATED \
--	-DLOCALEDIR="\"$(datadir)/locale\"" \
--	-DPIXMAPDIR="\"$(datadir)/pixmaps\"" \
-+	-DLOCALEDIR="\"/usr/share/locale\"" \
-+	-DPIXMAPDIR="\"$(pkgdatadir)/pixmaps\"" \
- 	$(LIBGNOMEUI_CFLAGS)
- 
- bin_PROGRAMS = gnono
diff --git a/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch b/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch
deleted file mode 100644
index edf5238c1475..000000000000
--- a/games-board/gnono/files/gnono-1.9.1-glib-single-include.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-Index: gnono-1.9.1/src/ai.c
-===================================================================
---- gnono-1.9.1.orig/src/ai.c
-+++ gnono-1.9.1/src/ai.c
-@@ -24,9 +24,7 @@
- #include <config.h>
- #endif
- 
--#include <glib/garray.h>
--#include <glib/gmessages.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "cards.h"
- #include "game.h"
-Index: gnono-1.9.1/src/ai.h
-===================================================================
---- gnono-1.9.1.orig/src/ai.h
-+++ gnono-1.9.1/src/ai.h
-@@ -23,7 +23,7 @@
- #ifndef __GN_AI_H__
- #define __GN_AI_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- void computer_play (gboolean pickup);
- 
-Index: gnono-1.9.1/src/cards.c
-===================================================================
---- gnono-1.9.1.orig/src/cards.c
-+++ gnono-1.9.1/src/cards.c
-@@ -25,9 +25,7 @@
- #endif
- 
- #include <stdlib.h>			/* for rand() */
--#include <glib/garray.h>
--#include <glib/gmem.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <gdk-pixbuf/gdk-pixbuf-core.h>
- 
- #include "cards.h"
-Index: gnono-1.9.1/src/cards.h
-===================================================================
---- gnono-1.9.1.orig/src/cards.h
-+++ gnono-1.9.1/src/cards.h
-@@ -23,7 +23,7 @@
- #ifndef __GN_CARDS_H__
- #define __GN_CARDS_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <gdk-pixbuf/gdk-pixbuf-core.h>
- 
- static const gdouble GN_CARD_HEIGHT = 98.0;
-Index: gnono-1.9.1/src/game.c
-===================================================================
---- gnono-1.9.1.orig/src/game.c
-+++ gnono-1.9.1/src/game.c
-@@ -24,9 +24,7 @@
- #include <config.h>
- #endif
- 
--#include <glib/garray.h>
--#include <glib/gmessages.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <gtk/gtkmain.h>
- #include <libgnome/gnome-config.h>
- 
-Index: gnono-1.9.1/src/game.h
-===================================================================
---- gnono-1.9.1.orig/src/game.h
-+++ gnono-1.9.1/src/game.h
-@@ -23,7 +23,7 @@
- #ifndef __GN_GAME_H__
- #define __GN_GAME_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- /*#define GN_DEBUG*/
- 
-Index: gnono-1.9.1/src/interface.h
-===================================================================
---- gnono-1.9.1.orig/src/interface.h
-+++ gnono-1.9.1/src/interface.h
-@@ -23,7 +23,7 @@
- #ifndef __GN_INTERFACE_H__
- #define __GN_INTERFACE_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <gtk/gtkwidget.h>
- #include <gtk/gtkwindow.h>
- 
-Index: gnono-1.9.1/src/main.c
-===================================================================
---- gnono-1.9.1.orig/src/main.c
-+++ gnono-1.9.1/src/main.c
-@@ -26,7 +26,7 @@
- 
- #include <unistd.h>
- #include <glib/gi18n.h>
--#include <glib/gmain.h>
-+#include <glib.h>
- #include <gtk/gtkmain.h>
- 
- #include "interface.h"
-Index: gnono-1.9.1/src/players.c
-===================================================================
---- gnono-1.9.1.orig/src/players.c
-+++ gnono-1.9.1/src/players.c
-@@ -24,8 +24,7 @@
- #include <config.h>
- #endif
- 
--#include <glib/garray.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <glib/gi18n.h>
- #include <gtk/gtklabel.h>
- #include <gtk/gtkwidget.h>
-Index: gnono-1.9.1/src/players.h
-===================================================================
---- gnono-1.9.1.orig/src/players.h
-+++ gnono-1.9.1/src/players.h
-@@ -23,8 +23,7 @@
- #ifndef __GN_PLAYERS_H__
- #define __GN_PLAYERS_H__
- 
--#include <glib/garray.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "cards.h"
- 
-Index: gnono-1.9.1/src/preferences.h
-===================================================================
---- gnono-1.9.1.orig/src/preferences.h
-+++ gnono-1.9.1/src/preferences.h
-@@ -23,7 +23,7 @@
- #ifndef __GN_PREFERENCES_H__
- #define __GN_PREFERENCES_H__
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <gtk/gtkwidget.h>
- 
- void dlg_preferences (GtkWidget *caller, gpointer data);
diff --git a/games-board/gnono/gnono-1.9.1-r1.ebuild b/games-board/gnono/gnono-1.9.1-r1.ebuild
deleted file mode 100644
index 9d5ede968dd4..000000000000
--- a/games-board/gnono/gnono-1.9.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="A rewrite for GNOME of the Windows card game WUNO"
-HOMEPAGE="https://sourceforge.net/projects/gnono/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="gnome-base/libgnomeui
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-glib-single-include.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gnono/metadata.xml b/games-board/gnono/metadata.xml
deleted file mode 100644
index 53a5689a737a..000000000000
--- a/games-board/gnono/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gnono</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/gnubg-1.05.000-r1 b/games-board/gnubg-1.05.000-r1
new file mode 100644
index 000000000000..08511a39ff2e
--- /dev/null
+++ b/games-board/gnubg-1.05.000-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmp:0 dev-libs/libxml2 media-fonts/dejavu media-libs/freetype:2 media-libs/libcanberra media-libs/libpng:0 sys-libs/readline:0 x11-libs/cairo x11-libs/pango gtk? ( x11-libs/gtk+:2 ) opengl? ( x11-libs/gtk+:2 x11-libs/gtkglext virtual/glu ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/libintl sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=GNU BackGammon
+EAPI=6
+HOMEPAGE=http://www.gnubg.org/
+IUSE=cpu_flags_x86_avx gtk opengl python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 dev-libs/gmp:0 dev-libs/libxml2 media-fonts/dejavu media-libs/freetype:2 media-libs/libcanberra media-libs/libpng:0 sys-libs/readline:0 x11-libs/cairo x11-libs/pango gtk? ( x11-libs/gtk+:2 ) opengl? ( x11-libs/gtk+:2 x11-libs/gtkglext virtual/glu ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/libintl
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://gnubg.org/media/sources/gnubg-release-1.05.000-sources.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87ad67f658e0ddaace30a01f54789628
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
deleted file mode 100644
index ce3cd234c4a5..000000000000
--- a/games-board/gnubg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnubg-release-1.05.000-sources.tar.gz 15030177 BLAKE2B a53c7d1d242083631a18f8c3eaa4d006fbbda8b6aef8240c1cc27a98b284cebd31ad2787ddd6e360a96bb365851c611971d47f686b2d8a42dfa35ff6a240eb02 SHA512 1d8080c362cb32a3828b6913823d0eb42b0befac7a9fbd6d5ee3346e7515f6150876ac3b8bd59d5fd0c0de2a03187441165bb82eff0ffa1fb84e385dcea58590
-EBUILD gnubg-1.05.000-r1.ebuild 2602 BLAKE2B 27a62ac75fe72e8ede5d30682a401e2daf11ccbbe7bd0ebd81f9a73708e4708dabe36698986bef5663d4ae7bf1b97e84c449c294447e4d47721c6704c2c1575a SHA512 5f95e71851deacdc08f62b7e96e8a60591ea4bd54f17d5376ebf4f5b51775cadf3146b4f65f96b3cfefbfa513b55490d18e052948f509291d2921686986c10d6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnubg/gnubg-1.05.000-r1.ebuild b/games-board/gnubg/gnubg-1.05.000-r1.ebuild
deleted file mode 100644
index b8e5f10b0a12..000000000000
--- a/games-board/gnubg/gnubg-1.05.000-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 gnome2-utils
-
-DESCRIPTION="GNU BackGammon"
-HOMEPAGE="http://www.gnubg.org/"
-SRC_URI="http://gnubg.org/media/sources/${PN}-release-${PV}-sources.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x86-fbsd"
-IUSE="cpu_flags_x86_avx gtk opengl python sqlite cpu_flags_x86_sse cpu_flags_x86_sse2 threads"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/gmp:0
-	dev-libs/libxml2
-	media-fonts/dejavu
-	media-libs/freetype:2
-	media-libs/libcanberra
-	media-libs/libpng:0
-	sys-libs/readline:0
-	x11-libs/cairo
-	x11-libs/pango
-	gtk? ( x11-libs/gtk+:2 )
-	opengl? (
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		virtual/glu
-	)
-	python? ( ${PYTHON_DEPS} )
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# use ${T} instead of /tmp for constructing credits (bug #298275)
-	sed -i -e 's:/tmp:${T}:' credits.sh || die
-	sed -i -e 's/fonts //' Makefile.in || die # handle font install ourself to fix bug #335774
-	sed -i \
-		-e '/^localedir / s#=.*$#= @localedir@#' \
-		-e '/^gnulocaledir / s#=.*$#= @localedir@#' \
-		po/Makefile.in.in || die
-	sed -i \
-		-e '/^gnubgiconsdir / s#=.*#= /usr/share#' \
-		-e '/^gnubgpixmapsdir / s#=.*#= /usr/share/pixmaps#' \
-		pixmaps/Makefile.in || die
-	sed -i \
-		-e '1i#include <config.h>' \
-		copying.c || die #551896
-}
-
-src_configure() {
-	local simd=no
-	local gtk_arg=--without-gtk
-
-	if use gtk || use opengl ; then
-		gtk_arg=--with-gtk
-	fi
-	use cpu_flags_x86_sse  && simd=sse
-	use cpu_flags_x86_sse2 && simd=sse2
-	use cpu_flags_x86_avx  && simd=avx
-	econf \
-		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF}/html \
-		--disable-cputest \
-		--enable-simd=${simd} \
-		${gtk_arg} \
-		$(use_enable threads) \
-		$(use_with python) \
-		$(use_with sqlite sqlite) \
-		$(use_with opengl board3d)
-}
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins ${PN}.weights *bd
-	dodir /usr/share/${PN}/fonts
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/fonts/Vera.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/fonts/VeraBd.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf /usr/share/${PN}/fonts/VeraSeBd.ttf
-	make_desktop_entry "gnubg -w" "GNU Backgammon"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gnubg/metadata.xml b/games-board/gnubg/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gnubg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnuchess-6.2.4 b/games-board/gnuchess-6.2.4
new file mode 100644
index 000000000000..1d61c02897ed
--- /dev/null
+++ b/games-board/gnuchess-6.2.4
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Console based chess interface
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/chess/chess.html
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/chess/gnuchess-6.2.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1359664f48fbc360b4a64681fa1702d0
diff --git a/games-board/gnuchess-6.2.5 b/games-board/gnuchess-6.2.5
new file mode 100644
index 000000000000..1b7f2e9f5f07
--- /dev/null
+++ b/games-board/gnuchess-6.2.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Console based chess interface
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/chess/chess.html
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=mirror://gnu/chess/gnuchess-6.2.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=037e7465b8f34a6c91a86688807f8064
diff --git a/games-board/gnuchess-book-1.02-r1 b/games-board/gnuchess-book-1.02-r1
new file mode 100644
index 000000000000..6cc63bfbe004
--- /dev/null
+++ b/games-board/gnuchess-book-1.02-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=games-board/gnuchess-6.2.3
+DESCRIPTION=Opening book for gnuchess
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/chess/chess.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=games-board/gnuchess-6.2.3
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=mirror://gnu/chess/book_1.02.pgn.gz
+_md5_=f9508e51af77e305a2c123d52c24f5cd
diff --git a/games-board/gnuchess-book/Manifest b/games-board/gnuchess-book/Manifest
deleted file mode 100644
index 841ac95bb23c..000000000000
--- a/games-board/gnuchess-book/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST book_1.02.pgn.gz 26265281 BLAKE2B 0e9b1d8dcaafa5db974ad61444f327669b5618eea661d73069f448ec5263afaac046d5ae15f9bbf5f1aec5d7e224b07a0820527954a6130d759e5fba00ed4b8c SHA512 2fda39fae66a2afaf0084bd482465de04a65b842276760cde69cb6649c0d3b90c5341e10b4d344e06983bdc97ec8802582d622290bc419b8742d3cd6dd39688a
-EBUILD gnuchess-book-1.02-r1.ebuild 554 BLAKE2B c3cde5f8947b4808fcd80649d91cf906b846b5b049f96014060833f63b06ac345370533a6618aff8df53e2855ad4937d99707d395cd4ff00c27e2c3184cbec48 SHA512 29c0a9a9d860380e68db060e80793ce76833d1beca10a4afdd68a2a920eb7352431207add6b2362fa5f12136acef7c09542766338d93d5453dbda6ee7362b3c6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild b/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
deleted file mode 100644
index 47e9b358322c..000000000000
--- a/games-board/gnuchess-book/gnuchess-book-1.02-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Opening book for gnuchess"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/book_${PV}.pgn.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RESTRICT="userpriv" # bug #112898
-
-DEPEND=">=games-board/gnuchess-6.2.3"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
-
-src_compile() {
-	gnuchess --addbook=book_${PV}.pgn || die
-}
-
-src_install() {
-	insinto /usr/share/gnuchess
-	doins book.bin
-}
diff --git a/games-board/gnuchess-book/metadata.xml b/games-board/gnuchess-book/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gnuchess-book/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
deleted file mode 100644
index b391d78c861d..000000000000
--- a/games-board/gnuchess/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnuchess-6.2.4.tar.gz 757985 BLAKE2B bbb83a9fe7a7ace155b869deebdb67474d6c23538e7852167e846d5570bcd878634b0b2576f3ee33407913976103c637d3b024a8b81f290325c88c84d573d85c SHA512 53546d3319cd6a7bc70be5cc11c29cf33c71b747de2244a7d8d4aff6b00318ad35ee0e27058b40a265c62ef02c188d2e34cba9bbf439306220796e7332904d42
-DIST gnuchess-6.2.5.tar.gz 782359 BLAKE2B d9ae979023ea6265e89a25223935df3847adfc52d46df2a9fe96700081f613f7817b4add22e3a63aa4e035adea9c1f4856cb1e9b80d751c3ee63818b5924c388 SHA512 f3f65a85eb4c93f6f10c7058bde7ee7f4a48c2f465b24a7cc0d5bcafe4df186b434ce23bf8c032d012efffba39c6c3c60ada484ff22d87114ce2be5dd0da6835
-EBUILD gnuchess-6.2.4.ebuild 440 BLAKE2B 7a2769716516ee2dea1b0a7d7cf76625e244e47e485ea5cceaa7fcf419f4baff99a80fdd8573fe2825990e7c58582acfee1aac6d36d7752e776a157f673d4ad2 SHA512 2de88c8d341b321ca37d0a2d369ce497762de4a79432bb0a53911eea7644ac29edfd0e8081b1c951c807dd3aedfcd03ce89d7e0584b4e0c6c52d7627a791e3f2
-EBUILD gnuchess-6.2.5.ebuild 443 BLAKE2B 8cfd191557073ef39505219bde801f90d28f6ff785a44446d5aa68f0d6365ca35773d2194dfb0240f6b0c04725a1c39f23d3142f7219c7b9656b2feb1e6e808d SHA512 40bcb82fa16ed49715eb105e2351822bf69b18aaedc05ef3b1efed3cdca534788304373eb5f54349132eed2fa26c566e81592b1a974e8b5231de1c29e9d71bae
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnuchess/gnuchess-6.2.4.ebuild b/games-board/gnuchess/gnuchess-6.2.4.ebuild
deleted file mode 100644
index 739454eaf6e1..000000000000
--- a/games-board/gnuchess/gnuchess-6.2.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}
diff --git a/games-board/gnuchess/gnuchess-6.2.5.ebuild b/games-board/gnuchess/gnuchess-6.2.5.ebuild
deleted file mode 100644
index e368ad19a379..000000000000
--- a/games-board/gnuchess/gnuchess-6.2.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="https://www.gnu.org/software/chess/chess.html"
-SRC_URI="mirror://gnu/chess/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-src_configure() {
-	strip-flags # bug #199097
-	econf --without-readline # bug 491088
-}
diff --git a/games-board/gnuchess/metadata.xml b/games-board/gnuchess/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gnuchess/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnugo-3.9.1-r1 b/games-board/gnugo-3.9.1-r1
new file mode 100644
index 000000000000..444dd03b5d34
--- /dev/null
+++ b/games-board/gnugo-3.9.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
+DESCRIPTION=A Go-playing program
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/gnugo/devel.html
+IUSE=readline
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3
+RDEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0= games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/gnugo-3.9.1.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_=a3536715666102f081b551cdf59fccfb
diff --git a/games-board/gnugo-3.9.1-r2 b/games-board/gnugo-3.9.1-r2
new file mode 100644
index 000000000000..9eb228e789b5
--- /dev/null
+++ b/games-board/gnugo-3.9.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
+DESCRIPTION=A Go-playing program
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gnugo/devel.html
+IUSE=readline
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-3
+RDEPEND=readline? ( sys-libs/readline:0= ) >=sys-libs/ncurses-5.2-r3:0=
+SLOT=0
+SRC_URI=mirror://gentoo/gnugo-3.9.1.tar.gz
+_md5_=6007e2ab439c1be111489489da374d96
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
deleted file mode 100644
index 6af0f6bff655..000000000000
--- a/games-board/gnugo/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnugo-3.9.1-format-security.patch 1943 BLAKE2B 2dd1c6f7b69da62baac53336e1b017136b16392b85a343aeb41d47fd10f5464a98eee1c8383e31531b21f72456a037bf72fb206752818f2fb39939d46bccb35a SHA512 5d53c53173980c9e73ce1f19c5c5e9228308cb00a61a623e942a3cc8598b73cc188ef24fda0b44feddcf0f381dbebdccf85716a187de730a9bb6412d1f9d61a7
-AUX gnugo-3.9.1-invalid-move.patch 727 BLAKE2B 5c5a13e3b00175627a45a4ef1d32b4a3dc049114281219ec70a22985c2deb027938b2e4ee1c0a58c1da8759800fdd9f98d6bb4981405f51af6269e0a01dedb74 SHA512 a1f20761e714670e2173b36390492304252bf30e46f93e37dee3cc72de346a59a8daaaaa6f0cf2e20834637598831f0f55d4c6c0825021d6fd00055a57db2bdb
-DIST gnugo-3.9.1.tar.gz 3207748 BLAKE2B 4251e125eac20188926210db8640f1ae4ff2b79f6a59b429af9e10fcfd6b0d34f9bf180b32194c519a7b59905a4b5e8bc1a2e45a071a8b8696bf16dd04f6a342 SHA512 b2b215fb8c1ebb0b58e54d14dcc02af3b76bde3a1b84a842a11a0a6018c77a2464c44b26fe0e7ad73b2b2e7fa22005466821bf762108c2c2e04428d3d459af97
-EBUILD gnugo-3.9.1-r1.ebuild 662 BLAKE2B 48296b632f9c05b031b7550e76af9a25217e21c7503a17f65fd859b4170ef8436251fa8ec911278cf4c469c5544f41c79975a197612c0938169211a89554de73 SHA512 287f9f4e6b7a7daa14cbfa7efe45d8f784c08fd4805a1b6f249e269156d9320a9d490ae1204a7c7bf52881e4bfd3b9e4982b3428a73f1cbae2f4db45f452fc58
-EBUILD gnugo-3.9.1-r2.ebuild 628 BLAKE2B 2e8947dbf827d1c757764f3aac8d269f5bc33082c2b1a3bd2a04a410d8f15c8ceea9ea8b914f65be8135c2acc9907da5e4bb796a6007e07206ddba6352b79970 SHA512 5d960b3058ec6289cac727d7549f78e9320e9bd0ea524f9306a0105169568393aa58e6d8d8960124115585e26d6bc8c1b638878ece3481f84ce2df11aeaba81c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnugo/files/gnugo-3.9.1-format-security.patch b/games-board/gnugo/files/gnugo-3.9.1-format-security.patch
deleted file mode 100644
index 7828187c571d..000000000000
--- a/games-board/gnugo/files/gnugo-3.9.1-format-security.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/patterns/dfa.c b/patterns/dfa.c
-index 3689616..2d2f8c6 100644
---- a/patterns/dfa.c
-+++ b/patterns/dfa.c
-@@ -279,7 +279,7 @@ resize_dfa(dfa_t *pdfa, int max_states, int max_indexes)
-  * dump a dfa (debugging purpose).
-  */
- 
--static const char *line =
-+static const char line[] =
-   "----------------------------------------------------\n";
- 
- void
-diff --git a/patterns/mkpat.c b/patterns/mkpat.c
-index 70a6964..5f1f1dd 100644
---- a/patterns/mkpat.c
-+++ b/patterns/mkpat.c
-@@ -1419,7 +1419,7 @@ generate_autohelper_code(int funcno, int number_of_params, int *labels)
-     /* A common case. Just use the labels as parameters. */
-     switch (number_of_params) {
-     case 0:
--      code_pos += sprintf(code_pos, autohelper_functions[funcno].code);
-+      code_pos += sprintf(code_pos, "%s", autohelper_functions[funcno].code);
-       break;
-     case 1:
-       code_pos += sprintf(code_pos, autohelper_functions[funcno].code,
-diff --git a/patterns/uncompress_fuseki.c b/patterns/uncompress_fuseki.c
-index 3290b05..c67a733 100644
---- a/patterns/uncompress_fuseki.c
-+++ b/patterns/uncompress_fuseki.c
-@@ -224,9 +224,9 @@ main(int argc, char *argv[])
- 
-   assert(boardsize > 0);
-   if (boardsize > MAX_BOARD) {
--    printf(output_strings[PREAMBLE]);
-+    printf("%s", output_strings[PREAMBLE]);
-     printf(output_strings[HEADER], boardsize);
--    printf(output_strings[FOOTER]);
-+    printf("%s", output_strings[FOOTER]);
-     return EXIT_SUCCESS;
-   }
-   
-@@ -251,7 +251,7 @@ main(int argc, char *argv[])
-     board[k][boardsize + 1] = '|';
-   }
- 
--  printf(output_strings[PREAMBLE]);
-+  printf("%s", output_strings[PREAMBLE]);
-   printf(output_strings[HEADER], boardsize);
-   
- 
-@@ -308,7 +308,7 @@ main(int argc, char *argv[])
-   if (mode == C_OUTPUT)
-     write_pattern_c_code(NULL, board1d, NO_MOVE, 0, boardsize, -1);
-   
--  printf(output_strings[FOOTER]);
-+  printf("%s", output_strings[FOOTER]);
- 
-   return EXIT_SUCCESS;
- }
diff --git a/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch b/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
deleted file mode 100644
index 1da388a043b5..000000000000
--- a/games-board/gnugo/files/gnugo-3.9.1-invalid-move.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 84a32e9cee2a70c0ec6ef58c1be279fed84a9a53 Mon Sep 17 00:00:00 2001
-From: Gunnar Farnebäck <gunnar@lysator.liu.se>
-Date: Thu, 13 Jun 2013 18:45:03 +0000
-Subject: Avoid crashing due to registering an invalid loss move reason.
-
----
-diff --git a/engine/value_moves.c b/engine/value_moves.c
-index e9f2daa..7ec8fdd 100644
---- a/engine/value_moves.c
-+++ b/engine/value_moves.c
-@@ -383,7 +383,7 @@ do_find_more_owl_attack_and_defense_moves(int color, int pos,
-       int dcode = owl_does_defend(pos, dd, &kworm);
- 
-       if (dcode >= DRAGON2(dd).owl_defense_code) {
--	if (dcode == LOSS)
-+	if (dcode == LOSS && kworm != NO_MOVE)
- 	  add_loss_move(pos, dd, kworm);
- 	else
- 	  add_owl_defense_move(pos, dd, dcode);
---
-cgit v0.9.0.2
diff --git a/games-board/gnugo/gnugo-3.9.1-r1.ebuild b/games-board/gnugo/gnugo-3.9.1-r1.ebuild
deleted file mode 100644
index aba4225ac342..000000000000
--- a/games-board/gnugo/gnugo-3.9.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A Go-playing program"
-HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="readline"
-
-DEPEND="readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0="
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-invalid-move.patch
-}
-
-src_configure() {
-	egamesconf \
-		$(use_with readline) \
-		--enable-cache-size=32
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-board/gnugo/gnugo-3.9.1-r2.ebuild b/games-board/gnugo/gnugo-3.9.1-r2.ebuild
deleted file mode 100644
index 64afb5b85e90..000000000000
--- a/games-board/gnugo/gnugo-3.9.1-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Go-playing program"
-HOMEPAGE="https://www.gnu.org/software/gnugo/devel.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="readline"
-
-RDEPEND="
-	readline? ( sys-libs/readline:0= )
-	>=sys-libs/ncurses-5.2-r3:0=
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-invalid-move.patch
-	"${FILESDIR}"/${P}-format-security.patch
-)
-
-src_configure() {
-	econf \
-		$(use_with readline) \
-		--enable-cache-size=32
-}
diff --git a/games-board/gnugo/metadata.xml b/games-board/gnugo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gnugo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gnushogi-1.4.1-r1 b/games-board/gnushogi-1.4.1-r1
new file mode 100644
index 000000000000..1c37c29b3325
--- /dev/null
+++ b/games-board/gnushogi-1.4.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0 X? ( x11-libs/libXaw ) >=sys-devel/bison-1.34 >=sys-devel/flex-2.5
+DESCRIPTION=Japanese version of chess (commandline + X-Version)
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/gnushogi/
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0 X? ( x11-libs/libXaw )
+SLOT=0
+SRC_URI=mirror://gnu/gnushogi/gnushogi-1.4.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=12881e3a2a50c0cbe19ca4bb382ae99f
diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
deleted file mode 100644
index ae083d846cd7..000000000000
--- a/games-board/gnushogi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnushogi-1.4.1.tar.gz 542301 BLAKE2B bc2c0c89ca63d4cc617914771f9439d1e99ef89c87d46b3649fde97d521b874c74f049fe5340a5ccab603e7f532441821b7785aef2b50609903e926905d75ba9 SHA512 b997f309bfba85553465ceb262094aa0a9a53dc7ad970f77c0eb0c1558ba12f9dd15b42a6abfc85f5ac08bbfecc7816a6e3e4fb0efe2caabb043fb343b1ebecd
-EBUILD gnushogi-1.4.1-r1.ebuild 1008 BLAKE2B d8cfb1c28cc479e601f74cd71780325c5a7d0a0c9513c70f6c447bf5c73c39ed83dc8c00628af1107d4a7ce08cacc42d7b71834e957821ef2ff30a8f4fd7eecc SHA512 81d6ee8e19542475e1b79c445ed95357aa395bec68d3972f869c3c59c2d1626967740c89068027c387406c81e794c84ed2e43f5a4556c2dc525ed396678e3030
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild b/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
deleted file mode 100644
index ebef0138a0f3..000000000000
--- a/games-board/gnushogi/gnushogi-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Japanese version of chess (commandline + X-Version)"
-HOMEPAGE="https://www.gnu.org/software/gnushogi/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="sys-libs/ncurses:0
-	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	>=sys-devel/bison-1.34
-	>=sys-devel/flex-2.5"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^bbk:/s/$/ gnushogi_compile pat2inc sizetest/' \
-		Makefile.in || die
-	sed -i \
-		-e "/^LIBDIR/s:=.*:=\"$(get_libdir)\":" \
-		gnushogi/Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_with X x) \
-		$(use_enable X xshogi)
-}
-
-src_install() {
-	dobin gnushogi/gnushogi
-	doman doc/gnushogi.6
-	doinfo doc/gnushogi.info
-	if use X ; then
-		dobin xshogi/xshogi
-		doman doc/xshogi.6
-		make_desktop_entry xshogi XShogi
-	fi
-	dolib gnushogi/gnushogi.bbk
-	dodoc README NEWS CONTRIB doc/gnushogi/*.html
-}
diff --git a/games-board/gnushogi/metadata.xml b/games-board/gnushogi/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gnushogi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/goatee-gtk-0.3.1 b/games-board/goatee-gtk-0.3.1
new file mode 100644
index 000000000000..d0ef6d565a29
--- /dev/null
+++ b/games-board/goatee-gtk-0.3.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A monadic take on a 2,500-year-old board game - GTK+ UI
+EAPI=6
+HOMEPAGE=http://khumba.net/projects/goatee
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1
+SRC_URI=mirror://hackage/packages/archive/goatee-gtk/0.3.1/goatee-gtk-0.3.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=8332104c05ade952aad8dcb6bbf3b408
diff --git a/games-board/goatee-gtk-0.3.1.1 b/games-board/goatee-gtk-0.3.1.1
new file mode 100644
index 000000000000..c6d61a79d101
--- /dev/null
+++ b/games-board/goatee-gtk-0.3.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.15:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DESCRIPTION=A monadic take on a 2,500-year-old board game - GTK+ UI
+EAPI=6
+HOMEPAGE=http://khumba.net/projects/goatee
+IUSE=doc hscolour profile test
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=>=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?] >=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?] >=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?] >=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.15:=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:=
+SLOT=0/0.3.1.1
+SRC_URI=mirror://hackage/packages/archive/goatee-gtk/0.3.1.1/goatee-gtk-0.3.1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=aece427812bf9d698734a67372089415
diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest
deleted file mode 100644
index 2a2c0ee87013..000000000000
--- a/games-board/goatee-gtk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST goatee-gtk-0.3.1.1.tar.gz 60560 BLAKE2B f58420c1b625b0be47da43ea006cbe68d465ed2ed44e640ad7ffd9f17d738f612321c42bb9bbf76404b1bfd91ae4baee73381881e5185afe653dd10992417dfc SHA512 d745e981171fb1267d4765d90e4906b51a0cd7e7e3804c7f418feea21cc6f047e5e4e70f86f3ed3abbe11800e91ecd4669d566c194ad9b340941e509e6061f70
-DIST goatee-gtk-0.3.1.tar.gz 60946 BLAKE2B f8da73654e6e6ad3abf3e05db2d28f052f769ddbd87ea40f74024d8e192ae85ce16c772441c266b4658a6f0ff7fb2ab590e0f6505c8321f9a2b573f333da8860 SHA512 3638dc3b0ebcf2d2be76688d75bdb0e870ce683af1dc6d924bf2f0add52a0c2afa4bbec4f3e9edb6229e0753914fda808dc92549239dd558d06848b40aee7cb1
-EBUILD goatee-gtk-0.3.1.1.ebuild 1156 BLAKE2B 1b0564dc2a4a792d97a5fdd09b5448cabafbbfc7990b571b98aa43dc94d447658406ea296e32d8995fb03cd7b1a7b66ed67abe5c0dbd3e088b2aa2bb14184294 SHA512 1700895a947dc331b964702fba744be6bd1335b173983822f1eb6c97f8a5e3f38b42a040205f08f5b3d8a52f1e36b014de207e4e45dc7a298fc0cf4d56e32b76
-EBUILD goatee-gtk-0.3.1.ebuild 1133 BLAKE2B a7bfe9da9adfed3e3d4e2e26fb78554d35a68fdde30a84b9c95fee4255e7a09327df91e1de43f681e8570826c12432ead5c1a118943a69f4439ee572d8761a50 SHA512 e1162ac254cac998547294fa81e72ebd77ea9c0e29fc3ad27ee4a9899cac561d1e0636818d31682f858b7e9a841146fc92d573d3aaa22e66112da751371a904b
-MISC metadata.xml 808 BLAKE2B 9d09adbd3d47ff4ff59389062d67cb8c9419465646e42d46cfe3e5273446723967979d42f10ac93fc447586b4c13ac9c8c206dee05a9ae3580b5b3d59301aa9d SHA512 513240a99caaf62bbb711d95e10ddaa546d59f4846c5bf707d19440893bf628f0e08e80bf7ec85c3e2cb62c360800b0fbd1dd1dce9f171e38534fd7bc0751599
diff --git a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
deleted file mode 100644
index 101cd3e9609a..000000000000
--- a/games-board/goatee-gtk/goatee-gtk-0.3.1.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
-HOMEPAGE="http://khumba.net/projects/goatee"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?]
-	>=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	>=dev-haskell/gtk-0.13:=[profile?] <dev-haskell/gtk-0.15:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'directory >= 1.1 && < 1.3' 'directory >= 1.1'
-}
diff --git a/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild
deleted file mode 100644
index c58adea91aba..000000000000
--- a/games-board/goatee-gtk/goatee-gtk-0.3.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
-HOMEPAGE="http://khumba.net/projects/goatee"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-games/goatee-0.3:=[profile?] <dev-games/goatee-0.4:=[profile?]
-	>=dev-haskell/cairo-0.13:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	>=dev-haskell/gtk-0.13:=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 )
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'HUnit >= 1.2 && < 1.3' 'HUnit >= 1.2' \
-		'gtk >= 0.13 && < 0.14' 'gtk >= 0.13'
-}
diff --git a/games-board/goatee-gtk/metadata.xml b/games-board/goatee-gtk/metadata.xml
deleted file mode 100644
index 97b194b9e0c6..000000000000
--- a/games-board/goatee-gtk/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		Goatee is a Go library and game editor, written in Haskell.  It provides a
-		GUI for recording, studying, and editing game records.  Underneath this is a
-		portable library for manipulating SGF files to build UIs and tools.  Goatee
-		aims to be full-featured by supporting all of the SGF spec and allowing for
-		full and easy customization of the game records you create.
-
-		This package is the GTK+ UI.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-board/grhino-0.16.1-r1 b/games-board/grhino-0.16.1-r1
new file mode 100644
index 000000000000..2384d1592d8c
--- /dev/null
+++ b/games-board/grhino-0.16.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=gnome? ( =gnome-base/libgnomeui-2* ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Reversi game for GNOME, supporting the Go/Game Text Protocol
+EAPI=6
+HOMEPAGE=http://rhino.sourceforge.net/
+IUSE=gnome gtp nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gnome? ( =gnome-base/libgnomeui-2* ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/rhino/grhino-0.16.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f5ea3da9fdb4d4fb46c84cd723e99048
diff --git a/games-board/grhino/Manifest b/games-board/grhino/Manifest
deleted file mode 100644
index 7c2805bfb365..000000000000
--- a/games-board/grhino/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST grhino-0.16.1.tar.gz 1178091 BLAKE2B aa5d0c7aab142aabc39d849cbf18cce5aeb57d42f74ad1e2117c57e735d9a6b383fc284cae82c64d5ed8ac809eb364568133e06f42a1062312512becf87df315 SHA512 17fd5539a9d74a715237a51cbf2f3119feae2bed6a26496b02d7882385d5567571ba4b4c4018554944d07322e5a0c3b3235e141579281621f5a030acbe6480e2
-EBUILD grhino-0.16.1-r1.ebuild 961 BLAKE2B bb979c3934c7a110f9bd1f9999716abf14240e18c5433a0af211dc77c69c2130fad8d9f537493916a7f9c7a9a4e5f9e371f9409e870a9d6bf89f8d29b42f0e47 SHA512 e399e36b3bc2e812d64cc8770bd27186c8c16e6950b42b6b514ee7b77fb2551300ac39b3e89d5995af9226866ed2dd052244aa373575081c9eb40717be38c65e
-MISC metadata.xml 513 BLAKE2B a54919c1b021a9e66b91ba91a110e75b9dd687538bc0da2c2beb5f738615e0f034954a7f19273022199efeb47cf1d3933ab5db7ddd8649a492846fd6a020eb05 SHA512 783fb713c40369df38b8aebba6ac6234ee646e097c1992b1ebeb790c3ddd1fa1915c5fcf4f1505f1b6450d9a4ca85e6be7eb38613316a3a475b625906fea6fc4
diff --git a/games-board/grhino/grhino-0.16.1-r1.ebuild b/games-board/grhino/grhino-0.16.1-r1.ebuild
deleted file mode 100644
index 2697f40697f5..000000000000
--- a/games-board/grhino/grhino-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Reversi game for GNOME, supporting the Go/Game Text Protocol"
-HOMEPAGE="http://rhino.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rhino/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome gtp nls"
-
-RDEPEND="gnome? ( =gnome-base/libgnomeui-2* )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	sed -i '/^(\|locale\|help\|omf\|icon\|)/s:@datadir@:/usr/share:' \
-		Makefile.in || die
-}
-
-src_configure() {
-	if use gnome || use gtp; then
-		econf \
-			--localedir=/usr/share/locale \
-			$(use_enable gnome) \
-			$(use_enable gtp) \
-			$(use_enable nls)
-	else
-		econf \
-			--localedir=/usr/share/locale \
-			--enable-gtp \
-			--disable-gnome \
-			$(use_enable nls)
-	fi
-}
-
-src_install() {
-	default
-	use gnome && make_desktop_entry ${PN} GRhino
-}
diff --git a/games-board/grhino/metadata.xml b/games-board/grhino/metadata.xml
deleted file mode 100644
index 5a4a37d191d9..000000000000
--- a/games-board/grhino/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription lang="en">
-An Othello game with strong AI.
-</longdescription>
-  <use>
-    <flag name="gtp">Install the GTP (Go/Game Text Protocol) frontend</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">rhino</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-board/gtkatlantic-0.6.1-r1 b/games-board/gtkatlantic-0.6.1-r1
new file mode 100644
index 000000000000..612684a2226e
--- /dev/null
+++ b/games-board/gtkatlantic-0.6.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=dev-libs/libxml2 media-libs/libpng:0 x11-libs/gtk+:3 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=Monopoly-like game that works with the monopd server
+EAPI=6
+HOMEPAGE=http://gtkatlantic.gradator.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 media-libs/libpng:0 x11-libs/gtk+:3
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/gtkatlantic-0.6.1.tar.bz2
+_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_=1e50ccb691eb2ee4f720d50b6d3ef596
diff --git a/games-board/gtkatlantic/Manifest b/games-board/gtkatlantic/Manifest
deleted file mode 100644
index ab11c3be8b69..000000000000
--- a/games-board/gtkatlantic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gtkatlantic-0.6.1-warnings.patch 161 BLAKE2B 90c51beb2323480c1987a3c79e857cb39b03e596b0ebe55e9b9ec46c4c0a9a8da9ba707377fff3e334d8c0158fa5b092fb62b585870511cecb9683328d2ac161 SHA512 9ccfc0ea087484cf837bff5b29f824ab63f69a8b7599690f3db8fbb2ebe83865fdf8764869b7c973e35901dc6839109b9e6266a606aedc47c063947e71d80f93
-DIST gtkatlantic-0.6.1.tar.bz2 505701 BLAKE2B 5580b6bba4836e99d6c06cda4b3bef9236adf828cfd909497082922a8b3cfe158f4240a399ea879f6700f9c66f29d81926963cbf145af20bd28e2bed33241e8a SHA512 8388cbdd4c73d56eacb18a645bdd2d1f6e1fa8d21be972eaba1c4d6af6d0681a2a54909a82d6846ddd785b46b0ad99193e5afea528c5662956ff89a1e6e366df
-EBUILD gtkatlantic-0.6.1-r1.ebuild 961 BLAKE2B cbbe539ce1fc32805db49e376784966b7ab9589538103706fe243903b1b25670242ae0ee49ec93781a8eea401eac8589ef3496e461bab233a9673f41c8aaa928 SHA512 95cbc7f780cae82fa443aa0681990275357f3d9276f58572728898b8c031a97c4565bfe08faa0abf319ff451d434f687259a92ec2670d1ee8f02b834f37475d9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch b/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch
deleted file mode 100644
index a55c7ac7e132..000000000000
--- a/games-board/gtkatlantic/files/gtkatlantic-0.6.1-warnings.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/readpng.c
-+++ b/src/readpng.c
-@@ -23,6 +23,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <glib.h>
- 
- #include <png.h>
diff --git a/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild b/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
deleted file mode 100644
index a4f03258084b..000000000000
--- a/games-board/gtkatlantic/gtkatlantic-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="Monopoly-like game that works with the monopd server"
-HOMEPAGE="http://gtkatlantic.gradator.net/"
-SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.6/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/libpng:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-warnings.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's:$(datadir):/usr/share:' {,data/}Makefile.am || die
-	sed -i -e 's/configure.in/configure.ac/' configure.in || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-icons-path=/usr/share/icons/hicolor
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/gtkatlantic/metadata.xml b/games-board/gtkatlantic/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/gtkatlantic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/gtkboard-0.11_pre0-r1 b/games-board/gtkboard-0.11_pre0-r1
new file mode 100644
index 000000000000..343a4e593bc9
--- /dev/null
+++ b/games-board/gtkboard-0.11_pre0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] gnome? ( gnome-base/libgnomeui ) virtual/pkgconfig
+DESCRIPTION=Board games system
+EAPI=6
+HOMEPAGE=http://gtkboard.sourceforge.net/
+IUSE=gnome
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 media-libs/libsdl:0[sound] media-libs/sdl-mixer[vorbis] gnome? ( gnome-base/libgnomeui )
+SLOT=0
+SRC_URI=mirror://sourceforge/gtkboard/gtkboard-0.11pre0.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_=62c207d74fb2cea21268142160726287
diff --git a/games-board/gtkboard/Manifest b/games-board/gtkboard/Manifest
deleted file mode 100644
index be9ebb0bbe9a..000000000000
--- a/games-board/gtkboard/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gtkboard-0.11_pre0-gcc41.patch 591 BLAKE2B e3480d0969645815db2cdd9bf32e840bb671a2f9f89c96f5a7e6c61d258d52edc59eca03df64d461298d2afd478f9cccb396a75c31ecd701dc476d304b1f2b32 SHA512 ce7b16643054fd9171c867b6ee7db946577d610fe9f9f6ac9fab98378182934b2eca1828ec8550664c1c67bc2b0f6631ed4538feb9e52d6b9f0ac7e73c1cd656
-AUX gtkboard-0.11_pre0-gcc45.patch 696 BLAKE2B 922d0fdaf0352d21aaa5eaae8bd4eec92b0b2f4321afdf8430096fcf46e7749a06a35c1582d8f6752b0462c96ea150457b58df5d1d32d1f24e0d540e854b3e34 SHA512 7e95753b1a69fbb7031deeb160a7b6da2113171984d8680630317f121e0a12ba97c3230342a3beb5ece6d3579ac4d65a0e9fa1b78e635c690e9e5fac15b54cd9
-DIST gtkboard-0.11pre0.tar.gz 459581 BLAKE2B efe6fc70d8b7c144f0db33502fbce509a0e600008747a5e9bd42d84d0d43de1c790436b731273c36d39356fb489f5616539655fd37ed5cfb802365dcd826e013 SHA512 09d4a1d5203ef0e21d21b5b6cb351add71d0a415ad83808b6e281dcf3f869221e99ae683846462d465eaac54f5eb292e1d8447ea7cdfb07602a8add49e2db283
-EBUILD gtkboard-0.11_pre0-r1.ebuild 971 BLAKE2B 64ccae830a9a59c7d22539b522b4c6c8b2fc12a410c8f26d00ab663a479dd7412af3dbfb2ddc7a2578b93401679c8f9fcbdbec2efd29a97b523b3c7f939cb477 SHA512 dfd3cbefeedb47642fff2171f602883cede95f975bc1e66b3c0a41d469abec852d4e198e0e4f0b5b4f7778140a0b906fa32f275a3940ec7b1e6559364e1fa767
-MISC metadata.xml 331 BLAKE2B e0040c6aa21b5a10ccde6c6dd7ab3463f3821cfdf21e778b4e2dabc93b0bbf902081859f781697949aee8adc870641a7ce449a84e8e451875ebd62a4ef21d970 SHA512 809518470fc270114a602f396c94e42ed33a87e6a46924679e9f1c23dae1863ee4b5a4419bd73d95a069b3810e53f3dd59bfb40ddaa888c9683ac6e2c1c52fb3
diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc41.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc41.patch
deleted file mode 100644
index f14096e155d1..000000000000
--- a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc41.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-gcc-4.1 patch from debian.
-
---- a/src/board.c
-+++ b/src/board.c
-@@ -74,7 +74,7 @@
- //! default background
- char board_default_colors [9] = {215, 215, 215, 215, 215, 215, 0, 0, 0};
- 
--static int cell_size, num_pieces;
-+int cell_size, num_pieces;
- 
- extern void ui_make_human_move (byte *move, int *rmove);
- 
---- a/src/menu.c
-+++ b/src/menu.c
-@@ -829,7 +829,7 @@
- 	
- 	{
- 	int i;
--	GtkItemFactoryEntry help_items [3];
-+	GtkItemFactoryEntry help_items [4];
- 	help_items[0].path = g_strdup_printf ("/Help/%s", opt_game->name);
- 	help_items[0].accelerator = NULL;
- 	help_items[0].callback = NULL;
diff --git a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch b/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch
deleted file mode 100644
index dd5a2f92a1e2..000000000000
--- a/games-board/gtkboard/files/gtkboard-0.11_pre0-gcc45.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/menu.c	2010-05-24 12:35:15.000000000 +0200
-+++ b/src/menu.c	2010-05-24 12:35:48.000000000 +0200
-@@ -176,7 +176,7 @@
- {
- #if GTK_MAJOR_VERSION == 2
- 	// FIXME: can't get existing bgcolor
--	const int size = 20;
-+#define size 20
- 	static char pixbufs [7][size*(size+1)];
- 	char **pixmap_data;
- 	static GdkPixmap *pixmaps[7];
---- a/src/wordtris.c	2010-05-24 12:36:50.000000000 +0200
-+++ b/src/wordtris.c	2010-05-24 12:38:30.000000000 +0200
-@@ -122,7 +122,7 @@
- 
- // TODO: change this so that we only need to specify pixmaps for individual squares
- 
--static const int lava_xpm_header_size = 253+1;
-+#define lava_xpm_header_size 253+1
- static char * lava_xpm_header[] = 
- {
- "144 504 253 2",
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild
deleted file mode 100644
index fe97dee177fa..000000000000
--- a/games-board/gtkboard/gtkboard-0.11_pre0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P=${P/_}
-DESCRIPTION="Board games system"
-HOMEPAGE="http://gtkboard.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libsdl:0[sound]
-	media-libs/sdl-mixer[vorbis]
-	gnome? ( gnome-base/libgnomeui )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc41.patch
-	"${FILESDIR}"/${P}-gcc45.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "/^LIBS/s:@LIBS@:@LIBS@ -lgmodule-2.0 -lm:" \
-		src/Makefile.in
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--enable-gtk2 \
-		--enable-sdl \
-		$(use_enable gnome)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	doicon pixmaps/${PN}.png
-	make_desktop_entry ${PN} Gtkboard
-	dodoc AUTHORS ChangeLog TODO doc/index.html
-}
diff --git a/games-board/gtkboard/metadata.xml b/games-board/gtkboard/metadata.xml
deleted file mode 100644
index e06235899db3..000000000000
--- a/games-board/gtkboard/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gtkboard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/hexxagon-1.0.2-r1 b/games-board/hexxagon-1.0.2-r1
new file mode 100644
index 000000000000..6b18f3bb537f
--- /dev/null
+++ b/games-board/hexxagon-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2 virtual/pkgconfig
+DESCRIPTION=Clone of the original DOS game
+EAPI=6
+HOMEPAGE=http://www.nesqi.se/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.nesqi.se/download/hexxagon-1.0.2.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_=303d18711f0b8076e3c562c6fb4b4301
diff --git a/games-board/hexxagon/Manifest b/games-board/hexxagon/Manifest
deleted file mode 100644
index 79f59fee6b57..000000000000
--- a/games-board/hexxagon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hexxagon-1.0.2.tar.bz2 1286713 BLAKE2B f6c3a7d0c0b2cd87ec896ebf6c1783561ae9a94a63c678463d2c5912a3bf380f682f136f258591051d00281fe2a92ba6add6477f50ce310b94529b9e4ca0e3e6 SHA512 8723534c4d260b1bac943609ca91ff224a120ad1f6e6362b1c515766f9ad3b339bbb9b0374cd71a482e127c47f6e1742b5189662f22e8eec07978417f5a6bda2
-EBUILD hexxagon-1.0.2-r1.ebuild 628 BLAKE2B 22beb8ef5f6a9c2746a06bcd1ce8addf693ae5eb007686c2f44e0f9aaa0322d1a7ea3d8b28bde59dba6e50f75450996864a593faf6c872453077ddfb993f9d27 SHA512 e7db9fcaa9437942d17a96326d9e6c96a0e33587882c766e557ff7ba06e9a2b206ad6f1b3fe9a8b4b5d34864dc37565f036e8e77d83201027a136b2455c6abed
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild b/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild
deleted file mode 100644
index d335ca45b66e..000000000000
--- a/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Clone of the original DOS game"
-HOMEPAGE="http://www.nesqi.se/"
-SRC_URI="http://www.nesqi.se/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/glibmm:2
-	dev-cpp/gtkmm:2.4
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	append-cxxflags -std=c++11
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newicon images/board_N_2.xpm ${PN}.xpm
-	make_desktop_entry ${PN} Hexxagon
-	dodoc README
-}
diff --git a/games-board/hexxagon/metadata.xml b/games-board/hexxagon/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/hexxagon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/iagno-3.22.0 b/games-board/iagno-3.22.0
new file mode 100644
index 000000000000..2d0b704f81b3
--- /dev/null
+++ b/games-board/iagno-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dominate the board in a classic version of Reversi
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Iagno
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 !<x11-themes/gnome-themes-standard-3.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d39e43cc3c9bae4f8946826ede8de33e
diff --git a/games-board/iagno/Manifest b/games-board/iagno/Manifest
deleted file mode 100644
index 1ade874a96b3..000000000000
--- a/games-board/iagno/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iagno-3.22.0.tar.xz 1815048 BLAKE2B 13d4cfa4e17c139cdf7bc5dd8b2962c35dc6cf245095d3657bb6dcab12eb9f028eec9410781ff0212a2c627121db3c1ca18c404657d1e524122d189a716b3ea2 SHA512 55309dad4b73e70ba007073222eb5cc719a7fc4e1925637d1f124f7ca6092a4c125cba48a9d80e46b97b16736d2266bbd86e8248c1c6e7898669ce703deef53e
-EBUILD iagno-3.22.0.ebuild 763 BLAKE2B bf1959aaf1b626ebe6778ff267205949b723c757c9c98f3cd46316f463e293ce3e4cbae3c6eb6f757581eb7f5b6919e68c48ee57aa160319f89ac5b8c2857d1a SHA512 fece7ed3ff9d8ad74648f313fd14633687eaae7e8dc3e52c6418cde287abd2aecb8df8fd1e802ed023f4f5c2d8161cbd60a2df3fa5b62dd7907e3adcd61e55be
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/iagno/iagno-3.22.0.ebuild b/games-board/iagno/iagno-3.22.0.ebuild
deleted file mode 100644
index cd4cf96fb970..000000000000
--- a/games-board/iagno/iagno-3.22.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Dominate the board in a classic version of Reversi"
-HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.15:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-board/iagno/metadata.xml b/games-board/iagno/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-board/iagno/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/knights-2.6.0_pre20180415 b/games-board/knights-2.6.0_pre20180415
new file mode 100644
index 000000000000..02deaf07fcaf
--- /dev/null
+++ b/games-board/knights-2.6.0_pre20180415
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple chess board based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.linux-apps.com/content/show.php/Knights?content=122046
+IUSE=speech debug +handbook selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kplotting-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-apps/libkdegames-17.12.3:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 speech? ( >=dev-qt/qtspeech-5.9.4:5 ) !games-board/knights:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=https://github.com/KDE/knights/archive/56762d582d8a8543f50c293ff54d5ac5e546c2d9.tar.gz -> knights-2.6.0_pre20180415.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=99bcd6afb3a63fe5d4ca0691ff7321f4
diff --git a/games-board/knights/Manifest b/games-board/knights/Manifest
deleted file mode 100644
index 1c0bfb5efb1e..000000000000
--- a/games-board/knights/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST knights-2.6.0_pre20180415.tar.gz 2642374 BLAKE2B 18648348eb4f9c34a37b0992d5b75a90fbb7fb1b6a7b23750bb57f11553d50a320e68dba303c6ec7fd394a0464341dd28fb8b404bb8ad1b9a92934b767a8183f SHA512 ce022463f9efecfed13fd101d958cd753ea1d167d6a6a70c8735afeccb49a6e9b9e5a4fa15ee7a5510a65eaa08fa0615da109793b7df4a50040d809393723145
-EBUILD knights-2.6.0_pre20180415.ebuild 1385 BLAKE2B 83a9c94fa86c3b2f1ca5e35b8839c3c14c609b3a510dc0101b20ed338922bbaa6264c3d82480a661952902c668439945609a8baafe8473dd5fd7af8f1a04e932 SHA512 b6497ed27a78a3b23d37de1aed7e3aaf11e83b852f626149f20970012c26d29135a13d12066ee73e56fb7fcd3a89faee2bf8db00a340d86512560b5575196823
-MISC metadata.xml 437 BLAKE2B a392fb3cb9557ccbfec875358b70d68f3d6c778875f650fe4667118c0ed3a3ea45adb6f5d245d8e9ac5d5f8567986bc48383333a455135a2d1664213d2b0f603 SHA512 b05223b8fddc2f3de74899b798b6830df6f8ca231f50ab46a4751d173c2aee3003a6538b4eb810d402ccb1cdec01c70e99b25bca25eb3b2c4b9c8326be43f4a1
diff --git a/games-board/knights/knights-2.6.0_pre20180415.ebuild b/games-board/knights/knights-2.6.0_pre20180415.ebuild
deleted file mode 100644
index 3dad37ca163f..000000000000
--- a/games-board/knights/knights-2.6.0_pre20180415.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=56762d582d8a8543f50c293ff54d5ac5e546c2d9
-KDE_HANDBOOK="forceoptional"
-KDE_SELINUX_MODULE="games"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Simple chess board based on KDE Frameworks"
-HOMEPAGE="https://www.linux-apps.com/content/show.php/Knights?content=122046"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="speech"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kplotting)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_kdeapps_dep libkdegames)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	speech? ( $(add_qt_dep qtspeech) )
-"
-RDEPEND="${DEPEND}
-	!games-board/knights:4
-"
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	elog "No chess engines are emerged by default! If you want a chess engine"
-	elog "to play with, you can emerge gnuchess or crafty."
-}
diff --git a/games-board/knights/metadata.xml b/games-board/knights/metadata.xml
deleted file mode 100644
index ec264f573891..000000000000
--- a/games-board/knights/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="speech">Enable text-to-speech support</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-board/mah-jong-1.14-r1 b/games-board/mah-jong-1.14-r1
new file mode 100644
index 000000000000..1e1d7284a809
--- /dev/null
+++ b/games-board/mah-jong-1.14-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/gtk+:2 dev-lang/perl
+DESCRIPTION=A networked Mah Jong program, together with a computer player
+EAPI=6
+HOMEPAGE=http://www.stevens-bradfield.com/MahJong/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://mahjong.julianbradfield.org/Source/mj-1.14-src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fd610ba4daf7682f21c03f2c747f941b
diff --git a/games-board/mah-jong/Manifest b/games-board/mah-jong/Manifest
deleted file mode 100644
index c873e9d44562..000000000000
--- a/games-board/mah-jong/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mj-1.14-src.tar.gz 414414 BLAKE2B 88aa315e629dd6c1155de38897925c99a742054778721f23c4e95b0b82667ad737246a92a1e9e18aa72e8e5b118d7c5bc5e8eb7ac9d0aab51b946a154627a584 SHA512 b4c631ce388041475b877cd4b413fda200932aea19212c00cb606d2ef0bb6a498fe12b7b52b04ef744b296c37c531bc44d9e35f9aed44edf89651580acde91e5
-EBUILD mah-jong-1.14-r1.ebuild 1219 BLAKE2B ba5e9fb1fffb94dd03ffc11d2c2edd281aa78d65d3c86032e7f7d27ad102aeeb13a85ea79144242a3b8f04c832b16f6193d036a1398b0b893c53d8b9575f505a SHA512 283b0885ac17f19f76cc78047f2387c4085c92ee2c6382363f66a6efc87118ec823b7373e59a053fa1951bf17bafb069eab92d6abd2f92e6a386e312b74d72ee
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mah-jong/mah-jong-1.14-r1.ebuild b/games-board/mah-jong/mah-jong-1.14-r1.ebuild
deleted file mode 100644
index 3f7a81b7f8e5..000000000000
--- a/games-board/mah-jong/mah-jong-1.14-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-MY_P="mj-${PV}-src"
-DESCRIPTION="A networked Mah Jong program, together with a computer player"
-HOMEPAGE="http://www.stevens-bradfield.com/MahJong/"
-SRC_URI="http://mahjong.julianbradfield.org/Source/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^.TH/ s/1/6/' xmj.man || die
-	sed -i \
-		-e "/^DESTDIR =/ s:=.*:= ${D}:" \
-		-e "/^BINDIR =/ s:=.*:= /usr/bin:" \
-		-e '/^MANDIR =/ s:man/man1:/usr/share/man/man6:' \
-		-e '/^MANSUFFIX =/ s:1:6:' \
-		-e "/^CC =/ s:gcc:$(tc-getCC):" \
-		-e "/^CFLAGS =/ s:=:= ${CFLAGS}:" \
-		-e "/^LDLIBS =/ s:$:${LDFLAGS}:" \
-		-e '/^INSTPGMFLAGS =/ s:-s::' \
-		-e '/^CDEBUGFLAGS =/d' \
-		-e "/^TILESETPATH=/ s:NULL:\"/usr/share/${PN}/\":" Makefile || die
-}
-
-src_install() {
-	emake install install.man
-	insinto /usr/share/${PN}
-	doins -r fallbacktiles/ tiles-numbered/ tiles-small/
-	newicon tiles-v1/tongE.xpm ${PN}.xpm
-	make_desktop_entry xmj Mah-Jong ${PN}
-	dodoc CHANGES ChangeLog *.txt
-}
diff --git a/games-board/mah-jong/metadata.xml b/games-board/mah-jong/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/mah-jong/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/maitretarot-0.1.98-r1 b/games-board/maitretarot-0.1.98-r1
new file mode 100644
index 000000000000..4c0f92dfe7a9
--- /dev/null
+++ b/games-board/maitretarot-0.1.98-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+DESCRIPTION=server for the french tarot game maitretarot
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/maitretarot.pkg/0.1.98/maitretarot-0.1.98.tar.bz2
+_md5_=c48407f3a21de4864087e4b88e656f00
diff --git a/games-board/maitretarot/Manifest b/games-board/maitretarot/Manifest
deleted file mode 100644
index 2b4a95860f96..000000000000
--- a/games-board/maitretarot/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX maitretarot-0.1.98-format.patch 428 BLAKE2B 70110e2592282654ffd9bfc1a54c0bb12fc43f4ff6cd575535f59151d16a87b047e22165ef099b6f13e48ee189f32b61fb3f7bbf91b6fba7a3e2e17867b6cdb2 SHA512 a6dfc1a6dc027b80076d29b1ffbe28f6dae6f0737f51e760edbf963e31f91b0367120b90a8cb69188307bf91537e14b28ae7202ebd3b9aad80f48684204d94df
-DIST maitretarot-0.1.98.tar.bz2 92050 BLAKE2B eaf38974482043b1f8008fac455b75d7e429f4f9ead26de6a50705ef7f3b8995c0b84b37f0ae95f24df7df2e438e5062763eb62ef526033f1e62aaff9c2ef272 SHA512 99cfe8e99b2214f729d6dc175064f827a258d008c2f67a16a77bbf18ebf73da87fae4d58b9597b582cc450762f2cc497cded26d84bb4ce3e7c25f9891bb72e03
-EBUILD maitretarot-0.1.98-r1.ebuild 580 BLAKE2B 2f964dc58e01b71577029c87735bf4ac55381eed3ff13cceeed7740875cd9798a66b9c23dd00aa1c4b7cad5b4ddf960572aa4bccad32290976926b558a20bd68 SHA512 9c872d8f81fffa7ac6539df1d8e1561e741916844258f252d71144184b3b70ef633f39483a6781f297a7e6c5e5d8efb5f3a119a801997fd4d17f85f3fc2062e4
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
deleted file mode 100644
index d7b5ca55b093..000000000000
--- a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/game.c	2015-12-16 21:59:49.400430743 +0100
-+++ b/src/game.c	2015-12-16 21:59:11.085058332 +0100
-@@ -642,7 +642,7 @@
- 		  (game, prev_winner, c, ((i + prev_winner) % 4),
- 		   game->players[((i + prev_winner) % 4)]->turn, &err))
- 		{
--		  g_message (err->message);
-+		  g_message ("%s", err->message);
- 		  turn_nok = TRUE;
- 		  game->players[((i + prev_winner) % 4)]->ready =
- 		    MT_PLAYER_READY_SEND_NOK_FOR_CARD;
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
deleted file mode 100644
index ab3167b6fe21..000000000000
--- a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="server for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_configure() {
-	econf --with-default-config-file="/etc/maitretarotrc.xml"
-}
diff --git a/games-board/maitretarot/metadata.xml b/games-board/maitretarot/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/maitretarot/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/megamek-0.34.10-r1 b/games-board/megamek-0.34.10-r1
new file mode 100644
index 000000000000..c28dca8749df
--- /dev/null
+++ b/games-board/megamek-0.34.10-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=an unofficial, online version of the Classic BattleTech board game
+EAPI=6
+HOMEPAGE=http://megamek.sourceforge.net/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/megamek/MegaMek-v0.34.10.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=cff4c6a187aaf596cc300a5ed36c3935
diff --git a/games-board/megamek/Manifest b/games-board/megamek/Manifest
deleted file mode 100644
index 5a1d2508bf3c..000000000000
--- a/games-board/megamek/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MegaMek-v0.34.10.zip 16677286 BLAKE2B 73c4ee9e38b4c50221c40c5d0cba1c13de00e586bf2cb9432c356f5c21045c26cfa64705b303c7213f29deda369a97ea5fba397c995c138731a66152c062c5b5 SHA512 943f6ed4f4d57197092a7aa09637f60827f23181a7b8b0991907fcc62109b471ea2ce53816a79dfcad9d8da65c9514be3190e924d9bf2b17aacf84fc1fa6e037
-EBUILD megamek-0.34.10-r1.ebuild 1053 BLAKE2B e9dae9a8ff3f3ee050166d1db15dfb752254ab2c19e4f96fe949c66430de78188b3b8bc442c9c7b1ae8d3c23719707a13a9c534a2750a35438d7221ec82de1d6 SHA512 126ee03e5a9dd995101da2e6c1d63de25d238a6838e595638aac3793ce76270016d1e94bb7a7a417cb7535cbf0e59acd7c03276ad2b973f35703f032486c19ed
-MISC metadata.xml 330 BLAKE2B 08bb146ebca0d9f6e0006d1d6d615a93434dc4a98f363da9da16eba5649678fc36325cdd84253a9f8d3ad72cc165d783228db019026380e447a5242365b29e06 SHA512 e2b391074805c40a32f3a2d74db870e75c5a9cb0413b15b41b43cf7bf16a6bf90363c3d1eb1b6c1fccbc4f44defcadbf44bea218b1a5f3d4fb66a4428e5b5cde
diff --git a/games-board/megamek/megamek-0.34.10-r1.ebuild b/games-board/megamek/megamek-0.34.10-r1.ebuild
deleted file mode 100644
index 6b3fe5a0bb91..000000000000
--- a/games-board/megamek/megamek-0.34.10-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="an unofficial, online version of the Classic BattleTech board game"
-HOMEPAGE="http://megamek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -v *.jar || die
-	edos2unix startup.sh
-	sed -i \
-		-e "s:XmX:Xmx:" \
-		-e "s:/usr/share/java:/usr/share/${PN}:" \
-		-e "s:/usr/share/MegaMek:/usr/share/${PN}:" \
-		startup.sh || die "sed failed"
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant
-}
-
-src_install() {
-	newbin startup.sh ${PN}
-	insinto /usr/share/${PN}
-	doins -r data docs l10n lib mmconf *.jar readme*
-	dodoc HACKING readme.txt
-	make_desktop_entry ${PN} MegaMek /usr/share/pixmaps/${PN}.gif
-	newicon data/images/misc/megamek-icon.gif ${PN}.gif
-}
diff --git a/games-board/megamek/metadata.xml b/games-board/megamek/metadata.xml
deleted file mode 100644
index 1c5cb53716e8..000000000000
--- a/games-board/megamek/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">megamek</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/metadata.xml b/games-board/metadata.xml
deleted file mode 100644
index fb63e54520b5..000000000000
--- a/games-board/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-board category contains board games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-board enthält Brettspiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-board contiene juegos de tablero.
-	</longdescription>
-	<longdescription lang="ja">
-		games-boardカテゴリーにはボード・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-board categorie bevat bordspellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-board chứa các trò chơi dạng bảng.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-board contiene giochi da tavolo.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-board contém jogos de tabuleiro.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-board zawiera gry planszowe.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-board/mt_dolphin_ia-0.1.98-r1 b/games-board/mt_dolphin_ia-0.1.98-r1
new file mode 100644
index 000000000000..a792520ce5fb
--- /dev/null
+++ b/games-board/mt_dolphin_ia-0.1.98-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
+DESCRIPTION=client for the french tarot game maitretarot
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_dolphin_ia.pkg/0.1.98/mt_dolphin_ia-0.1.98.tar.bz2
+_md5_=12bc2a97f1d4a964add1e48fbcb8a1b0
diff --git a/games-board/mt_dolphin_ia/Manifest b/games-board/mt_dolphin_ia/Manifest
deleted file mode 100644
index 14b761480363..000000000000
--- a/games-board/mt_dolphin_ia/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mt_dolphin_ia-0.1.98-formatsecurity.patch 311 BLAKE2B 8b92264e591637fc337561e294cb473e03bb1370243b217dab73c3f5c67df4cd90529f3050528e29113e9f71f92a0e5381eb290e4cd9c2ab4e38e259e6fe9242 SHA512 c919fb834459d435f1648cbefe4bc36c1628586da06162b49282d650c667ab579fb1a2c53e292c0508d286c3cc6ba7ed8e1a0b9ea456c75a191486919c7191e3
-DIST mt_dolphin_ia-0.1.98.tar.bz2 92625 BLAKE2B d4b2373ad100466270f09f854337a098baf9a6744b7223786ed4cb7c4955a3e44020d61a7c331ed6fe796ffc9e787f38d814470a78a56a7a4dac0d3cdf04f38c SHA512 17ba198d344bb8ef499d6844e949155a18f8942266392150d77e5c53dc0ee32bcf6a297153f85d7a964b02de8a82f3d156e899f4d25ef1940dbc794d9b44979c
-EBUILD mt_dolphin_ia-0.1.98-r1.ebuild 532 BLAKE2B a294a8e5e791f60aacd33b24067e9ce90a52b118faa12ba602b96c00a38dfd06440704cd12f8af163e10c4f19611e5d7831d8e188609c90320709f6d363d30aa SHA512 72401906f7173853ecaf854840170abe9f47ffb2d728b7c5f18754a04015f6c16330d14a679adae5439545c7581043790dcac0053b8f7a2fc94e7ed7adb84759
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_dolphin_ia/files/mt_dolphin_ia-0.1.98-formatsecurity.patch b/games-board/mt_dolphin_ia/files/mt_dolphin_ia-0.1.98-formatsecurity.patch
deleted file mode 100644
index af4cc43cefd5..000000000000
--- a/games-board/mt_dolphin_ia/files/mt_dolphin_ia-0.1.98-formatsecurity.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/player_client.c	2015-10-14 21:19:05.347505352 +0200
-+++ b/src/player_client.c	2015-10-14 21:19:22.057195175 +0200
-@@ -33,7 +33,7 @@
- {
-   player->nick[0] = g_string_new (config->player_name->str);
- 
--  g_printerr (player->nick[0]->str);
-+  g_printerr ("%s", player->nick[0]->str);
- 
-   return (0);
- }
diff --git a/games-board/mt_dolphin_ia/metadata.xml b/games-board/mt_dolphin_ia/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/mt_dolphin_ia/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
deleted file mode 100644
index c548718e2f1d..000000000000
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="client for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot
-	dev-games/libmt_client"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-formatsecurity.patch
-)
diff --git a/games-board/mt_gtk_client-0.1.98-r1 b/games-board/mt_gtk_client-0.1.98-r1
new file mode 100644
index 000000000000..420fb47c7d57
--- /dev/null
+++ b/games-board/mt_gtk_client-0.1.98-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client gnome-base/libgnomeui x11-libs/gtk+:2
+DESCRIPTION=client for the french tarot game maitretarot
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+IUSE=gnome
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client gnome-base/libgnomeui x11-libs/gtk+:2 dev-games/cardpics
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_gtk_client.pkg/0.1.98/mt_gtk_client-0.1.98.tar.bz2
+_md5_=8c98df89cb671be785b297213910ca01
diff --git a/games-board/mt_gtk_client/Manifest b/games-board/mt_gtk_client/Manifest
deleted file mode 100644
index b332f8e5982b..000000000000
--- a/games-board/mt_gtk_client/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mt_gtk_client-0.1.98-formatsecurity.patch 365 BLAKE2B c18bb9c664d1e719c53861dad4db625fb631ca07db8e18099fa893ee792236d3166dd833e6221e845c55330c9a260b59fb59dc135d6de41c8390d860915c67eb SHA512 611a1b688411b555f8a0e0bee59ec65bd479991c349d7d862eb6bdfd8113eec781d638f788bf84e4f7ff6ca2f756addec64503de1490409925047e0032f0b741
-DIST mt_gtk_client-0.1.98.tar.bz2 181458 BLAKE2B 9ceff8a2a2b691226e28c2246500d1a93234047870ac5dfcadfb651c26c17b5aa002e0157450769ab2d5304aa3aa28793fdf4dd5d61214c2365e53086be95f7f SHA512 8d43baf29a100b37db0f4f8b3f417c8253b6c243b7ead18efefbc3706361fbc652abf808c0b104dec5573a769eaa2d84903ad0ab602c738c139c86b8c36bf401
-EBUILD mt_gtk_client-0.1.98-r1.ebuild 654 BLAKE2B c8269767bd78c5435c1ce823d119618efa0304786172280ce8aa804bb3c467c7ceab4da387520790127be10bb47deb5339672a02d812f194402afe778dfa49e6 SHA512 6bb1ec87d1188c1600317b5b1b0dc9df410cc68486eea8cc1d00456afcfb3c0e4ee888d3e0f9940881e8e7965dfb929de663a24ca1ac3108f3a7ddcd0d7dbc4a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch b/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch
deleted file mode 100644
index edf33585b810..000000000000
--- a/games-board/mt_gtk_client/files/mt_gtk_client-0.1.98-formatsecurity.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/player.c	2015-10-14 21:52:59.453971198 +0200
-+++ b/src/player.c	2015-10-14 21:53:36.375289009 +0200
-@@ -52,7 +52,7 @@
- {
-   player->nick[0] = g_string_new (config->gui_player_name->str);
- 
--  g_printerr (player->nick[0]->str);
-+  g_printerr ("%s", player->nick[0]->str);
- 
-   gdk_threads_enter ();
-   gtk_statusbar_push (GTK_STATUSBAR (gui_statusbar), 0,
diff --git a/games-board/mt_gtk_client/metadata.xml b/games-board/mt_gtk_client/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/mt_gtk_client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/mt_gtk_client/mt_gtk_client-0.1.98-r1.ebuild b/games-board/mt_gtk_client/mt_gtk_client-0.1.98-r1.ebuild
deleted file mode 100644
index dabed363ec41..000000000000
--- a/games-board/mt_gtk_client/mt_gtk_client-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="client for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome"
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot
-	dev-games/libmt_client
-	gnome-base/libgnomeui
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	dev-games/cardpics"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-formatsecurity.patch
-)
-
-src_configure() {
-	econf $(use_enable gnome gnome2)
-}
diff --git a/games-board/mt_ncurses_client-0.1.98-r1 b/games-board/mt_ncurses_client-0.1.98-r1
new file mode 100644
index 000000000000..09fa7063c69a
--- /dev/null
+++ b/games-board/mt_ncurses_client-0.1.98-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
+DESCRIPTION=client for the french tarot game maitretarot
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_ncurses_client.pkg/0.1.98/mt_ncurses_client-0.1.98.tar.bz2
+_md5_=a76cb0d9cf3060da1751a3ac888a72d1
diff --git a/games-board/mt_ncurses_client/Manifest b/games-board/mt_ncurses_client/Manifest
deleted file mode 100644
index 3419c4450ae0..000000000000
--- a/games-board/mt_ncurses_client/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mt_ncurses_client-0.1.98-format.patch 309 BLAKE2B f6d112c9a3b401c39642a8218dbf1c97e3b8376b68948d2558905f1ce6c55945a9b3f7dda6e9db03d5f8f962d5bec7197f981f37bfa38d2603753f82453231a8 SHA512 0c6a09dd4b3ad1e64c1997a7b82414666c715dd56aaa0c986fe190aaf96f49f1f4a5f773a915480503ed410a8fe15080f0cf0636c0e91854f5a5cf94893f81cc
-DIST mt_ncurses_client-0.1.98.tar.bz2 97156 BLAKE2B 48e58107dc070a35216bf755fb206b7ed1b02c7585ab0e0472acbb33432c7ef7b5671f7e5c0c33b749f975ce5ba360b51686e89a1dd3e391c040436f8229e6f8 SHA512 cb2c8d23e3e2c536d24fb9beacb35577229eae016998fb7c57204284336a53a2378ce0d7b940bec7662766f679502c7d9cbfe4118235300072e648b83c5244b6
-EBUILD mt_ncurses_client-0.1.98-r1.ebuild 544 BLAKE2B 3741a72211bfb2d28b7a8ec1cc570326ffa179389288d159a855a294ad7e365863461cc81a83351cd30338683c171515c869da8351b93e215dfff552881b376a SHA512 59327ea5525b9560776ebc613d6f48bf8ba65ca5c3aac73fdecb9f8747234bc195ab242f4e8c676641ee82a53cbee8f447ad3fe8d5bad8d34476d907f4828b4c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-format.patch b/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-format.patch
deleted file mode 100644
index 155e47db276f..000000000000
--- a/games-board/mt_ncurses_client/files/mt_ncurses_client-0.1.98-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/player_client.c	2015-10-21 14:21:04.317896103 +0200
-+++ b/src/player_client.c	2015-10-21 14:21:40.001225103 +0200
-@@ -38,7 +38,7 @@
- {
-   player->nick[0] = g_string_new (config->player_name->str);
- 
--  g_printerr (player->nick[0]->str);
-+  g_printerr ("%s", player->nick[0]->str);
- 
-   return 0;
- }
diff --git a/games-board/mt_ncurses_client/metadata.xml b/games-board/mt_ncurses_client/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/mt_ncurses_client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
deleted file mode 100644
index cd247d29f412..000000000000
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="client for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	dev-libs/libxml2
-	dev-games/libmaitretarot
-	dev-games/libmt_client
-	sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
diff --git a/games-board/natch-2.4-r1 b/games-board/natch-2.4-r1
new file mode 100644
index 000000000000..ce8c3f6d3ddc
--- /dev/null
+++ b/games-board/natch-2.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=A program to solve chess proof games
+EAPI=6
+HOMEPAGE=http://natch.free.fr/Natch.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://natch.free.fr/Natch/Natch-2.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_=9b37758f17e88caa0324f8544f81abfe
diff --git a/games-board/natch/Manifest b/games-board/natch/Manifest
deleted file mode 100644
index 1310511c105e..000000000000
--- a/games-board/natch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX natch-2.4-format.patch 754 BLAKE2B 55c042df161710b3eb5bbaa7ea97a1be54468ec9243dcde6ab323301cb3cb6ef8e74bc4fe9c8d7bf0ea8382685e25274fba2ed7a885d9c5902d9e3ae9a6bc3de SHA512 9e80e047a458e4339c3a5b4e3023f96a853e8b1ae3ab847fa1de68adb0319961f996a10de9478b98acd0718433f034e42f98b84d145e9b5879fcf777a83bfc9d
-DIST Natch-2.4.tar.gz 196621 BLAKE2B 9d778ace5783f04638101265923053565cfb8930ac6657f10ac3370987bc4acd0f08af958d601ddeeded59253d619f83593b9283e34f905f30d03d65e110bc32 SHA512 390b1cb295f6d8f4d5ec27abad9aae0c06ea1b4bb9c29dcf5bf74f515ac4a90926a657fe3dd3cc91233cf772d2f072cdc34a043e5e294dc668ca619b21535d81
-EBUILD natch-2.4-r1.ebuild 567 BLAKE2B 36cd8b8301fdb15537267931270c0f34672a0f05b895a5e0dae4272366ef724bac0d04ac4625dc0ed8c16d406c18c75ff390875387870a4aa608bec674b8d9e5 SHA512 8973fa2aefa7d454c87fe77e0874c5f215e7bcedc03250bf3630ddbca542f2188b7c9ea5625455fb017ce98ed7e298d4b105f032b81fae4e1d4d5aadb73ed62b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/natch/files/natch-2.4-format.patch b/games-board/natch/files/natch-2.4-format.patch
deleted file mode 100644
index 38e2b7939b4e..000000000000
--- a/games-board/natch/files/natch-2.4-format.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/pcpjtool.c	2014-10-17 08:38:21.547119790 +0200
-+++ b/src/pcpjtool.c	2014-10-17 08:42:04.949035648 +0200
-@@ -45,7 +45,7 @@
-     int			nb_libre = 0;
-     const char*		separation_line = "+---+---+---+---+---+---+---+---+\n";
- 
--    fprintf( MainFD, separation_line );
-+    fprintf( MainFD, "%s", separation_line );
-     for (i=7; i>=0; i--)
-     {
- 	fputc( '|', MainFD );
-@@ -94,7 +94,7 @@
- 	    fputc( '|', MainFD );
- 	}
- 	fputc('\n', MainFD);
--	fprintf( MainFD, separation_line );
-+	fprintf( MainFD, "%s", separation_line );
- 	if (nb_libre)
- 	{
- 	    forsythe[nb_forsythe] = '0' + nb_libre;
-@@ -224,7 +224,7 @@
- {
-     char		s[12];
- 
--    fprintf(MainFD, move_to_string(coup, s));
-+    fprintf(MainFD, "%s", move_to_string(coup, s));
- }
- 
- void
diff --git a/games-board/natch/metadata.xml b/games-board/natch/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/natch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/natch/natch-2.4-r1.ebuild b/games-board/natch/natch-2.4-r1.ebuild
deleted file mode 100644
index 8b263b424b33..000000000000
--- a/games-board/natch/natch-2.4-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P="Natch-${PV}"
-DESCRIPTION="A program to solve chess proof games"
-HOMEPAGE="http://natch.free.fr/Natch.html"
-SRC_URI="http://natch.free.fr/Natch/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	newbin src/Natch natch
-	dodoc AUTHORS ChangeLog NEWS README THANKS example.txt
-}
diff --git a/games-board/openyahtzee-1.9.3 b/games-board/openyahtzee-1.9.3
new file mode 100644
index 000000000000..278c073c54a8
--- /dev/null
+++ b/games-board/openyahtzee-1.9.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure pretend
+DEPEND=x11-libs/wxGTK:3.0[X] >=sys-devel/gcc-4.6 dev-libs/boost
+DESCRIPTION=A full-featured wxWidgets version of the classic dice game Yahtzee
+EAPI=6
+HOMEPAGE=http://openyahtzee.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/openyahtzee/openyahtzee-1.9.3.tar.xz
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=95e0c1def3b38c1304fdebb82e8b14c4
diff --git a/games-board/openyahtzee/Manifest b/games-board/openyahtzee/Manifest
deleted file mode 100644
index 7296f363c5ec..000000000000
--- a/games-board/openyahtzee/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openyahtzee-1.9.3.tar.xz 178868 BLAKE2B 0cb5b87f8d4f9cdfbc81918f937ec783fef2488146f5497de0d01d6b50eeeef2edc308ca4230f1103b5770a03ccb74740e5c42b2ea01bd67705ed2aff6667d99 SHA512 7e696141d8f567247300c7f4924889b0a2f88866c70a10ad7619709990cacb726ec0af28bcee62a9f0d607d7f83ca5bb62d7275b2cc6e0343004f9125e4fb506
-EBUILD openyahtzee-1.9.3.ebuild 937 BLAKE2B dbc52d1d309360507c5260c151bc48a881be4925b5fc48e185264a7136565aea3fbd30cddf1a67375f1176dc18e58e7e328649c07dbe6ba3a8ddfe39df1a0453 SHA512 c213cf1063433df039abe8daf8f74e6f378c0f6f9353d80c12b5caa32c1a8c604570d9e54f269f0ce554adf83a644fccb90be40454faec1759ca4fe027d201f0
-MISC metadata.xml 462 BLAKE2B df86908050673276a1a63ed0c15cf798092cdb4caa47097cc1e96781d1afc11b08ccbf25598e40357c0c13ed3ba27508820d45bb73930ab137d00999abdabd36 SHA512 a2a3cb524e9432f9e439fd7f1bff4885ffca9230df17e5ad1f529710e606e34f5a65f0b880fd538d8dcccc228cba9672b8267fa17f8f2d477f7da416cbb8a7bc
diff --git a/games-board/openyahtzee/metadata.xml b/games-board/openyahtzee/metadata.xml
deleted file mode 100644
index e9c6b68de58e..000000000000
--- a/games-board/openyahtzee/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Open Yhatzee is an open-source (free) version of the classic dice game Yahtzee.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">openyahtzee</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild b/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
deleted file mode 100644
index 35b4ee304f5e..000000000000
--- a/games-board/openyahtzee/openyahtzee-1.9.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-inherit eutils wxwidgets toolchain-funcs versionator
-
-DESCRIPTION="A full-featured wxWidgets version of the classic dice game Yahtzee"
-HOMEPAGE="http://openyahtzee.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openyahtzee/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.6
-	dev-libs/boost"
-
-pkg_pretend() {
-	local ver=4.6
-	local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
-
-	if tc-is-gcc ; then
-		if ! version_is_at_least ${ver} $(gcc-version); then
-			die ${msg}
-		fi
-	else
-		ewarn "Ensure your compiler has C++11 support, otherwise build will fail."
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	need-wxwidgets unicode
-	econf --datadir=/usr/share
-}
diff --git a/games-board/pasang-emas-3.1.0-r1 b/games-board/pasang-emas-3.1.0-r1
new file mode 100644
index 000000000000..4ba7782c34ed
--- /dev/null
+++ b/games-board/pasang-emas-3.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-text/gnome-doc-utils >=x11-libs/gtk+-2.18.2:2 virtual/libintl app-text/rarian nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=A traditional game of Brunei
+EAPI=6
+HOMEPAGE=http://pasang-emas.sourceforge.net/
+IUSE=extras nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-text/gnome-doc-utils >=x11-libs/gtk+-2.18.2:2 virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/pasang-emas/pasang-emas-3.1.0.tar.bz2 extras? ( mirror://sourceforge/pasang-emas/pasang-emas-themes-1.0.tar.bz2 mirror://sourceforge/pasang-emas/pet-marble.tar.bz2 mirror://sourceforge/pasang-emas/pet-fragrance.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_=238d2a3c0a713a55c51eb3100e9676da
diff --git a/games-board/pasang-emas/Manifest b/games-board/pasang-emas/Manifest
deleted file mode 100644
index 4fea99f2c7d7..000000000000
--- a/games-board/pasang-emas/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX pasang-emas-3.1.0-build.patch 1346 BLAKE2B 0ff7cb7800a5b65986a4311dbcb396863ce520786106b9450096bdd6bec5453279d3b93dd8de124b36649ca3c7b98c0b2f9b89ea53ac3f9352c22aae4eeff2a3 SHA512 5918f34bdb05f2717db5ad4c3e06adf5fe44f1093a8c964e5362bbfd86a542b9cd593ae4bf045d628b23e489f8365f2e4e2ee8b07a68ec96fffa2a055c804120
-DIST pasang-emas-3.1.0.tar.bz2 3030528 BLAKE2B c61caf905f17fb51fd58609c8f0ec9fc61c0db0fd75eb65d271db39f7c3e670d651d8ed2134aa165cdfd8358d252b78b7716008c1aa96e2f7e9fed1b6123f06e SHA512 c1f7dc259100e2fe643ac0a5d766dad10435145b3fd76e698335817bc30b7a55a5816df920fc3c86fb7b533661b1dd179b20ad01586be914bb3a9cad9be29a65
-DIST pasang-emas-themes-1.0.tar.bz2 1190560 BLAKE2B a2218920dc601a12c86da15600f8cd09ae434265695d872d706086ab02b9b02e557e8c786789b8089d142b86114adbabfe392f1af290138a95a1d805845582a9 SHA512 8b82ce6ba588b83ed4a0d70d8aab256e2dae16143e64ca8a1fc25ffe61f001cdbc71d62d8eb42d9af4aeb63d6584f47b513b0ce1840d9b9f49d9b1b635eb4043
-DIST pet-fragrance.tar.bz2 1019437 BLAKE2B a4408d60c4ea14efab84f10bbce4da0382253f19cd60a82b278ac55c6b9f897a0e2eeef924930b7c8159a02460e3a269dea4254126e2389c84fe0f02cf61c62e SHA512 2af8908848cc20962c70ef573156b208dbc33032529035ae6f0b5760f5eb1b718582dc823340587e29b7e66a2d3c89ba113dedbf299c0bef639f28329ff278f2
-DIST pet-marble.tar.bz2 631999 BLAKE2B aee419bfe7355f6c90822deed14d44174d5862f08a6bcb81cabd3c2b05f7ee99ae836574af21e3a2a9c9bf203c1c39d8c4f435466cbbf274cdd162e2c6cc3805 SHA512 3ecaeaddb12e23fbd90e4d158a47dffb73b756bf9f5263d93c5f6aa21d290be3d91885de7200cdd3a45718b49ac19cd7073ed8bf83697af6bff64759f810122e
-EBUILD pasang-emas-3.1.0-r1.ebuild 1417 BLAKE2B 4aaf2fa8344a0f7d8807002c6eaecdfbf82acc0a92362766dccfca9bf2b018a0f0ae199015ef17cb495f4e31df00e73d950a20f62646c20a1a112da9aac8bd6c SHA512 dd36d7d6a5867b4eb1c73ade3d4651d60cce6ce5a169bd617a8355aad9c6bd284d806b2c6908a23aab4f98833cfc9000bc2225bf3884bf59820206c38fbba619
-MISC metadata.xml 418 BLAKE2B 6b928c147371451147002cd57f68630e399e64539f8de21411c9d3d0aa79313f306b1f273c24f980b6240f102c828c86c6246f23bcd2898466f0d9538682b09b SHA512 32f5fe7a93d534ffe61023137d21e0d5cfe9328ecbf16c3b0e117a3d131319fa3e284b23c244669cde0c1c0cf45ceffb291dd53198bd4961536ff223e71a3465
diff --git a/games-board/pasang-emas/files/pasang-emas-3.1.0-build.patch b/games-board/pasang-emas/files/pasang-emas-3.1.0-build.patch
deleted file mode 100644
index 93703d8e6d1c..000000000000
--- a/games-board/pasang-emas/files/pasang-emas-3.1.0-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- pasang-emas-2.1.0-orig/src/Makefile.in
-+++ pasang-emas-2.1.0/src/Makefile.in
-@@ -221,11 +221,11 @@
- 	pasang.vapi \
- 	pasang.h
- 
--LDADD = libpasang.a $(DEPS_LIBS)
-+LDADD = libpasang.a $(DEPS_LIBS) -lm
- INCLUDES = $(DEPS_CFLAGS) \
- 	--include ../config.h \
- 	-DLOCALEDIR=\"$(localedir)\"    \
--	-DPIXMAPSDIR=\"$(datadir)/pixmaps\" \
-+	-DPIXMAPSDIR=\"/usr/share/pixmaps\" \
- 	-DDATADIR=\"$(datadir)\" \
- 	-DTHEME_ROOT_DIR=\"$(datadir)/$(PACKAGE_TARNAME)/themes\" \
- 	-DUSER_THEME_ROOT_DIR=\".$(PACKAGE_TARNAME)/themes\" \
---- pasang-emas-2.1.0-orig/data/Makefile.in
-+++ pasang-emas-2.1.0/data/Makefile.in
-@@ -229,10 +229,10 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = kayu
--desktopdir = $(datadir)/applications
-+desktopdir = /usr/share/applications
- desktop_in_files = pasang-emas.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
--appicondir = $(datadir)/pixmaps
-+appicondir = /usr/share/pixmaps
- appicon_DATA = \
- 	pasang-emas.png		\
- 	pasang-emas-flash.png
---- pasang-emas-2.1.0-orig/po/Makefile.in.in
-+++ pasang-emas-2.1.0/po/Makefile.in.in
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = /usr/share/locale
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
diff --git a/games-board/pasang-emas/metadata.xml b/games-board/pasang-emas/metadata.xml
deleted file mode 100644
index 3fef0b97bb1d..000000000000
--- a/games-board/pasang-emas/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="extras">Install some extra themes</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">pasang-emas</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild b/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
deleted file mode 100644
index b028b2871b2d..000000000000
--- a/games-board/pasang-emas/pasang-emas-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="A traditional game of Brunei"
-HOMEPAGE="http://pasang-emas.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	extras? ( mirror://sourceforge/${PN}/pasang-emas-themes-1.0.tar.bz2
-	          mirror://sourceforge/${PN}/pet-marble.tar.bz2
-	          mirror://sourceforge/${PN}/pet-fragrance.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras nls"
-
-RDEPEND="app-text/gnome-doc-utils
-	>=x11-libs/gtk+-2.18.2:2
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	app-text/rarian
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/Icon/s:\.png::' \
-		data/pasang-emas.desktop.in || die
-	gnome2_omf_fix
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		--with-omf-dir=/usr/share/omf \
-		--with-help-dir=/usr/share/gnome/help \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	if use extras; then
-		insinto /usr/share/${PN}/themes
-		doins -r \
-			"${WORKDIR}"/marble \
-			"${WORKDIR}"/pasang-emas-themes-1.0/{conteng,kaca} \
-			"${WORKDIR}"/fragrance
-	fi
-	use nls || rm -rf "${D}"usr/share/locale
-}
-
-pkg_preinst() {
-	gnome2_scrollkeeper_savelist
-}
-
-pkg_postinst() {
-	gnome2_scrollkeeper_update
-}
-
-pkg_postrm() {
-	gnome2_scrollkeeper_update
-}
diff --git a/games-board/peg-e-1.2.5 b/games-board/peg-e-1.2.5
new file mode 100644
index 000000000000..3f28944b77d2
--- /dev/null
+++ b/games-board/peg-e-1.2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A peg solitaire game
+EAPI=6
+HOMEPAGE=https://gottcode.org/peg-e/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/peg-e/peg-e-1.2.5-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5f1ac78ea5d50c669daff56e1f4914da
diff --git a/games-board/peg-e/Manifest b/games-board/peg-e/Manifest
deleted file mode 100644
index 98ea89d1a4a1..000000000000
--- a/games-board/peg-e/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX peg-e-1.2.5-gentoo.patch 253 BLAKE2B e9bb860a02f87bc255b2161e3a98c860cde367fede9d5b9bc8bef52d4934cb959fbccb50fe4a79687670fb9a264ea038a37d67c14b2f60c51a59b4818c1ee602 SHA512 8c5952603a748ba7e156451c2d0338a6dd8b89d7f8485f4360b8d353993cfd7e6c03c7b9976c649059c788f80cc4a48441ff628b342e791ba833f2c700af505a
-DIST peg-e-1.2.5-src.tar.bz2 598322 BLAKE2B f717d3e378fe69e087631abd8f0cbe3cc3bf2479ab86a608c256100778bc94baa40752463a4cb511c4ffd431ce38333318803a1dc289be4bd7d3aad595cd76d1 SHA512 cfd15e2c8cba678d64c9289ab2aa3803af48aebb3e4e545439c247d622dd914dac0735a0fd786cdba1678b448c22a9e40f48a9a1db6391fa6532e3d918c0ca10
-EBUILD peg-e-1.2.5.ebuild 688 BLAKE2B ff8b8fc6a40e90aa69d2dc7513ca2e8b662f072d22bdff72a19591a16668912e186eed8239fae5e19d1271e034ffd63e8d4939adfc52b8819c7bcf2562b965d5 SHA512 c6c27f4aea964f185e2e49f1acbcf2533ea748ad0cde2800ec68c6cde83940d89a8488000e3313f6965c018af1c9d7db632926db0d11ad31e32226935a956402
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch b/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch
deleted file mode 100644
index e6430001cf35..000000000000
--- a/games-board/peg-e/files/peg-e-1.2.5-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/peg-e.pro	2018-05-29 13:01:32.000000000 +0200
-+++ b/peg-e.pro	2018-07-11 20:15:46.151082792 +0200
-@@ -75,7 +75,7 @@
- 	RESOURCES = icons/icon.qrc
- 
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
- 		BINDIR = bin
diff --git a/games-board/peg-e/metadata.xml b/games-board/peg-e/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/peg-e/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/peg-e/peg-e-1.2.5.ebuild b/games-board/peg-e/peg-e-1.2.5.ebuild
deleted file mode 100644
index e53cb97a9303..000000000000
--- a/games-board/peg-e/peg-e-1.2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils
-
-DESCRIPTION="A peg solitaire game"
-HOMEPAGE="https://gottcode.org/peg-e/"
-SRC_URI="https://gottcode.org/peg-e/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/phalanx-22-r1 b/games-board/phalanx-22-r1
new file mode 100644
index 000000000000..d6127a5201d0
--- /dev/null
+++ b/games-board/phalanx-22-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=A chess engine suitable for beginner and intermediate players
+EAPI=6
+HOMEPAGE=http://phalanx.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/phalanx/Phalanx-XXII.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=67f40b93a4fc852c0b01c1c2ff87c240
diff --git a/games-board/phalanx/Manifest b/games-board/phalanx/Manifest
deleted file mode 100644
index db404c0c6458..000000000000
--- a/games-board/phalanx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Phalanx-XXII.tar.gz 356831 BLAKE2B 11eacd51a77df0a0b25315145a3519e0ae34f97b1498b691167978700fe038770db24e0ce3dec4141a4f5f4c38ab38bf90b338a1320a09191f1757b895ce7307 SHA512 e959556bb29eb2178dbf77c656d6c6520a8568e93e03350c5141bee8808a04d0a0c1050a3db53b1fef4a7b6e6b724272700e52feb6c5d7f8308cebca91c51d67
-EBUILD phalanx-22-r1.ebuild 930 BLAKE2B edd80d4bcd0c850e67ed5c378d290c256c2acd320652a0becda1cc3cb188f3f0cd44f5a0cc68342e6e050144ac839d06f88a9f35b85891839fb63b78db39270b SHA512 e335f8cbf3d84867d7062d35ab2905d8da9df656fcffadb239abccb5e032c9a1b3d305d1be77f8ead81d584384c44a44cd30e5b751a2422b8121dd9cf3c1df5a
-MISC metadata.xml 590 BLAKE2B cc0d80f3eb03f6aab26996d3773c68b2f64328b1d9b8d4798fc4168d924c87d87f196d2dea76484cadcbd3d0d45ca4da9a34407cf57d59f9ce314203f2fcfee0 SHA512 48daed32c34b1183e44136d4da6572da67508c2782e6a28aebbf6d6d52b94eb2cf8c6dd079d8eab61a4180d82e1894271eb56e32d73f6bc302c2aa3050949fd6
diff --git a/games-board/phalanx/metadata.xml b/games-board/phalanx/metadata.xml
deleted file mode 100644
index 525b2313bb60..000000000000
--- a/games-board/phalanx/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-This is the Phalanx chess engine. Phalanx's playing style is quite human-like;
-when it plays at full strength, it may be compared to a intermediate-to-strong
-player; beginners will be right at home with it, too.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">phalanx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/phalanx/phalanx-22-r1.ebuild b/games-board/phalanx/phalanx-22-r1.ebuild
deleted file mode 100644
index cb72a63812f8..000000000000
--- a/games-board/phalanx/phalanx-22-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-MY_PN="Phalanx"
-MY_PV="XXII"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A chess engine suitable for beginner and intermediate players"
-HOMEPAGE="http://phalanx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/phalanx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	# configure is not used in the project; confs are in Makefile,
-	# and here we override them:
-	local define="-DGNUFUN" myvar
-	for myvar in "PBOOK" "SBOOK" "LEARN" ; do
-		define="${define} -D${myvar}_DIR=\"\\\"/usr/share/${PN}\\\"\""
-	done
-	emake \
-		DEFINES="${define}" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin phalanx
-	insinto /usr/share/${PN}
-	doins pbook.phalanx sbook.phalanx learn.phalanx
-	einstalldocs
-}
diff --git a/games-board/pioneers-15.3-r1 b/games-board/pioneers-15.3-r1
new file mode 100644
index 000000000000..3482f4e24afb
--- /dev/null
+++ b/games-board/pioneers-15.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 !dedicated? ( >=x11-libs/gtk+-3.4:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/rarian >=gnome-base/libgnome-2.10 ) ) nls? ( virtual/libintl ) dev-util/gob:2 virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A clone of the popular board game The Settlers of Catan
+EAPI=6
+HOMEPAGE=http://pio.sourceforge.net/
+IUSE=dedicated help nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-4.0
+RDEPEND=>=dev-libs/glib-2.26:2 !dedicated? ( >=x11-libs/gtk+-3.4:3 >=x11-libs/libnotify-0.7.4 help? ( app-text/rarian >=gnome-base/libgnome-2.10 ) ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/pio/pioneers-15.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec6675169fcbd29976d1f8c7eec21c94
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
deleted file mode 100644
index aa4cd3cf3ca2..000000000000
--- a/games-board/pioneers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pioneers-15.3.tar.gz 4154470 BLAKE2B 536b2100ac0dd75d8c118741bffdd433bebcbdef2df54a75a5e9004f5fb2f7859bc75c27935251fc94b3428e730a7be522b88a7ab13224cb545180eb84ad86f9 SHA512 57aa8bc48019c87a683a4728d28d56f6bd755a0566922dddb4de825904820d1204f893e73fd13465fcec63cecb4a5735a90338f6ff915b7f17113dc0f1e834c1
-EBUILD pioneers-15.3-r1.ebuild 1020 BLAKE2B f238e770e814394468c8f35a14d826b765f2dd999d12ee26736a1b2ebe61ab5a23bbc509ba82b19a641e63cbd655321724f856292eaa9ad9c06848c155212ce6 SHA512 c81f2facd174bad96b13784a15e7b4c06cde98f0af73f5dc798e06d0a893357e3ec1edc464fdff5a307a50e8766aba0a704e3028786f18897cccaa4320fc248b
-MISC metadata.xml 516 BLAKE2B bbc4f44f35490c9f2508b7b4bfa20d748757237608ff09fe5424e3e22370eaf8fa9d88bad25e9a6f0507557ad8bf84d8d78e59c9812e4a94ce8e0e009776b218 SHA512 363d4fc98308e842211f4515c1b6da788e6d43498376efbc7195a17406ad0015c6dee37b380537bfeb530d5ead40c5cd2c6c9836378d4ab178f8c1f1434a2dbc
diff --git a/games-board/pioneers/metadata.xml b/games-board/pioneers/metadata.xml
deleted file mode 100644
index f30a7ec883c2..000000000000
--- a/games-board/pioneers/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-	Pio (Pioneers) is a clone of the board game The Settlers of Catan.
-</longdescription>
-	<use>
-		<flag name="help">Enable gnome ingame help via scrollkeeper</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">pio</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/pioneers/pioneers-15.3-r1.ebuild b/games-board/pioneers/pioneers-15.3-r1.ebuild
deleted file mode 100644
index da4fa55fbc93..000000000000
--- a/games-board/pioneers/pioneers-15.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A clone of the popular board game The Settlers of Catan"
-HOMEPAGE="http://pio.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pio/${P}.tar.gz"
-
-LICENSE="GPL-2 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated help nls"
-
-# dev-util/gob only for autoreconf
-RDEPEND=">=dev-libs/glib-2.26:2
-	!dedicated?	(
-		>=x11-libs/gtk+-3.4:3
-		>=x11-libs/libnotify-0.7.4
-		help? (
-			app-text/rarian
-			>=gnome-base/libgnome-2.10
-		)
-	)
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/gob:2
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable help) \
-		--includedir=/usr/include \
-		$(use_with !dedicated gtk)
-}
-
-src_install() {
-	DOCS='AUTHORS ChangeLog README TODO NEWS' \
-		gnome2_src_install scrollkeeper_localstate_dir="${ED%/}"/var/lib/scrollkeeper/
-}
diff --git a/games-board/pokerth-1.1.2 b/games-board/pokerth-1.1.2
new file mode 100644
index 000000000000..126313fcc242
--- /dev/null
+++ b/games-board/pokerth-1.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-db/sqlite:3 dev-libs/boost:0=[threads(+)] dev-libs/libgcrypt:0 dev-libs/protobuf:0= dev-libs/tinyxml[stl] dev-qt/qtcore:5 dev-qt/qtnetwork:5 >=net-libs/libircclient-1.6-r2 >=net-misc/curl-7.16 virtual/gsasl !dedicated? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] ) !dedicated? ( dev-qt/qtsql:5 ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Texas Hold'em poker game
+EAPI=6
+HOMEPAGE=https://www.pokerth.net/
+IUSE=dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain
+RDEPEND=dev-db/sqlite:3 dev-libs/boost:0=[threads(+)] dev-libs/libgcrypt:0 dev-libs/protobuf:0= dev-libs/tinyxml[stl] dev-qt/qtcore:5 dev-qt/qtnetwork:5 >=net-libs/libircclient-1.6-r2 >=net-misc/curl-7.16 virtual/gsasl !dedicated? ( dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/libsdl:0 media-libs/sdl-mixer[mod,vorbis] )
+SLOT=0
+SRC_URI=mirror://sourceforge/pokerth/pokerth-1.1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6d7a0c09be0e8ee95e64eb1a27008a8c
diff --git a/games-board/pokerth/Manifest b/games-board/pokerth/Manifest
deleted file mode 100644
index eddeea2f217d..000000000000
--- a/games-board/pokerth/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pokerth-1.1.1-boost-1.65-ambiguous-advance.patch 465 BLAKE2B 4b7cb201233754ce5bc57338e7bcc8c03baebf3c021a34f01cfe221fba9062b6d2a51a5ee4c5644f0535de7a7bdccb27b6ae488a94fbcbcc2863b763a3b5103a SHA512 af91b98c04f844504c46b01c76a360d00bfe3993d6acdbc9800f2466833da42ad5e76a0ca3e197cb63aca10e4cb1eae73996b67691587eae2f2ee3975a33410e
-AUX pokerth-1.1.2-protobuf.patch 603 BLAKE2B 258ab192bf8c27266bc96103adfd52c0da9d719f07da674d31411f3248106fe919be741ab2829a250dba34e6eeaf023f9fbd6517581418c7f77b080ad47e34ab SHA512 ddb0ec7f60a0e494822e9c7abe9c9658c5df3b27e6be99624c5c959f0cc8db58ad13fb00ea947cfd3e81e48278ff27af8d09fec5e5c3acf31fe78ce70db89e1b
-DIST pokerth-1.1.2.tar.gz 21354306 BLAKE2B d8e1ecc46e61d9c16ae3949099f6e72271a5ab2def9799652b0c612980e0c5e96cb2ccf4d659c1a90b9ac6433af95587fa5d44af80c16fb6a34a272751c9fc4a SHA512 d54c84f199636eb5a53580213e5e4ccc828cf565bf4b055797daa82e2ad54d8c52c7a16a781b82c8cc89d184a2b3c4105922394d08c7d2e06383b96963c36b5a
-EBUILD pokerth-1.1.2.ebuild 1526 BLAKE2B 04e9971784afed63ca064c9587f1c83c1c267292d1f415d3e9e69bdc4e2811fd72e2cf0daa6d6f615be3221b92356b99fdd0806ab84e62b41576c44b14d44ac0 SHA512 724b42865bf254bf85591dec6a4c450ee4737c8ba0ffe607eb289a85d5f3a75cabf5949cea980a05163d4954df51ea68370af86bf5e57b4a28922dd68214e74a
-MISC metadata.xml 340 BLAKE2B e271d172e85302ebcaf0ad3f355035e16056764ae73b01faf494659f0b82c9b0060448e518732e56b13c25ad676156124b11b28ebfdff4697eddc4524ddaf278 SHA512 640db7890ea68059399c50c0ab24c337e0a4cd1c977c2b87198ee9af25e39547fadd3fd83f081da6afa62ae9a9ae2fa450b45a83519d66b036e357ecc3e9b705
diff --git a/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch b/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
deleted file mode 100644
index 2e8c9c50c5eb..000000000000
--- a/games-board/pokerth/files/pokerth-1.1.1-boost-1.65-ambiguous-advance.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Boost 1.65 made 'advance()' ambiguous.
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=629966
-
---- a/src/gui/qt/gametable/gametableimpl.cpp
-+++ b/src/gui/qt/gametable/gametableimpl.cpp
-@@ -3859,7 +3859,7 @@
- 	int playerCount = static_cast<int>(seatList->size());
- 	if (id < playerCount) {
- 		PlayerListIterator pos = seatList->begin();
--		advance(pos, id);
-+		std::advance(pos, id);
- 		myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID());
- 	}
- }
diff --git a/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch b/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch
deleted file mode 100644
index 0ac2ab0b1531..000000000000
--- a/games-board/pokerth/files/pokerth-1.1.2-protobuf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/pokerth/pokerth/issues/339
---- PokerTH-1.1.1-src/pokerth.proto
-+++ PokerTH-1.1.1-src.new/pokerth.proto
-@@ -701,7 +701,7 @@
- 
- message ErrorMessage {
- 	enum ErrorReason {
--		reserved = 0;
-+		custReserved = 0;
- 		initVersionNotSupported = 1;
- 		initServerFull = 2;
- 		initAuthFailure = 3;
---- PokerTH-1.1.1-src/src/net/common/netpacket.cpp
-+++ PokerTH-1.1.1-src.new/src/net/common/netpacket.cpp
-@@ -249,7 +249,7 @@
- 		retVal = ErrorMessage::sessionTimeout;
- 		break;
- 	default :
--		retVal = ErrorMessage::reserved;
-+		retVal = ErrorMessage::custReserved;
- 		break;
- 	}
- 	return retVal;
diff --git a/games-board/pokerth/metadata.xml b/games-board/pokerth/metadata.xml
deleted file mode 100644
index add52ba75f21..000000000000
--- a/games-board/pokerth/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">pokerth</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-board/pokerth/pokerth-1.1.2.ebuild b/games-board/pokerth/pokerth-1.1.2.ebuild
deleted file mode 100644
index 3a84288bbc76..000000000000
--- a/games-board/pokerth/pokerth-1.1.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils
-
-DESCRIPTION="Texas Hold'em poker game"
-HOMEPAGE="https://www.pokerth.net/"
-SRC_URI="mirror://sourceforge/pokerth/${P}.tar.gz"
-
-LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-
-RDEPEND="dev-db/sqlite:3
-	dev-libs/boost:0=[threads(+)]
-	dev-libs/libgcrypt:0
-	dev-libs/protobuf:0=
-	dev-libs/tinyxml[stl]
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	>=net-libs/libircclient-1.6-r2
-	>=net-misc/curl-7.16
-	virtual/gsasl
-	!dedicated? (
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		media-libs/libsdl:0
-		media-libs/sdl-mixer[mod,vorbis]
-	)"
-DEPEND="${RDEPEND}
-	!dedicated? ( dev-qt/qtsql:5 )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-rc"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1-boost-1.65-ambiguous-advance.patch
-	"${FILESDIR}"/${PN}-1.1.2-protobuf.patch
-)
-
-src_prepare() {
-	default
-	sed -i 's/!client//' *.pro || die
-}
-
-src_configure() {
-	eqmake5 pokerth.pro \
-			QMAKE_CFLAGS_ISYSTEM= \
-			CONFIG+="$(use dedicated || echo client)"
-}
-
-src_install() {
-	dobin bin/pokerth_server chatcleaner
-	dodoc docs/{gui_styling,server_setup}_howto.txt
-	doman docs/pokerth.1
-
-	if ! use dedicated; then
-		dobin ${PN}
-		insinto /usr/share/${PN}
-		doins -r data
-		domenu ${PN}.desktop
-		doicon -s 128 ${PN}.png
-	fi
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-board/polyglot-1.4.70b-r2 b/games-board/polyglot-1.4.70b-r2
new file mode 100644
index 000000000000..9baf1f208d6a
--- /dev/null
+++ b/games-board/polyglot-1.4.70b-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Protocol adapter to run UCI chess engines under xboard
+EAPI=6
+HOMEPAGE=http://hardy.uhasselt.be/Toga/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://hardy.uhasselt.be/Toga/polyglot-release/polyglot-1.4.70b.tar.gz
+_md5_=78baf8254cfb91ef1920d51fd88e4f5b
diff --git a/games-board/polyglot/Manifest b/games-board/polyglot/Manifest
deleted file mode 100644
index ac51384306ad..000000000000
--- a/games-board/polyglot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST polyglot-1.4.70b.tar.gz 269938 BLAKE2B bcefdb1157ca70438e60e77b0f3242527fd2b2cf0616727f3d09c30d6d7713f2c38482041fa0a0002cd7a730429915c913a2d282cdbb4f3b6556a202d3382e5d SHA512 23ffa735b44ebbdaa991d96ac7d09e368f99640265bea3a30e0623665a8a9567f7c5c3e9518e06348a9b34ef70b43de2000b85f4e6101f4d8f866ae9cac9abec
-EBUILD polyglot-1.4.70b-r2.ebuild 470 BLAKE2B 312634d9c3720720647e726383e44f0dcf2d237f831f6f5c8e94b7e2ed1dd2813d5b10f7f5a68893b33b923b40be5f11816d30b999893c424ef2d3b86aa996da SHA512 798325d28d57421669ac8d658b3b4e084398e8c35a7b14785941c9cfad8a881d1249f19ffad3a2f17a415db268b2b0fb8395fac98f5a84b5a9e0cfa66a406141
-MISC metadata.xml 488 BLAKE2B d49d8efb7834bce6cf6c49bea636306cc67ea1bb2f72625c5e3af945a59406bd7b782c217683c7abdd36b215cf586f44b43eba600ef157ce716f7d3310651918 SHA512 73200bcc5b340c191d80b87f3b44af5339b259ebe2e7c5668a5066a6e07cdf87d4e15db0361f7b5f65f5032216625fd1591c548c506576ac56174d9dffc94002
diff --git a/games-board/polyglot/metadata.xml b/games-board/polyglot/metadata.xml
deleted file mode 100644
index dfce47d11008..000000000000
--- a/games-board/polyglot/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>ulm@gentoo.org</email>
-</maintainer>
-<longdescription>
-  PolyGlot is a "UCI adapter". It connects a GUI interface (such
-  as XBoard, Winboard, Arena or Chessbase) to a UCI chess engine.
-  By specifying an opening book (in PolyGlot book format) chess
-  engines can transparently use such books.
-</longdescription>
-</pkgmetadata>
diff --git a/games-board/polyglot/polyglot-1.4.70b-r2.ebuild b/games-board/polyglot/polyglot-1.4.70b-r2.ebuild
deleted file mode 100644
index 6a46f3f55963..000000000000
--- a/games-board/polyglot/polyglot-1.4.70b-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Protocol adapter to run UCI chess engines under xboard"
-HOMEPAGE="http://hardy.uhasselt.be/Toga/"
-# not entirely clear what the "b" in the version stands for
-SRC_URI="http://hardy.uhasselt.be/Toga/${PN}-release/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DOCS="AUTHORS ChangeLog TODO" # README* installed by build system
diff --git a/games-board/pouetchess-0.2.0-r2 b/games-board/pouetchess-0.2.0-r2
new file mode 100644
index 000000000000..1351b313e644
--- /dev/null
+++ b/games-board/pouetchess-0.2.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=media-libs/libsdl:0[opengl,video] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl dev-util/scons[python_targets_python2_7]
+DESCRIPTION=3D and open source chess game
+EAPI=6
+HOMEPAGE=http://pouetchess.sourceforge.net/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl:0[opengl,video] media-libs/sdl-image[jpeg,png] virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/pouetchess/pouetchess_src_0.2.0.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_=c28ed0e218f1b1094f20bb9462fbd46b
diff --git a/games-board/pouetchess/Manifest b/games-board/pouetchess/Manifest
deleted file mode 100644
index 6e7bad05bcb8..000000000000
--- a/games-board/pouetchess/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX pouetchess-0.2.0-fix-sdl-version-list.patch 334 BLAKE2B fdf1f6bc91b022690d881749530a94a6f71cea7db80a75b8de7fcd80b0803816352341d5bee1076f144cbe6a47da4e3fec29cf7c9c456e9c114a604e9fb4eecb SHA512 3e236be94a6e29967d4d81516f3a72b240b4fe7168070d7fbb8ffe4ca69c734d98cd5331d7d1415eb7438a81816be5df6e7f42529bae0eb397e636f6d797c938
-AUX pouetchess-0.2.0-gcc43.patch 313 BLAKE2B 536e890776d1bfa1395fb64ef971846e42f946f6bfccd46ba3af8dd150d99530ba1b4feedba8add1955e5244cac4aa44518e085f88a6868950202f98cb5d4bfa SHA512 56d4ac831b478e1f30eeadb6aad1e8d862e6e10bc453e0770bcd1f322844eb1caded2db367b111ce3d3d8da1d9138df26cd1d435e7a012fa15f1b744cb7874db
-AUX pouetchess-0.2.0-gcc6-cmath.patch 492 BLAKE2B f11e15025ba94524f60dbac08f4f737ff91fa6a1ab21025e06badea2014519c7654db3bc1dd43fa0d82a539a4f7c429e350721b8be8e9bde09bd3c47fc8eda4b SHA512 fafd23c9d4791857cc65e370d43057576ac9ca0cf5930ce0cafe1df5e520e535e0c6141b707bf7a1d83884b4353b5321ce0f976dd15a857e2e9f2fc7fd00a3b8
-AUX pouetchess-0.2.0-nvidia_glext.patch 377 BLAKE2B 99aeb53d912511181ffe1c587932f075cda29b268df28a24ce3713f9329903123552deaa9f76968a670463a708b970c20844b4363c3a02f7456707ef4a523c5f SHA512 e3cad1eabdac6387c7218c02b0be53ac90d4ef9ecea37fdc4750daad2c1d7214b28902ce9b2b840f6a6f01e4cd55ee58295311533d4f8f4ec72362e6c67c03ac
-AUX pouetchess-0.2.0-sconstruct-sandbox.patch 759 BLAKE2B a7157ba8d65c03225bbfb0a2bd21d29b35f9b196958beda9d2584e2f0e002ffbbdcf7c780e9f5e6d7a3c75b6ad7255f35d7781e2b5fd704a2281aa3a99650c6b SHA512 8a45aa66e11a70b2f3114a58d1651e444f26a02016d2e9ef8caa425ecc8387b9c0339c605f36cca15fc9d743906b9b6a9ac0574ad60620c901c12e930156672d
-AUX pouetchess-0.2.0-segfaults.patch 1634 BLAKE2B eb56a2b33480022cc2ee095463de355028d56e632ab4382504e3a2839f55d80eff133fdaaa0cb34b6f2efea549c8141891dd74769a82e7a555f577321d5ec29c SHA512 fde86799926cfb5f51ad38fa8d0e9e4e2c14f3aed28cf102f5f4089c98b19b2fa7b65de798b64a43961dc2831a6818e4ceae65f4cba1bdafe37492f6ac2ab891
-DIST pouetchess_src_0.2.0.tar.gz 1055338 BLAKE2B 745db7e85966ecd999b62d91270bd5faa5cfa6ffd52738b8754b8e54197744fb8e826ec792b4363ed8735e043e6c417f8dc7c80033d5d723c9ccf79b88a367c7 SHA512 20d9b2edc3e3998716eddd38b82226f5c1298b9bf5cabc56a545bee602ce3e7a9106f130265f2b0d31ee56d728da2cc54a79623faa6841732cde0d7d94c33acf
-EBUILD pouetchess-0.2.0-r2.ebuild 1325 BLAKE2B 021dd4a1e469c79e5aaaa42619a1767a6c3d373d451ab09e9774e757cb8928b81d7979b34650cfb7af720e48ab8522cf9c35fb1a1c26fb0f44a046b4766c8800 SHA512 ca17289f8d97771d314a1ef1f809d4cf4d8691629e449cf15c6df3ed899609c3f017c96a90448268663db6b4adb4b7441353d903866d0c02e89fc32f3c802c1c
-MISC metadata.xml 333 BLAKE2B 72ac3670a55c7fc6021dc7548612397ef34b57e960f59adfbfb97025825828fb861d4eaab136da5235ec0d9b20f85bc672928365507959af3e06dd76d107e303 SHA512 9b5083cd658d82538d59352800f0386b7834af5a717eded245f4042a332b255d871eee485cb01f4c2d5735f06bd4b659816a1edc8bdeeaa655933d92f6edb523
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-fix-sdl-version-list.patch b/games-board/pouetchess/files/pouetchess-0.2.0-fix-sdl-version-list.patch
deleted file mode 100644
index 06b9aff2c2d8..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-fix-sdl-version-list.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pouetChess.py
-+++ b/pouetChess.py
-@@ -228,7 +228,7 @@
- 		sdlver = sdlobj.read()
- 		sdlerr = sdlobj.close()
- 		print sdlver,
--		if sdlver.split('.') >= ['1','2','8']:
-+		if sdlver.split('.') >= [1,2,8]:
- 			env.ParseConfig(sdlcfg+" --cflags --libs")
- 		else:
- 			print "You need LibSDL version 1.2.8 or greater for this program"
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-gcc43.patch b/games-board/pouetchess/files/pouetchess-0.2.0-gcc43.patch
deleted file mode 100644
index ef2ba1575825..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/sxmlgui/XMLUtils.h.orig	2008-06-14 14:50:16.000000000 +0000
-+++ b/src/sxmlgui/XMLUtils.h	2008-06-14 14:50:33.000000000 +0000
-@@ -38,6 +38,8 @@
- #include <stdio.h>

- #include <assert.h>

- #include <fstream>

-+#include <cstring>

-+

- 

- // Help out windows:

- #if defined( _DEBUG ) && !defined( DEBUG )

-
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch b/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch
deleted file mode 100644
index 4853eee81e1d..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-gcc6-cmath.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- pouetchess_src_0.2.0/src/sxmlgui/MathUtils.h.old	2006-05-26 21:22:57.000000000 -0400
-+++ pouetchess_src_0.2.0/src/sxmlgui/MathUtils.h	2017-03-21 18:01:15.569181229 -0400
-@@ -27,10 +27,13 @@
-   return (x < min) ? min : (x > max) ? max : x;

- }

- 

-+// Not used anywhere and conflicts with C++11 std::round(float)

-+#if __cplusplus < 201103L

- inline int round(float f)

- {

-   return int(f + 0.5f);

- }

-+#endif

- 

- inline float getNextRandom(){

-   return (float)rand()/(RAND_MAX + 1);

diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-nvidia_glext.patch b/games-board/pouetchess/files/pouetchess-0.2.0-nvidia_glext.patch
deleted file mode 100644
index b7077feb6a38..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-nvidia_glext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/sxmlgui/GenUtils.h	2006-05-27 03:22:57.000000000 +0200
-+++ b/src/sxmlgui/GenUtils.h.new	2006-06-12 20:35:32.000000000 +0200
-@@ -5,6 +5,9 @@
- #include <iostream>

- #include <fstream>

- #include <vector>

-+#ifndef GL_GLEXT_PROTOTYPES

-+#define GL_GLEXT_PROTOTYPES 1

-+#endif

- #include <SDL/SDL_opengl.h>

- 

- #define deleteObject(A){ if(A){ delete   A; A = NULL; } }

diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch b/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
deleted file mode 100644
index 8378a1d7223d..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-sconstruct-sandbox.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/SConstruct
-+++ b/SConstruct
-@@ -22,14 +22,24 @@
- 
- 
- 
--import os,glob
-+import os,glob,SCons.Util
- 
- 
-+# https://dev.gentoo.org/~vapier/scons-blows.txt
- 
- # create build environment
- 
-+env = Environment()
-+env.SConsignFile()
- env = Environment(tools = ['default', 'pouetChess'], toolpath = ['.'])
--env.AppendUnique(CXXFLAGS = ['-Wall'])
-+env['CC'] = os.environ['CC']
-+env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CFLAGS'):
-+	env['CCFLAGS'] = SCons.Util.CLVar(os.environ['CFLAGS'])
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] = SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] = SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
- # gather a list of source files
- SOURCES =  glob.glob('src/*.cpp')
diff --git a/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch b/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch
deleted file mode 100644
index 346ee1248ab3..000000000000
--- a/games-board/pouetchess/files/pouetchess-0.2.0-segfaults.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/faile/search.c
-+++ b/src/faile/search.c
-@@ -805,6 +805,7 @@
-       for (j = 0; j < indent; j++) {
- 	fputc (' ', output);
-       }
-+      void print_move (move_s moves[], int m, FILE *stream);
-       print_move (&moves[0], i, output);
-       fprintf (output, "\n");
- 
---- a/src/faile/utils.c
-+++ b/src/faile/utils.c
-@@ -125,7 +125,7 @@
-       rank (target) < 1 || rank (target) > 8 ||
-       file (target) < 1 || file (target) > 8) 
-   {
--	sprintf (str, "*** FAILE INTERNAL ERROR ***");
-+	sprintf (str, "xxxx");
-     return;
-   }
-   
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -184,6 +184,9 @@
- 	// first scene is SCENE_INIT.
- 	pGlobalInfos->SetCurrentScene(GAME_SCENE_INIT);
- 
-+    /* @FB 02/08/06 */
-+    pGlobalInfos->ReleaseKeys();
-+
- 	// main game loop
- 	while( pGlobalInfos->IsGameRunning() )
- 	{
---- a/src/scene_main_game.cpp
-+++ b/src/scene_main_game.cpp
-@@ -245,7 +245,7 @@
- 	
- 	if (pGlobalInfos->OnLeftMouseButtonDown())
- 	{	
--		if (chessboard->clickOnChessBoard(mouseX,mouseY,&sqX,&sqY));
-+		if (chessboard->clickOnChessBoard(mouseX,mouseY,&sqX,&sqY))
- 		{
- 			// if a piece was already selected, this means the player want to move this piece
- 			if (SquareXSelected>-1 && SquareZSelected>-1)
---- a/src/graphic_chessboard.cpp
-+++ b/src/graphic_chessboard.cpp
-@@ -122,8 +122,8 @@
- 	
- 	for(int i=0;i<6;i++)
- 	{
--		char texture_filename[50];
--		sprintf(texture_filename,PC_DATA_TEXTURE_SKYBOX,i),
-+		char texture_filename[256];
-+		snprintf(texture_filename,sizeof(texture_filename),PC_DATA_TEXTURE_SKYBOX,i),
- 		texture_skybox[i] = new CBasicTexture;
- 		if (false==texture_skybox[i]->load(texture_filename,false))
- 		{
diff --git a/games-board/pouetchess/metadata.xml b/games-board/pouetchess/metadata.xml
deleted file mode 100644
index 3ba0656ee96e..000000000000
--- a/games-board/pouetchess/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pouetchess</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/pouetchess/pouetchess-0.2.0-r2.ebuild b/games-board/pouetchess/pouetchess-0.2.0-r2.ebuild
deleted file mode 100644
index abb3f5a86b34..000000000000
--- a/games-board/pouetchess/pouetchess-0.2.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils scons-utils toolchain-funcs
-
-MY_PN=${PN/c/C}
-
-DESCRIPTION="3D and open source chess game"
-HOMEPAGE="http://pouetchess.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_src_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	media-libs/libsdl:0[opengl,video]
-	media-libs/sdl-image[jpeg,png]
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${PN}_src_${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sconstruct-sandbox.patch
-	"${FILESDIR}"/${P}-nvidia_glext.patch
-	"${FILESDIR}"/${P}-segfaults.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-gcc6-cmath.patch
-	# Fix for LibSDL >= 1.2.10 detection
-	"${FILESDIR}"/${P}-fix-sdl-version-list.patch
-)
-
-src_configure() {
-	tc-export CC CXX
-
-	# turn off the hackish optimization setting code (bug #230127)
-	scons configure \
-		strip=false \
-		optimize=false \
-		prefix="${EPREFIX}"/usr \
-		datadir="${EPREFIX}"/usr/share/${PN} \
-		$(use debug && echo debug=1) || die
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	dobin bin/${MY_PN}
-
-	insinto /usr/share/${PN}
-	doins -r data/.
-
-	einstalldocs
-
-	doicon data/icons/${MY_PN}.png
-	make_desktop_entry ${MY_PN} ${MY_PN} ${MY_PN} "KDE;Qt;Game;BoardGame"
-}
diff --git a/games-board/pychess-0.12.4 b/games-board/pychess-0.12.4
new file mode 100644
index 000000000000..c3d8e82962ec
--- /dev/null
+++ b/games-board/pychess-0.12.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/librsvg:2 x11-libs/gtksourceview:3.0 x11-libs/pango x11-themes/adwaita-icon-theme gstreamer? ( dev-python/gst-python:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) >=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A chess client for Gnome
+EAPI=6
+HOMEPAGE=http://pychess.org/
+IUSE=gstreamer python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/librsvg:2 x11-libs/gtksourceview:3.0 x11-libs/pango x11-themes/adwaita-icon-theme gstreamer? ( dev-python/gst-python:1.0 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://pychess.org/download/pychess-0.12.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=97f5ad53d6945a1e92ee1545c7e484ac
diff --git a/games-board/pychess/Manifest b/games-board/pychess/Manifest
deleted file mode 100644
index b2b7c0b57f20..000000000000
--- a/games-board/pychess/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pychess-0.12.4.tar.gz 4728410 BLAKE2B 4fd95e85983ce9e7d588e98a27a1695d116f102290942e2c747046ee9e4289b53734dbd949af4f88fc4186fc3e52b9ff41b1e18e2763c5f48b2d371ae22f44fe SHA512 bf2a6cffca50742fbdfba04bc33807b53e4b7485cb6c9b6bb84816e176fd99f3929dbc8e504b46053cdcd30f691d6df948f5153508b2b6d3504f85a31eaccf62
-EBUILD pychess-0.12.4.ebuild 1309 BLAKE2B 82768b6a1271bc6eeb611d81d9ed59bb117e74101fab3e921acfd5d8c2f835ecf0a531220827ca2ff8b74ff072a93f3b3a11dadd0cccd6805249fd45cdbb8b5b SHA512 dd5c1211739b284af66c1f98fd8ff5256884d333741cd2f60006d9a048729f32c23debc94b5e14cf309a5af7c673b9bd174ca3c4320d2b5c0503604243a176c4
-MISC metadata.xml 330 BLAKE2B 15a47bf5f276ac9befdb283d8c69ecb24c91b4ea01cd72afd84227afe207ee7f3abfc037d9bc1c214b5e0091aeae4ea071cfda32d55b25766cc9480a3611ae43 SHA512 0233cc10e31aa616eaab261554b2a730bb8932e3a266943c829a2c1c48f296830ea42217174256816a1bd4d0d4eeebb34e8c615ef2d997ee2d3da512ca97ee5c
diff --git a/games-board/pychess/metadata.xml b/games-board/pychess/metadata.xml
deleted file mode 100644
index 852efafb3934..000000000000
--- a/games-board/pychess/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">pychess</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/pychess/pychess-0.12.4.ebuild b/games-board/pychess/pychess-0.12.4.ebuild
deleted file mode 100644
index f5fe56473254..000000000000
--- a/games-board/pychess/pychess-0.12.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit fdo-mime gnome2-utils distutils-r1
-
-DESCRIPTION="A chess client for Gnome"
-HOMEPAGE="http://pychess.org/"
-SRC_URI="http://pychess.org/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-
-DEPEND="
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gtksourceview:3.0
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	gstreamer? (
-		dev-python/gst-python:1.0
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
-"
-RDEPEND=${DEPEND}
-
-python_install() {
-	distutils-r1_python_install
-
-	# bug 487706
-	sed -i \
-		-e "s/@PYTHON@/${EPYTHON}/" \
-		"${ED%/}/$(python_get_sitedir)"/${PN}/Players/engineNest.py || die
-}
-
-python_install_all() {
-	DOCS="AUTHORS README.md" \
-		distutils-r1_python_install_all
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-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-board/pysolfc-2.0-r5 b/games-board/pysolfc-2.0-r5
new file mode 100644
index 000000000000..2f8e49cbebc1
--- /dev/null
+++ b/games-board/pysolfc-2.0-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=An exciting collection of more than 1000 solitaire card games
+EAPI=6
+HOMEPAGE=http://pysolfc.sourceforge.net/
+IUSE=extra-cardsets minimal +sound python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=!minimal? ( dev-python/pillow[tk,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/pysolfc/PySolFC-2.0.tar.bz2 extra-cardsets? ( mirror://sourceforge/pysolfc/PySolFC-Cardsets-2.0.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3857d862f38edb21ca782178d864cc55
diff --git a/games-board/pysolfc-2.2.0 b/games-board/pysolfc-2.2.0
new file mode 100644
index 000000000000..12cb44cf12c2
--- /dev/null
+++ b/games-board/pysolfc-2.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=An exciting collection of more than 1000 solitaire card games
+EAPI=6
+HOMEPAGE=http://pysolfc.sourceforge.net/
+IUSE=extra-cardsets minimal +sound python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] ) python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] ) !minimal? ( dev-python/pillow[tk,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-tcltk/tktable ) sound? ( dev-python/pygame[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk] ) python_targets_python3_5? ( dev-lang/python:3.5[tk] ) python_targets_python3_6? ( dev-lang/python:3.6[tk] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/shlomif/PySolFC/archive/pysolfc-2.2.0.tar.gz extra-cardsets? ( mirror://sourceforge/pysolfc/archive/pysolfc-2.2.0/PySolFC-Cardsets-2.0.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24a89761b332df48fe9353ece29874c6
diff --git a/games-board/pysolfc/Manifest b/games-board/pysolfc/Manifest
deleted file mode 100644
index 38ddd5ed0bf9..000000000000
--- a/games-board/pysolfc/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX pysolfc-PIL-imports.patch 1581 BLAKE2B 82e608f9f84c0af4b695378af7f6ffe90602195f8bac980eb702cd4cc31be5051732e1abedd843970ec1ddf0a4b11bdb5e3455a0de1ff9d62f29dfb35a14987c SHA512 d00fb7b579e4010210131f9fe82ed90cb7ad5d39a391529d8d5c29c5f19b813afc429b1d5b8ae8af0eaf3a8082cf4a48723ce21b42522d9b9c8163a46a033aa9
-AUX pysolfc-gentoo.patch 322 BLAKE2B c2fccd5b11942d4cdce148199c6e8b8544502ba7bd95c2bdf230ebf96abc0b9d4e6225e7b1dde92f5eea8820149c10eb4c53e8f95fe82fcec15a480c0efa061a SHA512 963daef445d492a693380466fcfdc7f464947269d8a2b687039f31179c1f4fe5119efd71f83708073373c3ac5174a754075367937f99253d6b443e74e60e93d3
-AUX pysolfc-locales.patch 655 BLAKE2B ce8068858b91eead34f3ff374959d362aef3c1b2e6448016f54a4f69a04ff3c629660460a04af51d09e7451870db0727aa46bb190cd4671f0b81cb57c783c689 SHA512 53f95675c032f6d47957e883c9c5da4807b185fe4daaab663f36fb7044f12eb191cd934b6375534f5fcbc3f45dcd1b003639cf1d5f9d65b90fa5cc0afaae718e
-DIST PySolFC-2.0.tar.bz2 4208776 BLAKE2B 0675de0923c6ee381f58f8abbaef5e27bd6fc85bbee9dcd182026ba7259c25c38282623e0cd35b582e8999754d21b092d6a824499bc890a2c0c89c53679182fd SHA512 ec5a11565bd43e097cf1854fe246b8f92acd74077c0b3b158c999f9dc45966e8f805c60a2cfbd815137d970e0e6409d0ae437b9807bac9c39353657cf596b6fc
-DIST PySolFC-Cardsets-2.0.tar.bz2 30687905 BLAKE2B f17f5095a05cf42ea9eb3e7a3a7fefe055cc3452882bf96db82bb4d1bebb2307ffc2d0fd8836f7414bfcd93b1d8de52adb43ef22701a0806f2c6c036d9306501 SHA512 24275cd3656024e268a49487ac75e1e67e61ec20e0a9f88e2d1c287f91314a1a9343856d1202ce468f8863f4e9a9bf27526fbb1979a7d765718b38e64ca0cfc8
-DIST pysolfc-2.2.0.tar.gz 4504375 BLAKE2B ea48910d36b704667654292cd4fc2e62bcf259d9a3677369371ab7aadd387505d5ae658496ad8982e08ca0405b44971bc1e2375e91cd90f84c569f8f26249ff3 SHA512 c6d09803eab8fe7fc2c4203537d75b8db3216dfcbd5cc60be5b89f23544c871a37f7b16d20df7be4b70c6f014d47b8c361e1557ab04cb1008451f41b456d0ad2
-EBUILD pysolfc-2.0-r5.ebuild 1447 BLAKE2B 52dbd8f9be1d8946d5b8722ffef214a3f8ba6d15cb4f078be36164f120de1c47f883db8fc55c13526576e8aaafa22b1ab43b1aa1e0c2c1a3d53092be66bad6e4 SHA512 05f48c1db7ea2a2ab19bf30a9cac66289d95af96586d75d481e369391a83f809bd3d008aa9729c1800bbb51a829599b5d6de6d7be543b2c1ed1305a7d7cfd6b5
-EBUILD pysolfc-2.2.0.ebuild 1815 BLAKE2B 77f72a385ad1b7afed250236ede43d92c28af7556b9d7800c0de09accc3ee265df4557bf7202b01571e25dacd58a6be49a8afc0f8b9df7a88aaa41adb49fee8c SHA512 518766c0fcc0cccf849046c8d312cbfcf795d2ae2945838e23c00d553bf8d0c10c4d824c8d7354e35cb3b88859a6e0dc78af55514de92f60d43a617493db1479
-MISC metadata.xml 505 BLAKE2B 2ece0bd1f9e531449fc33b4515e89959270d74d6bbf9354a9405ea08cc6c163080a4406c92dd7d158faff445e6d0efd08c48ac52959c3fcc68055560bcf62fc3 SHA512 e7bb917b63c06fd17dd5e863e354ae147bd5aa7ef3f360ec848b3ea20087a092d8b7450cfd7ce1a615a6414d6d618f32b60f299cb5a50f0e852205c3fcf4d136
diff --git a/games-board/pysolfc/files/pysolfc-PIL-imports.patch b/games-board/pysolfc/files/pysolfc-PIL-imports.patch
deleted file mode 100644
index 64d9980a881b..000000000000
--- a/games-board/pysolfc/files/pysolfc-PIL-imports.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-https://sourceforge.net/p/pysolfc/patches/10/
-https://bugs.gentoo.org/show_bug.cgi?id=471514
-
-Index: pysollib/mfxutil.py
-===================================================================
-diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py
---- a/pysollib/mfxutil.py	(revision 279)
-+++ b/pysollib/mfxutil.py	(working copy)
-@@ -41,18 +41,18 @@
- Image = ImageTk = ImageOps = None
- if TOOLKIT == 'tk':
-     try: # PIL
--        import Image
--        import ImageTk
--        import ImageOps
-+        from PIL import Image
-+        from PIL import ImageTk
-+        from PIL import ImageOps
-     except ImportError:
-         Image = None
-     else:
-         # for py2exe
--        import GifImagePlugin
--        import PngImagePlugin
--        import JpegImagePlugin
--        import BmpImagePlugin
--        import PpmImagePlugin
-+        from PIL import GifImagePlugin
-+        from PIL import PngImagePlugin
-+        from PIL import JpegImagePlugin
-+        from PIL import BmpImagePlugin
-+        from PIL import PpmImagePlugin
-         Image._initialized = 2
- USE_PIL = False
- if TOOLKIT == 'tk' and Image and Image.VERSION >= '1.1.7':
-Index: scripts/cardset_viewer.py
-===================================================================
-diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py
---- a/scripts/cardset_viewer.py	(revision 279)
-+++ b/scripts/cardset_viewer.py	(working copy)
-@@ -7,7 +7,7 @@
- from math import sqrt, sin, cos, pi
- from Tkinter import *
- try:
--    import Image, ImageTk
-+    from PIL import Image, ImageTk
- except ImportError:
-     Image = None
- 
diff --git a/games-board/pysolfc/files/pysolfc-gentoo.patch b/games-board/pysolfc/files/pysolfc-gentoo.patch
deleted file mode 100644
index 07a7b662f320..000000000000
--- a/games-board/pysolfc/files/pysolfc-gentoo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/pysollib/settings.py	2014-04-07 20:05:02.335276008 +0200
-+++ b/pysollib/settings.py	2014-04-07 20:05:33.099062670 +0200
-@@ -63,6 +63,7 @@
-         '/usr/local/share/PySolFC',
-         '/usr/games/PySolFC',
-         '/usr/local/games/PySolFC',
-+        '/usr/share/pysolfc',
-         ]
- if os.name == 'nt':
-     pass
diff --git a/games-board/pysolfc/files/pysolfc-locales.patch b/games-board/pysolfc/files/pysolfc-locales.patch
deleted file mode 100644
index defac9bfba87..000000000000
--- a/games-board/pysolfc/files/pysolfc-locales.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r -U2 PySolFC-pysolfc-2.2.0.orig/setup.py PySolFC-pysolfc-2.2.0/setup.py
---- PySolFC-pysolfc-2.2.0.orig/setup.py	2018-04-16 15:05:24.000000000 +0200
-+++ PySolFC-pysolfc-2.2.0/setup.py	2018-05-19 17:52:08.434768430 +0200
-@@ -45,7 +45,4 @@
-                        ['data/images/misc/pysol01.png',
-                         'data/images/misc/pysol02.png', ]))
--    for l in ('ru', 'ru_RU'):
--        data_files.append(('share/locale/%s/LC_MESSAGES' % l,
--                           ['locale/%s/LC_MESSAGES/pysol.mo' % l]))
-     data_files.append((data_dir, ['data/pysolfc.glade']))
-     data_files.append(('share/applications', ['data/pysol.desktop']))
diff --git a/games-board/pysolfc/metadata.xml b/games-board/pysolfc/metadata.xml
deleted file mode 100644
index 7cc738da552f..000000000000
--- a/games-board/pysolfc/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="extra-cardsets">Install extra cardsets</flag>
-    <flag name="sound">Enable sound support using <pkg>dev-python/pygame</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">pysolfc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-board/pysolfc/pysolfc-2.0-r5.ebuild b/games-board/pysolfc/pysolfc-2.0-r5.ebuild
deleted file mode 100644
index b98ccfee931b..000000000000
--- a/games-board/pysolfc/pysolfc-2.0-r5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit eutils distutils-r1
-
-MY_PN=PySolFC
-SOL_URI="mirror://sourceforge/${PN}"
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-SRC_URI="${SOL_URI}/${MY_PN}-${PV}.tar.bz2
-	extra-cardsets? ( ${SOL_URI}/${MY_PN}-Cardsets-${PV}.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-DEPEND=""
-RDEPEND="${RDEPEND}
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-PIL-imports.patch" #471514
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	mv docs/README{,.txt} || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-${PV}/*
-	fi
-
-	doman docs/*.6
-
-	DOCS=( README AUTHORS docs/README.txt docs/README.SOURCE )
-	HTML_DOCS=( docs/*html )
-
-	distutils-r1_python_install_all
-}
diff --git a/games-board/pysolfc/pysolfc-2.2.0.ebuild b/games-board/pysolfc/pysolfc-2.2.0.ebuild
deleted file mode 100644
index 874ce3fcf38b..000000000000
--- a/games-board/pysolfc/pysolfc-2.2.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="tk"
-
-inherit eutils distutils-r1
-
-MY_PN=PySolFC
-
-DESCRIPTION="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-SRC_URI="https://github.com/shlomif/${MY_PN}/archive/${P}.tar.gz
-	extra-cardsets? ( mirror://sourceforge/${PN}/archive/${P}/${MY_PN}-Cardsets-2.0.tar.bz2 )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="extra-cardsets minimal +sound"
-
-S=${WORKDIR}/${MY_PN}-${P}
-
-DEPEND=""
-RDEPEND="${RDEPEND}
-	python_targets_python3_5? ( dev-python/random2[python_targets_python3_5] )
-	python_targets_python3_6? ( dev-python/random2[python_targets_python3_6] )
-	!minimal? ( dev-python/pillow[tk,${PYTHON_USEDEP}]
-		dev-tcltk/tktable )
-	sound? ( dev-python/pygame[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-gentoo.patch" #591904
-	"${FILESDIR}/${PN}-locales.patch"
-)
-
-python_prepare_all() {
-	sed -i \
-		-e "/pysol.desktop/d" \
-		-e "s:share/icons:share/pixmaps:" \
-		-e "s:data_dir =.*:data_dir = \'/usr/share/${PN}\':" \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	pushd html-src > /dev/null || die "html-src not found"
-	PYTHONPATH=.. "${EPYTHON}" gen-html.py || die "gen-html failed"
-	mv images html/ || die "mv images failed"
-	popd > /dev/null
-}
-
-python_install_all() {
-	make_desktop_entry pysol.py "PySol Fan Club Edition" pysol02
-
-	if use extra-cardsets; then
-		insinto /usr/share/${PN}
-		doins -r "${WORKDIR}"/${MY_PN}-Cardsets-2.0/*
-	fi
-
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN}/html
-
-	doman docs/*.6
-	DOCS=( README.md AUTHORS docs/README docs/README.SOURCE )
-	HTML_DOCS=( html-src/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/games-board/scid-4.6.2-r1 b/games-board/scid-4.6.2-r1
new file mode 100644
index 000000000000..81e2765c93a8
--- /dev/null
+++ b/games-board/scid-4.6.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 || ( >=dev-lang/python-2.7.5-r2:2.7 ) app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=a free chess database application
+EAPI=6
+HOMEPAGE=http://scid.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tk:0 dev-tcltk/tkimg >=sys-libs/zlib-1.1.3 !games-board/chessdb
+SLOT=0
+SRC_URI=mirror://sourceforge/scid/scid-4.6.2.zip mirror://sourceforge/scid/spelling.zip mirror://sourceforge/scid/ratings.zip mirror://sourceforge/scid/photos.zip mirror://sourceforge/scid/scidlet40k.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=31f14e88b4ad3b95695a043c545a87ff
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
deleted file mode 100644
index 364a8d1e5348..000000000000
--- a/games-board/scid/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX scid-4.6.2-gentoo.patch 4508 BLAKE2B ea08a9b215e7e80a33912db552cf3d5e79c8c252f6c9dc557d997b9df43f4dffcd9e74aa06a9a7eca064ec1304b66b3d9495ef152cebb0bd30a507641b321006 SHA512 52a32a6250b293a0fe145ebd45cf6b4d283f3d883cffa278e9599e36a57c129e0b6ccc2a637f200b5fa1e4b8c8a7956fa63a60ceb5d83ba877ca54920346de83
-DIST photos.zip 1007488 BLAKE2B 8b0f9b0402d9102bda4cfe1333cafdf048592004b2b8cb7f8f085eacc10b6b89811afd39c3d849a4f6288ad63145fc760e60bcd70867ae339459a451c537cbf3 SHA512 c04fc810b457d4dbd9a9cfaac90feaa8c32a2abee05e28a79042ae81cb01e8580e2a1cf0abeff230ec2928da883f862b8901d679cb1448fd9ca0923323fbddd6
-DIST ratings.zip 969347 BLAKE2B 47d050f7c0e00e96aa0371db7f328e699cd0e34eafa3652664f00df7fe08b98adc4197c5235303d6df2c5bcf7ea568c753d23ac5fffe3616de6db9dae21a31a3 SHA512 9b2a7280a7e72e2b464cc3da6be82ec9825b11d3c7e2219ab03a711c69f185f7d954eb3acdd441bff210e9296613df79a7e147a2ccbb4ed37b50af762abbd243
-DIST scid-4.6.2.zip 9768139 BLAKE2B 8e9baf2fe67c3566111f23ead005cba34d32f986afbaaed2117dc46aab65190dd8675df721c6fff3e7c5f338a07d7b787265dee63480141258625f6b6f54ec6d SHA512 d33f730857362dfefe55aaf395b0fc42087e190743ed63072128509fc6ac33791a4c2f67f89f03ec39170660fc6b7a6804fea084b383cf97cbb21661ce0569b2
-DIST scidlet40k.zip 242632 BLAKE2B a16c5a3c04f721a40221db33f9ff7192dba724203ff81a61286903c2f4ab8a33b442503882550a7a59ab0a0e6d735a74b3f34bf9dd89f9677f2b7a8b8082d398 SHA512 e8cb4ca276ca94378f224fad972b0659f3e8159668fa395dcae4be1de6cdd9d29082fdddba393bbea6c909bab4f388042ea05c7dff41edf850d731bc7479850d
-DIST spelling.zip 3147998 BLAKE2B 40b33e0c5fab487247af13b0e3fa22d91b17cfb1dbc7d3fafd080db306700e684b30bf46a7222dd7ae16dc1407239973be8de1ee619b31cbcb373684a7f1487c SHA512 394a8835f23336b6f4bebe4e33ab9f64ffa505e9d9bb984de82396e671df0b57b088aab28c5cf648c1a11bc28370b431cb6db54765ac4ab6056a707276ba8f42
-EBUILD scid-4.6.2-r1.ebuild 1986 BLAKE2B 994e81c6e581857d50870aadda8fba830f0859a7cf20d40da40c16981a6864ddbfb904053ee533d81d8a4476578b373c2621c7f372c320a71d0cc6f4191c42f8 SHA512 ba0364fb05c468a6048fdad1fe0462ed0b6d1c979d601de30a7d9b363893b262c89cf86b3a6afac65997e91c3ad26a4e7d5ee47b19073db72ddbc1ec22cf78ee
-MISC metadata.xml 327 BLAKE2B 26037c210c23b4fc0936c22b8ae22f33622b2b19a183bcbb69de69c4ed2b02aec5121198ba555cd7049421ae9a0e9824ed1115725bc0e4c9deff9639f88fcd6b SHA512 b3551509e319eba4e682673f363044c3f3b7973299618405e6aa29f44a86527e0f397a6baaface9d95806da7ec2c361c152729b753741694fb9c13760433e5c1
diff --git a/games-board/scid/files/scid-4.6.2-gentoo.patch b/games-board/scid/files/scid-4.6.2-gentoo.patch
deleted file mode 100644
index 6afd56b5badf..000000000000
--- a/games-board/scid/files/scid-4.6.2-gentoo.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- scid-4.6.1.orig/engines/togaII1.2.1a/src/Makefile
-+++ scid-4.6.1/engines/togaII1.2.1a/src/Makefile
-@@ -18,23 +18,16 @@
- 

- # general

- 

--CXX      = g++

--CXXFLAGS = -pipe -Wall

--LDFLAGS  = -lm

- 

- # C++

- 

--CXXFLAGS += -fno-exceptions -fno-rtti

- 

- # optimisation

- 

--CXXFLAGS += -O3 -fstrict-aliasing

--CXXFLAGS += -fomit-frame-pointer

- # CXXFLAGS += -march=athlon-xp # SELECT ME

- 

- # strip

- 

--LDFLAGS += -s

- 

- # dependencies

- 

---- scid-4.6.1.orig/Makefile.conf
-+++ scid-4.6.1/Makefile.conf
-@@ -157,32 +157,32 @@
- install: $(INSTALL)
- 
- install_scid: all_scid
--	install -m 755 -d "$(SHAREDIR)"
--	install -m 755 -d "$(BINDIR)"
--	install -m 755 $(SCRIPTS) $(EXECS) "$(BINDIR)"
--	rm -f "$(BINDIR)/scid"
--	@echo "#!/bin/sh" > "$(BINDIR)/scid"
--	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(BINDIR)/scid"
--	chmod 755 "$(BINDIR)/scid"
--	chmod +x "$(BINDIR)/scid"
--	install -m 644 -p scid.eco "$(SHAREDIR)"
--	install -m 755 -d "$(SHAREDIR)/books"
--	install -m 666 ./books/*.* "$(SHAREDIR)/books/"
--	install -m 755 -d "$(SHAREDIR)/bases"
--	if test -d ./bases; then install -m 666 ./bases/*.* "$(SHAREDIR)/bases/" ; fi
--	install -m 755 -d "$(SHAREDIR)/html"
--	cp -r ./html/* "$(SHAREDIR)/html/"
--	install -m 755 -d "$(SHAREDIR)/img/"
--	cp -r ./img/* "$(SHAREDIR)/img/"
--	install -m 755 -d "$(SHAREDIR)/tcl/"
--	cp -r ./tcl/* "$(SHAREDIR)/tcl/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)"
-+	install -m 755 -d "$(DESTDIR)$(BINDIR)"
-+	install -m 755 $(SCRIPTS) $(EXECS) "$(DESTDIR)$(BINDIR)"
-+	rm -f "$(DESTDIR)$(BINDIR)/scid"
-+	@echo "#!/bin/sh" > "$(DESTDIR)$(BINDIR)/scid"
-+	@echo 'exec "$(BINDIR)/tkscid" "$(SHAREDIR)/tcl/start.tcl" "$$@"' >> "$(DESTDIR)$(BINDIR)/scid"
-+	chmod 755 "$(DESTDIR)$(BINDIR)/scid"
-+	chmod +x "$(DESTDIR)$(BINDIR)/scid"
-+	install -m 644 -p scid.eco "$(DESTDIR)$(SHAREDIR)"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/books"
-+	install -m 666 ./books/*.* "$(DESTDIR)$(SHAREDIR)/books/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/bases"
-+	if test -d ./bases; then install -m 666 ./bases/*.* "$(DESTDIR)$(SHAREDIR)/bases/" ; fi
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/html"
-+	cp -r ./html/* "$(DESTDIR)$(SHAREDIR)/html/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/img/"
-+	cp -r ./img/* "$(DESTDIR)$(SHAREDIR)/img/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/tcl/"
-+	cp -r ./tcl/* "$(DESTDIR)$(SHAREDIR)/tcl/"
- 
- install_engines: all_engines
--	install -m 755 -d "$(SHAREDIR)/engines"
--	install -m 755 -d "$(SHAREDIR)/engines/phalanx-scid"
--	install ./engines/phalanx-scid/phalanx-scid "$(SHAREDIR)/engines/phalanx-scid"
--	install -m 755 -d "$(SHAREDIR)/engines/togaII1.2.1a"
--	install ./engines/togaII1.2.1a/src/togaII "$(SHAREDIR)/engines/togaII1.2.1a/"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
-+	install ./engines/phalanx-scid/phalanx-scid "$(DESTDIR)$(SHAREDIR)/engines/phalanx-scid"
-+	install -m 755 -d "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a"
-+	install ./engines/togaII1.2.1a/src/togaII "$(DESTDIR)$(SHAREDIR)/engines/togaII1.2.1a/"
- 
- install_mac: all
- 	install -m 755 -d dist/Scid.app/Contents/MacOS
---- scid-4.6.1.orig/tcl/options.tcl
-+++ scid-4.6.1/tcl/options.tcl
-@@ -598,7 +598,7 @@
- }
- 
- ### Audio move announcement options:
--set ::utils::sound::soundFolder [file nativename [file join $::scidExeDir sounds]]
-+set ::utils::sound::soundFolder "@GENTOO_DATADIR@/sounds"
- set ::utils::sound::announceNew 0
- set ::utils::sound::announceForward 0
- set ::utils::sound::announceBack 0
-@@ -607,7 +607,7 @@
- if {$windowsOS} {
-   set spellCheckFile [file join $scidExeDir "spelling.ssp"]
- } else {
--  set spellCheckFile "/usr/local/share/scid/spelling.ssp"
-+  set spellCheckFile "@GENTOO_DATADIR@/spelling.ssp"
- }
- 
- # book configuration
---- scid-4.6.1.orig/tcl/start.tcl
-+++ scid-4.6.1/tcl/start.tcl
-@@ -93,7 +93,7 @@
- 
-   # scidShareDir, scidImgDir, scidTclDir, scidBooksDir, scidBasesDir, ecoFile:
-   # Location of Scid resources
--  set scidShareDir [file normalize [file join $scidExeDir "../share/scid"]]
-+  set scidShareDir "@GENTOO_DATADIR@"
-   if {! [file isdirectory $::scidShareDir]} {
-     set scidShareDir $::scidExeDir
-   }
---- scid-4.6.1.orig/tcl/utils/sound.tcl
-+++ scid-4.6.1/tcl/utils/sound.tcl
-@@ -43,7 +43,7 @@
-   variable soundFolder
- 
-   set hasSound 1
--  if {[catch {package require snack 2.0}]} {
-+  if {[catch {package require snack}]} {
-     if {$::windowsOS} {
-       catch {
-         set ::utils::sound::pipe [open "| scidsnd.exe" "r+"]
diff --git a/games-board/scid/metadata.xml b/games-board/scid/metadata.xml
deleted file mode 100644
index 2e8ed33ebd1b..000000000000
--- a/games-board/scid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/scid/scid-4.6.2-r1.ebuild b/games-board/scid/scid-4.6.2-r1.ebuild
deleted file mode 100644
index f31b6be08e89..000000000000
--- a/games-board/scid/scid-4.6.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils toolchain-funcs gnome2-utils python-any-r1
-
-DESCRIPTION="a free chess database application"
-HOMEPAGE="http://scid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/scid/${P}.zip
-	mirror://sourceforge/scid/spelling.zip
-	mirror://sourceforge/scid/ratings.zip
-	mirror://sourceforge/scid/photos.zip
-	mirror://sourceforge/scid/scidlet40k.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="dev-lang/tk:0
-	dev-tcltk/tkimg
-	>=sys-libs/zlib-1.1.3"
-RDEPEND="${CDEPEND}
-	!games-board/chessdb"
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	app-arch/unzip"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	mv scid-src ${P} || die
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	edos2unix engines/togaII1.2.1a/src/Makefile
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		tcl/start.tcl || die
-	sed -i \
-		-e "/COMPILE.*testzlib/s:\$var(COMPILE):$(tc-getCXX):" \
-		configure || die
-	gzip ../ratings.ssp || die
-	python_fix_shebang .
-}
-
-src_configure() {
-	# configure is not an autotools script
-	./configure \
-		COMPILE="$(tc-getCXX)" \
-		LINK="$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS}" \
-		CC="$(tc-getCC)" \
-		OPTIMIZE="${CXXFLAGS}" \
-		TCL_INCLUDE="" \
-		BINDIR="/usr/bin" \
-		SHAREDIR="/usr/share/${PN}" || die
-}
-
-src_compile() {
-	emake all_scid
-}
-
-src_install() {
-	emake DESTDIR="${D}" install_scid
-	insinto /usr/share/${PN}
-	doins -r sounds
-
-	dodoc ChangeLog TODO help/*.html
-
-	newicon -s scalable svg/scid_app.svg ${PN}.svg
-	make_desktop_entry scid Scid
-
-	doins ../spelling.ssp ../ratings.ssp.gz ../*.spf
-	newins ../scidlet40k.sbk scidlet.sbk
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "To enable speech, emerge dev-tcltk/snack"
-	elog "To enable Xfcc support, emerge dev-tcltk/tdom"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/simsu-1.3.6 b/games-board/simsu-1.3.6
new file mode 100644
index 000000000000..bca700fd4fca
--- /dev/null
+++ b/games-board/simsu-1.3.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A basic sudoku game
+EAPI=6
+HOMEPAGE=https://gottcode.org/simsu/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/simsu/simsu-1.3.6-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=99df453ee250944a4dd098432adcd310
diff --git a/games-board/simsu/Manifest b/games-board/simsu/Manifest
deleted file mode 100644
index 013b363497db..000000000000
--- a/games-board/simsu/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST simsu-1.3.6-src.tar.bz2 597982 BLAKE2B acf13fe4e3e228cecc76a16352a4df06f14cf58307008f5679b63f1209b4cf191b28544ed3b002375afdf0de8cd92ce179f3cb367f9a5201099da99a806d60c5 SHA512 04e60ccab8345002078b7dbd253bc2a9701f9b8edbbdd9a01ac3ddffd9a5f3ccd32399216b9e497b309b6718646db11a55717e5bd201bfd2aaa80ad9b171cb94
-EBUILD simsu-1.3.6.ebuild 764 BLAKE2B 4564efd4a6d6519ec1875b03ca96c55c59d47fc28319318fdbbf94e587821c70eabbf2ee5f147c3259ed9fff3c103671ed562ecfc0893da6d5a417827594426b SHA512 f6881a3c818fe9507a71d7c23c2329bd725bb75630eb8d8e8d02115f09b2758c28e2886e6cf1be809c8c0408260892f03664585753cea486d1092ba2d68c783c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/simsu/metadata.xml b/games-board/simsu/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/simsu/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/simsu/simsu-1.3.6.ebuild b/games-board/simsu/simsu-1.3.6.ebuild
deleted file mode 100644
index 75b793631b42..000000000000
--- a/games-board/simsu/simsu-1.3.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="A basic sudoku game"
-HOMEPAGE="https://gottcode.org/simsu/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}/translations
-	doins translations/*qm
-	dodoc ChangeLog
-	doicon -s scalable icons/hicolor/scalable/apps/${PN}.svg
-	domenu icons/${PN}.desktop
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/sirius-0.8.0-r1 b/games-board/sirius-0.8.0-r1
new file mode 100644
index 000000000000..35771ab49f26
--- /dev/null
+++ b/games-board/sirius-0.8.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=gnome-base/gconf:2 gnome-base/libgnomecanvas gnome-base/libgnomeui x11-libs/gtk+:2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A program for playing the game of othello/reversi
+EAPI=6
+HOMEPAGE=http://sirius.bitvis.nu/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gnome-base/gconf:2 gnome-base/libgnomecanvas gnome-base/libgnomeui x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://sirius.bitvis.nu/files/sirius-0.8.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b7e2c13080a9223a3d4cc00456e2536f
diff --git a/games-board/sirius/Manifest b/games-board/sirius/Manifest
deleted file mode 100644
index b40a3ebe4489..000000000000
--- a/games-board/sirius/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX sirius-0.8.0-fix-build-system.patch 1333 BLAKE2B 7e6248d7d1c17b8c0d5fb63af9fcfb8536ec7b032f5ccd3e4926e8203b465a13ea9cca3ca3821f8572c2414f7cced922dcedb73e4782e34c10107f2a74e038bf SHA512 6aad8f7e1336e30d0983b668da2c554fdb4658665d6d65523ff02d745f22499260e7fa51003628691a2f8f5a6837e0ef35b83bc38c3d7e513fce9b456958c7bb
-AUX sirius-0.8.0-fix-desktop-file.patch 294 BLAKE2B 1bf069907ef6efd73cae334e71d345e5da619d292e4fbb6c4c982510e7a2212cc22ed187076ccedc50681192e120cd8d08a600adb067dddfb8f0605bdfdd6c8a SHA512 953f3b79aa802f7170ef60ef0f6e3e0368d26bf22275b41a2adc47e1481e10634271c46cf57bc71bb698b3f127e327d527f02903557bebe32f9639d3032c5ad1
-AUX sirius-0.8.0-format.patch 375 BLAKE2B f53a7484984628ab416a613fcae3bf73d565bd87ef6b19edefed4327a3aef0a53c7cae48cdfa28c80ce54b96f25e654884820f3f173969b825564a3f13cc3b9b SHA512 391217ed8b39ef7d78d170d2b45f71162f3a7aac2f4fa3db0dc761a73ddbdf67d8bc0cb0de708713b475a444ef8a01c309d6272adc06bb02b788c92861739877
-DIST sirius-0.8.0.tar.gz 1623435 BLAKE2B 34594cfb30633684f78aac349deef0316fee094c7d67b7e67db2ad1e618b72b6a9510d089474cb973f6dbcf503ec2f1177af2bb9c3a14e674d4bb6cdcf2f0548 SHA512 ffe5cb3354f30b8cb916b83b8fce1cbf7f7b37fad232ddb77a918eaf149d6b3e47488ff900301970e0d9240edfe483d57c434b1af35b87a9f50bcbd0e3aed3d8
-EBUILD sirius-0.8.0-r1.ebuild 768 BLAKE2B 67e77116f28f85bfb03b00b7d08957c12b1448211f3db91e867fe7d431b30aa38c632fa7f437022b13e7c8b9341b2c20ca8b5baeedf14ec87086a656f77b5a19 SHA512 09d734292c9d4acffc0d78f9bfae96fd39594823d0fb7d150cf665ddd4454c568ee8d8bb59a1d4f08c282068ee117285299687239d8ce46bc89056ed74f9654e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch b/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch
deleted file mode 100644
index e799616a492a..000000000000
--- a/games-board/sirius/files/sirius-0.8.0-fix-build-system.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Fix configure.ac
-* Remove setting CFLAGS
-* Look for sqrt() in libm (bug 592414)
-
---- a/configure.in
-+++ b/configure.in
-@@ -1,26 +1,23 @@
- AC_PREREQ(2.52)
- 
--AC_INIT(sirius, 0.8.0)
--AC_CONFIG_SRCDIR(src/sirius.c)
--AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-+AC_INIT([sirius], [0.8.0])
-+AC_CONFIG_SRCDIR([src/sirius.c])
-+AM_INIT_AUTOMAKE
- 
--AM_CONFIG_HEADER(config.h)
--
--AM_MAINTAINER_MODE
-+AC_CONFIG_HEADERS([config.h])
- 
- AC_PROG_INTLTOOL
- 
--AC_ISC_POSIX
- AC_PROG_CC
--AC_STDC_HEADERS
--AM_PROG_LIBTOOL
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- pkg_modules="gtk+-2.0 >= 1.3.13 gconf-2.0 libgnomeui-2.0 libgnomecanvas-2.0 libgnomeui-2.0 gdk-pixbuf-2.0"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
--AC_SUBST(PACKAGE_CFLAGS)
--AC_SUBST(PACKAGE_LIBS)
- 
-+dnl Look for sqrt() in libm
-+AC_SEARCH_LIBS([sqrt], [m], [], [
-+	AC_MSG_ERROR([unable to find the sqrt() function])
-+])
- 
- GETTEXT_PACKAGE=sirius
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
-@@ -29,22 +26,6 @@
- ALL_LINGUAS="sv fr de ru"
- AM_GLIB_GNU_GETTEXT
- 
--CFLAGS="-g -O3"
--
--AC_SUBST(CFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(LDFLAGS) 
--
--dnl Use -Wall if we have gcc.
--changequote(,)dnl
--if test "x$GCC" = "xyes"; then
--  case " $CFLAGS " in
--  *[\ \	]-Wall[\ \	]*) ;;
--  *) CFLAGS="$CFLAGS -Wall" ;;
--  esac
--fi
--changequote([,])dnl
--
- AC_OUTPUT([
- Makefile
- po/Makefile.in
diff --git a/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch b/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch
deleted file mode 100644
index dfa411d5152b..000000000000
--- a/games-board/sirius/files/sirius-0.8.0-fix-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix QA violations in desktop file
-
---- a/sirius.desktop.in
-+++ b/sirius.desktop.in
-@@ -3,7 +3,7 @@
- _Name=Sirius
- _Comment=Sirius, a othello playing program
- Exec=sirius
--Icon=sirius.png
-+Icon=sirius
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Game;
-+Categories=GNOME;Game;
diff --git a/games-board/sirius/files/sirius-0.8.0-format.patch b/games-board/sirius/files/sirius-0.8.0-format.patch
deleted file mode 100644
index 4bed292434d3..000000000000
--- a/games-board/sirius/files/sirius-0.8.0-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/sirius.c
-+++ b/src/sirius.c
-@@ -180,7 +180,7 @@
- 
- 	paus = 1;
- 
--	box = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, message);
-+	box = gtk_message_dialog_new (GTK_WINDOW (window), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", message);
- 	gtk_dialog_run (GTK_DIALOG(box));
- 	gtk_widget_destroy(box);
- 
diff --git a/games-board/sirius/metadata.xml b/games-board/sirius/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/sirius/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/sirius/sirius-0.8.0-r1.ebuild b/games-board/sirius/sirius-0.8.0-r1.ebuild
deleted file mode 100644
index c04568e02b57..000000000000
--- a/games-board/sirius/sirius-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="A program for playing the game of othello/reversi"
-HOMEPAGE="http://sirius.bitvis.nu/"
-SRC_URI="http://sirius.bitvis.nu/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	gnome-base/gconf:2
-	gnome-base/libgnomecanvas
-	gnome-base/libgnomeui
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-	"${FILESDIR}"/${P}-fix-desktop-file.patch
-	"${FILESDIR}"/${P}-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/games-board/sjeng-11.2-r2 b/games-board/sjeng-11.2-r2
new file mode 100644
index 000000000000..933a0ca35b69
--- /dev/null
+++ b/games-board/sjeng-11.2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/gdbm:0=
+DESCRIPTION=Console based chess interface
+EAPI=6
+HOMEPAGE=http://sjeng.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/gdbm:0=
+SLOT=0
+SRC_URI=mirror://sourceforge/sjeng/Sjeng-Free-11.2.tar.gz
+_md5_=3d33af3110d7047eee643333163a725c
diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
deleted file mode 100644
index ab5f678b75e2..000000000000
--- a/games-board/sjeng/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Sjeng-Free-11.2.tar.gz 174019 BLAKE2B c50f312ce4f569b17cf7f240fe27e9d6d27e83e260c7549ba13ee612a357700b1642c2b274637af3e0e0f45c35e46f088cdcd5dce6bb62591ef600b97d8c6d6b SHA512 cda3409d732ac1b07e83ccc0d3063d24497651097c633500dfca66fbb3021532053082ac57a5e23909dd1016a2bae07f166e56b82c4ce834749a101c9ee444b8
-EBUILD sjeng-11.2-r2.ebuild 398 BLAKE2B b829535981175878c2631fe03a542dbc8706530d4006550de55386a5440a186a5b7db47db0c99290d5d4b21cf16de68a5cf7a9c1271a9cf31b6926f3741d3ea5 SHA512 cff266a31310acb99335d459820715987bbf763a4941addeaa75c709c03ec872fe25a10d1321f4609cc5147407d89cd9106ad44237078e14aa2d96d86ffee45e
-MISC metadata.xml 328 BLAKE2B a01f3dc1b89d082ffb3e813bbadc30aec1d774322215d6aac79934e8e6e4b139beeeea052d46e075c7694a5fe2c3de80a418671fd339eb24afa51331051c41f3 SHA512 54f4f8c4089f82b019be4e1cc7f8ce10221142ff020c992f37cbcd3a9e87a43e4b61a1c5dca23edfcc1e5060fe0db19292d4f63319414d4994b91f517153c68d
diff --git a/games-board/sjeng/metadata.xml b/games-board/sjeng/metadata.xml
deleted file mode 100644
index 7afbb5979a15..000000000000
--- a/games-board/sjeng/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sjeng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/sjeng/sjeng-11.2-r2.ebuild b/games-board/sjeng/sjeng-11.2-r2.ebuild
deleted file mode 100644
index 9cf968e7d406..000000000000
--- a/games-board/sjeng/sjeng-11.2-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Console based chess interface"
-HOMEPAGE="http://sjeng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sjeng/Sjeng-Free-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="sys-libs/gdbm:0="
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/Sjeng-Free-${PV}"
diff --git a/games-board/spider-1.2_p4-r2 b/games-board/spider-1.2_p4-r2
new file mode 100644
index 000000000000..7f10445cfc81
--- /dev/null
+++ b/games-board/spider-1.2_p4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/libXext athena? ( x11-libs/libXaw ) x11-libs/libXmu x11-libs/libXt x11-base/xorg-proto x11-misc/imake >=sys-apps/sed-4
+DESCRIPTION=Spider Solitaire
+EAPI=6
+HOMEPAGE=https://packages.debian.org/stable/games/spider
+IUSE=athena
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND
+RDEPEND=x11-libs/libXext athena? ( x11-libs/libXaw ) x11-libs/libXmu x11-libs/libXt
+SLOT=0
+SRC_URI=mirror://debian/pool/main/s/spider/spider_1.2.orig.tar.gz mirror://debian/pool/main/s/spider/spider_1.2-4.diff.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_=4d37dba2fb488e48331c14ebe06105c4
diff --git a/games-board/spider/Manifest b/games-board/spider/Manifest
deleted file mode 100644
index f6622132a4d8..000000000000
--- a/games-board/spider/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST spider_1.2-4.diff.gz 2882 BLAKE2B 3016e4d6a7f4aa6e4f47e7abb78b12d70d5cee400a4e61b514e8fbbfdb7ad8484f84c1c1006447f3c6ab8a5897dfc4d4af5304eeaea716203c5c5440f9084b3b SHA512 e1e6eb4d5b14de7c32e1537877a3d26470c032bea567aa679c8a3744d62ab6b12d81bf05120679a273d98b6fd976c32d24ce9c54b720d006c51464f7ff6d5e75
-DIST spider_1.2.orig.tar.gz 168209 BLAKE2B 3a1163099ba9ce4faa9bc7c3424a2a2105c6fe001487822898dba7598dc5dc8d43cab2a3d7685fb71b1d19ff1b667397a41a3ba03fca4abf5d700308b19dc202 SHA512 a1d01f15ca37c8abdcc9f7c3dac925b1726f9b58ce51eb4096a9248abe0a55086ccdd5cc5ec358c2ee609ff089978676a3e3c669062a522ed7f1d4ea1ce33ab0
-EBUILD spider-1.2_p4-r2.ebuild 1604 BLAKE2B 2c1e8f6c6da9778ad9d6e50b8f2106270f673c3bb54e3a0f8bd8e9105430f09fe7ab45dc28598a0f53733f642c639f83eb7f19ba8df0553ec41b5f49414c5112 SHA512 eed7419df57dc9cb833f87c33dddcd8b99aa8da45a93c0a2ad30a224df0fcf1be68283ad4bc4241c88e3feeb7c1d22e7e06477ebca267ea95a5229476f9adab2
-MISC metadata.xml 327 BLAKE2B 60eff6a4428512cda35daa5d6d02f55f946b5e7840a9ff866a1f76014a837c25fa5c4e142187270a5b25b1c38c96a61cf3e7a229f39caf70d830731565b9222e SHA512 e55a8b00c37c88331de81c2c28e9a187c1a28d4fd64c5fcafd9e01c8cdfbdbd455ded19f523d1806506a1652a5eecaf09b5f8097a42ac40bb36821b92bd3c4b9
diff --git a/games-board/spider/metadata.xml b/games-board/spider/metadata.xml
deleted file mode 100644
index 9f9b26e3cb66..000000000000
--- a/games-board/spider/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="athena">Enable athena widgets</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-board/spider/spider-1.2_p4-r2.ebuild b/games-board/spider/spider-1.2_p4-r2.ebuild
deleted file mode 100644
index e6d741852790..000000000000
--- a/games-board/spider/spider-1.2_p4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop epatch gnome2-utils
-
-MY_P="${P%%_*}"
-MY_P="${MY_P/-/_}"
-DEB_V="${P##*_p}"
-
-DESCRIPTION="Spider Solitaire"
-HOMEPAGE="https://packages.debian.org/stable/games/spider"
-SRC_URI="mirror://debian/pool/main/s/spider/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/s/spider/${MY_P}-${DEB_V}.diff.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="athena"
-
-RDEPEND="
-	x11-libs/libXext
-	athena? ( x11-libs/libXaw )
-	x11-libs/libXmu
-	x11-libs/libXt
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/imake
-"
-
-S="${WORKDIR}/${MY_P/_/-}.orig"
-
-src_prepare() {
-	default
-	epatch "${WORKDIR}"/${MY_P}-${DEB_V}.diff
-	sed -i \
-		-e '/MKDIRHIER/s:/X11::' \
-		*Imakefile \
-		|| die "sed failed"
-	rm Makefile
-}
-
-src_configure() {
-	xmkmf \
-		-DSmallCards=NO \
-		-DRoundCards \
-		$(use athena && echo "-DCompileXAW=YES" || echo "-DCompileXlibOnly=YES") \
-		|| die "imake failed"
-	sed -i \
-		-e '/CC = /d' \
-		-e "s/CDEBUGFLAGS = .*$/CDEBUGFLAGS = ${CFLAGS}/" \
-		-e '/LDOPTIONS = /s/$/$(LDFLAGS)/' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		BINDIR="/usr/bin" \
-		MANSUFFIX="6" \
-		MANDIR="/usr/share/man/man6" \
-		HELPDIR="/usr/share/doc/${PF}" \
-		install install.doc install.man
-
-	einstalldocs
-	newicon icons/Spider.png ${PN}.png
-	newicon -s 32 icons/Spider32x32.png ${PN}.png
-	make_desktop_entry spider Spider
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/stockfish-8 b/games-board/stockfish-8
new file mode 100644
index 000000000000..f151c28b653a
--- /dev/null
+++ b/games-board/stockfish-8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=|| ( app-arch/unzip app-arch/zip )
+DESCRIPTION=Free UCI chess engine, claimed to be the strongest in the world
+EAPI=6
+HOMEPAGE=https://stockfishchess.org/
+IUSE=armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug general-32 general-64 +optimize
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://stockfish.s3.amazonaws.com/stockfish-8-src.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=db55fbc3373813cdf8844684b88ab169
diff --git a/games-board/stockfish-9 b/games-board/stockfish-9
new file mode 100644
index 000000000000..167127c07b5a
--- /dev/null
+++ b/games-board/stockfish-9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=|| ( app-arch/unzip app-arch/zip )
+DESCRIPTION=Free UCI chess engine, claimed to be the strongest in the world
+EAPI=6
+HOMEPAGE=https://stockfishchess.org/
+IUSE=armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug general-32 general-64 +optimize
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=https://stockfish.s3.amazonaws.com/stockfish-9-src.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a992e4178a018796c1d8af55ef78533a
diff --git a/games-board/stockfish/Manifest b/games-board/stockfish/Manifest
deleted file mode 100644
index 554a746b8ece..000000000000
--- a/games-board/stockfish/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST stockfish-8-src.zip 159017 BLAKE2B 01f2bf017a3e822e9a1cc35b3fd3a05a1e25e3acbc51b4b8ad9d9447eb5e35a8f8e313f72b4353e5ce1937ceb0aeb581a35d393e593fd0dd9851f149ea658b73 SHA512 4dcc8c6e975367e96d5b4e76c241094e1bade53fd19fa29320a5df10177ff5ae04844ca7ae9f9cfe929aa1341d898aabbbe523bbdab4c5beef75ca8332ce50c1
-DIST stockfish-9-src.zip 171925 BLAKE2B dacfe02525e2d78bf91a41bf2d22077ecb808566f87317382515aa14baade2c03c150ecd62ae026c5883321642330cd9beab50df35db3f1c7de18c8b84922ae0 SHA512 47b5dfea9e015dd68e33c8b1a131ed83710e4e5d67abe0c278a423f2940b07c7a5d661ce27915257ae3dad83fc2bb8e50d3d28bfa11a7c4cdf396d0378cd80f8
-EBUILD stockfish-8.ebuild 1780 BLAKE2B 7675de0d70d2570b9824c1c3c4a3a79610af479bb7447def360fc2ec91a6fbbc7f37463c1ba2cf45907d39c8bf34bde08aa8b24f6f990e9315a94e3a987d75ae SHA512 7a42f43fb26d2e01ad68f16e17daa55961b0559ee1b7b5639057d4d9814c8200d20109d3cd7a96068bbfcb03fa4541e0bf5f53ea8a9bf2abb4d7a637c0887b59
-EBUILD stockfish-9.ebuild 1773 BLAKE2B 8af8d85313f39361c455d2a4d16756bad28319dc40d50a540f34a51223cce4a3157c7da44edd2be3f6787f8f9dbc36a9ce9c3ea17020164058acaa7f0adb0610 SHA512 d80fe10b7c9e355a2f23cda9ff0f71e2042111edc9cfcfc0e407dcee9dcf8c17c248c3e2ed7d82c3c151ba4b6bfb643a86aeb42dd18b38e58766ec8b630f0857
-MISC metadata.xml 536 BLAKE2B 52bc05dae5efd0030acb6caf71fb8c42c556a3f96ab0feab4677400cfcc38094014289f56e59188320af9d527b511854b6a9f3c69cff74849e69d1be1f069433 SHA512 c428df576f969e62b0231dcaf77791ff5a8e2c5bf081f390e3df2fcf3ec9067c1cfed7d9e47f3e98359c5b206c28c5454b7385b3d6697e302c0a671bb8ef8d48
diff --git a/games-board/stockfish/metadata.xml b/games-board/stockfish/metadata.xml
deleted file mode 100644
index 38f3f419b3a3..000000000000
--- a/games-board/stockfish/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tamiko@gentoo.org</email>
-		<name>Matthias Maier</name>
-	</maintainer>
-	<use>
-		<flag name="armv7">Build for armv7; enables PIE</flag>
-		<flag name="general-32">Generic unoptimized 32-bits build</flag>
-		<flag name="general-64">Generic unoptimized 64-bits build</flag>
-		<flag name="optimize">Enable upstream -O3 optimizations (default enabled)</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-board/stockfish/stockfish-8.ebuild b/games-board/stockfish/stockfish-8.ebuild
deleted file mode 100644
index c908d406a8cd..000000000000
--- a/games-board/stockfish/stockfish-8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
-HOMEPAGE="https://stockfishchess.org/"
-
-SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
-	general-32 general-64 +optimize"
-
-DEPEND="|| ( app-arch/unzip	app-arch/zip )"
-RDEPEND=""
-
-S="${WORKDIR}/${P}-src/src"
-
-src_prepare() {
-	default
-
-	# prevent pre-stripping
-	sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile \
-		|| die 'failed to disable stripping in the Makefile'
-}
-
-src_compile() {
-	local my_arch
-
-	# generic unoptimized first
-	use general-32 && my_arch=general-32
-	use general-64 && my_arch=general-64
-
-	# x86
-	use x86 && my_arch=x86-32-old
-	use cpu_flags_x86_sse && my_arch=x86-32
-
-	# amd64
-	use amd64 && my_arch=x86-64
-	use cpu_flags_x86_popcnt && my_arch=x86-64-modern
-
-	# both bmi2 and avx2 are part of hni (haswell new instructions)
-	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
-
-	# other architectures
-	use armv7 && my_arch=armv7
-	use ppc && my_arch=ppc
-	use ppc64 && my_arch=ppc64
-
-	# Skip the "build" target and use "all" instead to avoid the config
-	# sanity check (which would throw a fit about our compiler). There's
-	# a nice hack in the Makefile that overrides the value of CXX with
-	# COMPILER to support Travis CI and we abuse it to make sure that we
-	# build with our compiler of choice.
-	emake all ARCH="${my_arch}" \
-		COMP=$(tc-getCXX) \
-		COMPILER=$(tc-getCXX) \
-		debug=$(usex debug "yes" "no") \
-		optimize=$(usex optimize "yes" "no")
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc ../AUTHORS ../Readme.md
-}
diff --git a/games-board/stockfish/stockfish-9.ebuild b/games-board/stockfish/stockfish-9.ebuild
deleted file mode 100644
index dc5c8779f356..000000000000
--- a/games-board/stockfish/stockfish-9.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Free UCI chess engine, claimed to be the strongest in the world"
-HOMEPAGE="https://stockfishchess.org/"
-
-SRC_URI="https://stockfish.s3.amazonaws.com/${P}-src.zip"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="armv7 cpu_flags_x86_avx2 cpu_flags_x86_popcnt cpu_flags_x86_sse debug
-	general-32 general-64 +optimize"
-
-DEPEND="|| ( app-arch/unzip	app-arch/zip )"
-RDEPEND=""
-
-S="${WORKDIR}/src"
-
-src_prepare() {
-	default
-
-	# prevent pre-stripping
-	sed -e 's:-strip $(BINDIR)/$(EXE)::' -i Makefile \
-		|| die 'failed to disable stripping in the Makefile'
-}
-
-src_compile() {
-	local my_arch
-
-	# generic unoptimized first
-	use general-32 && my_arch=general-32
-	use general-64 && my_arch=general-64
-
-	# x86
-	use x86 && my_arch=x86-32-old
-	use cpu_flags_x86_sse && my_arch=x86-32
-
-	# amd64
-	use amd64 && my_arch=x86-64
-	use cpu_flags_x86_popcnt && my_arch=x86-64-modern
-
-	# both bmi2 and avx2 are part of hni (haswell new instructions)
-	use cpu_flags_x86_avx2 && my_arch=x86-64-bmi2
-
-	# other architectures
-	use armv7 && my_arch=armv7
-	use ppc && my_arch=ppc
-	use ppc64 && my_arch=ppc64
-
-	# Skip the "build" target and use "all" instead to avoid the config
-	# sanity check (which would throw a fit about our compiler). There's
-	# a nice hack in the Makefile that overrides the value of CXX with
-	# COMPILER to support Travis CI and we abuse it to make sure that we
-	# build with our compiler of choice.
-	emake all ARCH="${my_arch}" \
-		COMP=$(tc-getCXX) \
-		COMPILER=$(tc-getCXX) \
-		debug=$(usex debug "yes" "no") \
-		optimize=$(usex optimize "yes" "no")
-}
-
-src_install() {
-	dobin "${PN}"
-	dodoc ../AUTHORS ../Readme.md
-}
diff --git a/games-board/tablebase-syzygy-0_pre20131213 b/games-board/tablebase-syzygy-0_pre20131213
new file mode 100644
index 000000000000..0f4226d68849
--- /dev/null
+++ b/games-board/tablebase-syzygy-0_pre20131213
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch pretend setup unpack
+DESCRIPTION=Syzygy chess endgame tablebases for up to 6 pieces
+EAPI=6
+HOMEPAGE=http://tablebase.sesse.net/ http://kirill-kryukov.com/chess/tablebases-online/
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+RDEPEND=~games-board/tablebase-syzygy-0_pre20131213:0
+RESTRICT=fetch
+SLOT=nofetch
+SRC_URI=KQQvKQQ.rtbw KQQvKQQ.rtbz KQQvKQR.rtbw KQQvKQR.rtbz KQQvKQB.rtbw KQQvKQB.rtbz KQQvKQN.rtbw KQQvKQN.rtbz KQQvKQP.rtbw KQQvKQP.rtbz KQQQvKQ.rtbw KQQQvKQ.rtbz KQQQQvK.rtbw KQQQQvK.rtbz KQQQvKR.rtbw KQQQvKR.rtbz KQQQRvK.rtbw KQQQRvK.rtbz KQQQvKB.rtbw KQQQvKB.rtbz KQQQBvK.rtbw KQQQBvK.rtbz KQQQvKN.rtbw KQQQvKN.rtbz KQQQNvK.rtbw KQQQNvK.rtbz KQQQvKP.rtbw KQQQvKP.rtbz KQQQPvK.rtbw KQQQPvK.rtbz KQQvKRR.rtbw KQQvKRR.rtbz KQQvKRB.rtbw KQQvKRB.rtbz KQQvKRN.rtbw KQQvKRN.rtbz KQQvKRP.rtbw KQQvKRP.rtbz KQQRvKQ.rtbw KQQRvKQ.rtbz KQQRvKR.rtbw KQQRvKR.rtbz KQQRRvK.rtbw KQQRRvK.rtbz KQQRvKB.rtbw KQQRvKB.rtbz KQQRBvK.rtbw KQQRBvK.rtbz KQQRvKN.rtbw KQQRvKN.rtbz KQQRNvK.rtbw KQQRNvK.rtbz KQQRvKP.rtbw KQQRvKP.rtbz KQQRPvK.rtbw KQQRPvK.rtbz KQQvKBB.rtbw KQQvKBB.rtbz KQQvKBN.rtbw KQQvKBN.rtbz KQQvKBP.rtbw KQQvKBP.rtbz KQQBvKQ.rtbw KQQBvKQ.rtbz KQQBvKR.rtbw KQQBvKR.rtbz KQQBvKB.rtbw KQQBvKB.rtbz KQQBBvK.rtbw KQQBBvK.rtbz KQQBvKN.rtbw KQQBvKN.rtbz KQQBNvK.rtbw KQQBNvK.rtbz KQQBvKP.rtbw KQQBvKP.rtbz KQQBPvK.rtbw KQQBPvK.rtbz KQQvKNN.rtbw KQQvKNN.rtbz KQQvKNP.rtbw KQQvKNP.rtbz KQQNvKQ.rtbw KQQNvKQ.rtbz KQQNvKR.rtbw KQQNvKR.rtbz KQQNvKB.rtbw KQQNvKB.rtbz KQQNvKN.rtbw KQQNvKN.rtbz KQQNNvK.rtbw KQQNNvK.rtbz KQQNvKP.rtbw KQQNvKP.rtbz KQQNPvK.rtbw KQQNPvK.rtbz KQQvKPP.rtbw KQQvKPP.rtbz KQQPvKQ.rtbw KQQPvKQ.rtbz KQQPvKR.rtbw KQQPvKR.rtbz KQQPvKB.rtbw KQQPvKB.rtbz KQQPvKN.rtbw KQQPvKN.rtbz KQQPvKP.rtbw KQQPvKP.rtbz KQQPPvK.rtbw KQQPPvK.rtbz KQRvKQR.rtbw KQRvKQR.rtbz KQRvKQB.rtbw KQRvKQB.rtbz KQRvKQN.rtbw KQRvKQN.rtbz KQRvKQP.rtbw KQRvKQP.rtbz KQRvKRR.rtbw KQRvKRR.rtbz KQRvKRB.rtbw KQRvKRB.rtbz KQRvKRN.rtbw KQRvKRN.rtbz KQRvKRP.rtbw KQRvKRP.rtbz KQRRvKQ.rtbw KQRRvKQ.rtbz KQRRvKR.rtbw KQRRvKR.rtbz KQRRRvK.rtbw KQRRRvK.rtbz KQRRvKB.rtbw KQRRvKB.rtbz KQRRBvK.rtbw KQRRBvK.rtbz KQRRvKN.rtbw KQRRvKN.rtbz KQRRNvK.rtbw KQRRNvK.rtbz KQRRvKP.rtbw KQRRvKP.rtbz KQRRPvK.rtbw KQRRPvK.rtbz KQRvKBB.rtbw KQRvKBB.rtbz KQRvKBN.rtbw KQRvKBN.rtbz KQRvKBP.rtbw KQRvKBP.rtbz KQRBvKQ.rtbw KQRBvKQ.rtbz KQRBvKR.rtbw KQRBvKR.rtbz KQRBvKB.rtbw KQRBvKB.rtbz KQRBBvK.rtbw KQRBBvK.rtbz KQRBvKN.rtbw KQRBvKN.rtbz KQRBNvK.rtbw KQRBNvK.rtbz KQRBvKP.rtbw KQRBvKP.rtbz KQRBPvK.rtbw KQRBPvK.rtbz KQRvKNN.rtbw KQRvKNN.rtbz KQRvKNP.rtbw KQRvKNP.rtbz KQRNvKQ.rtbw KQRNvKQ.rtbz KQRNvKR.rtbw KQRNvKR.rtbz KQRNvKB.rtbw KQRNvKB.rtbz KQRNvKN.rtbw KQRNvKN.rtbz KQRNNvK.rtbw KQRNNvK.rtbz KQRNvKP.rtbw KQRNvKP.rtbz KQRNPvK.rtbw KQRNPvK.rtbz KQRvKPP.rtbw KQRvKPP.rtbz KQRPvKQ.rtbw KQRPvKQ.rtbz KQRPvKR.rtbw KQRPvKR.rtbz KQRPvKB.rtbw KQRPvKB.rtbz KQRPvKN.rtbw KQRPvKN.rtbz KQRPvKP.rtbw KQRPvKP.rtbz KQRPPvK.rtbw KQRPPvK.rtbz KQBvKQB.rtbw KQBvKQB.rtbz KQBvKQN.rtbw KQBvKQN.rtbz KQBvKQP.rtbw KQBvKQP.rtbz KQBvKRR.rtbw KQBvKRR.rtbz KQBvKRB.rtbw KQBvKRB.rtbz KQBvKRN.rtbw KQBvKRN.rtbz KQBvKRP.rtbw KQBvKRP.rtbz KQBvKBB.rtbw KQBvKBB.rtbz KQBvKBN.rtbw KQBvKBN.rtbz KQBvKBP.rtbw KQBvKBP.rtbz KQBBvKQ.rtbw KQBBvKQ.rtbz KQBBvKR.rtbw KQBBvKR.rtbz KQBBvKB.rtbw KQBBvKB.rtbz KQBBBvK.rtbw KQBBBvK.rtbz KQBBvKN.rtbw KQBBvKN.rtbz KQBBNvK.rtbw KQBBNvK.rtbz KQBBvKP.rtbw KQBBvKP.rtbz KQBBPvK.rtbw KQBBPvK.rtbz KQBvKNN.rtbw KQBvKNN.rtbz KQBvKNP.rtbw KQBvKNP.rtbz KQBNvKQ.rtbw KQBNvKQ.rtbz KQBNvKR.rtbw KQBNvKR.rtbz KQBNvKB.rtbw KQBNvKB.rtbz KQBNvKN.rtbw KQBNvKN.rtbz KQBNNvK.rtbw KQBNNvK.rtbz KQBNvKP.rtbw KQBNvKP.rtbz KQBNPvK.rtbw KQBNPvK.rtbz KQBvKPP.rtbw KQBvKPP.rtbz KQBPvKQ.rtbw KQBPvKQ.rtbz KQBPvKR.rtbw KQBPvKR.rtbz KQBPvKB.rtbw KQBPvKB.rtbz KQBPvKN.rtbw KQBPvKN.rtbz KQBPvKP.rtbw KQBPvKP.rtbz KQBPPvK.rtbw KQBPPvK.rtbz KQNvKQN.rtbw KQNvKQN.rtbz KQNvKQP.rtbw KQNvKQP.rtbz KQNvKRR.rtbw KQNvKRR.rtbz KQNvKRB.rtbw KQNvKRB.rtbz KQNvKRN.rtbw KQNvKRN.rtbz KQNvKRP.rtbw KQNvKRP.rtbz KQNvKBB.rtbw KQNvKBB.rtbz KQNvKBN.rtbw KQNvKBN.rtbz KQNvKBP.rtbw KQNvKBP.rtbz KQNvKNN.rtbw KQNvKNN.rtbz KQNvKNP.rtbw KQNvKNP.rtbz KQNNvKQ.rtbw KQNNvKQ.rtbz KQNNvKR.rtbw KQNNvKR.rtbz KQNNvKB.rtbw KQNNvKB.rtbz KQNNvKN.rtbw KQNNvKN.rtbz KQNNNvK.rtbw KQNNNvK.rtbz KQNNvKP.rtbw KQNNvKP.rtbz KQNNPvK.rtbw KQNNPvK.rtbz KQNvKPP.rtbw KQNvKPP.rtbz KQNPvKQ.rtbw KQNPvKQ.rtbz KQNPvKR.rtbw KQNPvKR.rtbz KQNPvKB.rtbw KQNPvKB.rtbz KQNPvKN.rtbw KQNPvKN.rtbz KQNPvKP.rtbw KQNPvKP.rtbz KQNPPvK.rtbw KQNPPvK.rtbz KQPvKQP.rtbw KQPvKQP.rtbz KQPvKRR.rtbw KQPvKRR.rtbz KQPvKRB.rtbw KQPvKRB.rtbz KQPvKRN.rtbw KQPvKRN.rtbz KQPvKRP.rtbw KQPvKRP.rtbz KQPvKBB.rtbw KQPvKBB.rtbz KQPvKBN.rtbw KQPvKBN.rtbz KQPvKBP.rtbw KQPvKBP.rtbz KQPvKNN.rtbw KQPvKNN.rtbz KQPvKNP.rtbw KQPvKNP.rtbz KQPvKPP.rtbw KQPvKPP.rtbz KQPPvKQ.rtbw KQPPvKQ.rtbz KQPPvKR.rtbw KQPPvKR.rtbz KQPPvKB.rtbw KQPPvKB.rtbz KQPPvKN.rtbw KQPPvKN.rtbz KQPPvKP.rtbw KQPPvKP.rtbz KQPPPvK.rtbw KQPPPvK.rtbz KRRvKRR.rtbw KRRvKRR.rtbz KRRvKRB.rtbw KRRvKRB.rtbz KRRvKRN.rtbw KRRvKRN.rtbz KRRvKRP.rtbw KRRvKRP.rtbz KRRRvKQ.rtbw KRRRvKQ.rtbz KRRRvKR.rtbw KRRRvKR.rtbz KRRRRvK.rtbw KRRRRvK.rtbz KRRRvKB.rtbw KRRRvKB.rtbz KRRRBvK.rtbw KRRRBvK.rtbz KRRRvKN.rtbw KRRRvKN.rtbz KRRRNvK.rtbw KRRRNvK.rtbz KRRRvKP.rtbw KRRRvKP.rtbz KRRRPvK.rtbw KRRRPvK.rtbz KRRvKBB.rtbw KRRvKBB.rtbz KRRvKBN.rtbw KRRvKBN.rtbz KRRvKBP.rtbw KRRvKBP.rtbz KRRBvKQ.rtbw KRRBvKQ.rtbz KRRBvKR.rtbw KRRBvKR.rtbz KRRBvKB.rtbw KRRBvKB.rtbz KRRBBvK.rtbw KRRBBvK.rtbz KRRBvKN.rtbw KRRBvKN.rtbz KRRBNvK.rtbw KRRBNvK.rtbz KRRBvKP.rtbw KRRBvKP.rtbz KRRBPvK.rtbw KRRBPvK.rtbz KRRvKNN.rtbw KRRvKNN.rtbz KRRvKNP.rtbw KRRvKNP.rtbz KRRNvKQ.rtbw KRRNvKQ.rtbz KRRNvKR.rtbw KRRNvKR.rtbz KRRNvKB.rtbw KRRNvKB.rtbz KRRNvKN.rtbw KRRNvKN.rtbz KRRNNvK.rtbw KRRNNvK.rtbz KRRNvKP.rtbw KRRNvKP.rtbz KRRNPvK.rtbw KRRNPvK.rtbz KRRvKPP.rtbw KRRvKPP.rtbz KRRPvKQ.rtbw KRRPvKQ.rtbz KRRPvKR.rtbw KRRPvKR.rtbz KRRPvKB.rtbw KRRPvKB.rtbz KRRPvKN.rtbw KRRPvKN.rtbz KRRPvKP.rtbw KRRPvKP.rtbz KRRPPvK.rtbw KRRPPvK.rtbz KRBvKRB.rtbw KRBvKRB.rtbz KRBvKRN.rtbw KRBvKRN.rtbz KRBvKRP.rtbw KRBvKRP.rtbz KRBvKBB.rtbw KRBvKBB.rtbz KRBvKBN.rtbw KRBvKBN.rtbz KRBvKBP.rtbw KRBvKBP.rtbz KRBBvKQ.rtbw KRBBvKQ.rtbz KRBBvKR.rtbw KRBBvKR.rtbz KRBBvKB.rtbw KRBBvKB.rtbz KRBBBvK.rtbw KRBBBvK.rtbz KRBBvKN.rtbw KRBBvKN.rtbz KRBBNvK.rtbw KRBBNvK.rtbz KRBBvKP.rtbw KRBBvKP.rtbz KRBBPvK.rtbw KRBBPvK.rtbz KRBvKNN.rtbw KRBvKNN.rtbz KRBvKNP.rtbw KRBvKNP.rtbz KRBNvKQ.rtbw KRBNvKQ.rtbz KRBNvKR.rtbw KRBNvKR.rtbz KRBNvKB.rtbw KRBNvKB.rtbz KRBNvKN.rtbw KRBNvKN.rtbz KRBNNvK.rtbw KRBNNvK.rtbz KRBNvKP.rtbw KRBNvKP.rtbz KRBNPvK.rtbw KRBNPvK.rtbz KRBvKPP.rtbw KRBvKPP.rtbz KRBPvKQ.rtbw KRBPvKQ.rtbz KRBPvKR.rtbw KRBPvKR.rtbz KRBPvKB.rtbw KRBPvKB.rtbz KRBPvKN.rtbw KRBPvKN.rtbz KRBPvKP.rtbw KRBPvKP.rtbz KRBPPvK.rtbw KRBPPvK.rtbz KRNvKRN.rtbw KRNvKRN.rtbz KRNvKRP.rtbw KRNvKRP.rtbz KRNvKBB.rtbw KRNvKBB.rtbz KRNvKBN.rtbw KRNvKBN.rtbz KRNvKBP.rtbw KRNvKBP.rtbz KRNvKNN.rtbw KRNvKNN.rtbz KRNvKNP.rtbw KRNvKNP.rtbz KRNNvKQ.rtbw KRNNvKQ.rtbz KRNNvKR.rtbw KRNNvKR.rtbz KRNNvKB.rtbw KRNNvKB.rtbz KRNNvKN.rtbw KRNNvKN.rtbz KRNNNvK.rtbw KRNNNvK.rtbz KRNNvKP.rtbw KRNNvKP.rtbz KRNNPvK.rtbw KRNNPvK.rtbz KRNvKPP.rtbw KRNvKPP.rtbz KRNPvKQ.rtbw KRNPvKQ.rtbz KRNPvKR.rtbw KRNPvKR.rtbz KRNPvKB.rtbw KRNPvKB.rtbz KRNPvKN.rtbw KRNPvKN.rtbz KRNPvKP.rtbw KRNPvKP.rtbz KRNPPvK.rtbw KRNPPvK.rtbz KRPvKRP.rtbw KRPvKRP.rtbz KRPvKBB.rtbw KRPvKBB.rtbz KRPvKBN.rtbw KRPvKBN.rtbz KRPvKBP.rtbw KRPvKBP.rtbz KRPvKNN.rtbw KRPvKNN.rtbz KRPvKNP.rtbw KRPvKNP.rtbz KRPvKPP.rtbw KRPvKPP.rtbz KRPPvKQ.rtbw KRPPvKQ.rtbz KRPPvKR.rtbw KRPPvKR.rtbz KRPPvKB.rtbw KRPPvKB.rtbz KRPPvKN.rtbw KRPPvKN.rtbz KRPPvKP.rtbw KRPPvKP.rtbz KRPPPvK.rtbw KRPPPvK.rtbz KBBvKBB.rtbw KBBvKBB.rtbz KBBvKBN.rtbw KBBvKBN.rtbz KBBvKBP.rtbw KBBvKBP.rtbz KBBBvKQ.rtbw KBBBvKQ.rtbz KBBBvKR.rtbw KBBBvKR.rtbz KBBBvKB.rtbw KBBBvKB.rtbz KBBBBvK.rtbw KBBBBvK.rtbz KBBBvKN.rtbw KBBBvKN.rtbz KBBBNvK.rtbw KBBBNvK.rtbz KBBBvKP.rtbw KBBBvKP.rtbz KBBBPvK.rtbw KBBBPvK.rtbz KBBvKNN.rtbw KBBvKNN.rtbz KBBvKNP.rtbw KBBvKNP.rtbz KBBNvKQ.rtbw KBBNvKQ.rtbz KBBNvKR.rtbw KBBNvKR.rtbz KBBNvKB.rtbw KBBNvKB.rtbz KBBNvKN.rtbw KBBNvKN.rtbz KBBNNvK.rtbw KBBNNvK.rtbz KBBNvKP.rtbw KBBNvKP.rtbz KBBNPvK.rtbw KBBNPvK.rtbz KBBvKPP.rtbw KBBvKPP.rtbz KBBPvKQ.rtbw KBBPvKQ.rtbz KBBPvKR.rtbw KBBPvKR.rtbz KBBPvKB.rtbw KBBPvKB.rtbz KBBPvKN.rtbw KBBPvKN.rtbz KBBPvKP.rtbw KBBPvKP.rtbz KBBPPvK.rtbw KBBPPvK.rtbz KBNvKBN.rtbw KBNvKBN.rtbz KBNvKBP.rtbw KBNvKBP.rtbz KBNvKNN.rtbw KBNvKNN.rtbz KBNvKNP.rtbw KBNvKNP.rtbz KBNNvKQ.rtbw KBNNvKQ.rtbz KBNNvKR.rtbw KBNNvKR.rtbz KBNNvKB.rtbw KBNNvKB.rtbz KBNNvKN.rtbw KBNNvKN.rtbz KBNNNvK.rtbw KBNNNvK.rtbz KBNNvKP.rtbw KBNNvKP.rtbz KBNNPvK.rtbw KBNNPvK.rtbz KBNvKPP.rtbw KBNvKPP.rtbz KBNPvKQ.rtbw KBNPvKQ.rtbz KBNPvKR.rtbw KBNPvKR.rtbz KBNPvKB.rtbw KBNPvKB.rtbz KBNPvKN.rtbw KBNPvKN.rtbz KBNPvKP.rtbw KBNPvKP.rtbz KBNPPvK.rtbw KBNPPvK.rtbz KBPvKBP.rtbw KBPvKBP.rtbz KBPvKNN.rtbw KBPvKNN.rtbz KBPvKNP.rtbw KBPvKNP.rtbz KBPvKPP.rtbw KBPvKPP.rtbz KBPPvKQ.rtbw KBPPvKQ.rtbz KBPPvKR.rtbw KBPPvKR.rtbz KBPPvKB.rtbw KBPPvKB.rtbz KBPPvKN.rtbw KBPPvKN.rtbz KBPPvKP.rtbw KBPPvKP.rtbz KBPPPvK.rtbw KBPPPvK.rtbz KNNvKNN.rtbw KNNvKNN.rtbz KNNvKNP.rtbw KNNvKNP.rtbz KNNNvKQ.rtbw KNNNvKQ.rtbz KNNNvKR.rtbw KNNNvKR.rtbz KNNNvKB.rtbw KNNNvKB.rtbz KNNNvKN.rtbw KNNNvKN.rtbz KNNNNvK.rtbw KNNNNvK.rtbz KNNNvKP.rtbw KNNNvKP.rtbz KNNNPvK.rtbw KNNNPvK.rtbz KNNvKPP.rtbw KNNvKPP.rtbz KNNPvKQ.rtbw KNNPvKQ.rtbz KNNPvKR.rtbw KNNPvKR.rtbz KNNPvKB.rtbw KNNPvKB.rtbz KNNPvKN.rtbw KNNPvKN.rtbz KNNPvKP.rtbw KNNPvKP.rtbz KNNPPvK.rtbw KNNPPvK.rtbz KNPvKNP.rtbw KNPvKNP.rtbz KNPvKPP.rtbw KNPvKPP.rtbz KNPPvKQ.rtbw KNPPvKQ.rtbz KNPPvKR.rtbw KNPPvKR.rtbz KNPPvKB.rtbw KNPPvKB.rtbz KNPPvKN.rtbw KNPPvKN.rtbz KNPPvKP.rtbw KNPPvKP.rtbz KNPPPvK.rtbw KNPPPvK.rtbz KPPvKPP.rtbw KPPvKPP.rtbz KPPPvKQ.rtbw KPPPvKQ.rtbz KPPPvKR.rtbw KPPPvKR.rtbz KPPPvKB.rtbw KPPPvKB.rtbz KPPPvKN.rtbw KPPPvKN.rtbz KPPPvKP.rtbw KPPPvKP.rtbz KPPPPvK.rtbw KPPPPvK.rtbz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=0b92a824b8aefacae279bc884a4a78a7
diff --git a/games-board/tablebase-syzygy-0_pre20131213-r100 b/games-board/tablebase-syzygy-0_pre20131213-r100
new file mode 100644
index 000000000000..529d282c2566
--- /dev/null
+++ b/games-board/tablebase-syzygy-0_pre20131213-r100
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install pretend setup unpack
+DESCRIPTION=Syzygy chess endgame tablebases for up to 6 pieces
+EAPI=6
+HOMEPAGE=http://tablebase.sesse.net/ http://kirill-kryukov.com/chess/tablebases-online/
+IUSE=6-pieces
+KEYWORDS=amd64 x86
+LICENSE=public-domain
+PDEPEND=6-pieces? ( ~games-board/tablebase-syzygy-0_pre20131213:nofetch )
+SLOT=0
+SRC_URI=http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQQvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQQPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KQPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRRvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KRPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBBvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KBPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNNvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KNPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvK.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKQ.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKR.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKB.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKN.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPvKP.rtbz http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbw http://tablebase.sesse.net/syzygy/3-4-5/KPPPvK.rtbz
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056
+_md5_=4d10bb561c24b44c8e3262e2bc926978
diff --git a/games-board/tablebase-syzygy/Manifest b/games-board/tablebase-syzygy/Manifest
deleted file mode 100644
index ce513e3a96bd..000000000000
--- a/games-board/tablebase-syzygy/Manifest
+++ /dev/null
@@ -1,1023 +0,0 @@
-DIST KBBBBvK.rtbw 7392976 BLAKE2B 56a981e1c6992174f417c5b27201c439cc5081b100097196cef133266583b4bee10dd1a206d0c2331844de4fef575e9d2a7462933f54475d11e8c13398512528 SHA512 9c397034776628408073be8ca056e086c537b3e209a6ec496438633a0a89eb857376821aa640a558dc37c82ca47caba6699eec7d3aa68446a40ec12046b50235
-DIST KBBBBvK.rtbz 27287312 BLAKE2B 287e012123884f5878b8d40db9b28620b0d7b5be1bb20e888fd433a57c5535f18e8999dca0380708ca9a7a31db46299137b66b1f061328e0c06498d7ddb3ad68 SHA512 2b7bf5c33bed18f343e24df77656f42409ac83d9f122711509ef14b17706e59d2054f234ab3ad88f639f514e7dfbc2238bbe625d226240be5d49b44573c11c6d
-DIST KBBBNvK.rtbw 2361872 BLAKE2B dde4452c290e603447a334b42f5ca370ec0dafb7ddcc534a8ca6170d09d291d648f78a2c7536d7fd8f9c86cd8d2aad1747564893efad6b46c334b7cd356fbdc3 SHA512 44a573a9cc743ba0f02b6e6ede3ab1fa301d8d42f6ebda3aad4540de789148419a84f129758adbca6ce3b2335a9f3dcfc51a909802b9ef5f14e00f11256744f2
-DIST KBBBNvK.rtbz 132436304 BLAKE2B d2357063822febe8d62c50d5939a5ef032f1f92d30c4be5852062893080074f7bd90cea91b4b8448560245b3b705a9e0f406d457a24a821dd0cfeea746f93433 SHA512 bf67fe0197021debae4093fc3cf32fc94ab82ab32466f8f0e282b5f8603b6bb1184b068f0f6b561c28d5ee8528d4682ebf5ca6d930cb66e60d5e2621a8d41fde
-DIST KBBBPvK.rtbw 15914576 BLAKE2B c15d5fcb17a0c804301653ff0d1473785b39910ebb3e809793c9d4619628c24be3d9eef459005ff3db780ec13706fafe5ac13689a0856d39f565a2fcd3a6d0af SHA512 553bcf50885eceb3324ba0b024b9a1bc0a7be90dba6907dfaa90a2e28c454279aa5d4176fd4065289dee1b1bddafb23b8783b5e521c44a8ef706ebd9a5b1b9a2
-DIST KBBBPvK.rtbz 19743760 BLAKE2B face1c8aef019b39f18d8d35cf589a785bb3069118dc0f08ccb336432469f3b9f9b96e408379e7a9a404a97ce8d0cfa31edbcff4d2a56abd325be8e6775552b8 SHA512 0faac10d3bc6b7418be67e1cbb4945ccab5ced0a6aca49d269f0f0b82a259c51d192d251216056be3c7210edd0a8df750145a2374c45ae878fafca09091e54ed
-DIST KBBBvK.rtbw 739600 BLAKE2B ce2df62e5ed93d9764190040d7916b1b219bb8e892530565b9b865b7e7b2750a1e349dcdb6111ca04664674e3feb81fff96f3834698218f939d811f7e8b993cf SHA512 005c8eb7eb200ece83ca29943018503b693233b34c0572d27c79184b0c2cea02ee9e770cf4a36ddbdbddfac63033d87acdc38e7abc36dbc6f9bdc626c71e992b
-DIST KBBBvK.rtbz 1938576 BLAKE2B 2ee2b48f53e066c7eaeebc28e1efcf91b3f7ac69e46461c0387ce978c17e2a6273192cd31bba13bec7d4cc1ddece8e179e23d6193a4467f7069e9cbf2c2c5d5c SHA512 42c43b42b3bd5497515c797957c794dcbea936bf02f932cecd298ecb40c78e5451a4bcec380c47b378794dee327a492bc63a5c6f7684b2b038659d9f77b92bb3
-DIST KBBBvKB.rtbw 47843536 BLAKE2B 6a78bfe2116e5e8482300b69c7387b810cf36f8d2b66ee1a3aa2d4a690dfaca4e669f286148661e8c3fff14d61a2a0f3647a719ffaf00f55d518bcf2c2b69ba6 SHA512 0df92d195cf524a4d5b5e54b43b5300c517a7a7ce1ec72e28adb20e29e396dc574159c45766305172d18268772724725bc1bfcae46d2f4e478e5f64a1ff4e7f6
-DIST KBBBvKB.rtbz 60644496 BLAKE2B a7d1e018d887cbe9ed95c73872479135cd3e96e5a61ac3b61f97448dcedcd93ddfc717328641f689a01d3018044ee4ca6ef8add9fe5bc46c785598fb2f2ea12b SHA512 5c15f1c134f35281e8c17af98744652321cec0914ab5101ac4ee3e8a33e583cf6c303f6eb83988d5f2ec05819894d67a7c9f64e1ad0505d387d74995529d44d1
-DIST KBBBvKN.rtbw 33066768 BLAKE2B 846d46ab725b0d8b7a1c3923a7c9ed698eb296a8d25a9633e3a5d5dc6d288d13a452f0df341a25e328892dfeb0281f055e161b59b40756258f7f6a45db3636f8 SHA512 8bf93db8c8ba9f454ac5d880409f139142d433d1f745304184adebcc473cbb6d252abbff98ae7704e2ad66ce3f07dcbc78076e808c00bf4251aaec4e0d24ad56
-DIST KBBBvKN.rtbz 91589200 BLAKE2B 0019cf022e0d4aff581fe8f6c3bcd242e6698f630b63d37387fa6b8ca89345e57874e59b66d5be2fcdf8e5df5b9950f852e355db170035e2faf8ac664bdc3f51 SHA512 7ac86eb858c59c1213dd3ef45dbbfca79667e91dd2276e2a8dcf40a1295f371df14e30311e8e47180280a9744f9028a630a02a5eeb2c94d9945b6cf13619eaae
-DIST KBBBvKP.rtbw 125973264 BLAKE2B d7ba10ef28de0df9947c59fabc59a11ea4de6cbd103bb5191e1a066d51fe20c9f0d50921286284d3f89abd4d6549a9eb11472f11a57c714f38ba427975d335d2 SHA512 fa66aa6f47ec9f8ba2168508c4e24ffdeb256551871748a2b3a90b3a55f90b633cc748b3516e138f9920544266bc6e7f59672456b5caa63f2461ae15109c5758
-DIST KBBBvKP.rtbz 90165968 BLAKE2B 69ba23e9925685cd30e2247412ea5c30b2392ba0cf4446544b494c9f95b9e64a41ddb2ef2c6c6d64420436203ad1ef782f66c73827123538084e12059a86bc06 SHA512 454cc65f0f9c52d3b640a43cee153620ade9dbe00c41b8647835b2cdbe523d2df624cd7536cccc56c4ee966d5d7331fa0c87626ca18b40975367bc53b82d031b
-DIST KBBBvKQ.rtbw 123568656 BLAKE2B 84a91c91e9baf5a48ca849d20f6460d2095b506413eb83aa1b2e390ff71641623e1f349cf30802d996c064e6edc0e2be7ad6b37c9e8c7778a0ffab85f2be6865 SHA512 af2107d5f889c363fde947d96d99b9fbb3981dfe39cecbc3c2144c21fc3b33dbf5b60542297b36d1f570f3b9b67aeb9e83e620622939363f33809777a8a6a8ba
-DIST KBBBvKQ.rtbz 75157904 BLAKE2B 8dd5f067d7deaff189e4a74c0c97dfb887c0bcc604129244ffaba783e6c072ffd05ed735535643fd117bb769e31491ef9ce13b08a31abb51bd3aeef0b5d71644 SHA512 129deb61ad7fff516f7fe42f3f2b5263a90df45d7abaf5a1c6fe399a891a4bd6030bdfff8e2c1a93f93a9b93d349a3bd922e9e64eab5a83ac35006f657e2afd0
-DIST KBBBvKR.rtbw 53705104 BLAKE2B 0ae3b7f040dd2498f24fb88a8c37a7a40d7ed19d1ef602f8988645c2db814f93b103f113a797e4b3b3df6253244d103d72d3d6e832ae83acdbc04bd17e90be51 SHA512 b760647b48c9e3cb7af232fa636600cad0d9da13ebacff2905c0739fa2219e723e202465a73e334fabcf305df05c73af851d9c124282e6e3da964dcae007ca74
-DIST KBBBvKR.rtbz 176207824 BLAKE2B 37dfe6361d4de7205348c06743e6302deeb2a2605077e4279d7a74b66847948add58b143900d3e7418646fc52a5e0aa0cd4667065308aebbfcd091f1f9b5c1e9 SHA512 23348c2f6d66eddeac922c52455b251cf844e53626abcc5364a25e1ca64119d26e90d41721ebe0ce4b38768debc9bfe2975677a44f8071310d647bc2c13a63b1
-DIST KBBNNvK.rtbw 3728976 BLAKE2B 02c35edbe5a94e3780e3486dcf851ac6496aef6337ee38398086f2178bbd234cfce2f4a0fd41a90bf885f139dc12bb119088aeb4457fcc91c09681c61dc5c884 SHA512 1e3497f5a6074850789fdafb37e2742011898e03f132d9423c0e20e8a63742f882afa005fdf4d706ae5d0b3dab0e507a6a8929b5a1dbd04f64e552d84e601296
-DIST KBBNNvK.rtbz 210094096 BLAKE2B c42160d9584b691a5664768ac08fcd31dc93c02644411b8b3c7830bb1256ca6caa468939c1754cc21cbfa264b4379250208910adc03ab14f1ee59fb1071234c1 SHA512 025084ead516f71b7708fa78f8723e6b70532ab83b621d2373ec72dd6b72e45ac48a1a93ca17bfd87d96662a634ecd53e63eecc19d277d55b31e31483f6ccc02
-DIST KBBNPvK.rtbw 17857616 BLAKE2B 0ad84abbf5187b9ffe2c42e631831b27e59a7d7e92ae6c74872792e0b105c09bbbc9eb8da4256c962d836e88ac547215e5d4a01a5a4e78059d5f9087f45c0432 SHA512 55971212f590e5a8c2c1ce405722e9d833125ac389e78717fc0d0e65620f6fe71bc1c76719fba8b1c3f3e6e755c544dee337e8c4ffa232e2da010bb4b9d38ad4
-DIST KBBNPvK.rtbz 24568912 BLAKE2B a3abc1d0965596d9e83f972832ee00b7c43904f9d719877b489af4ba58c3d95815ad296230b4b6ba607076896194ff5d4d5bc77542f3e3e16349525b5dd253b4 SHA512 0559143aa56c3330a152dd89005873847a8cfec5ac62ef4c84ee6d6b020d586a5224abfaaac124a244a5a7046557d8cf9163d339fe0fff9401fd7c984cabc684
-DIST KBBNvK.rtbw 106832 BLAKE2B 7ef758bf835ef2d728e815548f472ee35a97d845a8f718de852a736189d8b38ce22e8459e10ebd4ab8eed7b75c57928c081c538d77471b5ce3a06cbcd55d478d SHA512 7f58476f78a9d980d604ce51ece8bb3beced1a3a7b45492c85dc43097eef3adf7dd8a21736ad8b5c487cb87c697f593b97cb3f7f1d45446bc89a7b7641d8aca0
-DIST KBBNvK.rtbz 9450128 BLAKE2B a2cf5b587b6e731209dfff8de3a441732a0a27cebace78f472e1bdd88659120a4bd8ba2f6968c88c6d74c3a08aa9043792905ad528ecbeede54161c3af2222cc SHA512 954a4c2a3a6d755600a22062f2ae76e656a3569f18d810856fb0f1f50220ae646cec1645e8dea02c5b75ed71c8fbe38f0f86d9f0c7d6e233458f1fa8ed1fbba2
-DIST KBBNvKB.rtbw 108237840 BLAKE2B e26c4aebe2a54630c2ea8725bf88c676339b68ca9d69898e4e3cadebba2b99f518fc26b88357fa66e45b2e01381a2bd8ad0c795c5ca1782f43065425b9d8c0b1 SHA512 eb065f234e83eddab81f15dd551220c39ffe7930571e145012d865a385137af4450579949af7be18c310402135d07c1c9bce113055e67cfcc95d3f19129af143
-DIST KBBNvKB.rtbz 426154256 BLAKE2B 8ea6706395b3af36172fbbfb8cd78a8d1a39bbd5ea8136b82c0bf834141ea55338f0e49a17a90c32774f94a0e1aa44153bb353304ea0a30c4ec6210d2270d9fb SHA512 6993c7ed1025da529ec8e611ccedd0cd7710eef0c19d6f9d9c1c43ead60dbd92e9456632a6d08922e05c24cad94a4035e06ec6e287f8bbddc3d5c579974a7bdb
-DIST KBBNvKN.rtbw 43695824 BLAKE2B 8ca16544469c7e0558aeaf894eacb1505d9282493f843bc0249c3b1b35da8d758bd6f40f159e5154d18e740698dc0e768df4121a642325762ff6d7eaa929efdf SHA512 1245ff45fc64ff05189bf34a08d59af7ab3b1a0e0d6afa817afa479065768417dc321d060958c35311189fb6e5974f278aa287b54e181c68ce1b3fd48b0e02d1
-DIST KBBNvKN.rtbz 571817552 BLAKE2B 15f923359e01d542297562e5c71893855a93133940fd002b12bf5f5fc41a160351c5e924290343b60d9ac6f806b1ec9a60e21fdd1b559959154b1cc59cb40c90 SHA512 05c8e9fce8f8989baf1594e86da39a3dc4a0a7c5bb8df9ef3f1e75cfe79bde1e635f6cf547007978fbef98b556885dca7b577fbc7c4bab0a31729cd49ca01c76
-DIST KBBNvKP.rtbw 219919120 BLAKE2B 47dd683841424a360ce98cb77eb4a5206d5e1eab1545931987505e2b1ce870a4fa95abef04362af4cd6a77da0b63f32eec67b3200294d8c2565c4104f2daf3fe SHA512 325205dd32aa927b54d71dfc8fc14f3318014a6ffd3a0bc2ad6d4fa24d18946081355685bc6066f2e7f36475dcb1ce4749fd22d70b9035f291960af84553bd73
-DIST KBBNvKP.rtbz 418575952 BLAKE2B 624eab05aadc82c0d7eeae1b777d1fb2c8c4fa9b835cbe1ed327e4750479c6e8762d70f45336cd1a53b90a182f5693910e3f7831f4e10bf355148fc246b57160 SHA512 334046ef41d229734f21460f4a2c83ac537fd98ea2428e763fb8aa886cd7e2c4aa4428cde9cda61e187e69b9f5ec619216d81e86f62c2d6f5c73346eac455f33
-DIST KBBNvKQ.rtbw 380874384 BLAKE2B 6b81f535d536942a61dfcaf4e0d42f0f2677b5c7522ad6326cc5b047386cd1c8e71e7f8f8b9861aea6e451614374da135c8837563b201b986c11d77955873e74 SHA512 1e4b8891e8cf03a704fbf69fe060943b3ba83e879437973e44a1e9818ce2a643cd4fcd646777559b8103bd8a6498b3129d404c2b3546c73b79a5ad38213d1cf6
-DIST KBBNvKQ.rtbz 173070736 BLAKE2B cc81ff8d90cb0ed657546c784412529bed720b209e307bf2b6df89e4fa34e4fc5988c98734f22886363bb5262ab340144951db37479e61b32cad74424edbad9e SHA512 f90265591a8feceac8709d222680072a4d0cc498f6f7684674f8c369c285ef541c81a3eb9c382db5040b04e992d3bc0ae56b5407fc9c07bbfb0f43ba5c5e596c
-DIST KBBNvKR.rtbw 177750928 BLAKE2B e177720ec15d8bc231458c1b60f3f88b208ed8267ff2a5507baeed00efc184231783189ac9f9025fd4612ef5f274dad10174b4c1f51ae5c1029cdd39e9d743d3 SHA512 17b4d19ce5fd601a7434bea932799a12183f08b46f3cb618c4651764be1d36dbd15aee1da6f2fc70beee41aa83dd480a440a8c11760bdf5e654c56ffa5509dea
-DIST KBBNvKR.rtbz 401373904 BLAKE2B 942358b3b9c438fc77a37ce0c921270b925580776d54ac11f18668f44fb66d697be9a3c5c096339ef047c9353d08203fb8966c17e6aa372ae0a04ae1a55e908b SHA512 f652d652b1670e1b7cf3c0fe1e77e4494bece2f1aa9259514088ac3d8cab5bca4bdef24d7bfad8d2c9d6506589ebb570454134425c827517bf69f5b51973dd5a
-DIST KBBPPvK.rtbw 7576912 BLAKE2B 2b30be1c9d369982caedb0e0c5367310cb938d5d00bdc1f7ebd38032e2141b24eb3b07a46720c593083f1657f51a728c34c4805ec02b9928d620f7753cb4a17a SHA512 9eee1f1cd2185258d1f21af9679140969d8331fc2c381d26520036895d534a801eb94bf5d0a6e7022ace30939aeb9bcaaf3df4bf4eff406d59b1365a1e7bb16d
-DIST KBBPPvK.rtbz 4512976 BLAKE2B 5650e3e2ef2fccec57c66c5545a44c26166d63455b413b92fa9ca9347c56f8c41301493bc2a57a9ce540db07decf368ffd01384ea9d32e91775acea805e705ef SHA512 f2d56c16c994fc8aaa84375941d3b7c01892712782c08dd03727b8a1881fb98441d323b99ccdc7290bdb1780850bf48d204f587f35f6e0e0383131ac7d67459c
-DIST KBBPvK.rtbw 1167824 BLAKE2B e8df9dc43f97ee7f4719b795e091ff40d1828856f7030cdf2df0a6827a28f025e1a8c3fdaeb71a6d9ac12a103cac43e8bd7071e4cba313065ccae9b14ea07cf9 SHA512 870f1789a49b80bec7f65c295e9b8a289f2c200632a1868e64863704d5890b3164af3394b0687fc620d6fe25116f43a1b1b04f9126bb354597eb84f3b785f1ea
-DIST KBBPvK.rtbz 1075152 BLAKE2B f29f8f6f264acb7ccc3d52c4048e8001c30439d1eb07559d39e12fe3c6c1c87b54bf2a82377bd49af5365a7ad97f1bc1960b915fd4fce16ed784698dc11beb10 SHA512 062477c8ce3ad64b17f351cc82234e3ef85b3e282f1c56269c6c17753e8917ecd002a78ea344279b744ba662d0b6681727b4d0a1bb48946facfb64dc42c9cccb
-DIST KBBPvKB.rtbw 526699216 BLAKE2B 85c9699ba56d68c1aeb382787b79fd2940bd6f9716b366a0cc44ae74012b46ad6f3f5968cf98ccd4b7f84eb75fa331daf9da67d253b369a50fc37bf8a8969bcb SHA512 c410783eb3150a348c43fbd7f7153bddb7d7ecbb15c3c29ec6281eef53ff2da850fb25e9f6efc0c03e61d13b2a62f9c500a66ee36a919613a622d644816013d6
-DIST KBBPvKB.rtbz 294062352 BLAKE2B 81d957e51594b9cfd9b3f980d1b6deb23e0c54cf9c2a2b9130ef11ab1b22bd7cc100849de6a7844008ffed548fa94340342d09ebda54814e776dd0b72a88bd99 SHA512 263257dbf599e251d6285cf7a38e7b3d78e55651cfc14377cb9531b62aa9dbe066890e67cbeb5fceeb7c566eb741f1530870d59829ef832961d833e7340bce71
-DIST KBBPvKN.rtbw 520288592 BLAKE2B 263093f61a03cf9efdda046ef418cad33a7f51835b42a7c243ee1c1e82f6364325fe3667bf26fd3db332f5ae8f3e138bbc151a07a0cc7828bc60d60ba3c93652 SHA512 489a1069eb59c63313c4f74101f7d7c954ca2adf46679e2863af01a7f90383c8e70211962171db073449d57e514866f665ec51f7bcd548a8581818baad3b4f2f
-DIST KBBPvKN.rtbz 403753360 BLAKE2B 4916fb59626b9ae64d19b2ae096829b37842ed3d88823de4952255f201728177754122a396d483cd139f32729be14adef6bde1fce0a699572f5ba7730a5f81b4 SHA512 646fde595803731798798a1545d5843b9c3e4d87767e92d0300f8a13f633af28e9f7815b9a35c035f60bb94f6f28dcf1709a1ada54ca4e997656e67773a1f6c2
-DIST KBBPvKP.rtbw 253195856 BLAKE2B 1472de9bc604ec90d1a66f3ee79626daff377bec146170eb251fecf8fd380752b59b8b8dfd2021a26bdf19d5c016d79f14b8882f21953531eb6cb8a9b73ef89b SHA512 6a08c07fd17592148115f73f2f54ca402c52a5e71edcfd174446826af278e62197918c81c9819b696b7d9f5fce506c714088046297010635ad3844469fcc798e
-DIST KBBPvKP.rtbz 89819920 BLAKE2B 0500fca6739fa29f0dcba05cc7d0d143d7c263b8a5b7a525def52e12dd10129dda1ea3b294c702db46d23c68e865e81551344fa8642d59f70c9702b758730e2c SHA512 5a30a923303171320eb374493d0a0b4d57ef9ebccedabd152be0165f37cb9f872a933e43896f857ccad78e4d26ee625dc371ada844f7e215dd2fe87f9149da80
-DIST KBBPvKQ.rtbw 900819984 BLAKE2B 2538b82fa2feadd631163081db14c28c75e236aabf9dc7e8b4cd2ab81b37d8009c11b84b80a5cd1772795c0eb6abdbc31c294628092d8ccb46990c182172682f SHA512 dfde4c597baae4bd063e989f5c8a1ea91bd125ff02c9621fe88fea5c54c56e52b8bdcad987185440f2d1fe726e8212ce12ba76c77ff5bcdcf20ded0c3a466e0c
-DIST KBBPvKQ.rtbz 803490576 BLAKE2B db7d3ce5c2fd658cfdcaf7d23487c597ae97044fa2eee96877a6f99267581b049bb226cacb9570b48b8d67f89a43c8e943e9b81158e94b1acae7da16aabd308f SHA512 3839980ffcfbe88d9ccfdde677eeaa79932e38848db0b156a9e1a148fbaf1ccec919bc3c2baa457f104b73a2915f9f6495725be70a2c0ecd26d0ef3fa22a14dc
-DIST KBBPvKR.rtbw 693450576 BLAKE2B b6b936189b0f944cf423d2d655ec5497947a052b01e45c864113f3ef6f0fb6c87bdc8b07f81c6b710a61364821f0f00fbbc88bbc2ccb12ab00551e19bc4e4da7 SHA512 670e6d8bd991ac5b74edd5c23b984a1e4744e8dcb77703390624da4e77bacb97d4d43fde1ab29cdacaa7db816e4f811240cb700f6dd3d68a0416960b0b173fab
-DIST KBBPvKR.rtbz 575965328 BLAKE2B fa1bf38261c82cbfc7a65447fb1d3b385e96171a6f0f0569e225f9ed6e0c9b56eb07c75d32de826013bcd9cb3b14b55eeebe4280281a7e8ca3ed0c6eecba736c SHA512 d193c56bd90d7d7f395ddb3fc35e383ccd657a9f1776b8a0c259fc9abe07705c501409870799c9fe932d5d19febdbd8bf89ee2e8ab2cbd4a68f73bd670dc59aa
-DIST KBBvK.rtbw 58000 BLAKE2B 67d7f2f4f68d9c586d10a2e1d7ee79e8a391451b6e948fb275db2de5b5af408b1905c0f4583e11c513546bfebbc0bd40f714980fed93e577fa16d60e00cd43fc SHA512 85b7e6354ab76a91e76e7b2c6db0a6b55557cd8d1111f95f8803b8cb625e460f1291fed0033004e858cd7bf45744258db05f35cc4a42ddc8ef732063ce6d0f16
-DIST KBBvK.rtbz 136272 BLAKE2B 3048b84b4e47444361b072b1ca44af49b317595dced274cc153bb52396a9d8dfa48ea48de0e4418e082ebb67ad82c43e9b34987c697ae5bb4bc243caa44f025a SHA512 c510838255fb4d09af534af1f055fb01da682ddcf852c29d5d17a4c5b69f9503cd67d47a73b5a569261ae25df87638f49d662bc69db93397fb1716b6bac9007f
-DIST KBBvKB.rtbw 351824 BLAKE2B df66286a7f3433475961e3702cd04767948454eeded43c7cdbf417ffb58a4ed331fdd2246c311d33089f0ad1b9f511d80a58b9db117edf52bf7683c0a6d904c4 SHA512 49d3b6f24f57c9364f4a0e10f90b5647733402a2633b618a59f20ecd3c429a3e64f9ad2f1e5cd04003045d4e9ea3bd5968f52d346eae43290b64a414548e3ca1
-DIST KBBvKB.rtbz 53072 BLAKE2B 9a9ce8f25c679964dd9c13e8a8f8d92e9257c8bf15e2c8a44dbaed4f783565738ad3294fcafcbdccad3b05223fdd4b9f3838b0a5b843642ff0f1c9c8b4090b0e SHA512 fe1fe83a10fe2435a966061a4158111f402a1e1cea92fcc0e397c83fdab015b3d4d9e386891ce595102c61e421d9598ebae877deab9ec52790a507b8818d3386
-DIST KBBvKBB.rtbw 2299280 BLAKE2B c02a6bf88556018ed8dc38bd89cd08e421646ad635ed1c27e3c9ef740973f8ccba3024c20f30fba64ae8b121e3b12815e7e17d89ed0d4afdd4186e0b053ee194 SHA512 ec5b509e96e6e3b4233f813d46b5c5b6a7429f33b50797951c549b3528e8e7a50bfdb543ad5781a96f251186fde6133878c1e77979be2039b67b92e2516d2b03
-DIST KBBvKBB.rtbz 1448528 BLAKE2B 6716c02ea610a4912d78c23b01eae9db7f55662c1d0a86bcd62b8ce5ee25ab20aa5e012db35781fb5a6b499681b0ec3a60295f7ef5d60158eaa6eb635eb63f56 SHA512 bbf848bcbc0497cd1cd18bd4fc987a76859bff0b6228844b78ae05622546710950ab85cb59475291bf788b1099ba65c93d48fe790eef8b01b236697d106659cb
-DIST KBBvKBN.rtbw 24025168 BLAKE2B 418ef82d672d45f0a2e6e57c51b592cef3a6c56b7a27d3bb80430f0b07c2cb21560b730a73b24e37d3377e6b34b947293051211ea708d1337e16136073237b4c SHA512 8aa74aa399b256b1fe640f30b7ef8f8107c8cdb85989543e79c668a4dd212a1ca9d7741d9a7409c9d200060c06f45102701d654bf5cc2effdaa5c9159944449b
-DIST KBBvKBN.rtbz 3276624 BLAKE2B 242d13b2463fe59c252f5a89f8b987f3b31c9a145f99aef93d19a2765de6d7fd61bc8f7714e9db93b335bea61fdb87814c3887f148e6c15ff40c4efd63d59edb SHA512 d1b7b42c74abab921368f1dc68b01201a7e2a4b777e79234c17d05339d93d4371123f4f4553c52fd8e7fac2bddc4a902f151575182d3e53c9d89ffc3e68a9706
-DIST KBBvKBP.rtbw 267107024 BLAKE2B 523c703aef7a66a05d90d07a665659f83a6664b025ba136dac1fc397badd1144a1185d272239869a7aff5bc65623d60b5c98d7952a9e8e9c2a086b04478e4fe7 SHA512 3e9c71325c19a1030fb3f878b052214bed6764b82c66c0c6e74596832bd31a8db8357e2a3316b504294847a6a9f7505422e3e37d3977c2b7d1cf61e459ddfb0c
-DIST KBBvKBP.rtbz 20158032 BLAKE2B b848f15bb5d5435286e13d5a92b1664dd15d73f35dc1d161324d8b6fcaefd9e2b20771caf587c2ff1465988a99bc80e4be6db3017cc35f3d1f7789dbf8c04e1a SHA512 edebd50e8039edae8bf809ddefa3a79e5bde226e14b96e517855a853fcfc0f613619db4ec4d0898ea0fa2b29d55accd0cc204aaf4dec81fabd40ef95c0988618
-DIST KBBvKN.rtbw 5064400 BLAKE2B 49b8afcd9b2a5c6969de5a7a2aafb43334b39efcb8d85f678bcb176e2c97ece11253a776ff5a689a6c1a05fd6a26c1c4b47d884d55e65e1427968b04de2985cf SHA512 fd4593ab2bd1b40012ba39c0e56b080e7f630c2009670bbf6dd93a1ba46c914d090e4e8c4540a777bdcc364bcfdb998f7ac8600f63b87e71606e638626bde8ac
-DIST KBBvKN.rtbz 8136912 BLAKE2B 7de8e1a7ede55692ce0c0a4c64b20d6d002c860aa2934797aca119fcba9054bd6e0f416279a30a9192265361657c732846df9158f3fb2a19f7f11159c2fe2280 SHA512 025e60f3eb2bd6ca26c4fa81bc339bb5425a7acc34c323de763ecd779271997044ee82a75dbf55633ae6962d41a5cac77d16de1b82661f16cf5490be71976f72
-DIST KBBvKNN.rtbw 67641616 BLAKE2B 5dde4df44c6f3c665eeb8fb0aa2c7b912a7d4d587a3b424baa748806152f34bd2e8c6e3654e0fb824149d76db95c515ec0704d43244045a657f152e781b162ad SHA512 609abbc8bfa324d2da531c8ab9f9a29d3eb1a7f103fb98bdadb64aadf8929b7c613b3cb4a265ad60baed6c86196a726e60a87de3cf261ab76a76fcee4d7055ce
-DIST KBBvKNN.rtbz 18342352 BLAKE2B 6efe2dca29fa0b47348f1374ce139f67870c1443773a56bd5301b1ff6f0e667850cbe9f4ff5bd951dc0ba05c4c9d031f6869bc0ced68118abe0b7652c8a53869 SHA512 c38a5505322d450a3cdad4e29776a4c44e9db73b95d5a2ab12e75f6b85949d7bd4ed9357626fc0436c4a5c6caa9c41d327107ea95a4633b63c9cf816969f62c0
-DIST KBBvKNP.rtbw 1068332880 BLAKE2B 6a9e7d5c83764aaec95f55286d83a34ad9f480db3fb1a33a4152598a8de59a484eb703fb2f757443727cfda975c23c0c231ff00d8c3d6ac8544abcddb0576d39 SHA512 dbeee9e47a69d9973e539a77f7b1b08bc929d361a8fcdcae34ed71555e4b5d78814d0304d538b809d513c71a52a4a3f19cc3d6ab71cd21a9d2f6a7ae31323de8
-DIST KBBvKNP.rtbz 988169872 BLAKE2B 2a6a0d84fea251094d8b13f578dff5e028c98f1ea3177b7014de56825efbe9a50934e1ecf341cfb762a4f84487ee8c3a8b40f0457f22ad557b9ef3018a7711c8 SHA512 1f775b409249c00f6e087e616f088b65d0e0d8c3fa97624befcfc7c83fabd224d1189fa53e14da9ad88b4875659e8c00303568c5fb2fa7d40a8230661c4e8361
-DIST KBBvKP.rtbw 7783952 BLAKE2B b9f725bc62279ef994ab286909bbcd973ff4dc72b436929a1275a10b4f5159c83ef37937f1116bf13512aec505975a7a5ceea1f93725eb8205f03a72c8fad48e SHA512 07f312149f75f04f4c68661946ca4f987a91ebe1aad637ca380d3be50f508133b79d5463c7c9cde455fa5feafa3e1908fc7975bd963ac8c6cc46ac16f2c10e93
-DIST KBBvKP.rtbz 6765008 BLAKE2B 2262a98a47f6c8186a63da08bc0e8df0a40e8fcb7c51f43327318b29501a143b2b1d81893295a1d5fdbd6e22da9d413c81376e4e975b3effeb93f63ce065d993 SHA512 f6028f8def2d9dfc26c52b7052ec3a6c72fa99d0a21b575b7a8691bead5b183d12ed73ea53d364785a61416e7eb0e7119702339444a291e183d0f49159dea0da
-DIST KBBvKPP.rtbw 234749584 BLAKE2B e4748dc46a518caae68bf7c9ff263b0f353d3633cd9ce2dcce8ad97b3b2673da15c2d7fa1d7a2ffe7b5086faef44505234b956b4097811d1d2d44c003f8a2afa SHA512 ba037563a8e0111c3447732af14698501556e849cff81ec0531e0b4299517833ccae49e1bca8054e1e3cd73af9066b350f80bfa8a9f3cf9874d676f369d4406b
-DIST KBBvKPP.rtbz 114093264 BLAKE2B d2c239c26da414898e3375a4823f70ed4876ed465a4d40dcc259828ed71047ab1c988065d660baf5f636577c6af43c433d3013258d23ef0cfedd09ff3d16487d SHA512 0d10078831566b37d41d11245b80af2d75bf9a9e236d6b293cb7bf5478af3d948935374870186c446f8cc89639e2f1ad633e58dce60ece8e0c1189c46d10a6f9
-DIST KBBvKQ.rtbw 2217040 BLAKE2B f2b96c0e7de45ae16a0f51adb20bf607d5b6fa859fc17bf72b594ed89b3cdde0c9659f546d0655132101d3b3425796f61e3ec2482b6a424aa9dad542d22a097c SHA512 e8ebd52e823a432015d92cb82a66b87611cd20268fe16fd853dfbfba82673e90da87b370e2bb413aa21d8233072ad329cc7fe255cdb3a7186b5c10524b8b07a5
-DIST KBBvKQ.rtbz 7933776 BLAKE2B 89604837ad225deb32e78478b537b8f8ec58460e20cdeea7207316d26a28e80c7155982c22ecd459f14c793758a7f695a72b172aafdc1d385e70a1df7b1fd587 SHA512 f4611a4d9ce1509f9b1f8a2f2cd0a692cb2758da17e300006ee471c14e49f152ae090c506589ea885066afaa1ed3c4e7e34ecc39a491d66fa322025f4feda73b
-DIST KBBvKR.rtbw 574864 BLAKE2B 755e697e0506356f17ee3be1a8298cd00460aa4b3040171020180ecc8da2bb2d622bf60a03d624c22d1177ff2e09d710ad10ce359ae940f1f408535965db0868 SHA512 fb7c4dae7adbd6752dcc9611d62e34fa23480b8ff25d6d9aa384733bca7340696160f50948eaa1ab8fcb775bdea686733c4d6b642e93d896f28c9ef22291505b
-DIST KBBvKR.rtbz 89360 BLAKE2B bdd6b29805c786c08e05bd99772a317e3f84c80c39885f69b57712a817a0c129159d845e22f62c4c76a8b19eb1e01441efdc4b0443be72db6c79bccc2d7d25a5 SHA512 07b682a448ebb8f175285b012bc63e0e4bf4dc713b4ad0b354c50e9e9f30f0e4f4c3d238039dbb460f3b2ca693ed20e69d0581ef431e01c203cafc4bd912ff3b
-DIST KBNNNvK.rtbw 1920336 BLAKE2B d2f0d414350231be4a9d7bd6c498bed70b0b8dab3a29240ebc43bf74a393da8f87a03a7479d91571680deaff8e99b54516dace27fc71846e3a9b93959b134fe9 SHA512 aa1f15138c6c5f03e664d2d4e1fb85b7081631340eb168f3059a5a9ef3e6cb7bdafa4acf7853ae41ee2285bbb92e3380fcdcebb04e90bdfa6acbd8970cbd7ce4
-DIST KBNNNvK.rtbz 119705680 BLAKE2B 4d42f0109c7cdf6bd19cfdbc49a62abb52fcc3e379c3777b8419a948b13f64205eaded8159771dcfa2ce3d32498904be6dbf32e076313196868c4acf48870348 SHA512 62e7d30e8e4ff0ba8edc7d4a4fc5a717515abb3cabdaec95f1f156f3b4729b0c3c645a82c9235f6887f8dc2f3bbfd1064cd7f573bac862ed0c6389d0a6c8ff42
-DIST KBNNPvK.rtbw 16576720 BLAKE2B 4455f76dc023f5031d29e56217bcf75a7efee00c48ebcf78c409248b8936c261581cf9af3003c7236c157ad898886beba0fb7b794ee30a7c435eb2251dc8fbce SHA512 20fb8ffc6c12f91a1282c8f5a9bfdedc1cb6feea57b902066f9ee7389c8c90c591d2a1a564980d8c6d19eaa9bd8dd60d2ebac524bfcd28bf1456bea2d9a42d73
-DIST KBNNPvK.rtbz 20478608 BLAKE2B 9dac33d89b49d164ccb69edccff85d9d7405047eb0f259a5fe723df528479c925cb9a5eb650c948b2347143739d240486498039bb730ebab55451dee9c3812f5 SHA512 fd47747147ed5a199dbe1a1f006cfa10e25f8e36b351e27c48c5c51cf03cf2bbfde08616efdb143c484c087407df2c3d2a722f559da1d43b2b8f557b108598c8
-DIST KBNNvK.rtbw 92496 BLAKE2B 8a4d2d4060fc458ddf1a6bce2991ca53a374cfbb967b8b421514e501127fe292af20f4509a51275147a4799301051c430fcb73cdaa41e921413a5a7dc189d56e SHA512 ad823bf6ac72e57018ecbc04df47d914ee98f4b4b6c9dbcfef3a8a66b35e29823910ba818d06ec7437fe1c4310b47b0d24cbe0a78aed2ebc54bfa7282278467c
-DIST KBNNvK.rtbz 9450128 BLAKE2B e408f41ea36a4053ff17e9231919e907ebfbcf683b63cb4cffdc6ebf87d41e0e5468d764a196a6daf4a8ce797733fa21139afee2bfbe61818082187360f82b82 SHA512 9f31df306d2a67846f03998d1587e276d558e4d8af01e5459bf0678cab87cfee95921c097577f58cc19ea4a97c63494a867f54b6caf0b758f62bb6398f49ea88
-DIST KBNNvKB.rtbw 87792144 BLAKE2B ad6f20b3c1a57dd6e85e9522d2608fcd385015d3edf965e1be4d65c12d13b1c1a680a2c6242b36e701d38133cd5d72e90aa70d8a8d128c546ebba7457aa23241 SHA512 5e2d68a376986be9e9910f598cd30d917e9aa4d61c4fac21e0148475029dab28be3aaa12098b5dd173127e5fc7e9e0bbe7b6abad5894c23d5750a027864e19f2
-DIST KBNNvKB.rtbz 687529808 BLAKE2B 5b62b560958423549822a4ad0d775dcf080b283d3e444d57b86835288b327925b4e6bcaa130424169297669ef1b8ebc36ed3c3cf8f3e2904af46dd5513cffd82 SHA512 3939c277049f35263d4f2acfd18feec57af28d732c9c8ed390f14b53c1f774fa76a8d664318898607383d450bab7698c599ee09b4a71dbad88abb3d6378d7f91
-DIST KBNNvKN.rtbw 53104208 BLAKE2B acaf6b5a8305ee5f80f01be1440215c0dc502f01915869b8ae5ca2373b370574ed3981e57a2994af36b703c6ab38e8aa440a1cbec57fd5c4f78a04b7127e8a24 SHA512 bb22227a19241743a838f9bb83a00443d1361af512d9aa9cd9d023d8da5f6fedf67cdc3b825cc4fa4b07366d166e44f8c2f4cf1bf7f2ff8996560d5c944ff564
-DIST KBNNvKN.rtbz 699881872 BLAKE2B ccd35276689bfd9fdc9b0e6301b545bbc8314b045da3c3b38a17c36a7a5e2598be1136986d5dca97af7b4930ea8da3573d55035180df5fb020ca9003dcab25b1 SHA512 44a1a88e46d15db952f67d02adc68916ced7026d83d616aa731ac16831407e6c96a2c73f51c89a319c1f23567b18f1eedef3b32066b7d41be3abf5d8b51fe77e
-DIST KBNNvKP.rtbw 235102800 BLAKE2B 7c81e72b3c9eaabf6f08c199570d6e05205d62f5500367608f90d930ed9940bad12eeccf4eb3ab352c594eb55b4ae1178272743108babdf47ca3ea3750d99927 SHA512 c62f30182ffffe71d123f3f7324ddf54dbee972d315eb1c6e182920703b7e2768d520a47713ea29266bc4bb2fa71b7af690a11fdf72a13c099d40657b0c2ec11
-DIST KBNNvKP.rtbz 405945936 BLAKE2B f59381bd8b36ddc298f14a4dbeafa6d418f0ab2d8e57414dd964bdd31b19fb6f858ba7eae40c546d240117758073f1f5b17980fc584f8d691c30555e74cce90a SHA512 abc1c0f6363ee2d716ef486329bd8917dc63843b1be90b8b6b12b70fa3ee3e59c27dee952ca5edc5928928d56ba8863838d4a87976d07ab6772804c90ada547f
-DIST KBNNvKQ.rtbw 269296080 BLAKE2B e5cf04e89ed02702a84f3ae9cb284e62fcd4679cf5b7e8da3037e8a2ca8aaa5e0929a6c5a5fd0d56e17ad7ad04d404142e131829e514004353157bf5dedbaa87 SHA512 2c3129452d1a26d641626dec204d88ae2528521551b1bd84e782b6843925a670893c6fc95d96676f0b4ed3243595403dfed2a70048f63ed021f38a205882acc8
-DIST KBNNvKQ.rtbz 128514640 BLAKE2B cab39523b7329c481f3c2a738e2e3494480766df7bdb5dbaf4c3a0722d6f6a764be1ffb5dd5a5ef603cda3d16fc7c52110b4a75cb477a2f726e13b02bbdba154 SHA512 25c8aa06fb5eaf14074167e959440da5279849c01a2d3c983bd04fcc875705c6caf99ac9eee28c68d2849e35dead7ac2861f05e06a475ea9bf38b119850a84fe
-DIST KBNNvKR.rtbw 53294928 BLAKE2B 817e01a2b316b0eacecaac33275be084538bf5458ee0f68fcf9c1b2661b90ee7d7c3db3e473e48e0e8552dbbe8fb6c6df2fa9a0278203d2255febfe14307880e SHA512 f86e27bb311ab26f26aba2219be918e535cfcaad2f3a2b3524c5b12da6c1b57f9250431b6ac4ef79c48c442c0a881d602b3b4789f3396a2629edfa45bc64582e
-DIST KBNNvKR.rtbz 10115792 BLAKE2B f7de27850f46412badba59cfef7ca417091dacb4f65ab9d2db17229df02d22cf5e7e412e9fe619cc28279ba7d428bf5be2b65e6fca3cb299ab58625486cc8642 SHA512 e21866bf6157ab02302b82694bace7e4f0f1fa6dc34cba6ad1f44828d51764a298a0d64c12c9b86bcce993a77910bb501bad1c6b15cf95deee29000523c00b7c
-DIST KBNPPvK.rtbw 10476176 BLAKE2B 5d6a1408985841d21ef5afae33108430247dce3a0efac310fe6f94fc3e95ffdf29038c196674e2bf7eb718b1bbd7a50a4ecf07ad13f9bdd50718700c7688fdcb SHA512 ac377f8a29b44c0e035977178716d64f618e764e422826297af2e5946eb1cda73689d909b733fa22192c634fba22f88af2351f185dfee699cd8f64b3206a4e2b
-DIST KBNPPvK.rtbz 12170000 BLAKE2B 5cf88d37b717fdd58c12e6fda9b56988e48198281a6101864d0a02409a9cc85ec9952e4436911a48f957c2f77f569f4f6724fda664f979b61d60d2dc5bc956d9 SHA512 de495d01b4b222de53bcc5b3d10cd4642da4504a28e792c4e0fef861095c7fbedd36bbd5d653cdaccf30c3fd4466af3c7c4285b8a3d10602e7a108ac75b7522a
-DIST KBNPvK.rtbw 478800 BLAKE2B da2235c80d48a067d2a1676876f244827879b1e5a56a5860aef3e8263500acd09fdc7600ed1cb904bd3f11b2db23e06f955339a7813542459e64cb911e75ce94 SHA512 b69acb300f16b2cc45c420f26cdfae3e1e9aef3db7e4219a95375c3e3d22903bf406174437f24be44d8b349df61ef01d7d7ced33cec1481ab10b9a2f3a4c51df
-DIST KBNPvK.rtbz 556880 BLAKE2B ee61283c22786b2dda16e70be49dae1ed9116d160058e4706749898c948d9353db914626002813881a27bd70361a6a30ffd4b90f1d8048eeab8894e30bb70b47 SHA512 378e344d9191017e7263b4766c1c1b7d75fd044128546426b69da76fd33dd91e4d96ec61291c535dc63131cd9260470f66fdeb56fb09c10d2d4e3b1319fa216c
-DIST KBNPvKB.rtbw 613637584 BLAKE2B b4dfa8f66cbc794e9dc30a77d6a07c8fc769651dd5bfb86b0fdbc3f600fd4d9c34b0ed1238654ddf71e660c9681b9a93325b05f5632013a0dd40d5b1b47ade51 SHA512 f0d9c38b29d432591b37df4925a484deab9ebc4629f40066bcb6b4a824cdcbd5e25bb0a5f7273baecb20d634823573a9d4ff77f4fa203719ea455963f6a5deeb
-DIST KBNPvKB.rtbz 1221612240 BLAKE2B 67c0f0b935818753b36097da764e6bdb6ca2b98dd487cab43821bee1417ef51820a12b8d00615fdee06515d04212fe1120312bb07adabda85b1deeb27ca60c44 SHA512 fac38744966c197339e4310293a2460015b409f532accb569e9cbdc73415c10e8b961e455f64126983043a2069729fea64a734458d3b620269923ca97127a1ee
-DIST KBNPvKN.rtbw 555586384 BLAKE2B d454b6c0808eb9e6d6904684322a02695f9105150d115e9c82e80a7e18ae75515ec706172c54ac503398a5a31cdacf8e1625674adf56e59debf7efafbd3944da SHA512 2569e7a773a8906c83038c660ac12a3b82e5380797c3642faba2ad21d34bef3b916f08b5f36614216f1ac3194137a8fdb2339c0f02c4b0d3a5834a1623c1cd43
-DIST KBNPvKN.rtbz 861113424 BLAKE2B 0d979776db3439e13527b66d49ea3fb3d116691f37792313eefe3599299c99135bfa0f4784bb63a6193b9740169d3ae5fc63a35d2effd00b821ece4078d32194 SHA512 d5f284e0cf884802becb3d5c21384b05fb334a07b7a81dcbc963c70b5803e9c3cc4d84692fc317d97be3816619bd1bc5a11581e94bc6d5a122be93d35a7a2761
-DIST KBNPvKP.rtbw 453956880 BLAKE2B b90d7b8b298a95e765dc4837316233236b0268abf544efae52b7a51d8670bdced4f6e3b83d352ba9db4c424eb61fb620168fbb422054c736aac1ffc9b501d6ad SHA512 763dfdc36f4a3e34cf312af7b1468d55c535817d61b55027e2c24161d644538cbe5b7dbb6de9fb9b8fa21c67c92c1e4132cff57627f174c337d60f925fc7cf10
-DIST KBNPvKP.rtbz 109660304 BLAKE2B aceed05b69e6007c383c5e6a43f80cdde07c56b74fc7bc8033b75a4c26f52637536fd10198610c52aa4f464e77409ac8a8083ce1b27e7f092066657c45b6d6d6 SHA512 eedfb4226642397cf85cf2ab9cbb2c3c2fd91a99e403ad87eb2b5641c3143648263eafd4979f705c99f175810ae83cae17f7cbb9942748686a5215cd9f7d15b0
-DIST KBNPvKQ.rtbw 1521897424 BLAKE2B 0d49b447b7c60e275f0b7bcda983c040b602bc2aba929f9c562a5118eaf3382a0b4acf16bb9246e81c3dd66da60cbc1ed07b4d36f06ad60df4eb1f361a0ac7c1 SHA512 e33ef6dcf491f11ca17b33270938df3df196e1605e1a158259860387b46e2e1d351ad308995eda4900eaa63ddca6f186539a48f1fa46f20f261c6ea47b0b52ed
-DIST KBNPvKQ.rtbz 1257508304 BLAKE2B c3386e80a57271543696a28ecbf6d1e34ce1a39a809f42f4eb3dbcb90d8bfe220d1c8b06b75eaeabcb5e69a101734a2491c6e1c8377ff58a75807f2bf4785ff5 SHA512 3d1f9e403bd79cc0898d45493fe4af88a31b43e3495e3b67f642a6e63ba1dca72fd2f103210d499c7adeda926b6e8a041ec246d52e94343374dc148d094bdee0
-DIST KBNPvKR.rtbw 1450159760 BLAKE2B 66cbbbc7eac29ef9ab0b98fc3594a45b0dfcca6855c91c0c7765b0dec3ffca302a137336addda0e408c92291c11916b6a17883fe7d846f3da6ff8bd0855d6722 SHA512 f2593913999a287235b9c48a6aaf8dab9b83d2ca6a9c9e6d01f697bf0cab92f2a619eaa0bcea9d2a0d14bae51606bd2f3d4b1a21de09dce6830ed9d08f5c01a4
-DIST KBNPvKR.rtbz 1609326096 BLAKE2B 67f000897caae960c775b4a4d7f6e7bbeb720af98cf21f1124cc289740520b327798910dcdce02eb3d9d8daefb0f1bd9a77c28443b206dd6544402b79aa520f2 SHA512 4d312e3309273f71f69d07b93a3bd83f2334836f28efeffe6bc6a299a09c4c5da7303b3074a20edf5a9580c59e3fe5135a11ef21964d5cd912a8fcbac117c66c
-DIST KBNvK.rtbw 7632 BLAKE2B 3f6d27d56d3b7ab338968fc174d8cad9adf93ae40043fd3baf504a88e259deb767da7cbf1823c30970a31a0fc30864ceb2c9c67a92a3118cb930d26662c9e643 SHA512 e7e35dc25531f937dfd02278a8aa971d26618b65b7d1e68625d53c87d46f78374ee70d917aeb65bc7143ae39754cb20463ea7a6b07c4902a8dac6444be5c4aaa
-DIST KBNvK.rtbz 461840 BLAKE2B 28755de3d0f081060db58b9d5e4d7bc9fb2a53efa8f3f1777f9b4362caeb89337399de3223fc6a6c30fdef746a9fbf9bb09c8a9e9bc81aad203b09f6a7392e10 SHA512 49c7e5763bd07f26c30dcac858e7601a637af7dbe18a69ac8f5a2fab77cd35fa30345de1b728eb87c16fc328984731dc545e45c52c900958f9920e1804605288
-DIST KBNvKB.rtbw 716816 BLAKE2B bcf0ad8c72134f16c7e056d8cfd5f51e55a0643399dd3a1b0988c19979e5c67d74fc5c3ba226e7d2434a46612dcf52ebc7dba764f89f8039a21334d6a8071534 SHA512 930a6c14cf5181100464822de5d2d0ee926069261da3fb8b8b60f8031c68fac8b85334fd96921f043830cbc414ebdf48a92e76b5f34dd7edcfc0197cf12c08f4
-DIST KBNvKB.rtbz 114576 BLAKE2B 9aeea424d96912ba24a4efc81cdec18745529cf41853b65f2f4efc1f89875cd42771f53840a1eb1b45556b9249f3ed1ee0d63293c1d2ad4de69869f0a79e367d SHA512 5f84fc5a8a47162c4e34581a408af65f79bc02e35b967a4c8896b6f93eed5deda46e77738ba01392090dd9285416572350626ea7cecea4ffeacbf8db68cf430d
-DIST KBNvKBN.rtbw 6458128 BLAKE2B 4a603bb9007088baa039eaf259b4d70fe5707e5ec58e77e03d2ada24d10648b246bb97b63112f1ba6bc58c846d4b4f56c51e3a5921c6d6a019b8c99c38e1fcad SHA512 8aed01728066d2c034a316adb4a9637bdfee1dee627b07abf818bd053186d9ffa9eee3922f2b8ddfb58874ea1e8f18da351142d6caa84d80844c72d6ff12caa1
-DIST KBNvKBN.rtbz 4345168 BLAKE2B 6a8ad4466e984e6b2f8cd3caf616ec788cf92513a840a39a8332baf410a89c7ced63bd4f79a30a54dedd02c85ccc812e8b71f2db08505500ce104cebda60f2bd SHA512 74e06da285b78c63200f3fd467eb2bd532c4a483fab6f59926a8ddf36dab234d22e9a1fcaafcb68c0c90bb2e0b419bd7e7ae760f1678d12f830e0b7dac66aaab
-DIST KBNvKBP.rtbw 666171088 BLAKE2B 8d88d5a3efe84015cec11779d3c68e865a4771d5c2c47efa2ae14d8f00c0bb218a21a5269fc42a291e9fff541893dedbfc804159235bf63091513ee8de6f8dfb SHA512 c50c76f7355f84ddd69ee9c79caf6579d792972921b9409cd30fc5cbf02da47bf52bc297ecaaf0d4b55ac8f57fa08e9ea5b690c47dfe6f39ac4f62220d436e27
-DIST KBNvKBP.rtbz 49625744 BLAKE2B 5b14595ac222f3b740772e3e3a7bd46587f2e5a1a342d6d4aeabfe92d911d67638d723c6507760ec9130cb9b13dc63ace4eca9853c216ada86f03acde2920668 SHA512 81d65bb757c8383bf4841883240ebc2473834d1a378c61754bfccb329d42030ad28dae313d27f894d4c54a3c040fa2a67ff96ba5fa0a4d25c5cc03bec63b8217
-DIST KBNvKN.rtbw 3575952 BLAKE2B c8b02383355478eea61146f5f28e04d85620a96c5597cdc722182803d16507d1d2ce670e02de47eb958b7c8b664d344dfcc0a02c0b1b5cf0420ed84d603317e8 SHA512 f37a8c30b69bbcaacd9a381ea4ce1084a776ba3dec7ed701f55277b5553401c64c4dc441ed87b0701a26d83f2cf1586be4d7c865afae1a9113293033f06d8793
-DIST KBNvKN.rtbz 1826640 BLAKE2B 0faad83e269cb5cb3e93dfc18961ee2c46a34db6e0ef833608eb7936743d3e66d44e98d534c6045c3d729c3d0e6f455247a90263709fb4d7c23e7a912df02522 SHA512 b60285c16c4c160a404b32d0ea17b5ae2aaaef413a19a59217575989b6a666d9e780dee8a50d2c892afa09788cc26ad45effb053a355c0dcd7097327cea3a344
-DIST KBNvKNN.rtbw 6934544 BLAKE2B 4ea3dfa5cc2e85b92fbfca9a5564b12d3db6563233571e5b2598d058adbce59a1e735523d92ae214358aa817a25fe0aab01f10f95a1b229424d6ae91feeb5439 SHA512 0599c06326a21a3a03804c7b1a43408d1284bebe3241814e36b4a1159b666abcba63b5ea371b9e55eb33e24cb1bca842db428584622159721cd8667ff4c85146
-DIST KBNvKNN.rtbz 2060688 BLAKE2B 0cd50c9ae64e5d7727b981ae60e49f6757395e2e47801f8e0879a2f8168b75b221f6de1c2e23d55c1f82ae77553adf769c65f3dbbcd559cc5ab37d9ce878f4b9 SHA512 5fa5f6ecba983596617bcc55c8ebcbfb2fd7f9afa29d444927d4a4ce5cb64e4229e162dcc5c1262e698ad0eb6685f7950a761091ebd4e21b8dc168ba99f625d6
-DIST KBNvKNP.rtbw 861885648 BLAKE2B 5b65a0a529b6901600eafd46285c63f22b20ef82a618fe1a17e26b4d0952d785b1a0991a9b8e9c6a9c14cae9f6951183fa968e45c84513309b3496610c73b4cd SHA512 e73d7a56bf2e403be77d85aaaf3e03d00b0d14141ef1fb801aa6b7c4fc4df7b6abd861eb56b216b84e37e087c0b23236e94809c3e78ba7224881046c8c0f05a1
-DIST KBNvKNP.rtbz 136410896 BLAKE2B 7a0b96f33db13d5543f5c72cacf2c623ec9b71276cc7b1dea232e1f2254baf73518afdebd2334e8e62c18adfac0990ecfd9ad1a117a42db497a86dde241328a3 SHA512 4d837a62265cec9e6704d82dd1a60f20a3958e79f86627fe9df5824ebb15b61932b5abdb392ad3f459655f72089daf22d08bd64a11e7c09ca8e3ced721fe466a
-DIST KBNvKP.rtbw 10146256 BLAKE2B 1eed46fe5b0c3893917609f357f5255f4bfb2018f6591ffaec32dcf805ff1d8d9c53e39fd3dd5771ce3d96fd7a9cf43e284af60e3d1f06388cbb4cfb5bf18f46 SHA512 3ef12be201ef9b2ea3a8eb6b9619253de2a20ce4814c86cae9463c83e65eec307d37f3b447b81acfbe32c0f8997830272f023690462f5d4e05168165b4c6be29
-DIST KBNvKP.rtbz 32367120 BLAKE2B 7d7fe974e94a1a671a4cebe861adfa0b84b928f928e9f5a0d76853358445e9c9542a06de543e9380aa72801390e1cc9e5833ad45ddaad11cb024c848d8602c8a SHA512 e44d216651f8756dfd52533905f5e0815c2eeab842108398342002e27559fdc2c037d045f676bf13b6db1fcde8016a25eec48a811f2baff547d21750dfdd163b
-DIST KBNvKPP.rtbw 482900880 BLAKE2B 277556aa825b680c59229ac881ec5b09822338637503fa944fba22a5afe918aa701e1b41bd27a783a0607ccbc2af34f6b4179caec3d18852404b7b3b9a264f7a SHA512 6dcb48b674eb7e1c697d983b41c74f52ab844654e1de8a8e6520c432cd9392a3eddf70f9b6991fd772151229deeb1d17320a43868e17c192bf1e175f5eacb8ff
-DIST KBNvKPP.rtbz 540480784 BLAKE2B ec91213267894370c2974ff5a4c4bce04e729b32c73c531fa4b1dc14186e847cc59a6e6679cc189db699fd76207306123c666c1cfc946c7bed102ac2fe85c50c SHA512 83096f0deb26ded8a77aaf0a322cdb4981fb4a1d7d3cc509667010a756cf60d66e25e1ff46ef6b23930c6af1f2d3ded9bb978837ea65b872f98814251b3447e8
-DIST KBNvKQ.rtbw 1054544 BLAKE2B f8e82ce966581b825eed22b204b75c3550f0f509102552ac0da1863433a1adde1581cbc931b06545bbd80b192404c8d9d2fb0827c26047f4945cfeeaeb74f1c1 SHA512 4f6870ec7c269264925a91b5bb040660757d3604b34f5f5cd9b4f745fe3baf4ae370d53873d12b8b485a94680e05ce3192c398a4dd0deb3c3828f3c662145a54
-DIST KBNvKQ.rtbz 12536144 BLAKE2B 6f3dc2f3b780c4de32b8e23819ef213e22a40bfa183b440a829098b23b42c2ac9c27149408f4eecfc1c999bcf1034709adf6cb19f621829784a419b1a98cb924 SHA512 d994d5a7691cfa54433a0ba4fe89a7903ef5eb4032431ac8765014134e15bc9fb7c57cdfea28fc297976c9ed174f33814b0d401a516ffbdd91a7590e6db31829
-DIST KBNvKR.rtbw 1328144 BLAKE2B e58eb562b8457eff93287b1ac05044dc26a898f4902f1f581d315f1742b6d8fc47bf11ed8b07b9236f0e09b61e9f0d54dcd3c07fb2b788fb446f9890656acde4 SHA512 d6c37888b82a0052112a792d227c53ce57b611c55601e34349397acb782f5db0eddf2992c3cad7a0bd55bc42cfac83e874b2831dfa77736bd71d5ea470e93721
-DIST KBNvKR.rtbz 118480 BLAKE2B 179ca65d07f77376b756ffd186a279f6847932225d983ff7fe6a2fb6c84826fc0577256a047da6634acb5195b2c2670834b8764e6691a554fe1d30ccd3cd69ea SHA512 c58e4eb1131f5454591f9d7cdbce595619e54a32c184d309a4099be1f88ce17e6c5feb69bc806aa71e3f18a69ad136fdd2f1a7a188f5d989450e945a8e93f5b3
-DIST KBPPPvK.rtbw 2786192 BLAKE2B 2803fc2716970522b2676af87a9e50f42b4ec66a57e8e3654c87e37ca3a0ed7bcc27371d6244b2a62a8cc1e97eff68fe164fb2020eba04c3d0b5bdca23ddd8a1 SHA512 ab3adf92083fd2e011bac9a35a80cac7917ce40cf0d768bd02154f28f5b73442ccf9c68f5c7bea46e2249a395773318eebea138de60b5db7d729f293243227a8
-DIST KBPPPvK.rtbz 1369872 BLAKE2B 1d20a7e3b750b776ec060c4f1cfcd1238399506364a7bdd5ab3da1aa75deb0c3d9afe5c1e25c8b54513fe14d5573621fed6d4b13b78ab339fa8064ff40485d92 SHA512 44da095da0c97f1eef79f317a22db43aa28dcd080b9bfb6a44ac1a59d6fb91213274d4cab756351e326b636117bd11f43a26cadfb9aa1986b90b451d847e9438
-DIST KBPPvK.rtbw 274128 BLAKE2B e4b9ed89b41d69919de3549e39b24043a64e1b3af70e9fee5b9a19324050518d2adaf9e21189891d4548ad1fcf5cca7466f3b8254ce3bac8c3940885bf522833 SHA512 93e93af714ef45dc463cc7948b51bc310c683f27af0b6916c504847bf3ef9affe6c7dde511e20e739de922affb0bb4980f56198ca4468a0f91405e138343a154
-DIST KBPPvK.rtbz 116624 BLAKE2B e191ce2928b3ee572b3ad53017f0002862c0f1f06160d61eca2bf1999f28c7c5ea545336546730c8402b5ee7cd40d681b986faeff8ff7ce6ecdb3f4f649bf9f1 SHA512 f204d4e8ee90c68b506a34dca6271a0a46e5fc9f1133b2b55b0abead7146d4213f8419977a3430b3e02874dcb9acdcadb6e029af32f100c4bbb810e0bc9f9624
-DIST KBPPvKB.rtbw 441693840 BLAKE2B c36097c298be3a2d4b548320d7aac38bc2967a4c3b593e7a35360e5334f71f7c135a6db273a2db48d82483d42ff85cbff99710c0f1f2c5dac7ae13b8ef8335ba SHA512 73472d27ec35008aceaab2375f866bac8ecf95a249977c00ec51d23bed46a0d0665d11dd533461001c6785bedaef04f74063b5915b62bd3d01e07a2fa9d19022
-DIST KBPPvKB.rtbz 139204816 BLAKE2B 4431ddcaa3513a85278b8983cd0e7f3135c529d75c93d489ad26c715ff06e53b1dac1e4f0c5ef01f4c9a9e7b19fba423d88f0d68c29c68f4e7a6eff3595e734e SHA512 c09bd83e22f24aa0e55db1ab0c9b6c3a137cbe02f14c9b309da050487780ae476d69aad943a08e998808544f1b1ff88c0a0600e0fbe4129f30b6294d78a6e7a9
-DIST KBPPvKN.rtbw 320832464 BLAKE2B 293725f0d61a6e9d4282a6e0b3f7c7ed265c50c195199ff731012cd808733593fc50ec69ce1ed22bf5bffd5fd4aa58b39f25924b87800ae8057561e8481a9f29 SHA512 fb28aa42096ef46d4b320873f2288380bfa3ce39f2a707cc278070a4ddf5f8478bc708710376be04414fbfb6e561777f4493e3bdb614c397f6a5cc1ed9b382a4
-DIST KBPPvKN.rtbz 133937616 BLAKE2B 8cf94f621eef8aebd9b865d218b4499b838151755ce5b20a97cc8c537d596e21fd037e5f285dd96ce4d9aa113c336697a64dddf20251a8c578226580ac1b487d SHA512 a69d252ac6c3472b06d56485f13b267d0efea05a5b31a803f14abd0921d019a650a26c4b134ed4d8735a707ddf8ab933a90dbef6717f6d6543264ff6ff2bc943
-DIST KBPPvKP.rtbw 166772624 BLAKE2B f170a29c70f129af3118c5fe6d13b5d89b7fe298aabf3d78b97978e59ea3f604cf5470f7b46b373c662772d9325e7dadc843d24d562496880fb9ca8f8bf0e5d1 SHA512 90e86b905a9e9c51d91e9a63810f3caa1205658b4f05af545638175f7c0bc4d3dfd5fa612c68dd3b3512f0046c450be7293e2482ff0e9c29123a47d58ec573dc
-DIST KBPPvKP.rtbz 22682576 BLAKE2B 2eed9c9355589dd8a095193b8da7bce658edaf14599839ed33f83eeefb6dba8c527db6a7a948366f63db60aa518913cd7e1072bd881fe72d251b9cc6d2ade4dd SHA512 00642770e2848655ae2e1487bfa87ec6b0220e246c9cef4a39363f36d073a98e682a526da4849498bb322b9bb7c406fb957e521f71c5ddfce3285515c06c74e1
-DIST KBPPvKQ.rtbw 390001104 BLAKE2B 2c34ed6901de2273cc5705329ed03a5b62903cbed1263dd9e542156840c036207eb5c2552b6fed94b7f6b6bf15dd0f1c90546881b15dea7ba1e23402ff3fdd3c SHA512 7ec77c902b289de6469a1789e617f819006bda413c04f6fff9897eeab7023c6b7dd8c65514e57c50109f951f0f3b4d7c62477c6fe85d7c944100f332fd6cc2f1
-DIST KBPPvKQ.rtbz 387032592 BLAKE2B 70c244a9367f64da19a6f6249bd4e6ccdadb260b000199f56ebca2395b0388e5ade909643e31fb9cad7495f2943c66fa8c95d06642bebcb5351bbedbeda67c56 SHA512 81d2249505e2f53fd17e30e4a9f3c51ce5b52b09ac02f23bfae7377b6f5465cc8493cf8a32b34168f5088010fde61b932e42bb8fcae4a3969e8dfac340c5c052
-DIST KBPPvKR.rtbw 552290960 BLAKE2B ebaafed22389f5d4285e4e0b0e4e3d2afb97c11f8a179fa9898bfce65197bf8a4d63bd2b42064e3e4f3e5671b4536fe2770b6ed3fca5e0129690a3806fdff9cc SHA512 3e9c3cb1acf2b3d8b111455825949630aca2f13976e33b9e9f97f96bb5060f40e43b597ee7be624cbabfc36f3a7a5cf48fb1d2dc9221fa59cde4c574fc784de6
-DIST KBPPvKR.rtbz 161020048 BLAKE2B 8a62d8cece07c6dca2f104a94d8293787fb869de00c4e1813d86a9b4e4867f3dd5efe1df9fb8fb0067ab2c1d7c36e93808133a9a5319b7f0fac1d730b281b871 SHA512 5d1c288291f2ba155e6a924bb6c4761e08491a8264b35015ecdbf00571e2b2eddad2e6529de937e2bdba875107df962f6570832780209392c0a17eb97190905e
-DIST KBPvK.rtbw 81424 BLAKE2B 70b917d7af453b3ebf740c49afe666f8b4eff77e0b9067b4ff8f1c0085d51f9f64d8ea42dfd65a93da284b3ff1ffcfa6e30fc9189b06243146d437977c4fd305 SHA512 9760ff46776517eeaf598109f9e3036d5a436fc32f88cdeddc32ce42045a58c492e4e103c56ffbb7ddd8d0183e8ceb37b6d7d28f86e466c2dd7a0ed101593104
-DIST KBPvK.rtbz 75792 BLAKE2B 2185ce9903306f47214d40531e38937da457b40fa0bb3e7b875dfd16c4dd4a881d76c53530c33008b2c2261f4abd028b93fcdb4a0e99b001f9a4fb17224a2ef4 SHA512 1ff903a5a2de352e57b46e177a2e283872e98344397737fa188a93937b8cf49078efcdfcd51b4e7e908248f41ced49cb7c7237755e3ad7a4ef327234a2b2844d
-DIST KBPvKB.rtbw 15290512 BLAKE2B f793a21a69e6fd728d6cf93baa41321c620d20a5284c99ff06b2b76285886fb34c762bdb4d92aa802e4de7cb2c6cc6a9868eadf584d2250b0bfe743846d9026a SHA512 b06c838b7ea38e0de5ffc841117046d37e271ddfc0ab0fff474bc0be8766f3e9a13664f09f29ba411fff82b75ca08313ddf47c3d17a22e8b73ea1628e8a64ab0
-DIST KBPvKB.rtbz 3497488 BLAKE2B d3be6ba8962cd41bce3b44c7ea8a751f417b63f0517cfb3e6acdfed0dc6239616fc778416cc62e8e1f6d349e3f7ec94ddc11bb022a88a68c9905f38b3c39edee SHA512 4b6e7f3a9b44ee846206d581042d572ae6c2e3f94ba05a9889bc7fc67cb7097c5d00ebb65b828a05fcad11c7e57e5222ec99033f961b00764a6824184b961371
-DIST KBPvKBP.rtbw 501348304 BLAKE2B b7ed5c463af8d035bb693b2ff9484c2bdd5cdb0c766d5c42a19b62f36e914cd9178e7af5670d2bd9eacf35b82d20c6cc441d4dfa2e0eacc09224ec9748535ed1 SHA512 0aae2dccc7b866cfd1e2774c9579e9eca98af3e06fc25c552cabe20a5f4e39665010d5b5a9749ae46c4eb681e3f0a93ed2c534d72d67b1f29c2e0776d00ce5f8
-DIST KBPvKBP.rtbz 176250192 BLAKE2B b4385504b9bba2e8d3d68c0d6dd6ed555e91e6888c92b7689edcdef426c3960c5d6e316047125b9e0360364a50c2a85a5eb2777bd3109202c560972a8bd2a086 SHA512 8a4d27e066bf9578c5a86dea6c7e51eaeee0c9352ebebadfae920076266f8c8e45147266062eff2d52cb7b3801fa3a97ffc3ed360196175304f5a69dce0a0ab8
-DIST KBPvKN.rtbw 20381328 BLAKE2B f6fe61bf839c7e9e0e6f8fa58e873af3370c91200af827df13e88212f2aa4ea365ad25eaa7b5fc3833acaa6fab5f8859f2d1098fb60d5a209cea5d174ea8490b SHA512 1d4c673a4cfc4e2b07a777eae2b738c8963c4fed7a08084b2530aadfe83b7eea074c93728d8a1a7d7ebd79ef267ce64314745790961c43eae44240d42458f3a9
-DIST KBPvKN.rtbz 7242128 BLAKE2B f2cfcd0aea8b7e21b62574d4f688130b1fe63ec537461c0218595ea583ac03ac8a9a5629a9bcc688d4063620264367a3a1c3ed39996490b0fd42ebea0f7aedf1 SHA512 09313f6b3e2f09c3ed7ddc5b08da58160b3e061edc0ee84cedceace5abb4bbc4f050130caa1f962893797a04f7514c2c2f72ac00463a5729e75232240c5c17e0
-DIST KBPvKNN.rtbw 336281680 BLAKE2B 398d1c36a75993bf078ef211520999db78bffa1bd0887e86880267d96f6215c2741e94534e2a4e4823fc5ad7bb80a0812a6c3cb11c43f0ddf3fbd9f947b8798c SHA512 4a2813839b192c8eb6a6e25be09e4ad84ff312d885c288048ed5037e37c76bae1ff3ce06c99a808308d42049af9595126488accefb97c11e1db57e2add6b4710
-DIST KBPvKNN.rtbz 43931984 BLAKE2B 4ae9e95105e19828219cb7b26c6d7142f37db2c100ffa3a8fd4a6bb2ad4855405e47b37e72a7e8e0d7422efff44291eeb5e800a6a63f3493d81fc5ea00315fce SHA512 157775132041af31de6a6498588e29f647b8a42c86d1c855ea261d9e0f2646d314ccd217251f62475afde4b6b4a2260b0236a77fbd7fe0eb00e2c9ab8e275f10
-DIST KBPvKNP.rtbw 1282012304 BLAKE2B c946187cb730bea6f165991c538f3b774578684571f8f28155b9428906e0f7ff45aebe9200e4880a4ff61d5d4daeb2dad7e46dd10a61876175c9d239165d568d SHA512 afe78fb0e6da6d384131d1c65b10530b1ba8ce51a0e0218d5025472634bdf20be3d60a52af31918a00d6c1b699e072baae283f341529a179bccd4a7ec1e06729
-DIST KBPvKNP.rtbz 240034576 BLAKE2B 0919fca7bb589e14bf28df8ead79cb328e95226993a36afb557d49e98f3f20e1d0d7424517b36d3d9ae31107e3d06634674466d0055a97276bb5929d34cc37ec SHA512 ccc3b7ad6ce4051ce8e309b7794134d9355e29869009febf24fa8bd2dc95f694a62c6a6d1ac8adaf143eca20c00c0934bc822774787fcddd2b0a5184863e261c
-DIST KBPvKP.rtbw 13821584 BLAKE2B b36f1bcd27e245ca380e64b10c4aefc3c53e500c567a259eea457c963d7c86b50b260d567fe5c295b46a09bd29b33bc10e3c3ecdaa10a1547b0241b31cab84e8 SHA512 d055ed90f5d43055a135dd5644dfa4f88c3123a30ef6aceb8e22b3e7a0098991b51e49e5568a87bd97f9b0d54b3c9d95243c7f59a2966a3910e74c171f073de3
-DIST KBPvKP.rtbz 7172304 BLAKE2B 58fe1e0d8391306a92edd141e691d6036a152ce1a581049afcd0d347b873d0469d3b7328f8c7fa1b18707010c6b117c3ac3ecd3a4723e36459399ed969a69211 SHA512 77c70a014f44a7d694baf5358e12538030f6e8aaf23b2a91077f59589ce42332934ef9d8cf23699fc78b1c4464f079e8895d7d957dacd246cf473c25ebc6aac9
-DIST KBPvKPP.rtbw 535094928 BLAKE2B da2a0f7c704c101346eda20943a285a016974fdb29dafcca41bf6ecbd1e49aee443fcce652c4a9a4f14eb040314733c425d0545418f563ade05d76e228a46090 SHA512 9320fe50859b3e17dd20b1e039bf9ea687ffb5280dafeb9645cee60b95ab8ac3ab84a51779175432923fd98c8e4d2c8b0f9f54dd0d9a3416dc2131b37acaa0e1
-DIST KBPvKPP.rtbz 173704144 BLAKE2B 4670bff3ce41bf896a99a1ea7ef0ef45a307e621e4e2e48f1cbb24482795ce68d0595f70b946d79c9d95321a458ddcd90d039e7305d90036775402cd01e9840b SHA512 cbc447b6ef1799c0b4d55194b93653fd97b5ac46c87ee3c5275e102dff6927bb5f88bc02faa7dba66c1e80bf6e02cf72a15a31dc362bba986eb262b32e725f59
-DIST KBPvKQ.rtbw 7497872 BLAKE2B 92f00e623052c804fcb18564d0db53a3f1e135f24fb7bdb18f67d218eaad01dff928116b04c3dcfc4778cf618691d39b1cd4acf6637f451d7c172d23e734b237 SHA512 a7d4ebadcb91b76e18dc62596949639da7afa15cd538026b34b02072f44879a3d201893d44a925a3f2f34dbfc5841accf70c3555cd58adb63cb94a68f6dca171
-DIST KBPvKQ.rtbz 23906768 BLAKE2B 40e71637774bf326c70a194ca71343714ff7ac64616f53927816ea3c7a3741e7b16aa2c1cec997c16acccf0837ce50cffef24d41897ffaddecc73d9aa3d01c59 SHA512 b8bd76e3ee5488b257367e9823d26926ec2898c83ce5b4ac3f4c58c7103a697c981c19b1706bf22c3dcac356b14042f63cda9b9ac964f7e0db00064156a046bc
-DIST KBPvKR.rtbw 14246864 BLAKE2B fd3652c44ece99f5b419581ea041c57b7d81d3a445ec2e169a9d599bd42ed7971ab59d410c6b5bd79e9ab38d2c274dc841253d748eac83c43227191eabebf9ad SHA512 9251aa0da1d92933b0b5b019a7b16ac2de848f46722e9b11710e225942cb20dc4c7dbf6d376c2160e1094a77c0e481ecd606f7a23bcbc9c59c3c7b0d88738147
-DIST KBPvKR.rtbz 1573776 BLAKE2B 86b9faed48e753db655c61502b42222185d8038adc930150bb337dc46a4f79e47bf547f280495d764c0364f5463f1e9874ac0a6efb68e13f4cf17976cb41e0cd SHA512 21706344494fb2833f76d9ec800221f4aa30cff767878955485f1cf994f0fd0d2be9bf797a94933de56f914fa5b683f825c046794a4b70d167471a41532ac03a
-DIST KBvK.rtbw 80 BLAKE2B 51bdc03d5fccd34fe54ac6d92b765fbd6620f84e89f7174668778e39fd3ef957c9f3a8543700f4c1812376023334a9e45c1f470380674246edb93dc1e3c96762 SHA512 ce796aa9a0a0632deac094537e389177ebb328626f534fc6b9e25fdfe205a626cedcd6cfbd2e5bcdc96fe0b99bbdfd2b4f930c5cc940e1f70f7e3d8fd1203899
-DIST KBvK.rtbz 80 BLAKE2B 3c46be1bbca94b52e6fbc9244249995ab1fc08c1caf72e41d454ac874af2e53a5889ce0f3b806d9f57ada7c7c30fe03366bc1e33251f7232b235dd5320e12ef0 SHA512 a4eaf986da05a21bad5cade70a1991bbe7141865af0f965800945073830c64405efc335c4bbe51b9c367c1d1f8d8c8a73296a033143da5c83bccbd509ef9272d
-DIST KBvKB.rtbw 1232 BLAKE2B 9abe73f796e7c9ab96f00ffabecbeb85201663159c745f1124332791f8aec72ddbce4b11544464ea4ba9e958736b940ccca9436e95896e64755e641cb83b09c6 SHA512 660279f760f5dcbedf35d9346951e6dbdd6e14a2f6315bd686b06b79861fc9ff3ae7755ca2dd8cc14bd49cb5233985c3a1ae76615f1920a0cf7346484e777d40
-DIST KBvKB.rtbz 80 BLAKE2B 022a57b1bd58a660d5d8d9bdc0a82eae2c6840558b17a90f9585356731d4b945abe3f74fd9592fc6d4a9359a5feb56f798b233b2735f233e7f9459b3470f1c81 SHA512 e43cf49682d33dbea7651da05dcf7bd15e5de065a139377072cae55908af4c23c29f83fc2836021a56b7889bcb8c27005db287b5eb7561861069e19374a79dd1
-DIST KBvKN.rtbw 2256 BLAKE2B 98d6f40893944b2c6b596075a7329586fdf2af45527811f18442bae2575cbf2f1d650641e165f545b70f0374c6bf0a258973866480eeb2e975b18d7a72f72708 SHA512 09225f928a254d005ea11d08c959b45864478e726152327f4894b26cd7cd612b8249e7417c63b19f350c704c8bc72b9631005cd7bcc0c844c1038ffc173d94cc
-DIST KBvKN.rtbz 80 BLAKE2B 9403689bc6349e3cb8ed8f0f0cc89e15d616372eb489e365c40d56c215831fbab9d2b89ebcbd31a7c255c3337b73b91a2a4fcd20a189e4f0dd7f43f52a1d480d SHA512 24803f11521cbe0a27f608af0012c66c29b8dc933039585a526a74c07fe3d53051611028a4484cd4be589ad8645cb92c8c37ea19856fafd71d106610bda5b319
-DIST KBvKP.rtbw 107472 BLAKE2B cc13b22980c65fe2607f397158e4c2d9387b90d45cfc1d6a2a39865621286b35d8c5d21273809c7890a781b849c6ad9119942e3da7f701bfbba1124d8f67d560 SHA512 57ae87e0576b0a0c08387b9f91c80bd8eb71479e34bba04fa6d6012f5c7a94fddd56eb2a2d9169bb7a74ce76eb7fce6675b09860f212286789d88403a2987695
-DIST KBvKP.rtbz 5968 BLAKE2B 8a316d5026849baa7038ac91976df1b6e6b373be77bca12661c9d492d19516f24c60cb5f1bf06e3ccb3f4b55e238025dccc48cd823324e6f5407196f1f5219a8 SHA512 ab1382f622de902fd3b343272ceb7f1efdc48dbc2c25131062a07ef3a5777e1677f3b8f3604b77afd0880bb7bb4c3680bb4cb727c3ad88ee9abba93959700646
-DIST KNNNNvK.rtbw 470480 BLAKE2B ef1c7691a37a5a0d61fcd9a533f71f031465036c6195c4d85c205d92cec623318dc933dc4a1ba0a4dcbe5e0a41296c5c087397c0ee369258664bd66a89fa51fa SHA512 9b059afc8169c9cd64d839c975c8548ebd45507ff46a5e3332e4cdfa709579d4f3bc1d12b55c856d0918e502e5e8dd72aeff74e254de42704543ea388c3c8791
-DIST KNNNNvK.rtbz 31877648 BLAKE2B 764cf4cb886373fd15a3915f76b87fbe039ef3f0c10940015235b5d963e9af79ec905735044c977550dc474a40828e37558e157cc3a6cc4b2c1dc6882adc7028 SHA512 4cfa4d1e89c9d7d7629b4e1eac805c6944be9d56335e9fd7819cf304708ef0d18db8d7373ac40468b0573ac85eb3373e38a4d43aef614fcb068d575254a90944
-DIST KNNNPvK.rtbw 4808144 BLAKE2B 0d9e4e4ecdee26fd5d91c58d6f8586e78e0734c9e8b93c114d163303a6a9b361689056eca6ad8711581ada552ec08648dc8dd9ca8bac5637773f28a4ac478247 SHA512 10039af8f09b6f7e5d4e64f652fda42ff69e59aa41d03d396d075c367febb43195eae0b574352a82e47132d17ed713ced089dbe9594d4e37e0de31d163de7a9c
-DIST KNNNPvK.rtbz 5843792 BLAKE2B 48bd1eb07c4a4570f5aa4870775087be14f6b89f6b0e9f05efb3a6e774a30e877c2d5c10acfcbe92041a19ef50117cd1b1f41b4aac74276174f3f545e3e53f69 SHA512 40b0011c637c1e116beb9ceeddca5ef1ae676619ae35b638dc1da925138a1fa85c90f9de78b6095fae58f84c2a9061b043d826708400957e518f460f96520d09
-DIST KNNNvK.rtbw 85712 BLAKE2B 89a9e155a90427e4eb4082201a9cb52b8b5cfc49259de3af69eda867fc7fb9e05b7a420badbbe918cb60522ba3d5ef25fa46f6949c55e0845fe92efed143d200 SHA512 042eb3dbe8b8698b70df4dc2283686995e6fd3339892df91e8e71ca39534b0a159f365f268360ce494e4b1f708c68c95ecfedddc166d809e6a6052aab4852142
-DIST KNNNvK.rtbz 3821712 BLAKE2B 6d9adb5fd9930021f142e6d030cfc420a2a60e40281dd4ab762a79a5c9713ce9c3669f6463032a243187b321d21a695ae8324143431c2affb45c376febaef897 SHA512 80ddaa89cfbb06c5cd3eaf94d1eba78cc4fe64210a830ec569be411170953e9d9803accb01ab53128f1c997942c0e95e504d4805c8195e01eeed5ae994d5bedb
-DIST KNNNvKB.rtbw 80869584 BLAKE2B 4057a8be61a266dce066ed0f76c560c893278727437d8e2a4f11b556e0d54237b1ef01d7532a0015dc2341739fc425965a14a4be3102fb94340eb74a3f369923 SHA512 f49a7aeeec71c5044002eb7f63df217caf4e9199623e849d1da3b781fb10646d45d0a09983b866580972682e1272c3a9981b66d4b64053bfe4588150c446bbb5
-DIST KNNNvKB.rtbz 233095440 BLAKE2B 89632beb731a79e4b3548fa5801c0de836fa26a792f2cfc744eda4fbd2c9f1c9a1155073b37511c79977dea77bfe806302bf8d8303cd0e1cdc8854eb0459dc25 SHA512 7a7b3361766abf169e1beb3c80935aaa50a8eda1d3706ff64e6d63be420a8bcfaf053f1e95c98d98724b01d98aad83bbb679c1b738518eafb5f850afa7bf0870
-DIST KNNNvKN.rtbw 28939152 BLAKE2B bd633fb0f3ae1a6802abc4f04ab249cecd6ebf94a7d0377a633b82e2cfd20d5cb4f491920a663abc9370fba2b43f89053ed4f5639613e6ae1c118013b2e93532 SHA512 1d5ed250f164650679bb8627d172188c635ac727c2cd729ac2ce8cedeb97ee707ed68b7755ae72ba6aae3cc64c592b9d30230ef165975c22de5ba5e4460e464a
-DIST KNNNvKN.rtbz 318866256 BLAKE2B e2f6ba50d5034f6a4b963ae8a2945eba4bc5320b143adb1816d3cc3cbbf201e20c9744d12a2295d2c298933f6e94414314cd0ecd2ac62aaadd2608906a9a219c SHA512 7bc79ec0e0dd7f20924605f6bbd406f0a4b564de390c4b807e679df802b0f66a9903cd3468aaa8c4329fd7e39eb0aa526ac61a9405eca29687167807fdcac48c
-DIST KNNNvKP.rtbw 114699024 BLAKE2B 4a418e085cc0784794a540e129df8e4428e7d7466abc6e3a372c0d774ca4ec1ae4bc148412a43c266a5d1475704dd1e2c5dbbd1a113dedf00d28275e51952da2 SHA512 856c5c9fa50159e57f116dbf8606eb9a5cc62dcb7678838ad6ee1efbbc1e6e8d369c0c2de3ace8ce38a14acf85cb89b0ab1d9481508efd909e8eb03de838a2ac
-DIST KNNNvKP.rtbz 242174544 BLAKE2B ced32f34995c5452e78492a8e4dbdb17a6f00d263e18c12bcc0d37390dfff1fefecd4925259f45753d9c83b1e2363667f10c8db32b5cb4105d2dd5a69bf5d005 SHA512 694aa248c24c28bf724ab324ffebbe584b933d8ef8208037f0d6e51c07e50bf10a0ea98b387a41ef831f7b80ca226f17c0b28314657c4871df7e60fc69d1d84b
-DIST KNNNvKQ.rtbw 93854608 BLAKE2B f36030e223fe342409cfba9c4afffcbc4cbedfe659bf7f0a4a5e088c77213550b4faa20ce729dd18c35ef3233a594ac6757d8dccecfe627279ae86b96a01a58a SHA512 052ba65fe84f422633be2075094caf06b6a9e25af0023588750e958c1d67deaf1d8f2a838b2bc56ef2ce0f4330507c5cc90c7f17a7e2a1010512c979268818d7
-DIST KNNNvKQ.rtbz 28989264 BLAKE2B 4d642d225a13d7092add3a45f384abfe2337c1257dfe7c8693216f5bc57f81c93923b9dc6e7dfa0814cc8fab726c469b14faf2ce75a171e557cadb741fd73eaa SHA512 375c8d66fdcbb7c68fe3bb28bd8313b74efe46b05253f2cb80d4dc5d8a2991c84ae411bb4afe8c2786ac98359f99a455abe2490ce1edc006e88f5eb6a40d7b8c
-DIST KNNNvKR.rtbw 13676112 BLAKE2B 6773338c1debf46fd4c2bd6a8a32780f35c75ef68223b08fde2d4a85e20b607f3c4a36fce9d40f2e8805b3b7d1fe08ea6bff7f561f6e5c79b8ac2ccdeb830054 SHA512 e501de17f2ba9560047053252cde476962f57ef451d86126b3bcb0f08517ff791fabd8891038e4af684895e7ff10676c6688225a4405fe59178c3a8ad34eb6b4
-DIST KNNNvKR.rtbz 1675664 BLAKE2B 0f2f75a306a6c69268ed5ec758bb36d80c25def0034f64087468342fd45f249f24a24a3e07add8cf6a0b034d233d88e0ea5d9ea120212d94194cc756fa3f47a0 SHA512 50f8c8a4b43145126f3f8d21c3c0f3ee9a16f20e930d680071aba03e426f154489f8cd9a3868f4907773a8f86e8ae192646948733f6ebc68ccde80e28f638894
-DIST KNNPPvK.rtbw 4812304 BLAKE2B 7abe6585f1cd200316a658b028d49a6be31c95e73969a435ca6d0bc5dd4b91e3f7a8912bec92e7e326b0b8f31d3cadc189f879d0c350340886948c2abf13ba21 SHA512 7b96c9c6499677ca46980e4b3259cdbf748133ec115a08b80f5698b9807eaf4a318860b39b4d474c1fc7cb5dd793f964d815fa1192f6a0422443f6e177badff6
-DIST KNNPPvK.rtbz 3279120 BLAKE2B 0e4c9cde60224aad4de7e87590aa2edc3f166c1d5b16ff166dbe0e2036e2a77f7ba83fb30a6b7840dd2b0c293728f025122a967ae4ee9802c788246805377c16 SHA512 5ae8a88696b61f8dfc74fffc13cf8858373199b1e3691f792e35269229e8a364df405da20ecc6529cb2821ca057fc15d5a4737d698cf8a99bebbe9ccf1215380
-DIST KNNPvK.rtbw 882576 BLAKE2B 8fe368f6ab2eb8873daa9e7c1e6f637bff0a153889ed42c491de988fabddd010484a3281defe60105416567b0f42eef66912c46f5482f6b839d556ed3cd24999 SHA512 9d79742878997224f258fa55de10a5975b4cab156f45644347195c463adc4825b6c897debaf1011e2d32b47b0fa95f5423734580492c08b8d2f632e5b3e731cc
-DIST KNNPvK.rtbz 1262288 BLAKE2B 4001894dc4569ff22d8a866139f359f1609bfff554e0036cb80bea99dd54dd3d48904f2514c95bc1de1cb99d3895430a07e8ac7d7b98d5675352a497916150b0 SHA512 11848ea9c699cd79117a3d69ff8a835610480da8d136bbaed13398b695440c904e50d86e105833cd513ac7d0b94b46ce9f886d6dbd94f109efec423894447272
-DIST KNNPvKB.rtbw 617920016 BLAKE2B 19441f1e654c37212ca2322dd33d2a33a1afb6c94e235d878b859b3dd90c9c4567207f0f78ce27b40cabe2ea559624ddadd76d39dde2d4b5c758a48c373fec6f SHA512 8cbd6ee0f57715882479cd7c4d129ff77ba9f6c995866619a4f5764e1cfb7bcee58bffea52003d37eed28b6a9b22674d3b4a38d01e47c38dba3f8d71caa4cb75
-DIST KNNPvKB.rtbz 960605072 BLAKE2B af865615497780428c8a6054ac4bc1700fc70e916255b588ccccebe1d59cc9c450a0dd2e58ac753322e024fef2156fdc73c78229e05ca2554de2d889191ea52f SHA512 6b97b0c266d92fd7bf657cece019d1d5292de08f93d90d70e743f7b3d5b6cbde0d4a771fdc89d55f35fc785d5da41ff67d25fbd0b65d4b2c63989c4e615db389
-DIST KNNPvKN.rtbw 616794832 BLAKE2B 56a3e39a88f4d681792427e1fbd1abee5211efeab542eb1c672c1c0d80104aec6621a40c6f2325138c9777cef0fc766c8475a96b3e5215b9a76c3d495a732ad3 SHA512 d2887f523da7090939dc5c8db802a5647821532dc978cbc3bf53d60c7b3dd0b3f2705e4e7c877ad021caeea4788443713ce6c3937748c9cf99fa3785f5c6e2be
-DIST KNNPvKN.rtbz 770992464 BLAKE2B e0af397611fc48177a06442a2aadacfc9677737a3c941b200cc022ddb42692e7f02a0c51617b424664b6671c2886abcd36737d6d0d8907fbb7046fbf2f5317dd SHA512 83495924838d5f04b062494a6456c07af73a8f26454aa9e02018dc79ceb3c9f8596fc6a56d4bc89571b66746cd9ca0cb1f95112e8f1461cf9663f5fe88a08ac8
-DIST KNNPvKP.rtbw 353523536 BLAKE2B 27fa0aa585bb16eed62e36dfca8fd51e648050e49dc965228d4a30c0b14d307a719b713a94c809fab3d9ea620d2c5a4cfafbc56b948267ee09c90f1d3f6b564e SHA512 c2db936a27d7ec982ea6b97f04de4e4f474efbd972ed6a8a5f8202265a09466a48c53416f7c9a6ec76da5a6fc60d0a40542ce958721228cbac3d7e36d4a4f8c6
-DIST KNNPvKP.rtbz 125913040 BLAKE2B d93092d8f6b1d0fe8e9dceca1d2e2669925eaebc88144eae1942812ea37763904bc774f698b27cd651375617a9fa80ebf1d3f2dbd9c604ce474fb4f0c30378bb SHA512 07a06fbb809d7a3ca1d495aaaa8e4129fd260e33c25e99d00ed06278f1e7dba594ee48d4aa6f9b461ccd22a23bdfe427d0ea8f58d18be1af7a58db577b8bb897
-DIST KNNPvKQ.rtbw 1024893520 BLAKE2B b6fcd6f349a9dbc302b06fdbb1b6683bf78fc104534463cefcafa22379e8f5def756a1b99cea491f92b360fd2f1fa03e661e0862bb13bfb1ace2b693c18b8dc4 SHA512 48f9634e7b00017dc4405cf9f115b736614f3cc6924a31f232707c67955f6e9f1da0d10bb20c51bf87c653ad55e2eb087e35cfcb3e9c7b4ec6f23dabb3628186
-DIST KNNPvKQ.rtbz 489355664 BLAKE2B 7d7d3aa4c57f4eeea6bfcc63ae3b89bda89ac33e5b71c7b2e0d769eb9c7bdf8ac54422677c02ba7675f1be25c3727dbfca0f3aa6e3a1190f1be9c0df60264162 SHA512 9ebb109209e2fa7e20457ee8fafea7679c3b3fae6bf8c351ccf3e8b120046cd8082ae581c8ccbf0c2671f8cd696ae9ae2b90c02a60e8c9e4baa901b3e90fe74d
-DIST KNNPvKR.rtbw 348697488 BLAKE2B f67d80b7c28e6eb8907433ab33f4e4bce38d2aa2c70eb0a2aafa085dca21f422bbc513958538f38c2e44d8cfd0b15a48eaccfbca889d2793740570130b52144a SHA512 333e480573d5e85fa19f7a33fbd28bbd8d8fc773590bad2d7c6e67c365a636ac7abbaaf2c347491da5fec664876b53bf4161e8c36b9106ce7821b068043b9980
-DIST KNNPvKR.rtbz 96331664 BLAKE2B 869831ed0d8428b67f151fcd1c2635880008b6ef5548b1e5d9f4297331f840ebeab78e191a3032f6d7bfdced39d3b071bb92b8faea4e0edd0d64813dcc037348 SHA512 e551078df1f76b36bc8be4bc96f975148e4ddcc72b41d0e34b5c9d14a64403ef9fde734eaed79cba17807a857ce6126becc807b4cf772c7818838f3f0a0fc614
-DIST KNNvK.rtbw 1360 BLAKE2B 02b8420f02d4e84d17659ad645fce2a5883a2d2d745cfeb1c9112e55a4b51d84775a0c4a0fc5947dfd15a05d0d69189f5a654f7e8d66640c4a2ef3c5835a4018 SHA512 c5decdcdce28c8df9dbbbb066b255da852271e4444f218fbe40ef192976640bb45f8770a5c1a7e662f4116e41407bb37a7c1a3c317ed7f44f220a833ff30c39f
-DIST KNNvK.rtbz 80 BLAKE2B b72c9f006921c3b4453e111115a13a3959465cfe6e9fdf98e6409cf692b15b20e1f96300c967bb8efdf203dee3dfae1c2c668b62236f8b1602a845066af03697 SHA512 248b3a2821c541bf7003285dc2f7bd26fa989ff1ade8b64bebe732e8c31933cc9cffac5026d9609df3ed210bb5824da5285e3616ec9d230a076360de5bcca387
-DIST KNNvKB.rtbw 67024 BLAKE2B 14f827b780e6e21c4a1c67801673bc44f0cfb7ac7b01ec65ce482bed960ae7a85b642b9a3df58a9ae8bfdc8669c22b9a47020675f5999349c4efe28abcf5c2f2 SHA512 4ba51fc4b8846de44ae0b1c8f386af3f58969996f9305d9048dc1f42b7172f95cd1ce99445f06624a09bed47869b3cd339e1317af0515f3b415470974df2d48f
-DIST KNNvKB.rtbz 30544 BLAKE2B a96be5054d2b641733017b2c37a92e7a4cf879e1a9fc60e4c6be134823f8e6698765446a611cc78cfef0051ee31dfca5193e7037e02a1dbceee805366c9fd7d8 SHA512 d3d468d27a201c5dc6c7890bb3d5aee8f3498679125566c0341659531b7a41737980ac1ac0f53ad67db8a9332cffeabf321d3e324489bf811d9c5a50d6eebb14
-DIST KNNvKN.rtbw 81360 BLAKE2B 77aa6caa69e40807c1fa9e91392c3f60328c180571e5fcef473b608cac7d30e2e19dad1799d1f354c4ba871b2654689345097c29078790db0e3994341b9df2f6 SHA512 526778e0d23fad85b5cb4bd0435830bf640e49256414b31d3f53d4be3e7f3ceec5c3b6bc4933cace6795a59c46c7ced485f4996cafcb294085322823cd5a63ca
-DIST KNNvKN.rtbz 32912 BLAKE2B dadc3925d5c4b9cdc57f7e0c0b70409d07a0253ec03cd6e9e8e7b3e44c3bb0886ef8f038b464e3b68747c5cc047bc2eeed6fa1d423087883771371a8024c79cd SHA512 801e5027ef425932bc1f224166f3039716f6bf329040e77d90d8d8b83cdc292b67a1b766200665970cea8a551d09e327916f2b6ba983aac85dc27d2c27013e2b
-DIST KNNvKNN.rtbw 1013968 BLAKE2B 944b4fed83eb15f3dc80d7fcc43ace24f506658ab35a3d5659dea37354e853dc0c762114e36c4b0f135f6f01fc63d7553a3f8e4aad016388048023201bee3ab3 SHA512 0c84f837f043eceb67de0e8160b79b8668e2cb761f0eb1b3966eeac5bc4914b3f89cbad9beb5da54cc11903f866f598d6c1934609be6ca9d376213f818975aa7
-DIST KNNvKNN.rtbz 961936 BLAKE2B fff384b7edd7f9feeb703be42bd263bd7716f6843453a3f4bf3b3f0702f4b700f4033a89b77cf6fbd25f99e35b429357d60f733c04bb02393641a5ea055ee9f8 SHA512 1a05f932335ea4ff24bc605c0e40355a385adf5591ae049580f579a67a01738992b194be9aa8bd5173220fc3028ec1a7daa6289ad69c17c4b631506dd8d94ba9
-DIST KNNvKNP.rtbw 257256080 BLAKE2B 0f6ff1dfcb915e9f013c0fab012ca86acca9e79815304453b87f23a42518a08c6d0c4192b204a8709873c5657099cbe8d745cc088cee66261044dce52851e23f SHA512 cbbcf500f1cd4d501017bf0860b608d5c98c1c45dc4f7650010f8b65c0fd1cef9a137c4b620a639212d7c8384b75e3ac3f6ab3d8944f9baab876fa80739d310c
-DIST KNNvKNP.rtbz 28426704 BLAKE2B 97964ed54dfe457d96a34dc21aead6ce296c52403b5271a391c78ac33a9dc67ef303b50de2d168a46370ef4f24f3bbfe554b75858c0c612802e03e392bd52786 SHA512 3f241976f4258ac6238f0036c047f7bc9487d677f33fbe0be2a5ba96707b7eb24770fc5cb70dbc1dfec1f943e2d6c71b3553b58b8740c83a1b7f3495fcb7814c
-DIST KNNvKP.rtbw 13729360 BLAKE2B cc192a8dc034876c48a96f09093d80bdf5a065bac0adf055bb0f2ee94f9023183846b1ed67c02bab1bab99e99e7bd303be0d8b36ece0201016da4dbc63790cbd SHA512 afa1221848ebb317398d2c4a1584a45614bde782199d23509cf2e6edbfe7b051572d43380472106a654da1fb1272514b0e166288b735a8bbf83939d404ca5c6f
-DIST KNNvKP.rtbz 10331216 BLAKE2B f9d727177d87f5650ace0cdf54108dce1b3cfe2486844a6eb144ba0f367397ee6a0ec4eea04b5af6e136c0826a35cdd8cbfc449339895520395370abd8776054 SHA512 0aa5e2d42bb66caa9933e0a0ac5f358a03be0014330132477f232cd8430527aeb06f603ce6fd8d7705a7cbe08c85e31823362268731b528d88ac51f265ef5f75
-DIST KNNvKPP.rtbw 435843088 BLAKE2B d86712aecee370a764f8aebc0968aa0c26a7e6110b105190c6681421e9d22dd694488b4de4cbd2f28b43e81ac3a351a2232bf40648aa2d2c0e80541d2ca2b716 SHA512 8e4517c77fe5ad6f2770f889ef73395b7083a5205cc8bd8c488adb296069fe8114bed6d5f9cc0bdc718c096ddd427cd1db7f79d1a1708f3414e08d49d79f6df1
-DIST KNNvKPP.rtbz 171159632 BLAKE2B f801fba92fbf7902c01a253da81bc626b40aaa0225651655938b3a46a28e3ab6572ec99521dbebf9e6345a810f624cb32155716a4bf526cd86753dc6a9f14dc2 SHA512 7051a006f7f236fa988b84dcafea0a84cba52d52ea3e3afd6dad0ef46cb597cc0b6ebbfa33c525fd67fd1409a7706273fc6eaced995f8d9cb7771a130fec9926
-DIST KNNvKQ.rtbw 3241744 BLAKE2B 4d3aac758c470c3920eeb62d73a85a5f01ee898b1667ee9ac773cc798194be092fb735934082f0b2822802d177344f99352bf51aded0e7e79ae17d1871cca0c2 SHA512 bfd838811f209e31417f95f9e6c69b6ed2a59500b3878ea816a8a49b97d2b899ff93c09a1d1aee251940ae2141569c7d1b77ea152d88bb25d3727b9e48648a31
-DIST KNNvKQ.rtbz 4940624 BLAKE2B ca653d83d22da4b334a9fa2cf02426f00ade5c236c932d37538127d4bc7b85f37290e6393f06f9d6b27b7371f3df2dcbd24a0a9218c65cd992931d0163c765ec SHA512 7dfae6c6ebc595d5553614e59c77a3701a8122f51b2b36259dc0bcc68144a9e8766c994eacdffc0316b167f89871083a512d2b5e87058fa936d6d3de22973798
-DIST KNNvKR.rtbw 313680 BLAKE2B ed3739931fb4a38bab93bec21bde657ed6ee7b701e6da81a9331df7fd26ad6350cbf7592ba3bc8008b03542cb15670d5f6490b610d662c8dd6e67cc32fc2e023 SHA512 926e9d5d09ce71bbe5d3bfabf81387d9e9ca4001dc48576ee29a8dcb63af6579ef278845e03387608e595050cef779a6bb7b539eb7ca1e16ce6e00ab7d15b0b5
-DIST KNNvKR.rtbz 62928 BLAKE2B c7e6014d596b2b9b56ef48160044cf38c94112fc48c2653b3f5c388fb9c447ac540e731778f173e94f2bb53eaab8c940387250ab08ecc6f4a5dc4f79ceb9ffc4 SHA512 01511b8dfb4720e3eb0a8b989c07602fe83ca48f5122e78a4c3af64e3583a4d96dd7d7eb623f1765b209e67573d01c0a888b4f6f14bd645305d66f1d1f121fea
-DIST KNPPPvK.rtbw 2316304 BLAKE2B 0ee1d524ae44c7be7e4c6170ba5ca337b43defde184c8450a839e5a3b35437160e1d2650c694b91d20b4a2a3fe6f3e6299888d34e8535e0041aa774bb68f8757 SHA512 f65e565c384f2f9391b15f9ff869787363837e8f9c2c9fdb27a8a04e506a2592199b765d454d853a95f41b0cb437eb3b561289c96decb1ef561eae3123e326fc
-DIST KNPPPvK.rtbz 1435856 BLAKE2B 0606ad5883310c2737690681d5ef65ee168826eff577b30e77b7a3561f2696e36ead5972ae7747c324d094fae252a4ac54562c81b7ee179229f9a2af8205627a SHA512 dffb9cc428821b991498b655eda93d3bb07690313f61d3c24b664a5c82f167dde09567910613cd5c52ced0b2330f18cbd65167aac6a5a834c561b85ae945a040
-DIST KNPPvK.rtbw 186512 BLAKE2B e418213e169ae7111b451214c5370a1d7c3be2ee3aa058576e2991f729032f8ed11463777d5e7b456fafbb4b342954c606271bd56c0682a6734488f24ce89fac SHA512 eebec760cfceb4fb28e6c525e2b6a1f34eefb5a02067f65de1e540946f78518cc874b4314f324e52a692afac2bbdd51a2fad7f91ab0291cb93bcb38886b75d51
-DIST KNPPvK.rtbz 111312 BLAKE2B f96466c1ea1bee4271d6c2d506e083f22be928a1a67211a78f73a8f84078b51dabc207d083e7be465d03ec76793e7597eb6396aa439ba5451ad57e33ac914816 SHA512 133d160d4f0793f76895d04d6d97d1fae83c833541068ce7d1ebb54939e12c0dad9e09705e445c15395c53a69f3fe66422e192f8257b68f5eff135050e976dde
-DIST KNPPvKB.rtbw 441594256 BLAKE2B 573ae088d22343abca5872fcc0b2a985b8bb5a70c4232eafe700f6d03ffd067d9dccac140f8e1d348ebd25d3aaf7c57368d1f361044b4f0422aa7348eb09cbfe SHA512 598cc1147770400d17869d9473a182322d5d64a48313974cc6dacc6edb9e2e0c5bbd7d9877658f6629f1f84baa6a4dbd568b2261e298c5d4afdd741e2b006dae
-DIST KNPPvKB.rtbz 225934736 BLAKE2B dda0d74a35647eef36925e61b23ba59cfc50c7af60d1755608e89569f7fee5576630bf0cc3653afdb430656c342c389d8b0f272de991bdbbc4e812a83ad933fb SHA512 7bbbe4b8def51050cf1551a3a9efcb7c82108d285ba1f0ad4945358a2db8317a3df7200f46cc0cccbaa0e73f3b00be01ed51e4795f93d7cd36a9d543640f1cc3
-DIST KNPPvKN.rtbw 353494800 BLAKE2B a1d184f23da456bcae6c6c88ffe500f48835349c54d6294c4dca654083e206298f0d3c1c1dbcc6dabb5e303c7c7423973a03ac4c8ab5ea7cf9efbb9188bb0b6f SHA512 df4334b84c8e5a95bde184b6630b2c2bd4973c69d03b9d63feba79c378161f556654ef868dafe0eb696bc6e2a5146caaa640d572cc4acbb905c5aabfea4003fd
-DIST KNPPvKN.rtbz 183962320 BLAKE2B a99568cb27545b4e2209e8ab6b982271324fe823cf5b0ea4c35b7488dcb523e80a93c1de725d6363f23f7f582c28895583fd57a3d3c8051b89d92d9170510595 SHA512 e3bd12c1b5d676e4ee4b20f1a9d56584d05579562629c36e7d9b005ba76302b731fdbbaaef48b4ef67b249684299000de0f78d5cd054411a0d315b8c32f611c7
-DIST KNPPvKP.rtbw 199769872 BLAKE2B 23f8886c08cdbe8e82b54e8e6781cf82c9e5630485656419e52d66156cb810ee6346c15fdddaea0de45c483de53efa53a172dbcf63a720d2e7881b1f86fccdea SHA512 ba7b41d8bdb7ea44c4cb0646f8107925927b81bbca1d0383cc00a58362639c8d08e83f7c3d9373d79b4444c2285aca889d1773aab22b78ed9a42988005a906e0
-DIST KNPPvKP.rtbz 36895760 BLAKE2B 6960bac79f513780636368306f9fd0c983df2007778f208c6b0c1daa30b7aa6d1239986f781134679ee1fcc538fd543b5c560a2b8d8facb36bb6a0fe35492749 SHA512 d07c4cb0f52fd80e1010c1c16f6c8710520656b95bed80ce14c7aa376e4372a42906c2c8250761d8ccbcf7ef15caad552905a5d4c7332cc08432ea695416371c
-DIST KNPPvKQ.rtbw 443491216 BLAKE2B ac7ff35b4fe532a524971a838d33657cff55806fc71c8f674f661388ddd30b5d99338ffa1ebde4187a83026d2e546532614cef63a100bed2b2383ede1f1cb0cd SHA512 c0f07a20c263c6f1f30f7df730526c1cd4ff3e86ab6f82e7852bbc97c30dd3a4a3b75daf177604c350d7eeaf7022a143963b9bca9b6e8c003ec772db042cae63
-DIST KNPPvKQ.rtbz 281482128 BLAKE2B 7776c09a9fefc6c00c249a781e5c704096be197a009091784ddbe524429c17d75bf92529e26e4cbec05390a135ba91b385dacb6ee9a408e551d1a47edfa31cad SHA512 cd87619ce37d3560443d705eda2d3c5ca426397556b15450056d4629a29f9c28016f7c1c4899a7cf7d36c3de49c6df0731b03c9e6ee7eea4980e810445cc31ee
-DIST KNPPvKR.rtbw 556467984 BLAKE2B 893dbbd24e3880b9c90667f923a4ebe3c16028b608a816cc3483fa2177a66db426e852fe25b88b5918eaf20bb1975bee2f077cd7652e3f7b30f1fdd4cb8b9c5d SHA512 ac99bc93a6619cbdd850d0845efe90a20d81d4fbaa38212e3f8fbb104dcae1f37fe8509a5266cc329786ed59dc85f8e56d29478d69b39f9b840fdaa54c714fb0
-DIST KNPPvKR.rtbz 149188112 BLAKE2B e1355d5133003b76710cc8f8207be8552b855eee79a3ee51775b1d8cef2c66ef52100ee3551c68407a6d50bcf28a8d60301e8416c6be23eafa88721869ac1b86 SHA512 7f13ef3c8dcdca686fd30dd564a965735835e68989f0890a048b995a00d798edea7bc5b5b9a304f682b8262ee4d9ce93fe8f3f97bb0390f31ebe252d184efeda
-DIST KNPvK.rtbw 93200 BLAKE2B 52d574730a7e4dac1cdd93eabe23fff1d002ad570635a2fcc57701a341396f4b161eb1fd45c20026af359dbeb81cc994a8d60a42f71121f112f863273233d5b9 SHA512 0f42fe52f93c51cbb2867f3d6b83d3d160c44a7c97a1e6ce1bd4020dc9821feb5d5f5ca893030f9b014e7891a9d29b3b5e6e137a3a3d2b5b6ce3f722ae5a95ba
-DIST KNPvK.rtbz 111056 BLAKE2B 5fad3a0e697baf9fd76eb372b23ca05875380b8789c1ccec54420692e822a8c0c92fa824b4e67046f36bbe12b23d87cf91a01ee437d92dc07c817ca064dc84b5 SHA512 402eb89563ce2ea80b7f1726ba96e6c0fd99acc7efccf79ad200f3baf621ca71ae92276d56e9b9cc165455b18b524a7e223b9774025f3d801509709b5173a9f4
-DIST KNPvKB.rtbw 13148688 BLAKE2B f82ae6cd0388c6412ef89e8f7f6074a3cf04b4d2abae50d8cf8e80ccb35a054fe2dc220afbbaedbecda82fc5a2a3bd5ca908a444d24efa016b7d3ed8e8409d53 SHA512 1744e15a21adfa6bb139fa1ebf63d6df3e984b0c8fbc727116a82bbb60fd6d845c20b0957b5a71606c09da6024e8c9c524b9290eb8689631e059f24b546e4738
-DIST KNPvKB.rtbz 4021776 BLAKE2B f26abf70454880d82741b24ea3af822ede037c5d5731138f4136104818c60a63fde7766ba1d5d936f7e71e3d42dbb1497715fc188b7621a5fdc1b85ae56e80d3 SHA512 7a354c403bc16f1b2bb72332783fbac4dd251386285e6fe78e89ce7cd0ce88fda811c2193f07c4bf62e3459ea3f646f708d650f863dc221bc1b44da03dff7aeb
-DIST KNPvKN.rtbw 14200272 BLAKE2B 56256ec2974b94fd0d4f7f4700ae424c7e17c9cf0c9ffee16eee85c00cdb26dde3e1e447176035562b51e6326b14029aa162b05f214629697418f02baaa5d901 SHA512 d133616285b15bb1bbc226ff44b53499b8cccc64a8d7a6441b4187c2f6f833074df80a12c86fd603495a3feb2c1bf29f7104f8240e217ef770079f336a546bf0
-DIST KNPvKN.rtbz 4930192 BLAKE2B c993456adf10939c8d69a8c48dd1972165f790c7ea15950857f1b593eecbd05e049f99d8fc14cf9bf3de9c14125d649b5f08358c3fd937fc2edf5b49cf3fedc8 SHA512 8206336a38ae91521b6db225f2699bff92a8c6dcb273b1de36ba851b9f1ed11049ff9ab412dc9b307fe201e7623e34dcc5a020014684200b37a79860a4af3e10
-DIST KNPvKNP.rtbw 614187856 BLAKE2B 19064c5f515f531a87a4bcb8a83d1a954f21cc9a88309e9ccd3bc0a91590239f68991dcb0663f1c01b62344106a044405f0951173439b91a1e5f2dcefa0ceedc SHA512 624481806121f81a12e287140c5a46cb73a3a77ac2e8245e4ea8b1d04f67d4f0f2ee569d71c5ea82a5da29b85c54cd6e2e1ecf6ae502bab68fb665c0f2260f72
-DIST KNPvKNP.rtbz 273085264 BLAKE2B 70e24923ce66d2007ece5067bf6465437b6603556e85b6c45a83c73eb57e040402e04c4d193574ddc062c2b81c749cdcb9c0178b8de1239ee6cd95944e09904e SHA512 e1541a65a547867004088ab774f915f5769e817efc62e609f0bf2da04bfdee3f9c9f6f2e7a63c68b147c0a5ab6200a7e2fbd9d5ad13c97779d0fe808b394509b
-DIST KNPvKP.rtbw 18616208 BLAKE2B c0cba1661afb2c4e880f61bee5828701ef5512f3fcbe2faa93f6c55ee9e15913603affc114aa9f3f3a5ce2b0f312c1488e032fc06035cfb51741cbf3bb899852 SHA512 8afc025315c0f2504600f270e32ee9896a82ee4fe20df0313f063abf5663470b8fcfd673905bd5d5d513c291f608b6b8b137ac1486762d325ef6c1489120c04a
-DIST KNPvKP.rtbz 8974160 BLAKE2B 94db88057cc1dcfbca5e79349de4919b0c8e21f417bfe863d5b7bb0377eb0ff7c0f0dc237f2a4f5848d64853c22863b7e6fc39ec0e601948072205127490a51c SHA512 bdaf3a13398550e5b078950f192257cda8ba0963dd4b020c15329b7d239d962877d1abf4e71e74e01549854d89e95d133ddb60a53a2bd8a0e3dfd907c30c0647
-DIST KNPvKPP.rtbw 593794384 BLAKE2B 5d83e611a7eb8cfb2caadad8c446697bb16768bac2eaf1b6bc9f2fd493291c5e819380c0c3b02b207584874067af7156276987f81ea7d258158d32cfa56a581a SHA512 688f9eecfe6ddeb107ec6ba775ea8f16486d92e2298dbeea53dd7149344de74a0a48612c64a17b49cd348688eb5cc493cd7b4b52cc3101a3cc8483d0569be120
-DIST KNPvKPP.rtbz 158781008 BLAKE2B 9006f42dd6f6e83c5970581ea8341247d2f116deb3084083fead6a46ce593c555213bffdac4b6dc86e129703d8620c16937ad393c51fab0f9cc8b70de5c349c2 SHA512 2e74683a1efac4701a6d19fc002b2efd498fd911786af41a31ef545a5c55ff5d0d1d528af98173ca01c6c6cb043a1de35aca015f06758bda3f8b37212aabfa8f
-DIST KNPvKQ.rtbw 10056720 BLAKE2B a87e7007e13d05091d95d90837f2cb0abb6d310009a4dcc3a5e1702a5b8b49f3a6cc93cddb97595bf3908b48de90eee6c649bdb259b587d928a16c6b36f02b95 SHA512 eb7fc414549a7a342315d80de14821b0595cf0d721bfadaa898844e84edd8a56218952507f11fcbde76c81830c9517279ac30df95f7d744ed981c8baac282bb6
-DIST KNPvKQ.rtbz 15554128 BLAKE2B 851b2273998330182fdd48d3a3f83986ce32f998ceab06cad28823bad448cd85c6bfcc2c5962e2a1526f98c86cb8b5c206b2511af750c40278d9fecd1c3ad877 SHA512 76d7caabc918db97b6791321a921db655e99d640e4c74d64fe4b329731cb10a14de16c51857d10b8443c31a6dd40532e1e7114b7f832a3f5a9703aafd7f4d4db
-DIST KNPvKR.rtbw 19810256 BLAKE2B a4d8ce1cbd3f9e648f3ad676341f84adef79b68c73b2f9ed58efaf2276ac1160b980d65fd449286fd534ec001f060f973888c5cb96942338270323cc46900f43 SHA512 1b767a2e89690ca3f54c7939216e2448fce6461779bb2d0c8866588f11a07cf559e6da55248827324e182bbe57beaa36b11c18578b13243d0c1ade5326f2b952
-DIST KNPvKR.rtbz 4874960 BLAKE2B e55151bfb35f5b421db3d2f46f046cc4851b629f2a6f4c125abde30fb666a8e66353335ea66a2b5f81be43f42eed7f59fb31cd77b39b557a35757f11144d6580 SHA512 3a0ee95a174baac28ee9e94585e261ef87528ab16e7a551f0cdea977911696e6d790035740754b1a089da82b98764c718f79d8b9450dc3738a42b2f52c8e1cd0
-DIST KNvK.rtbw 80 BLAKE2B d6116d7818b8b63295566751b641db1f57d796048073346294319e42ef8e4688042245a453ebb085a8ca206e773d230c5c8f254c0ff22a512b5c198cd8fc52e5 SHA512 ec56c0c6611386b7c0bfa6d68ec494ef5482b30b5506597da9057a998255a55ec6964d2640d48c0d9c88e615d26a05ff0d14d71627a65f0c2b6889984bb3c0d6
-DIST KNvK.rtbz 80 BLAKE2B e83717fb6c1a6f0bd8e965782af69de07d5e469eed4e6358f9dc84ac97bebaafd4409288747bf97049cbd5d9cb72d5ad443f542e22c15a22c584572e20d768d6 SHA512 03f6921789e374ef0632b535f83236a8007a50261fdcfb6fb15e8e78327507baff73f45842487ecd4d2d0c31fb2134de809a18f45b18d023fe59f6ab428204a1
-DIST KNvKN.rtbw 1168 BLAKE2B ccc396c7f195ef6b7cb464715270f656b380b9242de87e19ced7310856b78352d2344205da5fb0648fdc659b8d2553e6e77839c90335a6e80112ab7e917c74c7 SHA512 bc17fa113c461ddf880ced7ad0dbe0b2eb0200b8b1fa27a2b6d1394a58c512965c1781bc38e211ff39692dac6f206681e9a9bda6aeafdcea19f606da1283c884
-DIST KNvKN.rtbz 80 BLAKE2B 9e0b3300b4a6c1f29846797f0a912cd3d12e8250d1eaa94d54044766c7a14f5d109337cdb1a7c7d530e52faf850269b3474e745a2f075dc602f9d5eb0d2f493b SHA512 4b36451f464135a2f975ac195c763854217bc93264c02f3461a2b27ba01f2e798c0dfcdd1857b60ba5d66535aa1e23bbe60e864f008ddc490790a04001f568da
-DIST KNvKP.rtbw 148048 BLAKE2B b0bc06b2e8aae51894a4768e96d0fa433c1c4398c20352bb97f719c1c4153cbd05f017353af7153fae0a388dcb66da7166f226f098cc3fc66a76438012b6adaf SHA512 0d65c8c3d4455173292d38af8768b0eb06e822e6dabd71d779e9a6cbf102d435683e3d3d888471d074ec27b49c8b4a05433c593413fcd3d80504e3d62e0e55cc
-DIST KNvKP.rtbz 10640 BLAKE2B 6a62766ed82fa9823d7274a12ab1422c08dd9cc87771e33d0a6a03073fbc0cfab1fc369eece932a584a29096bbb0c0592f6cc859d65144fb061a07a5eb7a3f1b SHA512 b79dde53fe931d3b11a782dc6c2e96fac9c615215eec5cd63d5edc02519dbccca7ff7fbb8e553d2f4fc26dd8e738e9046fd8ddd08902c3c91fbecc465db39796
-DIST KPPPPvK.rtbw 440144 BLAKE2B 9877e132fde06822e8bd9206c559e0feabea45ef45be92272887f3f4f8302e148e0cd9942f785a2765bbb5b0c0d7027d86d76964cf562398c0d8713abf5d8aca SHA512 a4d94eddcfd33b7381e7a03109af8f2b5c37c3b5c0c143d3b88deee063370f4f4c0ac1d2898e1807a370a4ecfc5db401d08b6a62b6f3854174771ec62ed0ecb6
-DIST KPPPPvK.rtbz 197712 BLAKE2B e94c50caf737365ea9c4b9b8ed7d8ab6bd2a49e231a79f239ea58b07cb9044f95207994ce1acecebac754968bb9ba276a9e3e8790ef42bb4a10cd963e80c9c79 SHA512 ac2bd63da09b6e1a60ad18c465ca726383cb0757667997feab160d3fa8e9ead2a82c25420dfc4629dd7d0af2723218a70724b7f73742945e163ffc9e664ffcd4
-DIST KPPPvK.rtbw 56080 BLAKE2B 0def179dbd446ba892c5eeb5efbbb8f825eb50536210bda806d4732cd5b60aa1ca123143c32716e0d2cfbcc4d07ad45bca1e7b0c20f62314ac891da70e6b54cb SHA512 0b3e71291b4e24359402bbb2ae81725e5aeaacd222fee1dad23ac8e4b360b9c95943edbe759c879fcca5cfb1d21ab469fda2516cabb7a8b867047f6dabd146b8
-DIST KPPPvK.rtbz 22672 BLAKE2B 5ca9d407224930681446a4137c22222ac58be61ccb396acf47ce44bde58096419a7193e97bc8e49e0813a04896c75c468cd2701a9aa01cd6a32da51b2dcb53c1 SHA512 a774a006667892a62b35a19b615cfbe881361380d764f710fe374baf777a3b0ef385390fdf834af0956f581d5ca62bfb3c07906dec971f35fae7f17564c0476e
-DIST KPPPvKB.rtbw 113766288 BLAKE2B 8542310c0758793551db9dde06b7957022f9d19d4414ca35957acc5041a19586edf1f2d89dc54837e6d616e07ff58815adc7412294aa54260b79499806271536 SHA512 fccbd2787cd3cc6d8d84b3b4ae118cba38abdcf298d9ca3749002ba4425df77cdc2c07c59e1fffe2356e232408e0f45c650bb7410ff0ae6bb6db5c7a62433f14
-DIST KPPPvKB.rtbz 13104208 BLAKE2B 73a8e87a0e8c5d9f82ea4d781bce4fe0d2f1ed7c8e85a4a820e095852ca72446f242c59f5dd8d051d355d10f164e0d4f83d00a05efe970e2a7f0e7a21680a3f9 SHA512 c33260c06a6fe2bf23fe2d6117265599728e66effce1cb77129e0e88d24b160a6cb2008c8bacd2137ca2a679dea88361b56ce6f6fb614bd683e97f5f285a70c7
-DIST KPPPvKN.rtbw 97804368 BLAKE2B 8a1c9cba8765eed41f79b80370ea79e3e925c33998efa2e252643063ee176b5ed5da5a4c828c0a9e9b19ae2146b16771767efcc678cce96ac3cb958fc533d2aa SHA512 59dc89c9100bbfc0b7d7efe926950cea856d0034910a548267fda8c49f7260b0d3bf4b4ce76379422cec48edd9e6cd6ce47349dc3a483c8bcd49cf99ccf1833d
-DIST KPPPvKN.rtbz 13240208 BLAKE2B 2dfbcf8f6f74e97e878d33e8cffb046938371605a6e8178a25bc884dbc5af72d9a6318edc6a89e477eabdfd2793eb5be75ac7cdea795572eb810279a55335929 SHA512 6f4fc02b360a1f663a441cfddc19b9360eba72a3384f88beded5b61e766da69386ef91b87759be6ce9124dec5d3174d442cd556f295a3bd3caba2519c14d3d73
-DIST KPPPvKP.rtbw 53683536 BLAKE2B 93fb11ce8a1f67ea9c05cfa8926bcf16716bf61722050a8f7d4705ba1d3b9576757681be5c8bda9e5e69e0ae9a32eb824267500ed469327ab98209851be36dbf SHA512 7703d2596e6f64057873cb22003b0abea3c826dd79afe41fd89042b653ac217e15971ea17fcee3323426bcec94925ad033716bdd406ab1c8a379620cf5cd2df4
-DIST KPPPvKP.rtbz 1883408 BLAKE2B 2179a22a2b19ae161f09aceafcd77ed74c61363e1de146993a331f2cbf6a488d2442ee1441be094ab9f4b116daf7adc55c235d80dc0cc2dd6768d6b907518660 SHA512 4f084c9056623f06bd57822afde96811396690c7ef4bcbe586b60b2921407573c4f96625adb07429510ac944b80a0b832fd0b70b5c2e835261b474541280a920
-DIST KPPPvKQ.rtbw 84964944 BLAKE2B d8f2d369c921e2622820cb9b7658a4e8287905bdacfb37b35b851a27ab5b9b81e76d8d85bb23ddb499c4df45c1b4be5a138ce3153a918298fcb0006d34798c4b SHA512 845c2d4bdedaa0e68edeecb46b389ad357f77739303ad2d8c38382312f7e93cc585942173d4761138e482e50fc45baa6d0e174f8bbcaeb2901a41483dd661471
-DIST KPPPvKQ.rtbz 51067472 BLAKE2B 600a8019ed149259fec59a72c7104b9b91b720e0d653710972fd2a10a0fdb3e634996f22f675fc2961e372c613c617c1213c8079012e67045a723f7823f2a2ef SHA512 e941ea7f5eb9cb28f939339c6744ba4e92e1b09eae441a55ee243cb04f8b9514161f1cce18c8088fa62a201fbdc3a3c2348ad56377e556bb874e12366545d365
-DIST KPPPvKR.rtbw 170310736 BLAKE2B 26ca052ba0537811bc5b3b116e5b9752aa9291aa5e22616f13f51f7853465918c1a8941bebce3519ec0ba7bedae009cef70da94f670c5e429256fa9b401b4896 SHA512 e25931a074da6c1eeef97601610d51a26e4c43daba9940b081d5551b86dbb09db32ffec6e352949e4cbf169464ba606028fe4b1c0700b5d4c27e408927920fbe
-DIST KPPPvKR.rtbz 89196112 BLAKE2B 3c3e5d9214beaaa1b31e5153f5e4756f9ff6a9803b0746934f90e55a1953246dc3fe772bc6329d763ca50f3a36c62e7d3e218f64567332ed054d7024267fcba6 SHA512 2f41a269eb158ac200d8ee12e971d60fa79213c7e3c10f5e9b1a1ade81f9cd3faa4d201c6adb75b537decef415ceb142fe260fa590e156b6f897cfc534afdd0c
-DIST KPPvK.rtbw 25104 BLAKE2B 94222378f56d0bb7b745826f21e2504b63159c3fac81e7a98d0c0cd741e7f08d55ee21b5702c59716a1f352141402b7d6fc4e99c5882937019671471d23055f4 SHA512 a6a709e8c1c202032f8354fd8e2097220ad0c41e91e39734610de5fb2fb5f7af6a8d580c4d4f22a15159230d60438e10e791acde42ec7ea15f3b21f178829acc
-DIST KPPvK.rtbz 8656 BLAKE2B 398836a6e124ce2a8de93fbd83a900937d33d8bcd9671d4716aeed9aba04a6368c4dbbdc680fe5cd862815b7bcdb1517e1027a2a2b17ab6c064fc26f3217750b SHA512 71484cb251b9198b613780427c50313bcec8bac76039ffb88057d639a665e578cb64614ffc75d646edf03b46816d5a73e724964070f200c429661ea67acb3027
-DIST KPPvKB.rtbw 7269520 BLAKE2B 9a13a8aca12e1779e78414f94b64b9ae356a68a6e0bb1d795073d385d5b9d6740ee14b211fa85cb0a7f406c2bdf1d3a39056e064f898a33b13410db4477df1b8 SHA512 7217e3d31e7ae10349cfc3318c57a89928b625fd052aafaa8f2dc50d5503baace8f2adde7a5147a2bae249d061836ba8afceb941c2e9c5f574e7237ff79794a6
-DIST KPPvKB.rtbz 517520 BLAKE2B ad360c0c74a87d3eaccc5c2460a362811f85928ea78057aa920419c2272583cf8a42e45e1b6a7a9f8806878e6e06f7b7a30e72268b259777c083b9c273d4b4b9 SHA512 41749d62dae605d810ba6c7989025cbc636ed6e7a2e3cf36657904d4bf884cf2ef2a67741adc37c7b1cc9d6eeb9b526116dd107bd3c6874d7f4ff8d42ace9c05
-DIST KPPvKN.rtbw 7707472 BLAKE2B 41a17a653ea27e19540459c3ddc02344fbd60f7ae6c76807df53e21fc72a148f3ec0527fbf0707b5da77acb0e4f3b3879d3bca3c80ba81021c4758564b879b6e SHA512 39bb9fc9d61da89f4bec96c443126eec47408b59bf1e7f00795491d246cdcc4116217727a0825363b2634f2101c3c71041a1482a15a90c5cb43c6b6cf981aebe
-DIST KPPvKN.rtbz 699472 BLAKE2B 2ed33602ad8758b05dd794a1cd1e14c78b6bbd3eff26c771d235198eaa693a79c88949bea45342a11dfb68ae737c39dbdc982a1ef3923983323a32ec87831816 SHA512 0bd3cd324df114318c05e05a2156de07efd9edeed3a14cfcc6bee2d9831dd6a82daff27107b4506f068f16b6396ce668440e89821d650907c22e52edba949d69
-DIST KPPvKP.rtbw 7499088 BLAKE2B 636ca7984a95a4df67abc42885079f8f1d3c0b2d45da7f4703e60aa563b825483cad036226ec1989822524d859b6fcc0172dc252752b7b99855bec4011043fb0 SHA512 de97e5e46a19b0cea1bb12546fa99fc582aeb2f46928a00f34033911b3088a4f4f9f95125d0bb14a2f3bb5657d61d8f856c72118e91d204a08e801365112e6a2
-DIST KPPvKP.rtbz 669776 BLAKE2B d3a9680a024aa392b39e91a4795259babff3945dcd75acbb1172c72b6c1124376010a9c79ef58e065e11e20d649104d1a7f8f2e82f5be5403d01fb71747032c2 SHA512 c7b84921d136d3d26c6991acb7d41c5394da35d7010d954e077c1faa8ad7a9b5e6631af4942cb72930288b17b7a97d5a5bfc2d8478dad196e934132fbdf65633
-DIST KPPvKPP.rtbw 114901200 BLAKE2B 0e5649bb2e353fc847ac92d8266d5c62f67a4138da60282f50b4a3322b126876341763785940e619fe3fb40c7db75eb6cfdc84c92980764d67d670bdf659d234 SHA512 bb4335fefd6201a02006767c5a9168f526f004034adb36d4e76dab64e412b0f20a3997d8ed746b138478f6c7874c8cdd89996637df980aee36e62c9ac7aa64a1
-DIST KPPvKPP.rtbz 17180624 BLAKE2B a0a44b6421994e1410c4339a81c9984c0aad3f15d1ec2d9a9d7832a8045c95f44694d58f69af3bd190d5830cce5417207164a583d800538ba724725de5744fed SHA512 583b5adb5b83a733fe730c8e6d8269315c181a52c9cc3603fcb0356d28a2547ff289a095fbec3f8e73ba6bef904d0ff1d760fb5711723458786dcf00b3fede50
-DIST KPPvKQ.rtbw 3090576 BLAKE2B 496cf49eaca2241ccc8e340966e412c213839d330608d347c4da0f583b5f7b607b9c5ea5c7e47f75e0fecd84b1d97cfb595e672719ecee0a9d443edb1d76f5f2 SHA512 f5c1d8aa52a1aa8078e5900ff1162fd64a97ec2610d8b02327f6a2348280e3bc47ceac7613f6d6721e6be5326957568978cedf42acc889e743b584a579959aab
-DIST KPPvKQ.rtbz 3358672 BLAKE2B e39a09c7655f5450c334f88c696282fae0bc96ca36cb2a8cc1200341fb40b4f834ea00a48fa7d62b6b959a5706aea6861c406fa11df11cbfc3943a410c9dffef SHA512 7b07753024a0376f77cd0b965af529b0ab4a7e5ef06916774411a635f01b66a1c93a5c1ca56254dfd594fff193d8e26acdd3f3f3f7ce726199cf6671f3a5beb6
-DIST KPPvKR.rtbw 9068688 BLAKE2B 26aade4b517e988d6bc932cfe988ce336bf0a844300045a8dd64559f9693bf5df3d6a65d0bae993ba071eb2ffb0784eb9aa763ae045f9dc5d493bd023cded219 SHA512 62e2d47003d5ce723ded3baaac0831a1534950fa6d2a638cf56f1cbb880b3874199e286218d6f36160dff41dfc5fd6fd9e27d39d9ca0ee50576d3372faacf4b7
-DIST KPPvKR.rtbz 5114512 BLAKE2B 6764c14197ec11f8d7ce1826cac7855a3096df55a258b50c36f62122a63f25e068d5675b1285d190e28e30289d91a82cd763b9e110d22dfb179beef98a8430ca SHA512 789f2c031d883f7d1baa479a50fbe8afd2faf7b6fd6ca50d1ad71e86bcc7ae770b1ac5fb63a898a79bdc84d57fcaca45e4030feb0b68c6bfd0b17f079b354b6d
-DIST KPvK.rtbw 7824 BLAKE2B 18308c47afc87eee1f9fc7215f4d3c8f7d823070aec3cf03e21ce1881766c65d7daad0cb5368c2e25be2d9099f1a77975b7a68fafd3c88ff1a24188e59376a6f SHA512 ec9cab86545deee674ecedbf377eeb55129b086851a4b163922df7722b4b17e1cc19874f45a33035c05119f984f64e4237e3cdb906f9359c6f3cce08b9a623a7
-DIST KPvK.rtbz 4176 BLAKE2B eba797858dadd1a6deb5d7fa2de7297db09ac9860d1a37d33136e46547fe7bc499ae84811b75950fe5ce1fa4da3ed11eafbe45ea350672c6ad2ae9301140f328 SHA512 58029d157b4c07ca39b5f8d8af5ca95f1ecbe58e4fcf9a2f46181caa070c9444e33117d64a4644927c214ebac7e949ed98c9a8e428cc2bdc75a2f6b6a99566ae
-DIST KPvKP.rtbw 245328 BLAKE2B 8efc90b26fc4ce179a24bb64cd23bc5cee4d385d0e342d97b526b5f9fa34a7552873010f77829d58f5029a05a598ab9b2cbe72e26c8c786e163972deffe2af9c SHA512 9a525d3dc991352596303f6d09e140ff09b852c0451da7a2db2f2c285db6070439c12a36fec346ddf019c70d3df1c4348aa0ba45f6a767eaa0ae3cfa810430a0
-DIST KPvKP.rtbz 54480 BLAKE2B efcd53548082d53a28d24fcd1929c9d0f18ba1e4a3766f1ea7b80d708de9572593e45751c0b753f2388cedb68c2451186ad02c09190b4f72e7a159c453a7b6bd SHA512 445e94aa4866365f696371e1fb21f925e148615f6745dc730eeaf85e202df7772ed6e823376598b29a852fd3cfb79ba144feb69bcd12a8257c71d16b48f05325
-DIST KQBBBvK.rtbw 3983312 BLAKE2B dc0c0672237b5202d52dd12ba887b93da2f846ffbc25f3a0e9258f8ad740bfffd9437d51b489d51727bf742bc8e0e847c1086ba88f45008ae15fd1830b1e7f58 SHA512 9fe8145940b54f7363748133fd3e0fa487bf521bd8b6a9a381725bba2426fd3e630d2fe17574efcbcf1c3fe9f69c634e8cb680c51d00158ecfcae3ef39403a3a
-DIST KQBBBvK.rtbz 42533520 BLAKE2B 08f06618a0933a2471f6020bff2a5c5965101f5b7b8e4c0c6a7643c9fa3bb6794dfa02b612e02a2ba38fd8a7681426b90bffa0abb57e02b879076efbde22828d SHA512 b9ba223fad6576ab73e2601032c9e2b2d719eb06b0309a5c81e8c17d466ac8c72536a9c2aebfb728ff85039f401ccd918ab01fd5c4e9299530dc9f76b5a552d5
-DIST KQBBNvK.rtbw 10269712 BLAKE2B e4a04ffe7283316c1da81b07ca449f1a93a1166122049598cd711be8afc89e4baa8224f8d2c8f7cb79565a7f23efa628b0a0c4c8be84d9826fa8b71331522928 SHA512 acd60737a83da935d30a78177ef59a55042a6fecc6c6f5324f65700f56fbf62c2aa192040cc8ffb12d214bcc501703184e1bf4e48effbe24c140848f90391f3f
-DIST KQBBNvK.rtbz 75704208 BLAKE2B 2370594ff9696b95f4dedbacc564abed4ccaddd03d235d2c125a5c193f2712f25fdb81f140fb881cc16dfe40b8d8565caec8b219ee7a472cbfee81048d1c4a3c SHA512 f1b010dd363d51ecbab2af803e32e8e5013426b8148524b2c9cd3d1c77a7d799e3b44ae1b29dc7d86c8cc6c2829642be834507c10936c6275ebba5cea3f57432
-DIST KQBBPvK.rtbw 37927120 BLAKE2B 057f3a6e1fe2be80e6583f42d36926a165eb0e9eabdbd139a0953bd622438a703563e960d8486afc556cd64af4cad7ea319c993b5dc99a5a3743a9856da0f6c3 SHA512 ed540faf6f6994e9246c174faa00f19b704c604c9be674f62852c35a708d4b2ef74e2fc096d0918f28e8657ca98b3155f8bb06f4289c874d8181fae18f8b5746
-DIST KQBBPvK.rtbz 40279696 BLAKE2B e6c4d807533241c11aa18be6c23ff3fc3db985f04c399b0ede058c7e87c6c0836eab3d9627163009f2e1bc9e3b8c9752025d6c533c0347feaa5d542585141301 SHA512 c07693e66ae5a77756da8d9ced0ee87b676d9ecf80394b5f88a710b8b93d28b84948d76d626930e2e8f3b96bd71f180a65abf39ce3f0a3de05b701f054fe6b7f
-DIST KQBBvK.rtbw 160464 BLAKE2B 65978955d2f427610d5ce61a5ad594fd3acda00ae4bffb438a1e5ac5d408f55c3e10a6eb587113ab31503c09e95d68eefed76b19e9aee05c52b38713a725b8d5 SHA512 af003e27fa55fb316ce81447b58589b69af4670152fbe836a06da9713bf0c93c3c7b559423cd1b05c3008fdfc949d1e85743ba4d59959a7492c1837270764889
-DIST KQBBvK.rtbz 3094096 BLAKE2B 5096c624af35be06e4a01586a14f92b4765fda51397ed70b0f487cc9baca803b64a31bbb25a08802281e13244bd41f3736a20ddc8917bb2e32b2e41cb350faab SHA512 7682d9f295a0769936832bbd776f9f0b10e37c0438e691bc18208679dda3822f33cc1db808edec7afaea3dc14159ec442d4ed4ad44160a9eed8fce39b99cf8f9
-DIST KQBBvKB.rtbw 6310416 BLAKE2B db113a72384f7bb302267b8f495bfcce2029c9640bc8a4fd55021754ff0f9d2757d81b9ce6c431f5c78bea2c11ec67f893153240d7cc0da7af47a50ce21b845d SHA512 24aa93202eb9807137b797f914d062b72be597b679b680b764a07a215ab7ae43d20689fa8aee0d7b4e846d53b3884f47b8d3a0a97f45bbd8bb920fdecb21c53c
-DIST KQBBvKB.rtbz 137827920 BLAKE2B f574989be7d36c7fc52d88278c2bf9c13d869d4452ed8c4d0b49c7d2dbd4a19acbdf637afe13ce39f884b24404e50c2d4e7fe920bd219968b2fedef44bd2197d SHA512 fd36acfcb50e90200930f32b436ea2521dc3b09476cb52674b1039ffaf9c99ed6c3b6403cac584256a8a56ce3cf7d4ca06079d0682bba328881281eb38c82c64
-DIST KQBBvKN.rtbw 12421136 BLAKE2B f30cca041f13e2bc39fa2d033262d4ed4ed004e9f3989160bf5f0639d4a51e03f42b0967a239bbd0f9ecff2f360b62722365f5a8cfc83c681e3880010d7fdea4 SHA512 f9705b55e019c9f2b804383961834d0016b9bffd765a1d413bf66f1d71098cd8e86ea75289dddf1d1d58c6390f9ab0d8555d0a5195a853d2e475e5d1362f10ce
-DIST KQBBvKN.rtbz 96885136 BLAKE2B df9c954fc983d65aee58819787c583b588ab796094aab6cbe7f0a9773a598cacaee86affdb0cde7b2bbfe7100b2a3f33cef7e01644225600a28df1a5060022ab SHA512 2685d5f182746e019c142591c214b3a502bca67e07e8eaaeb971879842da6ea1695399c5dd4db68cdead30a18d2a2c34facfd5ced30c58a24929832625174937
-DIST KQBBvKP.rtbw 37499088 BLAKE2B bb5e16657b9d12ef8826bc90af7e1b6102f770d88bcd955506fd406485c791f7b3124972eece5efad13ceb2da3a025838702a7ccc7fd3482fe33fe1e3938723e SHA512 b699c31bb6c2665417f0cc356d174ad0da56716bb3ae6afe74175469e0636a3d7a1d80d6849e751c4fdad1a6027460f031a76d10bb3ffd271ff5726ddd809ab0
-DIST KQBBvKP.rtbz 181514256 BLAKE2B 04b7e1ff6455f2642378df496ebfd23f594749e73c373e1ff59b45df4c3c5788b04d66c2ac226f929723e619534e54a8d5b4461138bf5bfc98dab61f183c8a9c SHA512 92b93197da78ebb9f66c670d1df1fb5e1682eb56fb51cd83d71dfdc6dd561ada9401260f46acec5c32a61f3422ef4d8609fd30105ea3faffa047599abab5cec3
-DIST KQBBvKQ.rtbw 133300176 BLAKE2B 415b31c984ee646b2fa97074c1ce66b8308d52ef01936e8f84bbd6333df64c9d084ffb5ffc368d88bd6f400b7ca0c29a852e32f17190e535de6f6846c5724248 SHA512 edf5148ee32ef46326f79c13011aec5a996d101488bf8c09a110d709e82f344b98c995c0f23fa581ed11c80d3b883d391eaf486e28c86a65508b1d53e5d91196
-DIST KQBBvKQ.rtbz 369956816 BLAKE2B 1c8342343d5f74a915898f13cda661c500cbfccb02843b342e16cfdbe6e7cc5a76d16328d095949eed8ac6cafcef1e89398ec63cabbb490bb5f5ee9f28d62ccd SHA512 65de84e911276055acfaa31c902e1cdede95d07caa06a43bb2f0b9a47ea97dccf20bf870cd6acac0f96ba7b97a10f7b868badd0ac1b17719748c24af5e1319bf
-DIST KQBBvKR.rtbw 13323792 BLAKE2B f1991db4404767080687e82b1d216025aa190ea14bdfc35b34a771a2d790cf5184300c707729482edefd61f760e5e665deb28bff58a0a4bd112ea39428eec3cb SHA512 6125f28171c199cba7628f5a4f8194706ad81e2915584cf9229d875728272b171564c639bfaa494a9c63457a9748da30b06b274373e6cb1abaf9233aa0f4da83
-DIST KQBBvKR.rtbz 161869840 BLAKE2B a2e15097796ae29676bd7b3e67f462420b09b339293d5d2618d08a8fa7ba6437e23927fd720a07202a6cf139c6eb1e00657c53f5c6cca6c686d0b4687159e96b SHA512 2fa0e3b1912bb2d6498b43288c4250e2a2fe14c8821ee2b6169d445a4e361384c17afda7754c56213c075084f6c6678249ce311edf98a8949f58ccf1efbc8722
-DIST KQBNNvK.rtbw 9257680 BLAKE2B a05add3c9711786a46807abc204cf5f3ac97043110647775e0848dd4964b096cc01c9600a65a81b00f87935df62dd7087b60c66acd804fa9d633d671958aba44 SHA512 39481f7503a420d384f3b91099de65f8f52dc960a4e6facb13dc95e7672f986ca7b1350548cb4a61ba9c85663468131a95edd51a8bb26f46ea799c1f8fcfb96f
-DIST KQBNNvK.rtbz 89941456 BLAKE2B 6f0097ada75b36e15144afc877a0c0b909b1c877aae775e39707b7a41dd9e4db820ee7bc10d49401ae03ee06d57d25689a189a7484265cea3406338ee308d8df SHA512 0bd72f77cd5af9a7a8cb7266ea3a03bccfb74b74a04db3dcee9746083b4a8ef538cf7ca15f30afeb63f0e5d75b925b618f261de21b289be34cb1cc1162489eda
-DIST KQBNPvK.rtbw 60937552 BLAKE2B cdc0ae6aae269f82a22f4a138a442d9147704bbfd1d830a25b9a13e691cc29bb345261eab3eae17917340a7facceab7d80e2a15e3864626f7b072c3708f8c259 SHA512 507820492902cba89fad6259d2034806efd765b38690fe606e5dd10ee6afce72525dccd314d168ccf59322a1ac3365a37d1d23c70013f126aaa42525677ccb8f
-DIST KQBNPvK.rtbz 77681744 BLAKE2B 37be5673e27d42a6de686cfef501338dc2c21647f2650d60c6dbe26ce6f9259e3510050aa6e50d2e86be2a365d357ea4cf8a57ca3d546118fd30b862e305ce0d SHA512 ab55afadf021d056280c0630a4bcf30ef51baebfdf42ebad9bdbc7ec06e2a08665e98eaf6db60428131d58ce92348674458c7e42314b394cbc0217884bdfafb1
-DIST KQBNvK.rtbw 255888 BLAKE2B 330ebecfa418ee144deed760ff40873de52a383779fe262a0c81836b5d41337babe8253763ad5802cd6e7c5d8949539dbf2c98ff4508c7019af3b028aab357a8 SHA512 d13d61f5ae1550540c06a72e23dec610880dd7899f5b2553321c081bce5da9467ab073fbab1f4a74aa0470f8450cb8496942dcc25b89c8fd5aabad8121f44c2d
-DIST KQBNvK.rtbz 2967312 BLAKE2B d44d1af7d713004aea9c4b659fd26c61dcff96c175211c1b900870ff445ad03f6b2bbd4fdeadb3305d0c5ffd3074be15e980dfe68a87ffd26e6209293c64095a SHA512 2fa0ea541ab5fd0355f21d2dfd8f168a9a9c101c68c5050a634468f2ac436d49409ea388c1a16eded5cb112171a0d07d3ca6da07be1bd6e97d2747e28523a364
-DIST KQBNvKB.rtbw 9246352 BLAKE2B 5602fbe9fb2bd48fdf878f8057e7d72cb1ae04cc206e9060f096b74187378b97940d658db5c1b0682a728d0aacf1fe73e2ab0fa0fcf490ebb4f0f5159c7cf9e9 SHA512 4190aa8ad1283dea24db3ab62576123a8c998965ab94fb168e64a2698faf56dab232811e33c6788e9243df67fe33acdff6525ea9a318bf8c09e9852f76d636fc
-DIST KQBNvKB.rtbz 221660560 BLAKE2B fc972114816bb096242dedfe6524d7bd009607ae775a478914045dc6301432504f1104c37db9b05c4835381968f9a8a26663f99fc8667653fad3d3975b2db1a6 SHA512 0e6d92cee757c61efa8a85470f77a281696e375223cace165ec348e5f8dcf955929dbe07670ee5fd1bece859c3a536d7d2ece8691b8daecc4ccbc35fba528b73
-DIST KQBNvKN.rtbw 18784336 BLAKE2B 9fd96b944ccd55b3e71b25213dbd8398c38c8577a06e2c5497a9589783223adde35f433797571b4b95aecea2a8ae70cd723cc69693a85761cee9cbdfb4639d30 SHA512 cc415b6efb61385d233e35df212f04f909da1fe738fbf90e31a3bf2d158dbb3f6c77d1db5c55f81eccd6da823fa726accbbdf3d4b2d5bb152d8b7c3f9bbfc397
-DIST KQBNvKN.rtbz 145652112 BLAKE2B e4ef34f4cbaff3b718dce9cefaf2f084c104b5f95fd9f2f11b51463f6fc3f4b9d9636d30848e17747ccea311d0d3a7c414e9754aebf97a1ebed097d9ffeeb296 SHA512 f905b76b9a8287ed54982ea69ba91f458951d371d742cef4bfec8ad9644309d7f44d68c70ba3ff987cc3a55cd289d1889118e3440edb9fe56887a220ebd69930
-DIST KQBNvKP.rtbw 66343696 BLAKE2B 8234aa374341f6b79181d04f1aa1c15b7eaefa8a962e0be661e615b8395fa2231f6249747b13186bdc6944e3942b272e22a0c5656ddd19c9a75f66a44465693f SHA512 11f269ca1088217579ca28f5348fa7d30327a1c397ee3ac2b97f1b3ecd1eaf99979ff3dbc08f122ca23160a81d84100daedaa0e8082361da20d104fe393471b4
-DIST KQBNvKP.rtbz 290726928 BLAKE2B 91627592e8d85a2cddd1699e6ced70bc966fe9909645a15e88a4be8f46bc7a5cbb8067f541d21dba9ff30487c2ced4b16b91d3edfb0d30761a3cc8a577e25efa SHA512 4ee04146a9ba11d2588a673ee9746da7f51d7302c200ddedd7b0a9839b2735c1d34bdc7e9145d6f15d3e9f0e7cb7d0a4082459a0c8408f11d1ee8f0e39485c1a
-DIST KQBNvKQ.rtbw 237040144 BLAKE2B 7f343951011c3667ad4f5df141299977af3caef913ae7418a843704594024c73b87078003ef5563be8add6dafa78cdc2d76c73b401b0e0a1d13e1bb2a74a1dc5 SHA512 86097a7392df66752209574c6dbd765ef23353576a5400894eb19418953c1069fa5d740bebcba69554d8d848eac1a2a6623dd5f3ff6c0c40789a49a4660cd303
-DIST KQBNvKQ.rtbz 650520976 BLAKE2B ffbb8f488d82bda46091c74a102561819353d17a6d79d82953cb1cb4bf0b204e67df0c22b69950e2f7cf91e5da6c1d1cea6d548b8f4c152d47654065154290b3 SHA512 11889149d39e81c0b46dca4f42b5f2d6bd1c897dc4cd1f239f1cec5a5f511ef834ee2a93a99ae859dd7b22155ebb9d39a916b41821feda3e7d66dffea9fec57b
-DIST KQBNvKR.rtbw 18577168 BLAKE2B b0c39cd32e3fd49e11b9eadad5f7be330cabd2f6a6388d2f5c49859dec784fd65a5a2ffed30632458380aeea92ac91d4a757fbf4cabad94f8a54c01d4f3a769b SHA512 55d6de6a048ad084becb52b8708178b616915ca57282eb1ddaef316143d19300e30eaffdd9622846ca4debfe0072f6761d51436c9180ff0cfe65b6ae1fa834fe
-DIST KQBNvKR.rtbz 276153296 BLAKE2B d2af45f30e22d0415b800d618e1e96d01c32f0aef1df01a466a319fefa8bfcf0e980183c681b02154bc0665122eda9908f8ab27f95635e3c365b77caa0e17499 SHA512 b162f16d19276af24a9af433d65786a4aa49bd7b6f024fbb9d9720ce575609f127e999d54d570f68838ab34d1e051c76c916dca1528536b64d17344c346912bf
-DIST KQBPPvK.rtbw 21417552 BLAKE2B 6d20eb7518b5ab184176d1391ecd2112788140317e094dfc362ecdeea3568f2aabd14834a7d7776d523fa932d6d8511190475c5642ed33283a3802f087d1a066 SHA512 cbd6e4960fee8933d5b4b9b65c0bd0ca198882216d99cad3fc387b953ffa2a96fb5e0c8d14a2eac87f8747e8ab26d88c2b55f65d6bc2a20f8e013d223548c7e7
-DIST KQBPPvK.rtbz 8144464 BLAKE2B 93f3fe081b732baf7e5bed15b2a7a6f45a4aa4be82593044ccb42481e823442ed9ca66600c3a4b21a67df9baf55d206e3f108d085b4c23aae4d0ad31d923cde1 SHA512 1eae39cfe00a2e299481fee2228796bc125532c0802036099d6008deec1708680e61054d64a9b4bb9c8cea1322235fa63a1bf21d21befa7d04f1d75f78314c74
-DIST KQBPvK.rtbw 824272 BLAKE2B 6b06f79aeed74b12a0c0c3a0c78e2174aa62f0c5e66bccddb5dd9465ec9eea01701b097a91c659db4fb2b75415e08366e8cec558347df5a6714f09a36e7a0aa7 SHA512 4db3a64bf4423c2060d153088c6c9ab74579b9647c719d2c0bf18f6cc92984295554dab7819ec86a8e64a5dac536ee6bf66fe2503e2cb761fe1f6651ee74d627
-DIST KQBPvK.rtbz 1347600 BLAKE2B c25ef4d2aee0e43bc6344dabd5496ee5bffc99b009c140637f7c4e1406a51e0cf06cb834467ad2074997d61703f5f8a9361a728a5ba05ab790a417d856503701 SHA512 918db75fe5ed6285a9ca74c18039064025cbb0093bfc0889173298f308e4bb3aef054622755c9b3aec6d08be4959307485e5ef6da3c03b0e734dd64aadf9ae5f
-DIST KQBPvKB.rtbw 30712336 BLAKE2B 2a0727472ba382c0a7aca7269a5105baae19c24f96f10c4d5cdd4e45179db462e37783ece35bac5e7cd032172fa816c1f10e265b595ffdb0b4cb75e96a9c1b1d SHA512 92c23fbb8f7c878da1549464c7f0706b3fcac58899f91af7b17f55bf593d7b08265d2f43ae6d808fd72ca653aa20806b10fb262e8d6cc90577c84cdbc5a5b115
-DIST KQBPvKB.rtbz 152275920 BLAKE2B 928df55bef1ef32d15c4bc4b60f253255cb5012c996690706e4e21b4ef1deac9c96a47302c18d96e2f97d6527f1362173c1b8ad1ed4a4a148a64d29e7284945b SHA512 72904678f2bf520b9bcc158c3a342ebfab41ad88cd40bf1793062ac9f9f525777b2a301f8995847291a257f3b715ee7a796c77f6fc3f47269f788390ab811938
-DIST KQBPvKN.rtbw 56122512 BLAKE2B ab6078c9ca25591e150656bc509a8e8834ae235ea2928dc4025e3d13aec2c5bebc176ab2d5812503d8c9fab05068cf88f0d24be6be4d3942340ccac9e4a5e669 SHA512 c746f4f5159e0d0d12c767f18becd8399f56db8e45325a175942951d50f1d1a3340575c01f207a0830966567df417977e7f1aee49bcdaca9eaf26aec4c12e4aa
-DIST KQBPvKN.rtbz 146700240 BLAKE2B f35716f4dd9a8ace57fde3d8e115d0a31a4300097adb20c2ebb5d681dd8773029e6a1f52181857b3ab7b7ac2e92bd11cb59be86701ff5d991890e85a737116d3 SHA512 80e155e38dcb61807890e2cf4a4e1542a9f7d625ac38f3a74879d50cbf9a09ae600d1a3852c1be098773fbe378643b9b1cca2480b3015b9f19db6a34881af6ac
-DIST KQBPvKP.rtbw 57920464 BLAKE2B aa90dd89584ebaab1aef6f8ea452ca48983c02e49dc4b81bf3b4602d7597eabea12b8f0da71caad77d3ddd6380924f1e7581cf1c080916b26a2b680bc579c982 SHA512 34da622cbfd33aa07e169ffc239698c7069f956c1d3c1f79e525b2c16131d1bfcc86a492a98dc9ea5c87cfd9edb40137cb207af7d6e2206f710176d8313c8c5e
-DIST KQBPvKP.rtbz 67597840 BLAKE2B 01dc2e5310ed7591aa2238288afd3d7ee3c5c75cf69277a818aeb31e34d81672bff5f86b5c52854648daf091a9ac70c8331a234cc1163a80addf7fabf6dc4064 SHA512 01c75edefc4fb9695c5cb9d1b8b1a09a1441497a0b6aa03c8f6b1bdbf477efbae44d16c43d895a718c28a492d3755b6de4e7942e9025ee6b73caf2c8e7811ca7
-DIST KQBPvKQ.rtbw 879297744 BLAKE2B fdb3014df12fa3a77d2cc49e3492018bbf71acbe592465904914ae47d36e1780e7ddceeaae89b0cc22fe23e51e9f32e7a6712be8ba59a523bd940311cff05f37 SHA512 e925c9a9b6973ac525d44c099899a049e6496c6a2cb3a5cd8ee88ff169a652f4a89ea0d055f5bdf6847ba38bc6e69bc0973d99c586eedc06d0068575d0e3321e
-DIST KQBPvKQ.rtbz 1355934736 BLAKE2B 58c037b57fd71f1d82908bd5483a766f2dea79b6ddca2e995fa4d160b87fb46178a0678c795962853fa7bca30af9832d4904c0556654346be7fcdbaaf6b54b0c SHA512 3c0a509bc15fbbab2c378d9c5dbbe253f2eb859dfe8670ce10652c70e80e216c926a708e2da448eb01fc681044996cd635c9a80c600ab7b4da96327b104f1820
-DIST KQBPvKR.rtbw 60850512 BLAKE2B 5ed6a7782933da7ce3bce61f5d30baac58b6aceb43c22e70dc9097e23530418589499694c01c651c83bcd73662a0935dc10b68bfb19a31db4309f04491cd4091 SHA512 6bc0e7e6f2ee51efc90e2e922dc99f5170e4e54747d8c50962ff1de1508361cab9ab8188f8eb7d04ae96b93da6c6c9571c60df1ec385a98d06e425ed48d97231
-DIST KQBPvKR.rtbz 230853456 BLAKE2B a608947521948057921192263f0e6bb4193b5e49841bf40f815a932855b9cfaa8ba7f8d269310146f52aa52abcde07a4b439f1ebb5cacde26edf4ac09dbeff87 SHA512 89d45a3a07cc6c8b20d5211a588ac12e2f732125d19709c738415929780ea8658c409355b5b2ec952a14c962c11befe6bb98418777602db4e10e40bedf2dbbb6
-DIST KQBvK.rtbw 4944 BLAKE2B eb670c8d49ff9a92c0117d4809c22be763fa3b1bdb6e2411522052d658c93b4d808d8a3da0a1de64d138f7e6f327549bbfecf4eb23aa51af2a55db750ba815f9 SHA512 2f7f977468ba18fcfbbb4085d04764de6ebd3371f75da58eec39469d5eaf8034997398c9c8751d69c64181c37c7e0a0c2cdc2b434b14fd3d76436b3fdd002e20
-DIST KQBvK.rtbz 139088 BLAKE2B 2eddaf96a5c2306450ef086dee37d502ce495516926eb395c0bec3163668badfa248d5b42cf5b0791f0562997a7f334d978d021a7b7095a806df133d82f03d07 SHA512 256539674fdd01311e70978d588db418c3347722dd5c43f4066700b18a25e0c13399eb19ee05314ba5aecca6c65d0fd74996b2e034ed71014bf7d41375a89dab
-DIST KQBvKB.rtbw 232656 BLAKE2B 7e693c0ee9183536f0d5e5d1d48704c88fa20b93e17e7255c3c945530abf6b43ea9bd679bcde9ddc85ba4b0f226f47a4fdd55441a1b7d9b90fc194899fbae5aa SHA512 0807238a2203b253fb2b4d9fde6e3c25850d8e0bd14745fa18e38e612ad4584283327745a89f334e742ee21dc509ce17dccc225ba3c1837a42dc8ffc12c45e8d
-DIST KQBvKB.rtbz 6845584 BLAKE2B 08d89d611903de3b181e4f809fe7e4722570acc9554b3f0aada18f1aacd23bfea45c70027c4406418d930a468c9cc0ba144677ac76ffdc78d77704786c46d0df SHA512 ba8cef96d6a59db0ac9bb998b8b9177e1e96eed4e6bdb22808b6481f3b654488c5d625155a28bddd5a6d3731bbd40f7e7f63b37f100865129d4462a1cc639aa2
-DIST KQBvKBB.rtbw 18445264 BLAKE2B 9ec739709383947c9705ef23ffed2fdd480fd19338c2544fcf882832c894a6e77509875e9c0b3eb625d6c76e725dec935b51c7b516aa34553e2d6ea344141f32 SHA512 e8c268daa56b5c14b5931507602c310b1f60c162f7d0848762162837bb202e87c03df71d44b4981ebcf34a570c0e48ec28f9dc8c5798b848ad46d007192da9e9
-DIST KQBvKBB.rtbz 222826256 BLAKE2B 7110c0921c1ad105576c0821357cda022ee7eca0dc6c0141060a54db290387d01bd954a613f511c28f2f39b07044d3305009ec0b02d938cb08b07cf8a419bb98 SHA512 b3c70518ad7626ca8b7b56f4b2e8e2fa5e4adba9c7d249ff5a76939e76a76b6ba4f0f7f8361625f5d48717229fabf84d10d64441beb853d58a8835714dd73920
-DIST KQBvKBN.rtbw 34766672 BLAKE2B 52cc21dd8be69ae6a07036caec9cf19ebff1b46d5568ebd9e7530294a17e38e71d0ce55f96fbc1b6c7f8113764dfbc286f678eb2cbb9dba0199ac5d4bf719a2c SHA512 d7261f6482bb093b963fde9bb3369da0e45b89575695e6edfba53f8356e540a11efe51f0a43004923c65ec1d26be2e2f2beb65317dadcb0693f3d27bc5e0c5b3
-DIST KQBvKBN.rtbz 301845712 BLAKE2B 791b92be8b0a9b4d00cc0672427740baf8352eb5e7fe123577c8aec558c0072687837aed30540a35418f7a41d60381945739df95fb37a5349c976efc837165ab SHA512 0bfad101acb403e7038368466f06084ff63d49771518c056b8e6abfd142441a6aeab5f78ba88cd15662c143229ac35604ccc16eb940460f64e628fb41d542ddd
-DIST KQBvKBP.rtbw 233370448 BLAKE2B cb782bce5d01319dec92734926c09857b92c359cfbb111daed94c5b17b1c8f06da79ee06afcd2e44375be67faf6a897aab8fda70b8652cca46f0c889cebb5aea SHA512 18badcc51f7d8ba2f82c68311ba1453dcb660f02f4dee602a9833f25f195af7d68e0479ad2829673cd32740adabaf0c8b372cd97475e676981847df400cedb8a
-DIST KQBvKBP.rtbz 724328912 BLAKE2B e6ca4c756644543d450ffe21cdcb2be99a3c0998e2c75d388b99080bd7206d9a08d6b324d88cbe070ab4a5ed1780619f0c0d525a80449ab1331f1e619e65573a SHA512 7967e18dd340f8e6e7703ae8ea1ff06a9e16708ecc976b72d74a03e64945c457799e71535dfdb43eb20c84b277625accc75fbe446f224c662cf558f8c76759ed
-DIST KQBvKN.rtbw 387664 BLAKE2B 230a74655b1458c5976a03485d34000b389b37ac87046a444d6f5a4bdb618f8a68f16e1055a202dbf60e6b4836a1f270e35041790cc9f060af56ffebed0431dd SHA512 de48785b20f961d41666beb0ef3bfbca3f09ebb0aa0702a562d29627658a4b1f3716b5239ad8a26d1a5491e2c755a667b5132e63d55b3cf8bc3ed68c3a537784
-DIST KQBvKN.rtbz 4369104 BLAKE2B ddd94221662cc4aabcdb479e1439cf6be56b860294f896a88535dd8fc0d8e642bd6914a8ec46b05d5b160da265b81a427630611ccddccd4692a6975fd8914235 SHA512 aa19b5fb7409dc6f433708a29b8676d1b0f74eda5a8534a6df93c6222d1acde331c847870f87a842388d94735f4a8b3bab14ef46108865074a10433ed2f29b14
-DIST KQBvKNN.rtbw 24846928 BLAKE2B ae9d73bb421c4c12d9a179dc7158475142ee073f39d5267a756764d234b3144b54998a63dea5436dfab9366ca0c9368b94d6ef7a062d45ced31394828de368d1 SHA512 685a4481dec925e96a946947f9bf218d025c3ecf20f5aa84693cd6ea5a6be19c25ca30c2f07166e6fa86b89771117834343a693d6928a2a083cc54ac6bdf51b0
-DIST KQBvKNN.rtbz 123061456 BLAKE2B 97d2b7c51ade87e67ba5e0640786f1e8dc36c7294b6999bf12bd70f4cb18b817c604f1fb50467bda3f22b33345cff1e5d8a305ca840c3dc769154f946956eb2d SHA512 9f7af2a1016e8f94f6dbe8c8452c29be26838f16527381566104de99a134fd393d6566927934c6cf09fcbd47a012bdd9a9b1c74e758e7efa4e803e677aeec84c
-DIST KQBvKNP.rtbw 304391184 BLAKE2B 864536f2501020488a7fbea714fbd0560c27099a0f6b79c06db1ab6d534cfd5b276cd07f39a41a2e2221b5bd52b5ff8b7c2baa9ebef6a5995ff06d5dbeeb13a5 SHA512 c6a7527eae39d7f1f4742da55d5fe0a4b5316df6ca2f0ab46e348c37a5b56a743f27e1fc08db5181aa1325d6922dc4e7005e348340012db9b1e47640a83f26f2
-DIST KQBvKNP.rtbz 437289360 BLAKE2B f8def63090b56a75f870f7ecd02925844ec19d01e53972c6425cdd8fbafbb5af15d815a1eed72eff48d7c8d8846a389c43bdf7d0216bdf26a30ad8f0c564ee56 SHA512 06e91842df0a56d25a51fef2d857fdbccedef32a11d9a5d62f56054edee16ec486454ba1646d5979faf0944fe1a5f818f814f46078fde951f44e214a285daab1
-DIST KQBvKP.rtbw 2925136 BLAKE2B ef3a0b4a78a1de644941465cb93fa1a5bf7ddee133e061ef274fb7853ff70239ab9a6637af22a1f6604fd600079641a86dff969ef4120c0bc225c5d5f124cbc0 SHA512 3af6a69649ab4dec638b55131310d6c2dbe8363cb735683903d7b01b0f9e81dbc43a2884ac521950bf63d85349d9c182dc9631f5819e7bda3a93f505334d8388
-DIST KQBvKP.rtbz 7444880 BLAKE2B 601f37739bc94cf10e3887c5295e6471e11cdd918a136ca933bc5c4d615994d8ed3041416fe4c36fc7888f4e009660da44443e5262b90f5f9fd18c02dfa67299 SHA512 528b34bcc55683b88b9abfaf44be31f457dc46298aace99d11a021a1596f6f96a1d7809ede9a4f8def649db86d5b8283e555125f1a11cce64d5b15680cf2ebf8
-DIST KQBvKPP.rtbw 129057360 BLAKE2B 7a14b6095bdf9bd2d6fd23d5a581fdb8f6933d01494fc5a30497fc9cfaaef79e81bbd05e49de5139c1f3a7d5685431bb4308cdce29c5f160b0e4b5b68bfa7d8c SHA512 6b37b4e453137272301c59600d6ddd82b8a3fc4aeb3a8696cbfb12e66929e8393fb0e24960471f7efbea572abf482336ad45b05d523540bd8236d16d168d3869
-DIST KQBvKPP.rtbz 111550416 BLAKE2B 565e39ecc001b3492ef5f4df2b3edfa6f683e9bfd2accd733ac37ca407428d452d7abf3f8f432d8f7604e6633cd637687c0413e158dd1d39fd87a6b5cff1a84e SHA512 a7dd3b1440e4d8e66902cc4f01fbda70fcabcfa4cad120ca38943723551cf5277f88f560848403604e6f25313eb4504e9ca92d4efe2b7af44c0c3b79f2c54e29
-DIST KQBvKQ.rtbw 4092496 BLAKE2B fde2d5ce57c3e6d5e5cd61d7e058c7381def1aec62cbf837a39ac7c2f0c16a035fc60179d0d3435bc30e0e7ac1db3e096343bf165d56e8abefe0421ba7215b15 SHA512 88cf6d91b44da34102a6b38f7a24b849b87a8cf4efca32e472cd7c5b21ce86d66a0e628868c2ff18497af7d0656a4c5eba5d9df7305ea2fd87fcd00f420cf092
-DIST KQBvKQ.rtbz 1260112 BLAKE2B 0d2f2bba8903be8344907fade5002fe291c511978f45270dd730b19513b83dd1f9a3ccf6c1f1ab962bb6904faab7722a7aa84bf73f1b02cd41520b2347709342 SHA512 f390844442bcfb28fa316661114f02888ab135525fa3c24fda8831b53a5d657d80f649fac409aed7bec58b88db4498787e00018c7eed6b9f61e2ecd35e103653
-DIST KQBvKQB.rtbw 158431504 BLAKE2B 5115ec96b0da5903132d6059148c7c3b2355da6aea19669ad41e4b1e482da5ce7ee6a63e9d8db2b1731a6677d49de4578b7831e167765099153756b5958ad107 SHA512 eea7c287ffe50f716c0810b9a89064aa12ac438a8979a2d6133879f4939b113e514e282bc5735fa0744f81823d3dd235f014e0cb5b66ffbee84d648097d73e42
-DIST KQBvKQB.rtbz 92682640 BLAKE2B 965cb6163927703adbfdde2de81d7758b2fc0b9f6d95d19ab706b95463236cab7b25eebd5b21471fbc30595687ccfdabba5a47281357498c52dccbcde5178898 SHA512 e66bf1c8f9f5fd1faedefac831ec6632b6d5b717202ece2997c91d6630d2e59a9ba50cd15c5ce916a17a4691a2ca6935b00d0069a6218d329493230f530860d8
-DIST KQBvKQN.rtbw 290797328 BLAKE2B 861f075015130098078ced6e75e11143cce536ca0c58b228d9264d22928ec57d03cd2d42185d0d3a139f87087db909faabb61eae0413a89815bf151293105643 SHA512 f42d2b4f1b946b49b3a1e106757d3217af4c57d2e2387a4c60b99a402a54bcb537d0dca4c68f34ab4f96aae4d6560aa4d836067b6c561676fc7ee97326499166
-DIST KQBvKQN.rtbz 71495888 BLAKE2B 1c36869483ac69307e6ef8c559da13cd3255d072bd0cba304233120c1a42db8035d57a2b79fff5c7ded4d3e943f799aab1ebf4c075094b3a972eabc7336275c8 SHA512 d50d039c32f447321d05c4ea84b56ffeeecde5ad000b0026e7a1c8ce3c385181a0915af0ad34635d347cc1cd73ebf753419d8120d7f69087bcc010878b600e1a
-DIST KQBvKQP.rtbw 1140377104 BLAKE2B 9120f13044ac5dcd6712f1b9f270152f3ea59ac26dab7ec750d26cf84e3b780188cfbcfb34e7eadb7fcc10576a53597fbcedb29a665ade3b56f237ca7a714e5e SHA512 146b7760c63943368ec3fca986776ab08509b6ea75dddc842c6acd369f5cab1495a8b3f10de9e79ac5c0ffa89db407ee35af1ea1d75175d463d87fd87f74f62c
-DIST KQBvKQP.rtbz 301290832 BLAKE2B 481e35231d676c7a67dbb8e3ff99be49018a696037810a5a0185556b4dec888bfa136f877d1ec22793c80a054ad55630621003552bd6260c9caf3c2f718a816d SHA512 59f40ca7ca79b3bcb62afccde193f74d7b62a8ac2ac2325409a9e923bf91e77cc71fd2118646c5a37f18810567f7b2ebb718bfd642d1e275b7098a50293906b6
-DIST KQBvKR.rtbw 684048 BLAKE2B 534daac3be2988d65fd6b6e6761ab02587cc5fb663f68f209dc5bbd1135277d6c2142292eed30a095b13413539b26848f722500ae00fc2dc37632c135a13444f SHA512 4c05e81ffbeaa16ff2c56e7a826d8eac9ce60e7311320d17ca46bc0aef6681161283dbd7ada0dddef1797d43ce3367294051819081dcfe66a99415e546410e01
-DIST KQBvKR.rtbz 8740752 BLAKE2B 7048f30b391725f23eb314d5e4c04df43fdd572085b8bde307ebcb18c97241f13845f703b544540513e891f7df2b197d782d909f64e647b82be1f0bd2e954783 SHA512 cba4a3d3cd01fed966fb9a697e0fe0ad6277b29c442a907fcf01f55172eae0fea0267d237098426cd951d988b78a5594c4ecf465994d84f0fe31c34ca6da568d
-DIST KQBvKRB.rtbw 162070288 BLAKE2B 9051a2ff3aa5143b65859e04ad00132930cafce0fa577775a19490a7cbbcd87d6749e24891ceacaf19a9bb566f7f6bd653339b9dc1ac219458bc71900c3bb128 SHA512 55a646c8610edc040984ed36f469ee5b78f959a0b61e1b6fbd633c79b0342f11730113bc9adeb7c4c311b0cde6fc8ca2517d79f3c1cae052dc257c40b46fccf1
-DIST KQBvKRB.rtbz 548355152 BLAKE2B ea2b002d97990006d95ad4e104e507656d7ced8272f57f602a1464ea3dbabf5e2703f673e48d5f69375a090891e3d0f58a2fa16d144614f59ccb6f15997390d9 SHA512 49b269e611b1e951bd2289c4721a9fc02c2e037be15430ff37eddfde151cf5ce6556a3a873d484c042010556ddaba0af481362387b89a7bf4ab567c0b8d8d015
-DIST KQBvKRN.rtbw 134754128 BLAKE2B ddc0488d85a3d78ede67a79e7c731ccf4a88cb76192cc0f5d607b764ce17a40cbcb41891423eab46a907fb1922590ddb6b43e58bb7162ffd668351a0ae60ff4f SHA512 e750f54e505f836a4288c5e4d0b0ecfad83e6d91d5101fc0c08fb257d2221b9f732df475319eaf6c0797b310458409a2ab96000a194742226e43ed1cbd048aa3
-DIST KQBvKRN.rtbz 459051408 BLAKE2B eb633644037e2b4d8986aadd3e43e5052214107278b27b78b7d0f9e2b2760172a632b2d96f714167e43d79a007e0bd86eaf3d39aedef6555b3f4147e29274e0b SHA512 8ddaad2c7fd43be2e8396bbb32ebd745d78f6035b63dcff269cbe34c351d3b74465d8ed5bb074a2eb940f65e405deeb76ce8a652354463078a8e2abe89462f90
-DIST KQBvKRP.rtbw 368929424 BLAKE2B 337c028eea5d3d30c6acfc4c9227f2d007771c39dec74cb1c8931d017bf83f18ffb55ae0ae8e1ff1d1a8e2ab11fcd3a2afae3780312bf43dd7782773a2db2fc9 SHA512 076a1cf259e8d2cc793c639231e3e7fb2523133b8919dd7d86625e133ef9479867610e39479bc89f3b03488c7039ab7f3357272c74c037c4975f4dee4d686d0e
-DIST KQBvKRP.rtbz 982449296 BLAKE2B 4ae64c4c88c89b9739ccdd410e4aea214fe6ea1c799ef5764a2c4fb241c85f735599c741d5b4b79428a896312f340d76dfd9b9ad9bb18a4828b7f1c451f37714 SHA512 5b82d97ef79fcb79bc2028163fc37e24069a4ffc78d73a2773c4927e8148239b9e5ee8dd252d8b38f47b40f1459da2ccd30abb94bd9b86e3ff91bf3e3365fe70
-DIST KQBvKRR.rtbw 188763536 BLAKE2B 6c36b51bf8b03dc52e8b00d459dc04c38b1288a9d5917cd67caae77ddc94499fbc69d4e9bb11238cce8db77a6cba50d31735174e70f4a0307fc278285d4552d0 SHA512 f882040617c8d3a9ed325ed4b2c7c19e491a16f88aba40aee24b8f3f3002be22c65acf00804f81efe8412cb26e933f6bbfba67e94487fa60787790c8551923a5
-DIST KQBvKRR.rtbz 405199888 BLAKE2B a21be7a77ca41fededc7b82afba9bf28beb62676391cb666e54dc48130b10ab431972dfcbbbd1dfb9a2b5064a570b4c2449fcced74637a97b6cf9e2d7473d2a9 SHA512 d6cbef2e43972ce5f0b19da1e94e6822cf93bc6a077871e78a6ac0c845489c8323b805d4167b3bb9500f0efaf0197362d4c3e85d4337c10497383331f2af3400
-DIST KQNNNvK.rtbw 3243984 BLAKE2B fd06a0f5091020feefd3db6916bb13ab2963e2947b0448e2484fab886b213c077258a1327d64f0b939d8a7e94a1726e760d61af9ae4572c128813760c123ebbd SHA512 1115787dd2e06ab7d690f9197a58b034baf3048cf23abc5d9cd815923c5b4983a598058b626a7deeac03325341e0ac3033f39664b8d841562b9df02510afdb17
-DIST KQNNNvK.rtbz 35982480 BLAKE2B e0db09261f799cd25ff5165dc62f3a692591fa501df01878ad145d2ef5ced953f69ca29494202aa0f14e647b9d00ec0ee3d2fdd3d9bbce641cfdf70f692a2af9 SHA512 3ac63ce34a47b964dc4f1dc93fe3f8847dd8031420d09fa78c2f864fdbc000d6ce9c1a91e036cc7115b232e181812663e1cce6263c3a0f81f86bff2ab3c048f5
-DIST KQNNPvK.rtbw 26070992 BLAKE2B d3d2eaa35a1898f919be93427499f884af4494a85603b3791777f19a973e6a673a231fd953d1a9494cf96ea3e8023d14e3c6f2f37f8819ecdc9b23ce9dba84d0 SHA512 ae7c8c7e88de12b56e6e3c7eac67d40e72ab81a99adf914e969b192fd0c36d9c02fe1b0026adc692685c6ca669e7115335f59cdf1c7572f08f8ca004ba27c052
-DIST KQNNPvK.rtbz 39647952 BLAKE2B 6024552b0edc6ac0e0bfe6e20bf170aac2f016640b45f72a2129c62937a75a65a751efdbd32e85c377b920b111a405db6a066635b0cd6da83826b8df5ff95258 SHA512 7b9c409494c093a50e50e3a106f29244652cf965b3d048a3d162717d37211e0ed6e9cbff6b08e1ba603bba5d8de6d9a859bd2ce43210c7167b2e7b23e459ef89
-DIST KQNNvK.rtbw 113680 BLAKE2B 4cfe97b00ea547eb9c0b4a33bd762d88cba0f3dfc80451e2b392f35688984f5f2a84691d76b093f432724f695bba08bb39c0adc8c7e70f95823c602256594aad SHA512 7020862df0df2b08b1c038057a32f2d206a5aa6c106e3986ed74be2eb51303b978b85ebc63fbc6e66b2f483feebb56cc60e3576ca8f91d00f96d71c7a8f13bc7
-DIST KQNNvK.rtbz 3680656 BLAKE2B a0e4689a49038adae9a8686b3cdc08abd86c4702169809bd7c2a7f5f0798ab38c049cdabe66c4bceaa63c71f96b17e704bc2958f64c3368937a237b823612bf5 SHA512 dbe039f5bc3d08a435ea6a74ccb42de04a85851646b852619de6f83b90cd880336e030fba27f5270bc715dd3ef204f4f92f53e8b41b109d23cc157c87738d275
-DIST KQNNvKB.rtbw 5878800 BLAKE2B 27c5de1de0872db32311b4a249dddc051bcacab5c664fbc01b970479fd57db4332da4e5ddf4c856348a40b0cd28bbab436b4d0ca27d7bfdf2b95200293c23343 SHA512 82c1d62b37cb4f8d07dd797041466043e08a46d6199b2ba0eb0a6862e26b08c462a7b5c710015d5435b9f77f941ecb6d919ba7f2fac22e6d1af8f9823f3812d0
-DIST KQNNvKB.rtbz 182603536 BLAKE2B 792f8fa47ca183ffacd504bf9e4cdd0fafa730622879b5f9f0d2d229b081c323358f886d0c0b533d0f50c00e61e550ce0a7895cf88db1a0c8557a12fa4f13c30 SHA512 6bee5e1c3015d611bdbf3ad80e9c351447119e8d725ddae34e7efc9d157a7f0fc1c46561664419b1a23a1a579cabc89080bb2b669f3829b12675ec91c2c69441
-DIST KQNNvKN.rtbw 9820240 BLAKE2B d4339ce89b9de1307304ec9d3671ca94f5b854fdfbb790ec7306cac4b8d4f14c8e8c4075715c954c2335ad1b1952a573dcd994e6025360527fa7b0e7ae473fa3 SHA512 380ab5738c45e327da2da9e0eb9574eb24615425eeda92db408a4fba1ae53851d1570cbe3c42e1be6463154206d446f1b51dc0fb23c1c6ca558b279dea669ab8
-DIST KQNNvKN.rtbz 129782800 BLAKE2B 0b0650ea94ccc1261a3fb3e390dee3ffb55e10d7bbc1b51bf94bf32088f36cdf947bbf4ea8d1c5b6a2c2ab3fa4e594818c23ff88e947e0ca545841aa7a433ca4 SHA512 6aa544e4046b4e9936804f259ef6cf294bc4e405078b064309c610e9500e5a45548847ae54da06816996de64305132bf6024711f04a2e73903f7ab93ccd443c5
-DIST KQNNvKP.rtbw 51658192 BLAKE2B c6f1a7d1cc6ba8a9e6ceb6821a73c56d1630e03914c12c33a6fbdd30ec771bbd93a77cfe08c8a45a33b14165c4853b100b7e56d152b19d34e50a79f28dda9fae SHA512 a2395a8493440c572703396acb15010a27ff7d1a25edc1ea5bb3a3d02ab944d7d4ce6af0f87c94085574bbc857ca9ed7e6dad1cd0f03886dfe89651c9888385a
-DIST KQNNvKP.rtbz 192376272 BLAKE2B c09cbbae406dbc21af62cf5f8f0df4caaf3da8bbee8408f1ff692da4de255135fb3a1ce877ebc8bfa0713b6f8c6359d60db921960edaf294246e19e2137a6f5b SHA512 8ac3018e3c324d64dfde50f03a2b1b2ee3167fd93d3e02d849245a372afab8baad3977bd5d7c1c70922bde57930783468b4cff378d5a65d425f73063c265348f
-DIST KQNNvKQ.rtbw 169917264 BLAKE2B a9a76137f65a7454e0b11c863eb15ee023a937f950a848b85a62ee2e49dc40b73a80644d8968be94a46f37db81d17d37dd268fb71363b334e7a06d273aaa9a42 SHA512 c673975e5708889a3deb3f7fca5701753381cb14132112899605b56b65901d6280ab0314e105312c8a151a940a9f94d466dc991fe8a5e16eaa78342a4b354cb3
-DIST KQNNvKQ.rtbz 445148688 BLAKE2B f4852104c1858506c99228a95e8a6ca43740c3f7bbe4b9791a2d419e40741a069fae60b75d6c912153591f7598adbb4ec3d82f405938125243237621dc4709f5 SHA512 e3e9240b775a5e4dbdd8cd4d5d9d83a95a66d65aeba58899eb17d654d0eeea6ae86badee6adb35b7fc66adeda7174a5f5222f1514517ebdb1772f9129f0f0976
-DIST KQNNvKR.rtbw 19588112 BLAKE2B e7fa00ba9bf941b82fe2cd794a904614455a54c20b84a2481bd167f50d745105476bdce81b7406bbab8bf1f919c5dc1dfab9089f851b21784790460d4f519c12 SHA512 2751ebf49e7720a8c895c28e82f54546cf13c13c33c9a9eb693643e387f0e99d79f35eeb3d6d62fb789ed829b6002b8477d032c833a9cc8b83efbd499f6d6c46
-DIST KQNNvKR.rtbz 239440272 BLAKE2B eaeacbbfb5ee2895c5f905718716db084dd605423da416ad35d4639e34d3f64f3530953e0c4024303532487844f5568c24cbfc8d877d73ae9063d39bc9a2531e SHA512 7431a51ab001e78ca9b2ae5c56112b9c489be98a546bfc813bcfafa16a8f20674c6154136cb6d749806ad9d666beef4e50e8014bc8e7e87fa1534540fce4d6d5
-DIST KQNPPvK.rtbw 17307984 BLAKE2B 42a6be22ad3ae60c25f5e7d42e5959ede8dc0a8cb65dcbfc4cb0c36a0e39479e83fadc767aa88e0b9227f666e1dde1db875ec982046718d89abdbe11f47bd71e SHA512 a14a9352b1031f3226c292aa8eb8d956c1453445658c4c72e36ec5476a52463c03d412b60983fec300eb3482f1d4252b11c12d76dee734afc712d156afc9966d
-DIST KQNPPvK.rtbz 7980240 BLAKE2B f026c38158649c28ac05c3450c5237f75cddd23cc6b9e7ea24f619f1e974cf5711330c1a89f5be419ea8a96d80966f2e62f4def491c481e31f883450abe7ebed SHA512 6ca031a3495cc5fd84cfa7a09848d8a12f493cda8cd5d49a1730737e57db239322d7f7fb9da95e17a243acdec60cf326ef59c628ef0aa50f324f7838386efde2
-DIST KQNPvK.rtbw 648784 BLAKE2B 111e25fa3e1257129a574085ca00b215e31134b475cea608af6f5cb95b264e7021c4b02445c7188ffaa25eb023496f322cc3c6b4c42a2c41d30b07270badc69a SHA512 400504b9a901c443a84eb0019ff65fe016008ee7f193ada98f656e9937a829534591eda2babb9cdb304acc987e3b2ff286c79d019b18596d8fdc87d1223862b1
-DIST KQNPvK.rtbz 1295184 BLAKE2B 903ad82920ea538344b23fb790f027b75d455be5b8fedea5b6581b55e082ce91ce5b7550596af69a84da349a93eff6b9f7f77dca4c55ab444c97e70c6182d976 SHA512 9478f8779cb6c6a8c76be630e479c85d788e4cfcbfb022ff529fcfcaed70866d2db8bf6a39a09059efea40cfecc60977b8f96cbd1569968de73ba82547a75827
-DIST KQNPvKB.rtbw 29076112 BLAKE2B 2eec2c54a98528c52887007dd6ea89506973b9ee5e77236325297885dadc09f5f0efdee04c99402c008c3265355ed6ad04c7b2c99eb1011c703c59d2c358d356 SHA512 f523a7ba74a59b95e1c4a66d45f8ae7809796c2c123a98593eaca2918f4e31eee72b20c13d0f4ed843cadc8a878e1c0759e4166e57e6d50164b20aef7dd22ba4
-DIST KQNPvKB.rtbz 133713936 BLAKE2B 9368078da95b0d7715e24d1e03b7c6f73bd8de25fdf4e9fe77087dd7dbf57dde805875232b5d73d7b039aef928dee472d458ee2d7fff9406b751590b05bdb514 SHA512 3fbfacae7c1a0d741046270bb5eb56da205928062c60673b5a1d65e0d7a37e47f610b556f0feb16e3e9677a49b364ccf93658bcfc7e4d0e39f8eb55f35a87420
-DIST KQNPvKN.rtbw 60840656 BLAKE2B ac29fc6d19bdbc1539d90b602f21cbeb62758d4cdf6b7863b8f879fc067ac4e4ecf90e0a8e78ee0a7db52d2eb78766dc8268128b1300b7654ec17af05f8a9b7f SHA512 f13d9741ae1a19192d5d07aecd7edc2d33968d1a5d799a1bf27074cc9fa1f89fc0ec4e3db5a736b191d4528739363658c46a78b876695c1c8ac36e8a447ddf27
-DIST KQNPvKN.rtbz 122881168 BLAKE2B 7c75288c13637eafc77b8f2abdf4ade2cccc91bf1d50c3dfc35b6033a1eba87742e3fa656ec90d76a77fd56e7e16b188c99f7c36dc53733788bddd8065f477a3 SHA512 2d43a5a58294207a9ca0f2fd387500b41f12ed6538f9dc41e59ed0d7b58fed1a2bb2e2792314ad7650538b4ddeaf7e5d3ece3b9d0cd98041c3d368c4706c5b19
-DIST KQNPvKP.rtbw 62303952 BLAKE2B 4381206aa27de853d53cc13097b631bd43b192cd921880b75f54cc136045cbb98e7b062fb3e6fbed4ce8a9ffd2aaf9dca76aaf63c91b2c5fdc700a75fa965841 SHA512 2a85a21a1963dac71c155b267e30a0c5d03ac3bd44d6d5c1ca319c250dac92e8f9be7737b046343dae05ec7bb4056ad5baaa815b96f3f3c26ae214c53e46cc22
-DIST KQNPvKP.rtbz 72047760 BLAKE2B f17535336199a505f2ba929c7c0091429f663cbcd06138307599418a8b22d74bf7d9c2ef712e28dd9c08a3d2ff573a43006fe34dfb3a924e790720966ab1355f SHA512 2ca6d7315ec77a7a6b0916a8c5bb4c2aec8ca9768cec406815ce5738c8adf6d814f5ff8672f006588938e82b3dafde2e95e47b9cb7c0a602ed6366b6f81d6948
-DIST KQNPvKQ.rtbw 991683344 BLAKE2B 8f9486722f0bf34b6739acf0c7e2b6c9cc5f654593acaf9c99d53971aee4e52e82515e38701bb897c9308cf2343911ea7956e9a2214157afa10d4222482ebb67 SHA512 d7b82d9451bafa623430bd793a9a963da9e6e5ec6cae9a094a653b2946c13d0bad53e2cc6878216514d580f2292114172e157fe61ca1af6e7f1aa0b7c1408998
-DIST KQNPvKQ.rtbz 1431612368 BLAKE2B 81f5ac616b3430cd3b50c026c68102f88d4c18fd897a5525e42cb486a1d0c3057f14922ff8de22b8887176ca918d40931038053ac6c7e6ebb91fa47af82b0602 SHA512 b8633e0a61e977194a0cb308d90d00c19d7fc5cfd3f4fc7a7b3dff4dc2ed7c83347c8d1c7134efef5a14566e36de387c9c985428e327be8308158f3ca15d77c1
-DIST KQNPvKR.rtbw 63734608 BLAKE2B d048f8b92e3ef7e06115aa1f46f9761cd86e6c45765e44b138b4666f8d68ce10970669ad04d8f2b8896c40b1a50898e1fb506898d5c6c95594ccf05737b4b5b3 SHA512 f2ff030f5e774dcbf0134d75482a1f23cfc10a006dc497b76524a7e5bab3a083362c38a557eee4494ce3cbc5689eed31e10b89f65738a0b6710ac9336152ee01
-DIST KQNPvKR.rtbz 228711696 BLAKE2B 313cc9d00fc0ba7e3637f0bf5998c78b66a9311571d915c271e0a4497f52437c17a1c599a91475d46395a0ea85633c8938e2acb0ef3ac740fd7d075f0599479a SHA512 96eb73377b2c8230c7fbbdee07534b39ce22860348f1c22428867651c276680fca2156e821aede99838bdc1f75d8f391f4adbaa0291db8e3c10eed3800e3a74c
-DIST KQNvK.rtbw 3600 BLAKE2B 8fb8e190f2d5f24b06f52a3b8f70c015637ca1d8aa9ac6bba5d7d6865e81aabf067bbae35b22eca4dfeb706f585f5fca4816b82ad242a9a4e5e7e02256875319 SHA512 3332162d68533ce52af8f77edebd378e94db104266adfa8379d45d09f92f6e03abe8ab734c118f8f7e86bd388d4239e518e7e77456c38401fb275438dad8c3cf
-DIST KQNvK.rtbz 156432 BLAKE2B 7202e12c60b003df1088aa2dda45aa5780df9e3c6f9b5ead54e3b2f9691b7b7f31db0508b5de4f05c2ba4b63103002d7b77c21199fb673417a5779589a87425d SHA512 7b2caed8d677e9a93a9793953c83105c0ed6a080c9eec9783b4bc2ed65a1168fce8e76f9eecf179470beff0a00ae5bda3c2c12d2312526dc4ac023c89b27a241
-DIST KQNvKB.rtbw 218320 BLAKE2B 0cd9df65a1b3c9575c1d7b3bd26483270fe9075122c9292234a6307545fb4391fa96dc571191b1de989b6e37a611821c1a9a0cb23a155824f6211789055160ae SHA512 1fd6dde29ebe11f4328a93cce91929a22985bcd63ed33f42303d4a30ab56c5f9a0bf80ba9007789a8d392fed003635b92e654be9f913355b51fbb04c2318eb7d
-DIST KQNvKB.rtbz 8035600 BLAKE2B d43c7931ca22aa282d87b6b59462f443f9c23d97f7447f558828d7e7f3608750348d777b2c0dbae2fe8b14b79a8317f8237b3c0db53921c9c894865451645276 SHA512 54e8f3502da9dba64df01c8c342bfbc002b550b81ca3aa75bf6830480927365799b396284497dcc002c0a4cf3b37386ba5189d52300d349e38433a40d4022dba
-DIST KQNvKBB.rtbw 25338128 BLAKE2B c32efa2b315b19ea4eb73df7a4cb91fbb4e261e2f5a826c3a196ff012ef57115cff7a1b650730d8e9a1dc23c4c2bbb13d5c6410b346e176d8af52f685b1e5890 SHA512 26ddc84c96d6c82262aa67f7b106903286348cc1b8cda5b56a0c225014c9124a0cdca9d3e8968e8bb17432671e538b6167b5c7b6934e748cdf2f58af9788f46d
-DIST KQNvKBB.rtbz 233101264 BLAKE2B c052736de10df340abd6b4435ee1e9a4d90c4042a893b8846436f5d9b4a74ca09418ea9f4f6aee64ad623ad7b467f16199f1dd93c39628c10b02e1ab197c89dd SHA512 872567c3448238b1e2d4dc373e288b15937085f089ca6bcc1f6dcc37e33fd7b7178da7da825908501e90ec6d0e824ddafe7c760f99e2fa4c304bd83262d56bfa
-DIST KQNvKBN.rtbw 33784464 BLAKE2B dabca008ae666482b2d4dbb73cba214370eebe15e825528716ba0a4359cd57b93a63a41ac5f3de99be8d83f3c32ef6b91aa3d815ef6ae596c9eb811177e52a62 SHA512 36a3c6be06eceeb1189e0315a170fa7e02395c46bfc3896c9ff64cdbcf89c9a9637e008fe2de165a3834c4d97b4dd0b05513a8a262ef798fb1eb5f3c9fd2aea3
-DIST KQNvKBN.rtbz 321162320 BLAKE2B 1e00da237714c7623ac81b74421517502e9d94b711a8460eddcf76583f6e04f06e32886cff2e539ec1e86e677a76117af436328f725ea7ec955204cb97191035 SHA512 f0a50773df7c8dcaa0cf4ceb9e687cf4d96ec7a6b2bb7d8c185a91b8ae31456bbd0ba5576216627f35df4ac8969081f3b1ba7446e997b979638d0ccc3270b58f
-DIST KQNvKBP.rtbw 246884752 BLAKE2B a379f4cee8f2bd51558a4bd93a4c852ab62e69bbdf377672c4e01d803d29d9ce232a879a92aa3d04567dda9f4f59a089afe2f3573d17357aecbb779afdddebd6 SHA512 227c1dcd1606260e1a15fb37a11b5a7b5610c51451fb25757c961fe898866ce48d25b4846317a55d36f4dccfe8d24c855f0ac0adddc2df236904247a6b01c841
-DIST KQNvKBP.rtbz 777944592 BLAKE2B 689853e1b9fdcde273c6477184d7d826b0253f37c5ce7d6551ffa98c00c7aafce952c3bb22046cf92c36fbb6a2c72ea7743c66db258f72d0095b50dd251e632b SHA512 6f2870f94df52fd328b16bf40494dd158dcb1cc37749b16c23364b099a99fd6da8cf41c8f40ef8aa2e69767526f4deaba613bd7288f6a661bfbe0d3059510402
-DIST KQNvKN.rtbw 333456 BLAKE2B aad9cffbc0bf5ab01fd18f4d4da742c3ed80d062091d828484094c64805041cbdecc4afebb50ddc53c5dfcd663401d55e4d5943f6db7de77719fc1596c6bcc34 SHA512 7f20fa26c8f37c74fff92dc182ccd424dc503c2f95d28b1cd56bf7a3914b3ce790c60ba05993896c9085381b80e8303e8050c35d2411e91da8b4be3e544dce56
-DIST KQNvKN.rtbz 5411152 BLAKE2B 8f2d7967ac0dc101ee08918801672ed191bab3b31a896e6d52b17e9aa78437198036e07452fef021c31c15d9b98245345cee5368ea5984f0621a1cd0fed823ee SHA512 e03f83352808e1d8990c2a9ef8502b886a500c6c0604b8fed3c6597651c113c5583e0ae70d21b0c2a8f53a66b988943a31062b603d8861c4ddc77d90040ce368
-DIST KQNvKNN.rtbw 19085776 BLAKE2B dc1a4b425d360339f6938df911fbf6ecf2ffb8f92e210768bc9fb53142668b479114218136e0b7a459cad2ae122b45c54cfb30bd50498b20a9f01d9c6fdc0df0 SHA512 b4a7663456bbb88effb8118cacf48d871ac79dd7b11b6d2906c85d99b841a07ae0dede854338c28d543fe16e5f0bf09cadb7eefa30f65e4f7c3619a3139d548a
-DIST KQNvKNN.rtbz 160331408 BLAKE2B 2a028a97afbc838bb3ebd72709ef3e807d3059939ae4d431fb2d1148faae9d11eb2f6b6e91f2849640b0c4cdaf7f30e963fffef03a23aa851bfb0bcfb72520fc SHA512 1f1a71d8cff46ac6d506f7ad5d27e1bc0eada7cbf7797d83d28883a58d6fcf9706e916cbc62806045cd79a760dcb03f61c01e4ad65e15e189998c5ad79eb5184
-DIST KQNvKNP.rtbw 304943568 BLAKE2B 5c4c37ce9bf3f4453c2f2ddc958ec9913bc33d1f575c7a4889df7fdf11c1eef695ed2b243da0de6fcb66e65a2d1dfbe72659389becd0d137b79b5320a28faf70 SHA512 51592e5fd9e1c7e7195e21300d439af2da8feb132bd3a5d670f224d45b860762d512ccff858ffa9c5cb816aef8dc9bee289d56d9de14db3d52e33ccc716646ef
-DIST KQNvKNP.rtbz 536914256 BLAKE2B e8b4be3a5e06f9afa0fbd5320356c7e8e0b89a3edb58fb569ce8c465724941f66ffd85d9d9a3712e6a86dc30896ebcfa72e16eec73b3c39c02ea23bbb8d52b89 SHA512 4004a4b320291cdd28adaa29267c5c55f5489ff9761c0e64ef70b7d8851056c463f2ec952dd612c4feb10a6b4f9373e7cbd1bb91cc5187d8f65303ff5b174144
-DIST KQNvKP.rtbw 2662096 BLAKE2B 852badc680ab622e08abc1bbc0aa97742eb9b0d35ae94460352b1eb588e738c7c79638849af00693bcb0324b1ccd5f077f13b4a00c9f57312c2591f2092f06a1 SHA512 5754a812cdf10a6376c5e1782ba44fea73179921588f817ed1a61a2c38b01e64289dbb4a6f85acd4b3dd6c94be03e086d4d020452b4c149fd7ca019fa522f4d4
-DIST KQNvKP.rtbz 7902992 BLAKE2B 6dfa9176c874be6393c01a1db275e8786ba8e1ddb02208dbf1e6d97a486f230ab2ebb803233114cb21bc20ce234b8aaf661f0aa271beeb3a56dd191dc71e94be SHA512 35080dfce733a3ef07db693d9e4e44776a02b98f41c63a35d0c9a02bc58c754c0236850e35abcf08629a0bf41572a70d6b608fc3f60449aec21f2c4a5457d288
-DIST KQNvKPP.rtbw 128240080 BLAKE2B aac2ff3cb6e38d9409640a0d7275a5f9b884b9483ae4975fdc5b64b9402de21e87b7cb978b6b7c8de1842bc9104f30851a38fd22b66d8cf0fae53fe5f31f51df SHA512 a797f4cf8635db4b0f2b4ea00979f2fe91d8f18407206b4f49465fd5f6541f7f5fe059e9f18ce58c5fbac69d0f433abb1d1bf7eb6478da4f921a76bcb7fae648
-DIST KQNvKPP.rtbz 133295248 BLAKE2B 6bfd4f433426cefd5d93a3734d98f6c8e9eb3421c0ec38a0988d98c8284cedc8bc4e608d5262b66ce90cce012b1bfd40b2f4d6a7d2b788d1fb8152f85d5450bc SHA512 07057cecbefe22868585c070828cdbdc6ab731001eed3ae0dc092ea8c1633ac42d74f701bc133156223885a09f3f95976b9ee4fbf5db908a4482d9a138ad2654
-DIST KQNvKQ.rtbw 3139152 BLAKE2B 48685bc84922f6ffa73cb4b2651e200c227bdd066eeb157a0cdc57cd74a1c826aa833b582189db142de3aea252006cc5cde602f1b17e80dcd65dd2296b15c110 SHA512 0b50b12f92587722f0bd3b80eac0a9dd2cd2aaa9f32b508e6fa047e3abf3fec2f43a71a0bfdea73835fb94e17564a4a9c0bfc86a0e3de88953c41ec720aebdf3
-DIST KQNvKQ.rtbz 785296 BLAKE2B b331adec186e40c91973bbe984718abb221c3e9b0c9f06161e5f5f2f3ff6d0f54967d45f0be9faefcdf0da241a21f59b8126fafc7a7a9dbde6108727839fb54f SHA512 c70828efb79a515da11c737bd576af19bdc45b96087f1b44f0ac68a2f53bec0972e7df1aea6b9db35492b724b70adf9c24d818596bc1da15975a20a1795f438f
-DIST KQNvKQN.rtbw 133394256 BLAKE2B a4de48c94032bf972412e473df89d7416192b2dd5a66550600e7765143d79ba06c065ff69088c24651ca9a3c641e2f93ace3208594bf73ee513709fb97f70287 SHA512 d4f7d1df836a7454c6969db0d2bb7d210dc7b1a840612c5e1193327dcaa5db7561f8f718e616cdc79e6091eb590c4db311fba4070b51b4bdba4f7a5e8f9dc21f
-DIST KQNvKQN.rtbz 60699984 BLAKE2B 7d3853d1ba86daf2d3652c7f7e78cabbeca9c340fbd81b7db8cea84c36d46fd20f6680af46c293240b109b58bde696e6694d557306ce3a612d53f6e815165cc7 SHA512 45128a5f4e2eeb20c6119f6c3457a27b7cbfc8785b6dc8dfc3b85ba95c47bc3d3cfc43b03b0e80a310f92814fed446b0530f0338f8cc3e3cdb14a84e46e2007e
-DIST KQNvKQP.rtbw 1070174352 BLAKE2B e2e53e6ae0b02343c64c2c3fa1edbc38de9f652e557740bc7f1bcf1b2f2adc474633bef92e12f65859f63ed8d0286a05da64f06906c2eaeb269c345cb5cab256 SHA512 0f9dbf796e7aa472854a87062c158f2927654c104ecee9f4653327ba4e2859cadb73fe9ce74662fc36966a4fd8d9de67702156b3cd4896914688e50a09d6e757
-DIST KQNvKQP.rtbz 264552976 BLAKE2B 15919d7108175883a7945ce50bfd40cec24356b1dc9ca1318951813c2f7a52caf27be32400b72c454b735dc7ebdf9003eb4199637b69fb97eace8befaa352c3b SHA512 18c6251f4a7e1ceb1ec022ddc5eddca5ee8c3def00241bf7b17326ce3318968ad569733f4762fd6addf3c7a9b768122d2ae95653d14c14c69b306187446b9fd5
-DIST KQNvKR.rtbw 759824 BLAKE2B 7c8a54b208e1705d977dbb07bedc4bc4dd04a4c2980aa2e4f91990428f32312dd53d55a76356c6103bcbe1c018b5b3990fd5e267b3f62b0fd0c6ee223db5c0a9 SHA512 bc0b239b8ff6753054b0fa79591c93b29f2ffe2f4f6555d6e40373ab21efa37e60cc8ce6f1875e819c231eee730b7830c86855005b33d8bf6fc81728f354b611
-DIST KQNvKR.rtbz 10843024 BLAKE2B 0b96db08e4afc55f4e15ae1533d056b13391ff2253c0ee0b78258f0e29e8465b3871b5fed2e721bdfdf9e8b60e2e78344b39bb4631e87e5c8d0a536c230f3e2c SHA512 69eac0a2dd5088895784791f60ce02624b40ef1a9726dd22b300704e09dc55b1cf7c03d81ec4ac0fd5cc8202f8163e840128202f05450f792a6c5ba85c8df5cb
-DIST KQNvKRB.rtbw 169319120 BLAKE2B d3c50146814449f508a5f954d21ba3c368265e3cd519da91d04309e57f6e047b4f6266fc729164ab274cd8421731681d785c1130b156decf1151c21dae4a7f13 SHA512 41f82db6f20031cc1afbe7fde6d0c5e76fee1ff8a3bd931f16c4eaf685d561fe4bd09ec0d9084586bc0cf556bd4b71304bf844a881bcc0fd2054108235655161
-DIST KQNvKRB.rtbz 594827920 BLAKE2B ab30f31cf1e01023e1da5e8f98b794a6afb11ff5a04619dc39553c89839215d7b57e5599245f8c466f3485ebb90e21061f4de4cf452691702f5376405748390b SHA512 44a2386e2704620008f548feac33d0e948f3997028bfa1122674e9686c86b6df6150af8ebf0ebba7eae40d247abd5a19302ff864b1bd1ff4a7b60f15fd93729d
-DIST KQNvKRN.rtbw 143783504 BLAKE2B 98c689dffc33d8b3ad9cb6ec40ae731f1bdc44f722279406308cf1c86ad1cef335ae62826aa3a117c727ab1826b4b78c394dc5162ffc5ce962b90c77625e8863 SHA512 0f3ef660e7a89a3ea660b5ffb2421006f471761f5468473c1a78b042b0c4e5cc31b029a4e705348ffffcda7445d39b90627166744990e399da91451b9a728ffd
-DIST KQNvKRN.rtbz 552347408 BLAKE2B 348d6bd701246c9ec49216b0d34b503c17262b30fa50de2ac16ba4ec72f59bd87dab902552dc077cd92683f7d517dcebaf04dcebdb0546cc6360dddc798cab13 SHA512 25854d32f3149cb2f55e64505b91ab6c50e23803f3bffc9753922b366c15900b8f7d63234a665e48ce4336745b7f3b8ff86a52f9081f09c60b46677ac58073f5
-DIST KQNvKRP.rtbw 418354832 BLAKE2B 1593ea8c726d83016d168ef175944514d15da2aa4dffb5b07f9007aa6c58642980d021917e7df451866da4c331cb990228511ee8876f27de928ed0d663c6279c SHA512 37ee27206027463d1549ffc44de222adaed59ef4ca7844e60b808419b98d396f004b192a8960dc4d422500cab45193929429c8ec433013c6b10573bf2bffe321
-DIST KQNvKRP.rtbz 1227921360 BLAKE2B 2bda0aaf6121e583304dc87d7cbe450b41db39be6ac13af0bd506498f48ebafa18cde0ed53047d0d1dc4584c6b4c0233675990bcec9e3066fa769fd70021cfb9 SHA512 e0fb246195412e8600ce29ae5e9046e11e27efdd843fa96d819b21c8a2f3e7de7fcd8dc525b510c1e76c13851f55c9e813758e5ac8c64e087098ec64385b26c9
-DIST KQNvKRR.rtbw 333790736 BLAKE2B 9d2fe14fb6c5d14bcdb92096e2d58615848bf496ae52127546749d07c6443f7c06e9477ef849a37ddb7bb81622b9ba4c18ea442b07a88a9cc37901ae004c6712 SHA512 dc90ada053b8f28a1636e339fdd72b8a57cd0f4ce6266898ffd7dd1e8040a10192be3c1ed9202d08ed6afba21ea2f09db6af0c3c6cebd4489ff211544655ab97
-DIST KQNvKRR.rtbz 394814800 BLAKE2B 223625b9950ebcc89b8fe879daebc797235123cb43cb9a584efba3f03be5028d03329a7e096425a54e42f24e19aa7f405869b7518edd6d9a0de7cd06361feabb SHA512 30d4fe3ff263eff24cea0c9d6a644b7c54d50f76d26dad4fa61946123cc5a39cee0a70fe4e7e713fe386093e5ca1d89a790bd645243a6fb34bf5d0dab02c731b
-DIST KQPPPvK.rtbw 3804560 BLAKE2B c876fc794e8f602a3a205ea42df6a14297b25201eaf824f4b7cecc4d7ec53ffe405df24c53452a9aad742f0f4a51b1b309f1358da7dd0faa70650ffe2e7845fb SHA512 ca326e62d6e4adf183cd1485cd233b08054a2b3867229117577d08f1869ad7e21c0d43f3d48e0ebe209e0779acca0f3333bd63d7e9832b4fc512266dbdbd837b
-DIST KQPPPvK.rtbz 1123088 BLAKE2B 525aeb899c432b7980192888cfe2bc510b7563558474c6c8c5e730ac68676e3fb91ce851654d15ea9d4a341770ff2bfbbf730ebdb952d348f5d844ca48ac0e22 SHA512 3df6a96bfdfdea4a1aeb56b3d40185a081f093f142b8fb21f298cc52edafee215012fadfa3bd8cf859685dadd78baf21839392057f1d8d559b77ff7d459c8aa3
-DIST KQPPvK.rtbw 255568 BLAKE2B 1b9cc7d82cfee4f7537400f57962d3ef429efcf594e9d368e5d4d4db7383f370937fc048211197ca271eef3746cc802a05d8aecd621226cf3936c2e333948c6c SHA512 ab7d26eae5bfff00ec62d39a4e4d5b6db0583bacbcb935cf1e62584505b648a565e461f88b4f73d6099f708de87d8745e256ebab23bca6f2c7371de979e26e00
-DIST KQPPvK.rtbz 132240 BLAKE2B 36951c6e97f2ac513757b5b7aad04a8b3b917198474e29eb7f3463d64b52ed95751ec7fa954636a2fef1d245abd93ce626019d0513830d360b70223df33af87c SHA512 eb5a2491c84fbc578c110a537d4e2b7a11f9d43ae97cb1ec4a6702a1a6d6fe9612339e9183e62a4b6a0692dd07caccb0b91993bbf607cb2299ce2506674f1ea0
-DIST KQPPvKB.rtbw 10797392 BLAKE2B 33b48d58634adb7257a9c748dca4d2bb27eddb4e9bc1a3b976813938350b9cb8b19c196c2dbf16cdf3ef50f50ad460b77051c8ffa8ac02b5616d0f6cc00e2adc SHA512 b32e0d4135f47380578b69be5bce39c0232680c0babf5a10b6642b1554d2d18d0a0e323d08138e41e735ba587173a6a67caa147afa63725e66f4e475e1801982
-DIST KQPPvKB.rtbz 19417232 BLAKE2B ff9fe1a558e9186df7f79f2a7da0a74f86cf58f1e3bef7ecfaa5dd801eab0b94747ed24e67925a539153810a6d77a79960ad99206270f237ce721928e0514840 SHA512 08f8a6b88c7f4c5e4504fc540a44f6ee3b4dc662ab8d2ef0c8f252d0af27c15733e79b2a8a1cc8f9e76f285cf64c6dd102fcd0fcfffac78ecf64a3c6a62c5e51
-DIST KQPPvKN.rtbw 21925648 BLAKE2B dde220a5a437965b69e766b4b5850065baff38403bdfb57d2904cbb4b748618a56c7c311d6a6f10db68609679d851e65b732841abf0da3c2f0c9514a5118359b SHA512 b7d1b4bdb1389d06234da9958f3bf84e37e97b23376adedc1a3573219334e4794f1d965c7ee12270f2dc8567a1f72c4c8ce62423a9bf0df39a791110919bdec6
-DIST KQPPvKN.rtbz 22219536 BLAKE2B 54f7681bec0a486da53f228877f2bca6dade09c47edbf81ff7338d4ad479372e59ee97ae1dd0ff8f467cc12a7b252b74094817e9c90687852b3b83eb7dd10f7b SHA512 05355fe9a6908b6535c4dcdd57d0e0bf475a6d671738ab83745af255251eb7584367af219826ce0492c2d50ace445ce3cee2f720963c0517535f41baea7d53cb
-DIST KQPPvKP.rtbw 25058384 BLAKE2B e927dc522c4342421a1d0852fb59b562acf682bad7e6cc78cac861a66e00719cb332e859aba127630d3485f0a983f26450619806a836a259489bef31259e256a SHA512 1eb3ad416d2fb07bea6aec45233aba7303355277e6aa86890e82274fe56f564848d3f4988e5ce178379accca8fa5796b29efd07c0a2c544fd2a189e9167d5ffb
-DIST KQPPvKP.rtbz 11365328 BLAKE2B c06859ea5fae8f0f2ce32fe007110f4c3385be16a59b85fe1a4655a90e14058733230b733e75432bdbc2e42c5d1217dbc2a668c0cf32c0047fdf799411a2d525 SHA512 50b74d40621b0ec179e524fee27c4b2fb17dab970bb9bbee6370dd425e7513e7978712455021c08d05a445a611b4f7d302c99c55e05e1bb3b440c820bedef7c0
-DIST KQPPvKQ.rtbw 444370000 BLAKE2B 44c8a625eeb3a80913422e59d7fe82e8aac21b31b50d9c883ffb7575fffeedf2d2a2daa8799aefa71701a7a3d9d8560afa3682d1a061b10e495e933dade7eaaf SHA512 082af773f3561406042c0cdcfb8f2c823f1dd07fc5fd4ff74993629f76895ef8525ebc98f2c5de3f0a3234757e96fb5407dfed6071c6e6ee14345547a3849d95
-DIST KQPPvKQ.rtbz 487983504 BLAKE2B 6705dcabc196101fc840b5d108eccdaf9208a84de1302b7d012b0f19491c6e5b0b3bd4e8360bcf4c9d916b0fb3ded8491bfd2ef523a3c988c6a5724fa6e4563d SHA512 2cdfc2cb9d6c3d778faa985e09f395be6959534c61b45c1fd072180dd8061461f5dc8b4b4cece8f8031bff30a8ff0c9d11b57812ba4719af7d4992a0b87d5147
-DIST KQPPvKR.rtbw 25167504 BLAKE2B e1e45a6f702595f2abf779a8ec640b93f838066ff79af3c6d9144b8f124cfe5c2f3304adcd3a454c81f76b62d17ca7f5ca2f395b385bafa2be4b176ef8b85b8e SHA512 20912209ba64b291e82985abc756688e3ad90f6e32761355ea34be243802a630b214376518d928015b6e8fcd72f86b4834bfaab0e5fcaae22ba5f2a827a24e39
-DIST KQPPvKR.rtbz 63281744 BLAKE2B 454c283cc130e62f74419d08af4477e11ac3409ecd989780f6f3a1a7b152b0fbf3b4d4e47d9c9e31f9c49695f8cc28dd0a09089ffe5082ba6d4e0c011e9d6f00 SHA512 0645af64c9094ae1fb39979bd148167c3073cc1a9e2c8b4869ab237c79333c3df1e6fe71f4d642b08dc7a8ddb326c395296af3acdb427282e6ed4e319ca0db4d
-DIST KQPvK.rtbw 12496 BLAKE2B c501572c88e9d0344ffe3a422c08775c343a9a7114f76ddf1bf8b236a66d64008c969bf76eb9c04b67bbda283a6e9cec27991c41be1165f636045b11ccd70547 SHA512 25377068448aa7f8d4a4d5f99ae55e37300397a603a7008c7c92bd49631f872583f0ed8e1b702c7a6bbb40c55167359172b2dd64d657aee6feba05fd77d620df
-DIST KQPvK.rtbz 32208 BLAKE2B c7cb353b137119f271db625f90b35ccaf278dd575bf8f3eaf0df901e8f6321631edfdeb771bbd0a4ff5664e887de0f8f00fe712c2bd468fd018b80c5bd737f9c SHA512 9a402b7738ce44266558b6e17bc631107d5dbdc5bf28126c746f6464583639a6308738df21a6b0349b4f650041673cf1ea12e18c163ae4fc48daa72dd8511110
-DIST KQPvKB.rtbw 785744 BLAKE2B 693d03a2a6cab0d85924f550d8530b835868c2a96098092d8116eb9d12bbd28b360985d062147c9f46fafd0a32c79d368b879a449557ef481e91f7e433eb2f4b SHA512 406595613177de1327c3e8a6b9d56102ee87df63798ee82dda955ed94c0bd407407f75615c57b29f51bb578095b5151699b248411a45c229597032b17a2b5c56
-DIST KQPvKB.rtbz 2151824 BLAKE2B 27f0b4019ba0f7661dad5cff15b04260ee5bf19def8a4d902e05857911a9d542406c3cfff1ba72496e6d08ed62a8e40ad0ccdf33f804d03ca024890475a2f82f SHA512 4731ced91d6e6b3ec32cd64d195513d31d9125a43b726b6d04b5f568a1da2fad03e76fe497dcfccc26af2be84092b27bdc6c8949967206460a344a2c60124489
-DIST KQPvKBB.rtbw 97095632 BLAKE2B 34b23edd62224516472a4a1769260ae41a8b9b558e1098e8a91f5d1ea4dd32682f270fe045be5afa25bfe6d8e0ad8b633b1279f4753726a5c48c8cb521cd9336 SHA512 baee730bf9c4c49e031d35af4cbee61baa915785b720b26294de28ee6e030be4f2711a9341a1997a17cf55f4366abfe5e80d043ef3b62fd8e79679a706ddfd41
-DIST KQPvKBB.rtbz 186922192 BLAKE2B b1f0a835e09d42890a03e1e6e94eb3098abc4638059abcec15a22ca5eaab4b57e7298ea35f43ee9e7675e8697e83cc57b89bb41a59897f0dc75c6635738be563 SHA512 bf1f72fc8528eb427875c3639dc3814343daf832b50bbd32dff796c1fc4d775b09113690559174f8bc4ae0a4b67ba9a2d27bd1671da587fad0b3cb011a47c13b
-DIST KQPvKBN.rtbw 210767376 BLAKE2B fd45b10fc0d2b3c019473d57ae26cac084987d69a50d8950c20ffb2e54f8732b732e7a6971ed617264ce13152e2eaeda510474a71c5f98d8e116e3804beac93a SHA512 074c26be0bf5f6967f32291907b3dc76bb6e74d4f5d25e79591f5fc0c10db562416d6ad395715e4597659cb5caf0316ee32903100f125131ec330a3ba44af9ca
-DIST KQPvKBN.rtbz 262188624 BLAKE2B a7f0440d2443ef78a462f84e96b617572a6f47d8100d0379c79986f1405bc2b006519a4a68db8f502d8bc5a450384d3f06eb023fe49489b354ecaed757740add SHA512 ecf133bc3721bec756f8abd2221adb228ce8ac23079f2d29cc9fff6f6a0134da37332dbf3eb53c7ce5b700fee5e428105600ad7b55854d9e9ee411e704eff057
-DIST KQPvKBP.rtbw 251777168 BLAKE2B 99ae690ba97ed39c51f6cdcdcc7f0749fe799064c03a4b51acbf0e40b15c8f9f26d71594dda7a55258d4fe4fe126676804a2a2e53ab3ada47e414c27abc1fff2 SHA512 af271bb877fcdb5286441b88ea450be524f3e876cd2541398f3c996767df157ed77a24c6bf32ce4b026015b165b22e600f8fdd0b1d96be4c5635b0c3956371c7
-DIST KQPvKBP.rtbz 158215440 BLAKE2B 43fb3ecced609e74e87f6e672716ee2257adc4e3498effed2c957db96c742132897db2d3cc7bde718161de3528461ad1ae31a4407e84c76f941cdc1eb9bbf708 SHA512 f54cb136e1993ab9cac0f6b23c325fd28fd49bf60f6f04c0cb54aa8cb161f464a13ffd957f4a5a94d92a697ae3349f157bf5c466b49a40f581ef6232227f0464
-DIST KQPvKN.rtbw 1694352 BLAKE2B 322520492dc504d476afd715c09b8ef1dc089bc553c43b1b100c1b56b0b7a121c05779becb0cb9a7a562ff19b2f6c572011bf9c86611ffeb0302fe0b85c378a2 SHA512 21e3f1e265d0ffbf2a9eb9a905cd2b6cc36fcf76f6bc8a53260e5cd52468576e9196c894354ada0925d89127eb5820eafd344340c0f3d4a12706945d406bac46
-DIST KQPvKN.rtbz 2055632 BLAKE2B 9763dbb8f00f55c51cbc1b38479abff806f35c54fe5b8081344784ddc8a696ef75306a0bcf07bfd2025112aebd14a326970c5576e491e587354baff47a9b4d61 SHA512 3e164609f68ad9bab9a0c64e48e99a1cea1ace487063efff3e82145728812ef201970589a35542e4319f5c73c53a017547c3dce52a583ff3e96e92dd72ed03e4
-DIST KQPvKNN.rtbw 129637904 BLAKE2B 0d749b06ed34de2e3171db1709ea7a346116b51c10fd3454367f14a07f63dd803f679d5c4db6ee7773a9a7f1ad72008cda712ae7f37d04fd0fa766b370e41a1f SHA512 9462f3f584809cd7020e0e295fe2c377aa8a3199a203ebc6f6a5a155b119b6e94ae9c852da502f58ce4a99f5b018339294ac882e2c5d6fd9835bfb7b7302bd54
-DIST KQPvKNN.rtbz 145341072 BLAKE2B e424a4e47ef8034e516c10281d15b15cad1d77c357f8b1fe2f876b89316876a45a4e34973a8c3e13505a32c5ae4a29f82e7206feb3028bdd31da33f4b276a6e4 SHA512 30dc7ef70a6968aa8dfaa5fbec3c3c6202b04d0696b66a1a9f371276b1290162f8a460a9267956606c6e976d261c38fecb060dbcf5e361395a136df5494fd845
-DIST KQPvKNP.rtbw 306794896 BLAKE2B 1eed9ee20e82f0bcfe4e1e9ba40dea06106d89dd162246d336c75a0a567b66202cb3ad1d622ab5c561b23e2fde319ee0829debf5c4457518a9fb1e428451c07a SHA512 061d4cc4f5e82c386bb0e86b5b58810160d6685fd9d64da93b8a63be1b995694ff519c1e1cd9b9dad41976bab40e30afea9a46cac2b6eef0c4bcd9af7826bd67
-DIST KQPvKNP.rtbz 131902224 BLAKE2B 58b9ce718f5e299ee63433565b38847f1ee97a9bd0e990370ff22e283031394eb58a68b35fdf08361f800d0f4159e866623e342d49b1fbb5b5437d758074c2af SHA512 a2dccbc0a33603c1c59b99ad62ac259fac89b3bd798b421cceb1a778f0139f668537a4dcbb4c6ab503698d515de7adc797b728c9306e49b5e5a9d388a36afb5f
-DIST KQPvKP.rtbw 2464016 BLAKE2B ad8c367e9d77a6b3418891ec89ba86561fca4abc27ccf8bd3acf483adbde9f12eb69831add7d4cc1ca57f022a858e714e582275f5a67f41974c9b137057e0fb6 SHA512 18040bc4284b4afee2d593f0682b04f7202b8d4f9359cace02c14e354f37b3fd6b57e8278af52239292d4e7ea4bc1380f8c87c2a3464623cabdb94f111786e55
-DIST KQPvKP.rtbz 997904 BLAKE2B f3ac4c1e0e063eecd1b4958509be0ba168877ab92bf21ecb8deb46f8b04be5fb01c70fdcc5864e2ac8d5c2ed60fdc316229f55f33043cd04c6cdd51582855f23 SHA512 2beb6cb0818e509fa2157e2b7376939369aef1bdb27faa7051124a93416187c7396b37514afe83f22befc2e0c3c7345d4fce72ac78ef35a7e1853be1bc5656eb
-DIST KQPvKPP.rtbw 120272016 BLAKE2B dadccb8de8a9114feed7cfaac7042f5f18399b20c9136e9b24f172bc16c022df71c61a5b3e25e4590a0fd32bca0b50d00a93093ff2fedc71bd9241439cb0f82f SHA512 28ce803a1db4a6f1e446e6944dc17c111da443533a2557d6d2f74a46fc718fe257c35f40c93238c2343ce61b0ef78b53cc02d0e00625c7e38deb786dd2a768ad
-DIST KQPvKPP.rtbz 37737296 BLAKE2B 859525d6178921e6abd12546ddc10a7c18407cf09c4d72458ac7e493ace64b9c0354d214048ca0f595c03fac7840349b23f8250ced249359489c508582f5fe5e SHA512 2e8cc004cd09af0de7332ee3f40731f03d83d1f1985e7244e93a737f794ac61df971fd1e2fbe74d7901f2b3834568e72ffa860308014741870190bdbf25aa511
-DIST KQPvKQ.rtbw 20403600 BLAKE2B 90b770f7d2ec9fe8cddce4b280d756fc931d430d3a9cdcfc6e26f9e2e4b10a4fe506299676661b603793734c5277e825419696c95ced7d33b14c1dfba2a40a71 SHA512 ed3835db0831dc51aba9162ef672b3a07dc8654251a99a355c9875f82996c52a2c2c6beb8c3b151cbe9c755037a34ca961b146450a610808d0faf86d32b824d4
-DIST KQPvKQ.rtbz 16695824 BLAKE2B 2ff8204eb6d3c403efc0fad60c151c67098fa460d2f9f46cea95dc4bea89442c3f2a80ec510160fc64cf3c2187ba39d8ffc399901c19d99f05449fbd9fb8933c SHA512 f111ed76babb312ba648c7f8212e3515d1e8f2fc0d9a60ff6eb1e956e5d4f19021bc2709e18fbf6c4e97405fe18702b29fe315ea6a57358c17e6f8f2a5665961
-DIST KQPvKQP.rtbw 517138768 BLAKE2B be09a1c789f208586bb38a8a193ad03d79539e4d1e064f363f52a9faceefc3e469d4a7c512b4305c83e4425b7f80a7faff4e63b26dbc2657cbadd3ef8d7e360e SHA512 b9ee321c8972db0af4da6036c63b9c7f5f0e6875c670a1ac953e0995e8afd40ef1773d6e7f707245bcc75e9d9dc68dd8cc4e7144b09f3cb624b5161253ab3e8b
-DIST KQPvKQP.rtbz 583671888 BLAKE2B e04a9603b42eab3f20a73be6201b5abc5da57994f0e2a539b305aa5210d367269dd0ffe799c26cfc4160c46f6da48b9858cec549717ccad243ab63e6e9151932 SHA512 b672c66e00f1a5308c3da507c7f76f60c272f48b09ec57d5bc8f5788a0457dfa4582022e7d220e2a5bf39b3c573360e8ddedf43f71a83996b8fc5ae2a7f64226
-DIST KQPvKR.rtbw 2030736 BLAKE2B 50de50dab44ddf88e504037575e560c9934f7c708b6c723572f5732ac04cd54ac1e6dd4757cc0d307e938e47e7e029787b885a9838b7484fd1f9b312380d8ef2 SHA512 6e7b49562fed78878996d354f4bd28c3cef4fcff48cdcec134b261011e06cc7c1964516c7c256678311b461e090085c04db8cf554e7f5f13c0ff53ef4bf80e0d
-DIST KQPvKR.rtbz 6202512 BLAKE2B 7112b7045b4ed7349c7f4282b57a289f0df5b36dddb596b2be154f714cdf7c43029ac41a3062cbfc95da6def610c8836a1af9ff78eb2d8666ad14a364f7edc8b SHA512 f244461d4b73a7ffba6787bd7f039f3663e788329497565c126eda0fd1248347fd665cca0af69cf6948dd9f8a7fe17254a285aab816a0503fc6a6a9d2d154267
-DIST KQPvKRB.rtbw 1072476880 BLAKE2B 1856a2480316871fffc32350c68b7b60a60aa22cd1f87d55f7361858dde51f5a7046eb2d593fd642d0dde73a9cb9240a154321057c8c308cb854a26af4547f67 SHA512 4dc6419ba039f1be98752f7e553de8ea31b34da28a095919c05caf631d6dcd2aad82c226260c683d836fef35deeef412a5044bf4ba56fe86b60a5902250c6671
-DIST KQPvKRB.rtbz 1086065552 BLAKE2B 2c47c00aa4e17d46df4d9750c4de1cb6cf5cf645e4139fa81a0b081956374eeb7ed48a0bbead0983f48e5030be06f3a404cf0090b26825b3aa72b8db5b2c536e SHA512 0993c7d25358575a1b0e2bebe0f573dd55ddea6b376365ebd91ffb05947068a7d10041efc01fdd1621c2fb0d70b5241704eca06421a4e08c05fc54e102b775c9
-DIST KQPvKRN.rtbw 968260240 BLAKE2B 92a701d01f46ee1a5bdd01fb0e13b1a698860e4c7c29a25d0853cb1e6ae9a9187ed832ebbf40a2edccdd234856de704b5195225ffe1773efb3445c2279738187 SHA512 1ad0c22cb812f82704ff3e79a8c3f2bf8318dc3c6b215aa3b5082303325c4f9ff7752d2ce1b8d8b677dd56099c67cf562bb5bea675147785ca2aa2225c5e9413
-DIST KQPvKRN.rtbz 808688848 BLAKE2B 46abfa1c38bf446ebe489d34d841089cf928f126daaec06da749989f648769e90322035af4afe6972a994241e24a8df61518e449668fb3ddd7832547db5d1665 SHA512 74c8f7aed0a38299c217e29f9e74b64bfa79d132c077050e6a35be3b266583c10428785b761be9e67937d09caa0aa1741f4c20987cd6a30b68967fda75942edb
-DIST KQPvKRP.rtbw 460368272 BLAKE2B 15c1b8135edfee9c8185f9294c949748de755bcc39965af113a454f9353457b1f1d8636923547a8dcafdd5bbb9dac8e68faa876921e6f4228d139f202bfc6b49 SHA512 fe39d4f6b09e489428070d7aed5da63ebb96cada7212e7ea8d4fd972dc8d12fe577d5832046989d36363915f21160e2a9f16af275cedbe2174dfc4dce12f544e
-DIST KQPvKRP.rtbz 375871440 BLAKE2B e7586285298c6183da11aacfe2f50c8fa5d08608eb7df7569e428995048e16bcb6c6d264fa4e516a26ed58252a1bd4f378b8feea8f40b5058b27dc840e4b76a3 SHA512 c08f1162a8ad5f601dc3f633dfa108ebd3eb3a2625d690ff9d1c56a6639a5f84db2c3df7f8c325997f49763392f8157a1a690ee2db99f23f55ccd6ff8a94df7c
-DIST KQPvKRR.rtbw 819463760 BLAKE2B f6aa518eb131819b236e9b7f6f188926b7095732dec0258c5d08d089bb3bc1a83be5e8f12e6a93d995bbd14432ac8148ce041d74755cdd4c1117cbf4fc843a22 SHA512 a6a0f6fb5569c6ce25b554a30e14b90c18f8ceeabc0ca809e4e712e06c6ae83a5a81cee1bbd0f7637af9e1a92653406d366ac9953bf68e8349a843ce53125249
-DIST KQPvKRR.rtbz 269330576 BLAKE2B 969e6b7c3946b45e91449c20473fc6292a604ffdbe07d10792dff7264153c3ef42426a72b4061208952350330d9049efcee833a2f518e88d7bb9d9488b35c1b2 SHA512 91c447c2f96d1caf7fb93e66ef935dc69d543dc00fbbd6f5e3db8d1b2c4e5998bb3bc62c2db71c5f50e6b41ebaecdc187f0f7eaefd4dc399aecd46dbd89e6ff8
-DIST KQQBBvK.rtbw 12966288 BLAKE2B b0015623f31ea53dc24f3ad2a1405459db793ccfb8f5325f7291abf7dc1604b978a75374e29e5747dc3893e8510891e9b4101ecf245115b411634a96a9cf36c9 SHA512 e8fdf9fe42b88d018dbdfa5ad4d0435ec81ffbe15fed6d6cae9d0f08fcfb5cede0a44606138e1b1309aebe4966f0e8fed405bc0bc43023bd142b7fb356ab4938
-DIST KQQBBvK.rtbz 27776080 BLAKE2B e6372fcab67f49357a1af9f97594240a4f3a2a6816243dd888fba190a95e5d6596ba8e120983537a619e5ae77c80e39769f23c1ca04f9160e8e427da13a99f4c SHA512 ea4a742c30f38662e833ad4c588f0b3a5c710692e388735485198422a265bdc4394bed986f64da8e58f7d5de785ff511d1ff961481acdfbe8ea7a301f7516cc1
-DIST KQQBNvK.rtbw 15510480 BLAKE2B 6cf86c52911c9ab29f204b7c4dfccb0a95f9deff99e9ef4daa1a1aaa6eb46175fb69b9b990b34af68780a591e5ba1f803dbca16e49b5c3ec7607465264a4a795 SHA512 d4a4a2ca18e71f268832e0588d40afabcf08ee97952e8827b77decb4064b69cb7fc74d7b57602f7aaeb4851a167a69aaebd4e09ca0d62bc4e640efc2311bf262
-DIST KQQBNvK.rtbz 44478608 BLAKE2B e294db36de3dc5ea4f26482bab6861d702d440f9240b9f0334be24505cd4cc3780fca038344d43ab1b7682ef5626faf98082fe7a33e3eae76f10712a41dedcc9 SHA512 ab6abd2e7a3d02d15831034bbce49da80731ab67029ff1f0e2203dc49ed99255cc10664e7ec6dedda405b449f02b1571a10bbcd4ea026bd0d8c895ada7f7e660
-DIST KQQBPvK.rtbw 54013456 BLAKE2B 3bd8620e4636b84fda0dd69a05313bd76e053b0dd8f7e9d2b7dba5ba3fd593b3f9f803ba578d00274598a0d7292acdd1d032c14843aeaaec2e2cc2429126aa30 SHA512 be418f3d835ace71ebe7fb45d3ce98e46f7faca512b1e0c30d99a346fd1e6458cf2cf3632c9af3862af43f5801c1c4afe03885f990ce0f11fe2162cdc84f724f
-DIST KQQBPvK.rtbz 28451152 BLAKE2B 04ed82cbcfe513509a5d9dbb5f763d4d020a3ce95259a1c9f6125cea391388edce56cf1cb62d573a74325d12e5f59f2aa92fbcb292d5f16b5c0b408302a7333c SHA512 c7b9a5111f3ccd7c17e67ae87a4ed12ac120ae4e7b7e18231c9c248f0dde29cccbeae348d5d9bf6eba24ce0d490540c4644bd5f029f60987e337ba161ed910ce
-DIST KQQBvK.rtbw 227600 BLAKE2B af1791da23be00acae41a7a40d2a5d31321100813d64fba77985fd30fb36ab6755e1e87fb3805012fbeef91c8efdb568135b3f975300deba56df1e0c7a347816 SHA512 2a383f057d121814584cad8383bb44dbca45595ee64ccf641e61332f88ed0c79a40ae56d98f8cf0997bb08cd01a89d69ee22ca1f11d23a036c92453a00d8f0f0
-DIST KQQBvK.rtbz 806160 BLAKE2B 4c3f8c38fecd88f69215b184992b45c812fa4320c588b382636147dabb8fb31767bf252663b17b113a424bb9b2a4ec56c972e839c78808a16e8eb4820fe91e8d SHA512 c450d842da5f580c67178163f4cb711709378cdcc5cd9e8637997566cc78bf4559353db51381d246ad25a382e1e01d3e7464837198abf88bba64b61f67e62ab6
-DIST KQQBvKB.rtbw 3696720 BLAKE2B 1806a568181576bbc633e423cf29aa3478c60ac3a6010ef598a2279d6762d2fe5a73fa8db747718c2264b3fdf71f1407f3bff3ebbe9bad09bbd76133d656be6b SHA512 1570bdb0712ba1e66afa1f41e14799264db1665561755b6d6715526b2754101d565ab2fe0c0c11ee3cff99793c8ce9e28478afe418e62cef1e9717586ec2bcb8
-DIST KQQBvKB.rtbz 41059856 BLAKE2B 084bd7c2e4b3d12f88995c83ec5a4eee38f89009b89a1219bc254b11c49170864b5308868ed9f9e5b9765400334701f2551819300c2b29f114fbef3fc497464b SHA512 740442b10ac1a46c29564e68e938e1ad51d6eb4e0d86bba685e45e73ef6ef4fb2b619865cc172f94f9065a76f909a7499b02396f778c1812e0ea4e090618ff93
-DIST KQQBvKN.rtbw 3842064 BLAKE2B 46fd81b161c50ba62288004cb5fa1f1bdc28c5efdb35ee75b62edbcbe41676efc58fe2718d6dcc83230f3cb092c01f7f8bddb4a4c7f370fd5b016314f0fdb19a SHA512 1bc775323a0ae3c564329bb3bf0a3355a1c7faf2a1d427106fbb099e9feeafe184e2fd9292df3ff8570722c30dbafe408311287f934d3fbe861445b005a160c8
-DIST KQQBvKN.rtbz 39995408 BLAKE2B 0f9955a27cb6e1b164139be76b1931e16832f89855d00556844c029c7b9e71f2df2d27b7fc50d436a6029f86eae51becf23eddc6d4da2b0acdeaafb3607a9fed SHA512 d85273fe401457ab68c7ff764b3550430619b2ba33736af27758ffae8e9bdcd0183d64c11a460a3ea8b615dbe6e509e9f99b31642bd44905f4c94f1545a2d049
-DIST KQQBvKP.rtbw 19635920 BLAKE2B 03bb22403fc77efe9c53e1f669cd4601b6a540144ce5286bdfed9fb743088609c6680ee0248b2a358628deaeb8a0292d3e61d743f600f427b4d01d40925679ed SHA512 8a19cd6934b08bf2a84016acae47ed9d8a635babbfd8233b8a8867392268849b510a58c34f89e0196e04a8f7ad4d1885d9500df6d0325945dd9dbc7697eb26ff
-DIST KQQBvKP.rtbz 75192848 BLAKE2B a7c345b20d503ea691e7e25e410c59aa0745f155b956730d51198fc8b453d68f95420ad26cc8e803928c13a8d739258b778694adaa9199e8329a5f6e9b1c1b6c SHA512 98ddee5b453be60a70e2cd8e2cd62b8afa80ce16a8501686111915e1cb7d23e1e9bd3efd19eecf9007829acff705223563eb464ce4a2d114abc411edcbc416c2
-DIST KQQBvKQ.rtbw 27381712 BLAKE2B 184aaaa169333299203bd0bd7c50c8827ec5b75c09b84d2ee663930d49821be2216ca375d84403a72cdf297eebd71f41c30fbd250a79856223980af13ef0e50b SHA512 51832aff05af51e41f339e2047a7c47ef0d7826025c0216be67cdaf8993b6d9427ffe15152df64943b909c42748cbe52aa596e87f814a6902e63690146e8999e
-DIST KQQBvKQ.rtbz 96823632 BLAKE2B 9a0b28e943bf0b284aaeaf3fbc9d7816949d4bd4907bb1da7562776eec8a663931cff471f1736c5a6707be1fd1d27eaf66084057926909011c3eac10d5e9e8b2 SHA512 e60b326a7c38f22537cb1835fab4bf659c596b8a7d2e1187f5f19241712ec8367583e7899eaa4d77e75eaf624fc5494a863c1a75edd9e537f1eb5c6035894689
-DIST KQQBvKR.rtbw 4633680 BLAKE2B 27208064759e57f9b79e2d08031a01821be517b39b9deeb0636c7f494b364aaed32e694fced976c0d4eafcef6f9eba6452bd6e811b8e079449a1ac05e0c81590 SHA512 5a2a5850dfff8e1e4a83a711525ebe2495b2aeab43bbdbc3725b317216bd6102f54ae5e23a37bf9969c586f065dc0d589f3c7041b8006db3dd02314bb35c0937
-DIST KQQBvKR.rtbz 47924752 BLAKE2B 192010041500a0d63643e607af076f8469588f9eff930c26fa87e683ae6e63d24c747409daffa609c9d6454a2eb1c46cf2f538c498de10c39aeddd198e18a0b1 SHA512 feb799754d5a9064e1ebd183298d7ce971b0ba773a1872c4490e1d3e93358ad8ceefef2820661c2fbefadcdc2354aa5b56f1c210c7cb235810cce42ad98d4a5e
-DIST KQQNNvK.rtbw 9964560 BLAKE2B 5c16c17e8289296a3f9345cd2c6a242bb5e60914c4cd9b3e8a18fdea5f81f6cc3dc4f4d3399d87db3139c9db0f53f079975ce71a58375a189ae556334fa8b379 SHA512 cebebb3c65bf22a6abf18c2fa985913c268d24dcf62c3f9aba4660726e51fc362fc5efb0ad81fa1be53efcf7e7ade1271877bfc01717cc5d80f77d80c0ce8426
-DIST KQQNNvK.rtbz 35234576 BLAKE2B aec5a3313893b17eb64db23f7b15429f4c05c7d3533bee2856d8eb679c767d91c8f5b4a340c7740dd1af37497c5a04830ea23ccfb24ed82e1f875b55f1d71220 SHA512 91ff615f47d93842dd0048ca3313ad1b5dc1013544cb33e5275e22fe9eb3e19e9df059756df67ac25cdbee4ca25c1a7626acdd69befc4fd0795a5c2fc9d7a8cf
-DIST KQQNPvK.rtbw 41297424 BLAKE2B 4ea1c5b0f3bf93e631be54f9cfb9bec5492f3a76456bbdde453656b02256c943f14d9f6579f2602874be8ba2e462d747f3be56fcffb8b0526a1d9394b91f3b3a SHA512 6ddaa2cb4d37b6935df8a0b7b36d2f448fc2ae26d1b549bcbc33b1888c579b2c4fca998af1f137632746d89c7ba873304157475be74799a5e14046f2ea70d30e
-DIST KQQNPvK.rtbz 28779792 BLAKE2B 95d2d3f84a18fffca0c9e757bb643b916af193713c47dcbf6a31475b5cd703dbf1039316ff7c1a5edf39f77b7e8cfa885a5ef10264201fb6ba4b946632b92868 SHA512 2234233c92154d4615c20c74fd687401692e4e92a9382def66b948aca2ae69329c5ef24493caef587c4256ce967b42e7d732281637d4f8100c4242a283b528fc
-DIST KQQNvK.rtbw 186064 BLAKE2B 61f2a27eb96b3f1eefd584a2d76a84175f4e9b9d3cb27aca8c332aaac233ec1a977fa23953579f051ce68420b32ee5c2466cb1abb9c96e856137d314bac0c8b9 SHA512 94809d57a222359a0941be175683afef67e41c0ce95c90e5237c04e74108b4079ccba1c57ccc923ab3a6d7682243feb7604e49d0c387f3db5d52aa73b9ef6bf2
-DIST KQQNvK.rtbz 920848 BLAKE2B 33d77057cb9900ac83af7f3db66580e4aa6182dea38aa195a76d2d4940324c858823d37433636603e0f24646055be68d65197d83b83a9883abfe7fc4729ca60b SHA512 222a37b34b2157c8ff6ac3b34a5c1827d3ec0c3578b0380eb1ab7bc2b9add78ea8918cffe0b35ab091ab9f45db27c9ba01404cf3f6d9be677759c21e2dbc40b4
-DIST KQQNvKB.rtbw 3681680 BLAKE2B 7e01b1af80b308fcbd5f809dbcd0cfb0f9d14d396cfb3a76cbaae35cd28c9c5a2ff58232fac5a2d034b83cd5a6e53797e6bb751085742c4e795e2e6d51f4ab50 SHA512 f8d2e51c202ebdb54215235888d318c0bd7da1172de3ef9163b0da346ba2cb871d71c2eda21d614e8db2427466b5fe552a964f9b6c8c6d4a3334089675e431aa
-DIST KQQNvKB.rtbz 39980816 BLAKE2B e2091048a3a8fa83fc0321045c8ad6031f5b659653df5eca531444b7f4ae68329f4978a4687c3ca3c99ff66bd32a7acf2fbc3dfff652c0c814737c55348efd46 SHA512 a4d93a62cbeea18a539bd0838f469d447fd3835ede4164c081de320900bdc8db39c7b9cc3c760a42b265a4f85358158acf3fed73efb8ccaee84c8b0d47becb51
-DIST KQQNvKN.rtbw 3663632 BLAKE2B 3916cea5b09a3aa88856425fdfa9216bedd31915062d2f23905c1ab04fa9b22844e4291dd5db260d4b5e1c410d1da1b493f665b66941264bed3684de916da370 SHA512 30200725f23d102377d8ce2d06b78aca21fc5c66f11991e4de51541afaa50b6ea215cfc21f524620c1ff0e12285cf31209c2dbf9d7e045642369533563608460
-DIST KQQNvKN.rtbz 37874832 BLAKE2B 26bc9680ffa74883ae4a6737ced7d33c30ffe22d7b206498401aaa84a460bfca60d7a63d0bee391d7665a632cc8c5c966c672a899793747cc28ad834f9403cec SHA512 aee639c714f5a4e805329592683138ee2ee463e2e6181affc6ae7cf052460269178205454eb4fbf1cc315069171dcee1dc66466b5414992434c12fe19be640e0
-DIST KQQNvKP.rtbw 17729616 BLAKE2B 2cba1d1174bfbad20ecaf80a6bd10cf1de5bf06a3413a837c46f39ddef7068af871b25e856d69847399e7b0173d20c6267078ba99c2a0aa8e7d6ac1d9daf152c SHA512 8d8f0d571aab46d8a2405bd2be62cb36642e61a6928cfa5971e60d14604c05965605dd101552a811c87859c125cb82727af110d8f564e433e21ca93bd59c4abd
-DIST KQQNvKP.rtbz 82573456 BLAKE2B a2d0b5cc4fdfeab833f62ec90bc6c222d023dc25fafb1df822b16bc753ade2386ae27f550d09cc43940acd18fce3fb275a0f3dde5f6842a5a2f53a7e88be68bb SHA512 5759ce9b82b8687e5f8a0528f7ebafca3ade5648404a046c5f98c295006ba546f2f4af5e643744b939596bcc87773249fbe36b733807f247097b4532ebbe240b
-DIST KQQNvKQ.rtbw 26125776 BLAKE2B f6a70b661b370f9142d4c70d5b6e9c62d82eac0630b0ffc1c7b7efe2eb2a5665b31c1dec847c5657174efb83d2b979c5487b081a5b2213c7ec064eba896a2bd4 SHA512 cb083dfdf82c89c5a8f6893cc63532e44f21e8112c232675f6521ee4911537c5c70dd2cee838768dc1bc56f437b356f02d9061e6b5a3820089c6cc5f313a5156
-DIST KQQNvKQ.rtbz 102080080 BLAKE2B 3c9cec283f527109b613fce5d2b1af54181fd7cc73f8dbee634397770d6200a33cc7402cf43ed659816246f0e44825289e1ee077f105c316eeb0ed654437dc06 SHA512 2bb75939f264312ee6fb2599de487e4467dd2c3b936f70b365c70901050e31651d43bcafd19b6587a54101ab80563b1062025d9f79a95c9d062dda7b1a546077
-DIST KQQNvKR.rtbw 4431312 BLAKE2B 4830e374d95bd667fefa252929657a3c060c947da2b84b7232bdd22861988fee068fc640fdf414a6fdf1f786b9ed3f49d5961d012dbadcab49e29f64095a983e SHA512 9bc196ac2e8ff96b2d5d86c6ceddac5d6c2f435dfa538a16a398271b56ddd414100aede8536fa3a519f75b7951bddf23aca31bab6ebb9eb24d1f3a3b6ba9d351
-DIST KQQNvKR.rtbz 45255376 BLAKE2B 15e72875c16bb89f636f390168f8a3cbd9dd797745866818e1b14692608d7120f5d9091ddd2b5902c003a2df460bcef6384184febf87931de5ac17eba48532dd SHA512 df645f84a8b94b986d3dcf7db26d49d316733cdcfbf858000f3024d65c8a67022cfe29c009dcffd7a131693ea094eb07953a23256496cc7b20f18bf6655a6ee6
-DIST KQQPPvK.rtbw 15839504 BLAKE2B 501b1b56b95a02474139ca982cf0abeefc7eba4e1753d5cdd9a8ce4ca17040f3e8334b11a47545d42f186aed97b8a61d4b2161bc8d5f7d22861d662381ad77e2 SHA512 b24f6a0b31e157e3f5f1335a699b951a8d8fade57caafe8d4e99705fda76b20c1cd7231f70d2831135fca37f6b8aa62d46f57d23dca28ff7f2656eb99e6eed7a
-DIST KQQPPvK.rtbz 3410320 BLAKE2B 6ea43068dceb1bf75c6291857b3467f6000293ca94dbeaffea022d79f512c119025cbe382a1e1c0d09daad9576177ed45730b3758848c6ad66662ca1d5d0fcce SHA512 8df5dcc179a9fc589661dadae9168336eac23b10359d4e62bf8ef39b9bde0fcf177cf43620697c5f338aba15cccf62c058eca9b5d0ac11ab92937c0ee8304bb7
-DIST KQQPvK.rtbw 725200 BLAKE2B b85be9e4c15726fa8f73f9a9e68eaecc3b034c351a1ab9b57f96eacdab62b6e9db46567d2de866d10649db1a91bd3e183bb4cca7dedf197285f2cb771928c0e2 SHA512 30c028fc3faf0ae5ac0b9af8c2f8247c15642b47c855e519802d7e43a49e1324eb767ba7942d26e16f1eb6d4771418bf65373fcaf0a8e04072fe9db1c82c9a0e
-DIST KQQPvK.rtbz 583760 BLAKE2B 165fa13c06a632fed2915d11a292911eb56a5a21f343eed4f428458feb9e588e4602ef6122b3f78cd94412d7fa3e5c3a8d615871d967d908c22af93d13e7bbf0 SHA512 4a251570abce13355e86d718ba2ecf642ba0a39e3a7e0880883e5279c7f75f46c62d37a1db888a8e629176d9617a03611cc8d968a9c436ae84d5670b5c71003e
-DIST KQQPvKB.rtbw 11027728 BLAKE2B 174b6e005862e0427d46c3b26d7abe56def0d7560e391729c46263c4273bcec7b1cb9c2f9c0e3bfb9dd3667f628f45dd48af655e284ed052ca16d2fbfc5eb4e2 SHA512 639e423c1ce06953e24b94e9fa7574e02f423d78dfdf23a5369c82c4dbfa73d826d936c2765282485a2900513d138b4f6ed4190900ef73440afe6dd01b846089
-DIST KQQPvKB.rtbz 72137808 BLAKE2B c2d2c64ea06514accad9731c60f581cb7b2a5e2d459817a3fc3596caef5d8f9cb829f61376bc9f433c9acc6a207fecebe05b429da8fa315f0d8a286d51571980 SHA512 f6bd1e34167d15bd155d722f807a0e1459de0c64fe59939e4bcfb2fd84b8df531027ad2b164f73fd5d142e60c1783c99ae66c6f96d2771c06fe0655bad64cd21
-DIST KQQPvKN.rtbw 11126992 BLAKE2B e6ac876a1cae607f0d97d6ccc65d4b1e5f1f17ec115d95d04e92807d941285295a2c16c0d73e0484725dc98d4554b6ddececd345e29ca3fe4436b0d296dd1113 SHA512 1fdff44613b697e670c4374473667c35f811263e6a8f2981fb72fe72045a7ef8595152e0a94c56b18ce9bf378a7d8e566d1f1a7dcf9f1fe24e9764841a696f0e
-DIST KQQPvKN.rtbz 61847312 BLAKE2B 66830d737c167a529a63c54325dbee7a8a7e368b4669401650a861b8cc6e80ea1cf1f8efdefce97474ce6c82b6473e41b58493961e948bd48286caabeb31cddc SHA512 4da634a9c43f895af1fe9af7dc088a9edfcc0e4f89363c0c9805626cdc0b6ee75838479c583c480f4361db9456da2cbf9ee54acf01ec6f9bac9a4324a0e7b0b8
-DIST KQQPvKP.rtbw 14764304 BLAKE2B 95e48a3e7301044e1c90ca727c5d75fe531817a4e35edca8827b281d318a0695c07ffaa3bcd497521904c8314defeaf187f6761ba5bdb108a30ab96c40a722a4 SHA512 caceb5fcfbf31d642c154e75f2a75297915b823974829b51d4663b7c2762db2865682a1a221c7369b95b30a8dd9a97a1640a8a75ec3bb1dc6dc9b96b74841465
-DIST KQQPvKP.rtbz 18473680 BLAKE2B 21a878791afc0183fbef3588892624d4807d4f075626abb3624889ec94aff66dd84ba1520cd55fd319287ad7fe418335b0a7dad1b6386f6b7eed20fa90b76ae5 SHA512 66967c49fd72baa49c6ec9cb9832f0ce41c566763f116d72b055f547e40db5bd67d5852667862309eb950248c50e8bec70c950bf58e666a21f70dfafd2df9aef
-DIST KQQPvKQ.rtbw 90133008 BLAKE2B 8213af156c471084d0ec4f3ded9986cf4a11afd7a91babd58ac3be7ecbe16d36c112967b79199e756dca90a74ac1a51b5e25a211c2282ee675f92b0db8ad8a05 SHA512 d4972ea75e175fb146e80783c1a80031756e110d80f0b341c56b8812f0133243c682bd50e7261bdaed8d6a5255bbc02f00b4394b98077d90d49c24e1fd080e17
-DIST KQQPvKQ.rtbz 274515024 BLAKE2B 4348c8be19e822f1c125332ceeaff5f361ebd49bf7bb9547be5e69c713c8f5983b2d3dae4ae8417de098180106c66b70a7d644d7f1526d7f626e6c379919d00f SHA512 5df61ab591be04b35702731751401fe7360c5c1d0ee37231fabe4e723091a1145ff44233f7c19bf9fffd07c8260c67e4edc9e8d272557a6e930d288c1d7db6ad
-DIST KQQPvKR.rtbw 14401360 BLAKE2B ece80b97b5b7a55e59eeb482ce4148f47f0b404f905abbedc5618e5a61664163da2e091033f3ee13c0d1de54f3b723ad6995c1347b60e5fd37424f535f206a30 SHA512 04d1fac2eac00cba409c0dfd630ed1476ddcb266bb89234e38cede4b52a0587244145a36893dec01c90a3f5433472f9f386819d8dfa76a1af72f4ca1236b4b96
-DIST KQQPvKR.rtbz 100603984 BLAKE2B a62062158bbe6b59b69a7aae041d3e7a6583315b968f16f994c9e54f4d4cf12de2f8c7e516befd3a91f6d2648eb8b08101a732c2bfbb1bbe416a41f041bc8194 SHA512 051549a0eaf072f054bdf2a2fd194df802cfa003ed368ed7b228d63bfba96e85720b1928e99e166adaa9b42f37e221507ce9812a1ac674bb0e4e55db7a78afd0
-DIST KQQQBvK.rtbw 6620688 BLAKE2B 57f75a8a73607165c75c8005a511a004c73fcedb2a45d9652696b07538b4a3cca2f167ec4b124ff9a98ae546123a370a322b3984fc96f3b1842af4460ed8db1c SHA512 651f944a6aaba9d2950c2fe69e0623bce7069a7a9a7a58211c3ffebf8936c398c84a8958a0e71e6fcb3a9d967bdb829bcd09a1ac62676fb5135e969883bacc72
-DIST KQQQBvK.rtbz 7731216 BLAKE2B 017042704e35a9ce2a25c1670970f3f2f1f39c86ec79450ec2886fa5292cdbde216eafaa436fc4751d4bbae44e7beae2d696cdf4a1a94a6f1365a61878cba6c0 SHA512 b72ef48227a8cf677ba894b1a470e56f45ac2ff9ef3b2ea8600ddd525b3fb9513f4a7e54459ed86aaccf9a9994ff60ef5a070a48852ed19ae9e11c6721b5a29f
-DIST KQQQNvK.rtbw 6120912 BLAKE2B 3502a2f8868e58932a8d0ea41929b5f52397652a51a9b5b1ab8df1a7f91382c6500edc38d2cfd4bba23a012caa57a26b182d85dcf7ab4fe1fd97f0e26ccdfb50 SHA512 a76a853f93038798fce929b1a3bef9d3a485b2e1e5c40ca63313f0d741d58686d584f1efd9e1e7fd69909513d3e06593a6cb53c44a949660e5d75827e93d736c
-DIST KQQQNvK.rtbz 8823952 BLAKE2B 3581f7edfb228397a2534c22df4c4c04eaadeb5113c8d940f7dc248d9cf409dec22774d513f17d844a0c5de99ae4f22140664bfdd9860f69c359520ae3863e03 SHA512 ae77e4e05f4584d32a4866ee0db67d76f7d870a00a56d8e1e9d462145c0074703e971870677ae5c2785a1b9b4999b0cea7177a3ad1aad7a54c30b3aa6f263cc2
-DIST KQQQPvK.rtbw 23528976 BLAKE2B 8d8aecc9c1aa3f162d833da26933b7f6441b70506c1b1b1d725bcb241cf6ed3341d024f71a4a56a496f02b02c874d076d9351df41e928def85a710c97016d76f SHA512 cddce71cc01cc96735e9c85769f59493e0475ae1ab2545744992e1c770e7920b4f4ed2ae3074ef8073e999296bbaf80eec9e6c8d5275fb2e93e9feb750dd92b1
-DIST KQQQPvK.rtbz 6752784 BLAKE2B 5db2c40a70674a25910661108878c4a5e5ec0b1eb33557d3f7a45d3c29fb66a72867b4f1050ca634dbef1b5265c5dc4c3292951b986cf1c37deb98b37919a7bf SHA512 a062d61474d319604a1b488e8f4db4d87873e01103ef1d996798f3b61eb2a4c6a02075790ee15816b1405f8231b6aa9995355825552ca4b9266df1202b81bd21
-DIST KQQQQvK.rtbw 2894480 BLAKE2B 1c9b4861b128713a0c13818d2730bf18184f153d92ea7af81b9837b6c6df1c2ff3dd4ed1a42e934d262e6849792598a0e9cd2303a07a72a52f93cd624675e59c SHA512 600601754691dbb098a83fac29927c19329024ebc7c96bb6b6cfef9f472d043b9014422e1cc218fa9312a7a181a47050a03e4d8bda3fb7b180039bb01b33fac0
-DIST KQQQQvK.rtbz 1321936 BLAKE2B 8a9fd38928a899cebddced02ffab24f940ed27e498a97c6683f02733f2f83d458664727f58d5370463dda58845d80fdf59e7870078b28a5e2f3d3cc5b5d9f600 SHA512 6f4ce1dd68d0a6c91544f324a4a155ab5035d35ad289da0ed4fe96b237f5786684f442a29500613b33b535198c69b0765acbf02995e0cdf7bc5465166479718a
-DIST KQQQRvK.rtbw 6937040 BLAKE2B c006e32fd19f0074586d38d2a8d4603624f645e60318acb9c2390cd45580161f8ee151d631eb1d6237eee5573ae84af812f21e965ffa6972a44d27f7c6148653 SHA512 29b598f5202d6fad96e1bbeb2c9f06feb099b159a637e98d265ae26c675c0b7e32543e6e899b954b1c9de75fee822feb1df296b6602d8e7d73ca3105716eda5d
-DIST KQQQRvK.rtbz 6075984 BLAKE2B 110bbda2e9561607d07b7217c030be6e08edce253081c2f3310017b90fb47469f5fb62e68fe9d9875595ebeb5c06abe4c44c44c066fc670b045eed9c38fe69d0 SHA512 0e249b02e70e878c8dd46480614acc4b4eaa97c68c483be79d5f8592a5e364496b7ac939586b21374ede8be1e833590062c2f67053f9a987b0e342de45bbc297
-DIST KQQQvK.rtbw 165648 BLAKE2B 5596c217af8e7c9380921108cd5c2bcd842461bd0673253fb45b0c6a1472695cbf0dd6b61bacbf3ad25b8e8f7adad2dc27fb751f0324e07a700ba611cbeced1f SHA512 d66b441a3a3007d57df8b9c2ba668fb8b7b02f2e3bebc2bf38ed22c6c8381f9e339d3e88994ce9bfb0d3b75b94f10d6e5c35e5606c2b8d48b122b9deb66d7cb5
-DIST KQQQvK.rtbz 207248 BLAKE2B 9f6e2ab21893ce8e96de414dad4abbe33a47a580f4ebf60e4457b4c664bc986018a672b220eedd5744888022100baf19bfcf0075f6ca71c1cf13c042daa3b279 SHA512 553e95ed800c79fdee2fc86dca6bb69749840ec18ac22d461018f54257a38ef04c178b1942e59ec3554b9503ac825a19ccd7dffde6d96fd5d2c82b8113cdc464
-DIST KQQQvKB.rtbw 1338512 BLAKE2B ba489d07f9d44840824e6cb2afcf57923e23d4fb3be14c7548f4e591b6dbc0463c908b72268224b258d5f6f45e376cd8a4508308b138645ab92c9d9f03b21986 SHA512 7a438ebfa1babc706377f70057301b3de3ed171be582abed9634ace24310ab62d7f8403aedf0b08f315d003d5b8e506819f5f02e5f824b0b33318db745b25dc4
-DIST KQQQvKB.rtbz 10438160 BLAKE2B 93b24645eeec4429d7018e7bbbde0b3a6b96552443cecc8dd41fbf3400d7265fcf682c9007c6356c3e0a8e38b5038fe66f79cfccad6d2e0232fbb0703347c342 SHA512 c7077c66f885666bdd5baa88128a757c4f98eb7d6d419e4e9d7ff9fab67608109b337692e4a15e6e8e5cc06aa17fdb7066a6bd04a9c646b17f32e0818dba0a88
-DIST KQQQvKN.rtbw 1397136 BLAKE2B ae78661f19a73c19578b8e73d0b14ef18fd98413aa76998123bb4cd3e08bf6b3d9dc00a57acfa42a55f50d4c63f8f8aefdd42e556fdf1a0752f70990e7974746 SHA512 64a9d759e1e4e14893ef488209bd9fb0b313e0488dd95d62cb55f4cbf3db87712e9a18b3b1e260c3ed315a168e0830cb0cd4036e2a6bb9e6d74db05c7f1d2eef
-DIST KQQQvKN.rtbz 8950288 BLAKE2B 9cb6ea5ac69e6803a6eb2c5d35a78835c5a6b1d6e380d585aa52b2f407fc25aa35f949f7b8fa150da7b5eaca7cf4f06df2bd49a6aaf1a5a28ae2f39fd0760fb3 SHA512 28e7aa8d6d8b62841ba19066fa9a2df140424877af6f7192b2fd80cfe06b062db8eb1ef9e6131d64a13d8099751c78d272f7ca02183cb84d0e9d74d06dedbc73
-DIST KQQQvKP.rtbw 7599184 BLAKE2B 40902290004b10db5648422e25462c148d31501cf4ff510df5c8da654fc8a11051efd490c3a79214c4509c1d259af822b2f39f92553f54f32f1f760760d87a4c SHA512 d0748d573e35b307fde399826f105f677d05b0a5ade393d05261eae2a1f0585c6b6f124b9e276db2f137d87964939fa03d935f143bd025670e2a17464411388b
-DIST KQQQvKP.rtbz 12248720 BLAKE2B 3f1bd54b89ea333e1f900efc3b7646dd0987596d03ea372ceac0ea772dd46abbcc01e2c0559cdcdb906f151b8cbc1a8a523c4a8492022f40796eac47b911b29f SHA512 8771ca616b6d9eb79d27175c3e97bfb154d7654dfdad17087a7436249073ad9e1882fd689f4d73a492778a4f1294add7ee6a68282f1c6a588eda8fea5c1b6bf1
-DIST KQQQvKQ.rtbw 7878160 BLAKE2B 0833301456bbcf821e43ce2fd2a994ba2f3387fcc004c743d4fd4e86724a290df3f6965161d91c4769dde82974f4f148ea46495ac4880c2cb592b4ff5be5e553 SHA512 d5297e22318d6ba7ca6b728301b9c23480269b2d209fbb9068d42a2e4d0ac53f1963a8452da63c232d80f4e8474b13e4f94fdc6b31cacf1fd087d930c71644d1
-DIST KQQQvKQ.rtbz 15919888 BLAKE2B 613396a1c8f98d6a99a6d7b843eb30815b8e48a5f1d59dea140c15cffe6499e11f4b6ca814a2ce377d191b447c71c325ac0f9c80ea658efc07fc0bcaece213f3 SHA512 726db4b12fda74538731498874803dc740c8d9c2ddae0438a940f943fef8b589edf970bb6fc08e7e7897d8bf891eff867128311e145ed0274afbe35cbbe6af8e
-DIST KQQQvKR.rtbw 1516560 BLAKE2B 188dbe51eec4676102b51a4658e59fc075bf3fa21d42ca305a14dedaa81ff7ad4cf998e2e2aebaededb15a9857d37fc1bda543a4707a57f2d6b0ef319184cdd1 SHA512 68ff118e505aab1d976d4eb46be72378634c93ce4ed2d7a29a6078e4dd314cceaefd94fdc49a3e9fe84b94e01456238c9ba61fe9a0e4e65871ab0099e44708b4
-DIST KQQQvKR.rtbz 11880720 BLAKE2B 627a888c998a7d03b772a0c77ceba7d41c1cf7eda9965f5d4c2ec93b8c5bfc557a6fde39ae84687153c2538f126abb569b8797f89c0c7b22ca3aaf5b7b3b9f1c SHA512 a9949568170c8e396c221bc11ecf638cf214207e1120f9de0bc9b9b877c74e5f6792fe692ebbd9ed2713e7442d0a3f171d1a7f35dce1770e53358d61c84c91da
-DIST KQQRBvK.rtbw 17723856 BLAKE2B 4dc53c4d588bae01fc6cff3be95128a076bf3c0427ecfe1898efe10365087a9c4ecf1cbdbe968b9f91dca4b31c0aefc9704f39ef5ec9a96fa15b868f52275dbd SHA512 38f05726297107c8224db0a4783eec5127856468e0f52b541e62299f75ffafc409ef70b5d7e2d6d16c4095bc0e5a07bcd3ba0b6f70c0032ef5e83744de80efcb
-DIST KQQRBvK.rtbz 32904464 BLAKE2B 2a08fb7153b9212499ccd371defa3f553c39360be260eb6ec69346a2b8bf4e1296f916eb3b574e0811c80e793cc49a78a50abbdd900907c500b8da9f668b8fce SHA512 cedd6389f3b825d1e9c0d075edb7abb13f3d741edfb92d7c8f10d4a7f8a75b283a1e47f346e1292e65ad6a3923d3422aaaacd53c89616030f5896340728b5ba3
-DIST KQQRNvK.rtbw 14773968 BLAKE2B ee4369edf73cb016b917e5010bb0b47356a916040c8bed6f9376b9cd8c11d07936caeb246db2ecb51d633decd5283ef724a63a0afc1d4cc63f6092e3dd2b65d1 SHA512 9d3bb9b7e1bce1ff78a859e77e7efbfecc680b657ef7ab01b6840956efc29d7a366a1731b3786d585305f6fe231f556984d4bc75f337fa247e9b723f76b53df7
-DIST KQQRNvK.rtbz 37564304 BLAKE2B 1d88c94139e098820acda97041bbc434e7dcebcb19ebeae460bb27d8a99f451c22c50db7bdcf8fb6713ecac18613750a4ebca249540559f9cc69bb449d3f2864 SHA512 6206a483c0f5c13695e91ff04d0c7f5b9b31da6055c5b02e590a2f37bc0a172f1fae0f6cd7677d99c1a0100ad842340c7a066fae8a547ba2d91f71607207b2c8
-DIST KQQRPvK.rtbw 52913040 BLAKE2B 18a43a39127fda891148eb76aa1f049192d70fc45e6598bcfdd3721aa966836d26cc6f064457ef437527888b6feadd58b8e74f395785cdffa03a69680727486b SHA512 72d4110c71e125ccec7bb9a9812ef537a8461e96fe7b13a1d68affbe9f51a1943f2e75bcd80b0314e01769058259265d67d0357e2f32cb94505383c089a89181
-DIST KQQRPvK.rtbz 24384080 BLAKE2B 6b701a4ba0864ca381a6f35fb45df5eaddab05a0714f6ab0708074bdc19af0ec528940a350833f94474d6ce47e0d784b037ff96d7fa95402b86402c4d3427482 SHA512 f671d738d09b3d9c43df3f91a626efb78cef71e61e0270d4ba9aea11b5705b93191ab8fcf986a885aeb91a9c5cdfbc0c3c2ef786c2757671323d3dd42828b966
-DIST KQQRRvK.rtbw 14424848 BLAKE2B 808d115677e9fe5f12ad9e15cd35fd30476308a5de69662d152fe4528324acfdfceb8f2f0bab73369ef5ad5a0f6fb5386dc1e6328d39b4661387a51c8502239e SHA512 6a9590f94222ab99fa81366ab571cac3e5f158552e64c524ad81bfcb2f0800ad55f64f78ca2713f7dbff3a16f93a4f397573fdb5da81b0dbe2739e229df8a5f9
-DIST KQQRRvK.rtbz 17762000 BLAKE2B a8411be8f9c5b25e5c347d2a1aac765cd44ac83f21ebe763d3ac6a5ec2edb9659bbedcbc41afd2d872b3e5808177b6e3138323880a7584a63cd9bf3eaabc110e SHA512 267e82813bc3febc2f0a1f97fd68c6d92d80b1f9e117beab2306691c78ba8eb2e4cbe8c7a5510e0f11046fb23f6105f286779fa0e3427aa115e8c13f8275925e
-DIST KQQRvK.rtbw 247696 BLAKE2B 9cb6fb97b6e6271cbef4d86a1db35c8ae387cdf1a9ead6ed2dd84c82930aee902e65be7e6efd5e1198685eb5377d1182b61d2d8de3b6735cebe99748743e02b8 SHA512 6021c7a8d54ac712aaf14ce0698a72db0a0287b7658e43c56f02319fae0c58f2e471c5ef08eff6f1bdb3f1b21cc52353414774f2a08a14c64c44146ff2115a11
-DIST KQQRvK.rtbz 610512 BLAKE2B 1d39278e2471da90ebc71b4c0f920fd00041479280e37d42241f5cf6e67ae657d8e7ef2aa1c8c50148f432f70823cbb52cbbe0964e369f244466af07fb1fb855 SHA512 587ff9272cdca36035df57f3f65a6f39c21d55b8b0053094de8a79c93dede01fa69a86ef2d9dd9252b8b2946d4b5e2936cf8a09b1ebea4f42d7c412523a803f5
-DIST KQQRvKB.rtbw 3839568 BLAKE2B 4979c95a193c4f946a584ce1a2873232ff2614569a975b12ddcbdc74690c7ea8000d015a82aaea2d7864654877f82ada63d11ef4777cdeebab954d89cdc5bc7d SHA512 934045e8dcdc53bab8b13c73979a0a35febd112d564ed4d02716e086414b51c254a052f0265ff778e3e79ac15db73cc5ea147e4306e0695a8e2800044f52f4dc
-DIST KQQRvKB.rtbz 33180432 BLAKE2B 0917a311c351e67b64a85e39a62904f3b2c753e65054a4ea2ed8d364a747edebcb5e98349b59b5418aaa2d89976b07df1308d5d79e222ba66d53ba01fbd3fffb SHA512 6a1c1184f5f706ac8c3fa4642626cf304d53fdd18afcf33b0a104673c36afa6113a2154417863f93eb1c06974e48bc0f2b31c8ebe02835595b03b6c388956b9a
-DIST KQQRvKN.rtbw 3900048 BLAKE2B 59bced3d4a90bc35d083a3ca972711a075acb09eca0922ee285bf7e7c86cc74867ee94890173c44f4681ee93061af96fa7e9ad8921f721bc13d4e09d729a7b29 SHA512 cbc36146f894ad5b1db2438114c1281ff08c62bda90c3c6002cd39a45397e679eaa49e148295a2e6c272c0a8e0b9d4e0cf32a567fbbe3b35ed57ac6de3f2e64e
-DIST KQQRvKN.rtbz 27568336 BLAKE2B af1581b117b96200b8886ecb3345e8c8b95840b43800376d9d7102beeec658c617bb6e80f627d681488ba74f6be7c390816f602a2fe76eab5729235c1367e611 SHA512 2a47e3abe82f79e54a8ae12203f46035615a801bc8d112be997040a862107dc4e3ee9dd39ffbefcfb1358f5007a475a63c7ce3674ba661abce04fe4657486932
-DIST KQQRvKP.rtbw 18593168 BLAKE2B 630f15c92c0d07872cc1ba55a3065a028a5819bbbe5c91808aef57c6dbdef7faa9f2c162a7c7365e53908f2084379d2fcd17f7bc03d624db2360cdb372800069 SHA512 6c6283087d3174af926cf0831b3f69eedb3e345c6730b8b4ac95097b9ee85151a15114d1b0cc1befae019b7d53271dc39d00b9476f71646f90f41eac600d23fc
-DIST KQQRvKP.rtbz 57972432 BLAKE2B d5feb0085c68c833c64a8c34f4334ae1abb0f88a8f8ad14fd0493f94ceed1f4510a15490e501dba50610ec5fe1098e83cc335e71e9d86761cbf1c4ddeb9601a7 SHA512 e88276d6d2432869815ce430766546f23939137fa6f88edda6069b94518a03bd941bfce7369e318b5c4cd1a78c64723bedf66cbe033cc3d15ceb3aa68022c8f9
-DIST KQQRvKQ.rtbw 21874128 BLAKE2B ff5e5dc1a0db13980aaa0ef03658d848d225a8f4e72b132a69141a76a1c7741f5f7520a04bab815f8a889286efe719b00b7e5130202de0aac61d6ac81fd90249 SHA512 8a17ddf7ad9aa19638f9d832b907aab149d1c0500c94be3a29315a0d16f4074d319b7958d60e437209508e619a4481c2c678624a04db070a93ad51f49ff1c427
-DIST KQQRvKQ.rtbz 57594384 BLAKE2B 364ea90a2232c71b68df574b0058fd71b1e5ca533f202533d84052507a7c316b1b3122f0c572419b9943aacc7637016854eb530c0f3ee416b9ea08b355f1403b SHA512 6d473267d47f0863d4bead69a6b2a1942c50722757c78d627e6c4d58b98f67818673c1efaa0d03d498d2432091d52d88a2711c7dd043b357f7f4deafdcbe7e16
-DIST KQQRvKR.rtbw 4541264 BLAKE2B a15806bfac8a10a7b722a82c48c3e944d3bd5145ef612ad4138b81393cd52b29da560514eceb5212065dee2bb16051bc3556d2955fd34a418f4703bfbadd6286 SHA512 1e566ff5eceb1b74f5beb7354f1631e9b8e4bb630ea4bcea5d44ee0a71abe84564e43a40b0cd7218025114dbc62739fcbac1d35f6cf916c8d51254ec18751b99
-DIST KQQRvKR.rtbz 37920592 BLAKE2B 49ce3139f077aaeb50419586823652f75b428e840d0b2e197f84cd5f1d83e5e76f2597fd2a0912f29bea5e1a47cd44327162301e2fc2147d953654efa0d98e63 SHA512 d36716f1f7f4c791699e6ac61a6e6d6ab8f50d06988d1bc3cec8a646fd8e7a2ba0091ed7ce302328087197b4f419e2604d0c0905b50128b36f681bb0e54c4915
-DIST KQQvK.rtbw 7056 BLAKE2B fe730f1546f64c326a06f9f6f8bbd9ffb4bb1d8c209ada00a4646820f7f4317364a13cd42572e78be96f8ffbdfbd587b8e9698ced1b7226dcffa705e58897b59 SHA512 e94867862adc10a7980499a467104067249f5ce001ac6969b0603f57c8fa5546dbe34f14ab39e18b2d31a4d70d1c28025809ac3e26ba332a389cd0a28579be74
-DIST KQQvK.rtbz 25936 BLAKE2B b6c69c069897584ab9d580a6f3038de58476309c7393dfa32521179b35056b3724559795be94d7cf2a91d1f4c5a550ed15e66c4316380e8a7147a7ee0205b4c3 SHA512 7b5eb2297230ef1e0fd1de056f86af6310de0b75e44c7dbb2c4f25d07e25c4543450b960a6a993ecc7d8434157f53c74e1dacc8d04b33d0c9001bf162d131a7c
-DIST KQQvKB.rtbw 32976 BLAKE2B 191f5c7f990bfe8b619d40a149b7bc9318c6bfc80404872c99b421fbd9b362b90e233af6a48ce2c188fd1351f265bf41edf36a986c95de5888fc523deed06b09 SHA512 1d1ac803de20401a137ec0f8772c8768c4ce2983dbe6f1c970f77b4f3ecf9906947e41f510847bd7aec38dfd72bdf6dc9675cd07712d2fd9a3992bc6650a08b3
-DIST KQQvKB.rtbz 1086480 BLAKE2B 076604f4860fe92c137d399ff564d6a7b53cd41c24e3113e7e18239f2152e1ceb7a8b72921fa753b31bac230a5d603a29a215971ea904fb1420fa06ca04cfe86 SHA512 3484e4d7d5ace39ad88488fc8088f526af2cb0ffc013f9e980ecad9f7be83e8f910b46b10332a0f95b64f68b762fea83828ac1eb2a72a397a7650f5f5c8a9956
-DIST KQQvKBB.rtbw 2032656 BLAKE2B 4150c7645551ed2c02f2b18f39be1cd1422f10ec80f49fd087cbb5f262861e53629d82ed2b47fcf0d0d060da225b1ec0dc6d621f1c18ea56d43345a686337318 SHA512 678f0c73cd17a45ee57af7c25c14667e2ea46f8982997228bb34ba0e0980ad6192df450720d4798540f3ead691060c0ede1171e8e417a9152d31e44a0e8ca893
-DIST KQQvKBB.rtbz 23879504 BLAKE2B 68874d6eb6d104bcffbfd57189ed304d27c5cb2209218cb4650a823d285584d5efdf0d97bf2d46797005ff889b6d323baa123fa7580ba7bb4bc2a54cf2bc3212 SHA512 219bf797a33fb9bbffd3b22c2dd63a4d096c53b49aea119b42f28bcf94eccab0e8723361f8683b754b2f12aef5a9419bccb9dbcbaabb43949218ef8da112ba53
-DIST KQQvKBN.rtbw 3658512 BLAKE2B 967285351300d79fe8d1eb159a18764477594e1a4b7c68d2fa0b4a8f3efc67bd6a1b9ab7a6d089b55647867eb47d21e37aea936166cd4c145ead8e582ea9656c SHA512 79ab87346dfe821ea8914b1560ca8f3aea8dde77715fb97a657265eacb0b92f3116f2e77ef7db3c0059720c09847e800e207b28dbe325b1f1fb059663cde2a96
-DIST KQQvKBN.rtbz 37978576 BLAKE2B 6b7d5b07e169bf90eb060b7da09add43395d43a84f2f6c8e2befdd1f1fc580f6c72baf2f472f1b467f7bc4cf7e128432e24058d6a2bc681c6074a9c2643d2432 SHA512 802060c768965c22fa2bc9e88f16e9f25998136c333676af4c0ea4a586acc05ebfb36bde87bbaa80f0deec7fb712b3fcb0fc7a03ab656f37fe219f0c6052f1c5
-DIST KQQvKBP.rtbw 22919312 BLAKE2B a8d9d66f99e8a819bc32cfb2c4b599e2f5e4cec4cbc7eed7bb6418b0d68223543168288f9685390eb1c1b15ecac651b96e4444e20b1c0c7a6465899d094bd88c SHA512 fde9c3cd554e86a741761705d7971263b4bec158727f5a41471ec2303bc5ecc9038fc9b20dbe9ea1912cb4329e28ef9af026a36bd9ce832ffef9939598b0d218
-DIST KQQvKBP.rtbz 95096464 BLAKE2B 4749134f5526d57df1a61c47e6fe4ae15f24ba80805c1a7c6470a4feb2cf66a6cdb2096fe7885d006ae0b5f3002e2becb1a002a805b43623fedaeb0ace217055 SHA512 bc17999b2fd1772a5c7d554015264390f8a27a60c9c0cabc3905c277c420c049a0b281e73452fb046a819c2dfdbdf2aa93dee6daf55be4a04ba81d0885a6a22b
-DIST KQQvKN.rtbw 63952 BLAKE2B f22ae299d6f972857bfeb593d87902e216b8991b9535fedda92760f0666c69893da85b2bee80bbe87a142faa9a4f535c260078e7157bcda6224da427b33f2ff6 SHA512 3f9cb7346366515db1252e5ad34c55522d24b7c11194f41303a02384e3c75a51de88e02c0ddfe92d4c41991fa788aa895875f2dce15868372830c82cabce983a
-DIST KQQvKN.rtbz 1028688 BLAKE2B 0ea8cea3108634075355adcb17649d844a7350395117e17ed20b4e900bd0ba81b9106ff923c7390d8abba1942e34c8b482b163936aab3ca4398c86967bcfe9cf SHA512 2132cd1fc0f43b7b317c67e25957817d997234d52bd31141dbe9c6ebd5aa22f41b128de95fc828f2172a5519f0898303ad2be7ed2f6ca78429c1f48bb7ee6c5f
-DIST KQQvKNN.rtbw 1920272 BLAKE2B 73cb4eb9b59609134acea88363a227b698b470461326079cd825d7f90b0bd92a68b4254f52fe7d4932109dd70cc73ad9a5d22dfe2cbc42a8f6eb4e443331c64e SHA512 aeb1ad2c4b87daa6339b8b97898ccccfabc93b5a7e41ab466a9b118478258d3e25638dc19c6ff23ef201dd8753f047bcc3554d645716aa6d513a58566592227e
-DIST KQQvKNN.rtbz 20678928 BLAKE2B 6ffde211e54c71b893a25ccd947faf1300e3c8a87023e7a7a008506cfc857ee3de45a479b8660bf129090b8f149855d1b425eb0f810009592ae2bd6109762b65 SHA512 1abbdfbd5568f201e2b9b228b793280874d8869b5ab510b1c78529745f9708a1c459071905e5ec52f90aab772866b3e65669119415ca13bb0d26663786bec6fc
-DIST KQQvKNP.rtbw 19752848 BLAKE2B 47896d29f1044d6a53f211650ffc533c30b64861382c1a42a9783c051a55546ea5a318af53516e3f2cd6fa763dfd0e6f5e8ee3ffb043d0038ae786685bd24fab SHA512 02c5dee196ff873449ef6aad6306ea69c5cc8439f771c5aa2cd74c136d0556912ce7ea7d2715a555926f422323533de057d21582cef6b99b6c5a35e2e3ce9244
-DIST KQQvKNP.rtbz 86715664 BLAKE2B 6331c587d346a42691df47c42da2cdde37787d6a924b5896ad931952bb5b4045d8f78cecef746e8ff8f58e5a343a5f2845bf946acfdf7d632664a663b3dbeba4 SHA512 f99e1a25c773cd62f5f0253a30bf423296783a0106670f30b00a5d3278ecc20d00833d8ec5ffde76d75c8df43ee495960d63d85b944750f6f6f5de20387b029c
-DIST KQQvKP.rtbw 372240 BLAKE2B 8af9a9fe76b78362a5f703e299412f4a435e1be32e223cda920d38063922f1111d1d9d00b4f92e84eacb561526233dadafc01df2a225848ef5157a6ff56935f1 SHA512 1a04b2f0badf08d98a854a07db65ab2da3f11cb7fb73269ab9f0a98299dd4d36c7a12c1979dc1c2ddb8e27a648d2f0a4111c4c94ae6f2ac3a864ccd4b71dc8f8
-DIST KQQvKP.rtbz 1878992 BLAKE2B dfccb2c997205d36cd0eacb757ab72917734c122a75001a9363e0ed22c8def30fde6db692e2aa264168f9a5388f763fbcde3a6175a34c5b87aad54d0e8d110de SHA512 877de199e5cac78f9041c226a212b5c05b7b26d03a6d4cc38b673d949392e5f20db491b73789c30d9a38bcec6164d02b48d7ac452addcb7d519ed408108daa03
-DIST KQQvKPP.rtbw 9937488 BLAKE2B f6af23d891d44e75837b2e1b10360ac2a6c656cdbb21edb0ed02b21c5ad3a8cb625d7c1368011c393a4087195217055e87182472343bcc2b4c2ff6ecfdb71ce2 SHA512 5741f35054355d189704443a1de5dc24c465cf8d227b86d08a6e31ee710c724070c6cf0b7b36000ad938b2330f518405877cc4026217c20fdffc3bd0c8a53389
-DIST KQQvKPP.rtbz 23222864 BLAKE2B e44ae3480d91e9a5f88294049ee9318642c3170cad5dcc81cac156f6eec566c7231553997ca500c596b42b197c313e27e34519c9b99971bddc944592c0ac799e SHA512 fd23f0d6d952fb44a054d6756b1d07e437bbe727ae4540d133f9abad4d1f3a96df5534920c89158283174619560f402a0cdefd68b688d075146a1b3e4dc89144
-DIST KQQvKQ.rtbw 666832 BLAKE2B 378adae693f7e536940866be9791513b28dc2c52d1b02900eba24419d3945b2f5c6c654b78e14d05c6be071fba855a2df27cd34e60e55901dbce4315ccffa073 SHA512 ffd91daca72f4dbbbac9eff87abed32214b47e4d257b377d6329e96cf76f012b4b601216798bc549671c46171d7ad2da7b5e6849493d77a85ef0f46573f1f9d6
-DIST KQQvKQ.rtbz 2793424 BLAKE2B b093accc0d6ec03cf1c20f64595b6ed8b07b019a12fc43b4868e197bf4c1750f764bed5a6d4719c102979ce28957b9e0f8ec9113cce0bf9c8a91da8f58790fd5 SHA512 8a98c4629857eceadeb59b9a386496b8b118e8f56667966f41ffb500196b0a12c581669b9c8feb117fefceae14f0693afc74222cadcb3ff21eeaa5f2b1d351ad
-DIST KQQvKQB.rtbw 90495952 BLAKE2B a285f94b0bfda56fa6f8c80867fb70e28f2da2d7e0ad5e0d7f71cedf1e91e3c115bc438fb27b943a05d2995b0209beda1227698341248f83c00443e9a591b51d SHA512 759b16c026455eaa44e1e94c4caa9a638c07d031f52cc0468de6284d653592c7641d2bdc16e9f44dc26f3c924e25ef0004e2b05e819519b529674900b8d5e181
-DIST KQQvKQB.rtbz 154095888 BLAKE2B 4699414228090117317038a8f54d5cea1a30e4442d80915a933905c62a1a3366c4876fc30b9cd2efad532efc7444cc06545e50d3144cedebc1b50b22343a9798 SHA512 52b129c5222a7a8b569893bcd1d2f388643645a7d8a0061dc41784beec4ce45c960f8308330b710ec5e21ff7739bc260275939aed7f598dc649ec4a42163bc53
-DIST KQQvKQN.rtbw 71048848 BLAKE2B c1bddb17edf170a07f3998884d54f0396d18202f561ee56bc655666fde91832a47f587f74390a7b354f90e0995e8f4625c15344a187503605d1c9099942c53aa SHA512 3f9eaef46959869c887f990db946e13b6a99d1a219b6cd8148ec83ea419a1310fe31b0a5d2f46fff31ed4f08d4a51dc11074b9e6d7eb3bd37cd2da3abf129ef4
-DIST KQQvKQN.rtbz 135537680 BLAKE2B 80884dbdefb7ddbadf286950b5c2ae2e329e9ae6adb34ce5ac32c0a1c6c457ba403994fbfffbfb48bc4903ed008e2bac00fa845208664a881d9c206fb6d01df8 SHA512 82751fea2d30c56ce627cdb158d2efcf3ae8fe08559e9a22975d8f1db80ca8bde608cef50da3ea109f2de3e22edd0d901155bd8293b5a4cd4e4fd37e6ce52504
-DIST KQQvKQP.rtbw 161048848 BLAKE2B 0997f855aa4e4085f7ecaa10ec8ce9def2a9dd630a201a1b5260aa1826735d349b058d8adb0d5df6ce724ad5689eed98de84e358b2a4ac64d704ee04894bd185 SHA512 67101ca9792b60d6886a7e2907d8d5c47fd9ff73082daaa8144a572df1ea9fe0b51fcfdf295cee77dfa26c9ef650af91b108de673f5f9d8159039bf1d590f412
-DIST KQQvKQP.rtbz 371823888 BLAKE2B 59a855b25e18ddbd408fc4b2581b04f6c45abee2cb937d749692bc09fc8e00e5542ab286572fd1c5355c63132b4903c6b2acc949fe81d45375f66714e865426e SHA512 1f0c66785186810de060970acc4605ad8e6f48a62d7c5919bee82b08b55e330102dabb890e56e7368bab8d5369a27d1c62ff2e9fbd1989d9e35de3ba48bc7a9e
-DIST KQQvKQQ.rtbw 43013200 BLAKE2B c784ccef936b8f332a254f5cca6044abca294fb8a925ee3ea7812049cf5579eca3e7b372981945c79b267f5d85fe83b06825bdbda6ebe03c35e369d8f6eef83c SHA512 1f5482b0e423528a7dc4609e14f01f716d92b214e7ea468bde5372b4b456947f0a43fb4038086555379b7de65af81357c335c51fc68f9a90d8370ad4ce60ef32
-DIST KQQvKQQ.rtbz 100554832 BLAKE2B d6d97cb5fc20e5ab5a4f9937bbc4b0ce68561b8582004151db98b51fbf7a74244a73b233e66e33d7ace26b13bee6dbddc01ec8746bed56b126b31d2fbe52a064 SHA512 271c9fb6c69e37ca9caca3bc8d033e7627c242033a2db6c9f757182172d2e67d7d390c8155374f4554cf617dedabec3ed7951505b4f201b77e74e76e9e2dd130
-DIST KQQvKQR.rtbw 165340624 BLAKE2B b4bf569e01040c7cb010e8ea6b0f03f88fbc57025b1065b7cba19e82bc429f033ac5a7c92802962db5ee6324bf9e43612894a61c5e6313e35116ed3dec0eb765 SHA512 87a03624129aa93a65de3426a65655327de114a80aad20c8889618ae4038b274f4c4300bb869e1528c5ea6208e410c23244b96f023203fc549371b73abe37ae8
-DIST KQQvKQR.rtbz 134670608 BLAKE2B a8ce87cd6522d20be8e0880fad4389db507a1608b14d2e2fed5d3804cbfe7c669cd726c55e92a32a0e459bff635a9859f7c3bdac6491dda7e5d2e2bc975cda37 SHA512 a4f6934ab5f37c7aad0d673d6890bd01f026b2b78210815f1ab5c6a6f27d654ca406a602d9542e515173e52cff332d9fe3ac5a3fef51af40e6fb3d5f0bb162d8
-DIST KQQvKR.rtbw 82256 BLAKE2B d51bbe70987dfe75501a247c65721a336e286d6e4b30d5cee2348b0fc1dc22ea34a71afb2aa366f86f73da02e820514d2833bed0885c56e53d12ac1bc4300dda SHA512 24e859a5b81413716d5ed672b57eafc2b478f289b3580ccebe45fecef9b029a2a69817f3e97fa7a884fe4807c710e8d71fe3a5bf06ef166bd2bf0c0527d24d53
-DIST KQQvKR.rtbz 1261584 BLAKE2B 06e43132e3212d446042267fc78dc4f853a6df3d12c982033798d449ed4d9c149bc2305bfe0f9e8ba097fafae42ce444418c2e2f82b84edaf05307a0bba6dd16 SHA512 cc67e36886abc3909940efff979f4cc0af6481cd9e217449e2fe2120cbff39275e7083d6473d632cc9365e8b6d06aba93cd5440ce381d18e3e72168ad16cf864
-DIST KQQvKRB.rtbw 14912336 BLAKE2B 8c2290e4959e4756c92c5c5b42fbd9880997cacff85357156f7410da22bbeacabcc18310ba970a732b6fb176c0a4798446df30d6fe65b0dc08f4b83b71e5c3bf SHA512 a2134db97dc13cc08f13461a3d230072158da7322fb3d55c6c5c74bff3207df01ef80666162ae12c4d4e6de327987d764e0bae72e0fb8cbeaa9c4a8a7490e1f6
-DIST KQQvKRB.rtbz 72964240 BLAKE2B ee463532c12e8b38ebb6051164dad96233130de1e7d1c90ba604c780af6bbf8e4c5bff174df7302c4ef9a7491f8cc8e906be580271d37173ebc04189ee28f85c SHA512 1fb3be980877d484bd87e3c79058ed92022fe1cd2ce92639283b7d9c924a8d216ecb4a7b2ef3ccb9b9607372b540f2260d17a0e85886a549ebc484d0352c54a0
-DIST KQQvKRN.rtbw 10360848 BLAKE2B 8d6ab20e0ff102cbdd4aa865f4e46dabd558e8498213bafe6cc9200933e61a59a0b997e472e1f756f7027060cc265e7cc9ba81c106b2526aef02f1353ce2c8b2 SHA512 ead9982032a4dadd940a3532eb4bc18db111471d8aca14569c96a926deef13ac053a3e3edbfae23650bc998124123b8b2f333761f2559b4ed967bf861f7b2532
-DIST KQQvKRN.rtbz 55360400 BLAKE2B 29881160ffa7e6d9ee248b93c9ff526fed9bc63809a0b9199e746c9006d96cf545a916eb12241910410090fc64e2b5846e86770e2d984b2d64335858157e78d5 SHA512 1059324e1903202ef540e683e85dcad5987ce3454178c3b87ef0d323d56f4ec6b02300e139bd37c08f67a4c6bb2926820c098d985ab60643d7225a929c2f9872
-DIST KQQvKRP.rtbw 40628880 BLAKE2B 4ef983d20c5be3b3ddfab0f890d7fdba0c832f857bc17fd5daea403b800d275b28bc96315f7b7a0a4cbe28bd3986d215b0bf666112e9cf3a3dc70d9424d29f2c SHA512 295bd3e7fb8e05251c20dc13b1d6be5548557679b9badb55930526d6cb34de35ab6441a14cb9fbd832ae5eee767393a6d9883da32c60fff671d8e2aaf3ce8c7b
-DIST KQQvKRP.rtbz 122406352 BLAKE2B b4cc4b1bf3c1ccb90677298ac9406d07fae74f3b9d62386b02d0147c173e0b3f19b849e82780d2185aeb5fe895574c0008fc3e9e6a43fce680cffc4973eb0500 SHA512 cab0d55e9bb7294df8a29da511aca6afa9a8d9bf39e1440d5aced9745d91053780cb49d327b94a1f84821494c0503d14e62febed68618e86da468f1f3c230b3a
-DIST KQQvKRR.rtbw 25641744 BLAKE2B 7b776684a3f0a60634b9a58b455a45b0d02c93e5c7cbca0a73085b407f626d081695665495867a85d3d2e506624a5c001a0834f37f01a622f4782ea178b963cf SHA512 19e732892159b7fb7d3fb5f7514a53efb70bb4b82e59f8114f0968ad742ca495a09ac1c82d5fb7d7ce01b3224640ac137afe27b9aaacd8799bef90d5eb2f22a2
-DIST KQQvKRR.rtbz 48102992 BLAKE2B f73649811b001c28829faa965a3b6617c3754a9102085d0364b9ac9746b8e8865e0e05beae982ccac61a91bddf9807681f2ae0fe44696e021bbba44aef1a48d9 SHA512 8f926875dd86a1161cc428261eb1d08a16c45f1c954a9fda4ea2d66c7057df6344b2b4f893d86eb405e86a30f76e74d3615345c5b181813738ed841b4d713331
-DIST KQRBBvK.rtbw 13990224 BLAKE2B 72e2b8e7c2b5825ca4abb4f06f4736e543c1156d7bd5e0b728fc8cc15798b156b6c418168455f0e37cf40ee8dddf7b1cf6c2b854744eb9ed632521715f6f28e8 SHA512 d836b6c34d24cae44ce8f3f359f89f94ccfeecc572a31df29aefa0865d712cd4b6d10f51966883a5c98645d549f83fd1f2ff48f1b548876fe060512fdb6bf2ab
-DIST KQRBBvK.rtbz 57387984 BLAKE2B faafdba7e2122b3c557768aff4dd571661c74f9e8c68fd7b648b8e5def2dd0a8a49551c1448243526b9eb84496e5dc706c2fd396fab85f4a56a58133be53733e SHA512 a16b7112df2c2f50221f5c6a135999977d0b9a86f8edff1357c586bbba91cad54580541ccb6c38b9fd4e4fdcc2f65a826b336d65f2586a75f211fe993db732a0
-DIST KQRBNvK.rtbw 24321168 BLAKE2B 5b1b9273348099a9665f335eab37cfbbe55ea94e265550a23da4fd97a461b0d15edebdb8c897da28bc5fe16a6d547b935ffdf35d69d345fa8e232d5d46259229 SHA512 b53c549cfa50a2e1d5d2bbd2dc401cb9c50058b941d6d23b45d21670c7d21f671a52ed021e1e4e19d3d622ca4a8271a8945e627948a58fcd6cb27aea8d28bafb
-DIST KQRBNvK.rtbz 128226896 BLAKE2B f3e4ecf5b4cb088f0da2940bd55a2b2f898a802198011e50683a14eb201f3b9953dd82c47442552128a8c2e2be0ce8343766b87f5fc34d87ad58b6e0dd058866 SHA512 db045e94e22ebec44fcdb2b1fbc2a954eebb5b1a6f5cf98a1c49e9268e368671a050d1ccddefdc95df9f3f454f55cb6dfef47d2894c4dc08c897dee4e1446667
-DIST KQRBPvK.rtbw 83146960 BLAKE2B 20229afedd1e19b2da79a6471d864cb5734b5cf08782ee29e8041aee7ef000c681b4594e9e996452339e26e40fbdbd70662ec3dca711d9896f92d2b66d4fde4e SHA512 d48a7819f12d848b78792cba5e48bc6c75064b8948a5a9845e33df5cf1a82f6a1ef2dce63ccd4f3dd760bfdd6c79152d93a7fe308123f31a3447beb9a64c11af
-DIST KQRBPvK.rtbz 71024528 BLAKE2B 8e9facf353693b9848d400eeba7c025edd14b35cc4c5cb32da3c0420ba2d5b7cf0d0d283b91bf26c49b8d6225c0d6fb8ebd0e9d43efcd47fe1645594f54f0c1e SHA512 8dcbf3da034dc4337b4b90d926464447e374263ec1ab9cd14bafdb315dcb6043bc0ac300010620dc79f9e596246234ef74d94a7515e5012bc19507a8da39fd91
-DIST KQRBvK.rtbw 280720 BLAKE2B 0fa24f2c9746640910fe6d7dc03292877c607a2bd14aca74c9ed7e527091ac1e3575f62c1a1276c89ccc4d6761705e5453c277158519e35462b8822fa327b54c SHA512 13273ef2a3aca63220758008bf088e2749d97b9b212f473a021b2fdc95b618607d81ee917c8d892d65702241b841805ca9878f98d652e3e8a0469f824c3b522f
-DIST KQRBvK.rtbz 2226576 BLAKE2B 96cac078b3ab62e6a1a7258e4421ca2096680426b427be8b0d092d6b5856d77217dfd00301f77c7d8ca2833ceac422afbc660002486a412bfa1f7a6ff161a582 SHA512 5f4e2606fe964096c810ad1b770b0a47f087b41b21432070ebde34f07ca0f112ede66f900c73c13b59efe6eb04791043da8a6cab42ae59b6c6a84c4dd2852255
-DIST KQRBvKB.rtbw 7298448 BLAKE2B 2c78ec92f44fa4b780606d75830551b81dc621be22454fcdafa2a84428575f5719e527dbe7014f160b1a7b0c4446ea5360934e0109bd8286aae8d78ffdec9a84 SHA512 35fe6ff344515e4219d26f3be7e48654f111c80d2ccf31c5a8c2ee907fc5f5f597c1d8226fea187092b466ee23566503b815a7fa8892ba4d6b0bd95d89ecca44
-DIST KQRBvKB.rtbz 103926736 BLAKE2B ad2ac11edc04bdfa34b5c43964eeb37eb63162147a4c17ee0d644f1d58c5e29831b96804bf110ce9573dcf2175f4fb6ec6a8c8d6cd0f0aaf13653ac829b20cd9 SHA512 9f6ee1b1e15c8d14b39bc3aa54f4071e9729ff2b9dd5fe481fcc4b303b950991299a7840099aed286db52f7b43dde130b50f545ab5889a90b8dbc498aebbc7d6
-DIST KQRBvKN.rtbw 7401936 BLAKE2B 94de5b15a00c9635bce46f04c265cd2e2bfb548eb503bf96c8f25198d02f7e41512447f03fb0ea84f88464f61206c2b38f7e4f5653b990124b2796cc885cbe8a SHA512 294ac1a68ec071aa2e9f3ecb94517a2638a57bdcd2bfaf99aa23ada67d39896152bb3afff23913671330fba8847d2fdc9450f7728c858b847d57462822a41454
-DIST KQRBvKN.rtbz 95770832 BLAKE2B 1633309eb5141773b803ba88372ddb9a38f58ad670484b200e483cb657c6f1361472ad69f67ec28490002e16ca1330c7129e08fd43a240816685ce271976866f SHA512 5ecf7845931733673587adf663d5e8d3e2260f6e02e2e94d30250a249be12349cfb56a0ba6f5198e6a688eef7c3b5390e7a29ada1e3207ecb2cd70fbe61123d6
-DIST KQRBvKP.rtbw 42556048 BLAKE2B 36241b18148a6d0a69b20d05ae480eaa4f553d7f261f4ec4cea4231a4b4eeda586a7ef86611d241082c2915e79e06d89b1b1656d9eb618c1068858fc0211a4e2 SHA512 8fec9e78e31710509c3f71c67a5dceffcce4ccd9a557830fe4892608dae7eea9a7017e4715fcae92305c69e5693f70d479bdff44752af54554fca34e9851059c
-DIST KQRBvKP.rtbz 240624080 BLAKE2B 49e0df4234084dc135bf8e2aee80473e3746a81d2c4d10e64ad6be615010e2999dc20315641ece13f92fde3565f85c9ab2d1d89d3c90bd3d4b520855a523d9c5 SHA512 c5d6207f1dfd78ec39c993dd332ee31cb94255dc21559de4cba8a56d293f16504cea3fbd6ec6eac84cb298ad192618ef483a6869405c18a12108103b7d4d9773
-DIST KQRBvKQ.rtbw 115667472 BLAKE2B 3e198f360ac0000a1b2db5dbb102eebf7f11b0c76221b5289baf7fbc1825bf855a75a0ef19e52d16db2336f57f0fad2f39bea46dd6205568deeefe2eae562e43 SHA512 205a2529e63ca0bb37a0fe0d6a80669a9801d9972855c93180ec7cbe6f0541c7072db6e77923f4a6e908d9964f19059d35658e3908f797ae68b8ddfb72e2c2f7
-DIST KQRBvKQ.rtbz 322596688 BLAKE2B bde12f93acad254460e237f35b81664b2994b463b8221764ae4cef6b540e5e4cdfa10ae944d8c4e2e541e5a4081d628e4a27c33e08a4e2b2634587522fed0cb3 SHA512 c6f3b39cc9304828e7494daab17bd46470cd4653248a66651fcfe89dcb96699d53893fbbb052718027eaa2552e1bc12149f745e010cb3cddf600fe72c84e4b97
-DIST KQRBvKR.rtbw 15078224 BLAKE2B 626cf168463990fac4456125865b21970b4e38ac2df2b6c4f4c5f3dc6a56f1392f04cf3fa30ac7a469e02bf0efa9db53f77a9f01ce7281da225ff4166c4b08d9 SHA512 d61d0f14ff25bdeafbd9334dc4917292a77818f659b846cd445c978518039250837b63829ec6ba41208aab2b69ff4e8083d561be505e7cdc54dbb6e712b522e2
-DIST KQRBvKR.rtbz 164629264 BLAKE2B 88c858c0dd80e022b167a74c01c37f1410b71e0e036125a6030335b6795a44692e08a303a93b956d4bca3acee9f3fabb27a07f68db8e735f7e8d7ade08ab5dbb SHA512 44a8fccb65546f00388ac1a9e00859f84574968e3c293002dcd0cbd897c193fa2b5c3ccd542bbbaac073ac63947b1e98cef93ec3a95ae88616b92392e035146d
-DIST KQRNNvK.rtbw 10627344 BLAKE2B fba390882d3c00730ae2836186933e551d1b42b668b329cc34291ce0072feaea0f75f6b4305b4c8dcadf8303c48c70b13ec9897a6ea232f69225bed281af6e51 SHA512 5bab9038f4dd4a7ad143afd020ff78de4d87e750cf9f80def937437f7b45c8e4bc93ab47448b7ea95a1a936b8cff542aada0f1f19eb55d4cfaf87b95ff6129b9
-DIST KQRNNvK.rtbz 75176976 BLAKE2B c468fbc55d80b28e423cd18d4bbfcae034f5c73eafe61e1408e8f2d34e1747085cae79a8d157c99608a6c08151cef4dfd42e126ab60425e391c2cafe73a3ff15 SHA512 896794fee290fc77602010ca2737b3c8bec89ce5bf21c1778af042533449d4cfd1bb86614eb2cf56a2cb9a3a06ac277889d65e58e702c128540cbca73c9fda9f
-DIST KQRNPvK.rtbw 69077968 BLAKE2B 1dc31131fbbd23eb60038477c739ff596be6c99f96f595e81c158cc7d0867699af154ccc678125c37d9dadd491cbfec3267b6ed90c02c92afe849f92efcb763a SHA512 cca26806e6696a6381d85b5b79659e5d19e0aa44648c205d253e957c6994eedc38691f9e862253739a54acf90af91c1b6159f2ec23d1623cf6bc1c64e81949a4
-DIST KQRNPvK.rtbz 70400080 BLAKE2B df441708387cb0adc16a487339be637377faabb49f77700646800824f2e241206c2f97ac4e1d020dbc1023beac6321139e9ad7554eda1dcc8dfae199a6631da7 SHA512 72f627d245c4808cf83456df7a5cf6d5b16877c660de65b850a590361d2f7a66d7e98b4a103f4704266e2c7949d25d4507d79bdaa4eac11059d97a1718a0fe28
-DIST KQRNvK.rtbw 211920 BLAKE2B 7950c0aca6fe07aa9ee684e9e0196ca9470b730e3414bb0ac269b1ce1e4e50437250c34c7e83d457b7ab1a49f9519698eee1494365366fd79e557d061dd98654 SHA512 a9ee435c12b719e368d696b31351a14a9c94c49a62737e31d469a205e7442f24682d19bdafd479551b70c4852afe65b96363a265a9dcde8f600b59cd85fba8bb
-DIST KQRNvK.rtbz 2435344 BLAKE2B df82ec10b872b6f0a6a0a6633f66a9235733b13db3808e590b7e637220a6b0fe439c94e4044ba89c7241f78c0ebd3ba36907432264323dab8501c212d91316f2 SHA512 d15d5a380af5d65d02836d67c2cffb9510544564316f23c453bc7c1f2369dcff1fd03b3b9afec20d1b800ce6fc63cae69f953d2fa9e2290d7398ce0b83f75477
-DIST KQRNvKB.rtbw 7210000 BLAKE2B a6d306d886f4367463420215d2da2e735d0f69f9c6589d45c6699e6eea62e26a82d62297595871ddd5b8df9226db5c2848a676f5c71d9d1b8f31d1d9dd7d77f6 SHA512 04a026a635a2d9cb92673c6dfddd4c5ae0370b2cd8ca9262f4fc9000f662b5a83e27e0ce9451420218ca510a32772c3fa25d0540204ae4056ded513ed59f26c1
-DIST KQRNvKB.rtbz 101389136 BLAKE2B d49e0d8d580a94b55a00c5d2db4f3b01c5f0d98729b20611420c83efb863764b80eb9c457d5cab9bbfee10b369cfacb831b753231c0b6eb20f4789fc0e851f45 SHA512 533f2c74bc4990eaf0b85abbcf1054867b70b40e6fb4caae849c84e3e0a0f4cf2080eac2ff4d5edb2f45993c2e4306b871db14a4aada5bf1ee0632207364f494
-DIST KQRNvKN.rtbw 7237200 BLAKE2B ce27173c4ef8ee06f878cfd514e2562cd952c3e1f0772a502577cbb267177efe388d295996c89d196ca730fba64534b8f64e81c3b67890b4de4c71b1c6163480 SHA512 a6286eff8163d089ba3efa151cbe6c27c3ab99aa223513bfbd6e995d09a4c0d9b79fdcd03c38a434b4692439778eeb7a6870c5d8e6d26fc81318afbe46b6a076
-DIST KQRNvKN.rtbz 87819792 BLAKE2B 65f058b45dc1cfabb93c5e85472caa25a8d7bffa53ccc7724f0852b74e00e2b4173e60478db51c0472f37fd1e06fea13f1249914e43a73e1efc2d991c1b3af3b SHA512 8dfcec50153332f8863e28995ebf16bc1500375b7d1d1dd416bb79079ee3bc4f1610e32524de9d0e56fa499e825754405f9a07f3247470952c5571611f954057
-DIST KQRNvKP.rtbw 40129616 BLAKE2B 187da47420829ca27aaa9df2a12d404558d5fdf2ef4f32bdcf84db16e0ae5b28954fd3ac4031295ca4e9b1b419dd7acfbbf4ef28cda4d86edf5618c0bbdcb7f8 SHA512 893da52c84721f97d97c4f5f20e3a08bb4cff484a4679086fd0f5452893af3e983d460f5f56848984b86fc85bfbb5460109e3ab44d49642a4329479f6791ccf2
-DIST KQRNvKP.rtbz 261183312 BLAKE2B 50c5ee0e70da7d63c1fe10f44cb2485fb0c41255926dd13c6ec556cfc97916d2e77deb9afa500e2c609621601e3b9d4959d38f335dbdbc53c50169b2342d3a14 SHA512 72ac505a4a20209a7ee5c83b071ffa1ea01aef4265a614cc73eda8e80439b0e1dd59945fb56f8af85fb252f780dd3dd0aa03159fdaf13d47ac456eaa177ab569
-DIST KQRNvKQ.rtbw 111313808 BLAKE2B c91887b56de3d123b72f7544ad19c250880c3f75dce636ce89a2a83a1298c226e6d5bf7eb9523550d908e60ba34501d1c37d8f635142e11954395dd4e0198809 SHA512 bd313205ee4312f13c731570f0d67930a7759a7146c9aa44f8b2f6311e182614e6e42b414ff7a39c0fa0704d46b7480ab88b716682bf931588777ec12a3f950c
-DIST KQRNvKQ.rtbz 428078096 BLAKE2B a6a3b7acd041ce016365a6d8df5f6eebc17823d618c2ca4e4a2f9d483894a3202c5aa5f08dc58e34e93cc288db90e39aa95e09bfc5f2b1d1c443aaff8209bf3d SHA512 1ecb54e742043ed0423f0682265cd8c5c735e196f25735ea688c303042f0e2072823af4bd6987d80bc4655d6e87fd3b1b79732a90a2335cd7b8f219fff3bc626
-DIST KQRNvKR.rtbw 15311888 BLAKE2B 0f6def017005e0f7c42ecf4298cf4c340d3431885224eebf79cdc2e8cfade7571e5882fdb1919a32fc09738df41f6ed8dbcb1770462da447f3002eabfddd9823 SHA512 aa894e07b5120c7bca4093a917f7e4a2dfa6b17cf198d2a3951008fa2300acd8183641cd7f78aa75bcf39d6ef9f28f0687b2f3ad16f9949047a53e9eb871bd0e
-DIST KQRNvKR.rtbz 196360784 BLAKE2B 7cf64183facd55b168dc492d398d433841168bbdfee8fa60696e5a963a73312274208095a5d4f9125375118faa140ecd37c25f377937756dd564d294761fec49 SHA512 e1b41ad30186fa9f48a675a61b8e4457a8fe77e670f10caf0c275a555075ac2d3e129b2cd396516ff9728f4209a005a8a7e29345b0e596f8c97f7daf347b5f4a
-DIST KQRPPvK.rtbw 23539984 BLAKE2B a46b16695f2dcdc4a1304f23095de9c57ae7e513d9b0b901e46b31f48275304967dbf79f760fa952253770960f63ab6c14514adc2dba76e799a612830e6097f6 SHA512 7bb3b85574c2aac87a2ebee4f33b98bbb3751e961d01acf2d9e43921bd27fd752506be2a4fbf4ac396641d0655aea9cc8e361992354286c6a01ce8db6c616a2d
-DIST KQRPPvK.rtbz 7548240 BLAKE2B 143762d25b144065588128f15103f3fa0bfa1b1a9387df00c9c4ba87767c6b24734a797707f4330fb14f9058ddd43467de77edbbcdab518640e1c04c4eab716d SHA512 073b620f221a82f9fcbd3dfda9d67883cd0e9b669a1674daf20aa04b80199a45720d81cf0ed55a20c7bcdbdfd71c34751a5f2cb12e5a925cda74b71deea5469d
-DIST KQRPvK.rtbw 907600 BLAKE2B 20098462f6fa548cd3860a629b15099fb9db00bcc553d990c54947b490b4ecb94169ddfec86f6af8ef05980e542b5a55632f547dcc38ccf478fe93de45fe05a6 SHA512 bb78d4cf7f9c44a60211c1f7f1a4ff6df985b610f4eb9c9b002331dfe7ce3febf8d687b83db574fc6dde761bacb1b3dd623d6d98e5a0510ddfe3fa699e2032b7
-DIST KQRPvK.rtbz 1170832 BLAKE2B 258dfd590467277f7980ca7d29286fec79d613884a0d6f3808d1c49e74d79707160a30278559bfff984468442da38e6b9817fb8644051ef938b2c23464ff19bb SHA512 556a89c828b6f476ece333929fc515bb781e39211edf95913c48a241de89f32c37adc9d9bb924eacc6fad73d0135536fca0edcf50d4b715bee03badb0bfc0675
-DIST KQRPvKB.rtbw 21878352 BLAKE2B a0115351206c90482fe923023fa09fe19bc8f868d1f170986e65560b7f0fcc0c87f6b933ca3e2b86b5e9ceac6ca97ac361f5b3ed17ae97bc9ad461a64c457ae3 SHA512 3d92f5852342b383189fb5ad37c0e11f42502c8450dcb250b9cccd59337e01f18d32138953923b8467d7591055f78a7bee4f65fc8ea11d022a1172ff03e3f953
-DIST KQRPvKB.rtbz 141897232 BLAKE2B c277d086b9c2c6b7a5a2999728cca9126a0e76ea3744665a74a7cfa3531adef2c66010d2a7af858439eb770c96c96b1014143ef9745d350981dfce84030bfc06 SHA512 5a28a973187dc99601616bf3723a286991a96a9e3c9ddae09c89a31d9d7ae36c6154459a6863d9b0282bd4f184df31f7595cbf6cbd3ddb1546a572c8b877e0c2
-DIST KQRPvKN.rtbw 22569104 BLAKE2B f14eef6a2418d028a427afcdbb19f9f73e39b1f9c86f3fc8405f77bc6ddcfa17a241a6c85bea1b3fd6bb550d84809821e9a8481a0323db719af9c5eb94ad3b62 SHA512 bd49ce70ba23a4c1c9b1cd41fe7186472d0148e5217bf2edf8a6c4339a3d3a129ef2d06a80db6c3c3984656fb80e3d47060e393a4e7cde465d2d6caa799339f9
-DIST KQRPvKN.rtbz 130358736 BLAKE2B 47ef0054ecaad16733de93e0a51e333d4ece2b2db69f39697a0e5667eb3f5e07b1bfa4ec5e2f03e2a7a7f560624f99cf1e653420de426849f6ac57035c6dee7c SHA512 65c52fccc474a49d922ba47cb29aaf2704097b1f1f16fbccf8277acf271202c5e215fcf4e402fea5bb8edb528082737e6ec03ef36660b73c64f8728127c35135
-DIST KQRPvKP.rtbw 34824016 BLAKE2B 2fa4ad0f791dcfea8a5f5e8c7b955d124025f9f86ebe083a28af120f9185b491fba138283d6281f334aae6da04552bd18d05a23347a32a947da5f989c4b3119c SHA512 2aa847f3059cc546f347699f69f4ec26fa8ae4009f41b102d36aa7554e0277c949340acbe7f1561cfb6bd8c866bcefb7abec6384e298d426b40330dd5aeaed35
-DIST KQRPvKP.rtbz 51877520 BLAKE2B 28435165f472514b182f207299e2a70398533a16e6eb2b19279efb3537bc496f9405d4c1aadc9b321d2c4effb5095761e9af952bf976108ca96b376c21eb272d SHA512 4c02e75a34b82d45964e18f139859e3419f28f67439a4b9594dee80b7fc75f688f251e6c7bd72042c089c447a75a96d43a35c5067cd64a6c0d7d735d978dc5b9
-DIST KQRPvKQ.rtbw 453088912 BLAKE2B a8d1c8a71eeae3774bfd32201e90b2060fb5249e508882d90be4a5042e6e167174213ec4d10022222b8f20c1bae7f91454df06daa10d7fbdb5d841d9b893fc7c SHA512 564baf71f66fe2a9b01b0cc9d6e16ab4a9c657fa37e0b6b09db25799894ac53afdf89db1b3fb7717465de58f0f89dd90e4d2ee5972522f0cf22a9b5b5ae8b698
-DIST KQRPvKQ.rtbz 814927696 BLAKE2B e385be5ec8f58618f801de118a131cb6518c6d455f668b7e8f91de22c76a471c0394f081ef86cafd390798fa4d05ed79e104e74c9ff74b1f80934d531a0d4ec5 SHA512 b3e18b7b5c89058abdd1a78b67ad888d637261ecfd980ed8371924be460282eefc4d2d332b877596346e440fdefd92dc6fdd7af848eb0ac23f3b8b93ed898f3f
-DIST KQRPvKR.rtbw 37220240 BLAKE2B 4a74038eac47c30dd3a5ce8100cec454094b605d8a75d1dd14457191a0d10fe8fa56c9dd7d05dd35389a04c1498f3605478a718101d22052c9d3c1c6c4e8fdb3 SHA512 fd5d2c21cba81953d08f52f8002cb79681b606e551484c5a76c62ce5bab514a1a7025a16866c63578587a5aed4e7f9b833a7c8574d0c9fd07c69cee08b8c91e3
-DIST KQRPvKR.rtbz 188836176 BLAKE2B d2fe8c92db045a5b273c4e211c001fe1a30c9d1a1bf510d0665c851bfa66411d1ef6008624b08cf61794d7d0d825b4b64e58a496e67ca6b3703b75121358de9b SHA512 a869e0a4ce70b3b0f03ea38dc804bed62c3743e8142a811bb33f2bd6c248365bcf74c9fc6dfde515d3357d94869131223ca8c7a6c75db05dfa777faa5505b4b7
-DIST KQRRBvK.rtbw 15652304 BLAKE2B 6d2b87b0869a96e92d7e33cee9abd562c484db876aee791d4dfeefe20df897255b4560ee1a6c641a3eeb61a09b5eec61e2f73b3d3d458d36a95abf76de76d9d3 SHA512 31a048495f7567b91af9ac1cf6d9f8dfade6839536ec909dec9d8f874d3db3ec4532e09985c796b15522887db8267bdfe1b3291f5bad43098295a2fc3f4aed82
-DIST KQRRBvK.rtbz 46288848 BLAKE2B e87253cdef1f7100bb69cd9e245cce52d1e63bc23ad3a1a3f607d5ecf194d4d481ea40681dd5d768d17f9e5c2bb715986968d82c677c787c07449808d104822f SHA512 7beb7670bdefd8c6cdc29057809141a7493a5119d867b2e8797c8d32dd880f484285b1e71203175e230d6ad714506539ee3608925b922c5cfa38859ec452e916
-DIST KQRRNvK.rtbw 12799440 BLAKE2B b6b510382e48be14f4f49d637b5462e18a2ac53e8554505f78c96da959a85dd20bddb5f559f65cf6a9c8423c924e8cd71dfe3c1d8557bafc8379ea2dab03f302 SHA512 e47510838e9c084a345515df4afa9c0a1d109aa5f1d94d3f3b03280352fd85a57bf58f54edb0d979fc317dc323af26cdc2e6f7f6dc6a71964713ea3dcfd902d3
-DIST KQRRNvK.rtbz 49557456 BLAKE2B 973c018e26d0ce95688ecf386eb03f6cbbb9b20f431825aeb76af7399ff75284721325565b45da9e179645b4220a89fa0020a6faa16136518eab298df3489a2c SHA512 44459575e975e3e44179e5b7c55d390d6b5e20f846e359f270acba82aa606621e71b2e852399b11d26e76c127111edf38e15b28e60885aadf5d3fab2a8291e55
-DIST KQRRPvK.rtbw 40372560 BLAKE2B a3f9ca8c621e9bb06f74bcca446790aad41f14c3df78dae736e6ad21bca4763b1ea8ff3f498db7b05a67180b16c7f5e4298601b3c8d097acc2b0a3a4ecbece83 SHA512 1503fe225918fafa1c6197840788d508c5d590dd71c3f146eec252370041b2291d871e89cc472175fe5715012fe80b0dd355c11a9ddce77809c1a8bcc542e7e7
-DIST KQRRPvK.rtbz 30194960 BLAKE2B fb7f006eeddc6c1c53410283c9ea16a04a5557bacea37854e9818d1e3d6ca49444927df5c5fd5db3d05cbc7025545fe6d65e01d7d0f22952a47fa2d0af95b804 SHA512 c6310496b5365aee32870f3188832319d8a70264a0c5702105d7038d73f6e8bf2770c6b2db3de5387ae826ffb590b870f2c8bf13a5e42076b6186eec081d664e
-DIST KQRRRvK.rtbw 5286672 BLAKE2B 60ab939950664fc55b280105866637aba77b6a64d3df9c1b61c5ca32bca41bb4fed41322cac7e449e3e8f08680c2652718d22950d7436dfa6f8701c0a0c23088 SHA512 a2cd9f052309e922850ff00a83a7b117a80f375bb50e4240ba510e580b4de8605aaa29be797542b89088769f5e2d46890c3febfbc4492bef690a2f85994018c6
-DIST KQRRRvK.rtbz 10875152 BLAKE2B 16dae260fcfa798c38ba259bf064e903b671f387104eea24363b5f29595ba1c8acf3ecda0dc4decdc8e7015ead8b9d21bb620adb9c43ab363b45baae6415b945 SHA512 676b388a6985068fb0a514b4ed69eb20a1c5ca76f5247514b6cf5becdf817dafd30ea32fa6924cfad9fc82100c49eb27452739d0ed3637f97fcbc08e76909ef3
-DIST KQRRvK.rtbw 200528 BLAKE2B e2335699502a6d4918f293953480739a8ed1288413a1843c5c34eb9d5d21ccca1848948c7a26ee52e96b4c6a50165353e672ff3db87d67d61c992854a1e835b2 SHA512 3c53a4104b9b4094553550ecfb9b09c47fd87e271807ef6f63f0e2dfed124ceb2f34533515ea0d3a872694af5ff3c06d06319a594cec0985473f06f838e2b03f
-DIST KQRRvK.rtbz 880848 BLAKE2B 80d389f909d5f32be6bd3fa7a5f52cb347ba4a9bb2059372384a6d815e34f7a6390df97131b7cca4056fa6a8fd5644d818153c6758605cd88458812c9afc7f57 SHA512 90602cbab44cfd990ed57c2e4333c07c829e757655fdd491f8dbcd7298bb40d772b0c88d9bfc4dadc2050732ef93a436bf9f38e6ae296f6b4067ac123c25a901
-DIST KQRRvKB.rtbw 3739152 BLAKE2B 37808dc9f851ac0af4f97bc8f73737772773c34d23612961925087cf732eb22acd680ca7879e545f638fc67acea2b9a1c34fb074da0810b12fb801223b16583e SHA512 b6a6cc29985c99a2ae0392420d46e1979cfe565aa98581a38056aaecd3a3ce4fab5a5c9c7fd257826ea52c88b745bbd39e1c901b28b6c23e3c589d9ac143281c
-DIST KQRRvKB.rtbz 47545040 BLAKE2B 559ce5fd00ab40957e82b8ed9e4f4c4003a735bac1cfa7d2aa3b5d2812e77cf4f8b4bb20b9c9e2101d0930ab105c8d2d875ca54ca056fb9bb8d086fed0b70933 SHA512 124c39ecfd0af44fe6e61921b7291ce3e471c4839c15194c4375f69108d3880c39007602345cbd38b9163f0eb15b6d7512d10075601e5d0695c59ae63152ee5e
-DIST KQRRvKN.rtbw 3752976 BLAKE2B 70c91418ea47f66063d2469d6fb0fcbce04003fed09639dda8a24a9ab96e1ba8ecf329a98027c2625c63827942f900d0bc791e733c11a75f9af71df5d46537f4 SHA512 713c97c507e26aff3bb228688bc0ccaa9d95fc7e697854b399a6a828fbb3304ba537e3bc5761c2597cf77262cbcc4a60c48de084ae87d93a70f0c746e1816b70
-DIST KQRRvKN.rtbz 45985936 BLAKE2B 2690789f86faf6f06bd251d73258950514d4c1e02d16bff77d77d42432d994fd721db75822d4da3f4eeae3ce1d7338b81d828bc60a436d81ca3bbb94d840e7d0 SHA512 bbf1a510b2436c785db1be4d8971905a27f62cd59f1caf9881ccbb455bbf12f79bf8f4ae4ecf20e9f3cc447411eda092ad07097601d5a88b82f619f99764b5c2
-DIST KQRRvKP.rtbw 17930128 BLAKE2B 14bfe61fa02f9e13726999cdeee0d1f1d5bc9b8dab5b9e6db093c0b48a29d366743c51f66f84705a61316a7be8fbc6f5cee32ffc088e6b9c1250c8903cc17611 SHA512 7e5e3f29603b4bbb916607332e204ffe11d8706e00d450bb774cbc7f6630897fa388195e21d9d6a6e134c0e966827af896fbab4ddf4ab610ae0140f10be38008
-DIST KQRRvKP.rtbz 89103952 BLAKE2B 4cc6da527ed8b344966ac0eecf7a4ca6431906c0a7a0b39062d9ac190c8a314ecdc75c7cb2d489f30a7f74e277e5ba6f3e8d5499904705457734ec9d52b0c14a SHA512 04b55c792e46ce725524f1b4bf7a6dcd163a3b3aa05b1c465dbeb42ba23240e1b0a2ed73baa8c43eb21e474ba4da672096e936cb1e67e44152038cbffe777229
-DIST KQRRvKQ.rtbw 29146448 BLAKE2B 78d949b331fd8cf4bf3384fe31c5c936453721883cde29e7b3f985deb4af8afbb572282a4998a68c9b01567ce93403a40b00fb0f1228d9b78f822c074bef959a SHA512 6b94735d10117101fd6eabf9f2a7eae2b058fca37689b76f42cd5b436100d915c1f279d069e688bc9e95d0284f6dcedf9389fb0b4192ac55ea92d7ed1b683bf7
-DIST KQRRvKQ.rtbz 109369168 BLAKE2B 5ba9fcd90c5da67896072f7ae697799cbee651829feea1f450a1526ef7684e3c0a3795e8e83dcfa9ae9635db11c62fcdc34829cb4edb834159a7393a42ca3ed5 SHA512 e9a621a95951267296cab0f5a08cd9f0b1b23d46eb3c8b439d0937794054d260a4c9021f9ac5c2b4ec1600273b8a4e445feae4b916e804f010537daf2d985e7e
-DIST KQRRvKR.rtbw 4563472 BLAKE2B 74b85c472118097c66aca8f8c98bc989f6d733d70e9475652d4ea2bd99baf7f3937d89e055a2fdef044c3137c95bf19489910a6dd3a5cfff492da7f304493d7a SHA512 3025ec4e2c978c9b0d2d82cbd44f1d050852b84d23db5ad7daedd61ea74275d37f6dcf82f5f5aad96dbb454b04b276bb35f41c7008c51b72122e087c60c4afe6
-DIST KQRRvKR.rtbz 52081168 BLAKE2B 37495ef48f24ef9d1505be3807e480e27cae5634f645e6df7e0e27a45aa52f257ef81594ac318fdba19567013dcc188a0d031525542ae038860ed0a5c5f755ab SHA512 49b116b0c66a484ed6de24fe6899e9428bca15fae723a51f6f622f3ae28ae711f71e9b3c502cbaa3b249a3def97667e4aa8687e6e3e73f7c6281f5269bcfe1ac
-DIST KQRvK.rtbw 4560 BLAKE2B 2a61cd15dbdca135ce62b05548aa5b9a827db9474b930737f84a1fec4b134531cb87c50eae48ef84603c83447c1b15ab11e5a8db0cf521ffb72b42fd47ee92d5 SHA512 a9397fb687bad6d9c7e3bdc28a7dd85e8b3082d2ae0150be59987c41087c029ee9af25dfd280a3cd6b4649a5a35afe5b6a52e37abe6278fe103a978a248f3438
-DIST KQRvK.rtbz 44112 BLAKE2B c354ee8dd3c810bc489f6ed80f81af740c4ffe8f9e426fa488b83638ab751b198f907c5d04cd3258d41be3fbd38db397d177b6262dff6563ba5e85cc0a204397 SHA512 a216658f6e6c74783f631c76a787e4deed651c4dac3a60f1f03267f7b9f583e5d0277c514bdac9cd2d13ab959fbd95131eb6727252cedbd017a5273a79345402
-DIST KQRvKB.rtbw 159568 BLAKE2B c5f208787f9e4a2d2c050c299bf8af7f89e8f4b8ecd3920c56351bffea9ad63144b3721f5ebfcc4d16a1a5d1108f8e831ce942e463873296f36d4cfea5e406fa SHA512 c123d8f7b5364e91e43575c7f002bcb2d07dcd344dd3e924af9175514a371f6683641cf82274ba45d8842bfa03ba289a786831b1edb6b01f9a3f055eca3de157
-DIST KQRvKB.rtbz 2664848 BLAKE2B 6da0489356744af8ba66555bd6afb7c8ea3a08355d7468bc5e83238429e25bc5bca53b32d0a34f0662be319dc741bd4f86e2d2761487dc4c0e4b5a669dbe0588 SHA512 059aae92841055c9089cfc7689cd535b198d93b39ec7af759fcc385ed06f2724427760b6029bf1332279481a8c0ec14e7bb85dd9a05f95d9dda76af16457027c
-DIST KQRvKBB.rtbw 15533712 BLAKE2B 32f31c46e681b4fedfe4559b7d36c37a044e82ee6747de1a46f353e8631f459bcb8403a2c20ca1209c50b6ee9f51204d77ab63b7c536df664cc1086db95e81c8 SHA512 9512ab9292ba8be565179272730c2e52ce20cbbae29e0f902857a8931857df4f19d4e726b758073353c62c5f59dbea6eb3688dc4f30742a1a5dc6830c5dc244b
-DIST KQRvKBB.rtbz 79237264 BLAKE2B 3fa876a028a8a85df043928b684f1e14d266fd1e1b9db443669230ae80a51cbbaec68df3721894ad12ea15f940978cbc4edbe7fa2c1cb0232927d6348c4b00b1 SHA512 14c66c2dc6072bedb1f79a34336b5770648ec1f6ab8a3a70cde9d167428c3b6681ecfe68e9214ab9738eb595f651beea6d816d98278e04a9689adad3a07ae74e
-DIST KQRvKBN.rtbw 32155216 BLAKE2B 93105a02cb4718b543359dfe13273c4fd11844fef326de5875f30a4952e163f0f072ee30cfc3b7a502725e8db1d64f32dfb4de0443d1c5a4688ce1efa4e0a100 SHA512 8fb7245d384c33e35627d01fd1f9d01c4b263d028806474018684946a96079940f87ed2de3846a6c824215d297c4c8e282190c8c4cce6f294eb3d96d8d89d029
-DIST KQRvKBN.rtbz 114842832 BLAKE2B bdd231a760427ce082fa4890eee5fbf07f8148f973f0233faf211f35187291716da59ce31f335fa09ff2ef3fb47e029e35f68c1be1a4882e076bae6f0de6e366 SHA512 b1a5273f883609b3ae6b67cf5d60ccf7ebef27de53a920c522b735f93b57472179bfd46d69074481ff3bb39d40a292829c784a81ea4966bb70603834ce57e1c2
-DIST KQRvKBP.rtbw 119317200 BLAKE2B dd009e05ed7798755ac99be1695051593c4b76b2699aec92343352ac2471eca4bbb13675baa31009e2af07f0077baf53dcd693c178e297bdf12175d9edb17580 SHA512 d61cf74ee64e86d24db22bd67bda82f1fabeb58592c67e2688859e2342af5e32f46a3f384587b3ef7ef96f56a39f2ed78b248771b357db64981d41e15e73fc74
-DIST KQRvKBP.rtbz 218380432 BLAKE2B 07ff7687754be9dce41487c48a3f5f0d6faf4e50955fe5002f8f1dfd0834ae9abc3223709e7f38cdbf20c636e30aefbd54246b2ab7d4bcdbb9100a9558352967 SHA512 28143af85fa8bc7d97e8d798505d1a8849a1c52f14ae113731ce64027f83644b013d535b4588c848de710a983794959944233bda75bc72b99552e0a25d60d7bf
-DIST KQRvKN.rtbw 250832 BLAKE2B 5f1661fe741c1dd4242f24d92607cebc98a1c6e5b5d9d142c7ca0c629e959d9c0a45b74ea20198a286f27ac575df05241924b7a12207c9cf7c99976e75ff90c1 SHA512 b9176997c3333b8c6720ac9a134fe918297cea0e39906518411e87237f19c1657018b26d4cb2df0351ab0381e6113c9facf1b92ef342425f6a9488286fdb342e
-DIST KQRvKN.rtbz 1878608 BLAKE2B 2274291ee74a44e146707a71939e6ea043b5deebadf982ef70c42b954d2f2eb4d5f1af9eba32c9f9acb4a5208629c87276bd54ba9426f56f73b711df2f6d362c SHA512 a753abdf0eb2a3302482a55727b88e6860e8b4518af0c8f6d3b6f94dc0d81e60e2b97182a379b460e9a7d57694e1aa09a118cd95f865d5a53941d4141ec8d347
-DIST KQRvKNN.rtbw 22948688 BLAKE2B 07d8c13d8384e9b8c17b4cf402bfbd0dd403a5a95cef7b59e37a3e99409e6831d47b0fa1538865a4452826b75dbc6c1ce3882755dcfa360607fe60f8705cb5ac SHA512 6319d35f121e0c83637b5e22450439fc595bb4c4985af0985254a9c3b9fdd1ce186bea42e7c8ccb4f613bc0ef6984e45e03f9b9f8daaf0618dcbd162fde8a11a
-DIST KQRvKNN.rtbz 49082064 BLAKE2B a11ebc982be5d10f1b0e82cd2de139418d6f8ef060603ab31257596837a6d42dabcf519b997502b75b6641c885e92acfc450c49afeb128ff17795b44f8790108 SHA512 19e30e4541e88abdd5111f64712dc4cbd126ac236a512d1f73da3427809d317c0762dc6ee1c8c4809e04a67ca4291f8f8a39d69bd30d8bd51d3b9ec285a01952
-DIST KQRvKNP.rtbw 137872208 BLAKE2B ee575be204dbee4091be3b085b41cf597e825096423a99ed170b51dbea2949adabe5a9e252c2520ad32ad8a0453f834e706ee56e124d90a0e02cc67cea981d4a SHA512 59a137d7a08502a237059ee05f788db39820491d1ae673aebcfb04f5043b5b5b28685949d529a5c4843cfa660d35ca981576597e404dcd1b0c9849d952ee8066
-DIST KQRvKNP.rtbz 181283152 BLAKE2B b9fe53fbd927020e1eefbaf9e314e3a8ff2a09520e3d62a1acddd64790f8084d0c994b62a9fbccc263d567160c307edfe1ff0b525ec203c6b67acae3a9ef29ff SHA512 6981920f5a9e381bbbc9c7c362f85c4920d2ae702f3ca3decac0de36c198b938fa73d122562bf427bd554610ec148d19004af2eb6d18e0f721a8f2b2b53c9bd7
-DIST KQRvKP.rtbw 984976 BLAKE2B 8f4f07df9ac84d04426ece1a0f5cb6d7db1b59d5ea18ca27922d10cb6eb8155f42fafc457055b937d113f129fb13acae0d4d17265a3a2612f8124d48fa75ea67 SHA512 d2c05a335158cb87e969fd60208b8be1ff776eed1929fad6672d3b7c2f61060eb34b514b5996858ef7b0fd25a7f730441ae7dc4be5d97cbcdaab6a6725be4303
-DIST KQRvKP.rtbz 4687056 BLAKE2B 848207f7351125c53a24d377f5a9bc619a17c2f07d1fb18b5bcd041eae1f5a2cecbdd674c3dcdc4f589a9f9af61c34b0ad9e941efe360c28373ead3c84fd827c SHA512 981550e571684826558b7ced0ecbd06560e7fc20e37c1580a3a788f60d5b75bc6caf832eb3316d0086624d08b5a634d37b9adb98c774c52374370959a8d475be
-DIST KQRvKPP.rtbw 40663504 BLAKE2B 70e557df6cc30f165d861ff47351d14dfc50cebe81ed71995b67873383c8c028bf73bf9a0ae00c3821424d69e6a66b6c6f4bd7bd0b6646c63a14b09c2e55c41f SHA512 41571e6fc27fec9d90380946f03d7a7e27fa7f6302ffd7521975c7d26ff3c2e912b7e9f79fe0d76e44db867d15e18c1b423d962664f5bd7105469cab481a6458
-DIST KQRvKPP.rtbz 66843920 BLAKE2B 16904cf4920632b39837ccf5618578c4af2e83d2aaa9ab8925e3ba4f56bdc52d87fc7259f1e8d89c40a0a6af4ff0efd2b47cc9ec1234b32a70cabbc830af77ea SHA512 e5082f684d381c2adb981d2bc147054c8a7443dcfc1dc1c8bf3d8dc5a6588f7140972cf6262720fda406ed66eec0f8e23de6566197760b5fbcfe708560033947
-DIST KQRvKQ.rtbw 3095888 BLAKE2B b6cb14b67c75f0c653317b40d89d1426c4c2c6a7b3bcd925fcbb80e027604a36674c0d2ef83c3b08b5c82fa0230d85961c050b838ae62114b876db9129ca38dd SHA512 53db7e9541d539a0800a37d395e23809518828380bc4a2dc9d53d8031169c4f417e41faa3917310151c229a07031f63b6cacadac6a90f4d1cfc63f83a5ba34d5
-DIST KQRvKQ.rtbz 9245968 BLAKE2B 926fd205b879fe9cf8b0a3499f6452f5e544fb8bc907b0c3df36eb26e85cf47de42d3f4f45050f321a15ba4b817a9db63fa76b2fdf35a80f64226713b8d08bab SHA512 93fc5e2e9b4c1ff092f6fe0141c8f56196295072c37de20368a9efd946f788b21e54c8a1f68ee5f827d7bb0577a29814cd9695a6655b8e04a242ff9479bf4f6a
-DIST KQRvKQB.rtbw 386598864 BLAKE2B e851401ec99ff5049e6ccbcd7b2cee146860d3e621fd794aa2966d286fa645d5535001bd9598fd384f7a5560f65ff6ee640e6a7eddf318df6562d4d8c6e8e361 SHA512 e3ff4acea2ebd7f4ffae1c3bf512e3a480f6da9dbe3bf6e6578592208f5248047918b6e04a303d607529f3d8d2bcbd0cc31795ceac5ec7c23adbd429f9d973d3
-DIST KQRvKQB.rtbz 340386640 BLAKE2B 091af1f9f4494cedb799c613311e61122c81e007ce704e3e71ef668f67b2c7cfe65fa1ddbc3783d9fe346a91c615a55bdd5b1e6255306729445d5dd76ce1a68c SHA512 7a11303604b096b10523ed7ce75d697dd22aa136f41aefda6ecf40de9ebead7261385fe3c0b242c4f30fb4c4742cf021fc6557bbcc418450e944a1ae95c4383a
-DIST KQRvKQN.rtbw 367470096 BLAKE2B 87b912ef2b98713be5cb9b1ddccc79867e2efd798fe46f22b629fefad4d6734426ff1491c2993af6a0f969c72d3de9e8f368eb2c46375aaeb6b104ca69423f88 SHA512 a9d5b7e16757883d469335a3d00e39bb8c31410393a4938e8e69b0aa16b538242db947dbc6797d2d82af793e1667afbc72aacc2188f4fd0057ca71cab210c7c4
-DIST KQRvKQN.rtbz 339980816 BLAKE2B c88b5414d2a759caac27c443807551978990f43cd7fa27c57e0af93db07646e1726b3c32079435c629c632cee47621364a449b10f3673412f420d977d086dbd1 SHA512 dc2fe2fbacae8a2e0ab79398a2baf5e40a671c16c5da8047f9a56409b7a70cd86843325067e8436fdca69840283823cca921b594b8d25f8acd7fb379fe0c143a
-DIST KQRvKQP.rtbw 865977040 BLAKE2B 217bdef78299e8d25851140646753855c5dc68172f82e2dd0cc15b8e6bda2ec43c38e695c6978546ed1bc5b0cb416de25ae897628e233c9d9d0a5be4e9274c78 SHA512 bdced4acccefb0f184507f2b69fbdfb9b56300933978d5b26a86ef629aee00dbce33d18d37b1fc1b0421701d58e3debe87b8c715cd0811cf7e07e07f1f0e3957
-DIST KQRvKQP.rtbz 1311151696 BLAKE2B f7e0ba8bb35b92326cdafbdab1db2afa57a7390b8a565ddc96ad2031832014fb8ee1236489c0d683b9a7affaca12906158f803feb535843c13c69eaed2fe4a6c SHA512 01c149868e91f8d343b607cb896cc26af69fac12840515cf3738aa6912cf3288ef5f3426e55be10ce96d15b6489bf283832aae8655d53a6544a518c909a6d4ab
-DIST KQRvKQR.rtbw 166901648 BLAKE2B 3c8f5781947281b6060435389c74b7c5dd173b560148ba3f565ddf4681fd0cbdcc1b88a5e822d1c92a3a17e1465eee05e1c0cd18406e328912485d5ebeb52598 SHA512 471ab030c2890fe926499053ef074b749e13a3b52b022ee02eb4ebea3d87f06a7b5f689304bd313572eef4bfab51d66dcfca3a27835476f2ae37cddb50f2fafb
-DIST KQRvKQR.rtbz 543938512 BLAKE2B 68eb2fee7c0c790502446dfa7da767457041babdb410f37af6c808e7b271c3ff6a6f1814302b9b11dd50d33f24e886fdf2394f57bb847fac5248b72a19d96978 SHA512 f6ad3721c245920382ab02178c67e11fc490fa827ee990276f8aff33d4f8df58003c92e806221832046a64e8171043a88179409bf2f293b28bac5f6706698435
-DIST KQRvKR.rtbw 279824 BLAKE2B 61535d3832038a22d3c33d35f7adab20f187813830eb58caaacbd4b85ad659477a7a01be7469237c577c071558ded634c5ef4be1541ad55513e55362be82002a SHA512 1b6e11c74f946b99f4aff1963158a7b0bf041c7c09ef4e6943e32cd69b7535d59404143f8201a80b6fd331b0a33246cc74e3b0a43d3cb6d3ae34f781f2a4efc3
-DIST KQRvKR.rtbz 3421968 BLAKE2B e77ba734b03c6a60b373672df80df1079b739f4e75ce885fdb528841ab3ccaa591f9b5cb25dba452ea131d06575891cbe5747e2cd4d7187003ab55d03ee247b0 SHA512 3ecb56d2ab01bbab46335bc167def5d9c7d9516fe53d328d5d44c68b6207d141e04a8a55f4369850202de7fc23ccfb7d2973f0e9c81e13c5294b57bf2da78c34
-DIST KQRvKRB.rtbw 88047184 BLAKE2B 025428c40cf31ad7e6ed95459d5dd3eae9b4ff6bc229af23120fd473b476689e40476acb11fa7dd038950574279fe5788546a94f19b64b504bd44475101bd5fe SHA512 046eceed4af0231598910c06ba2c7b106f44dbab458fdd35d3344c89e9dd558630c5b5fca24ec4a5f92083827a5a72a6258e7660ade37585afe313b3c2c80aa3
-DIST KQRvKRB.rtbz 239502160 BLAKE2B 353045e062f2ee8d29b5736914297c9a787e3320f0d514e4f845739067b045e7bac9a27fe2370a7e87951e67e7bc060a54ea612a2ccef9176767f7869ed59fb0 SHA512 7debca7dad30527194cea1b41da4403f3177294268d1f83303b706170aa3d42335d11d525d69235595afb14d63ec0a54d58b3d960701fe4de4ff5476e98de3b3
-DIST KQRvKRN.rtbw 70927056 BLAKE2B b9cc39022d83f67db18d8f101ab0d82d7006589fe408f5d56ef5bd57ae0260c4438d83c3f520f675bea46a78e7fa15fd3db0118fee0c1d93ca5467aae53db6f0 SHA512 aaa84faa94b344688822d206e531bce9e78b2c9ab90ffba6356e5a24abc2e046ab2dc01696f16457d7ef07aa42281201d55aa02507a1d4aa1807d3004fd50659
-DIST KQRvKRN.rtbz 200742672 BLAKE2B 2f22636f88cdaea78984aea3d247140f735bf8d439287227832e1441425e955ed229eb583e7d9e10496737dd104a1b37d4bb99174b70367c1fbc6e0209031159 SHA512 7404ee3e992cb7b7a1d6b525bd4cf385418ff6bb19a448ed137aa63a6e2248e273a58ce061de684c40ca565d9bb58b09d952d686f08f2565aec81876101ea4a4
-DIST KQRvKRP.rtbw 175112784 BLAKE2B 10ee89e905adb02a0833c51149729570c2c39169dd354720448ba5a17cff82bfd62bc4b430c79eb7cff68681cfe71bd56cd142d2ec7e7c69fd60566e88e15119 SHA512 78e261d509133cb4b8251a8ddd10dec80156022fafcc74440936b8195bf89ae3bce7b2a6336a24543a21116a5009d1e183ffbe783d66c04367da8b2f4e086fca
-DIST KQRvKRP.rtbz 405163472 BLAKE2B e3d237464fb801ef79424b154eb7e4c46084bdc1a8eaf6b2c398f5a83cb8909516326e3b9c4bb02d73288b4bbab67ffc3cbadd477274b3739674b23242ce7478 SHA512 c72d68fe3ccdabb8be0d0590e5849aa968b72af9fb9337ad0568931d9e07f0dd89aa518cc9ff0fe1080fbfe4f6f5413f7fac5b3a55c139807ff18dc52eba78e3
-DIST KQRvKRR.rtbw 132920464 BLAKE2B 3be347bb4ff60eb797b94d33fd961a87607d17ac28782ba102263772244be288bf2dc24ab182c581e1bf1d1ca912c73070761f5845f617d3d643fa63172289d8 SHA512 55aa3e5ed3118996580b8621610377f2e7b99c5090e83c6734ab72f155aad99a65db53e17d7a2642dc9e9958baf3b57142b81f164650a0a23fc84496d509ab4c
-DIST KQRvKRR.rtbz 177186000 BLAKE2B 1f9075ec3e5ea08a4a6325d2fb8578afb00253568c571c43a5ab683d6e25e1900a71fda9f7abb45e3889c3534ddb44603732bfe2e99354aa342d0ed11f144811 SHA512 311ed9295f601c372d3753ec7aa61f8ca5dbbf1a6d561fd516bdd4cb413f6cba1c6ab2ffde1a36e714f12e3638deed6678a7cecb9fbda5b1336d119e7558bdc2
-DIST KQvK.rtbw 272 BLAKE2B b17ff1d585da3460905d316aabad4afa2c6a2f4d458dee2d863934156d0c03022c13f5980dc39f6ce8279374946f1096c921b13a72cab1cdcd4550a53ab91ff2 SHA512 3afc266901927629c69d7423b2e61620c63ff6f8d5ec9736d6ebee27dce907fbdd4fce025fb4b502b96b4e2b165eb69d740cc5dee58e48dbb87f755c17584ebc
-DIST KQvK.rtbz 5328 BLAKE2B 1ea35d259684b663fea8fb6877537a10bc398146532b001703809b5032ae8272bd008d7d0f3bdf321e84ad1c8294d4e8d9cd12f91a02e7de9234bb8b83714b5c SHA512 0fd1a767a0fe598b3ffa6e2820fbc85a9ea090616d78fefc6391aae37f31b8dea7a73d35efc96c4ead93fed63c3db74b58fd0cbdab230c072d9c3b5a4f25a4c4
-DIST KQvKB.rtbw 6672 BLAKE2B 472a98adce2d3480e463a899e1ed53e65e26f861ceb7774e738f04af9fbcf0477771730e57116bf9a4f9b277186f36263550efbe53da38b28af53f7ac8fa3e1e SHA512 2610be76c6cbb935fbcbae4a98889b94fa408c14a97920ce0bf26b4038ce3b0d8adeb5f306160c272e18614d2fa18653e68414d176be4c19a8f43f6d8d74ea34
-DIST KQvKB.rtbz 195216 BLAKE2B 79ac041cca1ed4f0ebea954faae3d519a2ba263ccc71508d865167795186a28b6d6a1803f1d3e7dc4222abbe13f1d2561d9a65c712800aa8c86a285ef7ee8b40 SHA512 24493cd07835751c46716513d105d3ea9d5e5f6cd59b8ba0e145694349b5c244ecdcc10aee4135a46d0ed2dcfe84b35e06f88e8664d08f09531be0b22c6346fd
-DIST KQvKN.rtbw 10064 BLAKE2B a1ffbd5ae5f8a8c0fde38d2ec8e33f23a311df0c8b8acb723786547497a16bcff6e4fcb6de29c89542d4cc83889d88ad61524838f1cdddf210c7beee8f4575ec SHA512 53dbfee0d4641e0f64cfb015cacb2b6cf4fe48a754f8ea5eb79084ade944522a58668130c0b4702c72ee01ed879c20d7f1dcabc6c80e85ab036da47f3a6c2949
-DIST KQvKN.rtbz 162640 BLAKE2B 566c6979b83f41e967b955ab3015b6b68fb130813d97ef9361ac7b1d86edc22479632afc8e0d22ff0d1c63c645227aadec203f48f1274f3abcfba530a456daed SHA512 22e3e090be2663f970e5ec08c3f6f0636e7f9d2600dc0986c3ca9be8d91eda99e93f1601e18efc1d224ca06b215b1f1454cc37f6be678480df036ab092ca8b6f
-DIST KQvKP.rtbw 58064 BLAKE2B 18a1110072ba8263e216855203cfabd91696b12cc1cd0207416aa722eeb5873341a7452677a1180d9cebf948ba96da5b91ee10b04cf28f95ab65901a40c7804a SHA512 1fd97989d8b8c2f7add83b002485976fe15406c6e928e0c6bcf60b65b6385452f094487eae08df57e5f05b3f33581b2b8e6c7ddcf25aeef052d21154f0f036ca
-DIST KQvKP.rtbz 205776 BLAKE2B a23b221102c2340d813aecd58d06e0a57011eba22acda3d040890561338207577a1cf2660d40a2fecd4cff5ae200f05a5e9688f53f3ae955879c7d8d63172447 SHA512 034ed1c1194d868704dd05fff22fde93b776a8969f789cd8d69bc5358733bdf23ad6600138c9b508c96eb98fb2b7cb18e177f8c32a65b18f9761a580d1a0e1f0
-DIST KQvKQ.rtbw 16528 BLAKE2B fd506442e2c0966b47f128405b7642e4d1567b4b91db86923767b19d4fa1299b31f46f3a8877c7cc479a4bf9c3de19601133530241823a20bfde23c970a84274 SHA512 995f605148225edb3c1ef55f953dac2fa264cda41d8ac85e1bed781c830eebbccf105f7c0754de0a87b7ca6a84644f82fa45766413413db5f76420ff36db2ccd
-DIST KQvKQ.rtbz 6736 BLAKE2B 04344e9141d53d6faed4cc1f6979591b7bc44a1bff9b52fe99ad2fb42d9f770a0caabde9178e560b993f54b1a3395699683b86989f8f59547ea0db88914d94a2 SHA512 6ba0c0e9f02f2c73e5b2d386f9dfa50624a5c5ccb88bff333501b21278edc44abec29f4da60c1504258aa0e523cea01a3187747a810b2d90fec0965ba0abca3a
-DIST KQvKR.rtbw 20496 BLAKE2B dcf243a896fe2c7f69062de640cb3f81bd009de199ef98aeaf4e30af21c22450e28346ccda7a411ce69116589b66344ecb7520527e57693e2cb977387edcf0eb SHA512 c2701e7527a4bf2df73135bffb857ad3e355bd2605ffe1f11e4ffdbaca2f8f0fdbf05963e00d8efaf186f5e208abbbd50488baaea255785d07f8c908ce015975
-DIST KQvKR.rtbz 309008 BLAKE2B e7553230b827217164872809425ec64ad4681d811e8fb3fb96809dfd3d688e0454aa0080485ba99d3bd0683d84b0f2e29600018d245730788303176c31f490ef SHA512 42de7ee3a638e6093688a0858788fb9d79f84a4ead97ac4ebfe39e9b0b355b5015ce6f6e0caa22b7e439675160c2214d47f4cd16b397ccd80b869ec49710e4cc
-DIST KRBBBvK.rtbw 3267728 BLAKE2B 3c44299880aaf055cd8657f50d636b30764a9dd3e9d3dd5ba8e011d6cb5b174c8882a0531dfe7a83f4424706efa8d2bae560998df0b0c4cdee568d084aa90fb9 SHA512 b813c24c7fe88df63fad32b8ed24533de4e682bc287fec23fb90fca045a681b619675b4bd83b572dfc36b7fde78df545ac066cac2096748cb0333696a73ca362
-DIST KRBBBvK.rtbz 89078608 BLAKE2B 9d65ddbff27a04c9db558ded1f16f2f65eb3344742600fde064e50f84eebd66f1e129f1f114a6cf6d6b90429e595949a6a2c8b88e5a13106f26a2f8e784e0d8d SHA512 850308cb7872bc60905d6c6731bfa298e547944c735979e7be931b531e646e0b76e66ef9937f87e23ceb5a383b5ee4988e9bc6c6ab116220e047e9988a9057c8
-DIST KRBBNvK.rtbw 8330384 BLAKE2B 6d2b953d0553501aeeddf2803ea27b978f0cf3b0404d7da3e7454f72aa8b20a6f065a2b4bc6f4c7cccaa5d93c58d03371602805edaa593c0e7920acf154c7745 SHA512 9ced7b80b3805dfc010af4e78be73d80f0300112983e29803f5d981d076c6314be79a88c0a2278bb15984a208bd18b41e075687b0633d2fa7f1372869dec14a2
-DIST KRBBNvK.rtbz 232027344 BLAKE2B 20f19e1e3454bc8745c253d2bc893a56571fefdef7082f6b73781ec248043de46b61cd676dfb4d81f6900ed7e4208b81b3d548117578f6ad5a4b4f4d6e979646 SHA512 b53ac37d823362a5f34a85a75ee7c99e99b4e5fbe688826065ec1f8811b0960ddfbabd57632a8b69a1e75c6a3262b01b6cc91d86e66167d90a59190d009fcffc
-DIST KRBBPvK.rtbw 26275152 BLAKE2B a0d09d7b7582d8c1341ba5df968ec9c4f041924d5622f2f970f46e59bfd6832d748226a33009b8a328355909241d7043dee90e147c343015c1dfb3da670331a9 SHA512 de87390f8ec8946f8df3ece008ca49fcfb1be0b735ccb40ca426ccd66754060b7ca9a07f0ecf5fb3ef9f44b2acfa003905e4ef1a8752e596165d5b52f80f0491
-DIST KRBBPvK.rtbz 47005200 BLAKE2B b1f841c2d9cc0c630c3b78d37d5ea44d624ebf55cb10a37e3681d517b6e527b6cfac9d278331710c3c3e5450580f97fc7b26afbf5e2037b7db7782f8f93968da SHA512 37894586259ff7335b89b39394cfe43cd01b758b86a00d4d15cb15ae48cc78247375502533966eec17ab54e65350cbc5b9eed26290ad5c01bd507687f59ff0fd
-DIST KRBBvK.rtbw 134416 BLAKE2B 1d31975faaf3e0706eada6d2c5c2d15040efd97b6ff255e5bf303390e9d6d9c5bc71c6ece2a16bd43c0e97dc7dcef745530bab45d7f65042f8fac04c5bd405d9 SHA512 4d5a41861390bb554782fecd3e3eed3369828fb948491d16e81471fac89f76ed7004a7af07b822f64c2b31ddd5d6c2cee3e3d4b9ece84c354bdd1a8cdcaa95bd
-DIST KRBBvK.rtbz 6354384 BLAKE2B 084db02f7fa4093f6aa815d56cd34d55add6831118eb3351b055f76914a8396b2de2f2fb54fc740ba7ad8ae452f7482586fcf690ae38b3904ea8f70bb58922f8 SHA512 65f4fd2fed268ca72917932e042e7269a7dbd40b8c03af22ffe8d833ee0c3819b38c3c669b211889f0501a2a5bfcd048d05c5715760cd59202d54f430c0bc635
-DIST KRBBvKB.rtbw 16366096 BLAKE2B 14ca9471898c5f22b320dc65a8dc5eb122a283c72ca46a9215c1c9cde52b3a47a94f49e701b88f79b88286407a0f6d4f1b62101d5ab94677ef90ebe4244ccf56 SHA512 064e1f5e9bc665ddf50c131c3373d31979fe1b163daf2c43380c6063dc3f9a736fc4c8d545b61805326ee7f1d667f6be8c0ba5de658ad6b967fa83a791c1527f
-DIST KRBBvKB.rtbz 342632272 BLAKE2B 6d7316d0e2630efe108cc469cc81309bef2d04e3c579592c758cfb83b6c0ff6854e646b55510ecd0bfb9c557cb00a6c413c753c32456e5fe4d9a8fb2c4d9a6e3 SHA512 15272393a382bc74ea785dde5387287ee3c9bd75cd97617c0b2da92a4f4b163bb837420bc6300b6f0c201a80ed146eb8200436c48bf62f0f9907189f91870985
-DIST KRBBvKN.rtbw 14682320 BLAKE2B d935599b2f2fb90474ba713893fcc78ae7c6624551147dd5ce6e5bcf378583ef7f227d784465c6564ab7cdbf653a01ed8bd9b564c1f383ea0bfb072eee8d5d4d SHA512 cf947c43235d8939757571d74f542aba897d51a1aba1a7b92c818475d01a2030156c91fff86f02a72fab5b2eba46c95cfe26cc3aefd22dc15e4292617675d455
-DIST KRBBvKN.rtbz 233675152 BLAKE2B 7388e111fd60f852d7d30559c4b21dba926afd96cf69cf6a5dfb5f6b390b8679aaed76cacb1e8578878724be59ed970479657982c821ca4a75f26ee9282e9ca5 SHA512 af256d7996bdfaec74e53f4fd487e035e5fc5585c2c7d5fa17ab653d73dbca3d1675a54cbdbece63d6c64e859b13acb461801ebb9dc7b8eeacb7df6e49dad026
-DIST KRBBvKP.rtbw 102882192 BLAKE2B e52c863e062a63029bfa3d21a366db34a1f13e9c076735c2cefd7229f0b57f7167c9d8191a382f5a36e8ce49a2885b73e57d6e568f0bfd5f82c27d1153712ba3 SHA512 a4d9a5cc2d5b7598c63820d266cab7ffa0541977a32023b46cabf7c790da31552f8fe19fc2583c03119a31ca057f7249eb2de867843d8bed439beda28f48f3e9
-DIST KRBBvKP.rtbz 215424848 BLAKE2B 88670c7c962e187179078b42309aeec4fb345a72ea16b61d0b9e1f0f2ac305778f45b1c861b5f94d1737de6a56234e9620b1ccf4c85318f2cccb1f7bfa47ca83 SHA512 bf235526794580e86cc2312d10788fbd4795a4baad0668b55dfcb8a06ceae28e0a850955c15c2910eb7291c0fb36515ebe9e0e602258a88b39e2882e51771110
-DIST KRBBvKQ.rtbw 248518544 BLAKE2B 8af1ed704a1ff24634b49ddacd8db945584f2e831093adb3c4255f17682a40ce0578766316fcda18c5c80c96a7feed18c449a57a6f935f8bbd22a39dbf233e52 SHA512 9ba4ec1005e972774d8efd7460fe48f6a45dfe7b86e65caa496319a550a809e7882615892e3c84d3738528ab9d90f11b22ead82777eedce68ae1e307578f3668
-DIST KRBBvKQ.rtbz 50603472 BLAKE2B 42afb7784801a93bde400beb98e38316fef4e401532cfbac28ac56038f01ab827eaf33e8e2e74fa52d5a20321d1422a0719819acf34cc37ff9f8661eec7022c7 SHA512 2cd51d91d3bf02954c71ef9fbbeeb53dbbc8be5ecbcad3324401e07cee1d37656ad470f3ce0760d7d90ebc516b8247e48dd509ce5284bd7ef887bae4179f1810
-DIST KRBBvKR.rtbw 62810896 BLAKE2B 4f4e688ce80871edd939be194fdaefadd5570c9dbb4489f410283da20fa555d0967fcc99754911d4e00f1def8fdc4cb60782761023ef6c56474825959f54cab1 SHA512 3d7ea73330dd09f0fe23a33da7a5b4704227a61d758e502430ab390bb61bad7814d14fc945be0a7fa5c7d86e9d7b104aafec2146f1ce5c215717d6d475075345
-DIST KRBBvKR.rtbz 485683856 BLAKE2B 94474175208b23ffd14350b5bc0546a83c8a03f771c6efdd7ec6c485b5e51ff0f5e81912d3633abaa768327c02de55e782a7956b5ac05483a0b87d9dfdaff5be SHA512 74d4a12a67ce356ec9048ae20235f0802a06f098de6f1db7ff35906ab8f17f5f437ff7d2a4dd4aa4e3981e0e24cad96c54d7cf2a33645675ddcd1c695e956a24
-DIST KRBNNvK.rtbw 7478480 BLAKE2B 99da25be88a8e67b1350a4bd7d31a41e663fd3da29b9e6e46f0a116947ca64d64ad73b8925ee28f45ee5b8ab6a02df3fb05b117535a1fe065024a0987baaf893 SHA512 a59a749eab1ec24733499d5ccb48f1ae6259d2488f119fa64a404dc4577ea33456e4330c31ebb60d2cc1b7d6069754d6ecded6f16c0a67e856b60e08762c47f3
-DIST KRBNNvK.rtbz 237828368 BLAKE2B b157339c7c55aa9a04e7f94e6004c1d0b189f6be9c071ed2799377875d0afc862cd06e9c349f998ac5925ba495a51500a648871e613b941762eff333e7f67b21 SHA512 2b2db2e91f4a20e8a6d42cd753e33fecf2a5675722f9f5c084ea1cf6bb60ca9428ed56f2febebe57f91f1fd8339284ba63546ac0282c125a12a06e998158fdea
-DIST KRBNPvK.rtbw 44036304 BLAKE2B 0b1850a269f3c8f717fc175b407fac69ee7ac948fb1efccd63b7bc7c30019ab8ba2945a3590ce358af5bf5cad9005eb029180dd222198abd1cda53400c192320 SHA512 2da0992a5a27f32f4ee8baa32915d37e48387d096a2a01dc3485ea6f2a74ba18ad21e6e6db03470bddad473ea3d7f95a55ee11b8011bc9496ad4106b565a39a7
-DIST KRBNPvK.rtbz 78726864 BLAKE2B 44eff2ec8a0e83bee18178f70d807405e244fcbd680208a9579a8015dd8c7e708930bc234eb98d919edf5c9b1988ee826547deefeb546165a431f92725eccc24 SHA512 a4f294ca68e480ee1224203182298f81cfcf8f16c89941b8442d7e51a781ccededa4ec80e621b49a3385cb8977dd0697611dec7d602c8e96eddbeac782075243
-DIST KRBNvK.rtbw 207696 BLAKE2B c222b8af89dcde115a6f37d1351cbe1809f006aa9c1f63f695bba3e4d88bb8e2f8a3bf6249b113d261b7c636ace354e02b2f4cea119f0604eab343fa778a2ceb SHA512 f4c8205b1860b04115acb2e89e7bd064662f66a62684e2a0c61acec8318c248e0e894e612185d558b43f264a7bb5647a71259e36ef5d1e509e1ca584d8756b14
-DIST KRBNvK.rtbz 9500944 BLAKE2B d5cba7fea6eb222255bd0c13411cf226d4b50bf70a115500d26b4279d62093a849ac4f4cfa77498bdfeddea2910c0857524e6a471b1757bbdb3a33448304a7f2 SHA512 cb701c3572842cc56eaa460e0aecc0fc7aa8ee96f6e81fc498e094e40b7092d903836c5e08669ff2ec1ae89475102617e1a460bd6ca9f0588ad6e489de58ba2f
-DIST KRBNvKB.rtbw 21869584 BLAKE2B 6df9a6ece2090b1aa55b560fcdc6c70e1a94588280dcdc99424aa65f5fb4cdaa96dd7df13b39a7e47a08546bdad5eb0599e796297b4b82121fc241734ed5e32e SHA512 bdf870b3766b1129ae1741a56c97b05d234fa05c22033a0edf099538ad351cda335a5fbe829d939e78c1442b4c46c0860e4a3af2a16d9b62587d07157a8bcc94
-DIST KRBNvKB.rtbz 647634192 BLAKE2B 1d6f8e1869ca15c2abd401e8eb5aaedb572793afcd1738b6c97ca07a33046999a73dc29763a644f1fb03502a577691ec0bcce592137d32b95828f87d6ee7096f SHA512 7698b8e69b16b7a4c4ea819a8331196a3bd622dd16d320d8101e95914b035d3c47969a7a5c02f4cf3c2aad806fd0eb8fa2128ca989c4d4574957b6d75bba28ab
-DIST KRBNvKN.rtbw 21899280 BLAKE2B 854d015d1794f582d93347643b096771784c947b48d96cd532ba4c1826f3d25607f1dca284da5490b8bde9ec9be5f5292eb1a012d204ec1aef14e58a3105f83b SHA512 d35cc1490655e755ed9e1bb003dc72cc9adf6569332d0d7a6e2cc05808ec94caa8bc6bb3213ffb87183513a369581cef588774ce9211de6db4c51872e2095e95
-DIST KRBNvKN.rtbz 481212048 BLAKE2B 2de4036f2674961fd9de341b53e02e3ef9fe848d1d25fb29d42b3b40d0a47c5eaaa6ca8fd6341abb51378dde7349e71c9a49072c99b98a3878c5984389b2939e SHA512 9210a8eb78dc918686821cbf2ff806a1bf1c5071fada07c125ffd838b77468b9f55fdb92a2e49b3e72cb14d58a438a72d9c65af1a69d1469d027c75ada4a9b07
-DIST KRBNvKP.rtbw 194035984 BLAKE2B 0b729e4a5ad568bb43929d412a5951956c5a0525f218822cc2d877d65e443bfba1943b42540cfb9f551df423392d070907583136ab3c8a8aa7c7508c260ac1ea SHA512 5fb8cc882d623f55bce021247b1ce35408d877e7dffc6a80f5688a5e3c8b9243d41c97926fe5799b98edb8371bdca931569744489a08b0171d3a85174809879e
-DIST KRBNvKP.rtbz 307181456 BLAKE2B 2fe25a6cd4db6218571ca77682b0f874494fde44354442a07c1b4fdbfb0a4a357fde574fd1afb3b939f427e74980ca603dc295800a7c3df0b1037261d1b12e11 SHA512 2b9d6062ce70cf9322b86bccdfaef98241a08cf949cfc7e95e08d188308a4fa38daea0584069ffa8a0055e5aa89a0f4e7e58b2f545ca8f02ed672873f44967ca
-DIST KRBNvKQ.rtbw 459799184 BLAKE2B cc001ef60fa80171564074a98d5f8d69091c53acbb9c1290b8dc373c23341ddf5916a89a25dc1dd3297605a8e9568c62b99e95d5914d6cf19f34ec7cd45f7281 SHA512 968b9d41f1b2f0c07b11dfdda2b391c3a63f1aaffeb3d4bf6c9d76e7d0b13c5114c864d9e4c2363c7646ef0b988886a6b696d61aa0f83458b1da6c79b841f4f8
-DIST KRBNvKQ.rtbz 114678608 BLAKE2B 78cd372d07c0fac344a4786f28c3eb4e48c0fbf747906cf16ea1fa385f86b2e94cb4016b8c0da689e5b09cb2f8ca976b4abd4c495aecadc631e2902921f2f547 SHA512 2f84673330605b70a453c2b49e91bdff47aa5b0047315aaee3db24b252a458b3d0764e0c790fd3a49ac9dd6c798ff61140c84c995c808a60b062fcc3038e1948
-DIST KRBNvKR.rtbw 127959504 BLAKE2B 215656dd5536d03034528d41c93aec754de44acfb40e6e1b15d6057811779b3fe5eb1466abc78c9a0ba3c264ce8913ca3d2d6e157f70ad6b66a99fe5a3c6cac0 SHA512 e99efef99db6bf0d36302bcaf639e9c3a6a66d19f00dc6de6a8fcce9f59451f2f90c943e4a51ecf7a2f48b6076aab51764b1f9ad6548ba1722a686c3b2b10f2a
-DIST KRBNvKR.rtbz 950576848 BLAKE2B bbdc2d165605d11ec505283cd9729ccf15d85a9496e4d9c091c9f6b5c301583cd99074f437dea6f019f7f3fdd4faa1863b8bd215e500e2f58dc6bd563e21abd4 SHA512 3f07af1cb7e72751a6ae012a7ac00d5eaf3a8b21c37f585071305b03157ffdb5f2cc51a147d4054ab6deb204f669bfaf6b2fe9c41e7a6083eb21369490bc2197
-DIST KRBPPvK.rtbw 13716816 BLAKE2B 4bb0fabf8781b2f05a8a23ab3b17065348bf75fbbb9706e7afdd42b029f290f7f45186797243ff428835b6d8301c4327c0ac6507f0b5309ee5f4089bf179da59 SHA512 9a88f3d91f30dee8254ff0cdbe2fe303cfbedb9408022f6310a62699bb458f75a3e6c73b0a82fa3476a8f79ecf1c96b7807b8d4be0ff19c43b271db90a04a1b7
-DIST KRBPPvK.rtbz 9701456 BLAKE2B 6406150576cbe5de5cecd37c5546088950833c89e21cbf6ff4ecb9174e8faad28459d48f047644c66afe7991acfbbf4f5f16b78d0ae0c6c928473123d7cafe42 SHA512 442c42d98388a9feefe79a1322e2ad5acf91d80290089ec76bb73894e831511ff0572f18db318289da12612902a8074fbe75c9e7f6a95f2ffea7ee761e589b4c
-DIST KRBPvK.rtbw 531600 BLAKE2B 2dfc79f10c73f767626a203c276d28b7854e6b246e321a02f0ba697cb7013cac611b2f6d0595d0e8c4d2e82507a43a3883d383321a32fa339b123087efe67deb SHA512 d74b9c10a65bf6915231b13e39abcfb572215566ae2aeaf066aeb08f6065b4fc4fe34175d37d56df98fd09a5e5ebdc6f3f29148ade6300dd150fb4db5520ff8c
-DIST KRBPvK.rtbz 951632 BLAKE2B 40c37b5961e540677c0b025ae846eee5e4d09575b6db5977d4d73a09bb2a7ae0471ef0b7ab93c35b3ba8aae924d651530778a36ae6d95b4965f625c7445c138e SHA512 c153fb5ccf4fd27a94cc7c03c9e79ba9bf090297316c46d99ea8030c2298c2f9c6e5c4d93dff8d42dfde5b193ca0acf9f61f9f8c32cc1165f420cb700690b314
-DIST KRBPvKB.rtbw 83754320 BLAKE2B 8142e811fd2bd559cee0440c78ceac03e3a4db363ba485515f4d96290dbc62b3f7dabc75605ab267b3f25fdd4378eb9d19d78b6941c97695146e01b15b9eea8a SHA512 37d2e3e6c20f33ef8bb7654b2d7491af524b9dc0087d713a709538cdb6b8018ad44a8dfc36b25ca97a9fab773125444fdc01284c7d4bb69fa30cc14d2607797a
-DIST KRBPvKB.rtbz 212784784 BLAKE2B 435ab6ae1f9bc36be09fdc5e3ba917f74e327009cb0394df2416d2cce99e74a5b1aa8b616ecd67db405f6717117b812d682c1299e7221e2a75f77f87a1740dea SHA512 e28bc17b0496b7ad93e382bd12e89854985234e0448f1541efe631466b56292dbcf39de8815981d8d2144ee70c171c172eadd2d0babd239ea490513c22aac6cb
-DIST KRBPvKN.rtbw 67843664 BLAKE2B 42d958786c46a1e6741be428af295e5eaaf157d71a530ca66772f20720fb54698de81135bb2a2c1bf500f87310e8153984b582241061e3352efa72550e52d41c SHA512 496c9dcaf388681257d1706cd9e4fd21c4dfae88d48204172f2fbbb532bc16f1d19bfe200311161ae20d9db8692499cbebf382e2f269e38eb7f13f466d8dbc2f
-DIST KRBPvKN.rtbz 144203216 BLAKE2B b55cc6c0c1919b56eddc2ffe713897c008942a57a00ed2ae8d21a2f0c4c066c88e852f90d37d629dbad0330e3af300e1e6491a6283666a4b9538553b73dac8b3 SHA512 eae273ca8709b1223f23c4424213a4ae5881c7d1e5565243260874531c2458e1d09595cae1015ecdbf2fe9639acd2a27874f266928e81a0ca2750c4d624eb547
-DIST KRBPvKP.rtbw 209506576 BLAKE2B c6a75c2f29c55a4191ace0481e6af49b63e4402babf717295aea0a09dea8113d4d65bad906c892bd551b9e4130025beb2451860a4f8b1b392f752bf312e54c8b SHA512 7bc0ea39ded5bdb626d8d0c28738c03b1af9d6fb23ebe03ca11de17eb3cedaa09a6856c6e593e27173f119989856a7d97697a0e2b7f35e76dd2ace24a0ea0a93
-DIST KRBPvKP.rtbz 72228368 BLAKE2B 1b482e2649de8c870bcc003c844ebc56d0785f59327b1a110b6c5c1b74e9b51540832cfcf816c8d197e2f0171e0ed2f4ac45e845e0bd1d2d35d5ea4d9f8ad954 SHA512 23ad1702de3c34c236fed95c4f43b6f1829acc74d9697067c3330d7faa2e1b3e7dd8a423ea088f71f6d4aab61b1d4b1ea3caa981a2d692ac7ab3ff26d5ab43d4
-DIST KRBPvKQ.rtbw 1992216400 BLAKE2B 8e398e13bdac96fee3efae09f29fde10d6227019424367feb781716ed8703b7770a4e09ffd965e71d545c37d8c7198187484f391256d5942d3b2431ce34baa7a SHA512 65d0ea904902316e181b52e4c2684e1edfd9f0a90ba41247d26360aaa37e12fb90c177204a8ba416bbc39a9b6cbcac64d105fd83b49a2af3ea078a5770aff7cf
-DIST KRBPvKQ.rtbz 671151248 BLAKE2B 6618fc9724674eb1cae958deaa3ee63af3afb527c91344c0a469e9ec864d134bb557150a7f569a6c24af4574b60074ddc497363714ac024d86742a301406c338 SHA512 05ff99d4c61987cf6d82f56b603a6367e96015a47c15a8527b792210521c1fb5ef9993561bc8e899726f19ee28ab0db4530dc0f9c6fc21207f9e45463570b8ff
-DIST KRBPvKR.rtbw 440252880 BLAKE2B 1b4345fd7c6e0882f7c22322e2664e162b04a87064d93755b3687505c4042f8193c945f4f2dedfb98cc04e4564bcd90435319052b20c9a6842f8d155e4c8bdc8 SHA512 25c447228dcf447b0cf4cc90ee3110d6beff81fc8b3bdf08aaa9e9be0fbf01e2c083f90b4aba9f7e1c1ddf2b80f20ff57a53a0e358ca2dc08b72580582c0f7c0
-DIST KRBPvKR.rtbz 1048610064 BLAKE2B 511e36f520f60b16d6473cc0cb8fad6c308710b432230679801b2dffb14fcbb18f54aa486c272f44b7b9e6b4d011f2d091b8f2a0d6830b9935b4dbdbe9558803 SHA512 0077ad205f152825326c2eec8abdf2d11a8bd9f917a3ad4823c209ac80d883b707c8c803be0d8be18f50db46fd3213af7f3c53d793a4f0d999a3ecf32b11cb9b
-DIST KRBvK.rtbw 2832 BLAKE2B 2c6d1b73eb59346dc63696aba5e4ac0b8e0e82ec7dd0dffe38e934bd3699c645210cedf34d1326ef981b28ff2fd4b92d96094bde8605c2045624f684f3d47f43 SHA512 177c519f1bb3b590af76a50ed845eba29efd55d033d7daa27618b0798625979850933cc21624ae92a9e59f30bcf3039c1a3687270230e3ad7eac4b68f590a0e0
-DIST KRBvK.rtbz 261776 BLAKE2B f4e446cbc41023ab212129409d5624e611a4089386ae6b82616a36e2cd4ef99532f71f84692addca66c7f2bf06f42b593c6099f82a411dca61e0289148c63495 SHA512 5610ce9ea7ce64cbcb880141b15f5df5b0afe344aebd9e7ae827948ad2dae56ed75ea9f999df7787d7d578ef89dd4284706b2b187c688d8fa4d311854b66c786
-DIST KRBvKB.rtbw 916624 BLAKE2B 65dfc38ef7a76335b879192ea74787f54e8b68402eb372d30a14f8eb312a3c3580bce1ffa304a253076e3783491f6cb2b87030693050ccfda56855fad7c33163 SHA512 fad782b4835893ba87d998e7603abfc9617b8daccecc96358698c94d1210db7d0e8b4892678363cfca63fef7365026fb95f29d8d821c22e94acd29e8773ec4ac
-DIST KRBvKB.rtbz 20128272 BLAKE2B eb290f42981f3df6d7287bde5a00867b4facebb2fe992cfb1dbf50f6bc4372c1b50b1e0af3cd3ce0c85daaa860ce331989db122daa1e1dd99cafe9b0eb432893 SHA512 63a16d94bc456ff226d163698b60c5c1dbf948aa738b9cc47f8e2083475ac9c5d2bf57bc84778597d25b9f6bb576211f7f9ec5aeb56ea066043770cca38597e7
-DIST KRBvKBB.rtbw 151874768 BLAKE2B 2109d83fc38893a6e0606d6d3ea028c188c3094b60abc2e7bb377a9c8077fe94753b0b47981b7722059927b6e92433f1d191dd8220b2ebe6faa8da496cae444f SHA512 6c1352c7068a76d5c4ab83293833eab51ade8ec2ab29af41db81d54236ec6f3b964be31579462f06cef2b75abc1ffc69d9418b45f2e226188cb3777b2cdd88f1
-DIST KRBvKBB.rtbz 64923856 BLAKE2B 3149a2daac0c3b200733f2fc8a8f8e1c02b01a9ac5e3da19e195b3138bc9cba4377fdb0f96c5ec9b0671395d9c72717e8489108ccd9e689559133207d40bd698 SHA512 75bbb56ddf0e6c08b461333dabc4526a75b287f3b423782af1f5ebd64ee406b66fde566b380f934e4db8d2b6f3efc3b659cce3c621b042d6a60deb01ebdbf033
-DIST KRBvKBN.rtbw 668332048 BLAKE2B ba227e84d92f96594bbcfdc7113b789f6f20fba3f686f2a5082e9bba5796a7ec6b05ae702e07de00145af1de28d0586268c010df6325969afdc1048bab1dd056 SHA512 333de6302b22cf13b6f1ec93cc2ad341db1f93afe5b9b8437ea8112f5e2aa5cb6b82d6ec74760b6bb3ca66446d2dce825a65c70bb0a02c1eef08eb23eee696f9
-DIST KRBvKBN.rtbz 994129424 BLAKE2B 9723b8cbaac03e5f4addeb8c38c134f9ed5b91206f7b43b506acc0b58ab14dcfc08c9065fc9c4454d9c6c86112bb011a9e4a4862b4b0a3915796b841a1f6ed63 SHA512 81efe4e8d40306ae93590678d0a14bb4ba46e912fcf34164afd89e6e280892c4d876708846c3c18e088e38525f8697cb7f3ef9ffc27b1d39c5703a84be9cdde4
-DIST KRBvKBP.rtbw 957809296 BLAKE2B 905ab1cf52ecb9b377cfd738120ce820acd35f3b2e4ac880c493aff75624e7077e46ecfde099c7c375b521d16f2d12421d69f96c7ee294193f137996e312cc3c SHA512 2e99233baaee048f8b1ed71d615ba17c43e1ef727cf8d26e973543698164ada7bc507be1eec3a59160a60cc93e91c5ac89840c5fd41f0eb0d8588a9eb45d6db9
-DIST KRBvKBP.rtbz 2167401424 BLAKE2B bdf232f9e2ea40de89a02c9de928614028c906096e7b60e783eee0f55fa1976bc7928429bc81972b0cd4f4d34adb77d861b3c0837a3b88c2a6c7344c98e83c96 SHA512 85555a2903d1a36a18623b82c67a2284e3ec14ba82dcccf7115bb65f86d45f9d22d00193060f41a2ff025c241c1955c8d0dfb31f080c3485ed0f1a4239349c6e
-DIST KRBvKN.rtbw 998224 BLAKE2B 01837327ddcd21988a4dd6944fae8bd8b2541c97d431ab1760c5f37d6be54d985b850a6a287744920ab03d2741e8847d1b3237fc39138fa424c64f14b89b3fd5 SHA512 938dec8089e465686c7049d327e0edf475be2af9be909631ef9e78b5486aa88a5b11a79daa728159427acfc0c64af33c34bf8baa112c61b2e13f8d14d3a6bb62
-DIST KRBvKN.rtbz 17507152 BLAKE2B ba9bd73649537b50b30d3aa19e405cc7c11861fc88e822b9dc3b3f379bdeff25be609231f87c2f2ee96deaa4bbe68430bdbe185ccbb683fd13aca48d7fa5fb98 SHA512 f73a0d44c49004f6f1384b9605970ba97c6b570bb1f4cf857fb9a4f9d12e2c6abc8bb66e8e9952c12944205ae070827503b51a8046e97a4e924b73ac97471876
-DIST KRBvKNN.rtbw 379484176 BLAKE2B 6b0a7461d1e8f0e6f1b157c124e284e7fabd00b3bbae863de2da8d35e45c9696421dde06f7396204b63270d4a31fd60420e5e7e0ac9eeb7318d31ab03073a27e SHA512 24acee274fa820307f83f046682b3f310e9f91990e7fd527bed206ccec769089e67334f6bc67380a8595871235f3bd63c9e8d300c4d6aedab5c7d3d4f6b62d40
-DIST KRBvKNN.rtbz 755095248 BLAKE2B 13e4595674bc0c1a68ee954b6cf10f97436cdc0e2749119169382cb187187c1484320f65b3fd65b66e54f2b5b9f837468e803c6e8207a246c3cedbc05dfa7d5a SHA512 24c743764904f3d14aaaf5884f2b74880f4f43c3ce829cc2005136cc6d7405db839999ce6dd446deb8955bfc6a7aef16f0b18c9ea1dbf398355cb3a889c37c60
-DIST KRBvKNP.rtbw 931510288 BLAKE2B 584a74ccb2322965a743e8d154efb1574dab2689fff3df382eb28ba1532a78d776bb8776dfb3970ff18455bec5c97c7530fadf1ad6ad64d6e39c455b9c1bdcc2 SHA512 287a329a3a5f2271926bd4ca179bea53926ddaaa92685438c2726dcd886048168e5da0ea2c154f6976466fa32ba82bc1622f76ccdcbb6a5cc186ed8b14822227
-DIST KRBvKNP.rtbz 1549052816 BLAKE2B aab63d83e40a83b61327ea75bf567588acf81e6010b6fe1eecfd270b0c3eafba186f71298f27e744a94a086acc4dd39c6328f2e95bf9dc2df227c354ffb45c0f SHA512 e551491962d551360476e6128751e25b772894cacd5c1f726e8ba0f708262ac707ec0bbd78962530503f0a18eeb8456fe82fde1d3b73b1192950039d8c6e00b1
-DIST KRBvKP.rtbw 5300624 BLAKE2B 220b9fdf008df15ae8f8ffba198971d1934783882823195626fc0631116a51c9d01aa2838a3fe6cdb33f4a42336042f12bd7e76c9d9e3986ec1a398d2bc20d51 SHA512 9944adcb7986097ec813b15dd3b5283a85b6d0fcafb2cf90f5264e4dabea57e805e7753d24bffa9dbe5e6c8b5fe80d25d84edcd40314904c4d4981e146893a41
-DIST KRBvKP.rtbz 9324304 BLAKE2B e852251fad784dde30a048810c1e4a9d0efb5fc059346830a004bda23eec24cf4c0c5be2cf371a0344a62891ba95289014901f6bd7c3fd736be7cdaff68f8542 SHA512 980f29c7b3d21d71eb2056b93b4233bf9c61c39751098a57991be0f2058f929312ce39060985579f2952f0b4f0aa5f1e445e375181d39ad07468e0bc32ba3d47
-DIST KRBvKPP.rtbw 299028816 BLAKE2B 9fb6664106d2d8d24620db5336e449a0b9a6fdfe6de9639929a38206597589c260ec105bf8fcf350a29d03e02beddff70557b7609333631795b7f07b35bda49b SHA512 57f4ca81dc934fef6dac024b17687f92c204b4d439766eba5d9f652fd9d70acff3fac2cd6e9e6a2108865b95cf55b4d154e15a8bfcc386ed6a0ad4a1cedf95fd
-DIST KRBvKPP.rtbz 172445008 BLAKE2B 60f7f3bb4d8d062bb2a62befc3ba09ceb02d5cab3831fc9d678572bb56b39678c9db002dcd16cee9916a821f51eed24781bb5e67c0e7bdbbccc99c1b174e2bb1 SHA512 71e48b3a2f44d5ada54a0432d66facc7ad2f09f9b2ced4fb57b88095ced046efef4afb81c0fa4421180a74664cea609de6151898190c5fe9db1f71bd140200ed
-DIST KRBvKQ.rtbw 9588688 BLAKE2B 9693f72ff64395a9cd276df5f282680af1c6c3fdd9c9ff219ac78326996fcdb22a15cff7320288fed171f896b4c72fad00510cd4ef95a2aa4896e9177e2e3ce3 SHA512 59d638ee358b33e9da0a1e639fe1c5a52190dc5fad791a6a8deb7b2a28403efb6912d6f4500f59de27699b15c4a1df1936918989f8c828a9159864f71385ec8a
-DIST KRBvKQ.rtbz 5323152 BLAKE2B 50b17bdbe2df824071e48667a17261b0ea42f98dc25f5790b8e50fae75d5f51164cc05fab7070598cc51f2db9959459404b76ac4552b07d850dffa3a3200c967 SHA512 190d857c0d31c393eae15628163c4a6df391a6fbbbbf2f539b9fe5e34b9f4dd7f67d06927a196be4fd919fe0d064e8edf25b7714d327f496b730fe0e4f817dde
-DIST KRBvKR.rtbw 2035280 BLAKE2B 0a5984deae01b806a83b47ca5b7e3954b618e069baca5fc4dcecc95a34bdd7aed7aa33c2a865cfa0a4ca8ab0f71ee8291908f1bdc94bf94da142d5568f2177a7 SHA512 0fdb3a9e84c2ce9a6908a4fdf84046c91987cb054222d7f429c0e5ba1a53e2508acaf62fdbaf0fd5561433d0061477cb43408239e76eab64c7c87469fdb42ac1
-DIST KRBvKR.rtbz 575440 BLAKE2B 02ba226da5b732f87edbc01c7649a080f6e531c3e395658cfdc723095cb27c091a9c25f5a340f1cdc58e7a81f951881623f4009bd445688b5a270855fed32c08 SHA512 7dd9034a27c02d8c12cda7d9fd5f03f2f7e868f07304a9b60ac47877cfde89a701d458f7ca573f5b48959bfbf4d7026095a2d1a1975a4d3c7b431a11cb121ee5
-DIST KRBvKRB.rtbw 110375440 BLAKE2B 23ee4b7969516dc76d5b44c8135471c42880d3d3e70ab8a45586095480a0f96a0ff91ac90c8423bd9d52330a43a971a2ae154e34fb741d012dda27a80b603c50 SHA512 0f739ed7faf5742b4ae47784510dd499dd2d002b9eb45f5830230aa8df56414127bde3fdb9b86a7d462a4da09c1df8e6a1a0385ccd3351d8267b535c82106ffe
-DIST KRBvKRB.rtbz 27321424 BLAKE2B ab5a471a036f409fe8562c5cf8e800cdcc33c9dc714fe0d229cd612c379b9f3cf29a4ffc2ff2048a74c2ce3bd1256da93feccdf2cc35f3a9f9d53e8512e8266b SHA512 c9fc83de6762ce844cf8a8637e46175eed8810ca6da9752bd0d27e9007e13f97f4f8597d2b09d6217a672137d3d5cb0ced9f1622499a145d10ed073757c92251
-DIST KRBvKRN.rtbw 202112080 BLAKE2B f284910113f7f17691ae7e3eb010d2252a37e640db727ad74597ee40cfe9c94c11a1b06d864c33d0d27e88a14b6b70284df33898715e38f6f9d7964caaf0a8f6 SHA512 7303afcc35dd13c2e58ccbfd95102c8f8e9086d1b5b90ed80d752ce653ed407daa2d52e0278264c79b9e8152998b4289f70623f3c230df4ea8624af3cf41af9c
-DIST KRBvKRN.rtbz 21877968 BLAKE2B 09562b06537cc2668798ba06d8230070c4df9547359eb48a36b11889775210ca282f6eeeb8159fa20db66a79af4651714b2353fd9969c9b83abab323855efced SHA512 c2ee4a0516116cf88e456d2155d59682edb21aa9cfd94a70b49be4b333fbfbd398c2d67e4a46083879dc3917bfed7f95b78aba924aa22d791f909218f108417f
-DIST KRBvKRP.rtbw 818979472 BLAKE2B 17534c6dd4989b2990d802bdebb981adaa1f8c0cca621b84c94c144b4b0220470a6f3684ce422af2ff1c0e6f735522653a223bf75546602d2b7acee9f00a35a3 SHA512 8a709e8c560338bacb501bc2de097cc0a3a4c7ecb838d49747db8cfb9a52055ffa617fa14c424693f0e9ceebb6a1bc0948f6e9e88eddbbc7954dfdc5229c885a
-DIST KRBvKRP.rtbz 120733584 BLAKE2B 2f25578f16af2be4094d3a675413e05b6e7ab70929ce5268e0887d7f0c45f4288b32b1416c270f9043977f34d211e26ba923fb807e7731eb102fc18c7ec63e41 SHA512 84355c70c41e3981a813352128f9a67ce28f3ba5fdc5f33a92ee4d8987e066fd16963a5778f80cb651130e25fa79b032f84eac7c8f357f7c4400faadc39ab104
-DIST KRNNNvK.rtbw 2222800 BLAKE2B 4ccda4f96408feaaee7c3b211a0ae8d806421e565448bea34ed4312143e9af344d9061d46149e9e6274e967402c1d84d7798f6c1231df9f1cf941275ab9ba98a SHA512 79a178de35bf3e515825af84acb3a00461d7d289bd0a903d89c8f293fac925db7f067862f274041985bdc333b252e2394ea97d6fd361a38f5daea329b0b0fae1
-DIST KRNNNvK.rtbz 87737616 BLAKE2B f99e7ff3c98f0790635ef8ae6f767e333f1ddd1ef2ed965c4e34f65041b2c6a5a3e800ac2f26dc0bf2d301c7259e2817b479085b1d1d342d5acbc9336428e5ba SHA512 3f3348e078c4e3d86f29c090d9dabe2c23073c56385f105381ab20c24ceca4baf8951ea562a047f049591e8ca11b3f964faaf58f5d4fe81578c05fc28ccb9071
-DIST KRNNPvK.rtbw 18446096 BLAKE2B 5b6d95045377130e54080ebcae4a1e790f7572dacbfbccd7e54148e953ad41008678fbccdf81acb3480cfa7072b8c75a84fa7cbb8c94450bd8be62eb768368e7 SHA512 834a197ed796b3bfc265272c6f7e4dc12334cd40133c2533bc9e5912c4383aa05c993a0dc67daacd2ad37b56705b22fdb6c1cf9d0965154ad17c04c68f338364
-DIST KRNNPvK.rtbz 33313104 BLAKE2B 6369a48d2c5df6f0e2cd0e9810d88d6fe3b9181b204cb9c6d6677791f078e94acfb6f3d5d2b5300646ecd161f6c4a8179c72dafb220eaf0394df9be525f953e2 SHA512 9d10ecaaa292ee4ff5fa6cd9aff3ce79ce8324d12bfa5503db5d1e275770d607e831926da3e838a1877fd81fffa8ce517684dacb0092c5f92e379e5d545e3c35
-DIST KRNNvK.rtbw 98832 BLAKE2B bb4607755fc7dcd5eb221c8d212ae48ab0a538e94409a54f34695adba3cff1543098b819a3407941b2af0e92bda78a47995c250ebfe22a2c89583c13c167933f SHA512 bfe213037c7d5710356e7cc55eef37f96d7d40e0d24569d6364aeeb524f851320af8a75b384d2c6fd2f86c53f0568c3e062b2584bd3062f3ae4b0cc79e3769f1
-DIST KRNNvK.rtbz 6841744 BLAKE2B 90e17446ab1e2503a858b29b8d06778c92fd262d42abb4b8113c4b815058d27188e681cceb5e0f88b454cbdb8ac69b754d4b87a6961078ae366fee7136618409 SHA512 88b86281104aefdbda2c562a026651a28eeefa0d96b54e63aab2ba8e2481452f98d524cb898c47ba2c6d276e4525d7fbadc62691ff90b9d7d3845cf67dfdbc36
-DIST KRNNvKB.rtbw 13095504 BLAKE2B 201a3a1260afed1085ade1e4546894cc9af8645e0702c182dbc9d87cf1653f3177482e9c93a4fbc0e9e6051bcc4b04c961781ab46b5263898aa73cf95d84c50f SHA512 f0bd7fb95db4ece6f4d64dfc9c540a614f86aafdd0260ac89333b7caf461e8dabd3f450ccb21600ded727bf598bbf920b9616809c157d9b844e8b919841df9d9
-DIST KRNNvKB.rtbz 399610128 BLAKE2B 536dab84d780ff37a3112ada515236cef296dc3cd95a43e6a944836c003532854bf697da9ddc0d73835c5b214fc31f3ac71a020d6aad55d5a18e3042814023fc SHA512 1fa7147aea0c6f4455b99dfb9d2d537bbc11109c3b9da9ede732373c1d44ffc11d3d4c0d91ecefe75e2fd75d46e9d7ca192d061a16835d460530605fedbb99f2
-DIST KRNNvKN.rtbw 10782992 BLAKE2B 0b04386ca130874b60523eeb40e54083b0ec714426b2bc19ec19b086fc526d13287d409267273be85ce772094bfb89b659745a37ed30da0f5caf89f1ff6ad078 SHA512 56ae7f750588bc7d898c42700b387137d67b75618573041e088c855baf91cd9d8326e2c282fbb2b470d02287f21984cdc8015c5da9874d8e5cdf6278d611c625
-DIST KRNNvKN.rtbz 344888400 BLAKE2B b56a422d3160e92ef304d964c01d1f598117bd7a892151d9c86c22d883eeb212a7da49485f6f0f4144fb186a80f4e2c9519249b1d7c44e1bb2fa6a2d01a7d95a SHA512 fd4509c818676a4672a13851909c94a8fb82c797ab85884c188bf6cc41b310bcb5d3ed4e2a87c80382b3fc73a3339d49719be5c3c6837df03ab29cc94ebbc272
-DIST KRNNvKP.rtbw 115122320 BLAKE2B d180955cb0805cf4dc0c98048e5663d0b7a58e7fc0daabb6dba038c863635873b503469132eb13ba8e9caca611b570f2172bc9a21133e5131756a27b7c78ff95 SHA512 f8fe2a61ccee48938351a630513e712e3d868c538e4db7f1690dc44045302ff69d430ea407bfeb1ae3ccc69987c91dd81c7f0f40cdbdcdb2d9a764292a796ec3
-DIST KRNNvKP.rtbz 239666384 BLAKE2B 4e37bb3913b250b83debf69f6fc69199ec37680bd1758d7fde7b79059bb28f7cd03c24d38f0a5279ee306bd1c15e51af0a693fbb9771bae059de1a13bb5670a8 SHA512 698a23bb82160fae518a11311fed940b7fea78d8801c521140b1a63dc4587b32cfbc926c3f8c88d56f36fdc3887c1ad40a7b7ede16a600c14a22fb437209fe3b
-DIST KRNNvKQ.rtbw 198460944 BLAKE2B 0bb0af240f56c36dce72a151f25a266110e988060e3bb3441a2ac5199e2de3ca4197dcf136c9df758829a8c7977f824a60f904b3e3297b33f7efee869a728be0 SHA512 af885040a1c555574b9565784dd8cf9389d106a106bee8fd6733d2e16dfb7847ce9fd0bf6e144b6410164ef812e0719d6888580e0fe037773862d1b2eb05b996
-DIST KRNNvKQ.rtbz 49561680 BLAKE2B 52f7ff06486b9feee349d2151084e9854bc3a676bd9d5da0d98c8bae001e15a2df44a22a8cab0e1df271ce19b742f221b0abc203cda64d586182db8297223e57 SHA512 228fd6c3364ae6d2651076060143ff24e597a8dedcb2813a564e5a4b8e194b575596d4001cc98f51af98f8eabd707dc3c2e8ba8629bd0ed90ad5d521531705c8
-DIST KRNNvKR.rtbw 108723024 BLAKE2B 5fd5fe062b6f1ac3dfc9b39e8c320e35a16d03b90d5bf196aa6ef61a997e2e46e7555fbe19c89f8a3f289c1520d930cd545b388a10edec46810d1ab3db03899d SHA512 54bdc0103f7367bd8e9bd210f539776f989f962a3ad8d0af3c5fc41a14c3e2f461a2924caa2c47b2f3ef43ca03944cc44dff861d1edbff585ed9f9f0e8b6f115
-DIST KRNNvKR.rtbz 567533008 BLAKE2B 14ccc551e7b6e9b4520327e72901d54caaaa0cb560d7895ace5a392caa39b00a992554ab2ae9f2a182bd32285e5e1721d35f2c6e95f56219e60f030d1306de08 SHA512 d2f00ab9a2e98f7eefcc3edfc1f1351f574dc0e09d70bcff8f5d30abafe81472f6b4f3253836cf08c970586dddb1634f15e93fad9327fab22315966c0ac9b53c
-DIST KRNPPvK.rtbw 11077328 BLAKE2B c1730847407fda85429f79031942f6c90b7affa99a5e760444291cb035c9b3840fa0b0a61d2ab0069ae7074d57dd3322fe99c118b07ed9be232f1b7de3360165 SHA512 9c33e925e83d32196346f9057036f726181d368418fde54f8426a3662896fd05e9576eb8c59c0a6b224d025bf51876fd9cf28ff2556767b2a6200a4b384296ca
-DIST KRNPPvK.rtbz 9109584 BLAKE2B eade874784da2eed9cbfa97cdbb544437696dbd2933072b828b0e036f954436d55143a462f46238b6d6cd02ba1d579967a282950feb9dded467f3df1c9a5c762 SHA512 715387260056ee79f6f12ca52b331e50daa60157117d740a80764a7a37ee124d879ad16cff2d9a1c5533c7a016b58825fa265b365da187d4d3d28a49384097cc
-DIST KRNPvK.rtbw 506960 BLAKE2B 9eadc06103b2d330409c3e2575d351e4bc3bde1e3eff70e99828695b0bb7f330e857d2592a4d10af67a6075679297bdce80e4e471da31f4a2723fca2e9999365 SHA512 d0ed0c91f24715ca196b9500cb56238475a2467fd967b653cd24be216b75a1988095f0f92950f4ba4866239111f5570e19397d1e309f242ca8e4851eac2171bd
-DIST KRNPvK.rtbz 810960 BLAKE2B 97b2e371cd39004c10aa9d2a8668f166ef5e2ccd1e90360416ac28398aba5f5f632fa790686c5d7f986a63e0c741aa08bc2c9e57512f8ca519edcac3092c907b SHA512 2cfe00e4c032fe9a9130af1753f58cb8c6d1721370b7d3cf0967fea634a52562ae8a8b9ae9f3852f46ae5ea673b1d1db05c7b1266f484db151f4e48e9541338b
-DIST KRNPvKB.rtbw 81836304 BLAKE2B 2a6ad340cd9220e34af12c1cce745c0ecaa3fc04c868767ba62c22fa32db007142f88d4c34839162b08d986cb7b08e99b48887baf889ea4239ded58d8b83d7d7 SHA512 d595fba617516c112a46de8bd60dea6f59d08b9eafa8a6d25375e9e27aedace98ef0ca049a0ea527dfc1e1f44e0d4d0b3117af8da90f73efc2e610ef385e982c
-DIST KRNPvKB.rtbz 204515856 BLAKE2B 055787fcb6c51aa8e73e8bcbb697e0a2de3ca0a63002c173a72d3b389a4fa3d7e223257cfc54f23c0a7d37afb425dff1e3eac177e6374730c95ef4c8fc848fd3 SHA512 8cc58ab7a0da21b2f36c6165fe1147d0b1f096a9a8bc730b2fe0dacc5af7ddd737e75340d28d73700002e2bac520599688af29f769eac7b5a5b4ee92f9d30efc
-DIST KRNPvKN.rtbw 70030800 BLAKE2B b99ab839efbd9bcb6d361ab927dd1a988f32097d75f108d953538b28a5d58bdacecc250ba8cc087123815c5484dbca12c701bb0ef70585ba7f487069583a5b26 SHA512 a87fa16f903e075cbcccdbe30516edcb75530d2e357e61d58af6ebb9d3bd1335e2d04700a8d7199633e447b71be15016a47f3cf478ae66cb1e019bc946253842
-DIST KRNPvKN.rtbz 153075344 BLAKE2B 581afb24c8a12c4a4e43f53cc5769816573532518a14efa9d774aecfc254e5e818a2c314c126abb3005781fcfca662c3bd2c1701e16674d763b3d7640284547d SHA512 35f2ded535fe064a9439e8b15f218e68ba1b7f012fe41c0636492f473f636e4683c1c6acd6ba9b70ef3aa004680b750834315fd2aaacceec708ccfa95d40c3be
-DIST KRNPvKP.rtbw 246958352 BLAKE2B bf4cd6fd1e0abe4095fcd9d531c13498c72f586b21ccabcb1ef4a56a3336980ff823e31318c68081692ec299ca667c79f069ac689234d9d581f15496e19e358f SHA512 aa0d8a4a1975fb49dfb9f650062e2ac3cff339e96fd93255ffed29cb8c9a188ea1f4533493071ba443d090e03a8c89874a19460b35466911a6bdf80c3fa33e4a
-DIST KRNPvKP.rtbz 77510736 BLAKE2B 90605930dc952dc08bbcb017bc11242701a381ac9bca20c74015c23b7774718164fb66d581f3339b082202a955f37d583d8e86d1ce131b9c5644c8c9731fcde5 SHA512 928e8859167a6c0608ccdc568fcafa122bc6ff48350d92d5305118ed1e34f722739bcc01ac6d22cbd8b693915a20217cb233a164c89cdab0d4fe1972cbcc2c6a
-DIST KRNPvKQ.rtbw 2104146832 BLAKE2B 2f56c2bba3eb768ee81871a3d6bee8b5960588109275ee42a1d967737ac8d46b9ff80bd5296dbb03ead9db20b50a793f5d5ca51fddd3759fc8ef74186cad648f SHA512 253dc98ecd69193aaa6c3ff33cd0ca55cb4c4829101171447bc8b10d0e4a427b1b6d620afa6dbcee74bb234a4e8f12d16db3b7ae2f7762eec803e0a0f0ec0e81
-DIST KRNPvKQ.rtbz 925599568 BLAKE2B cd92271d5103e32423333200ac0a3bb94cbdb57e393cdacb546a628c779c5b10dd88e24bf779db0a3490b87ebf40b8e88ff33c3e627a657e8861963bdca655b5 SHA512 79b8a65586579f99003609f33ce009dd07584ebe2732c936a8ec4d946db521884086a2c509e047c38cb62608a6d414877bd264ccf3a16a0cd2e3f603dc77972f
-DIST KRNPvKR.rtbw 601396624 BLAKE2B 5fccfd2459d82bab0e08d50482e4e7681f3d271cb617439eb9e15fc917b5aa17368706dacdc346aa0a4e3a118298628911a327dc0110e57c3206ce1005aecc6c SHA512 8a54befb27a400f633a40fee49d6a12217441dfcd38aa426c106dcf795236098eec04b56f6367b65c39220884bb245a3fd2d07449a1a9cef3060b645df726883
-DIST KRNPvKR.rtbz 1305378576 BLAKE2B 7a37e743f9603efcb7b17956565fca32eea7d4cb6a8fed558765781afdfe1450eab1953293cf8c4e513bf4cbac4cbeca39f49d3af4beec5e38bf59a86848bedd SHA512 db244d56c0f0ab4a5d7999049b562eac7734ea18922bdab73a5d26d5196d88c5475ca5b65ccc4b18dd23ac865fd4ad65e01bc491f88cd2d945ddd76f65245771
-DIST KRNvK.rtbw 2320 BLAKE2B a3fbbe9792453060b5c3ae81e357dc4bb83d596bf2910e9ef4c2cc4d675da1b82988199a90a7ca3b8eac3e0ad5818ec1cc7e8dfdbcc34acc16990ed9c5c3b948 SHA512 c64bab069266ffa97a001c48e2eb1054aaf3311747499368eb1e7def34e650ed5eba8bf7479053cabac8d88b601818fa162589c496b428b2292df90de436c15a
-DIST KRNvK.rtbz 295632 BLAKE2B 0b7aedf1b122cb1a498ebf5243cf87a4a99b81a97b0af2b91a7f09fe7ce343561e0728e6c2ad3a32a8949602ff92cb581bda8a2182e4a7c4f9a030eada405b19 SHA512 1e7d94300fe6fbe79d2146c167bda8e164b0c95837dee2274476ff86d1cf559c611679fb2764d9393535afde139a489c52eafb02be90779ebe77919c868322c5
-DIST KRNvKB.rtbw 1607824 BLAKE2B 43c75730229a3047f101482ccd73945cdd67d5f14d0dda017283d22c7f86de7f76a6084e8315c94eeb69e4772c9ce298a32b3067d1b6b61995e8300de65313a3 SHA512 8823b6226d4ccc6fb069cf6af9d0cccad7a3bd6ca904fcd7ffa0d23ab6704f28234dbd85515bff03dbe613626f4a2bef59c4356df964964ff7265cacf33cf8f9
-DIST KRNvKB.rtbz 21521616 BLAKE2B 2d1db208dfc1e6c047324dbbaa61f59f500e51bd146aeeb9ff0f623cf70fc2b13e66e2bc4da3e01d425524a7cd0599111403776b1a7b9075acac9cfeac09cea3 SHA512 d48d7e29fffaaece1e8c809302d0bfe6bc25e96a7e27d18d8aac07f80a1b252570c099b6dc2503100589b63e804d03a97ce959d9a5ac2cc47d74239d8d85d59d
-DIST KRNvKBB.rtbw 382737744 BLAKE2B 2dd82bf19fd8f3f22c90449a90250cac766fbc8222db32adb3b2772c90ca7407771fc194d7642df875da38e5c15b1c115f25e0ec57a14130cc1b72d264043db4 SHA512 beb730742262a3878c98dde0191ba097f26d7b5ecce3350f8c830b25d695101977f07643083e5275d5362ac7ef59cbe0616461c00c2102ba0c6e07fe83ff855b
-DIST KRNvKBB.rtbz 413306384 BLAKE2B 45af3a556ed2c908f5b51e4501f087f99ed0e14aee57046d14da85e0617c1fdf1db7452e7b9b840da52431addf81fae7cf218eba2e1e0a2c829c55e343d68c00 SHA512 5f4872b2965c5daaae474a55bc79624d377218850c6b448a5d12ac8f652318b809b7ff3ddff4826319425c4ded6495912f2882957bb6102af37341f3c3158e72
-DIST KRNvKBN.rtbw 561574352 BLAKE2B 3766976c24825b1ca126dc4ed224fd7a2296ec5164660901eda0bc2b1d6b0b276f37795763ff400be8d7ab93ce7bda7f9a94f6347fe239e41770fbe2afd0643e SHA512 0c6b6611de6da997ef4b988a025a6f7a33a531cffccbd9ea8a1b3f0e55df13bd61ce7cc44a505b636b2371869633f4d4bf9a3d68a86d5876ce95a06f795f1ec0
-DIST KRNvKBN.rtbz 471875536 BLAKE2B 2c63a58da671853a80553d113b2bd02b16026c922ec91d7719b6beac4a5dd32c2a207a6f29c3fa15b4bf757f28ed1b2219d1e936085618a7c449d6db5b4a4d5f SHA512 72ff984b76e803486da737b64e7d2f75b17d9522ea6592f5f52cb41c63458a147d60c4d6494a4f25db735f7c5b83ea7fa60a28a15652ec772a1c99fe0075ca1a
-DIST KRNvKBP.rtbw 1216378256 BLAKE2B f2a13581a193c4c45a8c0e41e7e5b2483533d0b703aed65afdb8037d70f13e05ca2780e9b4398c45485d089305b22eac3bf98828391c79edf8d692fc631f701b SHA512 555720bb5ca5214fac6af7bb5c9f8a4e75ad67d91014fe6612b3b2c0399738639669c073038d0649f70b13e90b1c9cafc9349f62d448b8bb79ce7d05ca4b2fc0
-DIST KRNvKBP.rtbz 2151135440 BLAKE2B f23d734912d5eaa0cc790a4f79bee4462ccef754bcb2834b36a689a9b8842ceed8b829f579cadedeaae553654ab4ee8d3aa953643f797cb8001b19537c8baa55 SHA512 3df166614b544fdd781518d29ba0e70ab9ce6ea0fe27f3ed2fe3832b30476cf1a28b1746a6b440fc90ad5f7ce37c20b9fc4c053944b36299dadd955702a5b0b9
-DIST KRNvKN.rtbw 691728 BLAKE2B 46636fc976bae20a3c457d4d321a9ac526f7db2841a1bf5a1b004a12cdc095aefc5f10d4babc80a8d38721a23f65101831bb71309179a74346b849a53802e43d SHA512 63581fc042e272209fb861abf7e6b6a7b626ef0e0b2c83f81141fe2f7407934a6b7828f5d6b01c9575ad0f8b37bbe83b24323970cd99bab9e39e5abaaded6f0d
-DIST KRNvKN.rtbz 21964816 BLAKE2B f7bb36ece7f929553cfbdeaab37c2d235df045fc874aee8df4aac8cc5fd142dd86c7a889a07d4f68134c84ccb4ef0c89c8be9b371b5c064f21920fb194ef5980 SHA512 b3d558a21d3ae9b84f748cedf3372004d7456c23fab16c3224566d0ff25775b358c137975308874c718df69061acc4c3758fecb5bb4dcb841d1997719593a25f
-DIST KRNvKNN.rtbw 290002640 BLAKE2B b970e07a71fe9be7431c4b294fa508596d8c034fc275ee94325c9170e2e10ca54297134318075fa34d0f6c6cb642d901ead1d5e02b74505f58ce2debc8ff740d SHA512 c4bf73f55f2534d97c68591d76ee283f013a1356a0a896770b5e3d964c847667ececb5af2ce4778001beaa0d303590226077c7e432a1a1328125b53c397e9ab6
-DIST KRNvKNN.rtbz 364742800 BLAKE2B 1c9e10e4be36eaa183009f4442551ff62a68b92234ff8518f9144a8a071fa1afac6f9d05eb7fcaa47b03ecc1afa4fbac0ca3916cbb99ca7452382157c442b361 SHA512 b6b2f3c0ed58845cc9204d79d34e8087ac2b1778de8d71ec22fc966119e86dde568b66a8e9953f38c1cd1dd33797e0b774ff6c148bb8662e289136d4ecc578f4
-DIST KRNvKNP.rtbw 1011698768 BLAKE2B 5ab254aebc79cc4359fe7964676af1ae15a5eebb37665e842fb6258a7a86b68f9e0952533105ddda0025d2839f842c1f414c5111c3b0bbc60af7a7e52cdae5e6 SHA512 db7fa11bc70f3326c02a2263059f1c2c5a21ee05a84824ae0354d50d8c3bde1a631a360ef656206cdf272759e2c024784488ce10932da8678b254191809e318d
-DIST KRNvKNP.rtbz 1831031184 BLAKE2B eb286b4fd27dbca4aab6b4f0cc52ce1ac86413b76fbc79ed8e087907b4faf10ffbc6f023e880bdb65ad0766cf322e737f7c82287410e9f32e42117b31e0e3075 SHA512 69acaa1e716042019c6a9e3c856ff1380257e4f8bed0609810b5b7d432c83ac4f168804bdfca38d674826707ecad936ca796d0f7af982a103a65fc5cb70611da
-DIST KRNvKP.rtbw 6367376 BLAKE2B 887081a8e18191ecc6f2a352588a84686ceedffba31231f58b6d902b414434294c2960c3b23f5440063a8f50dc04af6957b6e0bd3803d31baebbd59d7f93a1cb SHA512 b72a145748765d9bf81f9c627945b4bbb8d46aac2d00c64127a67d3b12ca97eb0382d748f5413ce170718b0bacfe4fa6fb62ac3cc7cc920572c15d91569de9c4
-DIST KRNvKP.rtbz 9350416 BLAKE2B cf476fd765b67e475f74f8417904af6bdd228450cd84c4f3ee264d5d3fdcbbf976bc85fa0e5f164a7c5cdf307cdf8634ec1f02b7cff3d8983b7477ec96704916 SHA512 addff1a489812e67dd282ff376ca38b5077aa16695c1c042ca977f8c3f721b72c9857b8afaafa32231d10fabf86af68b0a10015cd3258bfb6cef8f649b9d3d68
-DIST KRNvKPP.rtbw 341667728 BLAKE2B cdd7558add56272205e609f0480da62a6747616496c99d0eb4007e8d3652c21f1ff34722c76cc9ecab5b8032e3a2aeeb276891ef84379653ea5f85d195ad52f9 SHA512 187a11f2e8c4195b1a322ba1fc7f9bdcf8e6c113d32f05758e3171e959bc45749373b4776774ef53adf687ba7a36defc81d06401648f2917fb4b51aa23a0a91a
-DIST KRNvKPP.rtbz 219501136 BLAKE2B 065f3a692617466fa8569cdd45889a1271541119dfb9b893f63bb34610a6979b113a2d8b1f856ecca9b5a92299a319837319a33e39157718591b07235c42d340 SHA512 baaa6d0397a83f68237b17fa023da9021d80350117923583f4f669055bfcea3567f802a69c44ef650d2e991a67ef209c1d840d8c5bb7fe11293bf7a6aefc9434
-DIST KRNvKQ.rtbw 8863888 BLAKE2B a5baa3d6ed935d08f75455fc2a5e90524583d7749f87ba7b79fc286670a4eaf583a52d37f88f4e4706fc49b27e26b7709ddc44fef5c0b084098e788a2d95213b SHA512 0412a8df97196238b8d71dfd2052d9e3609af252714410edfebd3d56db7d76eb72d4fb6373ba03e751f75ac9657f44d5f2613ebfb85d6459d91033ebd8c23f7f
-DIST KRNvKQ.rtbz 6803856 BLAKE2B 58e95677c12f15eb42b8ee8b25801a9aa5e97c4c74044a1e08ae0c15d737b4a6d277201f0bad6f38b85280a4dde872a48cbe6acf88c758ae4292211357e1a328 SHA512 43e2d862dcacb77e44fdef7102ccd5e1e6faed395a89fa97679044ed478e4f8dc4323ed431780088a704686f8b1d72532ee3ee872947b8f4ec348092de99716d
-DIST KRNvKR.rtbw 1491856 BLAKE2B bad07c7d8085d880a91ce12920284bc75b7d79882322ea99d0adc907ab34aea8e79104424bdd04c5bcdfd8a4118dabf673e7523af0bb9a5cce756f18ed832a88 SHA512 48c438620e821643d064f7b16b742a94ff05fe2ebbce561521d7cb2e13765d3c9e21938765b126ac45ebeb2a72b7bc63002d51b203850604a9693e239887fa1d
-DIST KRNvKR.rtbz 287632 BLAKE2B e3c0062ad1803d3d3527bd883928166d1f11e5e8699b21bd828e3eb0bd1ec0b71b6e79d779084f3b8567899e14e49e717e9585d2e02e4011caf793262cfcca26 SHA512 4830c558b49ec81329dff8894fdb2c22b01ccd1306e785f948ba3d1b82488c5609c404a7eb50c1ac01ef63544f506865dce4415286e5fa032ff82bba61b0b1b1
-DIST KRNvKRN.rtbw 97808784 BLAKE2B 82ec53dcea11671fcb3ee3240b03613f383b094fd72d320b9e55f8523b818ee51eb188b07cd394d89b2f5e26071a240889eaa9126b2cc7a819c0412d589faf0c SHA512 8fb3bf30cbb529e5b18c290f523d7a6d4a193320d748608aef04adf35b34e7b73a1598e1cccff633206a4401ed06de2c3c5de46393f2e79533b66a0e03680d1a
-DIST KRNvKRN.rtbz 19639952 BLAKE2B 36943a26f683f92600a9a194c74941d37043a0d0994cbb12bb384c00270aa5fea0b37f9b2c23adf32aa0917e18b6efdc372ca8b614decb42ae91d09ebe306a91 SHA512 60c760b597a0f80e8be8e4f6d0e9417fa3d202a90133bc118aaf2575ab0f587e2b6cd1f8d7925dc2705a87b072483a88079419a1449a043e64b2db23fdab4d9c
-DIST KRNvKRP.rtbw 802331920 BLAKE2B 27109c86a855135fcffe55c123c967ffeb08169edb764b4861ca602f3af9ed420ecb6973de271e9fa463222a500ad1df471a7f22246ae242035dabfc9a89d062 SHA512 d322d67b0644365ea2c90cd7c80506a4182510b36b58e7273a81359677699dea6c8d9e2a8c0679dc8dea2f775637a7570d81af638c426b3c2093f626192d975d
-DIST KRNvKRP.rtbz 107623568 BLAKE2B a18f43065f3027e4deb6fd7f2d82fccfd0c7ab76510d05aff1ed49477b1bf67c4c8202269ed5ab941609df74db79ccdc2922d6bf11279b6213c0e36ff5b3cad3 SHA512 7fbd183965548a9eda97d41c16d21ffdaf1fb3a6b227e6486f6b67a99af12c94cd77aaae2064d6485113fe421bf5aa97a8b37e87f4fbcbc2e9aaf0137c3ff761
-DIST KRPPPvK.rtbw 2506512 BLAKE2B 52d31aa300d97cd2d8fcf6c595e6aea05af0960efc662e1deaea80e457b08b1b537b8000e51d3592ee36279881d20efecd988f4fe9169d0d9355089d9a202995 SHA512 2a0a14239b876c22738d102d18b5d2dc72107f01de041a15aa2f8c4f4282333224f0b3d719c02666ed4995af9c536beb4ac2b794d931a2980f3002be7b8dcffd
-DIST KRPPPvK.rtbz 1173072 BLAKE2B bb0da2848c8b5e2251924dd79444f8e706475c7fb98b8f4566b0069e8647c362ea9f315ec905546ef878186f4b6c20b7ae38fa02a86325def88703445448c534 SHA512 4ba86960be8e0fa1a61f281e313f290d14258a553ea205645b9ec4ce2caedee56db06bd330712777f164aac8497be94623c455344400dd007a755e3bb40558f0
-DIST KRPPvK.rtbw 165072 BLAKE2B 22f21de67b9d2c8a8de46afd7742ab689ced310f6f19265cb90cf3930f230a45a7ecaabdb96883783d284747ff6ada1a696c7d23634ab0eb294871b943cfaf36 SHA512 33ce678fb892f7ca7efb04da7e4790a9a0458e45f41c69772a84e7c0cef819cbdfe2d64d3155db618d05ae703ca1877ab37a095a7bebd79ef70a9fc52e207e2a
-DIST KRPPvK.rtbz 171408 BLAKE2B 8df668fe6ade7d52212960be7250f794bd8e84f80d8ca751e93bfe6c1e1d7c4bb1f76671200bdf08ebad2695b71f550409f364620e376adc0e09effed13d4b8d SHA512 e9455dba9ac047e74a969d9e6f5622df9ae4048fa796bdcbdadb8539146ee557f72445b3a79ca9604d1b49f26c2e332012ffa1b6f289e067bdc3120310cb6cd7
-DIST KRPPvKB.rtbw 33441808 BLAKE2B 1ec4b9df40599065fc24c100d79e58a87cd614f20532ad9a9247c8df56a3d13271b088daa4187b2011f5f20512e363bfcdc54a57745a763c55c0a357493c16ca SHA512 7ab888e89320f27a24a2953a41ccd99479c3171fbd6a0373e29fceaf5fb339d006cf5a77980ac756d15ac32fb5f13a0065960bba2d4e49b44ec9cd15f2797bba
-DIST KRPPvKB.rtbz 38497104 BLAKE2B f655b4617620afee3875967ee2f9ce6e48012cbd1ceaf8e0d4df87846bd8387a7b88ec72bd47f0066d87288e800644a6be93841e1ecf76d639d6e7db90f2af1d SHA512 de39cefc4bf11fce1a78edf7aee2a275a67c22171ba07bca35da7b5b9abb1c4606ca8200453ad46b4888c412608f5a68a4bcfa59b342ba3a5162729863729bbf
-DIST KRPPvKN.rtbw 27357328 BLAKE2B 2f1b4536e6a376679c7223b8f2efcf5ffb7b5f9f066f24452f6485b79f797442b180136847b24ed379ca2a7c6be352550c63bea0b7998dcc74f00039e6ba3543 SHA512 a8b6ae4ca14f47e0e125f3853e73faa0850257df5b176a5c32485a9aed0378445e8c67d44ae5b57dbab56b486464f166b4cc5d450b01ceccd1e370a5e0b218da
-DIST KRPPvKN.rtbz 29685904 BLAKE2B 4eca98ed2e2a5d94e2c692ac39f37ba52c1dc69c13217b3ed9e8eb2f478077c8174a02fea8a4936ff5b4b034b87642a15d45041bbadf33cda5f912e5eacb27f3 SHA512 0d1dc3284f340062e3df398a4065755721b65f8be697f655c63fc7722bbcb03de936ad74ab25deca5d099ffe51da76884fab0cb60822bd8aa476c35d597c153e
-DIST KRPPvKP.rtbw 89440400 BLAKE2B 78d43fa10d114e17d9d375c136c733d9a29f5cfcd18043c91c854405d6d58d08f3f6ed96eedf7a47880fb1640f9451be00735a1f96624e14e2d32d33cb827718 SHA512 488050fe5f2a9bd442c27bce88070aa0474275b2ae3112c84ffbdc71cd5af7b0a27e022378981c371142db49c6eaea1550004f847a592a525ec212eb4ff4d3c2
-DIST KRPPvKP.rtbz 16987984 BLAKE2B cd05f88616362354a99ff41cbc3ded7fd75aa7077a0db3c894a2f5a997973b424c731ec6465a7913b6f1a3199358744b2eef04b45c020169a332ea76636b02f3 SHA512 05c87cde655a958d82613b05f0bdf97dbbd8e31434c296aa499e08359dd385ed335945348e2d335e1680d64e7bf57c3a6adb79913b5bb823fe4e21e9b7fd88dc
-DIST KRPPvKQ.rtbw 638092816 BLAKE2B 18c8db8a957485fe225cc386d030569948b869a8a93bb6e525b5513b393d65fac6e3305dfbf9bba880086c1f123805923a60e96dc627277bb63fd79cdedce836 SHA512 44caa6923fd3fdaf68b19573dfa15820978b628da91dbcef92dadf7921367060d49edfda59a4933b666819d359e61ab9d4b58828e10cbfd1a828c1bf1c83726a
-DIST KRPPvKQ.rtbz 456417296 BLAKE2B e1d665254803a3ab9756bd48c9a9c32ade536ff048faf57ecad6a5cc8d9ce8ee883be70fbdf709522f61c4751ba5256841e88a99c8c15a67585eaf4c8f85f180 SHA512 928f1567f4cdc32fa6fb931a76a001cb1c2b0024bfd2b5573cfb56cd43408e54442c85394745feb575ae3f61c343d19a9a7801f29023e91d2450d059d7bbbc0b
-DIST KRPPvKR.rtbw 247897168 BLAKE2B 51fbfaeea7de40d94c026c8875bf8fbfb2e0087c2b04a1ed31a8dc557111959fa8fc79815d2373d45751a91ca15c762f9aef8fa09f9aa8110c4efd139655b95a SHA512 de906395aedc92a6c7b4ee4d9df4fcd589a3d334e833a8ee0e6509821f5c7fc8f1a80f4dd991bc9535f300cec86c8934d7adade5904e6f33f90c95707c241d2b
-DIST KRPPvKR.rtbz 247409360 BLAKE2B aa4ad3ab6b40d5adc3c04954eb1c800e1491b945bfc95800ec6a59866c55ddc21d1a3179199b82c5fa2c3d687df3d8ab6a38152c9d728ce30825db00c3ec64f6 SHA512 f805d7efbb2985ecddfb6f02dc44ef390269e4ad071f1269ddea1164b62e0ebe3d09fc1982266de03149f6d91912f0772860e17597f6b49bd425751f584911ef
-DIST KRPvK.rtbw 5136 BLAKE2B 691c307c6a4df42c06b830fbd8c660678b58521eeaf705c497ade4d87766df74b1ecbb6dca117b61b57683e8dd0601fb52beb9c1d406af9c2629730973d971cf SHA512 97c34aa51245a1aff0b8deb2c1adbe72fdebb66ef0422853048987bc59fb0a290f27cd30e6b591b35d11ce968caf3432a3521bfedced651242305a563ed8126d
-DIST KRPvK.rtbz 12944 BLAKE2B c39904bbfd0ba5b968aec06b085f19011ec39c72e8dd4b70f4e41a76047f114d867cdd4fdce5191f247ff044d479ac53eb7d30fb1e3a37cf7df3d6ab0e5c102b SHA512 c59039928606b1cfaa60fb71cecd882d62ad18978cb9d6bd318c35fcbd49553434dcc564dcdf644f32fea3d0e4dfb48ee3d66f59e9ca4824d2117c4a00305fd9
-DIST KRPvKB.rtbw 9939984 BLAKE2B f81c00703e3b43b7c28d542b871e69f44c36f091f8d176a13cd9502f6d6a2107b100e8e10c12bea7842e72fa53ca41fe6049f3fce111a1168f982cccb84927e8 SHA512 774dcea0ce062b3a9cfce0d8760c4720b224bd2edbe79be9ee8bab9b665ebcad380c58509a929207bf85c4dbd7b73b8043df1df21784ded852ae1c735b47f685
-DIST KRPvKB.rtbz 15630032 BLAKE2B 94d110709cb3947c1510f2910759cba81afdc3d749d3be8c733ee8d465be7f2c0482d308c40851533f421c68d686b3734319c293635ce23d054773327b026601 SHA512 3a6ddcc4e0a284ceade7ad019fd7754c9e34c5c3c9ced719493ad33b7818dfc335cf0f11fe3ca339594ae33852185be20968eb6481ccccb441e98c2a7da90d7b
-DIST KRPvKBB.rtbw 522144272 BLAKE2B 173f77ebd2a51bf1f32fae7be44f4386cbadd727862c0f61233b6e6aa8aad08c99a7f595e66fe08530573ab1d8965692420269bd45069ceb44e3a282016520ef SHA512 5191c2a623d639bdfd005bb7ba788083474411c71dc1f8af4ab0b8e84c48b9d4ed822dfb48a5e8d011658a2a71c1d5d61439a70879c36254b1976e31e2786a32
-DIST KRPvKBB.rtbz 69502480 BLAKE2B cddaa531b4016b3d9d8196e7f82b9d46b26004cb1d75d64da1d18b5a191bd9c76805ed53a3ca39f4f0fe248b865bcd6636d66cf775f4142a354abe9d92fa7f84 SHA512 b7210c06b1c440e69890f24e4fbd1aa1fff8ba06357e07eaabeb896893b1b2238580d546bcd60366870618dc3c6c0b6076409c13b5909bceedd77d7cd0b72ac5
-DIST KRPvKBN.rtbw 1420021008 BLAKE2B a6d2b7324917c89cdfb50f66354ee23b62e9f2a676d43fe2934999ab7b29cdb148ff9ae9809ecdc5ba2cd08d18350163e8829a6ff41eb41cdecd0424b38b744b SHA512 5ce5213f044f1e9882463dbc2ed528d1cf45f572140c420cc6be2a3d69da58c6e8a7bd922cfec0fe218c18490248e5d05a7d4efe1ac7a9829d5fdb58f34dbe37
-DIST KRPvKBN.rtbz 376919760 BLAKE2B dce0f2bdc4988d4a5efa76b5bdb3bac760f0b5062b730691491380a949d2160108eff450c1d2299c3b5259ebdda6ea355a984bf350dc3383348401a87016d1da SHA512 dc2f8cfbe63294323fcf5e6cb079f24edcd173505323d5530bafa368ba7cdadf2b8ad67a5c0d9fc2e60cada84d10cde66ec2cb2194461b659aff34996386f0ef
-DIST KRPvKBP.rtbw 1242134480 BLAKE2B 146db15c8d4d6ad3734e5b7ef9fdea2551c8d9e377b4c3061035406d4e3977a4d85eda9262f26f792923aaaaef3c90ff8c003db681763d9bcb589bf3d3fd5f29 SHA512 4fa68abc4158db672a4069f6aea81d1cae25f6762f22bfc73a30e9d000d9a438f5f4d17395cfdc4760b2bbc132bbbf62511e3ce478f17f1faea3e1c67a929b70
-DIST KRPvKBP.rtbz 614933904 BLAKE2B d79f4c7ae717a8f3289da3edc0ef934b5cee94ae32f0727663f7b90e717c34695615ba93df851d3d096882f400529fef552884497ac394150bd5815fb484b7a8 SHA512 7b4a5f48db9120c9f9fa3e72c48491bb58280d1204eea3f4626dbba9ba0ea947c3c969e57bc63e00683e417ca716ca0917ffd02e2d391d4c3aeb2c5e47f9c814
-DIST KRPvKN.rtbw 9449680 BLAKE2B 6339d977a7f30697fb39f1342a66032553e4c7805d30c84d4d37d40e17799f8d2af37018a5652983c180f17b166ed05f86903b27e976dbfc8a64aee7c29980e3 SHA512 e02dc020be8335fb9903a0417314a1fa92807f303f707f5afe78dc527a38a0ebb901ae0c9ecccca94254ca8a8bea2b7223ba569822cb8383589adbdb79c4b2cd
-DIST KRPvKN.rtbz 12376144 BLAKE2B 6a1deb084f0ae128580f2873fc36b716a23ae9e324a3e7c18b296b77ad921ff6bcb9e4064cad304580286c22fef4d2c132913696b6c949bb9689f41bc6d01fd1 SHA512 923f7659bdc69fc8ee333ba7bad138391ff56365080638d2f0b6bd39cb98c26a4aad4990667a2943c084ed836c0bf4b69264bb0b696f4b45888008c60d874b7c
-DIST KRPvKNN.rtbw 656427216 BLAKE2B d5e5e0821c0b9431e2d66fb0915ce119e2ac84fdd0d5652015bb71b9af061120648e316f609857d5adef002e2f76695e8d33181c1d4d91b05676097f2ba718ca SHA512 2b8b11e1436b685689f509f452442dcc970247623cc35b2105c5c9b30e45aad52b66c713aaa231292917e10bc7bb2a88bab858da9dd88300f989ae0bebe6f645
-DIST KRPvKNN.rtbz 231318736 BLAKE2B 45d8c8c4698daab83eca98cb784455f1050e51c02fefe253e53426779103dae43927622586f62c85cd04897d66cbdcb1de85f7a5d0269f1c0d96fd5b6841cc5a SHA512 10238c6955e4359f59d961f69f2713a27c83c49048130768a0c785fba5655152bdd267bdbd83821b2dc92afa56cbcb049d12bb9fe0cac4a20dd9b24d8af73ab2
-DIST KRPvKNP.rtbw 1119221264 BLAKE2B f1eae074d5b54b0898b63a7db2419426cd054ed3d171a2c5073d03a6fc674e4d18bb13fc6c5e6a7c2db86f72abc1761fdab71228f5545b55445fa047e63cb4b3 SHA512 4357a5e65751224b48a622410a4dbe9c6043b10ed8aaaea8a9d45884705b70fed023fb493a26495f362523c6d68ac75de175b97766270b901b4c3c78f9773e30
-DIST KRPvKNP.rtbz 538675472 BLAKE2B 0130770b0ccc8bbb14e44fb9af3141031e00d53b39fb4720e53f07549e017361e0825a32e932185761eb32eca49a2b86b748ea0bf91e2cc8e40fa104e7c90793 SHA512 9884236554a9698ada4a75266423d4874af8633bf7cd01773c44e804240630d9a6dd9bccc3a1d38ad759376c9b5444c7b0e6d5554251cdb7cf6e9973c59ddc8b
-DIST KRPvKP.rtbw 4446224 BLAKE2B 999f2e20119018873e66446bdfa2130c5502970a91e9a9bb409a476e8a12656733e720c72dbf409990b1f14c7838d943704f9506ff47e23cdfce81123feaaac2 SHA512 7c58910d9e4f1af030af2ab56e5c365c29cd7280b92256281a83b31bb015ee01293a94d3509d56f3d9cd494b1e579fa86b8d1f7f2bbcd2376626b28cfa9a5262
-DIST KRPvKP.rtbz 1408272 BLAKE2B 0849de74a43d58258ee567a164a0957d240097c8137d782d78fc27a3dce19ece3caed116c0fd2407a93f10d799e266b66b58def976c60d31662dfe9677e3602f SHA512 7b8984a549588316c7ce43e787c753277ec6aa58d9dd9568c5140ef295356c554fcb810d837276306cfa06e4848104500a30e84a48c91edf887cf214487fc244
-DIST KRPvKPP.rtbw 249114448 BLAKE2B e5bb47288f82d4a20bcfdcab31ba410dffc0d3120627e27a82a9d9b6a03bb84d55397229e39203cd22d098cfd58cc6f8f140718f7de4e742d07467b9d1028101 SHA512 ed47af5d2e2a1c5e240b5ab4069882057a19f6d0fca50086675b7199daccd1b25038bf6d61f4d9be26607021caa91a5da25ad33e62b3601c161c5f2eb3ee3710
-DIST KRPvKPP.rtbz 85511504 BLAKE2B 5ff57d7f990cbb4c1202351f1d7b51eb04e9aebb459a6bc97ad61712a837c167784de80362a41c4545fd62a89055227c6e6dd16a8b7b2411c42098bb3834e9d4 SHA512 5548767c225de48f431a043dbb1ed1d677b36714d9e9837dd26ecb86067122ac1a7eb46c2c3f4623b4e47ef58c5e4f9de62ef04b7d1404341e7a520d4c85c09b
-DIST KRPvKQ.rtbw 17606928 BLAKE2B e396ecc038f3e17cb2e931dfd63bf49e7dcff296f82ef88ceea8d22f57d08ab62e5efc7e2021d75ad6118d5e0f21db01fcdff4a2fbcad01e4de8a4859f878b21 SHA512 c8dbee7168ce87bc002a9abe71d1fe6bf4174790b1903c58d849af18bb7b1da49006277a27a7cabe2659ee4b11ab6e87c563440fbacbd26321e5982c5cb988f5
-DIST KRPvKQ.rtbz 31920016 BLAKE2B 0eb330bd8b0fd63fd40c6cf9a6d411b272350776bce7a1399d8adf5a9e5acb92901d8db27b771d7f98111728d634cc6fc2ad1c2319ee8fed57132fc47d686606 SHA512 f1df70a5c24627295d80cfb8763314cbea19e35802827d8abb12fa30cb53ac328d8e95643cb0019062664058f2acfcb946380967d1f422a7c125db486045b5ca
-DIST KRPvKR.rtbw 16378576 BLAKE2B cffe000e31a9a46114e0ca5baa7e7962d1cd5cd9465d059a6e277c7e5828a8761d0dc0d0103d11385bb6614a85bf85059d0f0ecde96b540ecd06ebf65e1bc611 SHA512 34245aa3accb1120f49bdbf3add5a0c59f9b876f9fe89bfe25078e86606d2c4d4cd4b654e6f195e0e1d6f7e1fc50a1d02c4c2b35ba0ec3e08413b0e12eb51d4e
-DIST KRPvKR.rtbz 13725456 BLAKE2B 9bae1b123899176a2b5f9214b7d08a2ae22359f7da7bee89682e66926d4248b252fbf54899c000d7413751ff9bc975b82f2514264e7618683035345d38a69b65 SHA512 706fcd6bfd196ae380986a2c17890c4741734e8ab32b6f2d8f6eebffcc8ec028a7d2fc948b84c62705317607db852cbdd08905312add459b1f6aba8921884823
-DIST KRPvKRP.rtbw 516280976 BLAKE2B 3f9dfbac9048954b81bb4281d0c81d9f14adb26ac78b318493b06be828fae3bceeb614b47ad72458e93d266757a74d69bec42c4d637b3c66e80d097c628ff314 SHA512 2f4e817ae15680135bfffdb5c8820115df110c673cf675a6413aae6d75e24973e799a8b28e45af4a59f61285d2bbcbbb746f57538942da66423742ca86272e0a
-DIST KRPvKRP.rtbz 438637840 BLAKE2B aadfd1a6c6bb793638d0c2315188da6f27c78ca70c9520edf687ce27fcf156bce73bbc089091edf6ee14021a2a38d9eeb7aabd81a4ac2c93977360eea7fde35d SHA512 5824690badee967ebc4006085c34e25772f160e0fbf148ef38d20bf102c4e7d7d60d4132635a54bef0845869e833a8bc4098df9c924edadb7af14696a48ac4d0
-DIST KRRBBvK.rtbw 8423824 BLAKE2B 0aad66baaa642a6870c580a53dfd41a7d36a4f8bac4ed7b33cbbab2e16cf4284bc9e8373cc4f28c33c620290fc9937a104119e995d9f83c49ba914ea38bd93f6 SHA512 9feba72314bcff4f15cdc531ad598e01d4fb6ea6145525bb659060ac890c7d2014373aa98bb7d37273159eb93395efcea410569def051c7e5adbca60fb66b71c
-DIST KRRBBvK.rtbz 85746256 BLAKE2B 24ec2c9653fc1515c8ee359520464d3e618f9679600c02d1414f6f0d09df544ba06bbe96f268dc3ef7dbaf17d051f3c47eab9b9ca8c7215d17645488675af677 SHA512 3a45d8a74f3b214fb69c7e9909c48d9919b20b0f52d918c958f086c20b8e656e420e92314ea255213524ce1981ce6b77afcf2401822639e2c6fd5a332aa0dd9f
-DIST KRRBNvK.rtbw 10427600 BLAKE2B 83049fdc761ef6b41b97d4f79d944ba377d299d6aaa29e3e454931bcaf791ef5574c9d8f1eea5465e804f279ec026fb86f522c49c08ea8343125b6598ad9b395 SHA512 a78345a9cfd4ea447a4311077f05871f569ab5fc366a59044e57178138e201988225611da900ebfc6397bc079ec33bba42a5a1389bf60717f10b520d6cfbcef6
-DIST KRRBNvK.rtbz 150302352 BLAKE2B 3cf3aabcebf9c76636420feee0a97aa498efc043e69f3355d831521472d283a0b2cad29292c43d5b155d49005f2c02052064c61f164d89710879550752ca220e SHA512 b4fd0fcce9b6173512dc443eb783b4ebec4b022509ec33ed5210b6dc7f1293b55806f8a92370fbdfd52f404b364957baccebbbdcd55bc907a88d3e6d37c62f51
-DIST KRRBPvK.rtbw 29150480 BLAKE2B e99cc2674f43c6705b44dd7fc183350bb760acb15e26fab444a951357a3080c4dfb5f04727bd41d3ff8ac86ede2197452e94c738335297e8181e52fdb587e5db SHA512 8981823594418c741dfb55f9545df089780981b36deb86a93ca1c5fb84ef811dd8bcb374f144174e11d26e49ed56b373d5e93cef7d3edf34769d89d9efebda2a
-DIST KRRBPvK.rtbz 41012176 BLAKE2B 4e4920c2286c33ea04d22c5577fcdc3cb255360ab993911e1d7923f00164b6c8373ada9e5f9f52f781bebce54108bcb8c8c9c326bbb3cd49113c93f4b16f950f SHA512 1115f1e6ef56653206b71a1d443112fc8a36ac02b7a1a214d406b57e122b44c6efe8feb8ee4353d58ddee038be9bc667e32f7720f704e3aa3bd003518533ba8b
-DIST KRRBvK.rtbw 159504 BLAKE2B 2fec46e3aee699fa9da0bcc77196e489cd79fd89d2467ebb3160722077e1fd1a2a3c3224d92162286e81804998e2a253272b88e40012be31d91d838cf80d4cc9 SHA512 01c43246f237ee6db9a7111f767d99099b2f7a4e437fc019bd22c599d87d1bf80298fec34bf04d4ec48bd170237ad20ba0dd68ab0d37e00b56a9366b54a313f6
-DIST KRRBvK.rtbz 2703248 BLAKE2B 5a9759fb6257600a4ee32352a8d71a08e48ae76b99909fbc9a6c979480d42b6571d50b73d158c3c0885e532678d0fc69edf1a8e40c3a7b683567931b31adf3dc SHA512 e8101b4cdd02eba9ef92cdc3910b0d86ca8b2068adbcc0a9bf0be2417b0232a627c09e7d39adf9095f3a83233d13623e2ce21746f3c031ea5ba1f204f949a77b
-DIST KRRBvKB.rtbw 3675408 BLAKE2B 1d026dad5da97933950037d7b59f6aff23f30d708089d08716f802dd46b52261564ac358532a31fa1a0c7fb3ecadf2be7d63320e4eaff6f2c9e5820382cc4305 SHA512 03889b0bfeeda4b4bffaeca8829f9f1f22b0a2c92178b8101a795810406dcb0e99feeb1af0f331437c68c1d63fe6fd961ab8ffc45d94f25eb9dabca98b09d4b2
-DIST KRRBvKB.rtbz 134213712 BLAKE2B 5a19f0be08a6fbff71f5fc4175d3872022756d060c07b177c75a966ad921b1ec5644b218c0493c832c00797df60bfa5dee6f6359e15a3e2ee57ebc4171baa445 SHA512 c6dc07a1ad0cb037d34fc48b41e7a7bc247ec32810327b997da7c555bf83a19dfbef7309449acceee08d52263739a8bbd79e0c717e28a4fd8be667b0850333b9
-DIST KRRBvKN.rtbw 3676304 BLAKE2B c933062b577089d620e89321f8b8e6d22bb4aedaecfe01c40c2f5b5ac00da1a9df90e74812e326a4c6ee6c9e31922b67fad98b250825298dfe1c8b67646ef7a5 SHA512 fae3c4eab72bf7e2447f6d4a16d2da29132e4b1dacdc5eb57fb52a3afafc72365f358dfc0c3a98797a27f1d0c4766ffadfa0734142e5b26ae7a538c276520c21
-DIST KRRBvKN.rtbz 109282704 BLAKE2B 5374cf0e1e99c72c24a29586f395a560695d3c9a400888f61a01e883f037647e9fee6b0221dbcfdeab7aca39b067aace85ab559bf6142f698171cdf9c339d80c SHA512 84a994eaaace17d87a9114fbf09acf8a9cd57a26b293593751fafca00f10f796e0d9ccd6b68bacf2abc9c313548283fe89ade163c6f8789a94b26d1ba0c7f2a5
-DIST KRRBvKP.rtbw 42143696 BLAKE2B c75650773dd3116271657336fe535d17d8e829202b3fe19ebc80900c519a5c172af680a9eff32ef4554a36635322a0241ce687dfb5a7236f0db9048f9d3f25ff SHA512 f0aa505d3fedbf5b9a35c832c7564241378818dc7e79e23e0098a536c380324ad3fbd7648a0cd82afcbdde418292b8aea222b29598a299275b1adec13c72ba72
-DIST KRRBvKP.rtbz 126865488 BLAKE2B c314a3c739a648224d688dd7f86732d0cd618dac0f2dbaae933d4e870d108cfa9b4a94d6de1d7f3df7ecc3171cb60b159c85dde78333f7ef19ac35636c6272b6 SHA512 bc930680f142b121a3f6b153081811025741c8a74d2ba11f97a85f310cab424fb567fca56e313845bc51dc4f2bde6b6d026dbd5b0de4f59931dcce3dfb25ad76
-DIST KRRBvKQ.rtbw 167901328 BLAKE2B 705ce990c6e48db8a0fd65040c8b86f3482f3a1b1ed3c4120bc6c0025c3daf6513aeb4bc50537e8e930180e5c6123c60189c0d39c28833bd9c521b5402adc855 SHA512 0eb89ceeb5ec811ed9622dc53acb77bb509d7240c2b0071bebf516569969662b673b4479dc87bf346d0d0f1aa3c5489fe5666923422eac8bf447e3e30ae3e838
-DIST KRRBvKQ.rtbz 454638096 BLAKE2B 2e0e479b0c809426ef889baa2227fe3725c2785fbb258e25906d179549d51d75c2ba4b82702077141b30a3d54497e944053c690d5625d0dd2abb10527a8f3345 SHA512 46658eb88d783957830612835d2a1a9246a8cadf04e73114543dffc7c038f1a6bb0adab500fa6dc9b10a9e1fa49612a2be2b3e6da37bdcd6aa73626a658d566b
-DIST KRRBvKR.rtbw 16228880 BLAKE2B fe2581cd198576f436da1f4f71b9a54e48f5d7538f9f1d4f5e0131df3b8ad586dff8e9552b506c81eab361e0bb9260152eab752782f13a4c4cf396100e79ffbb SHA512 821663b82a6f66b3ddc66964632263d3fd9fda82dff840ad5a3d5510f53b57df4800b7c1e1af1fb90b9a91618c68636e6df59b310eb76a892b577d57c1f4492f
-DIST KRRBvKR.rtbz 266303632 BLAKE2B 47ac420f9431e6f185336944e0831c0d5e83d2e225c2fc2a39cd280c6ce8326fa5848eb5aea4ccb5da3b67ad55ce433aa0739c07dfd4362ff06e99d534c3b69d SHA512 818f99b67f936e6746c08475aba72f1afa962a0347cfd7c3ef588fcdfbc022eb8218b21f42e61e0a4bbb7d58c17f5425a4ca24abc5ab76e434c7b2bb471c15f9
-DIST KRRNNvK.rtbw 5860880 BLAKE2B 63dc9aac2e175d1cd3a054997e99091dff517c60a43e0757113b49e4c494787e83c228aa32c9669ebebc36d73eb15f6ae47f2f87dd432b96e4cae084fabd043a SHA512 7bbdabd3e31912fa7b7bdeda32a7d12f6500e8ecdfd84480815b9982b1755370d36ed98724228a8a08936fbfe68817f9cf3cdffa538e3050e807b9c63b882d49
-DIST KRRNNvK.rtbz 93662864 BLAKE2B bbfb0a8dc6ec05b58e37c50a367a4d4789fa3f59a2fa445c7a8e5a7043d72e3f897bc65086f23b6a1071258fde167f230a8844ce7cfcb7397c8c0f7bf25efb5b SHA512 d37111e60db529e191375d3b55a8940eb7f02a39546a5bf48e276f97069a485db6b654a5272c990db04be7810a4962ef88256553b4d8db41efbf053fc208b900
-DIST KRRNPvK.rtbw 23632272 BLAKE2B 2b7a42a7acd1504c9eac7073ab1dbdee14d7790f4b94dce9f3ef4c5f7f845c9e695447f4904fa1c84995dd335c8228e1cb1239cd8cdd56f11e4d9e6daaf957f3 SHA512 83297c2d75c4ee0d71ac46efd17ddb4e6ffddb2047ef757b97fee5f75e26e144996a3376c18f15aa07a91dd6557bf82bea918da412f82078f8821f037ff1f551
-DIST KRRNPvK.rtbz 40651152 BLAKE2B 4915770c2183ff89dc3864fd241d6e56f224354186e78909b3ca4d8203d69b482cf16ba0e14bc51d7d125310409c87dd11472b2ff1a9f280978ae51ba2a67775 SHA512 071a53ea9f6836808b839d7ef32c00506b371be1868ad293a6201f02a2f1fb3ad285e36c7ad377566816d1ae0fa8a834de50f8da0f1748a45b3048e50d6f5116
-DIST KRRNvK.rtbw 100624 BLAKE2B 2d62e938d4cfe502d69dc180cf5d9aa4b2d0187b354c4c97fe4828fde9382db84243cffc0ddd98f62a136aa18161cd61dc19a40ae32f07f7ff683492c4d9f836 SHA512 c045ce330346183d365214eda8bda1b6d88649205a357ddd947d40ff2614b16dd84e499c91d4474e5ac508f0570c9db633be04f25dd36d06341dd2710cb99ad6
-DIST KRRNvK.rtbz 2725776 BLAKE2B 34b2618a81a3635f67c7b2b656b0b419f179dbaba3de7234850ebaaf7e54fc693947ae34ddcd028de600e63e841dccbcb2da987a44954baf3f11ab49b6fa105e SHA512 258cbbb6f6a18bd4f948b023e4b1d87ed35c0cf749679795e5ecd5bcdf2ee3eb0dc44d46f1350bf73508ad93c53ac6b7c42e896f5cacf6cb223032c6c2e1742e
-DIST KRRNvKB.rtbw 3667344 BLAKE2B b5fc05360cb0a7ae6a088f9e77c7bc29b1318258d7487b1456b644e135e7591aa9048dd6992106c12386e7dffe49f81fcd8f809effa342a5a6c9127b8587e47c SHA512 97eaac8ac1bda82184126c7f72469348c6a45c246f04175dcc48d8f75badc70a2ac564bce5270cdaf751fb42bc74bd56f43dda7645368ed2f53dd162af63b786
-DIST KRRNvKB.rtbz 126438736 BLAKE2B e24785fa3b9d863a568001155864b95a78a1b3ca0d06f537028c868493b3121d33125369b9143e8916d20187d5cfd2a1128ef0263cfcc7a15875265827053c25 SHA512 6dd1c4851005bba9b93d875a00369e3b59a7cf64081e57ce8f4e5673b3d461bc2c57dd518f3cd3479e84394cae3e07c9e74f6d22d5028ad9be0e0c335589d185
-DIST KRRNvKN.rtbw 3654672 BLAKE2B 38aa43d31d22dd6161865e637b59fcbac46df93d5d0d5d5c509e033badd26ddbb1d8d7b75b8fb42d39b134b4d915a8dc4a42e208598ac767ed78b72515137851 SHA512 75c06c094d5e8773e0d9337749364c11a9331efb122d93f767586f4d5b10c6c5f1d008afed6bb6da2e03f0dae300ec19ee6a4494dc25bb1861c6f4399413a234
-DIST KRRNvKN.rtbz 103568208 BLAKE2B 5b30e0aea1e86f45edf65026e8d4e3c1ed48d3fe70e565ecf8fc618757e65a8a1284d5b4d4fb8b7bfcd10325004ae2683d4bdb1b20a16b41ddc2eb6855e08b2c SHA512 65c9d92e3895a25d6c143334c4cb1f3e9e793e708b4af819458e79d6832fc29c6233b292e06cd1bac8188a61a5c3241dd24196fefeb056135e4d4172ed6d7917
-DIST KRRNvKP.rtbw 49373520 BLAKE2B 31956d40be553c0d2cc64bf9800477045d80a74833eeef6d38951e1e0a89db535d06dd2e61a6adb8bca6913b19112e22e00aa4bf791446bae817018aed313471 SHA512 fdf21a9315a2e1a5356f3c698051836f18ba059ff03bc0ca9284095c1a3c61472bec5ca4555eebca14df1d791fd861cad1d3d742d65a2098b6eba7b4f032b475
-DIST KRRNvKP.rtbz 114540752 BLAKE2B cf13e6105fa6c07f716f77ebea4ecfe2020479b12a3d13df303cde8da7d763fb85a3d7f9ee6885dcac3145476d8f664e26d3473dbae1e6e0a413bd26ea033134 SHA512 3e6e15f64d2342a47a72dc9124e834d4a76c68514c4a1cb6c583b23cdc750935da4d3fa0fa5d3fb44dfe17400c1abf20fe7ce3726b0f67a06fb3dd7390fbf8cf
-DIST KRRNvKQ.rtbw 200234128 BLAKE2B 288860784911a53dfbd7cc85f252c89d8ec71d07b6460a47bd6d6799977754b39856ffd7d960bb73d62d55e5451118c7a5859d46f4089f17d56338caf842ab3f SHA512 77a54b643af213dedf0804b1f6647cd4bcf7c8e591ac246e6172fd12ccd2b4e0db2acac08f85fdbfa646cda58fa7181e0df956f98ad96b613007581c994144e5
-DIST KRRNvKQ.rtbz 491956560 BLAKE2B bba0d1dbd9dd49b133eaf049df67a856740539ca118dcbc01c47fe501b1779a3b589df9bfa15b580b1f3d2cfec644986069532d047a6f209e7402f0b53a69c59 SHA512 d668877267617f6cfc5ad678bbcbc77cdade002ef559b18904fa449e85188881da28efa7c50f223aaa41594a232105ab169ee2eda77fdca43e4775f7bb3a3a7b
-DIST KRRNvKR.rtbw 15226064 BLAKE2B 3e0170a856ac2e33f8166678bfce037d05ecd4c943c1287c09484adb894aee521e980b63dac4a2b5ec5c2ba2660ae27b3883a1b74d9b40f99324b34d7caa931e SHA512 946bfc3a9df96362966b36a9aa3a34c5abb777311825f8a70f700d41ba0296071dd627189fbb08e005f470fd307578ec7232ebda824cab31627d39ddb8ce1354
-DIST KRRNvKR.rtbz 319945232 BLAKE2B ce3ceac18ca016d4ffa8fe4f1e41a34a190b94264c7043c8ed67c7eae7b0a66aa67d715de39f56a94c698c87528e5d9afe8c4520024029851aaeaa92e9f4ad6e SHA512 ba7d7db27e6de644fb8f877e8a47ddce49b6438cbdee8a89623be91011e96be968204cf74bfc390cfe01891b5e923f5a8233d23057763a8264a9e3e1469f5de1
-DIST KRRPPvK.rtbw 6839568 BLAKE2B fa222b3793d5511cfba247f4e4c6651b0d1f3728fd077f52d6731176c65922048efeea6e0e6f187ba79e6b066e79c6d9ed6363c963f43cefd1587c1ea36c6e4a SHA512 eddbc4ef4037073b6ed258edcffa5a2d025dfa5dc2b920500861920cbfef4ffe593647ac3574a6f2d70162156a80d7c465321582c91a7fd5d1f3ec8d1edd2c5a
-DIST KRRPPvK.rtbz 4353936 BLAKE2B b116bb8c9cdb0df81314441e95667ccd65a1a10006d2a03ad8e3d9ac235cea4a6486eed6702c153fe300268d8030fbaea71a71d295466c1ff825d57f35184063 SHA512 dffe2adabe36152bb35adbd350a50e75bd4905bfd5c51015d1040202658a245f86bae16cf8e8bf9281bb50d5af3878f2dcd156df53f1f3929d17f94967648c6c
-DIST KRRPvK.rtbw 241872 BLAKE2B 428a634e665e1f79aaba78ce005de7a22e235b100f293147dc4cecfaad00c651771b9ee25cfe57054ec9196603ccec6f84e82e54b36da0b58b16c491bf12752c SHA512 9f6770f1e774dfc1d7ca8efa12d6336fcf2cc1112bf8383f08e761cb2706bb6962a9038400f6c12564e87bceb1d4cb0b948efa02fda0a363136e46512dda9fd5
-DIST KRRPvK.rtbz 630032 BLAKE2B f045168bcf3826203e87fe45120598617db2d00a23270ed630119b93f68225dd791691f0b261349504840e5e2c59d02b1743f18c735c8c9a69b5b1e3db450220 SHA512 d454488711237fc2cd22d68349f9d2fe908d3915fb284e227376489a0e3e142e92a2adf7453fdd3b96c1926a0726c550f31dee45b43ff1eb9322b3acd383caa0
-DIST KRRPvKB.rtbw 12656528 BLAKE2B 6b076b9be5c89627cfd734941457bb8313e644de8c2dd7231e5e4cd56882f1f1a9672fd176f29165e1e8bf8a92925596a0464579edbf50896bf315dba247c1d7 SHA512 039de6d5615232ee9ebd88670efc3029274b42176c23f485f3f69c2e91f5880717c268936de3a4ec8cee97dba599f77d09cb08c477c32affb48b5cf6f42db433
-DIST KRRPvKB.rtbz 71324368 BLAKE2B e3716cb05be8829ea66fbc295e7041d723b24de8170d601788c9f97743daf01d6fb82aca491a58607fc7cb3b222cce08c6831c3d5c016e6cf6a0166fc94b485d SHA512 965c467fdb6fd6850b2b48275705cca91ad1bcfa68ca55634c09c79cfaba8a9039c29c9d5101f7c67fd7f219342c1910b10273a2a498e0c502759f1974f15f45
-DIST KRRPvKN.rtbw 12212304 BLAKE2B b7e797f90024215e13aa941fb6be96658dc8a3145285836620e8297fcb07c391c38c9b1a69bd3554d4489472da1a24bfa46396f1992f5e9e3873b2d3543d6e45 SHA512 cb4b2cd0eec418359c60b51ab8201e138414cd36a9e3fef2c8a6ae1304119a2246a047009bfd43eba15506278a9c1f806da6b628f49eeac5e040f6bded1a922f
-DIST KRRPvKN.rtbz 65050832 BLAKE2B 51c08d5bac5d433c97eb6ccc957d5e232e0aebaed54a13eccdd3915a419bf87e6912e932b3f2250b7da2e950c121d1ff2957b465a11293a10b3c4a1b7b1674cb SHA512 4500dea8825d0a0c07a111417f5984507752bca0bc60599d8172b387b2f983338286f9ee4ce6aa726ae6821c3e52965123b561074fc24b8b3af59245468be106
-DIST KRRPvKP.rtbw 80050640 BLAKE2B b2011f0f498a9480c17f5ecfa900bfc4d553fa05b292ad6b935447804fa05116ea77c9c8024d304a8c1bbf1a71368192e4ffb1f421b16767a9b39d22a7f2db5f SHA512 6d224b3c6d4607b7cdf36017953a0645cd55477f23e86ff5afcefeb6d919612414d51b97bc52a05b89c2214b796c7102dece206af62b2f4475b12083ed8c0ff5
-DIST KRRPvKP.rtbz 34184080 BLAKE2B 5403c324aef83e7a2f8ab6e87e11670ad93a3f7d4b120844ee9066636eac376153952ed4f82b394ab84057606f3be08c295638ea5320de50a68ece1d32ca4e7f SHA512 cdcdcfb2b8af8ea3a402edfdbbd6bb9b16214cc0b925529c0b29a4e4cb3948b79d9bff1a0848a373103eaf08ebf56b2f77b71163a488892e5ece47884232d448
-DIST KRRPvKQ.rtbw 919934160 BLAKE2B 2db8eeeef7f903e3fc1f7b8e21a9340403fe4bc5227dfeb54b5a727adbe737014c23f0ae7f5f8f785eed15375243091761938e97d53583fe820343ebf770d7f6 SHA512 95e417bba7c68ff45df50d79acbfdbf1663c63be41e660ff71cf324c9f44b1b09e8600c2b9ecbf868877c8e8d563c757703653da00b428258fdd875386993b01
-DIST KRRPvKQ.rtbz 598910032 BLAKE2B 479b84dbf2a744520c41268104d086bca9566785da0d573f29ef39556e08a90e798d9228f0a170838b5b4c0139532916b8cd5272257be2f3477c58ec9f5936ba SHA512 9f5376c7bb09eed56412726399194182e6d24b4fd1f3d4feb45282a40ec5f81c0ffdf427268fbb9dbe9970fb46a709dc5b899e214fae3332b2c1b123f75b90c3
-DIST KRRPvKR.rtbw 34982544 BLAKE2B 4f0118ae0a4ff2d88c0b44bbe0a7c1a8a361ebebd7b0b70a1809aa30cc6b18fe593abbfc40ef7ca16b1fca00fe947fc3f3445ccad724b537c4c17f0e6bd6b4b9 SHA512 2c9e879c0939d31eb2a95d07c0d18fd9e08fd1993c6305432d5014fa4848000389eb415da2cc0fcc91092a77578373883be727b091a4b128886f62b762611080
-DIST KRRPvKR.rtbz 168712656 BLAKE2B 77345f60b5e2231ada0a99d6aff5a26481ef9daf7b69778832640c1b286dfe7a05d71c16ed7279d7eb9df02e76a04e501fbc9cf1110b73e1d93717ecc1b9f1d2 SHA512 d26f8736179704732f313260eed0ffc1f90da8081f6f6ea8bf067256bf376ed91c7c190c556e5b4130bab075412c16a49c18cbc600049420ceb8e49968fd01d6
-DIST KRRRBvK.rtbw 4222352 BLAKE2B ad7eccf486321f86be6f6e3149ad5cf17326291f9d89c3c1776ddc813afc8494b12e7f450f3032e0f6d8bfa0b1894b530bfd5c8204afe40b145223412104ebf9 SHA512 87dbab725381da774a75d81c2bb2d7526d7140b715e7b0feec2a8a796b1b17215da3837525bc474dd9d214726d21780f460f5ee2e47e9fa87bcc0fcb77afd188
-DIST KRRRBvK.rtbz 28263952 BLAKE2B 0769b4809e06e17d9f7ffd7b47dbe6a5a23ad229c5ecd9e9298986478216a0d0dc1f53291dcc28014c141dd472af4a5b754e59513346961b7dc9a892c15726b2 SHA512 4138b65a82b8e2a3bf7503cf8c188eccfdb55d1392102fc01bb63bbaf7041214ac5bbdf36f8adf8eefde6007b3584badb1709f97a06ed896127e5cf390177962
-DIST KRRRNvK.rtbw 3464080 BLAKE2B 20f0f674a9ac714ecab718a4b3015c9463808de03d5bdffad86fecbd32ea395759d52043a3515849b7b82da565a034fdda47a0e7a2924197bb6d70bb001ec01c SHA512 b8eee312ea1848d3aeaa51e96385f775250f699a4c3a2d806a0553809940d92b0294e2a73740ddfec5f3191be91fcfb823ce3aa56242a88b4d0e206620d52361
-DIST KRRRNvK.rtbz 28711632 BLAKE2B 2a6a2f1f8f81650e4cc81ae0f3a2cdb4206e67baab9a5044caec675ede847558537c31fb6da42e14eca15b35999eeae5f528da6ff4036f5a99b82bbfe3ea3c09 SHA512 62c472d9c8a790ead9886cf16ab7041236b8a3a78a009f23d4ffcb1373a7e68d7ddf069cc2a75259af2ccee6651551b0b2c33897f688d40030d6b444543f3eea
-DIST KRRRPvK.rtbw 7792400 BLAKE2B 52af2586f2cfe4cf76b089d0e4c410f2314661c07c91328c3c8db51abf26fad52e59b6863a6bc38534a0e89309a6b9dab08f3a3ed73fb1c3bd54f71ebcc736f0 SHA512 3836b3550697d517d7e55aaaad8eb51d60943c6f1a3bf68b003e5afe735e36eb203bda956ba81d3bde65f9919cedaf1b8260d3eeca3f1848097dc6d245606e1f
-DIST KRRRPvK.rtbz 11281424 BLAKE2B 18b2c5e90f6a0cf8460601d10ff0129b1959d0829eb9b5a6661f1149ded4cce3d052967b7077115dd4582d30f0283044d868fb9a7a490544b534cb44c79c3140 SHA512 fefe934ee3b1945cd5ab1eba807c6b35d3e2c859bb4557aaf42701eeb335c320eb4b627211d519693c477509fbbb5286ba19c8574448c611fb378cca9a5884f3
-DIST KRRRRvK.rtbw 1183824 BLAKE2B e41f1382d57578004deb52d336279fb85a6209633c8e8f48adc072bd4efa32a0eb08842d91682f9f632e097d7eea66504024a5167b2fe2a6b4cf52cc0d70f266 SHA512 f83673a7236f3b920d75b09346bcdddd6261bac87dc3f04f83178d5c17bd9bac0d2889b87368a3d26d99e97a98d3ebae4e87bad7f20869d0c954996cc78e3fb1
-DIST KRRRRvK.rtbz 4586448 BLAKE2B a2452f945fb20f58a6055f6eed3a2ea8975872199cf23bb4898f3ccd6e5e6f85095839cf47133719f9b9c2abaf3af4a3c159f69952da633b9cb354c3286392ff SHA512 899c81736585cc8d702203bfd498143c795d31bd80f37a7bab934c0c602476fca211e377529db9abfb1ad0085c8e223f68a03697f81fb8036aa719c7e76fdd1c
-DIST KRRRvK.rtbw 54800 BLAKE2B ba38d58c7359b41e1a67cd571b409c795caf2c297212d67d4122e458a51a466a15f303a50eb568bae184f10f8eb81dc6918150a2bc0fc9138f61eb21d2c0be9c SHA512 72dee05483d7984f3543086cc1010b391667055df9f24c7b1642ca1f2778a8ccd56adcaae024dd8509f8da246385807794a0885015c698ceec12d4f8d087a3bb
-DIST KRRRvK.rtbz 561488 BLAKE2B f4511f38ca7c87ff9f39fd91e6b92387769b8c66980ec40f745dbe8a932148c190149ba0dad0671fe2015f319da073db716e1983b1694833c47961ab8e3c8655 SHA512 708dc1a653d0b3887a79a2686a78da112f4b7129c3a86a175e5c90dd645cb2336b6ce18c91317d99d32bc132d83f37e1cff84fb62d7a4c1e7c1f69cdfbd363e5
-DIST KRRRvKB.rtbw 1250768 BLAKE2B fd353cb34afb1552860a51dd2876457f4c61dcea7bfe993e1bd43d9b50f3581a763ba6c48190c040372057ebc12ed49ca7b9731747d36bbb664f1d2c47dfca6f SHA512 5243755694e2e508fc2a509fd1f342150e556cefa8a6c2e277419806917bb5d2936af18fd266c8f6df7760412222d042cd012125ebb43c4366868c2f940e186b
-DIST KRRRvKB.rtbz 28889040 BLAKE2B c2641988e7a0ada78ec28d4e6ddab418b98274387a9ceb857adb57fdd210a845849facbce3cb6e5787092e6d0178b857523cf2c5901c74a19287542e2eba0f27 SHA512 c22eea54bf6218507de0e8d2934e8d2dd16664d3ee28092ae0156b2ec09c6d6470f05e6ad11979a0ec32b815df3cc01e4dbc62d2aa89c8bf92945eedcf3bf217
-DIST KRRRvKN.rtbw 1239952 BLAKE2B 16a07b7139d8c09ae54090547920a7f58a65fbf7d5baa709fd6ca1b4f23110ce42f5d1d9d2dd0968d5f3f9c2aa4749c5f7372ebb5a902315c7f1f42549481510 SHA512 5c45b94dd97e0225332d0a29b806227327f4bd5db739c8c6f41a89806d6a45175ed9f000ef3dd451db59e84041e69745a9ec45fbb90846ced64580326c647be9
-DIST KRRRvKN.rtbz 25568848 BLAKE2B b4e2d8ec3804d4be469b548950ce18c5831e6fc43b03103738a3b7a6e25421a6593f01a7d4cb53ffea8046a4480fa74f34b4ff567acbab23bd9e92ac4c48d195 SHA512 64e1216c91e6fb8c772d8b9fb0bad316119df73f2e1805cb8458a026107617513dd361dbf5056c6a62df0ebcfd0d4979b8927447a3799ad3438f16e076e9b6c7
-DIST KRRRvKP.rtbw 9905552 BLAKE2B 63cfe5978972339a699959276cce880acd0377b8a3b21a50840e9f432ee344fdb85ef00326f18d325fca1cee964cf023b63b79af07ee3c8a07140440b4a16a95 SHA512 93825c50c3521a65dbf1007d5dd940b199d06efbc9d7ea7a37cfb92fec0973ebb44aaab540ce2768b5795def73f0514797f21409b99e4b0c18b1ae0d2c0ce142
-DIST KRRRvKP.rtbz 33563792 BLAKE2B 1f922e2dcd81f6b9b802817cb1b0f1f75167d5997a682f6eb020a7d92c1fe516af7d8f366d4d92ca6ff9f94ce97063ccf991f4877f875f34b1371786521be9aa SHA512 c326ca42bb55083b4ccb6fc89a3e8d87226347a48096eb93e45d1177138b80f649159c33350c52cdffe97edb49b7d9b115574aa2e62a2777f2f8ecead3d3f4aa
-DIST KRRRvKQ.rtbw 38932304 BLAKE2B 9a7ddb2f796f19a31e0466fa88d4c99e0afbf4fd49a0444bdc1fddaf0396137ca5a819b30486aee08ba7e772a6f3d3d202e1919fc055a3cccc59c6c48f6ad745 SHA512 748f2a2376fb1d93668c6f70dced97edf7b68e0b320af33d85fc454cf5cba85cd07b989f202b5db06757a819a6aee087e4fed2628a3d7e7965cf88bd08c132bc
-DIST KRRRvKQ.rtbz 96446416 BLAKE2B 8806e7791d6065de6712fed60063f47a5f9cc9ea6e4fa71697ee9b1f6888a8f1c1752b79ac77344669042576ddf33c3fd83632a46d1d94a8a03f09d098f8ca79 SHA512 99f7a68d7d860f7d85b5c127fa951e5fb7b47a30055273742f3f80044919f3ec06c4c29acbd70a1778254ad92bad72ef10ee12cb2e3e0aa0efa0a4844682fad0
-DIST KRRRvKR.rtbw 1839376 BLAKE2B 91b866177262f58fd84d1fff1522492e52bf2616958ce93df3d39e55e93047e3eaf211c54a3057fdad85db96ec571097044693d27118d6901e53a57868aa1840 SHA512 fd02dac0af42fab916356c69281f6d1653fbe4c0a0f98aad4a8a0f907e87f7ac0336bf28b015e20e4f2a12f22550a9033e55da784cf3aeaa9990b61239b27936
-DIST KRRRvKR.rtbz 34459536 BLAKE2B c472b726472c27ce9f8df967e8a072e3bf3031aa17c197cc5a88dd9db43bd70af498b80bd8c55f3091fcc6ebb2b98c456daa9d45dae69a7eb90b83e2c68f0007 SHA512 cd723ff055808ec56ec425e7388af9f9b00834a361c4e52e2606c79189f7031715365683a79e9fd1174e0453bb6058b27c9fc1c25cab7bd593e6d6c30b1f21c0
-DIST KRRvK.rtbw 1936 BLAKE2B 0089d408186e2f3c0ba14a81fbfeb0592471e64e450dd0e68fb1a5a8ef5f1c40a7b26c752af0906e052b22fdb4bb25b5646ee4d9d8bc0c96351e6821ffecbb82 SHA512 bf686e3ebb02fa916405a7227a9e40a8e3d3663880ed8c3c0e52eee13f33a5f7c3a95cd7be50012a8097d0065c554488d58dabb4e2a35d27e50c05a73cc9df67
-DIST KRRvK.rtbz 53520 BLAKE2B e53583f8d0cc10837d18ec5feb997938737aa49a2c958282441e6c4e9ee73f5f6503376b2ace2b33da0fd9b3fb2d54b0ddff058273ca8db871b095c5045f7301 SHA512 fc407a545f2b1af5ee4f954810ef001f5536c05af1e7cb6efd0dd66859c79e3a91b5af3b274d2706e4bd33e53b52fb4250af26cf75d8e3f8039e31c6ad8c0e16
-DIST KRRvKB.rtbw 351376 BLAKE2B 444eae0e938de4cd77c56f2a39c1a8c5a135235724b069c7163dfaef52f15539a4b3dd0081d33a88a538d0638db14ca801513e94aa473038d6c557aeb56a0c53 SHA512 3a945b45c9343617d506c00255270c80a906aed4e4359c9bcc74aff2ee4f4bfed258cc1f73b12ec2739741349e4a2ba43625d339e34b4e22218cc9206346d87b
-DIST KRRvKB.rtbz 4341328 BLAKE2B 7236107cc6646abed66bde49fb0f876dce6e0e2c9a2856d59214d3b84d40cc8db1c7b4a6a68367e8d15e28503b20c8f3c29cadc2346ca9380596b7bce4da735b SHA512 9017ebecb55a6e14fd205a7a1faab7fd37060ac7c3ed495b0ddfa60977176440c8e2309a3a5c7f1fa25b932fd0ecfff463f76783cefdcbd478d4753b3a5a125f
-DIST KRRvKBB.rtbw 54987088 BLAKE2B c6465888060de45336175bc2f9664747c2ac55bdd89f5b21fbef34583d7d2eb590cd27091f4480989e1d740a1300e114f0cc557d7763be76137e3053a03833b7 SHA512 f7869efac7039deffbd5addbee945569cea44fed66e63f9b772596f735c8c4fc5114080a37f41f4092f064db33c5e9367393b762182d22b5d5a199c48338f3e2
-DIST KRRvKBB.rtbz 221384208 BLAKE2B c6bea6513bac5ca020514392be8f7f43fe0288694549bf993b93510e82b8fac6eb88bb4202a87da4957851a98dc474375b22e70a3d85a6b0eaa1577f67e79c7c SHA512 55a584493e479132b393492c3f0c52d9749d6a2bc581f77f254df6a68ccd7397d1dbc5260dd2b794664f271afbcaed54c98532d192c8467500440bd339d1088b
-DIST KRRvKBN.rtbw 77011920 BLAKE2B bd8c93dfd6a56b050d8ab9d0b044619f607616f4740a070fc10e56c017d1d056abdf47566326901ae7061224c8c3e20a975af903f7a6af1c8c28be32182629f7 SHA512 a3b0b372e6760c61780d87f4f5d83da68619c8c9ca23489a4a83e8ee75a85e59a51fe0283b049410471c5e0caa92aae248de03c624a715d90ba887661d8d9b14
-DIST KRRvKBN.rtbz 359994256 BLAKE2B 9092b64bc00c140b83be95a5d918b7c3d46bb9dc561577e40968e421efef9721e97ff05450d83db3ea4a7978bc0b3b58d4305e5418eac6e19e921033d68c3f78 SHA512 036d03190a594246cc1e93c5f7c3dcd092e2623f250db08180660ff0b31dab9675779c9e2897b138d545ee78630a47e5527ed20f467c6074a07637b735a259f5
-DIST KRRvKBP.rtbw 303415760 BLAKE2B aa816ce6393ee104a91f46970e5d0ecee076b0b8fdc6499a5e468d334cbbd52472c9d5887aca1668f44929443e508a52e8d02cf5d2b8a6b4bf8e0f1509a5eb37 SHA512 182daecd729e60421a4ccf25065567f2982b6f58d098849a79e1528843885526fe9c67d98b1a700dadffa81d9883ab99b0ffe95a95816e7e2807c4c10740d203
-DIST KRRvKBP.rtbz 527398288 BLAKE2B 3c77b3604b8125a0e2b8099a73f6e5a8246937e29854261feb76896a8f8231c8cb2f1f16ceb0182c0d75122e19bf4a95493b4d209ea93d083724ae1aa11f9d7b SHA512 41afef825b51c0e33715669d590a49144977a7fd85fc73e629b0e0b94b5b5fcfe93e558d827e7b565009ad0164d582264026bcb01eeb95598f2ddc129167da4a
-DIST KRRvKN.rtbw 286288 BLAKE2B f035e9f99c7b2a41289f85e2db6bacdccc8c3babec7632ac48152cffc41c8ca5070a1577fd9c45b3c14579f1da122b629d70619baf813d7d254052ad7d43b9a3 SHA512 5e537ea69a01a37b6c5ce0113380d29296f208f53f4a0af208092bd69308dbda0337918b6838c318177a2396ff95ccf42c7c8ffb83551417d0ebda950d269739
-DIST KRRvKN.rtbz 3313680 BLAKE2B 4af2756e8a159378853723ad08c1778a126e0e6675fe57161d9b14ad8cac47071080162128812ab0e03777acf4337f7ba08007768ee57ca4122fd10759d37ff1 SHA512 29f142087ecfe3ff4588220dd17987553b31a7ba2974fe3995e9544c4994e2e37a8718b219e20b3bbc86dbe045d4f37a4d4be4b9227ca0a3f53f51e65eb045cf
-DIST KRRvKNN.rtbw 41528144 BLAKE2B eb535ad63ff21bfcdb71472520089f56997d90b76dc91419d0432d31efd0cf2cdc868e53397c34f85e4f43734ffea67fc062a3b6db5658c364c5ddc2a5d96ba4 SHA512 d48d24faa96787fa06739dce2b24983e871660ec9800e1d66050ad84c35b5139fc8a6d6ac1a5473311b7dd6322274c9ddb78cde4168e3488ad8a34a8b74cd7e2
-DIST KRRvKNN.rtbz 156681104 BLAKE2B 640afa58842e8982cdd4e81b93e5b9ccbd6ea248bb149b1f7793a1b3e689cd5a399a9862c023029095aff5fb0848e452f5abb109d16a739109617c4f4cbde01b SHA512 1ca57984e62bb8863014799c37750fbd304aa59e1965a23d44ecc4107a951c606a7a89c391cd4df864f472d18e3d70ba635743e5c4434d06df9287415f7fa04a
-DIST KRRvKNP.rtbw 268169296 BLAKE2B 1b3108e07f0b2dc95d63ed1f9f24ab795f7487a9bc09ce7efbe30b0f85cf639723bcd48b840534956f717edcdadbb7e33839b5f36c369b342cbbc62f555aae37 SHA512 d042e789e3b0f914758a57bc5ae3d23b6e2ded1778109b427c2941ab0aaef9da32d5f6c226ad0c1a95aefdeed220dd5d1b90329fed3c6282070434c6812bd365
-DIST KRRvKNP.rtbz 395718032 BLAKE2B 18005bf6e36d7c200527cd7427e99ab5b5394c8a9a2157c0fc3c03623e7c2fe4729efd25d768325a8036f6d0ca3b9be84805de2eb8c1fb22cdbbdace321c3ae3 SHA512 840930556f34d98acab8340ee2540f567be33810f0a6a00db116327cad1897f7ed33ac98283aa43493260a5f2322a8c38847600b69bc23d7a1c1d2955d18fc2e
-DIST KRRvKP.rtbw 1680272 BLAKE2B 252eedd44cdab6868659af60bac63450fd828d9d6b7fca86934c7a280f044e2aebfa19fb57c84ad22b24cc746ab30c9d6ee11bcb9b1fe386ec7747f088b34b15 SHA512 49e97a2fcf05db1be5078871a2bf348fdf0eda135c21ab72cde78bad4b9a6f373bdeb77ae6f7ea9d52b98e6f56bfb7b74bb108c18532edc7139139f595844e8d
-DIST KRRvKP.rtbz 1885520 BLAKE2B 01a56a9478cc634e8b1584025d556211a67bb9cbbb4049f599890cec86f0105d4791649adb8e07fa336c53e4579ad6337f33138438c2a8c0a0fb2453f28810c4 SHA512 d067e302fe0fbf678a40a07a9c6bbcfd80990d9314df7209586c7b1b360a8b22001cecd0bec7fefe08a16a9d47d284510db897f3c8bc1495a1d4bb6dd62dad85
-DIST KRRvKPP.rtbw 83355024 BLAKE2B 1a7de539c4a03b5c7fae300cfb4c0a79279fced8deac0abb396c32e21fe13e466af3d13932d52ba519ed9fc22e1e1ed4bb29f85aa30a7b574f874b506f6a7cff SHA512 30299772e742632b4d0d8d2808e1bf2ddfe8016f67cccd43d7065a814de43cde1d08a773310b697bb6da89b9e54685646d70f2fdadba5933c52ee070a154e1a7
-DIST KRRvKPP.rtbz 52397968 BLAKE2B 99b3d1edd2884873eb1c2fbd2af7f10cfa82869f12e76a568433add693e29e3d918a55d07c7bff1fc0309cbc99f6a320cffbcd91599ef1e22155416e0719bbe0 SHA512 d212d2216766d9803cad691e371c29a24aa13ab2bd2ed38e63c91633a2278cd3f52b917618727aa391eae8383bc1c143c26039e6964307499ec2552e905f2751
-DIST KRRvKQ.rtbw 4068432 BLAKE2B f8f9e5e8b8780904a065d68798777eea2dcb6ce008e5c9de7aa094cc16a47f614bd5a0b1416002baf4996a2f226fb2825a89f5a257cfd6fee547e3b3b515bad4 SHA512 4e33a9b186785352284c1ddd7382c3c4bf047a9163796f0415cfd09a017befa63560d138cfe0de7f3e1981b099ff92296c20443a5ec6dfe492f2a7bd27a3cb1b
-DIST KRRvKQ.rtbz 1127952 BLAKE2B 0cd2ff7923e68f6742c4f18840673b881e1ff0702275c4cf8138e3360d638da55d6cd26191c048ef87bc1016da9c15a13bee3dd79b547ca07644c97883c2c50b SHA512 241fa6986514c396a9f70544087b4a8163990c6cd9d4f1b8aaee3287a3a2e333a926090b38eeef92473150fc4172bb966ab9087f9901c8ca1bc028505190acab
-DIST KRRvKR.rtbw 334224 BLAKE2B f041552677d871a9dab8d83d18be21a0ecec99d330dd63ed23be21e0db55aa0a200a5b0621fcaba637be587eb746e32db29dea07d44721b0d0ae6e3cb4d2e804 SHA512 51449d8fa1a45130eaa8c50523fb2a05993e8f77b42c2aa1c98d84467f81208e261e066377a718621bf333357bd452422b085dcc0fec69d52f2c59662e7df408
-DIST KRRvKR.rtbz 7700816 BLAKE2B b1e75dd16f714fac8820dcfc9aa0b9ec7807bcce03a7669d21f7dacd5aedbe22d2730916ab685447eea7402fbb1c97f7e7d6bc91152f5d6e41e66847c4f51e52 SHA512 5a333acd5403f59a36da2530e293fe9f431a42619c788ddbb3e7eb6935bc2181e63fc5e33484ce5ff28f9f35dec18b9d848724d5ec08491e8ae9433cf5aecb57
-DIST KRRvKRB.rtbw 143451664 BLAKE2B 1c764ea91f04ca7f35f012c6a1645ff9d8b15c3e1a503c33c1dcb15e9e874cf5960cd98b9041ae6c1f25dfce7b7c0023ca5e3502841440ba3a955cbd1a745294 SHA512 59bdd1f783357c22e4bd117b48577a38d649cdc5eb5b2d099ba53f4639d15f1316c391cec3e924166cb96ac45ad91807ca0b1c5fc3f3d6226f4158ab4ef4c9f3
-DIST KRRvKRB.rtbz 46436240 BLAKE2B 5ae820b1825d99b9b5bb8b9d32b84e35f04a7b520a107e6b6e47b9902d315845e6e05c40bc121a056b7f6227b25b9bdc7d6207eb2ebb5c28d273124a80adf307 SHA512 5d0b7d2cb355e6c09cb3ac38817eae7cc3c84b436739a37b869e65a1d0a0926d5d715ff22128a5f407cf6597d253b5647ef81605dd53b5b45b6ca8b806420b43
-DIST KRRvKRN.rtbw 185764624 BLAKE2B a553fd12ed9c585aa48cca442b9a5f070f010e3bf76c59658b04f3d096987a1178d3c7a37c03ce3ed37082a226978e11a5aba714541b2d184fb2de156d9ab43b SHA512 4a27cbe3752311d64eb7b5f31649456bcf755af888721091954c039df9b7616c335b085d5e8cd8956c87c3646130e5d0fd96b8316146509a4da99a7b334d95db
-DIST KRRvKRN.rtbz 178146128 BLAKE2B 1ace78e0bc239dfc67e80f809638030f2e09c41f8340cce2d4cf8a66180b5937dc5bcb170d4f00bdd14a5275c29dda3c8ae80eae6115bac355a97537dd169117 SHA512 d8f22c3fcfc90535d574d718ea6160141f40f8b6eadc2438f8696531441cede1d38d1da385576a6184b74f0446fb96f554cc64afe7780a1bf58b07e83222c8a5
-DIST KRRvKRP.rtbw 303307984 BLAKE2B a5844ced41ed4f226522307492b5bbba23cc726e5896da980d6613486083837956f70f9f4986c44bd67e4f7cc0ccc14ce567a9d98e10fe717e6951ba4e756508 SHA512 a15ab65370a0b79583633595aafe1b69612180cf608e2a50e7afb70cc1715b823b142556b331756b75109f36b30a94175a0861f593f06ce600c7ee9baf8b253a
-DIST KRRvKRP.rtbz 828542608 BLAKE2B c61fe0b150ea86424654f0df61063d39c8bf766fd82d79cabb5d565f8f93b2cbc936e5c70d4a239cf7bcee540aa14a464d8c166bae8b21934274a0bdbe15bb69 SHA512 5d5d27f28c765e48cd78b147f9163c3f925e2ca8941fb9ee531640d48a5bfb7e12f9c4639150f053ae15f99a408cea20de9fb782611d14a77c4e2c1f7d7511f3
-DIST KRRvKRR.rtbw 52189648 BLAKE2B 11530907655991236a7dc7a71ce144e90de8ead051d0343f5a00c14d0db1a4bb932ad7fa974e34b390453b3fc36f1b8da90f16a24ae8b471fd12fb1a98103da9 SHA512 c2106c717fb44fc04c69dca57da50c140f4941fa2b600b6f376b6a5ba0e5249c2e4a1565f21266bb2331f32e504b450a9af1934295305202519068d9099c5d73
-DIST KRRvKRR.rtbz 19613136 BLAKE2B 05fc8b662bf5926db03ab71cc76413204b3d4cad1f76d79984ffb1bafc36654ca230fce1062d9ee30481e799397f175c95b316c0eb7a8557bb697e08a4b2cc9d SHA512 8b98234754fb77a4693fa43117f4b4c42a3bd41b5a417ef37c4bbb36990729ba05d493441afe58183a232b682290c9fe48de9e9ad550c53f2388dd82d11795d9
-DIST KRvK.rtbw 208 BLAKE2B 55de02f980686a0ae0f4541b62c87b2655f7ab5fa6ce9f1865588bc6b28b19754ae212ac5c18996de4e8fa6d295adc359ef0cdb44992de2ab453746eb4133c83 SHA512 cd528ef32bcf953f5c55c40c6a1ada8d8b24168af4bc5f15467367f66f002100b801b15102d275c8d34d243dd33bacb4b82996b4254cd1bd551970aef28721b3
-DIST KRvK.rtbz 8272 BLAKE2B b6d7c21f087569dbbe58266381625e3620256f74fb979ea4ff9912e549eb93cedb2d7021b127b4be16b76b0736597eaa4f0181e71964c8861e642e10cc29782d SHA512 90a9f44dbf1381324fdd58cb56a1e93bbb7bf1116624e8b8b14ddbca6109941aa15407e0a96c7062e69758916c336681582e2946c873e8f27892f4b0db8274b3
-DIST KRvKB.rtbw 32912 BLAKE2B 76e8ef3a05a5bde2ef31de1db2d8a5dbefb6947a4d5c5c6eb6a9b7672ac06f8157856f2a804627f1fa9e75268f8269157203aa80b39c3989ceedbdf7aac645f9 SHA512 1b8b913f1e9717daa06e21ce48a5013fc2f9b4af16fc141a0da807be5ddd5f16cc79776342eaac018fddba6a8f2b7543ade0b7524112633a6a780ba34d57a54b
-DIST KRvKB.rtbz 9936 BLAKE2B 939ac588529e5719eae75786f550b752f9e4230a6cd02262b1856270c11297e0e486dc27cd69029b9381d38456347a028b676791ee04818c8ec3b0463b188c0a SHA512 a22c7326f1dfde6e141bc178802f08585cc5f529e74e5c314fc5178ced026a9dda7785bdb3f9b64e3abc40d2a56ed895dbc5e2a7c02af2360bcfef1cf8dc0cb3
-DIST KRvKN.rtbw 100048 BLAKE2B 3912d2134e3526673d7992cf1f136506e8826879c53168fb5f10a8a43e4ca495ce3eb9efd41fe99c9ad1103b51438e053eca8a69de0535c2158940c098cfdc7b SHA512 d11964eb61118c61b8fcd7625e0ce64b874560e2f6322fa35663a92b491b1ef9610ddef9f6fc9f8f79c4f25b59be458001f0466245431886ecfb329bdb1241c8
-DIST KRvKN.rtbz 93200 BLAKE2B 1dfdee6ee44d3e9a661e77ad818fbfcf3d75886d51af4f9697a5777a47fbdf7d7db8ccceeceb8086c39ede934652ca10ef812f2d10089831992b5f73072f13c7 SHA512 e58b4c93604ca5cdc1fe1a803373fbe15d3206e1ac5e081a50b293123e996fab949dd85e1a5a15d08f7f36735cc997a57ea055772223d62da279d708a3fb92ad
-DIST KRvKP.rtbw 179408 BLAKE2B 914f36c63f04f52702e073b25b1abdeccf54eef3924853b45ffaafe14587582676d9265e9645d635e2f10fc4442113ec4b0f33780994ad8b73c992c7329ed4a4 SHA512 a85bb1b440e8e3c9cb72e7e646414ad02c29a22987bff853bb9260a2e99058115573e0c68eeca0f91118dc1be2b6733d6958708950edf8c19c8b60cc0c7acfd0
-DIST KRvKP.rtbz 193424 BLAKE2B 9ba5e45c763f973faaeac3ee902e93c21d06e44c6697500b0a02092728eea62d3b4c51454e1051e5e6119495d4a1c6c02501c274b63d4e8d7810b21668fee309 SHA512 7920d6e961860b94738b36dbb3cc3ee9771448c3e4a0f1544af79160cb8f8046c9ebe2c80c3183b4c5b3e7eb3be669533bcd2b2274b9b5705ce9a8948b85f65b
-DIST KRvKR.rtbw 12944 BLAKE2B 42839f64c0e8ec8b3be09c128ee2e8d768ce5d77ca06c3cf90322a773148d949ac66be0d45de7606728e9d7989b9e0fcd111f658818996037ddf59d46a44ed10 SHA512 328639da515a9b36bf6cad80a684c2759e03f8ca7ad78fe7a1e4b1f3ec4c79b418ec74755fa80f86d6523dee43f9e79b4f4e36c56ece06f367850d2a4f39f5c4
-DIST KRvKR.rtbz 3408 BLAKE2B e56df50b368a89acb767a827f17d83ec028a87c06e9ad9d18826db9ce8da6024cbc69f961cad24846ed48e839ef5e6f95bd0798455ee2e1cc6e625df573c7309 SHA512 729068cb50ed6abff51a2b8f4041edfb0d109f163d961db9240a0c74069a7e792f3904a7d712882ad25d356059917a64a84f511914f05c20d41185815f23e3d9
-EBUILD tablebase-syzygy-0_pre20131213-r100.ebuild 1598 BLAKE2B 5750013dbb20b436b231b711bf0e76b7c0c2e304a4b4d13891c8a48dfca390a987048ca84d8a5e3550fdbb90eca2f11af3b437f9ef1b28de325aecbc8a900a8e SHA512 86f0df3e6ad0364cf70d73215cca12be43517af545c60be714d79d4422c98079a4469949232dd0deae28578e2e476861454898460eabd8245357f6f262c6fdc6
-EBUILD tablebase-syzygy-0_pre20131213.ebuild 1550 BLAKE2B 25081190ea10704e5ba3151d3806c694b8308a203f3763e6a6daca825e7b58ce2643aef6bb5a27f7b4b27cee186f388736a97db0e28cb5b71ee8fb5decc2a4dd SHA512 e0b53e707638ead230bac7e856c5e8a2acc7c0cc1b88a3b2668b7350d8637113f15d7f42a74683a65cb7faac4156667445ef70aff4a80027452e889a8d9b5c66
-MISC metadata.xml 296 BLAKE2B 5d6b6728206eb5fd9aaeef1f5bce9ce5a750b51f2fd61b6777f74c3d3b130644fbfb206859d18686e6ee933149ad322dca7c23d432202a4093bbb3a3a823b147 SHA512 9b6cb3427a2633074cd27495a4053b48383ee9ad08376d6309f190d7d3833c33adc787ba5394d458be84100bea97424b0256f2c8e749b69d35d502ff8547e26e
diff --git a/games-board/tablebase-syzygy/metadata.xml b/games-board/tablebase-syzygy/metadata.xml
deleted file mode 100644
index 6b080aa60cc4..000000000000
--- a/games-board/tablebase-syzygy/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>ulm@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name='6-pieces'>Install tablebases for 6 pieces (huge!)</flag>
-</use>
-</pkgmetadata>
diff --git a/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r100.ebuild b/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r100.ebuild
deleted file mode 100644
index 4bc349060a1a..000000000000
--- a/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213-r100.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs
-
-DESCRIPTION="Syzygy chess endgame tablebases for up to 6 pieces"
-HOMEPAGE="http://tablebase.sesse.net/
-	http://kirill-kryukov.com/chess/tablebases-online/"
-
-tb345=()
-m=(P N B R Q K)
-for ((i=4; i>=0; i--)); do
-	tb345+=(K${m[i]}vK) # 2+1
-	for ((j=i; j>=0; j--)); do
-		tb345+=(K${m[i]}vK${m[j]} K${m[i]}${m[j]}vK) # 2+2, 3+1
-		for ((k=4; k>=0; k--)); do
-			tb345+=(K${m[i]}${m[j]}vK${m[k]}) # 3+2
-			#((k<=i)) || continue
-			#for ((l=k; l>=0; l--)); do
-			#	((k<i || l<=j)) && tb6+=(K${m[i]}${m[j]}vK${m[k]}${m[l]}) # 3+3
-			#done
-			((k<=j)) || continue
-			tb345+=(K${m[i]}${m[j]}${m[k]}vK) # 4+1
-			#for ((l=4; l>=0; l--)); do
-			#	tb6+=(K${m[i]}${m[j]}${m[k]}vK${m[l]}) # 4+2
-			#	((l<=k)) && tb6+=(K${m[i]}${m[j]}${m[k]}${m[l]}vK) # 5+1
-			#done
-		done
-	done
-done
-
-SRC_URI=""
-for i in "${tb345[@]}"; do
-	SRC_URI+="http://tablebase.sesse.net/syzygy/3-4-5/${i}.rtbw "
-	SRC_URI+="http://tablebase.sesse.net/syzygy/3-4-5/${i}.rtbz "
-done
-unset i j k m tb345
-
-LICENSE="public-domain" # machine-generated tables
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="6-pieces"
-
-# there is no use-conditional mirror restriction,
-# so depend on another slot of the same package instead
-PDEPEND="6-pieces? ( ~${CATEGORY}/${P}:nofetch )"
-
-S="${WORKDIR}"
-CHECKREQS_DISK_USR="939M"
-CHECKREQS_DISK_BUILD="${CHECKREQS_DISK_USR}"
-
-src_unpack() { :; }
-
-src_install() {
-	local f
-	insinto /usr/share/${PN}
-	for f in ${A}; do
-		[[ ${f} = *.rtb[wz] ]] && echo "${DISTDIR}"/${f}
-	done | xargs doins
-}
diff --git a/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild b/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild
deleted file mode 100644
index 1ede75fed76d..000000000000
--- a/games-board/tablebase-syzygy/tablebase-syzygy-0_pre20131213.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit check-reqs
-
-DESCRIPTION="Syzygy chess endgame tablebases for up to 6 pieces"
-HOMEPAGE="http://tablebase.sesse.net/
-	http://kirill-kryukov.com/chess/tablebases-online/"
-
-tb6=()
-m=(P N B R Q K)
-for ((i=4; i>=0; i--)); do
-	for ((j=i; j>=0; j--)); do
-		for ((k=i; k>=0; k--)); do
-			for ((l=k; l>=0; l--)); do
-				((k<i || l<=j)) && tb6+=(K${m[i]}${m[j]}vK${m[k]}${m[l]}) # 3+3
-			done
-			((k<=j)) || continue
-			for ((l=4; l>=0; l--)); do
-				tb6+=(K${m[i]}${m[j]}${m[k]}vK${m[l]}) # 4+2
-				((l<=k)) && tb6+=(K${m[i]}${m[j]}${m[k]}${m[l]}vK) # 5+1
-			done
-		done
-	done
-done
-
-SRC_URI=""
-for i in "${tb6[@]}"; do
-	SRC_URI+="${i}.rtbw ${i}.rtbz "
-done
-unset i j k l m tb6
-
-LICENSE="public-domain" # machine-generated tables
-SLOT="nofetch"
-KEYWORDS="amd64 x86"
-RESTRICT="fetch"
-
-RDEPEND="~${CATEGORY}/${P}:0"
-
-S="${WORKDIR}"
-CHECKREQS_DISK_USR="150G"
-CHECKREQS_DISK_BUILD="${CHECKREQS_DISK_USR}"
-
-pkg_nofetch() {
-	einfo "Due to their large size, fetching the Syzygy Endgame Tablebases"
-	einfo "via BitTorrent is recommended: http://oics.olympuschess.com/tracker/"
-	einfo "After downloading, place all K*.rtbw and K*.rtbz files in your"
-	einfo "DISTDIR directory."
-	einfo "(For the 6-pieces tablebases, there should be" \
-		  "$(echo ${A} | wc -w) files in total.)"
-}
-
-src_unpack() { :; }
-
-src_install() {
-	local f
-	insinto /usr/share/${PN}
-	for f in ${A}; do
-		[[ ${f} = *.rtb[wz] ]] && echo "${DISTDIR}"/${f}
-	done | xargs doins
-}
diff --git a/games-board/tali-3.22.0 b/games-board/tali-3.22.0
new file mode 100644
index 000000000000..33fcebef94b1
--- /dev/null
+++ b/games-board/tali-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.15:3 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Beat the odds in a poker-style dice game
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Tali
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.15:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/tali/3.22/tali-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=556b2b0acf4ef477443c74956801ff24
diff --git a/games-board/tali/Manifest b/games-board/tali/Manifest
deleted file mode 100644
index 6a6e60b1dd28..000000000000
--- a/games-board/tali/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tali-3.22.0.tar.xz 1716728 BLAKE2B 74420b49f9b7c44220fce4a4e692a35a6cd9c566eac6bc96615aba184c8bd05001871dc5973da1ad14db81bcbe9f7f45cc4c25f884304c6a8b89989c56dcd226 SHA512 63b50e6a27115fa9502fb86112ac02a987faff40e3eec8f0dc654bea2f001c0a252a6e1331ee3515d7194befe4e27dcde6d704a0f8a777d29e813c454a583ed0
-EBUILD tali-3.22.0.ebuild 514 BLAKE2B ad30cdd4368e18dbafe6cb6a4f2312328838598a3934997705f3efde76e4ff1e0dcd5a7d36b4ce16f744f4b4b406159834f26268ccfe714097054b839b7446af SHA512 fd708d14fb3fb67e23cce955a92ee66dc01b5bea2f252153854d5580bb83d6f483d8d62008154b717d56f67a22ac5a32e1a3cb0c5f87eab06d1dd380ac58e778
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-board/tali/metadata.xml b/games-board/tali/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-board/tali/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/tali/tali-3.22.0.ebuild b/games-board/tali/tali-3.22.0.ebuild
deleted file mode 100644
index 1d995bd1293a..000000000000
--- a/games-board/tali/tali-3.22.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Beat the odds in a poker-style dice game"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-board/teg-0.11.2 b/games-board/teg-0.11.2
new file mode 100644
index 000000000000..9779caf6440f
--- /dev/null
+++ b/games-board/teg-0.11.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl ) app-text/htmltidy nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome Risk Clone
+EAPI=5
+HOMEPAGE=http://teg.sourceforge.net/
+IUSE=nls debug
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 gnome-base/libgnomeui gnome-base/libgnome nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/teg/teg-0.11.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4640e352e245a588242710779819f912
diff --git a/games-board/teg/Manifest b/games-board/teg/Manifest
deleted file mode 100644
index 342a97d0329a..000000000000
--- a/games-board/teg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST teg-0.11.2.tar.gz 5790172 BLAKE2B 8a8084307a278b7b4aa7df7ce416f53b7bcc2dabb5ef13441810dbbe1d545819d4662028947d88d95e225f8e5f7d0ea8a06d6891d874fb88512233e70976e2fa SHA512 ac31b074eb0ff007ba34fc62043200701d6a481e8ad5eb323a111d0a93b998aa69ce3972780ce3bd212729ffd72229eb1a3ef3e73a9c0c6ceedd16c16107f4f2
-EBUILD teg-0.11.2.ebuild 479 BLAKE2B ff491540cc95258914a882c96a8a48621c963400b43126d28c35cb653d21651aa4bf91d90fa4d882c60d02500decc9758e3025b66813c257661b66f509aba2db SHA512 886fced1994d0d387d7597f2273d01db5cc177ebe8b808a240dd68ad89e724226607b52c825103dc5c763927475ade3b875b31fcb20f3d66b20aa2f0bf91d2ba
-MISC metadata.xml 326 BLAKE2B b40b24e3c324c3599c8b7e7a417de792d0f34f85e3359ae3beb724fb98240439a385572af26838d3fe340949b586b3c87730cdc72024a4c79e8ca75c997bd108 SHA512 e34cfd98dc3ecde6050f055590b59729e6933241f6a17682e695bbd3e2c5a8d7b7f5fe2296ddee9b954624e4d0b684632e4f78206267884f7233c66b98c230f1
diff --git a/games-board/teg/metadata.xml b/games-board/teg/metadata.xml
deleted file mode 100644
index 41e6e7c75fce..000000000000
--- a/games-board/teg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">teg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/teg/teg-0.11.2.ebuild b/games-board/teg/teg-0.11.2.ebuild
deleted file mode 100644
index c4525b381adc..000000000000
--- a/games-board/teg/teg-0.11.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnome2
-
-DESCRIPTION="Gnome Risk Clone"
-HOMEPAGE="http://teg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/teg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="nls"
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libgnomeui
-	gnome-base/libgnome
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-text/htmltidy
-	nls? ( sys-devel/gettext )"
diff --git a/games-board/tetzle-2.1.3 b/games-board/tetzle-2.1.3
new file mode 100644
index 000000000000..a95611b9131d
--- /dev/null
+++ b/games-board/tetzle-2.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A jigsaw puzzle game that uses tetrominoes for the pieces
+EAPI=6
+HOMEPAGE=https://gottcode.org/tetzle/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/tetzle/tetzle-2.1.3-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=99077d3c51bfa18527e8901460c7028a
diff --git a/games-board/tetzle/Manifest b/games-board/tetzle/Manifest
deleted file mode 100644
index e14f4d60b874..000000000000
--- a/games-board/tetzle/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tetzle-2.1.3-gentoo.patch 267 BLAKE2B 7432663ff3ae333e4dcef46193da107436a30395f236e2aebe11c5b3c0efe2264303f50c6eabc92167b5ba36a2e8d64d9cd27e78dc1a3aa3ddebbb29d8d567f3 SHA512 92e4a48b88df690f75890cb969863006b6b7cb1476970d87c0fa7ae59bc5aaa591004e6e962bdf7d84bb1e9668eeed0bc7131269247d79e613b7cb252bbf194c
-DIST tetzle-2.1.3-src.tar.bz2 1022680 BLAKE2B 197e2a221a779734d3cd76d5600460df42014a31a032fca2f5c181d54c004f56e6beb9803c60fd53edf5b0d4a614b3d0709fd8913d561e49a938a2f6f1943001 SHA512 6f4541ad2f67ac8a98bd0e1683d4cb6131a85a4e9d31a9dae0a97177a721038750f4276fb3a592b97804daceb1b99f0117e14c6221a6a6ce74b852b00ed5c607
-EBUILD tetzle-2.1.3.ebuild 861 BLAKE2B 34d273e9f48fd29d2c97a91e05c23231f6e794e1e1d19be2451e0ccb9997a1cf1b87027eb75c2f708dc7ef5bde027450518e8a52325f24d3507d784d52b79950 SHA512 9d3de221ff94c0f8f85920734f70b288b622d11977f890be57700805a417d85911e7b36d63b0d56f07e433046d24b64261189f1e30ed332b170ac1d6f94e8e37
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch b/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch
deleted file mode 100644
index f7d76c1276bc..000000000000
--- a/games-board/tetzle/files/tetzle-2.1.3-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tetzle.pro	2018-05-29 13:20:06.000000000 +0200
-+++ b/tetzle.pro	2018-07-11 20:24:01.076668458 +0200
-@@ -104,7 +104,7 @@
- 	RC_FILE = icons/icon.rc
- } else:unix {
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
- 		BINDIR = bin
diff --git a/games-board/tetzle/metadata.xml b/games-board/tetzle/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/tetzle/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/tetzle/tetzle-2.1.3.ebuild b/games-board/tetzle/tetzle-2.1.3.ebuild
deleted file mode 100644
index bc3518d35a8f..000000000000
--- a/games-board/tetzle/tetzle-2.1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A jigsaw puzzle game that uses tetrominoes for the pieces"
-HOMEPAGE="https://gottcode.org/tetzle/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	eqmake5
-}
-
-src_install(){
-	emake DESTDIR="${D}" INSTALL_ROOT="${ED}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-board/xboard-4.8.0-r1 b/games-board/xboard-4.8.0-r1
new file mode 100644
index 000000000000..436bf025b602
--- /dev/null
+++ b/games-board/xboard-4.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 ) virtual/pkgconfig x11-base/xorg-proto nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=GUI for gnuchess and for internet chess servers
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/xboard/
+IUSE=Xaw3d +default-font gtk nls zippy
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 virtual/libintl x11-libs/cairo[X] x11-libs/libXpm default-font? ( media-fonts/font-adobe-100dpi[nls?] media-fonts/font-misc-misc[nls?] ) !gtk? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) gtk? ( x11-libs/gtk+:2 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnu/xboard/xboard-4.8.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8c80b6ec76249fd8cf0cd5509d7494c7
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
deleted file mode 100644
index 596f6815f7bb..000000000000
--- a/games-board/xboard/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xboard-4.8.0-gettext.patch 502 BLAKE2B 9c763076afb8ef182e715cbe82a7935ca495d9485326807146fcbe8406c56cfaacb9ebc0221b18628ca36379cf8d8d14f5fe0c4d0577487e39abf8305e9fa6da SHA512 1e2e68d972e7fcc299940be72bf3f486cf132fc247ed9f95585379108a35cdbe00824108ec7ca679e37c612357ca5b03fe6bbc8d1082bf8d40a809e021c4c0a9
-AUX xboard-4.8.0-gnuchess-default.patch 1441 BLAKE2B 2b37c3650d45fb46bdf57b93152d99de3a88c1f75db33d0f4ecc1b2105cfdb444599af8905955b3a5a91527bac770fc67e0ee480d46a9c81b73fc1c11bf3ec68 SHA512 3ba68ce96dbdca3f0f8027d54c8cf7d8b7f278a2eb8bf549e3f9a2979bfb19aa0232d391430e6725bfdc73befdcc2da221663ff974774ab81bfe052286205956
-DIST xboard-4.8.0.tar.gz 3691531 BLAKE2B 7743b654e8bdd37672a6076ce032fcc92c846796a8cf84906ae8b74454297f0fed1bce078883e9aff6237c8bfee67db659bdd7b93acd94e1b27bc90629dc3b1a SHA512 fc3231f170baacdf97df5d08488f5a1fb9a144810f7b0eb72e3e95d345ce47aa2ff67a586ef45b6a9e45932300babc59c161a29e055dd0d19b133ba986985c81
-EBUILD xboard-4.8.0-r1.ebuild 2016 BLAKE2B f519703868c61099a0aaa90a150c1293a9a06eb62dae2f92b0f1d5ad1bb4932dbd8df527c2b166ed1e89381178b6f0cb0b349a9430bc4aa8a157ad771f89a3ab SHA512 8b262a091b80ab8c531fddc8d76a6efe0ac8cb2e6ab7cb3d5e3901d37c97ba4b47c9f61a3cff80c64788387a6f1f44c7b71b470ba14a75612895aa6e9cbc46e7
-MISC metadata.xml 418 BLAKE2B 0fb5a3b7607b0c609e7bf50224e1a53abc1e9dd90a811e964bbc5038f96966d32d4cfca6b8eaefc7e64be3fb2302a0231162554cd436043471c578830f74e1ec SHA512 ff385f8c46788e3c76fcdd891f4a4be50b100ff47298eece8a2f1ac3dd166ab384961f3fde0967dc3b3afcc3978cefb5025e4eb0dc69177395c75affa2416d1f
diff --git a/games-board/xboard/files/xboard-4.8.0-gettext.patch b/games-board/xboard/files/xboard-4.8.0-gettext.patch
deleted file mode 100644
index a50009a70efa..000000000000
--- a/games-board/xboard/files/xboard-4.8.0-gettext.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 7688073f2967bb3438d1a2d8ccffc53f697219fb
-Author: hasufell <hasufell@gentoo.org>
-Date:   Fri Sep 6 16:37:22 2013 +0200
-
-    BUILD: fix gettext version
-    
-    https://bugs.gentoo.org/show_bug.cgi?id=418267
-	https://savannah.gnu.org/bugs/index.php?39970
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ AC_ISC_POSIX
- AC_PROG_INSTALL
- 
- dnl| add gettext support
--AM_GNU_GETTEXT_VERSION(0.17)
-+AM_GNU_GETTEXT_VERSION(0.18)
- AM_GNU_GETTEXT([external])
- 
- AC_CHECK_PROGS(RSH, remsh rsh, rsh)
diff --git a/games-board/xboard/files/xboard-4.8.0-gnuchess-default.patch b/games-board/xboard/files/xboard-4.8.0-gnuchess-default.patch
deleted file mode 100644
index 772a887493c7..000000000000
--- a/games-board/xboard/files/xboard-4.8.0-gnuchess-default.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6b40739a29b99fbed7a9622c8cbe1c423e397b48 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 3 Nov 2014 19:53:24 +0100
-Subject: [PATCH] Make "gnuchess" the default engine
-
----
- gtk/xboard.h | 2 +-
- xaw/xboard.h | 2 +-
- xboard.conf  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gtk/xboard.h b/gtk/xboard.h
-index 234692d..dfa42ac 100644
---- a/gtk/xboard.h
-+++ b/gtk/xboard.h
-@@ -108,7 +108,7 @@ typedef struct {
- 
- #define BORDER_X_OFFSET 3
- #define BORDER_Y_OFFSET 27
--#define FIRST_CHESS_PROGRAM	"fairymax"
-+#define FIRST_CHESS_PROGRAM	"gnuchess"
- #define SECOND_CHESS_PROGRAM	""
- #define FIRST_DIRECTORY         "."
- #define SECOND_DIRECTORY        "."
-diff --git a/xaw/xboard.h b/xaw/xboard.h
-index bcfafb2..d4b3407 100644
---- a/xaw/xboard.h
-+++ b/xaw/xboard.h
-@@ -118,7 +118,7 @@ typedef struct {
- 
- #define BORDER_X_OFFSET 3
- #define BORDER_Y_OFFSET 27
--#define FIRST_CHESS_PROGRAM	"fairymax"
-+#define FIRST_CHESS_PROGRAM	"gnuchess"
- #define SECOND_CHESS_PROGRAM	""
- #define FIRST_DIRECTORY         "."
- #define SECOND_DIRECTORY        "."
-diff --git a/xboard.conf b/xboard.conf
-index 6c43b97..90fc680 100644
---- a/xboard.conf
-+++ b/xboard.conf
-@@ -73,7 +73,7 @@
- ;
- ; Engines & adjudicatons in engine-engine games
- ;
---firstChessProgram fairymax
-+-firstChessProgram gnuchess
- -firstChessProgramNames {fairymax
- "Fruit 2.1" -fcp fruit -fUCI
- "Crafty" -fcp crafty
--- 
-2.1.3
-
diff --git a/games-board/xboard/metadata.xml b/games-board/xboard/metadata.xml
deleted file mode 100644
index f87877458417..000000000000
--- a/games-board/xboard/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="zippy">Enable experimental zippy client</flag>
-    <flag name="default-font">Install the default font that xboard uses</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-board/xboard/xboard-4.8.0-r1.ebuild b/games-board/xboard/xboard-4.8.0-r1.ebuild
deleted file mode 100644
index 398488b60b28..000000000000
--- a/games-board/xboard/xboard-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils fdo-mime gnome2-utils
-
-DESCRIPTION="GUI for gnuchess and for internet chess servers"
-HOMEPAGE="https://www.gnu.org/software/xboard/"
-SRC_URI="mirror://gnu/xboard/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="Xaw3d +default-font gtk nls zippy"
-RESTRICT="test" #124112
-
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/librsvg:2
-	virtual/libintl
-	x11-libs/cairo[X]
-	x11-libs/libXpm
-	default-font? (
-		media-fonts/font-adobe-100dpi[nls?]
-		media-fonts/font-misc-misc[nls?]
-	)
-	!gtk? (
-		x11-libs/libX11
-		x11-libs/libXt
-		x11-libs/libXmu
-		Xaw3d? ( x11-libs/libXaw3d )
-		!Xaw3d? ( x11-libs/libXaw )
-	)
-	gtk? ( x11-libs/gtk+:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gettext.patch
-	"${FILESDIR}"/${P}-gnuchess-default.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-update-mimedb \
-		--datadir="${EPREFIX}"/usr/share \
-		$(use_enable nls) \
-		$(use_enable zippy) \
-		--disable-update-mimedb \
-		$(use_with gtk) \
-		$(use_with Xaw3d) \
-		$(usex gtk "--without-Xaw" "$(use_with !Xaw3d Xaw)") \
-		--with-gamedatadir="${EPREFIX}/usr/share/games/${PN}"
-}
-
-src_install() {
-	default
-	dodoc AUTHORS COPYRIGHT ChangeLog FAQ.html NEWS README TODO ics-parsing.txt
-	use zippy && dodoc zippy.README
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	elog "No chess engines are emerged by default! If you want a chess engine"
-	elog "to play with, you can emerge gnuchess or crafty."
-	elog "Read xboard FAQ for information."
-	if ! use default-font ; then
-		ewarn "Read the xboard(6) man page for specifying the font for xboard to use."
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/games-board/xfreecell-1.0.5b-r1 b/games-board/xfreecell-1.0.5b-r1
new file mode 100644
index 000000000000..4d02f3468996
--- /dev/null
+++ b/games-board/xfreecell-1.0.5b-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DEPEND=media-fonts/font-misc-misc x11-libs/libXext x11-base/xorg-proto
+DESCRIPTION=A freecell game for X
+EAPI=6
+HOMEPAGE=http://www2.giganet.net/~nakayama/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=HPND
+RDEPEND=media-fonts/font-misc-misc x11-libs/libXext
+SLOT=0
+SRC_URI=http://www2.giganet.net/~nakayama/xfreecell-1.0.5b.tgz http://www2.giganet.net/~nakayama/MSNumbers.gz https://dev.gentoo.org/~dilfridge/distfiles/xfreecell-1.0.5b-gcc6.patch.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=612523d831f26fc1f43f92215cd8c345
diff --git a/games-board/xfreecell/Manifest b/games-board/xfreecell/Manifest
deleted file mode 100644
index 4f1991a9ce12..000000000000
--- a/games-board/xfreecell/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xfreecell-1.0.5b-gcc43.patch 1124 BLAKE2B e4870d1a21b8322146b839bfbe792c5c2c24c93c825bc50ac15057f3d4186e4f6dd4c49c05d773044bc063a8773a55aad0bf1bb0912248ee8033f98611068cab SHA512 0164962559d0ce135ec08b8f143ef90ee3b70bcc4509057709d505e12e2efb3a70848befc187d228fc99ff225a10e415d81f3841796f2868751a2ce2df308e37
-AUX xfreecell-1.0.5b-gentoo.patch 11060 BLAKE2B 631f75fddd90000aa350a97f8f412341fe39c19b34894dbc2ecd5a0b761af1599157dbd9f52b3cbec37d1c0f9201c395af526b957970d1886c55b6e1500476ae SHA512 8109b5b05a20f36bf54eb8c5bee7b5a9031c82419b9efbea7f2513a0d81083fb959f2267357a73a75b5de5966304c62b5d245d7f1cf1e77730f6565a3a438185
-DIST MSNumbers.gz 1212278 BLAKE2B f976aed03fd176407cddc91ecdc42c26a94bc6e8cb09b24dc3f2e577c05d7a2695e7a33e9784e411cdcb30e7d411f5a6712214660ee0dffd732b0136913afc2f SHA512 6a8215f72bb4f10262c41875e1668bc5bb691f9ba2b803162675cf1fb8ce6090f6009727939ecb86301de76264d35d7d10614887b677055ac470975029e55785
-DIST xfreecell-1.0.5b-gcc6.patch.xz 18888 BLAKE2B b0bbba9a093bb00bdc3d21da61375db8d0cd189adae545c149b0816088a595d585df1e15da9da76696df74fe15a23b4b74d298575fc87b9b9a49efaa168982f3 SHA512 08c544d14c43bcfccb4eee7e99d77225297be8274b85de98edcb4fa297060f8b219814729286f90939b99427b4d32725c82134b860939b5894ccbba2e15226d9
-DIST xfreecell-1.0.5b.tgz 49367 BLAKE2B 6a2fd34f025cd86e55a9f8fe3d4294396078b850e014b6df5584b0ee575856d99ceeae7822d0ae33e168003b4b673920bb03dfbbf4130f46adcdc5acc79c25cf SHA512 b4437d9c78d5a6cb5fabd0157528aef85aa1d01b87875314e122d1eafbe5808af67b7b4dbf4db8e70d3d5193b10e61cc20210725b75c01ca6ff6db2b5840a64c
-EBUILD xfreecell-1.0.5b-r1.ebuild 973 BLAKE2B c6eb237433230abaa3ff8cc07a8df1af6672d3383470fcfce56606674b5fc3a998aca95cd85448f07f2c38629eed9539825f4f19226f7e42c3274ed06fb595c0 SHA512 885942c051cb61c0d33e505b532e05d4a6bc5cdf9709a8b96179543e1b98d86e8f0ccfe35c5307f44cd0455aefb326a8d00f5f1b3e81eada091764d9cf4f34b5
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-gcc43.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-gcc43.patch
deleted file mode 100644
index aa3b434e151f..000000000000
--- a/games-board/xfreecell/files/xfreecell-1.0.5b-gcc43.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/card.cpp
-+++ b/card.cpp
-@@ -1,5 +1,6 @@
-+#include <cstdlib>
- #include <cstdio>
--#include <math.h>
-+#include <cmath>
- #ifdef SHAPE
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
---- a/freecell.cpp
-+++ b/freecell.cpp
-@@ -1,6 +1,7 @@
- #include <dirent.h>
- #include <fcntl.h>
--#include <stdlib.h>
-+#include <cstdlib>
-+#include <cstring>
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>
---- a/option.cpp
-+++ b/option.cpp
-@@ -3,7 +3,9 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <unistd.h>
--#include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
-+#include <cstring>
- 
- #include "general.h"
- #include "option.h"
---- a/subwindows.cpp
-+++ b/subwindows.cpp
-@@ -3,7 +3,8 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <unistd.h>
--#include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
- 
- #include "general.h"
- #include "subwindows.h"
---- a/widget/widget.h
-+++ b/widget/widget.h
-@@ -4,7 +4,9 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/keysym.h>
--#include <stdio.h>
-+#include <cstdlib>
-+#include <cstdio>
-+#include <cstring>
- #include <vector>
- #include <string>
- 
diff --git a/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch b/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
deleted file mode 100644
index 85a2e4dd3c41..000000000000
--- a/games-board/xfreecell/files/xfreecell-1.0.5b-gentoo.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -ru xfreecellg/card.cpp xfreecell/card.cpp
---- xfreecellg/card.cpp	1999-03-27 05:36:28.000000000 -0800
-+++ xfreecell/card.cpp	2004-02-25 02:17:24.000000000 -0800
-@@ -119,7 +119,7 @@
-     int oldy = y();
-     int newx = dest_x;
-     int newy = dest_y;
--    int steps = max(abs(oldx - newx), abs(oldy - newy)) / Option::speedup();
-+    int steps = std::max(abs(oldx - newx), abs(oldy - newy)) / Option::speedup();
-     float curx = (float) oldx;
-     float cury = (float) oldy;
- 
-diff -ru xfreecellg/freecell.cpp xfreecell/freecell.cpp
---- xfreecellg/freecell.cpp	1999-07-27 07:15:27.000000000 -0700
-+++ xfreecell/freecell.cpp	2004-02-25 02:18:13.000000000 -0800
-@@ -64,7 +64,7 @@
- static GameNumberManager* gnManager; 
- static const int PathLength = 256;
- static char msNumbersPath[PathLength] = "\0";;
--static const char defaultMSNumbersPath[] = "/usr/local/lib/xfreecell/MSNumbers";
-+static const char defaultMSNumbersPath[] = "/usr/share/games/xfreecell/MSNumbers";
- 
- // ##### Functions declarations #####
- static void adjustSubwindow(NSWindow*);
-@@ -603,7 +603,7 @@
- void readMSNumbersPath()
- {
-   char* home = getenv("HOME");
--  string saveFile;
-+  std::string saveFile;
- 
-   if (home == NULL) {
-     fprintf(stderr, "Cannot get $HOME. Assuming I am at home directory now.\n");
-diff -ru xfreecellg/gnmanager.cpp xfreecell/gnmanager.cpp
---- xfreecellg/gnmanager.cpp	1999-07-27 07:18:05.000000000 -0700
-+++ xfreecell/gnmanager.cpp	2004-02-25 02:17:24.000000000 -0800
-@@ -16,7 +16,7 @@
- GameNumberManager::GameNumberManager()
- {
-   char* home = getenv("HOME");
--  string directory;
-+  std::string directory;
- 
-   if (home == NULL) {
-     fprintf(stderr, "Cannot get $HOME. Assuming I am at home directory now.\n");
-@@ -143,7 +143,7 @@
-   readFile(msLostGameFile, &msLostGames);
- }
- 
--void GameNumberManager::readFile(const string& file, hash_set<int>* hs)
-+void GameNumberManager::readFile(const std::string& file, hash_set<int>* hs)
- {
-   FILE* fp = fopen(file.c_str(), "r");
-   char line[lineLength];
-@@ -169,7 +169,7 @@
-   writeFile(msLostGameFile, &msLostGames);
- }
- 
--void GameNumberManager::writeFile(const string& file, hash_set<int>* hs)
-+void GameNumberManager::writeFile(const std::string& file, hash_set<int>* hs)
- {
-   FILE* fp = fopen(file.c_str(), "w+");
- 
-diff -ru xfreecellg/gnmanager.h xfreecell/gnmanager.h
---- xfreecellg/gnmanager.h	1999-03-29 05:07:19.000000000 -0800
-+++ xfreecell/gnmanager.h	2004-02-25 02:17:24.000000000 -0800
-@@ -2,7 +2,13 @@
- #define GNManager_H
- 
- #include <string>
-+
-+#if __GNUG__ < 3
- #include <hash_set>
-+#else
-+#include <ext/hash_set>
-+using __gnu_cxx::hash_set;
-+#endif
- 
- class GameNumberManager {
- public:
-@@ -20,15 +26,15 @@
-   bool alreadyLost(int);
- 
-   void readFiles();
--  void readFile(const string&, hash_set<int>*);
--  void writeFile(const string&, hash_set<int>*);
-+  void readFile(const std::string&, hash_set<int>*);
-+  void writeFile(const std::string&, hash_set<int>*);
- 
--  string lostGameFile, wonGameFile;
-+  std::string lostGameFile, wonGameFile;
-   
-   hash_set<int> wonGames;
-   hash_set<int> lostGames;
- 
--  string msLostGameFile, msWonGameFile;
-+  std::string msLostGameFile, msWonGameFile;
- 
-   hash_set<int> msWonGames;
-   hash_set<int> msLostGames;
-diff -ru xfreecellg/makefile xfreecell/makefile
---- xfreecellg/makefile	1999-04-03 05:42:49.000000000 -0800
-+++ xfreecell/makefile	2004-02-25 02:17:48.000000000 -0800
-@@ -1,16 +1,15 @@
- OBJECTS=card.o freecell.o option.o stack.o subwindows.o undo.o util.o gnmanager.o random.o
--CC=g++
--CFLAGS=-g -Wall -DSHAPE -DBOGUSRANDOM
-+CFLAGS=$(CXXFLAGS) -DSHAPE -DBOGUSRANDOM
- LIBS=-lm -L. -lns -L/usr/X11R6/lib -lXext -lX11
- STATICDIR=xfreecell-static
- DOCS=README CHANGES mshuffle.txt xfreecell.6
- LIBDIR=/usr/local/lib/xfreecell
- 
- all: $(OBJECTS) lib
--	$(CC) -o xfreecell $(CFLAGS) $(OBJECTS) $(LIBS)
-+	$(CXX) -o xfreecell $(LDFLAGS) $(OBJECTS) $(LIBS)
- 
- static: $(OBJECTS) lib
--	$(CC) -o xfreecell -static $(CFLAGS) $(OBJECTS) $(LIBS)
-+	$(CXX) -o xfreecell -static $(CFLAGS) $(OBJECTS) $(LIBS)
- 
- static-release: static
- 	mkdir $(STATICDIR)
-@@ -21,17 +20,17 @@
- 	rm -rf $(STATICDIR)
- 
- %.o: %.cpp
--	$(CC) -c $(CFLAGS) $<
-+	$(CXX) -c $(CFLAGS) $<
- 
- clean:
- 	rm -f *~ *.o a.out xfreecell libns.a
--	make -C widget clean
-+	$(MAKE) -C widget clean
- 
- lib:
--	make -C widget lib
-+	$(MAKE) -C widget lib
- 
- install: all
--	install xfreecell $(DESTDIR)/usr/local/bin
--	install xfreecell.6 $(DESTDIR)/usr/local/man/man6
-+	install xfreecell $(DESTDIR)/usr/bin
-+	install xfreecell.6 $(DESTDIR)/usr/share/man/man6
- #	install -d $(LIBDIR)
--#	install ms-compatible/MSNumbers $(DESTDIR)/usr/local/lib/xfreecell
-\ No newline at end of file
-+#	install ms-compatible/MSNumbers $(DESTDIR)/usr/share/xfreecell
-diff -ru xfreecellg/option.h xfreecell/option.h
---- xfreecellg/option.h	1999-03-27 11:39:17.000000000 -0800
-+++ xfreecell/option.h	2004-02-25 02:17:24.000000000 -0800
-@@ -22,7 +22,7 @@
-   void readPrefs();
-   void writePrefs();
- 
--  string saveFile;
-+  std::string saveFile;
- 
-   static int _speedup;
-   static bool _queryWindow;
-diff -ru xfreecellg/stack.h xfreecell/stack.h
---- xfreecellg/stack.h	1999-03-02 10:20:02.000000000 -0800
-+++ xfreecell/stack.h	2004-02-25 02:17:24.000000000 -0800
-@@ -28,7 +28,7 @@
-   int _next_x, _next_y;
- 
- private:
--  vector<Card*> _cards;
-+  std::vector<Card*> _cards;
- };
- 
- class PlayStack : public Stack {
-diff -ru xfreecellg/subwindows.h xfreecell/subwindows.h
---- xfreecellg/subwindows.h	1999-03-15 15:09:49.000000000 -0800
-+++ xfreecell/subwindows.h	2004-02-25 02:17:24.000000000 -0800
-@@ -76,7 +76,7 @@
-   int _undos;
-   int _totalScore;
- 
--  string saveFile;
-+  std::string saveFile;
- 
-   bool exitPressed;
- 
-diff -ru xfreecellg/undo.cpp xfreecell/undo.cpp
---- xfreecellg/undo.cpp	1999-03-25 07:48:40.000000000 -0800
-+++ xfreecell/undo.cpp	2004-02-25 02:17:24.000000000 -0800
-@@ -22,7 +22,7 @@
-   c->moveToStack(from, false, false);
- }
- 
--stack<Move> moves;
-+std::stack<Move> moves;
- 
- void undoClearMoves()
- {
-diff -ru xfreecellg/widget/container.cpp xfreecell/widget/container.cpp
---- xfreecellg/widget/container.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/container.cpp	2004-02-25 02:17:24.000000000 -0800
-@@ -61,18 +61,18 @@
- 
- void NSContainer::remove(NSComponent* nsc)
- {
--  vector<NSComponent*>::iterator iter;
-+  std::vector<NSComponent*>::iterator iter;
-   for (iter = nscVec.begin(); iter != nscVec.end(); iter++) 
-     if (*iter == nsc) nscVec.erase(iter);
- }
- 
- void NSContainer::hremove(NSComponent* nsc)
- {
--  vector<NSComponent*>::iterator iter;
-+  std::vector<NSComponent*>::iterator iter;
-   for (iter = nscVec.begin(); iter != nscVec.end(); iter++) {
-     if (*iter == nsc) {
-       int w = (*iter)->width() + _neighborGap;
--      vector<NSComponent*>::iterator iter2 = iter + 1;
-+      std::vector<NSComponent*>::iterator iter2 = iter + 1;
-       if (nscVec.size() == 0) {
- 	_width = 0; _height = 0;
-       } else {
-@@ -87,11 +87,11 @@
- 
- void NSContainer::vremove(NSComponent* nsc)
- {
--  vector<NSComponent*>::iterator iter;
-+  std::vector<NSComponent*>::iterator iter;
-   for (iter = nscVec.begin(); iter != nscVec.end(); iter++) {
-     if (*iter == nsc) {
-       int h = (*iter)->height() + _neighborGap;
--      vector<NSComponent*>::iterator iter2 = iter + 1;
-+      std::vector<NSComponent*>::iterator iter2 = iter + 1;
-       if (nscVec.size() == 0) {
- 	_width = 0; _height = 0;
-       } else {
-diff -ru xfreecellg/widget/makefile xfreecell/widget/makefile
---- xfreecellg/widget/makefile	1999-03-17 21:54:57.000000000 -0800
-+++ xfreecell/widget/makefile	2004-02-25 02:17:59.000000000 -0800
-@@ -1,15 +1,13 @@
- OBJECTS=window.o plate.o string.o button.o label.o textfield.o container.o frame.o util.o scrollbar.o font.o main.o
--#C=/usr/local/gcc-2.8.1/bin/g++
--CC=g++
--CFLAGS=-g -Wall
-+CFLAGS=$(CXXFLAGS) -Wall
- LIBS=-L/usr/X11R6/lib -lX11
- LIBNAME=libns.a
- 
- all: test.o $(OBJECTS)
--	$(CC) $(CFLAGS) test.o $(OBJECTS) $(LIBS)
-+	$(CXX) $(CFLAGS) test.o $(OBJECTS) $(LIBS)
- 
- %.o: %.cpp
--	$(CC) $(CFLAGS) -c $<
-+	$(CXX) $(CFLAGS) -c $<
- 
- clean:
- 	rm -f *.o *~ a.out .nfs* dummy
-diff -ru xfreecellg/widget/textfield.cpp xfreecell/widget/textfield.cpp
---- xfreecellg/widget/textfield.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/textfield.cpp	2004-02-25 02:17:24.000000000 -0800
-@@ -1,3 +1,4 @@
-+#include <cctype>
- #include "widget.h"
- 
- GC NSTextField::gc;
-diff -ru xfreecellg/widget/widget.h xfreecell/widget/widget.h
---- xfreecellg/widget/widget.h	1999-03-15 08:29:32.000000000 -0800
-+++ xfreecell/widget/widget.h	2004-02-25 02:17:24.000000000 -0800
-@@ -114,7 +114,7 @@
-     Elt(NSWindow* nw, Window w) { nswindow = nw; window = w; }
-   };
- 
--  static vector<Elt> eltVector;
-+  static std::vector<Elt> eltVector;
-   static void eraseWindow(Window);
-   static void registerWindow(NSWindow*, Window);
- };
-@@ -171,7 +171,7 @@
-   void fontWindowHeight(unsigned int);
-   void resizable(bool arg) { _resizable = arg; }
- 
--  string _label;
-+  std::string _label;
- private:
-   static const int fontGap = 4;
-   static XFontStruct* fontStruct;
-@@ -272,7 +272,7 @@
-   static unsigned int charWidth, charHeight;
- 
-   unsigned int maxCharNum;
--  string _str;
-+  std::string _str;
-   unsigned int cursorPos;
-   unsigned int strStart;
-   bool cursorOnTF;
-@@ -327,7 +327,7 @@
-   unsigned int _vGap, _hGap, _neighborGap;
-   Window _parentWindow;
- 
--  vector<NSComponent*> nscVec;
-+  std::vector<NSComponent*> nscVec;
- };
- 
- // ##### NSHContainer #####
-diff -ru xfreecellg/widget/window.cpp xfreecell/widget/window.cpp
---- xfreecellg/widget/window.cpp	1999-03-03 09:34:52.000000000 -0800
-+++ xfreecell/widget/window.cpp	2004-02-25 02:17:24.000000000 -0800
-@@ -2,7 +2,7 @@
- 
- bool NSWindow::windowInitialized = false;
- Window NSWindow::_root;
--vector<NSWindow::Elt> NSWindow::eltVector;
-+std::vector<NSWindow::Elt> NSWindow::eltVector;
- 
- NSWindow::NSWindow(bool create, Window w, int x, int y, unsigned int width, unsigned int height, 
- 		   unsigned int borderWidth, unsigned long border, unsigned long bg)
-@@ -86,8 +86,8 @@
- 
- void NSWindow::registerWindow(NSWindow* nsw, Window w)
- {
--  vector<Elt>::iterator begin = eltVector.begin();
--  vector<Elt>::iterator end = eltVector.end();
-+  std::vector<Elt>::iterator begin = eltVector.begin();
-+  std::vector<Elt>::iterator end = eltVector.end();
-   Elt elt(nsw, w);
- 
-   if (eltVector.size() == 0 || w > eltVector.back().window) {
-@@ -95,7 +95,7 @@
-     return;
-   }
- 
--  for (vector<Elt>::iterator iter = begin; iter != end; iter++)
-+  for (std::vector<Elt>::iterator iter = begin; iter != end; iter++)
-     if ((*iter).window > w)
-       eltVector.insert(iter, elt);
-   
-@@ -104,9 +104,9 @@
- 
- void NSWindow::eraseWindow(Window w)
- {
--  vector<Elt>::iterator begin = eltVector.begin();
--  vector<Elt>::iterator end = eltVector.end();
--  vector<Elt>::iterator iter;
-+  std::vector<Elt>::iterator begin = eltVector.begin();
-+  std::vector<Elt>::iterator end = eltVector.end();
-+  std::vector<Elt>::iterator iter;
- 
-   for (iter = begin; iter != end; iter++) {
-     if ((*iter).window == w) eltVector.erase(iter);
diff --git a/games-board/xfreecell/metadata.xml b/games-board/xfreecell/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/xfreecell/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild b/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
deleted file mode 100644
index b5e38916ce0a..000000000000
--- a/games-board/xfreecell/xfreecell-1.0.5b-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A freecell game for X"
-HOMEPAGE="http://www2.giganet.net/~nakayama/"
-SRC_URI="http://www2.giganet.net/~nakayama/${P}.tgz
-	http://www2.giganet.net/~nakayama/MSNumbers.gz
-	https://dev.gentoo.org/~dilfridge/distfiles/${P}-gcc6.patch.xz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/font-misc-misc
-	x11-libs/libXext"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${WORKDIR}"/${P}-gcc6.patch
-)
-
-src_install() {
-	dobin xfreecell
-	insinto /usr/share/${PN}
-	doins "${WORKDIR}"/MSNumbers
-	dodoc CHANGES README mshuffle.txt
-	doman xfreecell.6
-	make_desktop_entry xfreecell XFreecell
-}
-
-pkg_postinst() {
-	einfo "Remember to restart X if this is the first time you've installed media-fonts/font-misc-misc"
-}
diff --git a/games-board/xgammon-0.98-r1 b/games-board/xgammon-0.98-r1
new file mode 100644
index 000000000000..6acb1df2ca53
--- /dev/null
+++ b/games-board/xgammon-0.98-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure postinst
+DEPEND=x11-libs/libXaw app-text/rman x11-misc/imake
+DESCRIPTION=very nice backgammon game for X
+EAPI=6
+HOMEPAGE=http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXaw
+SLOT=0
+SRC_URI=http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/xgammon-0.98a.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_=2c7fd15a9e06f3a410426cf20099eb00
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
deleted file mode 100644
index 210027c02da0..000000000000
--- a/games-board/xgammon/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gcc33.patch 3671 BLAKE2B ed7136e938854cac0571e8d0025e04a4011d66d4a72cbef1ac481b8d663349485f818192c895900101647e584c6629ee5a636ed80afbcdd612b44178e68054f1 SHA512 afebed554856cceddda89a85edc2c8fb327718226a6306273ed1dc74c8809f08cc2a5c510d8af7653f0c2d7713689a693aa586d23ce72ac39378d71fe9821093
-AUX xgammon-0.98-broken.patch 258 BLAKE2B e4c6fbd2e89b5aca345928985d60ba22dec12d78a5ea1478501ed6e014b0081da82d7fd7364c5f98a03ea37ddb304772d3bedb6a86568f4906a2ab5da6fcff39 SHA512 602027d7e3e786932b1452a86f1ab530b8ac7651296b4d78fb466c0d083ecdc5b171af6f18632322c519cc56a018276de1c33f419b04a1d34988d7a6a85f7887
-AUX xgammon-0.98-config.patch 799 BLAKE2B 07ac070806ea0082f609e9b1fbc67c57eea3b6c69564f7fa7968ae1fac974fcf327f2c6a7dcd363ea0148854fd4642ca096b5f484889088082482dc53c1a1616 SHA512 e65dfcc1d12c91fff7cb868b69b28df775c602455a359cb05f33642168c2daf764a410d8180b47bde4bf216dd3cdfc1a5748c85e6a193aa67b7ca2f23648e8a9
-DIST xgammon-0.98a.tar.gz 76415 BLAKE2B 617ca76b8ebe22f753f20f94fc536008c119237e24ad1011a88780416405db95c5155759548e6719c328067387e1cbc052b0ebbbc020ad8e028f564cfcd3c3f1 SHA512 1176146d7cf4d5cbf47e911190de329d87650084044d1a2e5a53ed367d2b90ec63c0e906946c4523c2fb21b68df8b86cf0567527a91058e8db66a76086a02092
-EBUILD xgammon-0.98-r1.ebuild 949 BLAKE2B 724a28818381c487e911cacf0067700f6fe5d16a21a12421e6eec95069074b54dbdfe8c2d0d3c9a20fd9857a781002285ca5f36f743c453a5dd39aa15e669c3c SHA512 a6dc0bec5ba59b94d0649bfdf74ed7cc8e4875104b6cfdcde12c11b7500460305aff3889d8ca3cdd0a4a31ace46b92b3b17b73ce554cb7f6b352854377a3d5ad
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch
deleted file mode 100644
index 82dcadd990c7..000000000000
--- a/games-board/xgammon/files/gcc33.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- a/xgammon.c	2004-05-07 14:44:07.000000000 -0700
-+++ b/xgammon.c	2004-05-07 14:45:52.000000000 -0700
-@@ -944,31 +944,31 @@
- 	for (option=1; option<argc; option++) {
- 		if (strcmp (argv[option], "-?") == 0 ||
- 		    strcmp (argv[option], "-help") == 0) {
--puts ("xgammon [-otherdisplay (display)]
--        [-boardgeometry (string)]
--        [-boardcolor (color)] [-bc (color)]
--        [-darkcolor  (color)] [-dc (color)]
--        [-lightcolor (color)] [-lc (color)]
--        [-barcolor   (color)] [-b  (color)]
--        [-whitecolor (color)]        the stone color for \"white\"
--        [-blackcolor (color)]        the stone color for \"black\"
--        [-doublerfont (font)]        sets the (big) font for the doubler dice
--        [-doubling   +doubling]      sets if you wish the computer to double
--        [-h (black|white)]           set the color for the human player
--                                     (implies a human versus computer game)
--        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either
--                                     human vs. human computer vs. computer
--                                     or human vs. computer (default)
--        [-winat      (points)]       play a tournament up to \"points\" points
--        [-watchmove  +wachmove]      if you wish to see the flying stones
--        [-buttonmove +buttonmove]    set stones by simply pressing button
--        [-autoplay   +autoplay]      automatic play when only one move
--                                     is possible
--        [-stonesteps (number)]       sets the stepsize the stones fly
--                                     in pixel (implies +watchmove)
--        [-delaytime (tsec.)]         sets the time the cumputer waits
--                                     after each turn (implies -watchmove)
--        [-?] [-help]                 print this string");
-+puts ("xgammon [-otherdisplay (display)]\n"
-+"        [-boardgeometry (string)]\n"
-+"        [-boardcolor (color)] [-bc (color)]\n"
-+"        [-darkcolor  (color)] [-dc (color)]\n"
-+"        [-lightcolor (color)] [-lc (color)]\n"
-+"        [-barcolor   (color)] [-b  (color)]\n"
-+"        [-whitecolor (color)]        the stone color for \"white\"\n"
-+"        [-blackcolor (color)]        the stone color for \"black\"\n"
-+"        [-doublerfont (font)]        sets the (big) font for the doubler dice\n"
-+"        [-doubling   +doubling]      sets if you wish the computer to double\n"
-+"        [-h (black|white)]           set the color for the human player\n"
-+"                                     (implies a human versus computer game)\n"
-+"        [-gamekind -g (hvc|cvc|hvh)] sets the gamekind to either\n"
-+"                                     human vs. human computer vs. computer\n"
-+"                                     or human vs. computer (default)\n"
-+"        [-winat      (points)]       play a tournament up to \"points\" points\n"
-+"        [-watchmove  +wachmove]      if you wish to see the flying stones\n"
-+"        [-buttonmove +buttonmove]    set stones by simply pressing button\n"
-+"        [-autoplay   +autoplay]      automatic play when only one move\n"
-+"                                     is possible\n"
-+"        [-stonesteps (number)]       sets the stepsize the stones fly\n"
-+"                                     in pixel (implies +watchmove)\n"
-+"        [-delaytime (tsec.)]         sets the time the cumputer waits\n"
-+"                                     after each turn (implies -watchmove)\n"
-+"        [-?] [-help]                 print this string");
- 		exit (0);
- 		} else {
- 			fprintf (stderr,"xgammon: unknown option %s (ignored)\n", argv[option]);
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch
deleted file mode 100644
index e94afa0792a1..000000000000
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xgammon/lib/db.c	Sat Jan  6 12:14:12 2001
-+++ xgammon/lib/db.c	Sat Jan  6 12:13:56 2001
-@@ -259,10 +259,11 @@
-     close(fid);
- }
- 
--void main()
-+int main()
- {
-     set_binom();
-     set_naufm();
-     set_offset();
-     set_V_Werte();
-+    return(0);
- }
diff --git a/games-board/xgammon/files/xgammon-0.98-config.patch b/games-board/xgammon/files/xgammon-0.98-config.patch
deleted file mode 100644
index 1cedd03de3dd..000000000000
--- a/games-board/xgammon/files/xgammon-0.98-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- xgammon-0.98/xgammon.ad	Tue Aug 29 01:35:39 1995
-+++ xgammon-0.98/xgammon.ad	Wed Aug 12 18:22:25 1998
-@@ -67,4 +67,4 @@
- xgammon.buttonmove:			false
- xgammon.stonesteps:			5
- xgammon.delaytime:			5
--xgammon.database:			lib/xgammon.db
-+xgammon.database:			/usr/lib/X11/xgammon/xgammon.db
---- xgammon-0.98/Imakefile	Wed Aug 23 15:26:39 1995
-+++ xgammon-0.98/Imakefile	Wed Aug 12 18:42:55 1998
-@@ -12,9 +12,9 @@
- 
- ComplexProgramTarget(xgammon)
- InstallAppDefaults(XGammon)
--MakeDirectories(install, $(LIBDIR)/xgammon)
--InstallNonExec(lib/xgammon.db, $(LIBDIR)/xgammon)
--MANSUFFIX = 6
-+MakeDirectories(install,$(LIBDIR)/xgammon)
-+InstallNonExec(lib/xgammon.db,$(LIBDIR)/xgammon)
-+MANSUFFIX = 1
- 
- xgammon.o:      xgammon.c
- 	$(CC) $(CFLAGS) -DDATABASE=\"$(LIBDIR)/xgammon/xgammon.db\" -c xgammon.c
diff --git a/games-board/xgammon/metadata.xml b/games-board/xgammon/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/xgammon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
deleted file mode 100644
index d00b4f94fe5f..000000000000
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs eutils
-
-DESCRIPTION="very nice backgammon game for X"
-HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
-SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake"
-
-S=${WORKDIR}/${P}a
-
-PATCHES=(
-	"${FILESDIR}/${P}-broken.patch"
-	"${FILESDIR}/${P}-config.patch"
-	"${FILESDIR}/gcc33.patch"
-)
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	env PATH=".:${PATH}" emake \
-		EXTRA_LDOPTIONS="${LDFLAGS}" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		CC=$(tc-getCC)
-}
-
-pkg_postinst() {
-	einfo "xgammon need helvetica fonts"
-	einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"
-	einfo "or similar. Remember to restart X after loading fonts"
-}
diff --git a/games-board/xmahjongg-3.7-r1 b/games-board/xmahjongg-3.7-r1
new file mode 100644
index 000000000000..a233c7ee5291
--- /dev/null
+++ b/games-board/xmahjongg-3.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXt
+DESCRIPTION=friendly GUI version of xmahjongg
+EAPI=5
+HOMEPAGE=http://www.lcdf.org/xmahjongg/
+KEYWORDS=~amd64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=http://www.lcdf.org/xmahjongg/xmahjongg-3.7.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_=8d93ed338bcb9d1a6111026513c982dc
diff --git a/games-board/xmahjongg/Manifest b/games-board/xmahjongg/Manifest
deleted file mode 100644
index 636e6cd5e53a..000000000000
--- a/games-board/xmahjongg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xmahjongg-3.7.tar.gz 551834 BLAKE2B 8a8d82fe6f88efc0b966440b27654a003f8928bf10ee7cdf54a95dd35108530794faa21d39c296c789a910e6867db831bbfbecefe8f873f26a52d0e877b45485 SHA512 eb952b38b2ea79f3037a6e8063042f4094e0719edd366c0327350aaf6484ee64ad5d174741bbb80fc49dba62eba4790ffc97eb1bf0d942149e614bde7bd1759a
-EBUILD xmahjongg-3.7-r1.ebuild 678 BLAKE2B b50c04934ca6f5b5ae4b23620b79da7b3fdd1694c6fffc44e3e77b7463d545375b68444c78b5c2a60f2352d9294f3d371e1d7e780164b98f92156795ab37c523 SHA512 1af567a8301d87094c646c55184a5c4e54c5479bb53f3eaca1bc5fe3462851e270e04eea38b8ca1e33549d1737d0a546d2004e158bb7d93e697a6934b9a8e978
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xmahjongg/metadata.xml b/games-board/xmahjongg/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/xmahjongg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild b/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild
deleted file mode 100644
index e05ea7454d84..000000000000
--- a/games-board/xmahjongg/xmahjongg-3.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="friendly GUI version of xmahjongg"
-HOMEPAGE="http://www.lcdf.org/xmahjongg/"
-SRC_URI="http://www.lcdf.org/xmahjongg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/X_PRE_LIBS/s:-lSM -lICE::' \
-		configure || die
-}
-
-src_install() {
-	default
-	newicon share/tiles/small.gif ${PN}.gif
-	make_desktop_entry xmahjongg "Xmahjongg" /usr/share/pixmaps/${PN}.gif
-}
diff --git a/games-board/xmille-2.0-r3 b/games-board/xmille-2.0-r3
new file mode 100644
index 000000000000..1318c3d6e383
--- /dev/null
+++ b/games-board/xmille-2.0-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libXext app-text/rman x11-misc/imake
+DESCRIPTION=Mille Bournes card game
+EAPI=6
+HOMEPAGE=http://www.milleborne.info/
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=x11-libs/libXext
+SLOT=0
+SRC_URI=mirror://debian/pool/main/x/xmille/xmille_2.0.orig.tar.gz mirror://debian/pool/main/x/xmille/xmille_2.0-13.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9218fa6e53784c0e3ab9ae861d9fa0cc
diff --git a/games-board/xmille/Manifest b/games-board/xmille/Manifest
deleted file mode 100644
index 54d6546e45d2..000000000000
--- a/games-board/xmille/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST xmille_2.0-13.diff.gz 6276 BLAKE2B bf136bc25d3aea56b671b6ff475717d162f0620a1c8c07d3b96b9d7a4b9b9f3ccae1039fc24827048686c631312c36e450a8bd989c32e9d26ab1c594ffc317d9 SHA512 d9e4448942738a105255d9aa77e2e66cb9edc8b35fd8278d1c810dbdca4a5b8a4916bf48c8d6a16e282db0c0fa058a0b281c168976529edeedb6caf53af7cd15
-DIST xmille_2.0.orig.tar.gz 68178 BLAKE2B bd6ab40a8868b90bfc1b045a2be797c8eab49e676b695f521ceaf8646de9c01a07806c0ce029e4959a339e2ab48668635abd5b842c90e33c2cb5fd359eb971b8 SHA512 028740785dfc13b4088810855358b9dab75fbb79221dd4218ef0c19550c2180fe92e553d0a474bf45091b4008988e1a093a6d5bac99fe1ccafcaec3429cd0e8b
-EBUILD xmille-2.0-r3.ebuild 969 BLAKE2B 83b923821852b492b09a1cf30cb9a02b9ef733d0abb713feb7f41df8e9b500a114937dc3626c87805ff24b0c271ebcd9130498e9f576059a5e38f172e70bc77d SHA512 776ae5ac9669743a5efddf1badf2774514f1aa936d2bbc2fa9ed7d252a2cc426ab063517a10f13e5e0dc6169438aeda7ac6fe50d37eecea61c41ee97f0c7a4d5
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xmille/metadata.xml b/games-board/xmille/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/xmille/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/xmille/xmille-2.0-r3.ebuild b/games-board/xmille/xmille-2.0-r3.ebuild
deleted file mode 100644
index 7821de3430bb..000000000000
--- a/games-board/xmille/xmille-2.0-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop epatch toolchain-funcs
-
-DEB_PATCH_VER="13"
-DESCRIPTION="Mille Bournes card game"
-HOMEPAGE="http://www.milleborne.info/"
-SRC_URI="mirror://debian/pool/main/x/xmille/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/x/xmille/${PN}_${PV}-${DEB_PATCH_VER}.diff.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXext"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake
-"
-
-S="${WORKDIR}/${P}.orig"
-
-src_prepare() {
-	default
-	epatch "${WORKDIR}"/${PN}_${PV}-${DEB_PATCH_VER}.diff
-
-}
-
-src_configure() {
-	xmkmf || die
-}
-
-src_compile() {
-	emake -j1 \
-		AR="$(tc-getAR) clq" \
-		RANLIB="$(tc-getRANLIB)" \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xmille
-	einstalldocs
-	make_desktop_entry "${PN}" "Milles Bournes"
-	newman xmille.man xmille.6
-}
diff --git a/games-board/xscrabble-2.10-r2 b/games-board/xscrabble-2.10-r2
new file mode 100644
index 000000000000..eea73c55bd8b
--- /dev/null
+++ b/games-board/xscrabble-2.10-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/libXaw x11-misc/gccmakedep x11-misc/imake
+DESCRIPTION=An X11 clone of the well-known Scrabble
+EAPI=5
+HOMEPAGE=http://freshmeat.net/projects/xscrabble/?topic_id=80
+IUSE=l10n_fr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libXaw games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble-2.10.tgz l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz ) ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz
+_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_=957e06468ad7daec37dbe50e160f0f5c
diff --git a/games-board/xscrabble/Manifest b/games-board/xscrabble/Manifest
deleted file mode 100644
index 7600f8356bde..000000000000
--- a/games-board/xscrabble/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX xscrabble-2.10-build.patch 305 BLAKE2B a1663515d317f57f534ed94eaea2059b80583826e9b1d831972d8d7eef635cc9c0182f81f70e42d7df6f521ece481d10d7f20b158257f0efee4c08870cb38019 SHA512 f62fba061b464ae9ff4f4e5c15196ac921760e7f6bfe7432a33c157e405a4784ebaa45a08e67ee191faf62f0dc447559df8f73b91d819d4f6d4e3470c335c07e
-AUX xscrabble-2.10-path-fixes.patch 1106 BLAKE2B 4730587df34bc407403624659d9f6d43c0fa2c6aa46fe06f615ed390590c468780c9521d14ec312b429f2a41d60e6dbdb712a52f1e5fb27b9c3e9449b1f1d1af SHA512 50be14204d8b8c4f13153bcdab855c0fac27639d7a09844a5aae794bf3dbdaf1da6b8aa15ac065d2d35f47c47dfa0bec89e4c9f6231a4a7f2b9a095710c912d4
-DIST xscrabble-2.10.tgz 83575 BLAKE2B 0a7ac0713e8b48eaf770d11d8ddf5fc383f870437dbc12b6e90df3fb4c28559e28523f46461e306dde59a68cebf58e854959e58ec688201223eec9825e3c5e7a SHA512 38137b3dfd3156c3748719136a30fbc7f04910538bdbdec3e9d50e3efe326ab7119a45171e0fa2cd95cd81f0642070e2e011c165284766eb7a14bd7d2aa660db
-DIST xscrabble_en.tgz 393527 BLAKE2B 3f5b9d8030ba2711e64b2cc015f8662bdcfc2d3155d34b17be243a57e8c7dc3e4ad5fc6414c745654a8ea5771a9914d38bf5ce95b42e9b7daa70907bd9105b06 SHA512 05e4bca6ec2a9b7698f5c266bf5cede574cbef87883d7cac6dc35084fa2976dcd23f3a2215b674b9f36d7c170e6af021c3ec0884f06c9803cd67ec300651ac41
-DIST xscrabble_fr.tgz 810737 BLAKE2B 26f5601f5d09232a5145c66d1d359c7a6b389a83f10c1ebcddc7579160d417e0b0b9e5bccf7322128451f3941cdeb2177b26f4ddf9a8224ffd551d95f4a83d72 SHA512 f5425fa8bffec57e6eff16a3d33ae4569fc00343e0ed5e4f4e1e189ed02a5be7416c1549b1978042e030efbfb3a484abcac9479e7fe43de929b11d8ccf8ea3e1
-EBUILD xscrabble-2.10-r2.ebuild 1421 BLAKE2B 2e5785de0a18a84a4c1a5bae22df2c71a2c257b5f3b263c6fa6cdfe13a886417989bc57b8a3181366495ff350851b91bc4d1fae285379c1698e51169d654e2d8 SHA512 5aaa92eb29a78257e9c1f1908b2ef22798896ac2902169e5eb05eb50b881c7daa1187c316285e9b2e7b40f7944667784ce124b3bc2b8adf576a78540f963317e
-MISC metadata.xml 330 BLAKE2B 12712dc48fa06f3a64f7e994b853cc26c78eec98d147e1eba89bfd0ae58a134090376b18738090e3d929835cd596afc6fb9efe13dfe631cd8e8444b890470fdf SHA512 eb06666ebcaeac24c97b66c25652551043abae3bcd2764cd95f1d94ab8422a178fb5358d2aa655b75d254462120d36a87e64a2decb0c8a7ac255015ec1ee057e
diff --git a/games-board/xscrabble/files/xscrabble-2.10-build.patch b/games-board/xscrabble/files/xscrabble-2.10-build.patch
deleted file mode 100644
index 7d5214c7db34..000000000000
--- a/games-board/xscrabble/files/xscrabble-2.10-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-respect compiler, ldflags and cflags
-
---- build
-+++ build
-@@ -36,7 +36,7 @@
- #define RULES_FILE \"$LIBDIR/en/scrabble_rules\"
- " > src/config.h
-   xmkmf -a
--  make
-+  make CC="${CC}" CCOPTIONS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}"
-   echo "
- Now, type './build install' to install programs in $BINDIR
- "
diff --git a/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch b/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch
deleted file mode 100644
index 27a18689b1ed..000000000000
--- a/games-board/xscrabble/files/xscrabble-2.10-path-fixes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- build
-+++ build
-@@ -1,9 +1,10 @@
- #!/bin/sh
- 
- # Install defaults
--APPDEFAULTS=/usr/lib/X11/app-defaults
--BINDIR=/usr/games/bin
--LIBDIR=/usr/games/lib/scrabble
-+APPDEFAULTS=$DESTDIR/usr/$LIBDIR/X11/app-defaults
-+REAL_APPDEFAULTS=/usr/$LIBDIR/X11/app-defaults
-+BINDIR=$DESTDIR/usr/games/bin
-+LIBDIR=$DESTDIR/usr/share/games/xscrabble
- 
- # Version (don't modify without knowing!!)
- MAJOR=2
-@@ -53,6 +54,7 @@
- 
- if test "$1" = "install" ; then
-   mkdirhier $BINDIR
-+  mkdir -p $APPDEFAULTS
-   echo "mkdirhier $BINDIR"
-   install -c -s src/xscrab $BINDIR
-   echo "install -c -s src/xscrab $BINDIR"
-@@ -90,8 +92,8 @@
-   echo "mv -f xscrabble_$2/app-defaults/XScrabble_$2 $APPDEFAULTS"
-   rm -f $APPDEFAULTS/XScrabble
-   echo "rm -f $APPDEFAULTS/XScrabble"
--  ln -fs $APPDEFAULTS/XScrabble_$2 $APPDEFAULTS/XScrabble
--  echo "ln -fs $APPDEFAULTS/XScrabble_$2 $APPDEFAULTS/XScrabble"
-+  ln -fs $REAL_APPDEFAULTS/XScrabble_$2 $APPDEFAULTS/XScrabble
-+  echo "ln -fs $REAL_APPDEFAULTS/XScrabble_$2 $APPDEFAULTS/XScrabble"
-   chmod a+rwx $LIBDIR/$2 
-   chmod a+rw $LIBDIR/$2/scrabble_scores
-   rm -rf xscrabble_$2
diff --git a/games-board/xscrabble/metadata.xml b/games-board/xscrabble/metadata.xml
deleted file mode 100644
index a36c86cbd53d..000000000000
--- a/games-board/xscrabble/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">xscrabble</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-board/xscrabble/xscrabble-2.10-r2.ebuild b/games-board/xscrabble/xscrabble-2.10-r2.ebuild
deleted file mode 100644
index 2ea0730cfc70..000000000000
--- a/games-board/xscrabble/xscrabble-2.10-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib games
-
-DESCRIPTION="An X11 clone of the well-known Scrabble"
-HOMEPAGE="http://freshmeat.net/projects/xscrabble/?topic_id=80"
-SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
-	l10n_fr? ( ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_fr.tgz )
-	ftp://ftp.ac-grenoble.fr/ge/educational_games/xscrabble_en.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_fr"
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-src_unpack() {
-	unpack ${P}.tgz
-	cp "${DISTDIR}"/xscrabble_en.tgz .
-	use l10n_fr && cp "${DISTDIR}"/xscrabble_fr.tgz .
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-path-fixes.patch \
-		"${FILESDIR}"/${P}-build.patch
-	sed -i '/install/s/-s //' build || die "sed failed"
-}
-
-src_compile() {
-	./build bin || die "build failed"
-}
-
-src_install() {
-	local f
-	export DESTDIR="${D}" LIBDIR="$(get_libdir)"
-	./build install || die "install failed"
-	if use l10n_fr ; then
-		./build lang fr || die "fr failed"
-	fi
-	./build lang en || die "en failed"
-	for f in "${D}"/usr/"${LIBDIR}"/X11/app-defaults/* ; do
-		[[ -L ${f} ]] && continue
-		sed -i \
-			-e "s:/usr/games/lib/scrabble/:${GAMES_DATADIR}/${PN}/:" \
-			-e "s:fr/eng:fr/en:" \
-			${f} || die "sed ${f} failed"
-	done
-	dodoc CHANGES README
-	prepgamesdirs
-}
diff --git a/games-board/xskat-4.0-r1 b/games-board/xskat-4.0-r1
new file mode 100644
index 000000000000..d114d4cd2466
--- /dev/null
+++ b/games-board/xskat-4.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-fonts/font-misc-misc x11-libs/libX11 x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DESCRIPTION=Famous german card game
+EAPI=6
+HOMEPAGE=http://www.xskat.de/xskat.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=freedist
+RDEPEND=media-fonts/font-misc-misc x11-libs/libX11
+SLOT=0
+SRC_URI=http://www.xskat.de/xskat-4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c812488ef6510e3dfca04868e5d89f30
diff --git a/games-board/xskat/Manifest b/games-board/xskat/Manifest
deleted file mode 100644
index e7e4ab1a4649..000000000000
--- a/games-board/xskat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xskat-4.0.tar.gz 179059 BLAKE2B 0494db798eadd17b4b35256560aa82ad8ec239b08f7adcdd86621088676cbc4c7cae0d0a53bb15525d56319ba0549406038cc1e64cdcfefd280d379ffc326a96 SHA512 508d83886063be01aef509fa8050110e599e0120025a94747717fcbae38e2196e8db041296b984fe37895c211519f511cf75dfa6b948c5789e6b37064f3d0c0d
-EBUILD xskat-4.0-r1.ebuild 786 BLAKE2B de831e59e9180898684b1f2ba41adb63a4bb86cda0eec38eac70979ceaca9efafa1761665d58054747b74d957f1fd51b2aece84b9321d5400fe9bbff6daf274e SHA512 17402d201360565001c527201b2153fef04dd848f040e7691eed35c54d86e53848a9cd627d9111e9a3e8e77019c13e052d5126d342c46d0e761eff18a8457a7e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/xskat/metadata.xml b/games-board/xskat/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-board/xskat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-board/xskat/xskat-4.0-r1.ebuild b/games-board/xskat/xskat-4.0-r1.ebuild
deleted file mode 100644
index 517567ee1cf1..000000000000
--- a/games-board/xskat/xskat-4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Famous german card game"
-HOMEPAGE="http://www.xskat.de/xskat.html"
-SRC_URI="http://www.xskat.de/${P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-fonts/font-misc-misc
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-src_prepare() {
-	default
-	xmkmf -a || die
-}
-
-src_compile() {
-	emake CDEBUGFLAGS="${CFLAGS}" EXTRA_LDOPTIONS="${LDFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin xskat
-	newman xskat.man xskat.6
-	dodoc CHANGES README{,.IRC}
-	newicon icon.xbm ${PN}.xbm
-	make_desktop_entry ${PN} XSkat /usr/share/pixmaps/${PN}.xbm
-}
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index e802685c2e05..22d6f22672fd 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/advancemame-3.7 b/games-emulation/advancemame-3.7
new file mode 100644
index 000000000000..3e030f9ea0e2
--- /dev/null
+++ b/games-emulation/advancemame-3.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-arch/unzip app-arch/zip dev-libs/expat media-libs/libsdl2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype:2 ) virtual/os-headers virtual/pkgconfig x86? ( >=dev-lang/nasm-0.98 ) >=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=GNU/Linux port of the MAME emulator with GUI menu
+EAPI=6
+HOMEPAGE=http://www.advancemame.it/
+IUSE=alsa fbcon oss truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 XMAME
+RDEPEND=app-arch/unzip app-arch/zip dev-libs/expat media-libs/libsdl2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) truetype? ( media-libs/freetype:2 )
+SLOT=0
+SRC_URI=https://github.com/amadvance/advancemame/releases/download/v3.7/advancemame-3.7.tar.gz https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch
+_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_=21f8a0a36ec5c2a9e6ed1cab916ce5b4
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest
deleted file mode 100644
index 600b261cab4d..000000000000
--- a/games-emulation/advancemame/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX advancemame-1.2-pic.patch 344 BLAKE2B 61e312fe33565171824e2e875a22187134bfc8905dfa2f6bc50b43427acd0f25502d1da1f7f591c1882e82f37d591c737af0aaaa98705c345637d786886e6c20 SHA512 5ae1a76a5e08e65efece7b295af7e177e8da7d65c7de9a03529d8a6909d38c6510d8c3e122bc4bc542760bc2cdf2e26a1edf56d27bcfa6b1fe25ea9c0f467360
-AUX advancemame-1.2-verboselog.patch 838 BLAKE2B 157d3797c5b92148d35f502fbc76aac9742c21b277d897308e4a074e1cba95b6fe1ea3e6b758be0a8d8b7e10fba5d33f5ac318d7c332f6bf622215627168646e SHA512 d34ff98ff2971a01dd46a66b322507afec4930f89afd2141e753233efeccdc582644dbf576eae08300c8e3be0336e09e56609983bcd602a69a47985ecd954e6e
-AUX advancemame-3.7-move_aclocal_to_acinclude.patch 2277 BLAKE2B f66691900297b845d9b20f93c989d4f31c7e9cd87be5168fc9e716080f6d23bcf590b372df3275149ad28927581d4e406a4bcd3bb6ba1af3b732f97c7f5483f6 SHA512 1ece971e4d51d4ac6e8bcc9b72413b6cb9d19206797131c1ed6af33da3eec18797be128776061a7478dac807dc4e83a75a9495dd0a6c788090f55eb13aeaa89b
-AUX advancemame-3.7-remove_static_configure_option.patch 1076 BLAKE2B 17014295ddf61b910376338998791b645157175b640839ba076c72861cc643c2c5d969139230e7c49ee5e60ce790a100fc3f1612d2370e6bcb3a7a9f37ae4f14 SHA512 b7c1c961c123d8a175325626005c8d2081ba98f0f392dabde795732340f323caf513c6b691790afe254860044fca97cf497209d94dc0ff6e1d98fc8df4bda563
-DIST advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch 21144 BLAKE2B ba374d664db45f938d3b054820868b5aaa63a7461938f5e8a320dc607ef3444c8fc5f87cdd3ef9db130c1048ef9e75afed4f856997f048bcb44eb99d3bcbaefc SHA512 80136d71117329997846fe0f03a3cf3439ee8ff3db649f50a3008595ed2d82cd0e3dcd9c6908edf30e19d516943eeed129eb994a6326effaf94a7eaa5d1b8fa2
-DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74
-EBUILD advancemame-3.7.ebuild 2156 BLAKE2B 269e0044b610bf6c51d2de3cc689c3b4cf6a8529d66b94d08344404ae21eb64c5e225a7651e4639fff08373936a029d3815b32bc461c3706168d18bca7066546 SHA512 0cbe417469a221e735bdfc71b02f1b69e487e9fa903a7ff94a967ef7cc2364966ebf7107985d2cdbfdd760ee5b9492c60e2623782422f20c1e2c7aca1b86ba0d
-MISC metadata.xml 1139 BLAKE2B 0722cccd2aa4d9e24eb990e460c91d8df503c1adffa680ac5e1f2b900bdfc93099feb06aab43b43ce27defc3183c6b75c594ce99e7f1396f5512babfc9de68d0 SHA512 a9a85b10cfbf6c7a75c317db8d242d29655d14d9891b897171161af613221fe93ad776ddb53fcddd14f08295d1e02c3c3fbccdce027e2a0d1c434fe60e49f349
diff --git a/games-emulation/advancemame/advancemame-3.7.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild
deleted file mode 100644
index c371c14107c3..000000000000
--- a/games-emulation/advancemame/advancemame-3.7.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu"
-HOMEPAGE="http://www.advancemame.it/"
-SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz"
-
-# Fetch too big upstream patch
-SRC_URI+=" https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> ${PN}-3.7-use_pkgconfig_for_freetype_and_sdl.patch"
-
-LICENSE="GPL-2 XMAME"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa fbcon oss truetype"
-
-# sdl is required (bug #158417)
-RDEPEND="
-	app-arch/unzip
-	app-arch/zip
-	dev-libs/expat
-	media-libs/libsdl2
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig
-	x86? ( >=dev-lang/nasm-0.98 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2-pic.patch"
-	"${FILESDIR}"/${PN}-1.2-verboselog.patch
-
-	# Patches from upstream
-	"${FILESDIR}/${P}-move_aclocal_to_acinclude.patch"
-	"${DISTDIR}/${P}-use_pkgconfig_for_freetype_and_sdl.patch"
-	"${FILESDIR}/${P}-remove_static_configure_option.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-
-	sed -i -e 's/"-s"//' configure || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config"
-}
-
-src_configure() {
-	# Fix for bug #78030
-	if use ppc; then
-		append-ldflags "-Wl,--relax"
-	fi
-
-	PATH="${PATH}:${T}"
-	econf \
-		--enable-expat \
-		--enable-sdl2 \
-		--disable-sdl \
-		--enable-zlib \
-		--disable-slang \
-		--disable-svgalib \
-		$(use_enable alsa) \
-		$(use_enable fbcon fb) \
-		$(use_enable oss) \
-		$(use_enable truetype freetype) \
-		$(use_enable x86 asm)
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	local f
-
-	for f in adv* ; do
-		if [[ -L "${f}" ]] ; then
-			dobin "${f}"
-		fi
-	done
-
-	insinto "/usr/share/advance"
-	doins support/event.dat
-	keepdir "/usr/share/advance/"{artwork,diff,image,rom,sample,snap}
-
-	dodoc HISTORY README RELEASE
-	cd doc
-	dodoc *.txt
-	HTMLDOCS="*.html" einstalldocs
-
-	for f in *.1 ; do
-		newman ${f} ${f/1/6}
-	done
-}
diff --git a/games-emulation/advancemame/files/advancemame-1.2-pic.patch b/games-emulation/advancemame/files/advancemame-1.2-pic.patch
deleted file mode 100644
index 049befbfac2c..000000000000
--- a/games-emulation/advancemame/files/advancemame-1.2-pic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./advance/blit/blit.c.orig	2004-12-19 01:01:46.039956536 -0500
-+++ ./advance/blit/blit.c	2004-12-19 01:01:19.566981040 -0500
-@@ -28,6 +28,10 @@
-  * do so, delete this exception statement from your version.
-  */
- 
-+#if defined(USE_ASM_INLINE) && defined(__PIC__)
-+# undef USE_ASM_INLINE
-+#endif
-+
- #include "portable.h"
- 
- #include "blit.h"
diff --git a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch b/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch
deleted file mode 100644
index b72c1224e75f..000000000000
--- a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Feb 17 03:39:55 UTC 2013
-Subject: build system
-
-	make build log verbose
-
---- advancemame-1.2/Makefile.in
-+++ advancemame-1.2/Makefile.in
-@@ -77,21 +77,21 @@
- srcdir=@srcdir@
- # Don't add the prefix @. This command must be used also in a shell script
- INSTALL=@INSTALL@
--CC=@@CC@
--CXX=@@CXX@
--LD=@@CC@
--LDXX=@@CXX@
--AR=@@AR@
--ASM=@@ASM@
--RC=@@RC@
-+CC=@CC@
-+CXX=@CXX@
-+LD=@CC@
-+LDXX=@CXX@
-+AR=@AR@
-+ASM=@ASM@
-+RC=@RC@
- LN_S=@@LN_S@
- MD=-@@MKDIR@ -p
- RM=@@RM@ -f
- ECHO=@@ECHO@
--CC_FOR_BUILD=@@CC_FOR_BUILD@
--LD_FOR_BUILD=@@CC_FOR_BUILD@
--CXX_FOR_BUILD=@@CXX_FOR_BUILD@
--LDXX_FOR_BUILD=@@CXX_FOR_BUILD@
-+CC_FOR_BUILD=@CC_FOR_BUILD@
-+LD_FOR_BUILD=@CC_FOR_BUILD@
-+CXX_FOR_BUILD=@CXX_FOR_BUILD@
-+LDXX_FOR_BUILD=@CXX_FOR_BUILD@
- EXE=@EXE@
- EXE_FOR_BUILD=@EXE_FOR_BUILD@
- SDLCFLAGS=@SDLCFLAGS@
-
diff --git a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch
deleted file mode 100644
index 4a30e179ae27..000000000000
--- a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b0edfe1e5bb1a705fad539e5ab1c299d38dcf9d4 Mon Sep 17 00:00:00 2001
-From: Andrea Mazzoleni <amadvance@gmail.com>
-Date: Tue, 8 May 2018 18:55:39 +0200
-Subject: [PATCH 1/3] Use acinclude instead of aclocal
-
-aclocal.m4 is generated automatically, and we don't have to lose the content.
----
- acinclude.m4 | 20 ++++++++++++++++++++
- aclocal.m4   | 29 ++++++++++++-----------------
- 2 files changed, 32 insertions(+), 17 deletions(-)
- create mode 100644 acinclude.m4
-
-diff --git a/acinclude.m4 b/acinclude.m4
-new file mode 100644
-index 00000000..ceed823a
---- /dev/null
-+++ b/acinclude.m4
-@@ -0,0 +1,20 @@
-+dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno)
-+dnl 
-+dnl Shows a message as like "checking wether gcc accepts flag ... no"
-+dnl and executess ifyes or ifno.
-+
-+AC_DEFUN([AC_CHECK_CC_OPT],
-+[
-+AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
-+echo 'void f(){}' > conftest.c
-+if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then
-+  AC_MSG_RESULT([yes])
-+  $2
-+else
-+  AC_MSG_RESULT([no])
-+  $3
-+fi
-+rm -f conftest*
-+])
-+
-+
-diff --git a/aclocal.m4 b/aclocal.m4
-index d6e7b527..56e944be 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,20 +1,15 @@
--dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno)
--dnl 
--dnl Shows a message as like "checking wether gcc accepts flag ... no"
--dnl and executess ifyes or ifno.
-+# generated automatically by aclocal 1.15 -*- Autoconf -*-
- 
--AC_DEFUN(AC_CHECK_CC_OPT,
--[
--AC_MSG_CHECKING([whether ${CC-cc} accepts $1])
--echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then
--  AC_MSG_RESULT([yes])
--  $2
--else
--  AC_MSG_RESULT([no])
--  $3
--fi
--rm -f conftest*
--])
-+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
- 
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-+m4_include([acinclude.m4])
--- 
-2.17.0
-
diff --git a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch
deleted file mode 100644
index 342ba1c5c07a..000000000000
--- a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 890af36a3939f0978af779caa878ddeb44183d8d Mon Sep 17 00:00:00 2001
-From: Andrea Mazzoleni <amadvance@gmail.com>
-Date: Tue, 8 May 2018 19:32:44 +0200
-Subject: [PATCH 3/3] Remove the --enable-static configure option
-
-I doubt it still work and it doesn't make sense anymore.
----
- configure.ac | 10 ----------
- 1 file changed, 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4e609993..1c94e037 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -139,13 +139,6 @@ AC_ARG_ENABLE(
- )
- AC_SUBST([CONF_DEBUG],[$ac_enable_debug])
- 
--AC_ARG_ENABLE(
--	[static],
--	AC_HELP_STRING([--enable-static],[enable static compilation. (default no)]),
--	[ac_enable_static=$enableval],
--	[ac_enable_static=no]
--)
--
- AC_ARG_ENABLE(
- 	[bare],
- 	AC_HELP_STRING([--enable-bare],[enable compilation without drivers. (default no)]),
-@@ -232,9 +225,6 @@ if test $ac_auto_ldflags = yes ; then
- 	else
- 		LDFLAGS="-s"
- 	fi
--	if test $ac_enable_static = yes ; then
--		LDFLAGS="-static $LDFLAGS"
--	fi
- 	if test ! -z $ac_host_ldflags; then
- 		LDFLAGS="$ac_host_ldflags $LDFLAGS"
- 	fi
--- 
-2.17.0
-
diff --git a/games-emulation/advancemame/metadata.xml b/games-emulation/advancemame/metadata.xml
deleted file mode 100644
index 7583d81c6809..000000000000
--- a/games-emulation/advancemame/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-AdvanceMAME and AdvanceMESS are unofficial MAME and MESS versions with an advanced video support for 
-helping the use with TVs, Arcade Monitors, Fixed Frequencies Monitors and also for PC Monitors.
-
-They run in GNU/Linux, Mac OS X, DOS, Windows and in all the other platforms supported by the SDL library.
-
-The main difference compared with the official emulators is that the Advance versions program directly the 
-video board to always get a video mode with the correct size and frequency.
-
-Generally the Advance emulators are able to use a video mode which doesn't require any stretching or other 
-unneeded effects to match the original arcade display. When the stretching is required by hardware 
-limitations you can anyway choice from different types of stretch.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">advancemame</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/advancemenu-2.7 b/games-emulation/advancemenu-2.7
new file mode 100644
index 000000000000..ca1331d839fe
--- /dev/null
+++ b/games-emulation/advancemenu-2.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0 ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 ) x86? ( >=dev-lang/nasm-0.98 ) fbcon? ( virtual/os-headers ) >=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=Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator
+EAPI=5
+HOMEPAGE=http://advancemame.sourceforge.net/menu-readme.html
+IUSE=alsa debug fbcon ncurses oss sdl slang truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0 ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/advancemame/advancemenu-2.7.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b0b6af20ff7d1d532331739d1f47e80
diff --git a/games-emulation/advancemenu-2.9 b/games-emulation/advancemenu-2.9
new file mode 100644
index 000000000000..8d01aec760e3
--- /dev/null
+++ b/games-emulation/advancemenu-2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0 ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 ) x86? ( >=dev-lang/nasm-0.98 ) fbcon? ( virtual/os-headers ) >=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=Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator
+EAPI=6
+HOMEPAGE=http://advancemame.sourceforge.net/menu-readme.html
+IUSE=alsa debug fbcon ncurses oss sdl slang truetype
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat alsa? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0 ) sdl? ( media-libs/libsdl ) slang? ( >=sys-libs/slang-1.4 ) !sdl? ( ( !fbcon? ( media-libs/libsdl ) ) ) truetype? ( >=media-libs/freetype-2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/advancemame/advancemenu-2.9.tar.gz https://dev.gentoo.org/~polynomial-c/advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=a4999a03de302e59874ef5b15c0cd998
diff --git a/games-emulation/advancemenu/Manifest b/games-emulation/advancemenu/Manifest
deleted file mode 100644
index 09387f7aa4b8..000000000000
--- a/games-emulation/advancemenu/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX advancemenu-2.7-alsa-pkg-config.patch 458 BLAKE2B 74b2d6bc6d5aca8cb2ea70b51ecbe3acfdb735f8dea5bc28696079c28a83877296dcbfc57457822a87ac25d25538af0d4d9726d3e026335f6f3cb1e489771b6c SHA512 d1a97d71ea9e5e412db22925a613f59848486586f5635a60fb0acce376b8c6217ef09a6228dfc39b604294b99e3136a849cb9124b55606e32d9e10c48cb9111e
-AUX advancemenu-2.7-pic.patch 272 BLAKE2B 9e486e8d1eb5e1073252e4484ff02dcbe1b2cceab1b4defb678ef6190e3e5604e3d06142dc9da55b16bb82a069f979943fb460d2b352b66fd55cb96ef9b6bfc8 SHA512 600ac7607374ab2e7654303b8205ac737c7b7aae41c23ea1bd005943361df5579207a91658ec4f3ab9f5f802d87d65336efed71894e2e87c0ce19200c769df9b
-AUX advancemenu-2.9-destdir.patch 3419 BLAKE2B 816edf68becb74022e879ea8812d2ba56d2071cdd6167b556c0805566e49c0025051272c951180f609e13f76afc596e3c7af93c00afa240626399c910e714051 SHA512 8fcf78ae0c1eebe672f0f823a98cdd8afef4efa1fccaa10f50131c577629a1f013c397267c6f990537efc5f6491726454e886c5db1c88245cad0a30b6c8c809f
-DIST advancemenu-2.7.tar.gz 2371297 BLAKE2B 43b468f963ecc2ef99766cf9177d7da2edb4c7497f62d9344e80f6c54f2c082ddef294697b7f6438b2959eefc27ca2c05e5744019c55c9f88f59155507622582 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb
-DIST advancemenu-2.9-use_pkgconfig_for_freetype_and_sdl.patch 18514 BLAKE2B b20922280c72ec151c3611ab3247391bd85785ee3db92d4bbd88ed0f0e50a8351a2b0cc63c2bf10aabba8a2bf57bcc5392230af1ed0eaabbfb28f5e34bc4785c SHA512 f68c2b42b48a9e768ecda54b0319148ed5503670f19be5cd4b23f150c6df9a43a053a0e64c8906836f461b49986c650f7e9f3952a5cf1309db66a79ea061123c
-DIST advancemenu-2.9.tar.gz 2515021 BLAKE2B caccbd311b43699766f2928c78983e7c3c45149d8733ea0795212c4f204828a8f4f22d05becd891947d9adce90d009e4d9b01ebfb0b5698ee9411a09d51c26b7 SHA512 ad19970ac9682b03fcfac36ab71cac1ce43aa88b7323ab6ce3a13ae45a29161cd654ce516115e6a441987055b0e9a47d15abae8ca9875753b81f5d7799908386
-EBUILD advancemenu-2.7.ebuild 2294 BLAKE2B a51023d7f931bb1b3ef47bcade4971bc8cfaae9a765c05b674de241a3155248e8faddf2437499818b866896f21a621069ffe5cc1bb78aa05ac98e09e3e47fb51 SHA512 2185634d2eeccb14800fddd08e88c39aab3c09acd1811ce5ebb161eee12e86933645dbdbdbb75af81146dadd1d54068393923602dfeb03c8fa6d0f4461f5dcec
-EBUILD advancemenu-2.9.ebuild 2237 BLAKE2B a8c0fe65acfcdb17e0d2610e8cf62018cc47557a7026f223deef2d125dacacb748859a0e39003d1c1f01c16e9a414f604d4ceb8c1a1dbe889c8ccced0e6d05ac SHA512 b657f77cbd4ca97be357a0ca56a30b84898a193d2440432c81769acc44f822e0969fb6aeaf620e4ee84515ef3c72dea78cd0b9d39215ca53e32304c6bc5e2046
-MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancemenu/advancemenu-2.7.ebuild b/games-emulation/advancemenu/advancemenu-2.7.ebuild
deleted file mode 100644
index 52e1f2e5ecd9..000000000000
--- a/games-emulation/advancemenu/advancemenu-2.7.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
-HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
-
-RDEPEND="dev-libs/expat
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:0 )
-	sdl? ( media-libs/libsdl )
-	slang? ( >=sys-libs/slang-1.4 )
-	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x86? ( >=dev-lang/nasm-0.98 )
-	fbcon? ( virtual/os-headers )"
-
-src_prepare() {
-	# pic patch - bug #142021
-	epatch \
-		"${FILESDIR}"/${P}-alsa-pkg-config.patch \
-		"${FILESDIR}"/${P}-pic.patch
-	sed -i -e 's/"-s"//' configure.ac || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	use sdl && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use !sdl && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
-	use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="${PATH}:${T}"
-	egamesconf \
-		--enable-expat \
-		--enable-zlib \
-		--disable-svgalib \
-		--disable-static \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable fbcon fb) \
-		$(use_enable ncurses) \
-		$(use_enable truetype freetype) \
-		$(use_enable oss) \
-		$(use_enable sdl) \
-		$(use_enable slang) \
-		$(use !sdl && use !fbcon && echo --enable-sdl) \
-		$(use_enable x86 asm)
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	dogamesbin advmenu
-	dodoc HISTORY README RELEASE doc/*.txt
-	doman doc/{advmenu,advdev}.1
-	dohtml doc/*.html
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Execute:"
-	elog "     advmenu -default"
-	elog "to generate a config file"
-	elog
-	elog "An example emulator config found in advmenu.rc:"
-	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
-	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
-	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
-	elog
-	elog "For more information, see the advmenu man page."
-}
diff --git a/games-emulation/advancemenu/advancemenu-2.9.ebuild b/games-emulation/advancemenu/advancemenu-2.9.ebuild
deleted file mode 100644
index 532a8cfeca85..000000000000
--- a/games-emulation/advancemenu/advancemenu-2.9.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Frontend for AdvanceMAME, MAME, MESS, RAINE and any other emulator"
-HOMEPAGE="http://advancemame.sourceforge.net/menu-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-# Too big to put into FILESDIR
-SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug fbcon ncurses oss sdl slang truetype"
-
-RDEPEND="dev-libs/expat
-	alsa? ( media-libs/alsa-lib )
-	ncurses? ( sys-libs/ncurses:0 )
-	sdl? ( media-libs/libsdl )
-	slang? ( >=sys-libs/slang-1.4 )
-	!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
-	truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
-	x86? ( >=dev-lang/nasm-0.98 )
-	fbcon? ( virtual/os-headers )"
-
-PATCHES=(
-	# pic patch - bug #142021
-	"${FILESDIR}"/${PN}-2.7-pic.patch
-	"${FILESDIR}/${PN}-2.9-destdir.patch"
-	"${DISTDIR}/${PN}-2.9-use_pkgconfig_for_freetype_and_sdl.patch"
-)
-
-src_prepare() {
-	default
-	sed -i -e 's/"-s"//' configure.ac || die
-
-	use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
-	eautoreconf
-}
-
-src_configure() {
-	export PATH="${PATH}:${T}"
-	local myeconfargs=(
-		--enable-expat
-		--enable-zlib
-		--disable-svgalib
-		$(use_enable alsa)
-		$(use_enable debug)
-		$(use_enable fbcon fb)
-		$(use_enable ncurses)
-		$(use_enable truetype freetype)
-		$(use_enable oss)
-		$(use_enable sdl)
-		$(use_enable slang)
-		$(use !sdl && use !fbcon && echo --enable-sdl)
-		$(use_enable x86 asm)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	STRIPPROG=true emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc HISTORY README RELEASE doc/*.txt
-	doman doc/{advmenu,advdev}.1
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-	echo
-	elog "Execute:"
-	elog "     advmenu -default"
-	elog "to generate a config file"
-	elog
-	elog "An example emulator config found in advmenu.rc:"
-	elog "     emulator \"snes9x\" generic \"${GAMES_BINDIR}/snes9x\" \"%f\""
-	elog "     emulator_roms \"snes9x\" \"/home/user/myroms\""
-	elog "     emulator_roms_filter \"snes9x\" \"*.smc;*.sfc\""
-	elog
-	elog "For more information, see the advmenu man page."
-}
diff --git a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch b/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
deleted file mode 100644
index 1b0f8a8df9cb..000000000000
--- a/games-emulation/advancemenu/files/advancemenu-2.7-alsa-pkg-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- advancemenu-2.6.orig/configure.ac
-+++ advancemenu-2.6/configure.ac
-@@ -512,7 +512,7 @@
- 		[snd_pcm_open],
- 		[ac_lib_alsa=yes],
- 		[ac_lib_alsa=no],
--		[-lm]
-+		[`pkg-config alsa --libs`]
- 	)
- 	if test $ac_lib_alsa = yes; then
- 		AC_MSG_CHECKING([for ALSA])
-@@ -531,7 +531,7 @@
- 		[snd_pcm_open],
- 		[],
- 		[AC_MSG_ERROR([the ALSA library is missing])],
--		[-lm]
-+		[`pkg-config alsa --libs`]
- 	)
- 	AC_MSG_CHECKING([for ALSA version])
- 	AC_TRY_COMPILE([
diff --git a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch b/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
deleted file mode 100644
index 62f073bed83b..000000000000
--- a/games-emulation/advancemenu/files/advancemenu-2.7-pic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./advance/blit/blit.c.orig
-+++ ./advance/blit/blit.c
-@@ -28,6 +28,10 @@
-  * do so, delete this exception statement from your version.
-  */
- 
-+#if defined(USE_ASM_INLINE) && defined(__PIC__)
-+# undef USE_ASM_INLINE
-+#endif
-+
- #include "portable.h"
- 
- #include "blit.h"
diff --git a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch b/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
deleted file mode 100644
index 9ebef883ae25..000000000000
--- a/games-emulation/advancemenu/files/advancemenu-2.9-destdir.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- advancemenu-2.9/advance/advance.mak
-+++ advancemenu-2.9/advance/advance.mak
-@@ -284,45 +284,45 @@
- # Common install
- 
- pkgdir = $(datadir)/advance
--pkgdocdir = $(docdir)/advance
-+pkgdocdir = $(docdir)
- 
- install-dirs:
--	-$(INSTALL_PROGRAM_DIR) $(bindir)
--	-$(INSTALL_DATA_DIR) $(pkgdir)
--	-$(INSTALL_DATA_DIR) $(pkgdocdir)
--	-$(INSTALL_MAN_DIR) $(mandir)/man1
-+	-$(INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdocdir)
-+	-$(INSTALL_MAN_DIR) $(DESTDIR)$(mandir)/man1
- ifneq ($(wildcard $(EMUSRC)),)
--	-$(INSTALL_DATA_DIR) $(pkgdir)/rom
--	-$(INSTALL_DATA_DIR) $(pkgdir)/sample
--	-$(INSTALL_DATA_DIR) $(pkgdir)/artwork
--	-$(INSTALL_DATA_DIR) $(pkgdir)/image
--	-$(INSTALL_DATA_DIR) $(pkgdir)/crc
--	-$(INSTALL_DATA_DIR) $(pkgdir)/snap
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/rom
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/sample
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/artwork
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/image
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/crc
-+	-$(INSTALL_DATA_DIR) $(DESTDIR)$(pkgdir)/snap
- endif
- 
- install-data: $(INSTALL_DATAFILES) $(INSTALL_ROMFILES) $(INSTALL_SAMPLEFILES) $(INSTALL_SNAPFILES)
- ifdef INSTALL_DATAFILES
- 	@for i in $(INSTALL_DATAFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)"; \
--		$(INSTALL_DATA) $$i $(pkgdir); \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir); \
- 	done
- endif
- ifdef INSTALL_ROMFILES
- 	@for i in $(INSTALL_ROMFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/rom"; \
--		$(INSTALL_DATA) $$i $(pkgdir)/rom; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/rom; \
- 	done
- endif
- ifdef INSTALL_SAMPLEFILES
- 	@for i in $(INSTALL_SAMPLEFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/sample"; \
--		$(INSTALL_DATA) $$i $(pkgdir)/sample; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/sample; \
- 	done
- endif
- ifdef INSTALL_SNAPFILES
- 	@for i in $(INSTALL_SNAPFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdir)/snap"; \
--		$(INSTALL_DATA) $$i $(pkgdir)/snap; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdir)/snap; \
- 	done
- endif
- 
-@@ -351,7 +351,7 @@
- install-bin: $(INSTALL_BINFILES)
- 	@for i in $(INSTALL_BINFILES); do \
- 		echo "$(INSTALL_PROGRAM) $$i $(bindir)"; \
--		$(INSTALL_PROGRAM) $$i $(bindir); \
-+		$(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
- 	done
- 
- uninstall-bin:
-@@ -363,7 +363,7 @@
- ifdef INSTALL_DOCFILES
- 	@for i in $(INSTALL_DOCFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(pkgdocdir)"; \
--		$(INSTALL_DATA) $$i $(pkgdocdir); \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(pkgdocdir); \
- 	done
- endif
- 
-@@ -378,7 +378,7 @@
- ifdef INSTALL_MANFILES
- 	@for i in $(INSTALL_MANFILES); do \
- 		echo "$(INSTALL_DATA) $$i $(mandir)/man1"; \
--		$(INSTALL_DATA) $$i $(mandir)/man1; \
-+		$(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/man1; \
- 	done
- endif
- 
-@@ -401,7 +401,7 @@
- 	-rmdir $(pkgdocdir)
- endif
- 
--install: install-dirs install-bin install-data install-doc install-man
-+install: install-dirs install-bin install-data
- 
- uninstall: uninstall-bin uninstall-data uninstall-doc uninstall-man uninstall-dirs
- 
---- advancemenu-2.9/configure.ac
-+++ advancemenu-2.9/configure.ac
-@@ -1158,8 +1158,8 @@
- 
- dnl Final
- AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
--AC_SUBST([mandir],['${prefix}/man'])
--AC_SUBST([docdir],['${prefix}/doc'])
-+AC_SUBST([mandir],['${prefix}/share/man'])
-+AC_SUBST([docdir],['${prefix}/share/doc/${PF}'])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
- 
diff --git a/games-emulation/advancemenu/metadata.xml b/games-emulation/advancemenu/metadata.xml
deleted file mode 100644
index 879ee3497adc..000000000000
--- a/games-emulation/advancemenu/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">advancemame</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/advancescan-1.16-r1 b/games-emulation/advancescan-1.16-r1
new file mode 100644
index 000000000000..643884251555
--- /dev/null
+++ b/games-emulation/advancescan-1.16-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-libs/expat sys-libs/zlib >=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 command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine
+EAPI=6
+HOMEPAGE=http://advancemame.sourceforge.net/scan-readme.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/advancemame/advancescan-1.16.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_=4b0aabdd30827471ee333ad279753be3
diff --git a/games-emulation/advancescan/Manifest b/games-emulation/advancescan/Manifest
deleted file mode 100644
index be6ff5210622..000000000000
--- a/games-emulation/advancescan/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX advancescan-1.16-gcc6.patch 24440 BLAKE2B bd7b25859798cc3935fedc6d60ea822189301232426e2b071665aaf6af3a85f16d93c22373e8ad1b46da96ab577fceebe681e86021452aa20e24b0e0fd9b2a8a SHA512 e758ba7d900f1ca5fd6f32c3572fbf4c2a7cf77877f926511bd724ec5ec8ddb9697244f5a582eeb5275188ae2c8a14e8388cac93365ac348e9cc60835884a499
-AUX advancescan-1.16-sys-expat.patch 1543 BLAKE2B 72143e1dec74c828c4051a5b198f706caf3385e1a982eca142fd6f2f4c7a2f3797fb732fd1086b4f3c5cf93560f67077720c14945f52ed388ce981db559230c4 SHA512 a9dc80b75a8b9dbad3fe6c156c4de0cafee171d820845ea7ff2f042b7f73fd6cd10d710c60fb8bf4cfdea139f527008958b445d01838a8fdf6c96d3e76c530f4
-DIST advancescan-1.16.tar.gz 316895 BLAKE2B 1ce2ec88a80cca8ff8d1fa09cba7b9c5583e42a3419bfd561bb184b53fe071c011b864ee813f0107667881112ca4adf01cd2b8e8148712927af1c82bc73f43c1 SHA512 6d359c160d54a0a1cd13db10f5fc9986fae4f1151e205024e40c21b0f933723351907156faec22a92561ad523151e3b7d4ff70a6eebbb6152bd3767063a31031
-EBUILD advancescan-1.16-r1.ebuild 752 BLAKE2B 5929dc6fe1808098966a167e1c82441aa3b105c1b27e4e98e7fbfea03607f35d319d76b8e9da9b39aaabb5f59a833594a8dcf7d014683e446766f932c02f8559 SHA512 70fd6345547813dc994b66a135badf8d0f85ff862dffe4a14cc0ebb2119a303e569b46059b6c1c88182253b73e2164f3171a62039e70f3cde954b8ff1066d2e4
-MISC metadata.xml 334 BLAKE2B 9c8f19757cfe814fe5650009b03d9eb653e3937cf30b4288dfa616a894560bdc81edba8b1ad235f34f5200a2c7ae8e9b19ba0e9f1e0ec5a2560b806ac9e184d8 SHA512 18cabfd831489b32b4449794c06a28425d91dab0c2868038fb48c94728fc16ccca268ae93a4f4a51be01c5901591582e6df2523460ba4ba98719436944577e1f
diff --git a/games-emulation/advancescan/advancescan-1.16-r1.ebuild b/games-emulation/advancescan/advancescan-1.16-r1.ebuild
deleted file mode 100644
index 46c0c1379bcb..000000000000
--- a/games-emulation/advancescan/advancescan-1.16-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="A command line rom manager for MAME, MESS, AdvanceMAME, AdvanceMESS and Raine"
-HOMEPAGE="http://advancemame.sourceforge.net/scan-readme.html"
-SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/expat
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sys-expat.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	rm -rf expat
-	default
-	eautoreconf
-}
-
-src_install() {
-	dobin advscan advdiff
-	dodoc AUTHORS HISTORY README doc/*.txt advscan.rc.linux
-	doman doc/{advscan,advdiff}.1
-	dohtml doc/*.html
-}
diff --git a/games-emulation/advancescan/files/advancescan-1.16-gcc6.patch b/games-emulation/advancescan/files/advancescan-1.16-gcc6.patch
deleted file mode 100644
index 1f9c73f6db60..000000000000
--- a/games-emulation/advancescan/files/advancescan-1.16-gcc6.patch
+++ /dev/null
@@ -1,520 +0,0 @@
---- advancescan-1.16/analyze.cc.old	2016-09-25 19:17:21.698171287 -0400
-+++ advancescan-1.16/analyze.cc	2016-09-25 19:22:12.027465540 -0400
-@@ -33,467 +33,6 @@
- { 0, 0, 0 }
- };
- 
--char MAMEDK_DATA[] = {
--	0x2e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2e, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x5f, 0x20,
--	0x5f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x5f, 0x20, 0x5f, 0x5f, 0x20, 0x5f,
--	0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x20,
--	0x5f, 0x20, 0x5f, 0x20, 0x5f, 0x5f, 0x20, 0x5f,
--	0x5f, 0x5f, 0x20, 0x20, 0x20, 0x5f, 0x5f, 0x5f,
--	0x20, 0x20, 0x20, 0x5f, 0x5f, 0x7c, 0x20, 0x7c,
--	0x20, 0x7c, 0x20, 0x5f, 0x5f, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x7c, 0x20, 0x27, 0x5f, 0x20, 0x60, 0x20,
--	0x5f, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x5f, 0x60,
--	0x20, 0x7c, 0x20, 0x27, 0x5f, 0x20, 0x60, 0x20,
--	0x5f, 0x20, 0x5c, 0x20, 0x2f, 0x20, 0x5f, 0x20,
--	0x5c, 0x20, 0x2f, 0x20, 0x5f, 0x60, 0x20, 0x7c,
--	0x20, 0x7c, 0x2f, 0x20, 0x2f, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x28, 0x5f, 0x7c,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c, 0x20, 0x7c,
--	0x20, 0x7c, 0x20, 0x7c, 0x20, 0x20, 0x5f, 0x5f,
--	0x2f, 0x7c, 0x20, 0x28, 0x5f, 0x7c, 0x20, 0x7c,
--	0x20, 0x20, 0x20, 0x3c, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c,
--	0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x2c,
--	0x5f, 0x7c, 0x5f, 0x7c, 0x20, 0x7c, 0x5f, 0x7c,
--	0x20, 0x7c, 0x5f, 0x7c, 0x5c, 0x5f, 0x5f, 0x5f,
--	0x28, 0x5f, 0x29, 0x5f, 0x5f, 0x2c, 0x5f, 0x7c,
--	0x5f, 0x7c, 0x5c, 0x5f, 0x5c, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x74,
--	0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77,
--	0x2e, 0x6d, 0x61, 0x6d, 0x65, 0x2e, 0x64, 0x6b,
--	0x2f, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x3e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x3c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x70, 0x72, 0x6f, 0x75, 0x64, 0x6c, 0x79,
--	0x20, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74,
--	0x73, 0x20, 0x72, 0x61, 0x66, 0x6c, 0x65, 0x73,
--	0x69, 0x61, 0x2e, 0x7a, 0x69, 0x70, 0x20, 0x66,
--	0x6f, 0x72, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20,
--	0x6d, 0x61, 0x6d, 0x65, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x22, 0x52, 0x61, 0x66, 0x66, 0x6c, 0x65,
--	0x73, 0x69, 0x61, 0x22, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69, 0x73,
--	0x20, 0x63, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67,
--	0x68, 0x74, 0x65, 0x64, 0x20, 0x62, 0x79, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x43, 0x6f, 0x72,
--	0x65, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x2f, 0x20,
--	0x53, 0x65, 0x67, 0x61, 0x20, 0x31, 0x39, 0x38,
--	0x36, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x3e, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x3c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f,
--	0x75, 0x20, 0x6d, 0x61, 0x79, 0x20, 0x68, 0x61,
--	0x76, 0x65, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20,
--	0x67, 0x61, 0x6d, 0x65, 0x20, 0x52, 0x4f, 0x4d,
--	0x20, 0x4f, 0x4e, 0x4c, 0x59, 0x20, 0x69, 0x66,
--	0x20, 0x79, 0x6f, 0x75, 0x20, 0x61, 0x72, 0x65,
--	0x20, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x6c, 0x79,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x6c, 0x65,
--	0x64, 0x20, 0x73, 0x6f, 0x2e, 0x20, 0x42, 0x79,
--	0x20, 0x22, 0x6c, 0x65, 0x67, 0x61, 0x6c, 0x6c,
--	0x79, 0x20, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x6c,
--	0x65, 0x64, 0x22, 0x20, 0x77, 0x65, 0x20, 0x6d,
--	0x65, 0x61, 0x6e, 0x3a, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f,
--	0x75, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x61, 0x63, 0x74, 0x75, 0x61, 0x6c,
--	0x20, 0x61, 0x72, 0x63, 0x61, 0x64, 0x65, 0x20,
--	0x6f, 0x72, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x70,
--	0x61, 0x6b, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x20,
--	0x52, 0x4f, 0x4d, 0x20, 0x79, 0x6f, 0x75, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x61,
--	0x72, 0x65, 0x20, 0x64, 0x6f, 0x77, 0x6e, 0x6c,
--	0x6f, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x20,
--	0x55, 0x6e, 0x64, 0x65, 0x72, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x63, 0x6f, 0x70, 0x79, 0x72, 0x69,
--	0x67, 0x68, 0x74, 0x20, 0x6c, 0x61, 0x77, 0x73,
--	0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x55, 0x2e, 0x53, 0x2e, 0x2c, 0x20, 0x79, 0x6f,
--	0x75, 0x20, 0x61, 0x72, 0x65, 0x20, 0x65, 0x6e,
--	0x74, 0x69, 0x74, 0x6c, 0x65, 0x64, 0x20, 0x74,
--	0x6f, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x61, 0x20,
--	0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x20, 0x6f,
--	0x66, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x73,
--	0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x20,
--	0x79, 0x6f, 0x75, 0x20, 0x68, 0x61, 0x76, 0x65,
--	0x20, 0x70, 0x61, 0x69, 0x64, 0x20, 0x66, 0x6f,
--	0x72, 0x2e, 0x20, 0x53, 0x69, 0x6e, 0x63, 0x65,
--	0x20, 0x52, 0x4f, 0x4d, 0x53, 0x20, 0x63, 0x61,
--	0x6e, 0x27, 0x74, 0x20, 0x62, 0x65, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x64, 0x75, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
--	0x65, 0x64, 0x20, 0x28, 0x6e, 0x6f, 0x74, 0x20,
--	0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20,
--	0x73, 0x70, 0x65, 0x63, 0x69, 0x61, 0x6c, 0x20,
--	0x68, 0x61, 0x72, 0x64, 0x77, 0x61, 0x72, 0x65,
--	0x29, 0x2c, 0x20, 0x52, 0x4f, 0x4d, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x69,
--	0x6d, 0x61, 0x67, 0x65, 0x73, 0x20, 0x61, 0x72,
--	0x65, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64,
--	0x65, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63,
--	0x20, 0x61, 0x73, 0x20, 0x61, 0x20, 0x73, 0x65,
--	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x52, 0x65, 0x6d,
--	0x65, 0x6d, 0x62, 0x65, 0x72, 0x2c, 0x20, 0x74,
--	0x68, 0x65, 0x20, 0x70, 0x75, 0x72, 0x70, 0x6f,
--	0x73, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x61, 0x6e,
--	0x20, 0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x6f,
--	0x72, 0x20, 0x69, 0x73, 0x20, 0x74, 0x6f, 0x20,
--	0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x67, 0x61,
--	0x6d, 0x65, 0x73, 0x20, 0x28, 0x73, 0x6f, 0x20,
--	0x74, 0x68, 0x61, 0x74, 0x20, 0x74, 0x68, 0x65,
--	0x79, 0x20, 0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20,
--	0x64, 0x69, 0x73, 0x73, 0x61, 0x70, 0x70, 0x65,
--	0x61, 0x72, 0x29, 0x2c, 0x20, 0x74, 0x6f, 0x20,
--	0x68, 0x61, 0x76, 0x65, 0x20, 0x61, 0x6c, 0x6c,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x79, 0x6f, 0x75,
--	0x72, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x20,
--	0x6f, 0x6e, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20,
--	0x50, 0x43, 0x20, 0x28, 0x73, 0x6f, 0x20, 0x74,
--	0x68, 0x61, 0x74, 0x20, 0x79, 0x6f, 0x75, 0x20,
--	0x64, 0x6f, 0x6e, 0x27, 0x74, 0x20, 0x74, 0x69,
--	0x65, 0x20, 0x75, 0x70, 0x20, 0x74, 0x68, 0x65,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x66, 0x61, 0x6d,
--	0x69, 0x6c, 0x79, 0x20, 0x54, 0x56, 0x29, 0x20,
--	0x61, 0x6e, 0x64, 0x20, 0x74, 0x6f, 0x20, 0x6b,
--	0x65, 0x65, 0x70, 0x20, 0x61, 0x20, 0x62, 0x61,
--	0x63, 0x6b, 0x75, 0x70, 0x20, 0x6f, 0x66, 0x20,
--	0x67, 0x61, 0x6d, 0x65, 0x73, 0x20, 0x79, 0x6f,
--	0x75, 0x20, 0x6f, 0x77, 0x6e, 0x20, 0x69, 0x6e,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63,
--	0x61, 0x73, 0x65, 0x20, 0x74, 0x68, 0x65, 0x20,
--	0x67, 0x61, 0x6d, 0x65, 0x20, 0x28, 0x6f, 0x72,
--	0x20, 0x61, 0x72, 0x63, 0x61, 0x64, 0x65, 0x2f,
--	0x68, 0x6f, 0x6d, 0x65, 0x20, 0x63, 0x6f, 0x6e,
--	0x73, 0x6f, 0x6c, 0x65, 0x29, 0x20, 0x66, 0x61,
--	0x69, 0x6c, 0x73, 0x20, 0x6f, 0x72, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x68, 0x61, 0x76,
--	0x65, 0x20, 0x61, 0x6c, 0x72, 0x65, 0x61, 0x64,
--	0x79, 0x20, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64,
--	0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x49, 0x74, 0x27, 0x73,
--	0x20, 0x66, 0x6f, 0x72, 0x20, 0x65, 0x64, 0x75,
--	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c,
--	0x20, 0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65,
--	0x73, 0x20, 0x6f, 0x6e, 0x6c, 0x79, 0x20, 0x28,
--	0x69, 0x6e, 0x20, 0x63, 0x61, 0x73, 0x65, 0x20,
--	0x79, 0x6f, 0x75, 0x20, 0x61, 0x72, 0x65, 0x20,
--	0x61, 0x6e, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x65, 0x6d, 0x75, 0x6c,
--	0x61, 0x74, 0x6f, 0x72, 0x20, 0x70, 0x72, 0x6f,
--	0x67, 0x72, 0x61, 0x6d, 0x6d, 0x65, 0x72, 0x29,
--	0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f, 0x75,
--	0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x4e, 0x45,
--	0x56, 0x45, 0x52, 0x20, 0x73, 0x65, 0x6c, 0x6c,
--	0x20, 0x74, 0x68, 0x65, 0x73, 0x65, 0x20, 0x52,
--	0x4f, 0x4d, 0x53, 0x20, 0x66, 0x6f, 0x72, 0x20,
--	0x70, 0x72, 0x6f, 0x66, 0x69, 0x74, 0x2e, 0x20,
--	0x4d, 0x6f, 0x73, 0x74, 0x20, 0x67, 0x61, 0x6d,
--	0x65, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6d, 0x70,
--	0x61, 0x6e, 0x69, 0x65, 0x73, 0x20, 0x64, 0x6f,
--	0x6e, 0x27, 0x74, 0x20, 0x6d, 0x69, 0x6e, 0x64,
--	0x20, 0x74, 0x68, 0x65, 0x20, 0x64, 0x69, 0x73,
--	0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f,
--	0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65,
--	0x69, 0x72, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x27,
--	0x73, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x52,
--	0x4f, 0x4d, 0x53, 0x20, 0x62, 0x65, 0x63, 0x61,
--	0x75, 0x73, 0x65, 0x20, 0x74, 0x68, 0x65, 0x79,
--	0x20, 0x6e, 0x6f, 0x20, 0x6c, 0x6f, 0x6e, 0x67,
--	0x65, 0x72, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74,
--	0x2c, 0x20, 0x62, 0x75, 0x74, 0x20, 0x74, 0x68,
--	0x65, 0x79, 0x20, 0x57, 0x49, 0x4c, 0x4c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x6d, 0x69, 0x6e, 0x64, 0x20, 0x69, 0x66,
--	0x20, 0x73, 0x6f, 0x6d, 0x65, 0x6f, 0x6e, 0x65,
--	0x20, 0x73, 0x65, 0x6c, 0x6c, 0x73, 0x20, 0x74,
--	0x68, 0x65, 0x6d, 0x2e, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f, 0x75,
--	0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x4e, 0x4f,
--	0x54, 0x20, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69,
--	0x62, 0x75, 0x74, 0x65, 0x20, 0x52, 0x4f, 0x4d,
--	0x53, 0x20, 0x74, 0x6f, 0x67, 0x65, 0x74, 0x68,
--	0x65, 0x72, 0x20, 0x77, 0x69, 0x74, 0x68, 0x20,
--	0x65, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x6f, 0x72,
--	0x73, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x61, 0x73, 0x20,
--	0x61, 0x20, 0x70, 0x61, 0x63, 0x6b, 0x61, 0x67,
--	0x65, 0x2e, 0x20, 0x41, 0x6e, 0x64, 0x20, 0x61,
--	0x67, 0x61, 0x69, 0x6e, 0x2c, 0x20, 0x4e, 0x4f,
--	0x20, 0x73, 0x65, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
--	0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x59, 0x6f,
--	0x75, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x4e,
--	0x45, 0x56, 0x45, 0x52, 0x20, 0x68, 0x6f, 0x6c,
--	0x64, 0x20, 0x6d, 0x61, 0x6d, 0x65, 0x2e, 0x64,
--	0x6b, 0x20, 0x28, 0x69, 0x6e, 0x63, 0x6c, 0x75,
--	0x64, 0x69, 0x6e, 0x67, 0x20, 0x69, 0x74, 0x73,
--	0x20, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x63,
--	0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x79, 0x2c, 0x20,
--	0x77, 0x65, 0x62, 0x6d, 0x61, 0x73, 0x74, 0x65,
--	0x72, 0x73, 0x2c, 0x20, 0x65, 0x6d, 0x70, 0x6c,
--	0x6f, 0x79, 0x65, 0x65, 0x73, 0x2c, 0x20, 0x73,
--	0x74, 0x61, 0x66, 0x66, 0x20, 0x6f, 0x72, 0x20,
--	0x61, 0x6e, 0x79, 0x62, 0x6f, 0x64, 0x79, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x65, 0x6c, 0x73, 0x65, 0x20, 0x72, 0x65, 0x6c,
--	0x61, 0x74, 0x65, 0x64, 0x20, 0x74, 0x6f, 0x20,
--	0x74, 0x68, 0x69, 0x73, 0x20, 0x77, 0x65, 0x62,
--	0x73, 0x69, 0x74, 0x65, 0x29, 0x20, 0x6f, 0x72,
--	0x20, 0x6f, 0x75, 0x72, 0x20, 0x77, 0x65, 0x62,
--	0x68, 0x6f, 0x73, 0x74, 0x73, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x72, 0x65,
--	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x69, 0x62, 0x6c,
--	0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x61, 0x6e,
--	0x79, 0x20, 0x64, 0x61, 0x6d, 0x61, 0x67, 0x65,
--	0x20, 0x63, 0x61, 0x75, 0x73, 0x65, 0x64, 0x20,
--	0x74, 0x6f, 0x20, 0x79, 0x6f, 0x75, 0x72, 0x20,
--	0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66,
--	0x6f, 0x72, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6c,
--	0x65, 0x67, 0x61, 0x6c, 0x20, 0x61, 0x63, 0x74,
--	0x69, 0x6f, 0x6e, 0x73, 0x20, 0x74, 0x61, 0x6b,
--	0x65, 0x6e, 0x20, 0x61, 0x67, 0x61, 0x69, 0x6e,
--	0x73, 0x74, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x66,
--	0x6f, 0x72, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x6f, 0x62, 0x65, 0x79, 0x69,
--	0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, 0x20, 0x61,
--	0x62, 0x6f, 0x76, 0x65, 0x20, 0x73, 0x74, 0x61,
--	0x74, 0x65, 0x64, 0x20, 0x72, 0x75, 0x6c, 0x65,
--	0x73, 0x2c, 0x20, 0x6f, 0x72, 0x20, 0x66, 0x6f,
--	0x72, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6f, 0x74,
--	0x68, 0x65, 0x72, 0x20, 0x72, 0x65, 0x61, 0x73,
--	0x6f, 0x6e, 0x2e, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6d,
--	0x61, 0x6d, 0x65, 0x2e, 0x64, 0x6b, 0x20, 0x68,
--	0x61, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x64,
--	0x75, 0x6d, 0x70, 0x65, 0x64, 0x20, 0x74, 0x68,
--	0x65, 0x20, 0x52, 0x4f, 0x4d, 0x53, 0x20, 0x6f,
--	0x6e, 0x20, 0x74, 0x68, 0x69, 0x73, 0x20, 0x77,
--	0x65, 0x62, 0x73, 0x69, 0x74, 0x65, 0x2c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x61, 0x6e, 0x64, 0x20, 0x6f, 0x75, 0x72, 0x20,
--	0x70, 0x75, 0x72, 0x70, 0x6f, 0x73, 0x65, 0x20,
--	0x69, 0x73, 0x20, 0x74, 0x6f, 0x20, 0x70, 0x72,
--	0x6f, 0x76, 0x69, 0x64, 0x65, 0x20, 0x61, 0x20,
--	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x20,
--	0x74, 0x6f, 0x20, 0x74, 0x68, 0x65, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x49,
--	0x6e, 0x74, 0x65, 0x72, 0x6e, 0x65, 0x74, 0x20,
--	0x61, 0x6e, 0x64, 0x20, 0x67, 0x61, 0x6d, 0x69,
--	0x6e, 0x67, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x75,
--	0x6e, 0x69, 0x74, 0x79, 0x2e, 0x20, 0x4e, 0x6f,
--	0x20, 0x68, 0x61, 0x72, 0x6d, 0x20, 0x69, 0x73,
--	0x20, 0x62, 0x65, 0x69, 0x6e, 0x67, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x64, 0x6f, 0x6e, 0x65, 0x20, 0x74, 0x6f,
--	0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x63, 0x6f,
--	0x6d, 0x70, 0x61, 0x6e, 0x69, 0x65, 0x73, 0x2c,
--	0x20, 0x61, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20,
--	0x52, 0x4f, 0x4d, 0x53, 0x20, 0x6f, 0x6e, 0x20,
--	0x74, 0x68, 0x69, 0x73, 0x20, 0x20, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x77, 0x65,
--	0x62, 0x73, 0x69, 0x74, 0x65, 0x20, 0x61, 0x72,
--	0x65, 0x20, 0x6f, 0x66, 0x20, 0x67, 0x61, 0x6d,
--	0x65, 0x73, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20,
--	0x61, 0x72, 0x65, 0x20, 0x6e, 0x6f, 0x20, 0x6c,
--	0x6f, 0x6e, 0x67, 0x65, 0x72, 0x20, 0x66, 0x6f,
--	0x72, 0x20, 0x73, 0x61, 0x6c, 0x65, 0x2c, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x7c, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x66,
--	0x72, 0x6f, 0x6d, 0x20, 0x77, 0x68, 0x69, 0x63,
--	0x68, 0x20, 0x67, 0x61, 0x6d, 0x65, 0x20, 0x63,
--	0x6f, 0x6d, 0x70, 0x61, 0x6e, 0x69, 0x65, 0x73,
--	0x20, 0x63, 0x61, 0x6e, 0x20, 0x6e, 0x6f, 0x20,
--	0x6c, 0x6f, 0x6e, 0x67, 0x65, 0x72, 0x20, 0x70,
--	0x72, 0x6f, 0x66, 0x69, 0x74, 0x2e, 0x20, 0x20,
--	0x20, 0x20, 0x20, 0x20, 0x20, 0x7c, 0x0d, 0x0a,
--	0x60, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0x2d,
--	0x2d, 0x2d, 0x2d, 0x2d, 0x2d, 0xb4, 0x0d, 0x0a
--};
--
--#define MAMEDK_SIZE 3648
--
- analyze_entry::analyze_entry(const string& Aname, unsigned Asize, unsigned Acrc)
- 	: name(Aname), size(Asize), crc(Acrc) {
- }
-@@ -576,49 +115,12 @@
- 	return true;
- }
- 
--static void sset(char* dst, unsigned w, const char* s)
--{
--	unsigned l = strlen(s);
--	if (l > w)
--		l = w;
--	unsigned b = (w - l) / 2;
--
--	memset(dst, ' ', w);
--	memcpy(dst + b, s, l);
--}
--
- analyze::analyze(const gamearchive& gar)
- {
- 	// insert some standard crc
- 	for(analyze_entry_static* i=GARBAGE;i->size;++i) {
- 		garbage.insert(*i);
- 	}
--
--	// insert the MAMEDK crc for the current info
--	for(game_by_name_set::const_iterator i=gar.begin();i!=gar.end();++i) {
--		char t0[128];
--		char t1[128];
--		char t2[128];
--		char name[64];
--
--		snprintf(t0, sizeof(t0), "proudly presents %s.zip for your mame", i->name_get().c_str());
--		snprintf(t1, sizeof(t1), "\"%s\"", i->description_get().c_str());
--		snprintf(t2, sizeof(t2), "%s %s", i->manufacturer_get().c_str(), i->year_get().c_str());
--
--		sset(MAMEDK_DATA + 64*9 + 1, 60, t0);
--		sset(MAMEDK_DATA + 64*11 + 1, 60, t1);
--		sset(MAMEDK_DATA + 64*13 + 1, 60, t2);
--
--		analyze_entry_static e;
--
--		snprintf(name, sizeof(name), "%s.txt", i->name_get().c_str());
--
--		e.name = name;
--		e.size = MAMEDK_SIZE;
--		e.crc = crc_compute(MAMEDK_DATA, MAMEDK_SIZE);
--
--		garbage.insert(e);
--	}
- }
- 
- analyze_type analyze::operator()(const string& name, unsigned size, unsigned crc) const
diff --git a/games-emulation/advancescan/files/advancescan-1.16-sys-expat.patch b/games-emulation/advancescan/files/advancescan-1.16-sys-expat.patch
deleted file mode 100644
index 0648a0cf068c..000000000000
--- a/games-emulation/advancescan/files/advancescan-1.16-sys-expat.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,6 +30,7 @@
- 
- # Checks for libraries.
- AC_CHECK_LIB([z], [adler32], [], [AC_MSG_ERROR([the libz library is missing])])
-+AC_CHECK_LIB([expat], [XML_Parse], [], [AC_MSG_ERROR([the expat library is missing])])
- 
- # Checks for header files.
- AC_HEADER_STDC
---- a/gamexml.cc
-+++ b/gamexml.cc
-@@ -22,7 +22,7 @@
- 
- #include "game.h"
- #include "strcov.h"
--#include "expat/expat.h"
-+#include <expat.h>
- 
- #include <string>
- #include <iostream>
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,10 +18,7 @@
- 	siglock.cc \
- 	getopt.c \
- 	snprintf.c \
--	lib/readinfo.c \
--	expat/xmlrole.c \
--	expat/xmlparse.c \
--	expat/xmltok.c
-+	lib/readinfo.c
- 
- advscan_SOURCES =  \
- 	scan.cc \
-@@ -43,10 +40,7 @@
- 	siglock.cc \
- 	getopt.c \
- 	snprintf.c \
--	lib/readinfo.c \
--	expat/xmlrole.c \
--	expat/xmlparse.c \
--	expat/xmltok.c
-+	lib/readinfo.c
- 
- EXTRA_DIST = advscan.rc.linux advscan.rc.dos \
- 	README AUTHORS HISTORY INSTALL COPYING \
-@@ -82,28 +76,7 @@
- 	portable.h \
- 	lib/readinfo.h \
- 	lib/endianrw.h \
--	lib/extra.h \
--	expat/COPYING \
--	expat/README \
--	expat/ascii.h \
--	expat/asciitab.h \
--	expat/expat-1.95.8.diff \
--	expat/expat.h \
--	expat/iasciitab.h \
--	expat/expatcfg.h \
--	expat/expat_external.h \
--	expat/internal.h \
--	expat/latin1tab.h \
--	expat/nametab.h \
--	expat/utf8tab.h \
--	expat/xmlparse.c \
--	expat/xmlrole.c \
--	expat/xmlrole.h \
--	expat/xmltok.c \
--	expat/xmltok.h \
--	expat/xmltok_impl.c \
--	expat/xmltok_impl.h \
--	expat/xmltok_ns.c
-+	lib/extra.h
- 
- man_MANS = doc/advscan.1 doc/advdiff.1
- 
diff --git a/games-emulation/advancescan/metadata.xml b/games-emulation/advancescan/metadata.xml
deleted file mode 100644
index 879ee3497adc..000000000000
--- a/games-emulation/advancescan/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">advancemame</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/atari800-3.1.0-r1 b/games-emulation/atari800-3.1.0-r1
new file mode 100644
index 000000000000..3a0367c31d20
--- /dev/null
+++ b/games-emulation/atari800-3.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] ) ncurses? ( sys-libs/ncurses:0= sound? ( !oss? ( media-libs/libsdl[sound] ) ) ) !sdl? ( !ncurses? ( sys-libs/ncurses:0= sound? ( !oss? ( media-libs/libsdl[sound] ) ) ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:0= ) media-libs/libpng:0= sys-libs/zlib app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Atari 800 emulator
+EAPI=6
+HOMEPAGE=http://atari800.sourceforge.net/
+IUSE=ncurses oss opengl readline +sdl +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] ) ncurses? ( sys-libs/ncurses:0= sound? ( !oss? ( media-libs/libsdl[sound] ) ) ) !sdl? ( !ncurses? ( sys-libs/ncurses:0= sound? ( !oss? ( media-libs/libsdl[sound] ) ) ) ) readline? ( sys-libs/readline:0= sys-libs/ncurses:0= ) media-libs/libpng:0= sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/atari800/atari800-3.1.0.tar.gz mirror://sourceforge/atari800/xf25.zip
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=546cd194df98f23bb69972422a28d5b1
diff --git a/games-emulation/atari800/Manifest b/games-emulation/atari800/Manifest
deleted file mode 100644
index 5ebd2c1ca923..000000000000
--- a/games-emulation/atari800/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX atari800-3.1.0-tgetent-detection.patch 690 BLAKE2B 49016e922f66214dadd0da179679e61f9359f93020d964f4ccd4b0b27da5ceb0fcdc0eedee6b891f8090bfe2c2d4fb23bbbc8130e660a1b84df8434101248f90 SHA512 dc045dc72b011fe2fab1b440a5fc50c3a34dcb4cd867efa9a8276cc770f21778732adf6c59e5a3daec0cd37364a83f877c739d1120d468af9372d088895850e5
-AUX atari800.cfg 467 BLAKE2B 76caa8d4f73d292adb36ce66186bf657a25f4ef5404f0dedc0456fa933bc672bc5a89819b92555d88033bc47bdff4cd5b376571de01339a1b60a82a3210dcd11 SHA512 17f43f9f1b8dcf1513eefc8b89e94ecdaeb3f4e324a669e09c1f8b180e3c545b474164f73bc4c319dde27dda8effa1f2786957854ade81d161221e081c87d358
-DIST atari800-3.1.0.tar.gz 1492289 BLAKE2B cad7a3111bf714321d01aff1f8b30408efc1eca0876d9b795395d62d18eabdf78b71d3b2af887e8ba03e33e3824fcd5b45070e39cddd0e5ad0bda2d853f724b1 SHA512 c8f035c9be000c67dd854a14a236d165e6e2d30b5138f8772c6ea5c5290b0410525570e3ed9dcb2f9bcb129f97a36e6eef5993f0a5ad3cc993c6b59b127bcabe
-DIST xf25.zip 188942 BLAKE2B c10b9108eebc571ac334ea6fca76d227e3d2fcde1595e8823a3d178dc31d9efa9b209572ee03875461289093615470192cf5c9a06cf0b4363d097a9eac201db4 SHA512 306612fc2af41ed10d76103af83e141cfd8bd3ba2ea3cbd1d0b81d4d5b0108c06948a5c626648c8a2424536757a42a3f8b9af1fb63fa3c31096447ffed0f9923
-EBUILD atari800-3.1.0-r1.ebuild 1860 BLAKE2B c286b79674f42d3a421be8e5e5c8ac02387c81ee5994fc7e9657e0732c46d1a38ee93ba240530f5072baaad88b648c28ed533114a9aa986a8b51a3f4e18ffede SHA512 ad3fc9d642d739fd8024c81db883d5b5bffa46e6e5b9967aa5dcbb1d45373eafb7cb399118e01354fbdb878b7ea49d5d76b38189d1bd643503a78ed2ed3ed0e4
-MISC metadata.xml 961 BLAKE2B 5f5e394a1ea4099f9d33f1e4f542b98ea31038e2855d839a86ea55fca18f02b9d99f2b0b554e0816142d80ca84adcbe2e1af1c664d773fb8df2794600fe21b48 SHA512 f31b0309a14446c07f11c72be8bb0cda851e5e0f424211f7a26eb5030935119a31eccfc1d81d80987cf6a6ef22d56e74edd258eba13d2635cccd584fadaaf123
diff --git a/games-emulation/atari800/atari800-3.1.0-r1.ebuild b/games-emulation/atari800/atari800-3.1.0-r1.ebuild
deleted file mode 100644
index 31aa318cdebb..000000000000
--- a/games-emulation/atari800/atari800-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop autotools
-
-DESCRIPTION="Atari 800 emulator"
-HOMEPAGE="http://atari800.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/xf25.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses oss opengl readline +sdl +sound"
-
-NOTSDL_DEPS="
-	sys-libs/ncurses:0=
-	sound? (
-		!oss? ( media-libs/libsdl[sound] )
-	)
-"
-RDEPEND="
-	sdl? ( >=media-libs/libsdl-1.2.0[opengl?,sound?,video] )
-	ncurses? ( ${NOTSDL_DEPS} )
-	!sdl? ( !ncurses? ( ${NOTSDL_DEPS} ) )
-	readline? (
-		sys-libs/readline:0=
-		sys-libs/ncurses:0= )
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-src_prepare() {
-	default
-
-	# remove some not-so-interesting ones
-	rm -f DOC/{INSTALL.*,*.in,CHANGES.OLD} || die
-	sed -i \
-		-e '1s/ 1 / 6 /' \
-		src/atari800.man || die
-	sed "s:/usr/share/games:/usr/share:" \
-		"${FILESDIR}"/atari800.cfg > "${T}"/atari800.cfg || die
-
-	# Bug 544608
-	eapply "${FILESDIR}/${P}-tgetent-detection.patch"
-	pushd src > /dev/null && eautoreconf
-	popd > /dev/null
-}
-
-src_configure() {
-	local video="ncurses"
-	local sound=no
-
-	use sdl && video="sdl"
-	if use sound ; then
-		if use sdl ; then
-			sound=sdl
-		elif use oss ; then
-			sound=oss
-		else
-			echo
-			elog "Sound requested but neither sdl nor oss specified."
-			elog "Disabling sound suport."
-		fi
-	fi
-
-	cd src && \
-		econf \
-			$(use_with readline) \
-			--with-video=${video} \
-			--with-sound=${sound}
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install () {
-	dobin src/atari800
-	newman src/atari800.man atari800.6
-	dodoc README.1ST DOC/*
-	insinto "/usr/share/${PN}"
-	doins "${WORKDIR}/"*.ROM
-	insinto /etc
-	doins "${T}"/atari800.cfg
-	newicon data/atari2.svg ${PN}.svg
-	make_desktop_entry ${PN} "Atari 800 emulator"
-}
diff --git a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch b/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
deleted file mode 100644
index 018e423af6b4..000000000000
--- a/games-emulation/atari800/files/atari800-3.1.0-tgetent-detection.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN atari800-3.1.0/src/configure.ac new/src/configure.ac
---- atari800-3.1.0/src/configure.ac	2014-04-12 15:58:16.000000000 +0200
-+++ new/src/configure.ac	2015-03-26 23:36:24.419178078 +0100
-@@ -982,7 +982,7 @@
- dnl existence of the tgetent symbol in readline. If not, we search for tgetent
- dnl in a few other libraries. All done with a single AC_SEARCH_LIBS statement.
-     have_readline=no
--    AC_SEARCH_LIBS(tgetent, [readline termcap ncursesw ncurses curses], [
-+    AC_SEARCH_LIBS(tgetent, [readline termcap tinfow ncursesw ncurses curses], [
-         AC_SEARCH_LIBS(readline, readline, [
-             AC_CHECK_HEADER([readline/readline.h], [
-                 have_readline=yes
diff --git a/games-emulation/atari800/files/atari800.cfg b/games-emulation/atari800/files/atari800.cfg
deleted file mode 100644
index b31c67de0958..000000000000
--- a/games-emulation/atari800/files/atari800.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-Atari 800 Emulator, Version 1.2.2
-OS/A_ROM=atariosa.rom
-OS/B_ROM=/usr/share/games/atari800/ATARIOSB.ROM
-XL/XE_ROM=/usr/share/games/atari800/ATARIXL.ROM
-BASIC_ROM=/usr/share/games/atari800/ATARIBAS.ROM
-5200_ROM=
-DISK_DIR=
-ROM_DIR=
-H1_DIR=
-H2_DIR=
-H3_DIR=
-H4_DIR=
-HD_READ_ONLY=1
-EXE_DIR=
-STATE_DIR=
-PRINT_COMMAND=lpr %s
-SCREEN_REFRESH_RATIO=1
-MACHINE_TYPE=Atari OS/B
-RAM_SIZE=48
-DEFAULT_TV_MODE=NTSC
-DISABLE_BASIC=1
-ENABLE_SIO_PATCH=1
-ENABLE_H_PATCH=1
-ENABLE_P_PATCH=1
diff --git a/games-emulation/atari800/metadata.xml b/games-emulation/atari800/metadata.xml
deleted file mode 100644
index 6489dd5ca137..000000000000
--- a/games-emulation/atari800/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Atari800 is an Atari 800, 800XL, 130XE and 5200 emulator for Unix, Amiga, MS-DOS, Atari 
-TT/Falcon, SDL and WinCE. Our main objective is to create a freely distributable portable 
-emulator (i.e. with source code available). It can be configured to run in the following 
-ways :
-
-    * BASIC mode
-    * CURSES mode
-    * SVGALIB for Linux Systems
-    * X Window + Optional XVIEW or MOTIF User Interface
-    * CBM Amiga
-    * MS-DOS
-    * TOS (Atari Falcon030/TT030 and compatible)
-    * MS Windows (DirectX)
-    * SDL (many different platforms and systems)
-    * WinCE
-    * MacOS X
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">atari800</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-emulation/caps-20071115 b/games-emulation/caps-20071115
new file mode 100644
index 000000000000..b0fd0878647c
--- /dev/null
+++ b/games-emulation/caps-20071115
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Support library for accessing and using C.A.P.S. images
+EAPI=5
+HOMEPAGE=http://www.softpres.org/
+IUSE=doc
+KEYWORDS=amd64 x86
+LICENSE=CAPS
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/ipfdevlib_linux-20060612.tgz amd64? ( mirror://gentoo/ipflib_linux-amd64-20071115.tgz ) doc? ( mirror://gentoo/ipfdoc102a.zip ) mirror://gentoo/config_uae_ocs13_512c-512s.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=46c0a1a69c0c5b177ef47f7bcb55b43a
diff --git a/games-emulation/caps/Manifest b/games-emulation/caps/Manifest
deleted file mode 100644
index 9c5bddc0ab1a..000000000000
--- a/games-emulation/caps/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST config_uae_ocs13_512c-512s.zip 1613 BLAKE2B 75262e48802d9dbfa95d9fc18aeb032176e98be86aeae65e893b9d8db57f6d6fb089df35273f27abcbbcd568d5dc96fec25281034f752862e06a8e22dcf38450 SHA512 38aa65030f874756780239191e08c7dbf41a241b44a82a58d8adef8dd94879d3db221c26e860d980a602fd89734f4ce8053e7c7037a8889e9a6f69a1d2dc4d8e
-DIST ipfdevlib_linux-20060612.tgz 60265 BLAKE2B 8ab649aef5be48287d88777e8ae94ea784922174f6a127ac5e8bfd906bb852caa9ffd624fbd51d062971c6b13ea0ae7089c0ad9356a10697cad425c348599b9a SHA512 6d01b35850af9f5f4a45f8ee7f9c9b7a02ffaf3830588c46cf718c5007316baac49c1c7c928f0fc78e9014e3f094cb6a2d6e842c1440a7b8e34e6c31899699d7
-DIST ipfdoc102a.zip 264258 BLAKE2B 07af5bd9e466d588472171694f778f6416d6cbad157782ab60ce0e7b764e6d5b9b1b3107d837edeee3253cba4332f182751894c0e897433124f6e6f1dd9ddf3d SHA512 f4b34349c65a5cffc6fad8370959ea0c2516087f46cbb43770b45cf14c573062e03abd77350cf4c8f690dc6a1d461dd0613a03ab70c1f8a72a3a43b9085730f0
-DIST ipflib_linux-amd64-20071115.tgz 24278 BLAKE2B 37cfa092dfaeb190de02233e021923c55d74a0445e850d35aeb2333a04a29c863769d770fd71a1110a112b719bcf5cecdc0d74f35546de51711b62da86077bbc SHA512 f306503a0aed7fd781bb6aea22a94fe72a5de952e3e26bb923d551ec5f165aa3fced4014df6a50f20b0f4526710b7e8643aa47a4de85f09bb2f3fe040d0b0f70
-EBUILD caps-20071115.ebuild 1548 BLAKE2B 410627ac26df710dcfb9279ada9f1a4d96f1d75988dc77dbd3ae441fea1a0aa84b4df9be3002fd44d327bd165a26e22d2112e47e0f05b8edde4bdfd71ece70ef SHA512 4b0cb66de587ed30daab8b203fbb3a086995786ceffb6d1e678b0308518b2ea4fd67b18ec5dfd9e9eb31b59dc106a44d70ffe1cbfe9a8d86fbcc04aecc48171f
-MISC metadata.xml 603 BLAKE2B 3a37c2c85d43ee38463f362f4ca6e85d0368ea684f3e63adb4438d08bd42b5562cb2a79067774f45ca773254c07bcc31b24e6a45d927ca54ab19c2dff6eb9fd5 SHA512 fedf1973e487ee47ad0ee6552e3867b2b9732084dae90cec32168bfea54dd8d6b25fedf3c7336205706a14b72a7c14cb4653a4b18293f7eb6661c3edb781e3b5
diff --git a/games-emulation/caps/caps-20071115.ebuild b/games-emulation/caps/caps-20071115.ebuild
deleted file mode 100644
index e466d2a9e18c..000000000000
--- a/games-emulation/caps/caps-20071115.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="Support library for accessing and using C.A.P.S. images"
-HOMEPAGE="http://www.softpres.org/"
-SRC_URI="mirror://gentoo/ipfdevlib_linux-20060612.tgz
-	amd64? ( mirror://gentoo/ipflib_linux-amd64-${PV}.tgz )
-	doc? ( mirror://gentoo/ipfdoc102a.zip )
-	mirror://gentoo/config_uae_ocs13_512c-512s.zip"
-
-LICENSE="CAPS"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="usr/lib*/libcapsimage.so* usr/bin/ipfinfo"
-
-src_install() {
-	insinto /usr/include/caps
-	doins ipfdevlib_linux/include/caps/capsimage.h
-
-	case ${ARCH} in
-		ppc)
-			dolib.so ipfdevlib_linux/lib/ppc/libcapsimage.so.2.0
-			dobin ipfdevlib_linux/examples/ppc/ipfinfo
-			;;
-		x86)
-			dolib.so ipfdevlib_linux/lib/i686/libcapsimage.so.2.0
-			dobin ipfdevlib_linux/examples/i686/ipfinfo
-			;;
-		amd64)
-			dolib.so ipflib_linux-amd64/libcapsimage.so.2.3
-			dobin ipflib_linux-amd64/ipfinfo
-			;;
-		*)
-			eerror "Unsupported platform"
-			;;
-	esac
-
-	case ${ARCH} in
-		ppc|x86)
-			dosym libcapsimage.so.2.0 \
-				/usr/$(get_libdir)/libcapsimage.so.2
-			dodoc ipfdevlib_linux/{HISTORY,README}
-			;;
-		amd64)
-			dosym libcapsimage.so.2.3 \
-				/usr/$(get_libdir)/libcapsimage.so.2
-			dodoc ipflib_linux-amd64/{HISTORY,README}
-			;;
-	esac
-
-	insinto /usr/share/${PN}
-	doins OCS_13_1Mb_800_600.uae
-	doins ipfdevlib_linux/examples/ipfinfo.c
-
-	use doc && dodoc CAPSLib102a-40.pdf
-}
diff --git a/games-emulation/caps/metadata.xml b/games-emulation/caps/metadata.xml
deleted file mode 100644
index 927538501fc1..000000000000
--- a/games-emulation/caps/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		C.A.P.S., the Classic Amiga Preservation Society, as the name implies,
-		dedicates itself to the preservation of classic Amiga software for the
-		future, namely classic Amiga games. This is the C.A.P.S. support
-		library that allows third party applications access to and use of 
-		C.A.P.S. images.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-emulation/daphne-1.0 b/games-emulation/daphne-1.0
new file mode 100644
index 000000000000..276239251353
--- /dev/null
+++ b/games-emulation/daphne-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libogg media-libs/libvorbis sys-libs/zlib media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/libmpeg2 virtual/opengl media-libs/glew
+DESCRIPTION=Laserdisc Arcade Game Emulator
+EAPI=5
+HOMEPAGE=http://www.daphne-emu.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libogg media-libs/libvorbis sys-libs/zlib media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/libmpeg2 virtual/opengl media-libs/glew games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.daphne-emu.com/download/daphne-1.0-src.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_=2ec82219ddb7579fd68866f12fc26260
diff --git a/games-emulation/daphne/Manifest b/games-emulation/daphne/Manifest
deleted file mode 100644
index ed0bebb0665a..000000000000
--- a/games-emulation/daphne/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX daphne-1.0-gcc43.patch 486 BLAKE2B 2f316f61b6386c3bbb3ddb4eae154953fcca2e38cd3f83b46c5d4c5cd77efce514540ddee385ebfebe172c921dc19522cd2996b8dfa57e386c2516538b5d9d1e SHA512 ab47c9d7c45191ff0b8b5dcb5de2553da0983785f5497cc4a683c1501cee5d1fde0bc70311a1fca68785ede36e410a367b0d1863c8c51b52d4501a4d14a57ac2
-AUX daphne-1.0-ldflags.patch 620 BLAKE2B f3603a7b4793e7e61ae6ead36c427046843b4723ac9e278d446956b6ee0eb228cc60bf479bf2cde3822f4e83825aeccc4869fcb765b96686e92478a9bfd1b7a0 SHA512 5dd63bd25b8fc583b95bf5be338ddad5e636f72e68f7a19052e84fa2c55da068bc6d9a449b693e69b87700d85e002731916f3cf9f0a6226e864112b4a3f3576a
-AUX daphne-1.0-system-lmpeg2.patch 1547 BLAKE2B d80c4a9ca8fc4cfe6aea555e6585220f149841b5887ef28ab73274664127e34ad26897f34d5a49acad9c2457a7b4c81844114ed27a3c56c3c329e004882aadfe SHA512 ffa1fd05c4a676b0f5342f10764b872b14ad0a6bdfabd7b6b6e306594ae1c4fd7827688906fdc123d1aaab889b1659441a03e16f758528f4e14117f9c8cba892
-AUX daphne-1.0-typefix.patch 1951 BLAKE2B f3f88058245db9b0b3beade18fa48f6aa21eb786935b768324f6287b1c06d800976bc061b038eebc35139f7af114a1288a00d82452db98ba3d971442d07de46a SHA512 b97a32e54d14e40b5857623065ded2985868abce8e26a21fcf2452a90bbcc2ebd7b0d6f24a36d62351a254cf3f66514c5c55014cfce03246ccf3f884a07f5352
-AUX daphne-1.0-underlink.patch 407 BLAKE2B c8583863874ce2dfac04fbb8832f0d1060200816dcd02a0ce63ea14ceeee03bfb435b8730d6cec55bcaf4b028925e729240d2c9f879219472ab822edf5c212db SHA512 ecbe457ea90aad322275b5b4ea29b7a3a28442afc87a1338987691799241350bc2583a9dc568c2215c489a21806ad918ebcb3091096ec827ac0f091a93451edb
-AUX daphne-1.0-vorbisfilefix.patch 500 BLAKE2B c8fa57b17b22392d4ef153e3ba7b27a8d5d3780c3d718852326aee28d33a41d93aa5e5e16ee870826cc1a2e6f71cf9066b381d043738420a670893f9134a57a8 SHA512 1fcea4e31f29a165da3746a35fe7a9c839caa0b6eabfe9247bd5b4f603985f114b3dec952cd680f3dc243c8014db012e4b0bc26c8721e8b74807271b80803433
-AUX daphne-1.0-zlib.patch 356 BLAKE2B 6130956ae52788c180330e653191a99a3b88c57431bd9e93c2ee599e699969b113bc26142bff3e747953c6034b5bf566932bc92ec504e7fc7507f7eed3bab562 SHA512 8c76ab069589fedceae114140eb845324f75c664dd76f257065293a8eecf57d9e2487c00af9d310afffe36f990b09c73c7648979b785886f3ca814f8a64d33e6
-DIST daphne-1.0-src.tar.gz 4316387 BLAKE2B 12063360931b36aaf301e6cd8169706f43456363140f9abbe9b09b711126a1c90f451cbbafc0f0d9fa23d538e01b3a99d2c50056e00ced51607572a1108621b8 SHA512 e15e3e86cd03b8eea410eedb667c878f9e2fb044a9bf2cc54e54db641f1c2c6fd99e889cfab308bf972336b577059e13d6cf2a353016ded8e28dae9ddedc0ad4
-EBUILD daphne-1.0.ebuild 1964 BLAKE2B 5a813b31b1cc4309a820b4de7f875e415f664ac230be813c3f3bb376a54db7641d515cbead8c9066efa5a7a0ae2d13f6e3beb04a0a5b457b24e6cde3c1626b6a SHA512 5aa88307cb2dda478879b64c40f1f728e717d7fb9849c1b95db26f8a24a7445d8dbbfed74b7512005524ce638dcd460b52162cf48b44710a556dc813f60c0134
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/daphne/daphne-1.0.ebuild b/games-emulation/daphne/daphne-1.0.ebuild
deleted file mode 100644
index ce1a8f457df6..000000000000
--- a/games-emulation/daphne/daphne-1.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="Laserdisc Arcade Game Emulator"
-HOMEPAGE="http://www.daphne-emu.com/"
-SRC_URI="http://www.daphne-emu.com/download/${P}-src.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libogg
-	media-libs/libvorbis
-	sys-libs/zlib
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-mixer
-	media-libs/libmpeg2
-	virtual/opengl
-	media-libs/glew"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/v_1_0/src
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-vorbisfilefix.patch \
-		"${FILESDIR}"/${P}-typefix.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-system-lmpeg2.patch
-
-	sed -i "/m_appdir =/s:\.:${GAMES_DATADIR}/${PN}:" \
-		io/homedir.cpp || die
-	sed -i "s:pics/:${GAMES_DATADIR}/${PN}/&:" \
-		video/video.cpp || die
-	sed -i "s:sound/:${GAMES_DATADIR}/${PN}/&:" \
-		sound/sound.cpp || die
-	sed -i "s:./lib:$(games_get_libdir)/${PN}/lib:" \
-		io/dll.h || die
-
-	sed \
-		-e "s:-DNATIVE_CPU_X86::" \
-		-e "s:-DUSE_MMX::" \
-		-e '/export USE_MMX = 1/s:^:# :' \
-		Makefile.vars.linux_x86 >Makefile.vars || die
-}
-
-src_configure() {
-	cd vldp2
-	egamesconf --disable-accel-detect
-}
-
-src_compile() {
-	local archflags
-
-	if use x86; then
-		archflags="-DNATIVE_CPU_X86 -DMMX_RGB2YUV -DUSE_MMX"
-		export USE_MMX=1
-	else
-		# -fPIC is needed on amd64 but fails on x86.
-		archflags="-fPIC"
-	fi
-
-	emake \
-		CXX=$(tc-getCXX) \
-		DFLAGS="${CXXFLAGS} ${archflags}"
-	emake -C vldp2 \
-		-f Makefile.linux \
-		CC=$(tc-getCC) \
-		DFLAGS="${CFLAGS} ${archflags}"
-}
-
-src_install() {
-	cd ..
-	newgamesbin daphne.bin daphne
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe libvldp2.so
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r pics roms sound
-	dodoc doc/*.{ini,txt}
-	dohtml -r doc/*
-	prepgamesdirs
-}
diff --git a/games-emulation/daphne/files/daphne-1.0-gcc43.patch b/games-emulation/daphne/files/daphne-1.0-gcc43.patch
deleted file mode 100644
index 07c505c27814..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile.old        2009-01-19 16:22:07.000000000 +0100
-+++ b/Makefile    2009-01-19 16:22:17.000000000 +0100
-@@ -33,7 +33,7 @@
- endif
-
- # Platform specific cflags defined in the Makefile.vars file
--export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} -Wall -Winline -Werror
-+export CFLAGS = ${PFLAGS} ${DEFINE_STATIC_VLDP} -Wall -Winline
-
- OBJS = ldp-out/*.o cpu/*.o game/*.o io/*.o timer/*.o ldp-in/*.o video/*.o \
-        sound/*.o daphne.o cpu/x86/*.o scoreboard/*.o ${VLDP_OBJS}
-
diff --git a/games-emulation/daphne/files/daphne-1.0-ldflags.patch b/games-emulation/daphne/files/daphne-1.0-ldflags.patch
deleted file mode 100644
index 245e8f5e216b..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.old	2010-10-05 08:48:46.000000000 +0200
-+++ b/Makefile	2010-10-05 08:49:10.000000000 +0200
-@@ -43,7 +43,7 @@
- .SUFFIXES:	.cpp
- 
- all:	${LOCAL_OBJS} sub
--	${CXX} ${DFLAGS} ${OBJS} -o ${EXE} ${LIBS}
-+	${CXX} $(LDFLAGS) ${DFLAGS} ${OBJS} -o ${EXE} ${LIBS}
- 
- sub:
- 	cd ldp-out && $(MAKE)
---- a/vldp2/Makefile.linux.old	2010-10-05 09:29:52.000000000 +0200
-+++ b/vldp2/Makefile.linux	2010-10-05 09:30:13.000000000 +0200
-@@ -33,7 +33,7 @@
- all:		vldp2
- 
- vldp2:		${OBJS}
--		${CC} -shared -o ${LIBNAME} ${OBJS} ${LIBS}
-+		${CC} $(LDFLAGS) -shared -o ${LIBNAME} ${OBJS} ${LIBS}
- 		cp ${LIBNAME} ../../.
- 
- clean:
diff --git a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch b/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
deleted file mode 100644
index e82d2ecf0d40..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-system-lmpeg2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ur v_1_0.old/src/vldp2/Makefile.am v_1_0/src/vldp2/Makefile.am
---- a/vldp2/Makefile.am	2009-12-29 18:04:15.000000000 +0200
-+++ b/vldp2/Makefile.am	2009-12-29 18:10:42.000000000 +0200
-@@ -1,3 +1,3 @@
--SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
-+SUBDIRS = autotools
- 
- EXTRA_DIST = bootstrap
-diff -ur v_1_0.old/src/vldp2/Makefile.in v_1_0/src/vldp2/Makefile.in
---- a/vldp2/Makefile.in	2009-12-29 18:04:15.000000000 +0200
-+++ b/vldp2/Makefile.in	2009-12-29 18:10:51.000000000 +0200
-@@ -128,7 +128,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
-+SUBDIRS = autotools
- 
- EXTRA_DIST = bootstrap
- subdir = .
-diff -ur v_1_0.old/src/vldp2/Makefile.linux v_1_0/src/vldp2/Makefile.linux
---- a/vldp2/Makefile.linux	2009-12-29 18:04:15.000000000 +0200
-+++ b/vldp2/Makefile.linux	2009-12-29 18:13:12.000000000 +0200
-@@ -14,14 +14,9 @@
- DFLAGS = -O3 -march=i686 -fomit-frame-pointer -funroll-loops
- 
- CFLAGS = ${DFLAGS} `sdl-config --cflags` -I./include
--LIBS = `sdl-config --libs`
-+LIBS = `sdl-config --libs` -lmpeg2
- 
--OBJS =  vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o \
--	libmpeg2/cpu_accel.o libmpeg2/alloc.o libmpeg2/cpu_state.o \
--	libmpeg2/decode.o libmpeg2/header.o libmpeg2/motion_comp.o	\
--	libmpeg2/idct.o libmpeg2/idct_mmx.o libmpeg2/motion_comp_mmx.o \
--		libmpeg2/slice.o	\
--	libvo/video_out.o libvo/video_out_null.o 
-+OBJS =  vldp/vldp.o vldp/vldp_internal.o vldp/mpegscan.o
- 
- LIBNAME =	libvldp2.so
- 
- 
diff --git a/games-emulation/daphne/files/daphne-1.0-typefix.patch b/games-emulation/daphne/files/daphne-1.0-typefix.patch
deleted file mode 100644
index 790d93a3af87..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-typefix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-amd64 does not like int pointers
-
-diff -ruN v_1_0.orig/src/ldp-in/ldv1000.cpp v_1_0/src/ldp-in/ldv1000.cpp
---- a/ldp-in/ldv1000.cpp	2008-01-29 18:04:34.000000000 +0100
-+++ b/ldp-in/ldv1000.cpp	2008-09-19 14:29:40.000000000 +0200
-@@ -607,9 +607,9 @@
- 
- void ldv1000_event_callback(void *eventType)
- {
--	g_ldv1000_last_event = (unsigned int) eventType;
-+	g_ldv1000_last_event = (unsigned long) eventType;
- 
--	switch ((unsigned int) eventType)
-+	switch ((unsigned long) eventType)
- 	{
- 	case LDV1000_EVENT_VSYNC_END:
- #ifdef DEBUG
-diff -ruN v_1_0.orig/src/vldp2/libvo/video_out_null.c v_1_0/src/vldp2/libvo/video_out_null.c
---- a/vldp2/libvo/video_out_null.c	2008-01-29 18:04:43.000000000 +0100
-+++ b/vldp2/libvo/video_out_null.c	2008-09-19 14:30:03.000000000 +0200
-@@ -82,7 +82,7 @@
- 				// this is the potentially expensive callback that gets the hardware overlay
- 				// ready to be displayed, so we do this before we sleep
- 				// NOTE : if this callback fails, we don't want to display the frame due to double buffering considerations
--				if (g_in_info->prepare_frame(&g_yuv_buf[(int) id]))
-+				if (g_in_info->prepare_frame(&g_yuv_buf[(long) id]))
- 				{
- #ifndef VLDP_BENCHMARK
- 				
-@@ -133,7 +133,7 @@
- #endif
- 						// draw the frame
- 						// we are using the pointer 'id' as an index, kind of risky, but convenient :)
--						g_in_info->display_frame(&g_yuv_buf[(int) id]);
-+						g_in_info->display_frame(&g_yuv_buf[(long) id]);
- #ifndef VLDP_BENCHMARK
- 					} // end if we didn't get a new command to interrupt the frame being displayed
- #endif
-@@ -272,7 +272,7 @@
- 			    uint8_t ** buf, void ** id)
- {
- 	static buffer_index = 0;
--	*id = (int *) buffer_index;	// THIS IS A LITTLE TRICKY
-+	*id = (long *) buffer_index;	// THIS IS A LITTLE TRICKY
- 	// We are setting an integer value to a pointer ...
- 	// Because it is convenient to let the pointer hold the value of this integer for us
- 	// Hopefully it doesn't cause any trouble later ;)
diff --git a/games-emulation/daphne/files/daphne-1.0-underlink.patch b/games-emulation/daphne/files/daphne-1.0-underlink.patch
deleted file mode 100644
index dd4c3d1467e2..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-underlink.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.vars.linux_x86.old	2011-09-21 12:27:42.480566742 +0200
-+++ b/Makefile.vars.linux_x86	2011-09-21 12:27:57.490564959 +0200
-@@ -24,4 +24,4 @@
- 	-DUSE_MMX -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DUSE_OPENGL
- 
- # platform-specific lib flags
--LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW
-+LIBS = `sdl-config --libs` -ldl -lz -logg -lvorbis -lvorbisfile -lGLEW -lGL -lm
diff --git a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch b/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
deleted file mode 100644
index 05a0403a8af4..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-vorbisfilefix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix no sound issue with >=media-libs/libvorbis-1.2.0
-
-diff -ruN v_1_0.orig/src/ldp-out/ldp-vldp-audio.cpp v_1_0/src/ldp-out/ldp-vldp-audio.cpp
---- a/ldp-out/ldp-vldp-audio.cpp	2008-01-29 18:04:07.000000000 +0100
-+++ b/ldp-out/ldp-vldp-audio.cpp	2008-09-19 13:43:10.000000000 +0200
-@@ -146,7 +146,7 @@
- 	switch (whence)
- 	{
- 	case SEEK_SET:
--		if (offset < g_audio_filesize)
-+		if (offset <= g_audio_filesize)
- 		{
- 			// make sure offset is positive so we don't get into trouble
- 			if (offset >= 0)
diff --git a/games-emulation/daphne/files/daphne-1.0-zlib.patch b/games-emulation/daphne/files/daphne-1.0-zlib.patch
deleted file mode 100644
index d94af3b174f4..000000000000
--- a/games-emulation/daphne/files/daphne-1.0-zlib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/io/unzip.h	2011-09-21 12:13:28.911668053 +0200
-+++ b/io/unzip.h	2011-09-21 12:14:53.074658064 +0200
-@@ -57,6 +57,10 @@
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF _Z_OF
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
diff --git a/games-emulation/daphne/metadata.xml b/games-emulation/daphne/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/daphne/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/desmume-0.9.11-r1 b/games-emulation/desmume-0.9.11-r1
new file mode 100644
index 000000000000..97ed94daa612
--- /dev/null
+++ b/games-emulation/desmume-0.9.11-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=dev-libs/zziplib gnome-base/libglade media-libs/libsdl[joystick,opengl,video] sys-libs/zlib virtual/opengl x11-libs/agg >=x11-libs/gtk+-2.8.0:2 x11-libs/gtkglext dev-util/intltool virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Nintendo DS emulator
+EAPI=6
+HOMEPAGE=http://desmume.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/zziplib gnome-base/libglade media-libs/libsdl[joystick,opengl,video] sys-libs/zlib virtual/opengl x11-libs/agg >=x11-libs/gtk+-2.8.0:2 x11-libs/gtkglext
+SLOT=0
+SRC_URI=mirror://sourceforge/desmume/desmume-0.9.11.tar.gz
+_eclasses_=xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=474801794fd8b6412f33f7d35632f164
diff --git a/games-emulation/desmume/Manifest b/games-emulation/desmume/Manifest
deleted file mode 100644
index 377ab85a7308..000000000000
--- a/games-emulation/desmume/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX desmume-0.9.11-fix-pointer-conversion-warning.diff 370 BLAKE2B 8e019cf69a13b3669166f1ee04d26e6538a392e494d356b2eeabd43ac69fe9489ddeda146054ab5d1f821b3a52719d58ae493ca870f46461eacaab26ffb9eba1 SHA512 f7d5f4ac4d96f244aa6ee81a90f64e754aceebf075f1c4ff84dde2d1d2beaf617631569c5aa9a8afb40ae4499067e2233ba00a4b9d606a9608915714766d0bff
-AUX desmume-0.9.11-gcc6.patch 1991 BLAKE2B ffb0a58f7317aa50fe17c4abe1ba6c9bbf9cb937736479214b86187c32af8c1659aa719eccce184a5f0fa1b31f15634276fb676bf97ec64feba603fa89ee289f SHA512 e9249a613f1bf3b6d72dcce47cbc39daeadb1b4f7b9be2748b537ec3389a61f46b5f15f5a10d55bc4b1dbd69dd87526b5ce79e58b539cf432679da9bc803e0cd
-AUX desmume-0.9.11-gcc7.patch 832 BLAKE2B 80accd7e22d22163692be58f2da288db4b4009603f9cf9fca4d709e44dfae4496c9b7610c82bf6bfc47c470837dccec83a95e124c3ad9a8cead654cd389a3476 SHA512 9c9b0452a6aaf860583ad97737fb7142601a5ff6f4b720037c9b4d2aeab533c12ffbb1a216753f7e9e4f04350a4e276c5606624ab633f4c2bea517ec0233db8f
-DIST desmume-0.9.11.tar.gz 5359305 BLAKE2B 31764dcb2d0facf32eddd5c66f40e2268f8afd5c2562bf246b93bb60c191d7888587991732014dee11417016515a4367bda9acf79f699703754aa904dcaeeb01 SHA512 160cb6ec0ede04ad1fbddde2b7b04aa41fa464c8338d7eb9d7536196a82d8d716889b40be4fb831a22e3fe8532b947f7f0b41311601b6842be2516dff7cae46c
-EBUILD desmume-0.9.11-r1.ebuild 800 BLAKE2B 5cf60a8343d47e2e7adce5697fe8904bc733f503d9d56a37515708def52dd403ae52bec61b20bb6183335266e61916b2d0591e6f89ca20ce5cdbff76c565cbd6 SHA512 91fc616b3935e92f6b1f88346a47b6683835d02a2a35f32fc2b2d127971546fe45ef3af8d1d690f9e39b595f51c405664cf29ae9b62e63f024e8c98214786e7d
-MISC metadata.xml 407 BLAKE2B a64ba166734f13f34fec0ca394d4d51bc70f2cb9539981e068e544f3139584ee3ec2da89a02ef9203008cb73213213adb148c978311ae36d95749e553d10605b SHA512 89d3a5b608525bfa1f05503017619520d82c663241668c3d5fa5602e625cbfe02564b04d7bac0e97bbe53ff8eba08a6895fb0e8cd519d0d88efd29a0ca64ac4b
diff --git a/games-emulation/desmume/desmume-0.9.11-r1.ebuild b/games-emulation/desmume/desmume-0.9.11-r1.ebuild
deleted file mode 100644
index e98e0846012b..000000000000
--- a/games-emulation/desmume/desmume-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg
-
-DESCRIPTION="Nintendo DS emulator"
-HOMEPAGE="http://desmume.org/"
-SRC_URI="mirror://sourceforge/desmume/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/zziplib
-	gnome-base/libglade
-	media-libs/libsdl[joystick,opengl,video]
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/agg
-	>=x11-libs/gtk+-2.8.0:2
-	x11-libs/gtkglext"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README README.LIN )
-
-# fix QA compiler warning, see
-# https://sourceforge.net/p/desmume/patches/172/
-PATCHES=(
-	"${FILESDIR}/${P}-fix-pointer-conversion-warning.diff"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-gcc7.patch"
-)
diff --git a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff b/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
deleted file mode 100644
index 8975085133ff..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-fix-pointer-conversion-warning.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/path.h	2015-02-14 16:05:26.000000000 +0100
-+++ b/src/path.h	2016-07-11 12:09:59.591987169 +0200
-@@ -375,7 +375,7 @@
- 				else if (strchr(strftimeArgs, *p))

- 				{

- 					char tmp[MAX_PATH];

--					char format[] = { '%', *p, NULL };

-+					char format[] = { '%', *p, '\0' };

- 					strftime(tmp, MAX_PATH, format, time_struct);

- 					file.append(tmp);

- 		}

diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
deleted file mode 100644
index 761ccef045cf..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/src/wifi.cpp
-+++ b/src/wifi.cpp
-@@ -314,9 +314,9 @@
- 
- #if (WIFI_LOGGING_LEVEL >= 1)
- 	#if WIFI_LOG_USE_LOGC
--		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: "__VA_ARGS__);
-+		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) LOGC(8, "WIFI: " __VA_ARGS__);
- 	#else
--		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: "__VA_ARGS__);
-+		#define WIFI_LOG(level, ...) if(level <= WIFI_LOGGING_LEVEL) printf("WIFI: " __VA_ARGS__);
- 	#endif
- #else
- #define WIFI_LOG(level, ...) {}
---- a/src/MMU_timing.h
-+++ b/src/MMU_timing.h
-@@ -155,8 +155,8 @@
- 	enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT };

- 	enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT };

- 	enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT };

--	enum { TAGMASK = (u32)(~0 << TAGSHIFT) };

--	enum { BLOCKMASK = ((u32)~0 >> (32 - TAGSHIFT)) & (u32)(~0 << BLOCKSIZESHIFT) };

-+	enum { TAGMASK = (u32)(~0U << TAGSHIFT) };

-+	enum { BLOCKMASK = ((u32)~0U >> (32 - TAGSHIFT)) & (u32)(~0U << BLOCKSIZESHIFT) };

-	enum { WORDSIZE = sizeof(u32) };

- 	enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE };

- 	enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY };

---- a/src/ctrlssdl.cpp
-+++ b/src/ctrlssdl.cpp
-@@ -200,7 +200,7 @@
-           break;
-         case SDL_JOYAXISMOTION:
-           /* Dead zone of 50% */
--          if( (abs(event.jaxis.value) >> 14) != 0 )
-+          if( ((u32)abs(event.jaxis.value) >> 14) != 0 )
-             {
-               key = ((event.jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event.jaxis.axis & 127) << 1);
-               if (event.jaxis.value > 0) {
-@@ -370,7 +370,7 @@
-          Note: button constants have a 1bit offset. */
-     case SDL_JOYAXISMOTION:
-       key_code = ((event->jaxis.which & 15) << 12) | JOY_AXIS << 8 | ((event->jaxis.axis & 127) << 1);
--      if( (abs(event->jaxis.value) >> 14) != 0 )
-+      if( ((u32)abs(event->jaxis.value) >> 14) != 0 )
-         {
-           if (event->jaxis.value > 0)
-             key_code |= 1;
diff --git a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch b/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
deleted file mode 100644
index 8b8a67f2291a..000000000000
--- a/games-emulation/desmume/files/desmume-0.9.11-gcc7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Bug: https://bugs.gentoo.org/646352
-Patch: https://sources.debian.org/data/main/d/desmume/0.9.11-3/debian/patches/gcc7_fixes.patch
-
-From e1f7039f1b06add4fb75b2f8774000b8f05574af Mon Sep 17 00:00:00 2001
-From: rogerman <rogerman@users.sf.net>
-Date: Mon, 17 Aug 2015 21:15:04 +0000
-Subject: Fix bug with libfat string handling.
-
-diff --git a/src/utils/libfat/directory.cpp b/src/utils/libfat/directory.cpp
-index 765d7ae5..b6d7f01f 100644
---- a/src/utils/libfat/directory.cpp
-+++ b/src/utils/libfat/directory.cpp
-@@ -139,7 +139,7 @@ static size_t _FAT_directory_mbstoucs2 (ucs2_t* dst, const char* src, size_t len
- 	int bytes;
- 	size_t count = 0;
- 
--	while (count < len-1 && src != '\0') {
-+	while (count < len-1 && *src != '\0') {
- 		bytes = mbrtowc (&tempChar, src, MB_CUR_MAX, &ps);
- 		if (bytes > 0) {
- 			*dst = (ucs2_t)tempChar;
diff --git a/games-emulation/desmume/metadata.xml b/games-emulation/desmume/metadata.xml
deleted file mode 100644
index d906b044dcad..000000000000
--- a/games-emulation/desmume/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">desmume</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/dgen-sdl-1.33-r1 b/games-emulation/dgen-sdl-1.33-r1
new file mode 100644
index 000000000000..b39a08e2f1e1
--- /dev/null
+++ b/games-emulation/dgen-sdl-1.33-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=media-libs/libsdl[joystick?,opengl?] app-arch/libarchive opengl? ( virtual/opengl ) x86? ( dev-lang/nasm )
+DESCRIPTION=A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator
+EAPI=6
+HOMEPAGE=http://dgen.sourceforge.net/
+IUSE=joystick opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+
+RDEPEND=media-libs/libsdl[joystick?,opengl?] app-arch/libarchive opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=mirror://sourceforge/dgen/files/dgen-sdl-1.33.tar.gz
+_md5_=830a2beccd34f2f593e83ef279fbc1d4
diff --git a/games-emulation/dgen-sdl/Manifest b/games-emulation/dgen-sdl/Manifest
deleted file mode 100644
index 27f46d59279b..000000000000
--- a/games-emulation/dgen-sdl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dgen-sdl-1.33-joystick.patch 406 BLAKE2B 175ac9aee89e657dc48f2c0d8f63019da310fc33dbde271dfb3d7cab79d9533136b02c4761063fc56f88764c0f6afacc687f13fe3e4a1acf99fbd0792694e76c SHA512 0057f4099b941cc1aa1fc4d2d260c3bb7601f8149542ab4a87b3306f839ec6e8306fd00d0f2f87d770cc956a60841ff608095ca7bbc3e0e143f6c057f4d21e58
-DIST dgen-sdl-1.33.tar.gz 939297 BLAKE2B e7d107425f8d2c396e37bd140c9ccebe96f7365ac729faac748e1ccf53ebae30fedc59f05070cdcb16d59a7870b6679e4f6e0dda83a697342c2a692c565a4d13 SHA512 c98ab8cdced62a5d26fd677ad36b031e756620114c946ac067599e84ae6ebcfab731554dd4337b6314c3b5db4601c8a6cc67c285d2aad136e659b9973c01a749
-EBUILD dgen-sdl-1.33-r1.ebuild 825 BLAKE2B 6094564d53612df217efc0d81040883390d4bac149c1630e09b6a1078d4157bfc4720c49af45042e44c1f4f3f02312d6efb5d8a4e475419a46119a91cb352376 SHA512 b9d088beb9a75205745f19a97557c20eae8c2c3318d85576a153a12e831ad578ada032d8ddfe6d05927bac0485c6ffeb04e38a349c39d19f26d057ae2faec6d2
-MISC metadata.xml 327 BLAKE2B c719679eeb00833778ba9a80981dd32cfba3e8d498b378b07eff877d65bbed1c878a0522abe25c5d60f78c89e637a23ae4bbd79a5200cf26677fe25a4e74020a SHA512 17031a8025df3d06c71dfb85bf2870eac32e84e86797296aa4a7e7cd24ac579a7305a7664d05e2054e4ad11da6c683011e8132dce0e6ea7dab0b8f70dc984a9b
diff --git a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild b/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
deleted file mode 100644
index 5d9acdc094b9..000000000000
--- a/games-emulation/dgen-sdl/dgen-sdl-1.33-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A Linux/SDL-Port of the famous DGen MegaDrive/Genesis-Emulator"
-HOMEPAGE="http://dgen.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dgen/files/${P}.tar.gz"
-
-LICENSE="dgen-sdl BSD BSD-2 free-noncomm LGPL-2.1+ GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick opengl"
-
-RDEPEND="
-	media-libs/libsdl[joystick?,opengl?]
-	app-arch/libarchive
-	opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-joystick.patch )
-
-src_configure() {
-	econf \
-		$(use_enable x86 asm) \
-		$(use_enable joystick) \
-		$(use_enable opengl)
-}
-
-src_compile() {
-	emake -C musa m68kops.h
-	emake
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README sample.dgenrc" default
-}
diff --git a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch b/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch
deleted file mode 100644
index 6cb4e936b35b..000000000000
--- a/games-emulation/dgen-sdl/files/dgen-sdl-1.33-joystick.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/sdl/sdl.cpp.orig
-+++ b/sdl/sdl.cpp
-@@ -6285,6 +6285,7 @@
- #endif
- 	static unsigned long hide_mouse_when;
- 	static bool hide_mouse;
-+	bool pressed;
- #ifdef WITH_JOYSTICK
- 	static uint32_t const axis_value[][3] = {
- 		// { pressed, [implicitly released ...] }
-@@ -6301,7 +6302,6 @@
- 	};
- 	unsigned int hat_value_map;
- 	intptr_t joypad;
--	bool pressed;
- #endif
- 	uint32_t plist[8];
- 	uint32_t rlist[8];
diff --git a/games-emulation/dgen-sdl/metadata.xml b/games-emulation/dgen-sdl/metadata.xml
deleted file mode 100644
index fc165789cb5e..000000000000
--- a/games-emulation/dgen-sdl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dgen</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/dolphin-5.0 b/games-emulation/dolphin-5.0
new file mode 100644
index 000000000000..72f0238dd5ad
--- /dev/null
+++ b/games-emulation/dolphin-5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib:= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm:* ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Gamecube and Wii game emulator
+EAPI=5
+HOMEPAGE=https://www.dolphin-emu.org/
+IUSE=alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
+KEYWORDS=amd64
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib:= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm:* ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
+SLOT=0
+SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=97e139b28b846eb3bd7a03a66f50296c
diff --git a/games-emulation/dolphin-9999 b/games-emulation/dolphin-9999
new file mode 100644
index 000000000000..5889c486771a
--- /dev/null
+++ b/games-emulation/dolphin-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib:= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm:* ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Gamecube and Wii game emulator
+EAPI=5
+HOMEPAGE=https://www.dolphin-emu.org/
+IUSE=alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib:= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm:* ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7b95d8e1f15be5b258a9da5d21eb8cf4
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
deleted file mode 100644
index 41198106b068..000000000000
--- a/games-emulation/dolphin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
-DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4538 BLAKE2B 2cdf537c696d52e637b644500fac6b5528f863104f9ffe8b8c30d9bcefd91a6309854ed744f8174766281266b3beac403ebeaa707749fbd03b1750990ec331c1 SHA512 8c3dff0ac08c394f05256b0736209425ec4e4a8d87299bd788e5b1df9ae01aafff61c6b4484b3f064b13d5fc0e999fc434aa162b2d70268d4293b6ab138c80ce
-EBUILD dolphin-9999.ebuild 4591 BLAKE2B ef1c50ccf6887336ba8aa86ff7e3e4a8c601d6ff15b54ee2ae9f0001dc5de1dae09a195bc224f8dbac51e261eb5f99dceb372ded1fe78ed81404231c49c6a77e SHA512 569cb7d38d0cc1900a52b0fec1fb1a82071d8923adf9bec703ffd6e935fbe471b9cd314babf2de2d569009d706367d4c93a198bb7e0fc187af3d822da5370635
-MISC metadata.xml 836 BLAKE2B 786a1a9f4e7d76c0111bd9755f784a0bba5607465e2693986c6e2f37e0a32f9ceea84c902464ea47b66f84c183660d5767f569ae933c6b8774d47a15de4c6f30 SHA512 7bdcb2ba2f3a1fa247080a08da495274bea1f61bec1a88e824ebd44fb7e21e74e7ef52855c1c6fba07f12b278df19c0014ba98a5b6ec50f62c08b0ee31e5fc6b
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
deleted file mode 100644
index 6110f03b0a04..000000000000
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-WX_GTK_VER="3.0"
-
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
-
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
-KEYWORDS="amd64"
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
-
-RDEPEND="
-	>=media-libs/libsfml-2.1
-	>net-libs/enet-1.3.7
-	>=net-libs/mbedtls-2.1.1:=
-	dev-libs/lzo
-	media-libs/libpng:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	virtual/libusb:1
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	bluetooth? ( net-wireless/bluez )
-	egl? ( media-libs/mesa[egl] )
-	evdev? (
-		dev-libs/libevdev
-		virtual/udev
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
-	llvm? ( sys-devel/llvm:* )
-	openal? (
-		media-libs/openal
-		media-libs/libsoundtouch
-	)
-	portaudio? ( media-libs/portaudio )
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[haptic,joystick] )
-	upnp? ( >=net-libs/miniupnpc-1.7 )
-	wxwidgets? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	media-libs/freetype
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${P}-CHAR_WIDTH-collision.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Remove automatic dependencies to prevent building without flags enabled.
-	if use !alsa; then
-		sed -i -e '/include(FindALSA/d' CMakeLists.txt || die
-	fi
-	if use !ao; then
-		sed -i -e '/check_lib(AO/d' CMakeLists.txt || die
-	fi
-	if use !bluetooth; then
-		sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
-	fi
-	if use !llvm; then
-		sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-	fi
-	if use !openal; then
-		sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
-	fi
-	if use !portaudio; then
-		sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
-	fi
-	if use !pulseaudio; then
-		sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
-	fi
-
-	# Remove ALL the bundled libraries, aside from:
-	# - SOIL: The sources are not public.
-	# - Bochs-disasm: Don't know what it is.
-	# - gtest: Their build set up solely relies on the build in gtest.
-	# - xxhash: Not on the tree.
-	mv Externals/SOIL . || die
-	mv Externals/Bochs_disasm . || die
-	mv Externals/gtest . || die
-	mv Externals/xxhash . || die
-	rm -r Externals/* || die "Failed to delete Externals dir."
-	mv Bochs_disasm Externals || die
-	mv SOIL Externals || die
-	mv gtest Externals || die
-	mv xxhash Externals || die
-
-	remove_locale() {
-		# Ensure preservation of the backup locale when no valid LINGUA is set
-		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
-			return
-		else
-			rm "Languages/po/${1}.po" || die
-		fi
-	}
-
-	l10n_find_plocales_changes "Languages/po/" "" '.po'
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	local mycmakeargs=(
-		-DUSE_SHARED_ENET=ON
-		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
-		$( cmake-utils_use log FASTLOG )
-		$( cmake-utils_use profile OPROFILING )
-		$( cmake-utils_use_disable wxwidgets WX )
-		$( cmake-utils_use_enable evdev EVDEV )
-		$( cmake-utils_use_enable lto LTO )
-		$( cmake-utils_use_enable pch PCH )
-		$( cmake-utils_use_enable qt5 QT2 )
-		$( cmake-utils_use_enable sdl SDL )
-		$( cmake-utils_use_use egl EGL )
-		$( cmake-utils_use_use upnp UPNP )
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon -s 48 Data/dolphin-emu.png
-	doicon -s scalable Data/dolphin-emu.svg
-	doicon Data/dolphin-emu.svg
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-
-	if ! use portaudio; then
-		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
-		ewarn "USE=\"portaudio\""
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
deleted file mode 100644
index 78c1cdbac9d0..000000000000
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
-PLOCALE_BACKUP="en"
-WX_GTK_VER="3.0"
-
-inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
-
-if [[ ${PV} == *9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://www.dolphin-emu.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
-
-RDEPEND="
-	>=media-libs/libsfml-2.1
-	>net-libs/enet-1.3.7
-	>=net-libs/mbedtls-2.1.1:=
-	dev-libs/lzo
-	media-libs/libpng:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:=
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	virtual/libusb:1
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	bluetooth? ( net-wireless/bluez )
-	egl? ( media-libs/mesa[egl] )
-	evdev? (
-		dev-libs/libevdev
-		virtual/udev
-	)
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
-	llvm? ( sys-devel/llvm:* )
-	openal? (
-		media-libs/openal
-		media-libs/libsoundtouch
-	)
-	portaudio? ( media-libs/portaudio )
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[haptic,joystick] )
-	upnp? ( >=net-libs/miniupnpc-1.7 )
-	wxwidgets? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	media-libs/freetype
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Remove automatic dependencies to prevent building without flags enabled.
-	if use !alsa; then
-		sed -i -e '/include(FindALSA/d' CMakeLists.txt || die
-	fi
-	if use !ao; then
-		sed -i -e '/check_lib(AO/d' CMakeLists.txt || die
-	fi
-	if use !bluetooth; then
-		sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
-	fi
-	if use !llvm; then
-		sed -i -e '/include(FindLLVM/d' CMakeLists.txt || die
-	fi
-	if use !openal; then
-		sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
-	fi
-	if use !portaudio; then
-		sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
-	fi
-	if use !pulseaudio; then
-		sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
-	fi
-
-	# Remove ALL the bundled libraries, aside from:
-	# - SOIL: The sources are not public.
-	# - Bochs-disasm: Don't know what it is.
-	# - gtest: Their build set up solely relies on the build in gtest.
-	# - xxhash: Not on the tree.
-	mv Externals/SOIL . || die
-	mv Externals/Bochs_disasm . || die
-	mv Externals/gtest . || die
-	mv Externals/xxhash . || die
-	rm -r Externals/* || die "Failed to delete Externals dir."
-	mv Bochs_disasm Externals || die
-	mv SOIL Externals || die
-	mv gtest Externals || die
-	mv xxhash Externals || die
-
-	remove_locale() {
-		# Ensure preservation of the backup locale when no valid LINGUA is set
-		if [[ "${PLOCALE_BACKUP}" == "${1}" ]] && [[ "${PLOCALE_BACKUP}" == "$(l10n_get_locales)" ]]; then
-			return
-		else
-			rm "Languages/po/${1}.po" || die
-		fi
-	}
-
-	l10n_find_plocales_changes "Languages/po/" "" '.po'
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	if use wxwidgets; then
-		need-wxwidgets unicode
-	fi
-
-	local mycmakeargs=(
-		-DUSE_SHARED_ENET=ON
-		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
-		$( cmake-utils_use log FASTLOG )
-		$( cmake-utils_use profile OPROFILING )
-		$( cmake-utils_use_disable wxwidgets WX )
-		$( cmake-utils_use_enable evdev EVDEV )
-		$( cmake-utils_use_enable lto LTO )
-		$( cmake-utils_use_enable pch PCH )
-		$( cmake-utils_use_enable qt5 QT2 )
-		$( cmake-utils_use_enable sdl SDL )
-		$( cmake-utils_use_use egl EGL )
-		$( cmake-utils_use_use upnp UPNP )
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon -s 48 Data/dolphin-emu.png
-	doicon -s scalable Data/dolphin-emu.svg
-	doicon Data/dolphin-emu.svg
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-
-	if ! use portaudio; then
-		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
-		ewarn "USE=\"portaudio\""
-	fi
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch b/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
deleted file mode 100644
index d6e4c7a2dc0e..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0-CHAR_WIDTH-collision.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Avoid clash with TS 18661-1:2014 macros
-https://bugs.gentoo.org/637986
-
---- a/Source/Core/VideoBackends/OGL/RasterFont.cpp
-+++ b/Source/Core/VideoBackends/OGL/RasterFont.cpp
-@@ -15,7 +15,7 @@
- namespace OGL
- {
- 
--static const int CHAR_WIDTH = 8;
-+static const int DOLPHIN_CHAR_WIDTH = 8;
- static const int CHAR_HEIGHT = 13;
- static const int CHAR_OFFSET = 32;
- static const int CHAR_COUNT = 95;
-@@ -146,20 +146,20 @@
- 	glGenTextures(1, &texture);
- 	glActiveTexture(GL_TEXTURE8);
- 	glBindTexture(GL_TEXTURE_2D, texture);
--	std::vector<u32> texture_data(CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
-+	std::vector<u32> texture_data(DOLPHIN_CHAR_WIDTH * CHAR_COUNT * CHAR_HEIGHT);
- 	for (int y = 0; y < CHAR_HEIGHT; y++)
- 	{
- 		for (int c = 0; c < CHAR_COUNT; c++)
- 		{
--			for (int x = 0; x < CHAR_WIDTH; x++)
-+			for (int x = 0; x < DOLPHIN_CHAR_WIDTH; x++)
- 			{
--				bool pixel = (0 != (rasters[c][y] & (1 << (CHAR_WIDTH - x - 1))));
--				texture_data[CHAR_WIDTH * CHAR_COUNT * y + CHAR_WIDTH * c + x] = pixel ? -1 : 0;
-+				bool pixel = (0 != (rasters[c][y] & (1 << (DOLPHIN_CHAR_WIDTH - x - 1))));
-+				texture_data[DOLPHIN_CHAR_WIDTH * CHAR_COUNT * y + DOLPHIN_CHAR_WIDTH * c + x] = pixel ? -1 : 0;
- 			}
- 		}
- 	}
- 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
--	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
-+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, DOLPHIN_CHAR_WIDTH * CHAR_COUNT, CHAR_HEIGHT, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture_data.data());
- 
- 	// generate shader
- 	ProgramShaderCache::CompileShader(s_shader, s_vertexShaderSrc, s_fragmentShaderSrc);
-@@ -196,7 +196,7 @@
- 	std::vector<GLfloat> vertices(text.length() * 6 * 4);
- 
- 	int usage = 0;
--	GLfloat delta_x = GLfloat(2 * CHAR_WIDTH) / GLfloat(bbWidth);
-+	GLfloat delta_x = GLfloat(2 * DOLPHIN_CHAR_WIDTH) / GLfloat(bbWidth);
- 	GLfloat delta_y = GLfloat(2 * CHAR_HEIGHT) / GLfloat(bbHeight);
- 	GLfloat border_x = 2.0f / GLfloat(bbWidth);
- 	GLfloat border_y = 4.0f / GLfloat(bbHeight);
diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
deleted file mode 100644
index e5f72fa203b6..000000000000
--- a/games-emulation/dolphin/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<use>
-		<flag name="egl">Enable EGL support</flag>
-		<flag name="evdev">Enable evdev input support</flag>
-		<flag name="llvm">Enable the LLVM-based disassembler for debugger mode</flag>
-		<flag name="log">Increase logging output</flag>
-		<flag name="lto">Add support for link-time optimizations.</flag>
-	</use>
-	<longdescription lang="en">
-Dolphin is a Gamecube and Wii emulator. Most games run perfectly or with minor
-bugs. Games are playable at HD quality, with 1080p and more.
-	</longdescription>
-	<maintainer type="person">
-		<email>twitch153@gentoo.org</email>
-		<name>Devan Franchini</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dolphin-emu/dolphin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/dosbox-0.74_p20160629 b/games-emulation/dosbox-0.74_p20160629
new file mode 100644
index 000000000000..334876e156f7
--- /dev/null
+++ b/games-emulation/dosbox-0.74_p20160629
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=DOS emulator
+EAPI=6
+HOMEPAGE=http://dosbox.sourceforge.net/
+IUSE=alsa debug hardened opengl
+KEYWORDS=amd64 ~arm ppc64 x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound
+SLOT=0
+SRC_URI=mirror://gentoo/dosbox-code-0-3989-dosbox-trunk.zip
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=be0257ff2a9c6054437efa4bc2694ce8
diff --git a/games-emulation/dosbox-0.74_p20160629-r1 b/games-emulation/dosbox-0.74_p20160629-r1
new file mode 100644
index 000000000000..b4e34d721cb9
--- /dev/null
+++ b/games-emulation/dosbox-0.74_p20160629-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=DOS emulator
+EAPI=6
+HOMEPAGE=http://dosbox.sourceforge.net/
+IUSE=alsa debug glide hardened opengl
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound
+SLOT=0
+SRC_URI=mirror://gentoo/dosbox-code-0-3989-dosbox-trunk.zip glide? ( https://raw.githubusercontent.com/voyageur/openglide/3722fc563b737d2d7933df6a771651c2154e6f7b/platform/dosbox/dosbox_glide.diff -> dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff )
+_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_=d51952680e9e9928e893c6c34f8abf35
diff --git a/games-emulation/dosbox-9999 b/games-emulation/dosbox-9999
new file mode 100644
index 000000000000..c0ac1da9473a
--- /dev/null
+++ b/games-emulation/dosbox-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst preinst prepare unpack
+DEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync >=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=DOS emulator
+EAPI=6
+HOMEPAGE=http://dosbox.sourceforge.net/
+IUSE=alsa debug glide hardened opengl
+LICENSE=GPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib ) glide? ( media-libs/openglide ) opengl? ( virtual/glu virtual/opengl ) debug? ( sys-libs/ncurses:0 ) media-libs/libpng:0 media-libs/libsdl[joystick,video,X] media-libs/sdl-net media-libs/sdl-sound
+SLOT=0
+SRC_URI=glide? ( https://raw.githubusercontent.com/voyageur/openglide/841e1071597b64ead14dd08c25a03206b2d1d1b6/platform/dosbox/dosbox_glide.diff -> dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2006a7920a7fefcd22d6fb09f02741da
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
deleted file mode 100644
index 872b32c2d143..000000000000
--- a/games-emulation/dosbox/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX dosbox-0.74-gcc46.patch 274 BLAKE2B 6375a8c0752eed6481cfc987ac3b7c7f699d745498e619862223dcbf660eef21f7619ef5b8e2034d20ad09716714988875e30d1959fe29393fd96559a2d710df SHA512 3175ba75be568d24286501844073bebbd2ae2e770ca6bdd9d409b290ca7b9f98a8406b5b92b89a9965eeda8045f2ac9634aacf8eb01917cbf02087996de53177
-DIST dosbox-code-0-3989-dosbox-trunk.zip 1327592 BLAKE2B 7a9eccd381c1ce7a08d6e650d94de9e82aa5fb1b63abd23b0f42d10d95df4ca2ba4b2c319f3375e030c1578f032ee7bde528f9c4bbc27b665733f7d035865376 SHA512 625eacc1a1190d87d56713f7af54e6a7886e7666ba9f7f0b1d553c96a2eb02ec7810ac2da73d014d5ea3b69f2a7658bdd445532abe030e7f6ef85a3c20bdd3c7
-DIST dosbox_glide-3722fc563b737d2d7933df6a771651c2154e6f7b.diff 96346 BLAKE2B c22d8897b3767b3351aec4d7bd64d201c32e2191c0520478f33973b0b36652e9770f571ea32fee6d30a4de35cae1c4d223d56af070b3f3916f6827ab47ec0585 SHA512 d2be6ee8bd1f13058c76ccae595b67f15ab87e0e36dab0d938ebbd7fc5d379f6f054d30c32ef4723b9fcdbbcea7bf0e1aa2c8b1aab1737f1d0e4d2a2df0f7714
-DIST dosbox_glide-841e1071597b64ead14dd08c25a03206b2d1d1b6.diff 96801 BLAKE2B d24d1f4262129899d807c275b1ae2d6c09056a126441665f37359302428f30576f399c4778b55f4eaec674e714d85243f576bfa3064887c5801daddc9e507aad SHA512 4cbe0ede9c4242aa346ca6c609b7a4d8e4e1d204d79d93ff741d58d3ca14e43a2e49cd696bd4bd54c13e62d1080320ee233963bac26f25bb0b4fada86e813ca2
-EBUILD dosbox-0.74_p20160629-r1.ebuild 1787 BLAKE2B 7a7c60b909d4a4b4e424d5baa03b5ca7247697c6d993f5aed8690d9eb35b708e62626febc56b94dbd7ca70ecbfd3b93ce4327128e2272a97f5ff1ddd26307a03 SHA512 f4e67047d01f2ca91fa446136ec2829c589c37f2cca664e1ff1292a5ec78fa8a44f78defcdfd23e556ffa2a2d3b2f9a403e4178f3dca36b5ea58307ca1c52889
-EBUILD dosbox-0.74_p20160629.ebuild 1074 BLAKE2B 1d8f874307886cd84f6573784e4d1af6117841c49242352a57109b82879a58ae12a8a512f40eb65fc64b3e294455d278671f3ee7dd46497569954219c566a8a6 SHA512 00edfb8cf1fa3b1f7bee6ef96b5dee033cf1ca48737e9f00a4ddbe09b29c717cf2ae1f10577ca29fa4b886ec7a28f2131e1e12dc41fed5a4c5831b0194ce58b8
-EBUILD dosbox-9999.ebuild 1884 BLAKE2B d5fb6c6b1f123e83d960dd3ff7323845e9ab2673aa889c08d4dc660e18617503b56dfd765f405cb03d3509e88e1cb78242c96b37161a263b966c7fc54eec25a3 SHA512 9ae090a3377bc63b13cb6b6325ffdc36e1cd3a1df512f5c50d1334005a41893dbb6459e008594fe8550fb31948b1f149913bd641fc281fdffea2a7b7e5cfb970
-MISC metadata.xml 623 BLAKE2B 2ff1106b2288c775d3bcff26145af604b63edd350f28ff3fd9c8407a738910d080425fa635b6b03436b0b8c24dde9c7dbd342df1f1bacdfacc391246db565ac0 SHA512 a7aff1ef1c4c2c97e8287b3aec84c1c270b8d052e12d4719704a6732575f1f62e4f9024af3d4e1f234e18c3d47aec863bdf6e6472e03cabd24124e7473c28e87
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
deleted file mode 100644
index f622d980d347..000000000000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-PATCH=3989
-GLIDE_PATCH=3722fc563b737d2d7933df6a771651c2154e6f7b
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip
-	glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE="alsa debug glide hardened opengl"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	glide? ( media-libs/openglide )
-	opengl? ( virtual/glu virtual/opengl )
-	debug? ( sys-libs/ncurses:0 )
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video,X]
-	media-libs/sdl-net
-	media-libs/sdl-sound"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-"${FILESDIR}"/dosbox-0.74-gcc46.patch
-)
-
-src_prepare() {
-	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
-
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable !hardened dynamic-core) \
-		$(use_enable !hardened dynamic-x86) \
-		$(use_enable debug) \
-		$(use_enable opengl)
-}
-
-src_install() {
-	default
-	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
-	doicon src/dosbox.ico
-}
-
-pkg_postinst() {
-	if use glide; then
-		elog "You have enabled unofficial Glide emulation. To use this, symlink"
-		elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's"
-		elog "directory and add the following to your DOSBox configuration."
-		elog ""
-		elog "[glide]"
-		elog "glide=true"
-	fi
-}
diff --git a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild b/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
deleted file mode 100644
index 45b0b0fdb711..000000000000
--- a/games-emulation/dosbox/dosbox-0.74_p20160629.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-PATCH=3989
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
-SRC_URI="mirror://gentoo/dosbox-code-0-${PATCH}-dosbox-trunk.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86"
-IUSE="alsa debug hardened opengl"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	opengl? ( virtual/glu virtual/opengl )
-	debug? ( sys-libs/ncurses:0 )
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video,X]
-	media-libs/sdl-net
-	media-libs/sdl-sound"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${PN}-code-0-${PATCH}-dosbox-trunk
-
-PATCHES=(
-"${FILESDIR}"/dosbox-0.74-gcc46.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable !hardened dynamic-core) \
-		$(use_enable !hardened dynamic-x86) \
-		$(use_enable debug) \
-		$(use_enable opengl)
-}
-
-src_install() {
-	default
-	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
-	doicon src/dosbox.ico
-}
diff --git a/games-emulation/dosbox/dosbox-9999.ebuild b/games-emulation/dosbox/dosbox-9999.ebuild
deleted file mode 100644
index bceaab9e8150..000000000000
--- a/games-emulation/dosbox/dosbox-9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GLIDE_PATCH=841e1071597b64ead14dd08c25a03206b2d1d1b6
-SRC_URI="glide? ( https://raw.githubusercontent.com/voyageur/openglide/${GLIDE_PATCH}/platform/dosbox/dosbox_glide.diff -> dosbox_glide-${GLIDE_PATCH}.diff )"
-
-if [[ ${PV} = 9999 ]]; then
-	ESVN_REPO_URI="https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk"
-	inherit subversion
-else
-	SRC_URI+=" mirror://sourceforge/dosbox/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-fi
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="DOS emulator"
-HOMEPAGE="http://dosbox.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug glide hardened opengl"
-
-DEPEND="alsa? ( media-libs/alsa-lib )
-	glide? ( media-libs/openglide )
-	opengl? ( virtual/glu virtual/opengl )
-	debug? ( sys-libs/ncurses:0 )
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,video,X]
-	media-libs/sdl-net
-	media-libs/sdl-sound"
-RDEPEND=${DEPEND}
-
-if [[ ${PV} = 9999 ]]; then
-	S=${WORKDIR}/${PN}
-fi
-
-PATCHES=( "${FILESDIR}/${PN}-0.74-gcc46.patch" )
-
-src_prepare() {
-	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use glide && append-cppflags -I"${EPREFIX}"/usr/include/openglide
-
-	econf \
-		$(use_enable alsa alsa-midi) \
-		$(use_enable !hardened dynamic-core) \
-		$(use_enable !hardened dynamic-x86) \
-		$(use_enable debug) \
-		$(use_enable opengl)
-}
-
-src_install() {
-	default
-	make_desktop_entry dosbox DOSBox /usr/share/pixmaps/dosbox.ico
-	doicon src/dosbox.ico
-}
-
-pkg_postinst() {
-	if use glide; then
-		elog "You have enabled unofficial Glide emulation. To use this, symlink"
-		elog "or copy ${EPREFIX}/usr/share/openglide/glide2x-dosbox.ovl to your game's"
-		elog "directory and add the following to your DOSBox configuration."
-		elog ""
-		elog "[glide]"
-		elog "glide=true"
-	fi
-}
diff --git a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch b/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
deleted file mode 100644
index 98b4508f519f..000000000000
--- a/games-emulation/dosbox/files/dosbox-0.74-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/dos_inc.h	2011-04-28 08:46:04.505011354 +0200
-+++ b/include/dos_inc.h	2011-04-28 08:46:27.104408178 +0200
-@@ -21,6 +21,7 @@
- #ifndef DOSBOX_DOS_INC_H
- #define DOSBOX_DOS_INC_H
- 
-+#include <cstddef>
- #ifndef DOSBOX_DOS_SYSTEM_H
- #include "dos_system.h"
- #endif
diff --git a/games-emulation/dosbox/metadata.xml b/games-emulation/dosbox/metadata.xml
deleted file mode 100644
index 4c30301896f0..000000000000
--- a/games-emulation/dosbox/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>wine@gentoo.org</email>
-	<name>Gentoo Wine Project</name>
-	<description>Should be cc'ed for issues with dosbox-0.74-_p* snapshot versions</description>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">dosbox</remote-id>
-</upstream>
-<use>
-	<flag name="glide">Enable unofficial Glide emulation via media-libs/openglide</flag>
-</use>
-</pkgmetadata>
diff --git a/games-emulation/emutos-0.9.4-r1 b/games-emulation/emutos-0.9.4-r1
new file mode 100644
index 000000000000..9bf2ea66eb26
--- /dev/null
+++ b/games-emulation/emutos-0.9.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Single-user single-tasking operating system for 32 bit Atari computer emulators
+EAPI=6
+HOMEPAGE=http://emutos.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz mirror://sourceforge/emutos/emutos-512k-0.9.4.zip mirror://sourceforge/emutos/emutos-256k-0.9.4.zip
+_md5_=ae77d07d7fb2081cd8cba088f7cc3d70
diff --git a/games-emulation/emutos-0.9.9.1 b/games-emulation/emutos-0.9.9.1
new file mode 100644
index 000000000000..8b4476d2ec7b
--- /dev/null
+++ b/games-emulation/emutos-0.9.9.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=app-arch/unzip
+DESCRIPTION=Single-user single-tasking operating system for 32 bit Atari computer emulators
+EAPI=6
+HOMEPAGE=http://emutos.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/emutos/emutos-512k-0.9.9.1.zip mirror://sourceforge/emutos/emutos-256k-0.9.9.1.zip
+_md5_=21ce29ff1dba671a4f55675d3441a505
diff --git a/games-emulation/emutos/Manifest b/games-emulation/emutos/Manifest
deleted file mode 100644
index 15b6ffc7ccef..000000000000
--- a/games-emulation/emutos/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST emutos-256k-0.9.4.zip 1600186 BLAKE2B 2c5243165d651a8f4f3b56d0b4bf30bbfd183e4c9d3ae2b1087c3864d540efe445cf10b68e98e862a12be9f34c388548959376a665aac91f09e05b4b39abce58 SHA512 ce7ce9e53c82f7861752ee454a4e3ce616bca73ce580e2b803deea22497de06e5ab49a69af6507ce98ab337312dbb879d258ba2acdf868443f406761caa69404
-DIST emutos-256k-0.9.9.1.zip 1913841 BLAKE2B 3f6093b5df9f694c8f75c07378bbb2e6326b4cf5235fd76059d6cd49701744e16b6fcbf8a92ece7d7bc67c480578f6245bd2e5d48a3e73240b7ae57f0c9ad4d6 SHA512 9ede677a53414bf86b111b3703386aea2b9600abbd6a4fd632b3549faa50f7308fcc7a0eb78626d59a4f2c7d8b844dc2ad5137d2b927f070ab1482799605a56d
-DIST emutos-512k-0.9.4.zip 314877 BLAKE2B 69388ce090c56c05861b859061a9b47998354dc240a0b482f616c5a2c9440ee897abdad96b946f922f77f60ee7d781e37538a42bfc778a6e15ab82225596d91b SHA512 00c8718f364712f5d346859dc40ed83c1792521c9600520aacf199f7d6b24d5cf7a3e2533e1e343d6aa9e77ed3056f8636713bb7c3e9739254e0658c921a78a8
-DIST emutos-512k-0.9.9.1.zip 273400 BLAKE2B baf7001b1150aa5aa5482920733c613c8ebc2d9eeb944de6c1cae471e6889062ed935a3bfe17d209a54733dd5ca453244fde6d906b7dd7f68772633d456df594 SHA512 38f5084df230883634715a1bd1ec542ed63027fae5690a7857986653a918f302126a288600aefa38bd12920d40c1a535cd467b66d55a1b0471364a590ca7986a
-DIST emutos-src-0.9.3.tar.gz 935570 BLAKE2B bcbf216e8bfbae681a404fdaa07e7bc00e1a865e4f6430bf70741ea9a92ee16ab90eef99140c29f3cf381bac93d72e20312e7f21b2e96bc23144c73af0b9191f SHA512 45e19a9f8ebbd1675059a78d1416d0571bc54c3979b36c684f2394f508f48f6f1dae10f4eb966e1757ff10698644302c788ee3e51bf42fe10d131d87508d9824
-EBUILD emutos-0.9.4-r1.ebuild 640 BLAKE2B 8a3f4bb6cfa1d3e87bb6d17f4d17e66d46c99f020824fb067dd865438414b28fb33f23d9a7d4bc2485403763aaf76fd7dbe5048bd54b4e2229eb8fe4dcb2f071 SHA512 2c5b4da9049091414ab55b0caf51953701fcec33742b66e0e78f1c030592d89d0fe51175bbf8275b2bb2956074091577522b92db4c88db258dd8b71ef8916d14
-EBUILD emutos-0.9.9.1.ebuild 587 BLAKE2B 828a08810fcd647a4dc5b06c48635c042b28b83f0b0cb6d67859f0d04c228c9d2eeb137d288f2b72550eeeff26a1f73b24ef3278832239383a64f2b620713d09 SHA512 adb1a1bffe4f24f784a2083d96d28eb20e1dade2b8f9917188db24a3a48ed0e5e46db8719e476aa010c46f7342c6eb2f3e39b27d990255dcbe7e03c4edac744e
-MISC metadata.xml 329 BLAKE2B 3751df88821c56b414164dd686cc65be252f2968ecf92c93f2c6b3c6bd88a77bdc28a2fd33f4d08d2956e6e4d42c3304c0bc7a01226551850c44a438f1d2dd5e SHA512 5af91295f3ae78fb613b90a573aa870ac2e5e00623f305a00981637ac480320f2df7b16f35155e880344254521a0d08adf12ae92cffa15d4a3c3dab2aa8d661a
diff --git a/games-emulation/emutos/emutos-0.9.4-r1.ebuild b/games-emulation/emutos/emutos-0.9.4-r1.ebuild
deleted file mode 100644
index 0e2acfe94e1c..000000000000
--- a/games-emulation/emutos/emutos-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI="mirror://sourceforge/emutos/emutos-src-0.9.3.tar.gz
-	mirror://sourceforge/emutos/emutos-512k-${PV}.zip
-	mirror://sourceforge/emutos/emutos-256k-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	dolib */*.img
-	dodoc emutos-512k-${PV}/{readme.txt,doc/{announce,authors,changelog,status}.txt}
-}
diff --git a/games-emulation/emutos/emutos-0.9.9.1.ebuild b/games-emulation/emutos/emutos-0.9.9.1.ebuild
deleted file mode 100644
index 10bd4656d74a..000000000000
--- a/games-emulation/emutos/emutos-0.9.9.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Single-user single-tasking operating system for 32 bit Atari computer emulators"
-HOMEPAGE="http://emutos.sourceforge.net"
-SRC_URI="mirror://sourceforge/emutos/${PN}-512k-${PV}.zip
-	mirror://sourceforge/emutos/${PN}-256k-${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins */*.img
-	dodoc ${PN}-512k-${PV}/{readme,doc/{announce,authors,changelog,status}}.txt
-}
diff --git a/games-emulation/emutos/metadata.xml b/games-emulation/emutos/metadata.xml
deleted file mode 100644
index 3f4ee01ee5eb..000000000000
--- a/games-emulation/emutos/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">emutos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/fakenes-0.5.8-r3 b/games-emulation/fakenes-0.5.8-r3
new file mode 100644
index 000000000000..1d2b0369a2c4
--- /dev/null
+++ b/games-emulation/fakenes-0.5.8-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=>=media-libs/allegro-4.4.1.1:0[opengl?] dev-games/hawknl openal? ( media-libs/openal media-libs/freealut ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Portable, Open Source NES emulator which is written mostly in C
+EAPI=6
+HOMEPAGE=http://fakenes.sourceforge.net/
+IUSE=openal opengl zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=>=media-libs/allegro-4.4.1.1:0[opengl?] dev-games/hawknl openal? ( media-libs/openal media-libs/freealut ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/fakenes/fakenes-0.5.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ee280ad40161769129cbcfc903833ee4
diff --git a/games-emulation/fakenes/Manifest b/games-emulation/fakenes/Manifest
deleted file mode 100644
index c74bf58a2a6b..000000000000
--- a/games-emulation/fakenes/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX fakenes-0.5.8-underlink.patch 194 BLAKE2B f15bef6e75e4be31a7ea5aff318eeafa42b7c0aa0f4a9fe85ae81209edbf1e9b9203816e907fc8ee9be6d8272c61d784664f223b713d704e33e2392db6d4a09b SHA512 1c523353ebb40f12433dc13b9e003f5da95a2e67af5b0f29e438ba985942696061919fb5b8a41ded0f2c618871994b97070d05456e5b3607fe9f59536d772236
-AUX fakenes-0.5.8-zlib.patch 6297 BLAKE2B cedd715d31f552852c7271edb43c81019442bfbd0d10bbcc8b35c22f75b8ccfd4f23442a1f980ba5b7cbd242746bc6b729d26ce0d5900183c5ecf3707d24c5c2 SHA512 a152e8edffafb36b891bf1ee83ce9fd3c9248a82910d09019d4025c5c7fb77fe6c70cfc22b66e9b15da21081d6d14fcc175f051025c35730ba06fac0bb87556f
-DIST fakenes-0.5.8.tar.bz2 274503 BLAKE2B 64b410052e54c0cd1b474f5bacce220f39455c0de9024582cfc98ea307900b771428eeb9cb4e83e0cd72b0a221d10856f23f1c34b3058050a7dbc81b03e88c07 SHA512 2a22c51cf7171661a92584e083c3dfd69d009b586c22f8b5a4b4022065309ae4d6370a81997c035a9e19ff225e87d92e1b572b313585f2e05776cbf7c1c971aa
-EBUILD fakenes-0.5.8-r3.ebuild 1586 BLAKE2B 0e83991a1377d0aa075e64778351d7bdcb8a15e8261ed3d292688d03a0d4e3678f66e7ac3337c7ae2a44d3bd83837e3408dfe344f13b2545ff92a95d9d7a4e73 SHA512 5e84382587a661c9932b1e7d5ce5772394489df434c58e9bcb6e2f000ecce44822b988868d8dd853871a752db9f6682e662d23407e0aadbd4a0c2ca12386e4c7
-MISC metadata.xml 330 BLAKE2B 31881a989488e32b8a6e034fbb1a1dd88722cf0fc512d40a2ddb53e0a92a68c9787c3a18557dbaed50863d3f4491c2df2617a21703d6777ccd8782978e6c33d2 SHA512 40a9b0382052203f7855ddedfed71e9db3fd128ab5ec0c45b6e6ea4170f919f1ffb3f285b0f708e80f9a37b7af53a584d1ee915ad1f776e99b816bcceb756753
diff --git a/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild b/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild
deleted file mode 100644
index e8aeb3a8b2c0..000000000000
--- a/games-emulation/fakenes/fakenes-0.5.8-r3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic toolchain-funcs gnome2-utils
-
-DESCRIPTION="Portable, Open Source NES emulator which is written mostly in C"
-HOMEPAGE="http://fakenes.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fakenes/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openal opengl zlib"
-
-RDEPEND="
-	>=media-libs/allegro-4.4.1.1:0[opengl?]
-	dev-games/hawknl
-	openal? (
-		media-libs/openal
-		media-libs/freealut
-	)
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:openal-config:pkg-config openal:" \
-		build/openal.cbd || die
-
-	sed -i \
-		-e "s:LIBAGL = agl:LIBAGL = alleggl:" \
-		build/alleggl.cbd || die
-	eapply "${FILESDIR}"/${P}-{underlink,zlib}.patch
-}
-
-src_compile() {
-	local myconf
-
-	append-ldflags -Wl,-z,noexecstack
-
-	echo "$(tc-getBUILD_CC) cbuild.c -o cbuild"
-	$(tc-getBUILD_CC) cbuild.c -o cbuild || die "cbuild build failed"
-
-	use openal || myconf="$myconf -openal"
-	use opengl || myconf="$myconf -alleggl"
-	use zlib   || myconf="$myconf -zlib"
-
-	LD="$(tc-getCC) ${CFLAGS}" ./cbuild ${myconf} --verbose || die "cbuild failed"
-}
-
-src_install() {
-	dobin fakenes
-	insinto "/usr/share/${PN}"
-	doins support/*
-
-	cd docs && HTML_DOCS="faq.html" einstalldocs && cd ..
-
-	newicon -s 32 support/icon-32x32.png ${PN}.png
-	make_desktop_entry ${PN} "FakeNES"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch b/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
deleted file mode 100644
index 48f37a5fd83d..000000000000
--- a/games-emulation/fakenes/files/fakenes-0.5.8-underlink.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/build/hawknl.cbd.old	2011-06-22 17:28:16.733408930 +0200
-+++ b/build/hawknl.cbd	2011-06-22 17:28:29.217203187 +0200
-@@ -22,4 +22,4 @@
- 
- # --
- 
--LDFLAGS += ' -lNL'
-+LDFLAGS += ' -lNL -lm'
diff --git a/games-emulation/fakenes/files/fakenes-0.5.8-zlib.patch b/games-emulation/fakenes/files/fakenes-0.5.8-zlib.patch
deleted file mode 100644
index 15549051a6a5..000000000000
--- a/games-emulation/fakenes/files/fakenes-0.5.8-zlib.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-diff -ur fakenes-0.5.8-old/src/include/unzip.h fakenes-0.5.8/src/include/unzip.h
---- fakenes-0.5.8-old/src/include/unzip.h	2012-08-22 20:51:45.310735240 +0200
-+++ fakenes-0.5.8/src/include/unzip.h	2012-08-22 20:56:40.737069700 +0200
-@@ -119,9 +119,9 @@
-     tm_unz tmu_date;
- } unz_file_info;
- 
--extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-+extern int ZEXPORT unzStringFileNameCompare (const char* fileName1,
- 												 const char* fileName2,
--												 int iCaseSensitivity));
-+												 int iCaseSensitivity);
- /*
-    Compare two filename (fileName1,fileName2).
-    If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-@@ -132,7 +132,7 @@
- */
- 
- 
--extern unzFile ZEXPORT unzOpen OF((const char *path));
-+extern unzFile ZEXPORT unzOpen (const char *path);
- /*
-   Open a Zip file. path contain the full pathname (by example,
-      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -143,24 +143,24 @@
- 	   of this unzip package.
- */
- 
--extern int ZEXPORT unzClose OF((unzFile file));
-+extern int ZEXPORT unzClose (unzFile file);
- /*
-   Close a ZipFile opened with unzipOpen.
-   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-   return UNZ_OK if there is no problem. */
- 
--extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
--					unz_global_info *pglobal_info));
-+extern int ZEXPORT unzGetGlobalInfo (unzFile file,
-+					unz_global_info *pglobal_info);
- /*
-   Write info about the ZipFile in the *pglobal_info structure.
-   No preparation of the structure is needed
-   return UNZ_OK if there is no problem. */
- 
- 
--extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalComment (unzFile file,
- 										   char *szComment,
--					   uLong uSizeBuf));
-+					   uLong uSizeBuf);
- /*
-   Get the global comment string of the ZipFile, in the szComment buffer.
-   uSizeBuf is the size of the szComment buffer.
-@@ -171,22 +171,22 @@
- /***************************************************************************/
- /* Unzip package allow you browse the directory of the zipfile */
- 
--extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-+extern int ZEXPORT unzGoToFirstFile (unzFile file);
- /*
-   Set the current file of the zipfile to the first file.
-   return UNZ_OK if there is no problem
- */
- 
--extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-+extern int ZEXPORT unzGoToNextFile (unzFile file);
- /*
-   Set the current file of the zipfile to the next file.
-   return UNZ_OK if there is no problem
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
- */
- 
--extern int ZEXPORT unzLocateFile OF((unzFile file, 
-+extern int ZEXPORT unzLocateFile (unzFile file, 
- 				     const char *szFileName,
--				     int iCaseSensitivity));
-+				     int iCaseSensitivity);
- /*
-   Try locate the file szFileName in the zipfile.
-   For the iCaseSensitivity signification, see unzStringFileNameCompare
-@@ -197,14 +197,14 @@
- */
- 
- 
--extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-+extern int ZEXPORT unzGetCurrentFileInfo (unzFile file,
- 					     unz_file_info *pfile_info,
- 					     char *szFileName,
- 					     uLong fileNameBufferSize,
- 					     void *extraField,
- 					     uLong extraFieldBufferSize,
- 					     char *szComment,
--					     uLong commentBufferSize));
-+					     uLong commentBufferSize);
- /*
-   Get Info about the current file
-   if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-@@ -223,22 +223,22 @@
-    from it, and close it (you can close it before reading all the file)
-    */
- 
--extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzOpenCurrentFile (unzFile file);
- /*
-   Open for reading data the current file in the zipfile.
-   If there is no error, the return value is UNZ_OK.
- */
- 
--extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzCloseCurrentFile (unzFile file);
- /*
-   Close the file in zip opened with unzOpenCurrentFile
-   Return UNZ_CRCERROR if all the file was read but the CRC is not good
- */
- 
- 												
--extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
-+extern int ZEXPORT unzReadCurrentFile (unzFile file, 
- 					  voidp buf,
--					  unsigned len));
-+					  unsigned len);
- /*
-   Read bytes from the current file (opened by unzOpenCurrentFile)
-   buf contain buffer where data must be copied
-@@ -250,19 +250,19 @@
-     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
- */
- 
--extern z_off_t ZEXPORT unztell OF((unzFile file));
-+extern z_off_t ZEXPORT unztell (unzFile file);
- /*
-   Give the current position in uncompressed data
- */
- 
--extern int ZEXPORT unzeof OF((unzFile file));
-+extern int ZEXPORT unzeof (unzFile file);
- /*
-   return 1 if the end of file was reached, 0 elsewhere 
- */
- 
--extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-+extern int ZEXPORT unzGetLocalExtrafield (unzFile file,
- 											 voidp buf,
--											 unsigned len));
-+											 unsigned len);
- /*
-   Read extra field from the current file (opened by unzOpenCurrentFile)
-   This is the local-header version of the extra field (sometimes, there is
-diff -ur fakenes-0.5.8-old/src/unzip.c fakenes-0.5.8/src/unzip.c
---- fakenes-0.5.8-old/src/unzip.c	2012-08-22 20:51:45.300735366 +0200
-+++ fakenes-0.5.8/src/unzip.c	2012-08-22 20:57:42.596243769 +0200
-@@ -500,7 +500,7 @@
- /*
-   Get Info about the current file in the zipfile, with internal only info
- */
--local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-+local int unzlocal_GetCurrentFileInfoInternal (unzFile file,
-                                                   unz_file_info *pfile_info,
-                                                   unz_file_info_internal 
-                                                   *pfile_info_internal,
-@@ -509,7 +509,7 @@
-                                                   void *extraField,
- 												  uLong extraFieldBufferSize,
-                                                   char *szComment,
--												  uLong commentBufferSize));
-+												  uLong commentBufferSize);
- 
- local int unzlocal_GetCurrentFileInfoInternal (file,
-                                               pfile_info,
diff --git a/games-emulation/fakenes/metadata.xml b/games-emulation/fakenes/metadata.xml
deleted file mode 100644
index b669d82dff83..000000000000
--- a/games-emulation/fakenes/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fakenes</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/fbzx-3.0.0-r1 b/games-emulation/fbzx-3.0.0-r1
new file mode 100644
index 000000000000..71bfba0c685b
--- /dev/null
+++ b/games-emulation/fbzx-3.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib virtual/pkgconfig
+DESCRIPTION=Full Screen Sinclair Spectrum emulator
+EAPI=6
+HOMEPAGE=https://github.com/rastersoft/fbzx
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/libsdl[video] media-sound/pulseaudio media-libs/alsa-lib
+SLOT=0
+SRC_URI=https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> fbzx-3.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=34b8ad3379d74e63b272024ae661fa9b
diff --git a/games-emulation/fbzx/Manifest b/games-emulation/fbzx/Manifest
deleted file mode 100644
index 8ca6b3508aed..000000000000
--- a/games-emulation/fbzx/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fbzx-3.0.0-gentoo.patch 6372 BLAKE2B 0e218a83a4eee9f7fbb632f74eb64358149715835f566c4256cecfa5857c615d732073a1346b0e8f4998fb5c560d7c2d39a083e5c1ae99cf4c889b6de42b8cde SHA512 4de9830dcfe015833939c1795f016d37afa0d364b94de2cc64b941f8d4df2acbe7220be951fa403bab6eba0db4882a8c15c376eac108fe6331e67708515b876e
-DIST fbzx-3.0.0.tar.gz 435239 BLAKE2B 5105995a7972c7310628c0e4d3af7f1a749192bc24ac312e493d8821edf5ec329a65eedcbfa6c8479a4f4d134ca730acef7ee27ef2f89253f2e179c7cf8c2bf1 SHA512 cf2a01a1dde62da03c1f04e91f226859ae4cf06d099597dc1a1554c4ff9782dd287f9d924083829eee40cf0450c053d818f963f68381f9e16e0e61ca1f3d3083
-EBUILD fbzx-3.0.0-r1.ebuild 852 BLAKE2B c2c32bf293dc5803cbbc21b56cc5baee95bfc28f6e258482c3b9499f94cbe2f909329869e86bd1b49a4a5d6fb24054cb999d4bfc1dbbe45dc60ab9a0065e57c0 SHA512 775bfb04e9ba7c1bf47aa69260d4413caa5270202ca12434dd15f870570657d584eb2dee11cb4abeba57765dde96b4df2352a60504429203fa0ff7f44532cebf
-MISC metadata.xml 469 BLAKE2B 9c35e70c04d622fbda873c4f3d225b5a7813627bfc6bb01e14ebf011869385d9449652d056e3f2a4ff175337b55e63f987234fa2b3b600576611ec42f01187ca SHA512 72d484a764834cd1691665dea6904f154af7a4a6f4c8dc43eaeafe71ec775c8bf0b62ffe42d3cf244829292ff4d0f8a677eccce1902110b94e6f1fdd31219a25
diff --git a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild b/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
deleted file mode 100644
index 8fcb34dbfc9c..000000000000
--- a/games-emulation/fbzx/fbzx-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Full Screen Sinclair Spectrum emulator"
-HOMEPAGE="https://github.com/rastersoft/fbzx"
-SRC_URI="https://github.com/rastersoft/fbzx/archive/3.0.0.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-sound/pulseaudio
-	media-libs/alsa-lib
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i -e "s|/usr/share/|/usr/share/${PN}/|g" src/llscreen.cpp || die
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	dobin src/fbzx
-	insinto "/usr/share/${PN}"
-	doins -r data/{keymap.bmp,spectrum-roms}
-	dodoc AMSTRAD CAPABILITIES FAQ PORTING README* TODO VERSIONS
-	doicon data/fbzx.svg
-	make_desktop_entry fbzx FBZX
-}
diff --git a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch b/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
deleted file mode 100644
index 0e1f02337146..000000000000
--- a/games-emulation/fbzx/files/fbzx-3.0.0-gentoo.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -ru fbzx-3.0.0.orig/src/Makefile fbzx-3.0.0/src/Makefile
---- fbzx-3.0.0.orig/src/Makefile	2015-04-01 17:22:47.000000000 -0400
-+++ fbzx-3.0.0/src/Makefile	2016-04-01 13:15:27.230190807 -0400
-@@ -1,78 +1,74 @@
--CC=g++ -c -O2
--CPP=g++ -c -O2
--LN=g++ -O2
--
- CFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
--CPPFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
-+CXXFLAGS += `pkg-config --cflags sdl libpulse-simple alsa` -D D_SOUND_PULSE -D D_SOUND_ALSA -D D_SOUND_OSS
- LDFLAGS += `pkg-config --libs sdl libpulse-simple alsa`
- 
- 
- fbzx: cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o 
--	$(LN) -o fbzx cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o  $(LDFLAGS)
-+	$(CXX) -o fbzx cargador.o cmdline.o computer.o emulator.o keyboard.o llscreen.o llsound.o menus.o microdrive.o osd.o screen.o signals.o spk_ay.o tape.o Z80free.o Z80free_codes.o Z80free_codesCB.o Z80free_codesED.o Z80free_codesDD.o Z80free_codesFD.o Z80free_codesDDCB.o Z80free_codesFDCB.o $(LDFLAGS)
- 
- Z80free.o: z80free/Z80free.c z80free/Z80free.h
--	$(CC) -o Z80free.o z80free/Z80free.c
-+	$(CXX) -c $(CFLAGS) -o Z80free.o z80free/Z80free.c
- 
- Z80free_codes.o: z80free/Z80free_codes.c z80free/Z80free.h
--	$(CC) -o Z80free_codes.o z80free/Z80free_codes.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codes.o z80free/Z80free_codes.c
- 	
- Z80free_codesCB.o: z80free/Z80free_codesCB.c z80free/Z80free.h
--	$(CC) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesCB.o z80free/Z80free_codesCB.c
- 
- Z80free_codesED.o: z80free/Z80free_codesED.c z80free/Z80free.h
--	$(CC) -o Z80free_codesED.o z80free/Z80free_codesED.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesED.o z80free/Z80free_codesED.c
- 	
- Z80free_codesDD.o: z80free/Z80free_codesDD.c z80free/Z80free.h
--	$(CC) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesDD.o z80free/Z80free_codesDD.c
- 	
- Z80free_codesFD.o: z80free/Z80free_codesFD.c z80free/Z80free.h
--	$(CC) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesFD.o z80free/Z80free_codesFD.c
- 
- Z80free_codesDDCB.o: z80free/Z80free_codesDDCB.c z80free/Z80free.h
--	$(CC) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesDDCB.o z80free/Z80free_codesDDCB.c
- 	
- Z80free_codesFDCB.o: z80free/Z80free_codesFDCB.c z80free/Z80free.h
--	$(CC) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
-+	$(CXX) -c $(CFLAGS) -o Z80free_codesFDCB.o z80free/Z80free_codesFDCB.c
- 
- cargador.o: cargador.cpp spk_ay.hh keyboard.hh emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh cargador.hh
--	$(CPP) $(CPPFLAGS) -o cargador.o cargador.cpp
-+	$(CXX) -c $(CXXFLAGS) -o cargador.o cargador.cpp
- 
- cmdline.o: cmdline.cpp cmdline.hh
--	$(CPP) $(CPPFLAGS) -o cmdline.o cmdline.cpp
-+	$(CXX) -c $(CXXFLAGS) -o cmdline.o cmdline.cpp
- 
- computer.o: computer.cpp z80free/Z80free.h llsound.hh keyboard.hh computer.hh screen.hh signals.hh llscreen.hh tape.hh emulator.hh osd.hh spk_ay.hh microdrive.hh menus.hh
--	$(CPP) $(CPPFLAGS) -o computer.o computer.cpp
-+	$(CXX) -c $(CXXFLAGS) -o computer.o computer.cpp
- 
- emulator.o: emulator.cpp spk_ay.hh keyboard.hh llsound.hh cmdline.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh microdrive.hh menus.hh cargador.hh
--	$(CPP) $(CPPFLAGS) -o emulator.o emulator.cpp
-+	$(CXX) -c $(CXXFLAGS) -o emulator.o emulator.cpp
- 
- keyboard.o: keyboard.cpp menus.hh llscreen.hh llsound.hh computer.hh screen.hh signals.hh z80free/Z80free.h tape.hh emulator.hh osd.hh keyboard.hh
--	$(CPP) $(CPPFLAGS) -o keyboard.o keyboard.cpp
-+	$(CXX) -c $(CXXFLAGS) -o keyboard.o keyboard.cpp
- 
- llscreen.o: llscreen.cpp osd.hh font.h llscreen.hh
--	$(CPP) $(CPPFLAGS) -o llscreen.o llscreen.cpp
-+	$(CXX) -c $(CXXFLAGS) -o llscreen.o llscreen.cpp
- 
- llsound.o: llsound.cpp emulator.hh screen.hh osd.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh llsound.hh
--	$(CPP) $(CPPFLAGS) -o llsound.o llsound.cpp
-+	$(CXX) -c $(CXXFLAGS) -o llsound.o llsound.cpp
- 
- menus.o: menus.cpp spk_ay.hh microdrive.hh z80free/Z80free.h keyboard.hh llsound.hh llscreen.hh menus.hh tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh cargador.hh
--	$(CPP) $(CPPFLAGS) -o menus.o menus.cpp
-+	$(CXX) -c $(CXXFLAGS) -o menus.o menus.cpp
- 
- microdrive.o: microdrive.cpp osd.hh emulator.hh screen.hh z80free/Z80free.h computer.hh signals.hh llscreen.hh tape.hh microdrive.hh
--	$(CPP) $(CPPFLAGS) -o microdrive.o microdrive.cpp
-+	$(CXX) -c $(CXXFLAGS) -o microdrive.o microdrive.cpp
- 
- osd.o: osd.cpp osd.hh
--	$(CPP) $(CPPFLAGS) -o osd.o osd.cpp
-+	$(CXX) -c $(CXXFLAGS) -o osd.o osd.cpp
- 
- screen.o: screen.cpp keyboard.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
--	$(CPP) $(CPPFLAGS) -o screen.o screen.cpp
-+	$(CXX) -c $(CXXFLAGS) -o screen.o screen.cpp
- 
- signals.o: signals.cpp signals.hh
--	$(CPP) $(CPPFLAGS) -o signals.o signals.cpp
-+	$(CXX) -c $(CXXFLAGS) -o signals.o signals.cpp
- 
- spk_ay.o: spk_ay.cpp spk_ay.hh llsound.hh computer.hh screen.hh signals.hh llscreen.hh z80free/Z80free.h tape.hh emulator.hh osd.hh
--	$(CPP) $(CPPFLAGS) -o spk_ay.o spk_ay.cpp
-+	$(CXX) -c $(CXXFLAGS) -o spk_ay.o spk_ay.cpp
- 
- tape.o: tape.cpp z80free/Z80free.h tape.hh signals.hh emulator.hh screen.hh osd.hh computer.hh llscreen.hh
--	$(CPP) $(CPPFLAGS) -o tape.o tape.cpp
-+	$(CXX) -c $(CXXFLAGS) -o tape.o tape.cpp
- 
-diff -ru fbzx-3.0.0.orig/src/menus.cpp fbzx-3.0.0/src/menus.cpp
---- fbzx-3.0.0.orig/src/menus.cpp	2015-04-01 17:22:47.000000000 -0400
-+++ fbzx-3.0.0/src/menus.cpp	2016-04-01 13:15:33.213974823 -0400
-@@ -1691,7 +1691,7 @@
- 
- void keyboard_menu() {
- 
--	llscreen->paint_picture("fbzx/keymap.bmp");
-+	llscreen->paint_picture("keymap.bmp");
- 	print_copy();
- 	wait_key();
- 	llscreen->clear_screen();
diff --git a/games-emulation/fbzx/metadata.xml b/games-emulation/fbzx/metadata.xml
deleted file mode 100644
index 375b39e89bcb..000000000000
--- a/games-emulation/fbzx/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-		FBZX is a Sinclair Spectrum emulator, designed to work at full screen
-		using the FrameBuffer.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">rastersoft/fbzx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/fceux-2.2.3 b/games-emulation/fceux-2.2.3
new file mode 100644
index 000000000000..3533fda9b409
--- /dev/null
+++ b/games-emulation/fceux-2.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=lua? ( dev-lang/lua:0 ) media-libs/libsdl[opengl?,video] logo? ( media-libs/gd[png] ) opengl? ( virtual/opengl ) gtk? ( x11-libs/gtk+:3 ) sys-libs/zlib[minizip] dev-util/scons[python_targets_python2_7]
+DESCRIPTION=A portable Famicom/NES emulator, an evolution of the original FCE Ultra
+EAPI=5
+HOMEPAGE=http://fceux.com/
+IUSE=gtk logo +lua +opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua? ( dev-lang/lua:0 ) media-libs/libsdl[opengl?,video] logo? ( media-libs/gd[png] ) opengl? ( virtual/opengl ) gtk? ( x11-libs/gtk+:3 ) sys-libs/zlib[minizip]
+SLOT=0
+SRC_URI=mirror://sourceforge/fceultra/fceux-2.2.3.src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7
+_md5_=25c7f2802fd46a71d1acdca0754a8f7f
diff --git a/games-emulation/fceux/Manifest b/games-emulation/fceux/Manifest
deleted file mode 100644
index 7b3b3d33444a..000000000000
--- a/games-emulation/fceux/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fceux-2.2.2-warnings.patch 1306 BLAKE2B eb52e35f7933e1d194ca14b9d6a782f727e3b120ce8632f2b3db2036b06b7328d4dbf2f3e8fcd2cd27511f811b56e2840c943855076768598c0d899c59ffddc7 SHA512 75df61b98e94ce659a1cc9732a491cdcfe6b826ce9d8f9b22e5542217ade6074e86429cdcc326cb770a21fff049cf20760f8172c4b3ce52de1ee404ff5a7193a
-DIST fceux-2.2.3.src.tar.gz 9292792 BLAKE2B 44412934a50f2cab581cb194932a079071e8c7c1cb4cb4d173e9d7cf4898806fe1b0948d6e86fd70d1265eb596c47f77f751e3a113f03aba9b95e1f5def9c2a8 SHA512 6deb83e9e773694f4040f5f325b0b5b4f45d58bb3481db67b4659c940d90c4c87e3ffeac712b72ddb3f5d089cd9fc7b55b497db61f708c23a7c43c17eda55c7b
-EBUILD fceux-2.2.3.ebuild 1191 BLAKE2B 6471d82ac2f1ef1d0fcf36fe59b5b5d29c103f6c32739242c244fb834bd2fde62bf12e0c7f7c1eb6b0b2e59bdf1aefcbdb1f911ef144146f903b8be795d82439 SHA512 793f5ce80df5e0ee4b116fd89c68b6923a2fbf02cd54f632cddd69345289e783b61a2c6a09464efa21de4881bb3d7446a6ba1b2dc29c518d4caa26b52f3fd81f
-MISC metadata.xml 432 BLAKE2B 69c86fec99d0d08d0672142afbb39b2f2c352af4a8ff953516522f721e2482a4624b542593c8eac0be3570a75037cf27b0c48bd19033429d1c5d66e85fcdb952 SHA512 f6f073a198d89d195daa4da1c4c8bdf631258db0ff8cc5fefd9d8a6d93beb38081d37a70df0d0f62d7bf79f7595a3456d88ac0c724535d8c453f3096d2256b96
diff --git a/games-emulation/fceux/fceux-2.2.3.ebuild b/games-emulation/fceux/fceux-2.2.3.ebuild
deleted file mode 100644
index 93ccbe28693f..000000000000
--- a/games-emulation/fceux/fceux-2.2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit desktop epatch scons-utils
-
-DESCRIPTION="A portable Famicom/NES emulator, an evolution of the original FCE Ultra"
-HOMEPAGE="http://fceux.com/"
-SRC_URI="mirror://sourceforge/fceultra/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk logo +lua +opengl"
-
-RDEPEND="
-	lua? ( dev-lang/lua:0 )
-	media-libs/libsdl[opengl?,video]
-	logo? ( media-libs/gd[png] )
-	opengl? ( virtual/opengl )
-	gtk? ( x11-libs/gtk+:3 )
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.2.2-warnings.patch
-}
-
-src_compile() {
-	escons \
-		GTK=0 \
-		CREATE_AVI=1 \
-		SYSTEM_LUA=1 \
-		SYSTEM_MINIZIP=1 \
-		$(use_scons gtk GTK3) \
-		$(use_scons logo LOGO) \
-		$(use_scons opengl OPENGL) \
-		$(use_scons lua LUA)
-}
-
-src_install() {
-	dobin bin/fceux
-
-	doman documentation/fceux.6
-	docompress -x /usr/share/doc/${PF}/documentation /usr/share/doc/${PF}/fceux.chm
-	dodoc -r Authors changelog.txt TODO-SDL bin/fceux.chm documentation
-	rm -f "${D}/usr/share/doc/${PF}/documentation/fceux.6"
-	make_desktop_entry fceux FCEUX
-	doicon fceux.png
-}
diff --git a/games-emulation/fceux/files/fceux-2.2.2-warnings.patch b/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
deleted file mode 100644
index f0af4631abda..000000000000
--- a/games-emulation/fceux/files/fceux-2.2.2-warnings.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru fceux-2.2.2.orig/src/input.cpp fceux-2.2.2/src/input.cpp
---- fceux-2.2.2.orig/src/input.cpp	2013-06-15 15:44:11.000000000 -0400
-+++ fceux-2.2.2/src/input.cpp	2014-12-31 01:32:46.302001912 -0500
-@@ -1161,7 +1161,7 @@
- 	// FIXME this will always evaluate to true, should this be

- 	// if (*lastSavestateMade...) to check if it holds a string or just

- 	// a '\0'?

--	if (lastSavestateMade && (undoSS || redoSS))

-+	if (*lastSavestateMade && (undoSS || redoSS))

- 		SwapSaveState();

- }

- 

-diff -ru fceux-2.2.2.orig/src/state.cpp fceux-2.2.2/src/state.cpp
---- fceux-2.2.2.orig/src/state.cpp	2013-09-18 19:03:59.000000000 -0400
-+++ fceux-2.2.2/src/state.cpp	2014-12-31 01:33:11.453155054 -0500
-@@ -1048,7 +1048,7 @@
- 	//Both files must exist

- 	//--------------------------------------------------------------------------------------------

- 

--	if (!lastSavestateMade)

-+	if (!*lastSavestateMade)

- 	{

- 		FCEUI_DispMessage("Can't Undo",0);

- 		FCEUI_printf("Undo savestate was attempted but unsuccessful because there was not a recently used savestate.\n");

-@@ -1153,7 +1153,7 @@
- void RedoLoadState()

- {

- 	if (!redoLS) return;

--	if (lastLoadstateMade && redoLS)

-+	if (*lastLoadstateMade && redoLS)

- 	{

- 		FCEUSS_Load(lastLoadstateMade);

- 		FCEUI_printf("Redoing %s\n",lastLoadstateMade);

diff --git a/games-emulation/fceux/metadata.xml b/games-emulation/fceux/metadata.xml
deleted file mode 100644
index a6bb4cbf9bfa..000000000000
--- a/games-emulation/fceux/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="logo">Enable the ability to add a logo screen when creating AVIs</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">fceultra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/gambatte-0.5.0_p20131102-r2 b/games-emulation/gambatte-0.5.0_p20131102-r2
new file mode 100644
index 000000000000..89e38b3bbf9d
--- /dev/null
+++ b/games-emulation/gambatte-0.5.0_p20131102-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[X,sound,joystick,video] sys-libs/zlib dev-util/scons[python_targets_python2_7]
+DESCRIPTION=An accuracy-focused Gameboy / Gameboy Color emulator
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gambatte
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,sound,joystick,video] sys-libs/zlib
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/gambatte-0.5.0_p20131102.tar.xz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7
+_md5_=12675c7e7c10deaeff9a28623a866254
diff --git a/games-emulation/gambatte/Manifest b/games-emulation/gambatte/Manifest
deleted file mode 100644
index a5191aaacb28..000000000000
--- a/games-emulation/gambatte/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gambatte-0.5.0_p20131102.tar.xz 353212 BLAKE2B ad17289f29a00230d7ccec2825d6487ed994a6148a931254a9d5c941c5dbb643c5eb4dbd9f43decfcb86fb693f82358e795a4912c4d40258b27b0d8611961ec1 SHA512 9f27af85d2fceb128231eb3e5bf2806a1773c575990296f37eb3c0a14bca5c72f7f161cdf77f710f4ff85b2b3266db9ba098e5ef6772bc5bf7b2c97b8281999b
-EBUILD gambatte-0.5.0_p20131102-r2.ebuild 1624 BLAKE2B 59fd76fbfc8afd9aaa57f77d3aca89277e0bdf96c5bfda0f098845b4e3b6d47ec629d0a8b1fc8e84583dbf8868c23772a0a581e65024d04625a0342d4a2ecd88 SHA512 ee9838bc274b9c6682af17b8c185d81d7ec1b176eec3d386e3da6e489489b3f5cc9b74d5c3aaa840ce7047bd83e52b87f4304a847437cf69d9a21a6d7a3bfb77
-MISC metadata.xml 331 BLAKE2B b739e6db5361a25503fed526b7417578fff92612b1ca90c4a6e8578bd678f3b3b69736238a9ad882a654c7c9bd66b8d1ac296899129610b23ab96918067012d8 SHA512 c46ee0b944bbf88420eb47c11f60d00a6516fe2bb28b5078e8f11857636f16381969cac9edb98d554d07d0894c224817e12560410092ca532da036e697433b1a
diff --git a/games-emulation/gambatte/gambatte-0.5.0_p20131102-r2.ebuild b/games-emulation/gambatte/gambatte-0.5.0_p20131102-r2.ebuild
deleted file mode 100644
index 57ce854affa0..000000000000
--- a/games-emulation/gambatte/gambatte-0.5.0_p20131102-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit scons-utils
-
-DESCRIPTION="An accuracy-focused Gameboy / Gameboy Color emulator"
-HOMEPAGE="https://sourceforge.net/projects/gambatte"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[X,sound,joystick,video]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-fix_scons() {
-	local i
-	for i; do
-		cat >> $i << END
-import os
-import SCons.Util
-
-if os.environ.has_key('AR'):
-	env['AR'] = os.environ['AR']
-if os.environ.has_key('RANLIB'):
-	env['RANLIB'] = os.environ['RANLIB']
-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'])
-if os.environ.has_key('CXX'):
-	env['CXX'] = os.environ['CXX']
-if os.environ.has_key('CXXFLAGS'):
-	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-if os.environ.has_key('CPPFLAGS'):
-	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS'])
-if os.environ.has_key('LDFLAGS'):
-	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-END
-	done
-}
-
-src_prepare() {
-	default
-
-	# Fix zlib/minizip build error
-	sed -i \
-		-e '1i#define OF(x) x' \
-		libgambatte/src/file/unzip/{unzip,ioapi}.h \
-		|| die "sed iompi.h failed"
-
-	fix_scons {gambatte_sdl,libgambatte}/SConstruct
-}
-
-src_compile() {
-	# build core library
-	cd "${S}"/libgambatte || die
-	escons
-
-	# build sdl frontend
-	cd "${S}"/gambatte_sdl || die
-	escons
-}
-
-src_install() {
-	dobin gambatte_sdl/gambatte_sdl
-	einstalldocs
-}
diff --git a/games-emulation/gambatte/metadata.xml b/games-emulation/gambatte/metadata.xml
deleted file mode 100644
index a2f679865cad..000000000000
--- a/games-emulation/gambatte/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gambatte</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/gcube-0.4-r2 b/games-emulation/gcube-0.4-r2
new file mode 100644
index 000000000000..abfc1595b1ab
--- /dev/null
+++ b/games-emulation/gcube-0.4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] virtual/jpeg:0 sys-libs/ncurses:0= sys-libs/zlib
+DESCRIPTION=Gamecube emulator
+EAPI=6
+HOMEPAGE=http://gcube.exemu.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] virtual/jpeg:0 sys-libs/ncurses:0= sys-libs/zlib
+SLOT=0
+SRC_URI=http://gcube.exemu.net/downloads/gcube-0.4-src.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_=cd56f5f6313b06c3ae2b570f495e0ea3
diff --git a/games-emulation/gcube/Manifest b/games-emulation/gcube/Manifest
deleted file mode 100644
index 9f1dd254f3bf..000000000000
--- a/games-emulation/gcube/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gcube-0.4-gcc47.patch 429 BLAKE2B 2da4477aa5fc8b33bae0404a5347e6a0bac493ed2c2ff54d743d1d1920a7055c89f2c3b4e9ebe29a42f88991cd45ad9702916070a91895bca2c465fb1c14d505 SHA512 e6cf8d03734d26b5051c50f9fbb3ae3d62f34ea2dc6a29177cac72426c9a5e5887acf88cff437c0b830eff5648ac30f477a9fea4e945cc53b9606788cff80889
-AUX gcube-0.4-ldflags.patch 915 BLAKE2B 7bc5425df1dd9a7afdc2844c7e4044f634c824c4b857c49162e73cad98f888049beda2963c353c7e9c412c680e5c49ebe91d57f94b4158338a322f542414f513 SHA512 62343ae3871a406e21c219a779e568b5a053cc474893b5ad690f8995b01c86cabecf5e1e9c55d91f0adab046f652f2f6d9b3c298edc92872d62976d6de2733f4
-AUX gcube-0.4-underlink.patch 447 BLAKE2B 05fea68713edaf3d38656fb5911a64d48b8ae7bda74c50153ddf63beabad8cdf36eb311dc40233728b5900d4797858f89d0b3ba0b3d57212603ae391b1dac4c3 SHA512 e916f3b3f901857f6c7af1bdbdf06ec9ae649d42ed9a166f146c4a319c67644312614550c17a7c4269dd116b6a5a03cf87a62acd5db8b29fc4fa4413b68ed36d
-DIST gcube-0.4-src.tar.bz2 803503 BLAKE2B a9f5db1b824d5319e89a5e865c1ca539a2f11458f4c542d34168c06b79f9f589ea928768ca26275f31aad51b01f51efe8453a1121ba947aaf067beb2f9dea13f SHA512 f73665386d547322f20ed5e358f4f394b07d74fd90bddbfe1158a7a5d896bff36dabc9833f2d820a7af7673b8c8af62490f7fa07b06a2bbca4df6356a1e3c91a
-EBUILD gcube-0.4-r2.ebuild 922 BLAKE2B fc74e6ce689ed888c61d254c1daa5102e0ed205a0609794ef5993914e7396e55bf88574817850daa8d9223cd3c17e8696044121054e80a603d5b4103e1de63d5 SHA512 e3515c29982ed53c204d7d8c09e081c3fd81adc085914249cf02b818055f8374a44d6884a5cf8335444ecb29875d9e0abf717337723013c903d69dfee34f3ccb
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gcube/files/gcube-0.4-gcc47.patch b/games-emulation/gcube/files/gcube-0.4-gcc47.patch
deleted file mode 100644
index 48ac167a1f0d..000000000000
--- a/games-emulation/gcube/files/gcube-0.4-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.rules.old	2012-10-23 14:06:54.417782365 +0200
-+++ b/Makefile.rules	2012-10-23 14:07:11.516377033 +0200
-@@ -1,6 +1,6 @@
- 
- SDL_CONFIG=sdl-config
--LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL) -lm
-+LIBS=`$(SDL_CONFIG) --libs` -lz -l$(OPENGL) -lm
- 
- PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
- OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
diff --git a/games-emulation/gcube/files/gcube-0.4-ldflags.patch b/games-emulation/gcube/files/gcube-0.4-ldflags.patch
deleted file mode 100644
index b4a64f16aede..000000000000
--- a/games-emulation/gcube/files/gcube-0.4-ldflags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile.rules.old	2010-10-01 07:16:16.000000000 +0200
-+++ b/Makefile.rules	2010-10-01 07:18:04.000000000 +0200
-@@ -88,22 +88,22 @@
- profiler:	default
- 
- gcube:  $(OBJECTS) gcube.o
--	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $^ -o $@ $(LIBS)
- 
- gcubedbg:  $(OBJECTS) gcubedbg.o cpu_dbg.o
- 	$(CC) $(CFLAGS) $^ -o $@ $(LIBS)
- 
- bin2dol:	bin2dol.c general.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(LDFLAGS) $(CFLAGS) $^ -o $@
- 
- tplx: tplx.o general.o
--	$(CC) $(CFLAGS) $^ -o $@
-+	$(CC) $(LDFLAGS) $(CFLAGS) $^ -o $@
- 
- thpview: thpview.o general.o jpeg_tools.o
--	$(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` $^ -o $@ -ljpeg `$(SDL_CONFIG) --libs`
-+	$(CC) $(LDFLAGS) $(CFLAGS) `$(SDL_CONFIG) --cflags` $^ -o $@ -ljpeg `$(SDL_CONFIG) --libs`
- 
- isopack: isopack.o general.o
--	$(CC) $(CFLAGS) $^ -o $@ -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) $^ -o $@ -lz
- 
- ppc_disasm.o: ppc_disasm.c
- 	$(CC) -g -c -o $@ $<
diff --git a/games-emulation/gcube/files/gcube-0.4-underlink.patch b/games-emulation/gcube/files/gcube-0.4-underlink.patch
deleted file mode 100644
index f4b3d5b6969d..000000000000
--- a/games-emulation/gcube/files/gcube-0.4-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.rules.old	2011-06-10 14:14:08.372105234 +0200
-+++ b/Makefile.rules	2011-06-10 14:14:18.504746649 +0200
-@@ -1,6 +1,6 @@
- 
- SDL_CONFIG=sdl-config
--LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL)
-+LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL) -lm
- 
- PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage
- OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE)
diff --git a/games-emulation/gcube/gcube-0.4-r2.ebuild b/games-emulation/gcube/gcube-0.4-r2.ebuild
deleted file mode 100644
index 6194fc6a2103..000000000000
--- a/games-emulation/gcube/gcube-0.4-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Gamecube emulator"
-HOMEPAGE="http://gcube.exemu.net/"
-SRC_URI="http://gcube.exemu.net/downloads/${P}-src.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	media-libs/libsdl[joystick,opengl,sound,video]
-	virtual/jpeg:0
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PV}"
-
-src_prepare() {
-	default
-
-	sed -i -e '/^CFLAGS=-g/d' Makefile.rules || die
-
-	eapply "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-
-	sed -i -e '/^CC=/d' Makefile || die
-
-	append-cflags -std=gnu89 # build with gcc5 (bug #570504)
-}
-
-src_install() {
-	local x
-
-	dobin gcmap gcube
-	for x in bin2dol isopack thpview tplx ; do
-		newbin ${x} ${PN}-${x}
-	done
-
-	einstalldocs
-}
diff --git a/games-emulation/gcube/metadata.xml b/games-emulation/gcube/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/gcube/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/generator-0.35_p4-r1 b/games-emulation/generator-0.35_p4-r1
new file mode 100644
index 000000000000..36134c296043
--- /dev/null
+++ b/games-emulation/generator-0.35_p4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=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=Sega Genesis / Mega Drive emulator
+EAPI=6
+HOMEPAGE=http://www.squish.net/generator/
+IUSE=+sdlaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.squish.net/generator/cbiere/generator/generator-0.35-cbiere-r4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e32416b56986a9701a24fc86fbf14081
diff --git a/games-emulation/generator/Manifest b/games-emulation/generator/Manifest
deleted file mode 100644
index 95dc701335c6..000000000000
--- a/games-emulation/generator/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX generator-0.35_p4-configure.patch 3634 BLAKE2B 726c133bb419bc8226d31043b851cceb6077e8a3dc7fd4a351d9117933b219012d812b25c6b96b0569e066191adc786e2ec02ed723b7eb14ca3e3e326188aa40 SHA512 bed25bc2d951d4c369265b4790754ba4e63d5beda803a655dc240ac76004b57ba1bc3823c4a35f6fa2ee5e5a9b22827c46e090f63536b4d6b959986cc016c1ed
-AUX generator-0.35_p4-inline.patch 465 BLAKE2B 8818f566ad1987e09fbc49eae5b216c5d620bfa989fdbed61e0c700862ee9fd6f20e6e0010284ee6854a8fc4299a685fde41937f2d5e32675298f3adf8615b4c SHA512 9776dbe2e8f725b8f542ae382fe8da193987c9e12d857c359de2c32402f4dee729c92837aa543efe4ba7c6c66d81e3e505496a783598621d20f724509d4358ba
-AUX generator-0.35_p4-underlink.patch 513 BLAKE2B 8424efa3326db4f627ffab9a8a6c8f55e0f5477f31a830fada195d6cfd3ded01734d70981ea27ca06341009385ea00cbe1ac3f7ffa23bdba5eb3f2c35f800820 SHA512 0947c6365ee33d15c136906385da761e0f6e4d92356b0e3eaf8c3cdcd82c87982d18e6bc35690ac448b9e9dab213358f5f55c0d3be2f3eaece7bdd776479319b
-DIST generator-0.35-cbiere-r4.tar.bz2 435289 BLAKE2B 962785fd5f87cfd03cba3238fb0d9d29b6ea42f2b44a5314c328c1c008f9fe005696556be79632e36e29948474612a8f3014dfecd47eca06014b1d7174787ed5 SHA512 73fd36d8004135c172025b3eb3385f731e294935413d7ac905672f1a88434ca332325821c5f15d5ae83fb1385fcde9f1e7f32242f8ac175bb96bd535b5d91620
-EBUILD generator-0.35_p4-r1.ebuild 1092 BLAKE2B de4360b80c7109f3c8c0925a67f53a113bb2c48aa50ebdde7c3ade30363eff0ee2b007819936aab0ff8783c292158af9a699bc0cc70503365c7d040ef131240f SHA512 f54d48b13d10a30529a946a44f1a35ecb7dfcf032a578ceda75404affb15058def9ddadc3b2cf40b5b2f2a9922c926f978d108f63fbcc5cd34d410485ddb30e1
-MISC metadata.xml 326 BLAKE2B b5532fc7965a4b39312288491e98a48de5acdf76c1c5c92ddff370631484f6a57160eb2f983f6086d249b6cf9bba8b8dae47633c2bb38325e2d3faa175099253 SHA512 10d43e88d746f422d5751b87175a6ec76468d1f829d65aa554acced5075cfa39b6fd0d589a87d71a3127f70a718653e24444710f3e669dab3c0587a6b138ca67
diff --git a/games-emulation/generator/files/generator-0.35_p4-configure.patch b/games-emulation/generator/files/generator-0.35_p4-configure.patch
deleted file mode 100644
index a918c4a97113..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-configure.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/configure.ac.original	2008-03-17 13:07:48.000000000 -0400
-+++ b/configure.ac	2008-03-17 13:08:03.000000000 -0400
-@@ -28,15 +28,12 @@
-   AC_ARG_WITH(tcltk,
-               AS_HELP_STRING(--with-tcltk,Create tcltk version),
-               MY_PROG="generator-tcltk")
--  AC_ARG_WITH(gtk,
--              AS_HELP_STRING(--with-gtk,Create gtk version),
--              MY_PROG="generator-gtk")
-   AC_ARG_WITH(sdl,
-               AS_HELP_STRING(--with-sdl,Create SDL version),
-               [MY_PROG="generator-sdl"; USE_SDL_AUDIO=yes])
-    if [[ "x$MY_PROG" = "x" ]]; then
-     AC_MSG_ERROR(You must select a user interface type:
--    svgalib allegro tcltk gtk sdl)
-+    svgalib allegro tcltk sdl)
-   fi
-   if [[ "x$MY_PROG" = "xgenerator-allegro" ]]; then
-     AC_DEFINE(ALLEGRO, 1, [Allegro version])
-@@ -202,50 +199,6 @@
-       CFLAGS="$CFLAGS -Wstrict-prototypes -Wunused"
-     fi
-   fi
--  if [[ "x$DEBUG" != "xno" ]]; then
--    AC_MSG_RESULT(Turning on debug flags)
--    CFLAGS="$CFLAGS -g -O"
--    optimum=no
--  else
--    if [[ "x$GCCVER" != "xno" ]]; then
--      AC_MSG_RESULT(Turning on gcc optimisations)
--      CFLAGS="$CFLAGS -O3 -fomit-frame-pointer"
--      if [[ "x$GCCVER" = "x3" ]]; then
--        AC_MSG_RESULT(Turning on gcc 3 optimisations)
--        CFLAGS="$CFLAGS -fno-math-errno"
--      fi
--      case "$CFLAGS" in
--        *mcpu*|*march*) AC_MSG_RESULT(Skipping target optimisations)
--              ;;
--        *) case "$target_cpu" in
--             i386) AC_MSG_RESULT(Turning on i386 optimisations)
--                   CFLAGS="$CFLAGS -march=i386 -ffast-math"
--                   ;;
--             i486) AC_MSG_RESULT(Turning on i486 optimisations)
--                   CFLAGS="$CFLAGS -march=i486 -ffast-math"
--                   ;;
--             i586) AC_MSG_RESULT(Turning on pentium optimisations)
--                   # cannot do malign-double as we link to other libraries and
--                   # it would break binary compatibility
--                   CFLAGS="$CFLAGS -march=pentium -ffast-math"
--                   ;;
--             i?86) AC_MSG_RESULT(Turning on i686 optimisations)
--                   # cannot do malign-double as we link to other libraries and
--                   # it would break binary compatibility
--                   CFLAGS="$CFLAGS -march=i686 -ffast-math"
--                   ;;
--             alpha*) AC_MSG_RESULT(Adding -mieee for Alpha)
--                   CFLAGS="$CFLAGS -mieee"
--                   ;;
--                *) AC_MSG_RESULT(Sorry unknown target CPU)
--                   ;;
--           esac
--      esac
--    else
--      AC_MSG_WARN(You did not opt for gcc optimisations!)
--      optimum=no
--    fi
--  fi
-   AC_CHECK_LIB(jpeg, jpeg_start_compress, 
-     [ MY_LIBS="-ljpeg $MY_LIBS"; AC_DEFINE(JPEG, 1, [JPEG features]) ])
- 
-@@ -272,14 +225,7 @@
- 
-   AC_PATH_XTRA
- 
--  if [[ "x$MY_PROG" = "xgenerator-gtk" ]]; then
--    MY_SUBDIRS="glade gtkopts $MY_SUBDIRS"
--    AM_PATH_GTK(1.2.10,,AC_MSG_ERROR(Generator needs gtk 1.2.10 or later))
--    AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
--
--    MY_LIBS="$MY_LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
--    CFLAGS="$CFLAGS $X_CFLAGS"
--  elif [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then
-+  if [[ "x$MY_PROG" = "xgenerator-sdl" ]]; then
-     MY_SUBDIRS="gtkopts $MY_SUBDIRS"
-     AM_PATH_SDL(1.2.6,,AC_MSG_ERROR(Generator needs sdk 1.2.6 or later))
- 
-@@ -305,6 +251,7 @@
-   AC_CHECK_SIZEOF(unsigned long, 4)
-   AC_CHECK_SIZEOF(unsigned long long, 8)
-   AC_CHECK_HEADERS(sys/param.h)
-+  AC_CHECK_HEADERS(sys/time.h)
-   AC_CHECK_HEADERS(bzlib.h)
-   AC_CHECK_HEADERS(zlib.h)
-   AC_CHECK_HEADERS(tcl8.0.h)
diff --git a/games-emulation/generator/files/generator-0.35_p4-inline.patch b/games-emulation/generator/files/generator-0.35_p4-inline.patch
deleted file mode 100644
index e7f09fa3689c..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-inline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur generator-0.35-cbiere-r4/ym2612/support.h generator-0.35-cbiere-r4-patched/ym2612/support.h
---- generator-0.35-cbiere-r4/ym2612/support.h	2005-08-27 05:12:29.000000000 -0400
-+++ generator-0.35-cbiere-r4-patched/ym2612/support.h	2018-03-26 11:49:36.000000000 -0400
-@@ -3,7 +3,7 @@
- #include "config.h"
- 
- #define errorlog 0
--#define INLINE inline
-+#define INLINE
- #define HAS_YM2612 1
- #define YM2612UpdateRequest(x) 
- #define AY8910_set_clock(chip,clock)
diff --git a/games-emulation/generator/files/generator-0.35_p4-underlink.patch b/games-emulation/generator/files/generator-0.35_p4-underlink.patch
deleted file mode 100644
index b350e8b8a334..000000000000
--- a/games-emulation/generator/files/generator-0.35_p4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/main/Makefile.am.old	2011-06-20 21:35:25.832460030 +0200
-+++ b/main/Makefile.am	2011-06-20 21:36:29.490503981 +0200
-@@ -7,7 +7,7 @@
- bin_PROGRAMS = @PROGRAM@
- EXTRA_PROGRAMS = generator-svgalib generator-tcltk generator-allegro \
-                  generator-gtk generator-sdl
--LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ \
-+LDADD = ../cpu68k/lib68k.a ../ym2612/libym2612.a @MY_LIBS@ -lm \
-         ../sn76496/libsn76496.a
- 
- ## this should be generator_tcltk_DATA but it won't let me do that
diff --git a/games-emulation/generator/generator-0.35_p4-r1.ebuild b/games-emulation/generator/generator-0.35_p4-r1.ebuild
deleted file mode 100644
index 14ef210d58a8..000000000000
--- a/games-emulation/generator/generator-0.35_p4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs
-
-MY_P="${PN}-${PV/_p/-cbiere-r}"
-DESCRIPTION="Sega Genesis / Mega Drive emulator"
-HOMEPAGE="http://www.squish.net/generator/"
-SRC_URI="http://www.squish.net/generator/cbiere/generator/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sdlaudio"
-
-RDEPEND="
-	virtual/jpeg:0
-	media-libs/libsdl[joystick,video]
-	sdlaudio? ( media-libs/libsdl[sound] )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-inline.patch
-
-	sed -i -e 's/@GTK_CFLAGS@//g' main/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-cmz80 \
-		--with-sdl \
-		--without-tcltk \
-		--with-gcc=$(gcc-major-version) \
-		$(use_with sdlaudio sdl-audio)
-}
-
-src_compile() {
-	[[ -f Makefile ]] && emake clean
-	emake -j1
-}
-
-src_install() {
-	dobin main/generator-sdl
-	dodoc AUTHORS ChangeLog NEWS README TODO docs/*
-}
diff --git a/games-emulation/generator/metadata.xml b/games-emulation/generator/metadata.xml
deleted file mode 100644
index 4f260fbfd598..000000000000
--- a/games-emulation/generator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="sdlaudio">Enable SDL Audio</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-emulation/gens-2.15.5-r1 b/games-emulation/gens-2.15.5-r1
new file mode 100644
index 000000000000..7d2298093e2e
--- /dev/null
+++ b/games-emulation/gens-2.15.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/opengl >=media-libs/libsdl-1.2[joystick,video] x11-libs/gtk+:2 >=dev-lang/nasm-0.98
+DESCRIPTION=A Sega Genesis/CD/32X emulator
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gens/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl >=media-libs/libsdl-1.2[joystick,video] x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/gens/gens-2.15.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=afdb1cd8583e7641c267594bff9b0313
diff --git a/games-emulation/gens/Manifest b/games-emulation/gens/Manifest
deleted file mode 100644
index 9d767dd2b427..000000000000
--- a/games-emulation/gens/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gens-2.15.5-as-needed.patch 367 BLAKE2B 145f1d54665e2a0a50a11c18bca22c9ec17b420d3439812f4d82ca259486ee4e3ffcf8b47a5cff7bd61a838ad6723ce9fa9d1d4448d3d51b5638861d5109f970 SHA512 be44bd13b869a9181d740f850dcb7a6f6cfc8660bf31cdf515beffa989fc64e120e7dc3b683f702ec6059805bc37f18a104f420fd3f84a438f26b09da82dd4a8
-AUX gens-2.15.5-gcc34.patch 1545 BLAKE2B c0a4b73fb0ead7ccd98660c8684e88dc8b04179cee114c3d984b9ab699a8f3f5c680b55068847d225645ea32f03eed21841e0e01aeb2c80d15f40d7ad52a5f13 SHA512 8af2946ac09a18adc2d35ea7797acfdb107b86b29b6bf412a87080e4cc66e45bb5a61823095766bde2ca3e95768a1ac243e39b1d06f9bd99f20b7fdec71d1ef0
-AUX gens-2.15.5-ovflfix.patch 581 BLAKE2B a4b44f6b59e03021f9b68603b0011d88fc14284e3e817c970d97a2e8ebbc1454eef339869da680e0b5073b96a7786fb39a1fa997c0d0a6911837c0220a59b0b1 SHA512 cc21dfabeba4cf413853c8d7d0779448c9aab318c2bd83894622ea132eae645000b77d9ef803bb1643f5f6b1b11263f4dfaf66e50a905730e592a628654c33f7
-AUX gens-2.15.5-romsdir.patch 575 BLAKE2B 2af287d30b5ff6c28a306fb35733cd8a715ffe1ae20da117b5f9dd3520f54c39a906d9bcd6b6003ce2cb4bd09d55d10bf25164d71f9400548360b9736cb5aa06 SHA512 73b75f4b8087931b20b1b8c220ce64e957ca0cdeb91a59a90b29b4376420e567093f0ae6d6525cdf3930f555720b27c9f152ec5bbf0365743a0bac236da115e6
-DIST gens-2.15.5.tar.gz 741852 BLAKE2B 17501077737ea7320f9675c130c89cc0e078ad413e7af32c55c5db8d0fa2ba099db26d1272c32e09e86bb11fd49f364b0597540261414d366198afb24a10bc7a SHA512 7163f6a1e09bac420e0e4aa0f8f3ed255406d9aff3cc7366c40226e7fece78baca5428d0fe87daf0f12f6e10b428477a795b54d008db5e3dcbf7692ed9d9fe7d
-EBUILD gens-2.15.5-r1.ebuild 1039 BLAKE2B 3f45d90fe1ed3b9210a03fe33fec6d86d75854dde240aa45d6c9ccb3acdd013108280a40c81518eb5cb9e1ad26f9e88cd796a79f8d085dbc30adda55b4426679 SHA512 9a2486425226271ab06d8c5977590f86885748c63b51c35246e55ea5ffd69f22ee909214b8d2d084c6444e881857306f1729e1819b349d59ae2f0d1a079265ed
-MISC metadata.xml 327 BLAKE2B 2eb11640da9741a65ebe22b58a03e88d5432c69cef02a4db90801bc65d06987e3a8056401efca51ed70846666922d312bb1f38189cea7a53e9e0c1afbde55fa9 SHA512 651fefa76d513b3f2a0ecf865547bf7046605ef21fa689e620820464a28b3b2e5b288623e7ca71bcae93cc016871240025caf1fdb04a45a0695ec457098434b4
diff --git a/games-emulation/gens/files/gens-2.15.5-as-needed.patch b/games-emulation/gens/files/gens-2.15.5-as-needed.patch
deleted file mode 100644
index 2b58e7f94b33..000000000000
--- a/games-emulation/gens/files/gens-2.15.5-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.old       2009-02-04 14:41:40.000000000 +0100
-+++ b/configure   2009-02-04 14:48:52.000000000 +0100
-@@ -4929,7 +4929,7 @@
-        { echo "$as_me:$LINENO: result: $with_opengl" >&5
- echo "${ECHO_T}$with_opengl" >&6; }
-        if test x$with_opengl = xyes; then
--               LDFLAGS="$LDFLAGS -lGL"
-+               LIBS="$LIBS -lGL"
- 
-        fi
- fi
diff --git a/games-emulation/gens/files/gens-2.15.5-gcc34.patch b/games-emulation/gens/files/gens-2.15.5-gcc34.patch
deleted file mode 100644
index 77acd5c4e970..000000000000
--- a/games-emulation/gens/files/gens-2.15.5-gcc34.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-from https://sourceforge.net/p/gens/patches/25/
-
---- gens.orig/src/gens/gens_core/cpu/68k/cpu_68k.c	2004-05-22 09:02:12.000000000 -0700
-+++ gens/src/gens/gens_core/cpu/68k/cpu_68k.c	2005-03-21 10:52:24.000000000 -0800
-@@ -24,9 +24,9 @@
- 
- struct STARSCREAM_PROGRAMREGION M68K_Fetch[] = {
-   {0x000000, 0x3FFFFF, (unsigned) 0x000000},
--  {0xFF0000, 0xFFFFFF, (unsigned) &Ram_68k[0] - 0xFF0000},
--  {0xF00000, 0xF0FFFF, (unsigned) &Ram_68k[0] - 0xF00000},
--  {0xEF0000, 0xEFFFFF, (unsigned) &Ram_68k[0] - 0xEF0000},
-+  {0xFF0000, 0xFFFFFF, (unsigned) NULL},
-+  {0xF00000, 0xF0FFFF, (unsigned) NULL},
-+  {0xEF0000, 0xEFFFFF, (unsigned) NULL},
-   {-1, -1, (unsigned) NULL},
-   {-1, -1, (unsigned) NULL},
-   {-1, -1, (unsigned) NULL}
-@@ -60,7 +60,7 @@
- 
- 
- struct STARSCREAM_PROGRAMREGION S68K_Fetch[] = {
--  {0x000000, 0x07FFFF, (unsigned) &Ram_Prg[0]},
-+  {0x000000, 0x07FFFF, (unsigned) NULL},
-   {-1, -1, (unsigned) NULL},
-   {-1, -1, (unsigned) NULL}
- };
-@@ -109,6 +109,10 @@
- int
- M68K_Init (void)
- {
-+  M68K_Fetch[1].offset=(unsigned) &Ram_68k[0] - 0xFF0000;
-+  M68K_Fetch[2].offset=(unsigned) &Ram_68k[0] - 0xF00000;
-+  M68K_Fetch[3].offset=(unsigned) &Ram_68k[0] - 0xEF0000;
-+  
-   memset (&Context_68K, 0, sizeof (Context_68K));
- 
-   Context_68K.s_fetch = Context_68K.u_fetch = Context_68K.fetch = M68K_Fetch;
-@@ -134,6 +138,8 @@
- int
- S68K_Init (void)
- {
-+  S68K_Fetch[0].offset=(unsigned) &Ram_Prg[0];
-+  
-   memset (&Context_68K, 0, sizeof (Context_68K));
- 
-   Context_68K.s_fetch = Context_68K.u_fetch = Context_68K.fetch = S68K_Fetch;
diff --git a/games-emulation/gens/files/gens-2.15.5-ovflfix.patch b/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
deleted file mode 100644
index fdbef69dba0a..000000000000
--- a/games-emulation/gens/files/gens-2.15.5-ovflfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/gens/gens_core/cpu/68k/cpu_68k.c.old	2010-10-28 09:34:52.000000000 +0200
-+++ b/src/gens/gens_core/cpu/68k/cpu_68k.c	2010-10-28 09:35:53.000000000 +0200
-@@ -239,8 +239,8 @@
-   memset (Ram_Word_2M, 0, 256 * 1024);
-   memset (Ram_Word_1M, 0, 256 * 1024);
- 
--  memset (COMM.Command, 0, 8 * 5);
--  memset (COMM.Status, 0, 8 * 5);
-+  memset (COMM.Command, 0, sizeof (COMM.Command));
-+  memset (COMM.Status, 0, sizeof (COMM.Status));
- 
-   LED_Status = S68K_State = S68K_Mem_WP = S68K_Mem_PM = Ram_Word_State = 0;
-   COMM.Flag = Init_Timer_INT3 = Timer_INT3 = Int_Mask_S68K = 0;
diff --git a/games-emulation/gens/files/gens-2.15.5-romsdir.patch b/games-emulation/gens/files/gens-2.15.5-romsdir.patch
deleted file mode 100644
index c885552f12d5..000000000000
--- a/games-emulation/gens/files/gens-2.15.5-romsdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN gens-rc3.5-opengl/src/gens/util/rom.c gens-rc3.5-opengl-patched/src/gens/util/rom.c
---- a/src/gens/util/file/rom.c	2005-01-10 22:24:01.000000000 +0100
-+++ b/src/gens/util/file/rom.c	2006-10-29 14:58:14.000000000 +0100
-@@ -411,6 +411,9 @@
-     create_file_chooser_dialog ("Open Rom", GTK_FILE_CHOOSER_ACTION_OPEN);
- //      fileselection_set_dir (fd.filesel, Rom_Dir);
-   addRomsFilter (widget);
-+  
-+  gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), Rom_Dir);
-+  
-   res = gtk_dialog_run (GTK_DIALOG (widget));
-   if (res == GTK_RESPONSE_OK)
-     {
diff --git a/games-emulation/gens/gens-2.15.5-r1.ebuild b/games-emulation/gens/gens-2.15.5-r1.ebuild
deleted file mode 100644
index de49e5ffa082..000000000000
--- a/games-emulation/gens/gens-2.15.5-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="A Sega Genesis/CD/32X emulator"
-HOMEPAGE="https://sourceforge.net/projects/gens/"
-SRC_URI="mirror://sourceforge/gens/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	>=media-libs/libsdl-1.2[joystick,video]
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/nasm-0.98
-"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-romsdir.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-gcc34.patch
-	sed -i -e '1i#define OF(x) x' src/gens/util/file/unzip.h || die
-	append-ldflags -Wl,-z,noexecstack
-}
-
-src_configure() {
-	use amd64 && multilib_toolchain_setup x86 #441876
-	econf \
-		--disable-gtktest \
-		--disable-sdltest
-}
-
-src_install() {
-	DOCS="AUTHORS BUGS README gens.txt history.txt" \
-		default
-	newicon pixmaps/gens_small.png ${PN}.png
-	make_desktop_entry "${PN}" "Gens"
-}
diff --git a/games-emulation/gens/metadata.xml b/games-emulation/gens/metadata.xml
deleted file mode 100644
index da30fe35d4bc..000000000000
--- a/games-emulation/gens/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gens</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/gfceux-2.1.1-r1 b/games-emulation/gfceux-2.1.1-r1
new file mode 100644
index 000000000000..96a2aa8f0623
--- /dev/null
+++ b/games-emulation/gfceux-2.1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-python/pygtk >=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 graphical frontend for the FCEUX emulator
+EAPI=5
+HOMEPAGE=http://fceux.com
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/pygtk games-emulation/fceux 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=mirror://sourceforge/fceultra/fceux-2.1.1.src.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_=6632ec0bf6e3db5c8c97bd8a50eb8ae3
diff --git a/games-emulation/gfceux/Manifest b/games-emulation/gfceux/Manifest
deleted file mode 100644
index 74a7bb36002e..000000000000
--- a/games-emulation/gfceux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fceux-2.1.1.src.tar.bz2 3263945 BLAKE2B 96c1dfcf51f34eff273c948d7467c4c5503079423d839c6e52596f5a47bb7a2c148a1603fbd784d838c62476e71818418615f4d10f9d04669d319466b379f078 SHA512 19a1253a3ff1d88baec5636dbebab287b106e5e114081ab4040f52dfcda28b878af748a759e08dc2fe1381eb8f59e728d36993a9aca9ce184ed8760114cf3149
-EBUILD gfceux-2.1.1-r1.ebuild 1258 BLAKE2B 125f8cc0c48c208f9d689be19aba0640d440f295d261f8be796b08497e94f8ae1d6e397f157aa8a8b6ba354d5aed2ef7898e5efbb9986ea983c35476fd0bfa26 SHA512 f95bedd06faf08fc9ffb28a9d229d6dfd20ee298025f8b06c349641d4fe8de23d860b48532fb8171af43e1f4a546a48d669d374bc761dffc2ddc8af7d27d274b
-MISC metadata.xml 331 BLAKE2B b36952158ee85e8e6614447dca54480d07a8e2fc23b059d16ede28fa9b31f65d21b606e0515e073c0d42d770a68cadcfec8965c6e9bd1343ef484f914e977434 SHA512 c64be39c5960c471c673a706561fc8962a9badcd31912280acbc999ec6617f72eaf432e0bd6f148fae4967f6c83770d8468c990cd191376f919207ae85037fa7
diff --git a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild b/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
deleted file mode 100644
index faf11fdaf183..000000000000
--- a/games-emulation/gfceux/gfceux-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils distutils-r1 games
-
-DESCRIPTION="A graphical frontend for the FCEUX emulator"
-HOMEPAGE="http://fceux.com"
-SRC_URI="mirror://sourceforge/fceultra/fceux-${PV}.src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/pygtk"
-RDEPEND="${DEPEND}
-	games-emulation/fceux"
-
-S=${WORKDIR}/${PN}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -i \
-		-e "s#data/gfceux.glade#${GAMES_DATADIR}/${PN}/gfceux.glade#" \
-		src/main.py || die
-}
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doicon -s 48 data/${PN}.png
-	newicon -s 128 data/${PN}_big.png ${PN}.png
-
-	# respect games variables
-	dodir "${GAMES_DATADIR}"/${PN}
-	mv "${ED}"/usr/share/${PN}/* "${ED}${GAMES_DATADIR}"/${PN}/ || die
-
-	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-emulation/gfceux/metadata.xml b/games-emulation/gfceux/metadata.xml
deleted file mode 100644
index 3c71f364aead..000000000000
--- a/games-emulation/gfceux/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fceultra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/gngb-20060309-r1 b/games-emulation/gngb-20060309-r1
new file mode 100644
index 000000000000..6984356d3782
--- /dev/null
+++ b/games-emulation/gngb-20060309-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=media-libs/libsdl[sound,joystick,video] sys-libs/zlib app-arch/bzip2 opengl? ( 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=Gameboy / Gameboy Color emulator
+EAPI=6
+HOMEPAGE=http://m.peponas.free.fr/gngb/
+IUSE=opengl
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,joystick,video] sys-libs/zlib app-arch/bzip2 opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=http://m.peponas.free.fr/gngb/download/gngb-20060309.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0d34dc919ae47342eee2b5ea03f47985
diff --git a/games-emulation/gngb/Manifest b/games-emulation/gngb/Manifest
deleted file mode 100644
index 7a56b75c4b36..000000000000
--- a/games-emulation/gngb/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX gngb-20060309-amd64.patch 982 BLAKE2B 767efcd0db8ae30296a2326ae74b16f2ea776bee490a77ae6c7960ed96ac127e54e6bb896cc4bcaca43a5c3a5508ebb0bcad17c5c7af3add1104c95540090811 SHA512 91f3782ecaeac60ad60c14b8e173099683e85917765f1d8e1ce92edbbba929042e0254c2d7f4432124c1dd2c8965603e88172076bf4e3c6b427e8c46f25c0312
-AUX gngb-20060309-gcc34.patch 623 BLAKE2B 8861c3224bc01d4ce1ec5c062d473bb2ad6f533e834550ba7d53f416d684c44580169d36aa016a65d916f8ffe05aa336f1b60da285e253b7aa288c33f8518860 SHA512 651a0771d1b43762083bece5eb12ecba5833774fb095bdb00c0031e20d11b4a59daae4bdd519a2840a2dd5aa5ea0a852d968da7cf96de8acd7ac1ddd90968167
-AUX gngb-20060309-gcc5.patch 818 BLAKE2B 8b937260859a3bed1339f3d3a253fcc58aff3991503f03fbdc529446666e7a0c344469d10793e6ab31dba42f9b4db4b29181e1e3bdaed23bc41175056cc5f747 SHA512 f61dd42c766ee9fcdd02228401011b38dc9ecc7e87044b34f6d726a4fc9862ebabb39223b83967fce247a675a6cfa8037747e49ead4077b9a0aff522f7377e79
-AUX gngb-20060309-gcc7.patch 1693 BLAKE2B a47637993a219502c6f81750987ea7679935cd07e7cb2ad8ffbdb648a8b11c329ca55585949f172c3b0ce2b18592572a37c4302d59b9172e4d481d1a81871644 SHA512 ff73a5344c1b3d090fbd16c774ffb535f4586cd2b876f71654d1e3e127c1527bb9abe096e24f6c8fb5cff2d19c29b12aa1e6f56e760b00362ff44755711ec433
-AUX gngb-20060309-inline.patch 463 BLAKE2B 8946f6bc81e518b482fb93bac335b3a15a728736a06bb753692d6ac896d1ffc4f550d3aff8b41dbd1bf5d79d38c5c3edf969b7686d9fb05e654e49384d65055b SHA512 6a1916555f7855abde4a1ce3a6ba19575c3b92cd8e3eb9283757b54e1747ee37dce7005c2311d9faaeb5059e8157c742abfba072c912b1c6d5e40555a28c2b25
-AUX gngb-20060309-joystick.patch 2162 BLAKE2B f2c9bf3aad5468e5a4e587489b0737270c07d743a7ee710aada49a041f73d6a8afbdf4b8f1efa7ec2a582603b7a39e75c5b33765d965f9b85538dc7a7ff87d01 SHA512 535fcccfc986fdb4e555d0edca7ad4cbe33ed656a904bd32d4de516a4735ecdc7743e58e38a20d2b6015f515f7dbed6260a974ec92797b497a111b0e5bb1c24c
-AUX gngb-20060309-qwerty.patch 590 BLAKE2B 1042df2d545203547a691322ddfee05a76cd9a8a099e7ce14917f7b93ccee606ff9746a88c056409b838e4cd4a53703248bd1232be177d582a7774a80cf141af SHA512 756923c0d35b42adb69da6bf7c3c7cd89adc6402d758b8f2f50d2e527181841685b108cd9903c70a2e62b7ce3319dd1a784045866d50d9a21eabc870115779b9
-DIST gngb-20060309.tar.gz 168911 BLAKE2B 9377b107c3318041cf903de1661ec6a43078e1cade77b2899b6412616b2c5c32e217d5efc69fcc5324c75242f880493b1b3e678c5bc0a71a4a3ef2dbfd756b4c SHA512 169fdb94eac439240ff15fc2337908cb40e06259338d03c0193a0cb04acb9ee688832fc3157ec56e4e541a8889c4b1a4e7d0efb035b5829ffb856192b60d259f
-EBUILD gngb-20060309-r1.ebuild 951 BLAKE2B ee37545f7f64fc3f75d464523e47768bfb24b27f633481518b66dcf28ac29d5986e8450895bd720950fc9b0f609f1f7267c9f88d161d43cfb59c688713e47797 SHA512 b83debaf3d28f5a7da50dd1cb10b7eaf339cfffdebbec798295dde6c23f520bea064a4ecb43e8e8e2591bbfde1ec9f7554aa7e7972c4bee2af084770c523a9de
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gngb/files/gngb-20060309-amd64.patch b/games-emulation/gngb/files/gngb-20060309-amd64.patch
deleted file mode 100644
index 1e63ee00dd26..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-amd64.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Wed, 16 Aug 2017 22:53:10 +0200
-Subject: reproducible build
-
-Bug-Debian: https://bugs.debian.org/831773
----
- configure.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/configure.in b/configure.in
-index 9b8aeec..145bd73 100644
---- a/configure.in
-+++ b/configure.in
-@@ -90,6 +90,7 @@ fi
- dnl Arch
- 
- case `uname -m` in
-+*x86_64) arch_info=x86_64 ;;
- *686) arch_info=i686 ;;
- *i586) arch_info=i586 ;;
- *i486) arch_info=i486 ;;
-@@ -107,7 +108,7 @@ sys_info=`uname -s`
- AC_MSG_RESULT(System: $sys_info)
- 
- case $arch_info in
--i686|i586|i486|i386) OPT="-O3  -Wno-unused -funroll-loops -fstrength-reduce \
-+x86_64|i686|i586|i486|i386) OPT="-O3  -Wno-unused -funroll-loops -fstrength-reduce \
-                           -ffast-math -falign-functions=2 -falign-jumps=2 \
-                           -falign-loops=2 -fomit-frame-pointer -Wall " ;;
- sun4u)               OPT="-O3  -Wno-unused -funroll-loops -fstrength-reduce \
diff --git a/games-emulation/gngb/files/gngb-20060309-gcc34.patch b/games-emulation/gngb/files/gngb-20060309-gcc34.patch
deleted file mode 100644
index 112569287fd3..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-gcc34.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 19:06:35 +0000
-Subject: FTBFS_with_gcc-3.4_conflicting_types
-
-===================================================================
----
- src/save.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/save.c b/src/save.c
-index c7e4395..bf50bdf 100644
---- a/src/save.c
-+++ b/src/save.c
-@@ -404,6 +404,8 @@ int save_load_rt_info(GNGB_FILE * stream,char op) {
-   return 0;
- }
- 
-+void movie_add_pad(Uint8 pad);
-+
- int save_load_pad_movie(GNGB_FILE * stream,char op) {
-   if (!op) {			/* Write */
-     PAD_SAVE *p=gngb_movie.first_pad;
diff --git a/games-emulation/gngb/files/gngb-20060309-gcc5.patch b/games-emulation/gngb/files/gngb-20060309-gcc5.patch
deleted file mode 100644
index 72dd21a494fb..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-gcc5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Date: Thu, 10 Aug 2017 19:06:36 +0000
-Subject: gngb_fcc5_fix
-
----
- src/cpu.c  | 2 +-
- src/vram.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cpu.c b/src/cpu.c
-index f03a811..57bc209 100644
---- a/src/cpu.c
-+++ b/src/cpu.c
-@@ -2826,7 +2826,7 @@ __inline__ void rom_timer_inc(void) {
-   }
- }
- 
--__inline__ void cpu_run(void) {
-+extern __inline__ void cpu_run(void) {
-   static Uint32 divid_cycle;
-   int v=0;
-   Uint8 a;
-diff --git a/src/vram.c b/src/vram.c
-index 206b625..7213b4e 100644
---- a/src/vram.c
-+++ b/src/vram.c
-@@ -242,7 +242,7 @@ void switch_fullscreen(void) {
-   conf.fs^=1;
- }
- 
--__inline__ Uint8 get_nb_spr(void)
-+extern __inline__ Uint8 get_nb_spr(void)
- {
-   Uint8 *sp=oam_space;
-   Sint16 no_tile,x,y,att;
diff --git a/games-emulation/gngb/files/gngb-20060309-gcc7.patch b/games-emulation/gngb/files/gngb-20060309-gcc7.patch
deleted file mode 100644
index 557e69501dc9..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-gcc7.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Thu, 10 Aug 2017 19:39:05 +0000
-Subject: gcc7
-
-Bug-Debian: https://bugs.debian.org/853425
-Forwarded: no
----
- src/cpu.c    | 10 +++++-----
- src/memory.c |  2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/cpu.c b/src/cpu.c
-index 57bc209..5209548 100644
---- a/src/cpu.c
-+++ b/src/cpu.c
-@@ -61,7 +61,7 @@ static Uint8 a;
- #define H (gbcpu->hl.b.h)
- #define L (gbcpu->hl.b.l)
- 
--__inline__ Uint16 get_word(void)
-+extern __inline__ Uint16 get_word(void)
- {
-   //Uint16 v=((Uint16)(mem_read(PC)));
-   Uint16 v1,v2;
-@@ -74,7 +74,7 @@ __inline__ Uint16 get_word(void)
-   //return v;
- }
- 
--__inline__ Uint8 get_byte(void)
-+extern __inline__ Uint8 get_byte(void)
- {
-   //Uint8 t=mem_read(PC);
-   Uint8 t;
-@@ -83,7 +83,7 @@ __inline__ Uint8 get_byte(void)
-   return t;
- }
- 
--__inline__ void push_r(REG *r)
-+extern __inline__ void push_r(REG *r)
- {
-   //mem_write(--SP,(r)->b.h);
-   //mem_write(--SP,(r)->b.l);
-@@ -93,7 +93,7 @@ __inline__ void push_r(REG *r)
-   mem_write_fast(SP,(r)->b.l);
- }
- 
--__inline__ void pop_r(REG *r)
-+extern __inline__ void pop_r(REG *r)
- {
-   //(r)->b.l=mem_read(SP);
-   mem_read_fast(SP,(r)->b.l);
-@@ -176,7 +176,7 @@ __inline__ Uint8 unknown(void){
- 
- 
- 
--__inline__ Uint8 gbcpu_exec_one(void)
-+extern __inline__ Uint8 gbcpu_exec_one(void)
- {
- 	static Uint8 opcode;
- 	if (gbcpu->ei_flag==1) {
-diff --git a/src/memory.c b/src/memory.c
-index 26e42d9..fd06738 100644
---- a/src/memory.c
-+++ b/src/memory.c
-@@ -737,7 +737,7 @@ Uint8 mem_read_default(Uint16 adr)
-   return 0xFF;
- }
- 
--__inline__ void update_gb_pad(void) {
-+extern __inline__ void update_gb_pad(void) {
-   gb_pad=0;
-   if (!conf.play_movie) {
- 
diff --git a/games-emulation/gngb/files/gngb-20060309-inline.patch b/games-emulation/gngb/files/gngb-20060309-inline.patch
deleted file mode 100644
index d73ed4cb617b..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-inline.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Arthur Marble <arthur@info9.net>
-Date: Wed, 16 Aug 2017 23:49:59 +0200
-Subject: clang-ftbfs
-
-Bug-Debian: https://bugs.debian.org/757486
----
- src/global.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/global.h b/src/global.h
-index bb46387..6a6d2b3 100644
---- a/src/global.h
-+++ b/src/global.h
-@@ -22,5 +22,10 @@
- #include <config.h>
- #include <SDL.h>
- 
-+#ifdef __clang__
-+#define __inline__
-+#else
-+#define __inline__ inline
-+#endif
- 
- #endif
diff --git a/games-emulation/gngb/files/gngb-20060309-joystick.patch b/games-emulation/gngb/files/gngb-20060309-joystick.patch
deleted file mode 100644
index ec5003a52c61..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-joystick.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Wed, 16 Aug 2017 23:25:30 +0200
-Subject: joystick axis
-
-Bug-Debian: https://bugs.debian.org/592777
-Forwarded: http://m.peponas.free.fr/gngb/news.html
-Origin: http://m.peponas.free.fr/gngb/download/memory.c.diff
----
- src/memory.c | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/src/memory.c b/src/memory.c
-index fd06738..9eaef1f 100644
---- a/src/memory.c
-+++ b/src/memory.c
-@@ -67,7 +67,11 @@ Uint8 ram_mask;
- MEM_READ_ENTRY mem_read_tab[0x10];
- MEM_WRITE_ENTRY mem_write_tab[0x10];
- 
-+/* doesn't work for negative joy_?_min */
-+/*
- Sint16 joy_x_min=0;joy_x_max=0;joy_y_min=0;joy_y_max=0;
-+*/
-+Sint16 joy_x_min=-32767;joy_x_max=32767;joy_y_min=-32767;joy_y_max=32767;
- 
- void (*select_rom_page)(Uint16 adr,Uint8 v);
- void (*select_ram_page)(Uint16 adr,Uint8 v);
-@@ -755,15 +759,28 @@ extern __inline__ void update_gb_pad(void) {
-       Sint16 joy_x_pos=joy_axis[jmap[PAD_LEFT]];
-       Sint16 joy_y_pos=joy_axis[jmap[PAD_UP]];
- 
-+			/* unnecessary if joy_?_min and joy_?_max are minimum and maximum
-+			 * values of Sint16
-       if (joy_x_pos>joy_x_max) joy_x_max=joy_x_pos;
-       if (joy_x_pos<joy_x_min) joy_x_min=joy_x_pos;
-       if (joy_y_pos>joy_y_max) joy_y_max=joy_y_pos;
-       if (joy_y_pos<joy_y_min) joy_y_min=joy_y_pos;
-+      */
- 
-+			/* this doesn't work when joy_x_min or joy_y_min < 0 (mid should be ~0),
-+			 * because ((+max) - (-min)) / 2 = ((+max) + (+min)) / 2
-       Sint16 joy_x_mid=(joy_x_max-joy_x_min) / 2;
-       Sint16 joy_y_mid=(joy_y_max-joy_y_min) / 2;
-+      */
-+      Sint16 joy_x_mid=(joy_x_max+joy_x_min) >> 1;
-+      Sint16 joy_y_mid=(joy_y_max+joy_y_min) >> 1;
-+      /* this doesn't work as joy_x_mid or joy_y_mid approaches 0
-       Sint16 joy_x_qua=joy_x_mid / 2;
-       Sint16 joy_y_qua=joy_y_mid / 2;
-+      */
-+      /* (difference) / 100 = 1% of possible values */
-+      Sint16 joy_x_qua=(joy_x_max - joy_x_min) / 100;
-+      Sint16 joy_y_qua=(joy_y_max - joy_y_min) / 100;
- 
-       if ((joy_x_pos<(joy_x_mid-joy_x_qua)) || (key[kmap[PAD_LEFT]])) gb_pad|=0x20;
-       if ((joy_x_pos>(joy_x_mid+joy_x_qua)) || (key[kmap[PAD_RIGHT]])) gb_pad|=0x10;
diff --git a/games-emulation/gngb/files/gngb-20060309-qwerty.patch b/games-emulation/gngb/files/gngb-20060309-qwerty.patch
deleted file mode 100644
index 29f563b749e9..000000000000
--- a/games-emulation/gngb/files/gngb-20060309-qwerty.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Thu, 17 Aug 2017 00:15:26 +0200
-Subject: sample_gngbrc
-
-Bug-Debian: https://bugs.debian.org/597910
-Forwarded: no
----
- sample_gngbrc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sample_gngbrc b/sample_gngbrc
-index a76b465..d0fdd3f 100644
---- a/sample_gngbrc
-+++ b/sample_gngbrc
-@@ -65,6 +65,9 @@ map_joy     1,1,0,0,3,2,0,1
- 
- map_key      273,274,276,275,120,119,13,303
- 
-+# Key configuration qwerty example
-+# map_key 273,274,276,275,122,120,13,303
-+
- 
- # Normal GB palette (bright to dark)
- pal_1 0xB8A68D,0x917D5E,0x635030,0x211A10
diff --git a/games-emulation/gngb/gngb-20060309-r1.ebuild b/games-emulation/gngb/gngb-20060309-r1.ebuild
deleted file mode 100644
index ebe0e3fb3b34..000000000000
--- a/games-emulation/gngb/gngb-20060309-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Gameboy / Gameboy Color emulator"
-HOMEPAGE="http://m.peponas.free.fr/gngb/"
-SRC_URI="http://m.peponas.free.fr/gngb/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="opengl"
-
-RDEPEND="
-	media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	app-arch/bzip2
-	opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# From Debian
-	"${FILESDIR}"/${P}-amd64.patch
-	"${FILESDIR}"/${P}-gcc34.patch
-	"${FILESDIR}"/${P}-gcc5.patch
-	"${FILESDIR}"/${P}-gcc7.patch
-	"${FILESDIR}"/${P}-inline.patch
-	"${FILESDIR}"/${P}-joystick.patch
-	"${FILESDIR}"/${P}-qwerty.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e '70i#define OF(x) x' src/unzip.h || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable opengl gl)
-}
diff --git a/games-emulation/gngb/metadata.xml b/games-emulation/gngb/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/gngb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/gngeo-0.8-r1 b/games-emulation/gngeo-0.8-r1
new file mode 100644
index 000000000000..1b555973733e
--- /dev/null
+++ b/games-emulation/gngeo-0.8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib[minizip] >=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 NeoGeo emulator
+EAPI=6
+HOMEPAGE=https://code.google.com/p/gngeo/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl media-libs/libsdl[joystick,opengl,sound,video] sys-libs/zlib[minizip]
+SLOT=0
+SRC_URI=https://gngeo.googlecode.com/files/gngeo-0.8.tar.gz https://storage.googleapis.com/google-code-archive/v2/code.google.com/gngeo/logo.png -> gngeo.png
+_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_=c03075ca8e1f672c700840cf148fb066
diff --git a/games-emulation/gngeo/Manifest b/games-emulation/gngeo/Manifest
deleted file mode 100644
index 6d147332d635..000000000000
--- a/games-emulation/gngeo/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gngeo-0.8-cflags.patch 1946 BLAKE2B 208a35296c2d943c65dfdcb02b3724bbc9bad4823103f10ec2fb7b069793a7ca901a51a41543175458f9e4326518f075eed924cdc492b1310159914a8c88e074 SHA512 5df77d438efd9040efcae7f1a19c5939967ae158a50408592b1dd81db26776215ec7994c8173db0e6f9888f45fa2c043bd1338f41a4c535e886c2b0f633a38b7
-AUX gngeo-0.8-concurrentMake.patch 635 BLAKE2B 5f2e96d55ad902a4f9904a28c0de855cd4fe7a65677d5a106688b9194a678b7f4a4be066942839a45c36ae717da62e53be36cdd7832a5abe72bc148b498f1766 SHA512 1d84bac8ad5dbe3f95ff148284d24432aece67191b566927dedf040cab080bf59f2b70f5ae788ab02e5d549b1c56fe2c8f92d5255b8c670433a2efb17483e460
-AUX gngeo-0.8-execstacks.patch 2505 BLAKE2B db1d2bdfe1cc45c76be070c3243439adbebac47b10aba46c85f3d3059d85cc90133e9a75e329b4d3d3ce369018797b166782dd0c795bf18511772013a66bb92d SHA512 cfd0cc424ce0862fb49a1349ec53c65051a13dc031bf66f4df3d96b5d44d9a1a0768c1184b5d6e35d6e72bbf779c0e499989f6b57cde1e25d0ce50bbbdbefdea
-AUX gngeo-0.8-zlib.patch 335 BLAKE2B 4b18c076a3285659f7e199a6d86c3ea2a899fe8dade51b03b36035c4cf9378a1b80ae16aa81c12f75a51bf0053f7d44dfb3b1025f7d95274a79689737ce6d1cb SHA512 6f09ebb89173bc172dc035247727d5e046fb36b3b05789d4b8e98648a229a260f3749fa3e2e35065a418e339d8d80830411ca3614171ef7aadeba0147a4f6a70
-DIST gngeo-0.8.tar.gz 1043579 BLAKE2B b4d1ffdb53e32ea25ed743af113573ce9ebd9f864bff1fed88797573141aecd3a2f799731316ced19892b9e45a334c8a8b59593fce4ec5651754bf80196c9e13 SHA512 4301e0f48afd8686cdc45bd8c3e7b724f4ab7a2482567c7fe99ee8960f652dbcefb00fcdd7071d85b02636a9ae9795d03169ffc79e8ae6f4c5515a5a53c090c7
-DIST gngeo.png 1488 BLAKE2B e474aaec3f9d79b83ecb3519680b172cfecbca27931bb3a039d6ee46c53737557ca2c110b22d0f974840039e465b7bfafa364ae2076f9ea785858099fe402922 SHA512 bc0403cf06fd1095095d87e5e6b8cd8d9e018a2a5b20f7168935d0c48d288af55bd98a72150f3c6d6089646a0780b65ff24f135bf5a680690af160c9be8945e5
-EBUILD gngeo-0.8-r1.ebuild 1045 BLAKE2B 0b002644090a65142e44a40fa2b6437318281973c800bc416f7e70f3035194ea5fd70ac22f9df046c22917154a3b16aba85a05f09d41fbf770adba594d13160b SHA512 7193404f6a63cf323f910f132809e865ca9eb65a6406e39252fbcd55980136dfe0879366abeea048edab343ca1bc51115f47eee64cf1eadd736c8a8a7f845fc5
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch b/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
deleted file mode 100644
index 0dcc3e7c5bf8..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.8-cflags.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/configure.in.orig	2016-03-31 04:15:45.913917791 -0400
-+++ b/configure.in	2016-03-31 04:16:23.447607551 -0400
-@@ -236,20 +236,12 @@
-            AC_DEFINE(PROCESSOR_INTEL, 1, [Define if you have an x86 processor])
-            ALIGNLONGS=0
- 	   proc_i386=true
--		CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -falign-functions=2 -falign-jumps=2 -fexpensive-optimizations \
--                    -falign-loops=2 -fschedule-insns2 -malign-double -fomit-frame-pointer -g \
--		    -fno-strict-aliasing -pipe -mtune=$target_cpu -DCPU=$target_cpu"
-            ;;
-      x86_64)
- 	   AC_MSG_RESULT(Turning on x86_64 processor optimisations)
-            AC_DEFINE(PROCESSOR_ADM64, 1, [Define if you have an x86_64 processor])
-            ALIGNLONGS=0
- 	   proc_x64=true
--		CFLAGS="$CFLAGS -O3 -fstrength-reduce -frerun-loop-opt -Wall -Wno-unused -funroll-loops \
--                    -ffast-math  -fexpensive-optimizations \
--                     -malign-double -fomit-frame-pointer -g \
--		    -fno-strict-aliasing -pipe -DCPU=$target_cpu"
-            ;;
-     sparc*) AC_MSG_RESULT(Turning on sparc processor optimisations)
-            AC_DEFINE(PROCESSOR_SPARC, 1, [Define if you have a sparc processor])
-@@ -258,8 +250,6 @@
- 	   if test $target_cpu = sparc64 && test $CC_MAJOR -ge 3 ; then
- 		CFLAGS="$CFLAGS -mcpu=v9"
- 	   fi
--	   CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -fomit-frame-pointer -g"
-            ;;
-     arm)   AC_MSG_RESULT(Turning on arm processor optimisations)
-            AC_DEFINE(PROCESSOR_ARM, 1, [Define if you have an ARM processor])
-@@ -273,8 +263,6 @@
-     *)     AC_MSG_RESULT(Processor type unknown - Use generic optimisations)
-            ALIGNLONGS=1
-            optimum=no
--	   CFLAGS="$CFLAGS -O3 -Wall -Wno-unused -funroll-loops \
--                    -ffast-math -g"
-            ;;
-   esac
- 
diff --git a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch b/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
deleted file mode 100644
index f039ecf544d9..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.8-concurrentMake.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/src/generator68k/Makefile.am.orig	2015-01-23 18:37:37.998723294 -0500
-+++ b/src/generator68k/Makefile.am	2015-01-23 18:38:39.995391133 -0500
-@@ -71,9 +71,12 @@
- 
- #def68k : def68k.c
- #	gcc def68k.c tab68k.c -o def68k -I .. -I ../.. -I . `sdl-config --cflags`
--def68k.o gen68k.o tab68k2.o : %.o : %.c
-+def68k.o tab68k2.o : %.o : %.c
- 	$(gcc_build_verbose)$(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags`
- 
-+gen68k.o: gen68k.c def68k-iibs.h
-+	$(CC_FOR_BUILD) -c $< -o $@ -I .. -I ../.. -I . `sdl-config --cflags`
-+
- def68k : def68k.o tab68k2.o
- 	$(gcc_build_verbose)$(CC_FOR_BUILD) def68k.o tab68k2.o -o $@ 
- 
diff --git a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch b/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
deleted file mode 100644
index a3face06f35c..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.8-execstacks.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/src/effect/2xsaimmx.asm
-+++ b/src/effect/2xsaimmx.asm
-@@ -2107,3 +2107,7 @@
- final1b       resb 8
- final2a       resb 8
- final2b       resb 8
-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- a/src/effect/effect_i386.asm
-+++ b/src/effect/effect_i386.asm
-@@ -88,3 +88,7 @@
- 	emms
- 	
- 	endproc
-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- a/src/effect/hq2x16.asm
-+++ b/src/effect/hq2x16.asm
-@@ -1935,3 +1935,7 @@
-     dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

-     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

- 

-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- a/src/effect/hq3x16.asm
-+++ b/src/effect/hq3x16.asm
-@@ -2520,3 +2520,7 @@
-     dd ..@cross8, ..@flag0,  ..@flag0,  ..@flag0,

-     dd ..@flag0,  ..@flag0,  ..@flag0,  ..@flag0

- 

-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- a/src/memcpy.S
-+++ b/src/memcpy.S
-@@ -495,4 +495,8 @@
- 
- Lmemcpy_bsrcul1l4:
- add r1, r1, #1
--b Lmemcpy_bl4
-\ No newline at end of file
-+b Lmemcpy_bl4
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
---- a/src/raze/Makefile.am
-+++ b/src/raze/Makefile.am
-@@ -20,7 +20,7 @@
- 	$(srcdir)/strip_ $< $@
- 
- raze2.asm: raze.asmu raze.incu raze.regu
--	nasm -w+orphan-labels -I $(srcdir)/ -e $< -o $@
-+	nasm -w+orphan-labels -f elf -I $(srcdir)/ -e $< -o $@
- 
- # This assembles the file, once it's been pre-processed
- raze.o: raze2.asm
---- a/src/raze/raze.asm
-+++ b/src/raze/raze.asm
-@@ -4259,3 +4259,6 @@
- 
- ;- the end ------------------------------------------------------------------;
- 
-+%ifidn ___OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- a/src/screen_i386.asm
-+++ b/src/screen_i386.asm
-@@ -96,3 +96,6 @@
- 	endproc
- 
- 
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
---- a/src/star/star.c
-+++ b/src/star/star.c
-@@ -2431,6 +2431,10 @@
- */
- static void suffixes(void) {
- 	emit("end\n");
-+
-+	emit("%%ifidn ___OUTPUT_FORMAT__,elf\n");
-+	emit("section .note.GNU-stack noalloc noexec nowrite progbits\n");
-+	emit("%%endif\n");
- }
- 
- /****************************************************************************
---- a/src/video_i386.asm
-+++ b/src/video_i386.asm
-@@ -86,3 +86,7 @@
- 	
- 	popa
- 	endproc
-+
-+%ifidn __OUTPUT_FORMAT__,elf
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
diff --git a/games-emulation/gngeo/files/gngeo-0.8-zlib.patch b/games-emulation/gngeo/files/gngeo-0.8-zlib.patch
deleted file mode 100644
index 9aa4a6b5f479..000000000000
--- a/games-emulation/gngeo/files/gngeo-0.8-zlib.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ru gngeo-0.8.orig/configure.in gngeo-0.8/configure.in
---- gngeo-0.8.orig/configure.in	2012-11-15 17:57:57.849578009 -0500
-+++ gngeo-0.8/configure.in	2012-11-15 18:19:55.305923094 -0500
-@@ -95,6 +95,7 @@
- #AC_SUBST(LIBOBJS)
- AC_CHECK_LIB([m], [acos])
- AC_CHECK_LIB([z], [inflate])
-+AC_CHECK_LIB([minizip], [unzReadCurrentFile])
- 
diff --git a/games-emulation/gngeo/gngeo-0.8-r1.ebuild b/games-emulation/gngeo/gngeo-0.8-r1.ebuild
deleted file mode 100644
index 3e7f2be86fc0..000000000000
--- a/games-emulation/gngeo/gngeo-0.8-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="A NeoGeo emulator"
-HOMEPAGE="https://code.google.com/p/gngeo/"
-SRC_URI="https://gngeo.googlecode.com/files/${P}.tar.gz
-	https://storage.googleapis.com/google-code-archive/v2/code.google.com/gngeo/logo.png -> ${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	media-libs/libsdl[joystick,opengl,sound,video]
-	sys-libs/zlib[minizip]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-execstacks.patch \
-		"${FILESDIR}"/${P}-zlib.patch \
-		"${FILESDIR}"/${P}-concurrentMake.patch \
-		"${FILESDIR}"/${P}-cflags.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-	append-cflags -std=gnu89 # build with gcc5 (bug #571056)
-}
-
-src_configure() {
-	econf --disable-i386asm
-}
-
-src_install() {
-	DOCS=( AUTHORS FAQ NEWS README* TODO sample_gngeorc )
-	default
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN}
-}
diff --git a/games-emulation/gngeo/metadata.xml b/games-emulation/gngeo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/gngeo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/gnuboy-1.0.3-r2 b/games-emulation/gnuboy-1.0.3-r2
new file mode 100644
index 000000000000..839bdca2dfb4
--- /dev/null
+++ b/games-emulation/gnuboy-1.0.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sdl? ( media-libs/libsdl ) !X? ( media-libs/libsdl ) X? ( x11-libs/libXext ) X? ( x11-base/xorg-proto ) >=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=Gameboy emulator with multiple renderers
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/gnuboy/
+IUSE=X sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sdl? ( media-libs/libsdl ) !X? ( media-libs/libsdl ) X? ( x11-libs/libXext )
+SLOT=0
+SRC_URI=mirror://gentoo/gnuboy-1.0.3.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=0b38f808ac0f4679de887905554d568e
diff --git a/games-emulation/gnuboy/Manifest b/games-emulation/gnuboy/Manifest
deleted file mode 100644
index 91a13c156629..000000000000
--- a/games-emulation/gnuboy/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnuboy-1.0.3-exec-stack.patch 487 BLAKE2B 09cc0019eed65610d67b4c305588b990c9458f8d59349b98fb9ddb274b614c85548928ee38ef68db871db095be40da6450c1444d45f72eb997db9d348eae0332 SHA512 b579b15906bf104f9db86bb49452c26a3eff0cebe2a66349f3b308742d9fe29823879df7658ce542a2d7397b664b7ba5297eb3c266fab1ddfb32ad73da78a693
-AUX gnuboy-1.0.3-include.patch 350 BLAKE2B 30d5bd6fc959e56cd3f6a49b38b86f973cb2b119856921675cdd1c5b665e13e62e9fd675adbc5340c9e1ed715aead8445c50e63b78a31106497fdf08cbcb79a7 SHA512 9815515c39bf0a387b32e0038a050dd7ca51b5b47d539ee39fcb77b1908735890aac9abfd7d1fe03733d7c9359398b1688f401aa2170ac48d0ed6d2d50acf04d
-AUX gnuboy-1.0.3-linux-headers.patch 1721 BLAKE2B 2ce538da8270a7893ddeb4233954b9abc8237785ed085cef8129108eaef93d5c34e37b65db246c91c61b2b7e71bf452b0317ceb5ee7b5a169b764e5f1fb44790 SHA512 710fd830cabea8fee05ab07a6342470a1176d7ed1c5ed14c110f47218d7d3b57704c09e0887da6152b05ed1b12e5a6959efde865359c220756176290617b3917
-DIST gnuboy-1.0.3.tar.gz 187627 BLAKE2B 1fe01abceae56244d28544f10cc5659063cfe19ac491374bcb2b818f01385e065385fcba01e0038f51d4b29bcb3018f02402adb820c0a556c201334766595a51 SHA512 89e8075dac5ec17b375a5739367b46c55130211fb487a052be1cca49a5d86cc1a7f1619b2b2473d744fbe3c51fdb1a11110b15836cc9cc9de588932b91d258e6
-EBUILD gnuboy-1.0.3-r2.ebuild 1068 BLAKE2B 8f750b31e7ce52c19992abbf167385d217a78f114f548e8ef39f4648b099e3ea98066cedf7a80129b54f8fb957bde2579090a7f5b2fb025980197448f326801a SHA512 7eb6e0885259eb224d93b1505d943113f8db50e2ca08efd50368ec941dcd96bddf78b7d624d383323736146b136f75e5ae49497112bc936c4764436d5fa61d28
-MISC metadata.xml 329 BLAKE2B 121873380b3adf5f6fc460d258de391a75a04f4d50b285c1f882e7461814133507981e7829ae1a783eddfc56933c328fdced934d04e5092a9c0e0f6eca7bfbdf SHA512 79c14f0442b618a82acc9b067360ef978d009fb61a44d869d0c6b4df375b005bc721ce8b90ac80be2bdb8e40e95e111b941a5ac9f006470eefc3b41459b52463
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
deleted file mode 100644
index a263ee49599e..000000000000
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-exec-stack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/asm/i386/cpu.s
-+++ b/asm/i386/cpu.s
-@@ -2428,3 +2428,6 @@
- 
- 
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/asm/i386/lcd.s
-+++ b/asm/i386/lcd.s
-@@ -288,3 +288,6 @@
- 
- 
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/asm/i386/refresh.s
-+++ b/asm/i386/refresh.s
-@@ -283,3 +283,6 @@
- 
- 
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch
deleted file mode 100644
index 15573000511e..000000000000
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-include.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru gnuboy-1.0.3.orig/defs.h gnuboy-1.0.3/defs.h
---- gnuboy-1.0.3.orig/defs.h	2001-01-23 07:04:22.000000000 -0500
-+++ gnuboy-1.0.3/defs.h	2014-07-04 03:56:46.685149736 -0400
-@@ -4,6 +4,10 @@
- #ifndef __DEFS_H__
- #define __DEFS_H__
- 
-+#include <stdlib.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <ctype.h>
- 
- 
- #ifdef IS_LITTLE_ENDIAN
diff --git a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch b/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
deleted file mode 100644
index 543bd2434eed..000000000000
--- a/games-emulation/gnuboy/files/gnuboy-1.0.3-linux-headers.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-# -ansi breaks <linux/joystick.h>
-
---- a/configure.in
-+++ b/configure.in
-@@ -133,7 +133,7 @@
- if test "$enable_warnings" = yes ; then
- case "$CC" in *gcc*)
- AC_MSG_RESULT(enabling selected compiler warnings)
--CFLAGS="$CFLAGS -ansi -pedantic -Wall -Wno-implicit -Wno-long-long" ;;
-+CFLAGS="$CFLAGS -Wall -Wno-implicit -Wno-long-long" ;;
- *)
- AC_MSG_RESULT(disabling warnings for non-gcc compiler) ;;
- esac
---- a/loader.c
-+++ b/loader.c
-@@ -11,7 +11,6 @@
- #include <stdlib.h>
- #include <string.h>
- 
--char *strdup();
- 
- static int mbc_table[256] =
- {
---- a/main.c
-+++ b/main.c
-@@ -8,7 +8,6 @@
- #include <stdlib.h>
- #include <string.h>
- 
--char *strdup();
- 
- #include <stdarg.h>
- #include <signal.h>
---- a/path.c
-+++ b/path.c
-@@ -5,7 +5,6 @@
- #include <stdlib.h>
- #include <string.h>
- 
--char *strdup();
- 
- #ifdef ALT_PATH_SEP
- #define SEP ';'
---- a/rckeys.c
-+++ b/rckeys.c
-@@ -4,7 +4,6 @@
- #include <stdlib.h>
- #include <string.h>
- 
--char *strdup();
- 
- #include "defs.h"
- #include "rc.h"
---- a/rcvars.c
-+++ b/rcvars.c
-@@ -5,7 +5,6 @@
- #include <stdlib.h>
- #include <string.h>
- 
--char *strdup();
- 
- #include "defs.h"
- #include "rc.h"
---- a/sys/linux/fbdev.c
-+++ b/sys/linux/fbdev.c
-@@ -10,7 +10,6 @@
- 
- #include <stdlib.h>
- #include <string.h>
--char *strdup();
- #include <unistd.h>
- #include <sys/mman.h>
- #include <linux/fb.h>
---- a/sys/linux/joy.c
-+++ b/sys/linux/joy.c
-@@ -2,7 +2,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--char *strdup();
- #include <linux/joystick.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- a/sys/oss/oss.c
-+++ b/sys/oss/oss.c
-@@ -2,7 +2,6 @@
- 
- #include <stdlib.h>
- #include <string.h>
--char *strdup();
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
diff --git a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild b/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
deleted file mode 100644
index 177799b9c235..000000000000
--- a/games-emulation/gnuboy/gnuboy-1.0.3-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Gameboy emulator with multiple renderers"
-HOMEPAGE="https://sourceforge.net/projects/gnuboy/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X sdl"
-
-RDEPEND="
-	sdl? ( media-libs/libsdl )
-	!X? ( media-libs/libsdl )
-	X? ( x11-libs/libXext )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-linux-headers.patch \
-		"${FILESDIR}"/${P}-include.patch
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if ! use X ; then
-		myconf="--with-sdl"
-	fi
-
-	econf \
-		$(use_with X x) \
-		$(use_with sdl) \
-		$(use_enable x86 asm) \
-		${myconf} \
-		--disable-arch \
-		--disable-optimize
-}
-
-src_install() {
-	for f in sdlgnuboy xgnuboy
-	do
-		if [[ -f ${f} ]] ; then
-			dobin ${f}
-		fi
-	done
-	dodoc README docs/{CHANGES,CONFIG,CREDITS,FAQ,HACKING,WHATSNEW}
-}
diff --git a/games-emulation/gnuboy/metadata.xml b/games-emulation/gnuboy/metadata.xml
deleted file mode 100644
index 3e42cc8d1267..000000000000
--- a/games-emulation/gnuboy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gnuboy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/hatari-2.1.0 b/games-emulation/hatari-2.1.0
new file mode 100644
index 000000000000..3c122bd0c1ac
--- /dev/null
+++ b/games-emulation/hatari-2.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-emulation/caps sdl2? ( media-libs/libsdl2[X,sound,video] ) !sdl2? ( media-libs/libsdl[X,sound,video] ) media-libs/portaudio media-libs/portmidi sys-libs/readline:0= media-libs/libpng:0= sys-libs/zlib:0= virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Atari ST emulator
+EAPI=6
+HOMEPAGE=http://hatari.tuxfamily.org/
+IUSE=+sdl2 python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=games-emulation/emutos-0.9.9.1
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-emulation/caps sdl2? ( media-libs/libsdl2[X,sound,video] ) !sdl2? ( media-libs/libsdl[X,sound,video] ) media-libs/portaudio media-libs/portmidi sys-libs/readline:0= media-libs/libpng:0= sys-libs/zlib:0=
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/hatari/2.1.0/hatari-2.1.0.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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b518ce003e9f4c93921721b7b54057e2
diff --git a/games-emulation/hatari/Manifest b/games-emulation/hatari/Manifest
deleted file mode 100644
index b004751ca1f6..000000000000
--- a/games-emulation/hatari/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hatari-2.1.0.tar.bz2 4072778 BLAKE2B 934ab28e799d0d13c26c291005513511367eb2ddbeda0f9756c19f10fa9e6bb8e10451057fa7e0b49a30e3f562eb5f327057d324b2a92e09b1115f63132dca97 SHA512 d1fbf6e60e2df2c43d070bee6a9c1dc93c36a8ea7f75bbf2a67790840952661cee136ebccd6b2ed523ef9b7b56391e058384f2e3f46acb609bb362cac05b9753
-EBUILD hatari-2.1.0.ebuild 1951 BLAKE2B 256870db02e0c0cb6402157af5dc1a108f9dba4b3dbb414a7fa7d0ab3692877dd9baf0462f6a044e027a5d92d313fa479cee7251da75c8a87ed38d140897462b SHA512 7d6b881dfe3d1fbffb800b5ae866699891ee3cdfdbc88dc9633a755b1361d003ef1617648b8b30d1c72b709dc700fb9db4e3b3a5abc030270598b0035cad90d3
-MISC metadata.xml 318 BLAKE2B be4d8512e3f8fe751fc03aeae422216c9a366fc4cea3a49e4b8050f2a8280054fcc335f820718743fdf49cdb9a1fb73633e596ac8bf989b22f0f5a5fa33bd93b SHA512 2e304611622c91d0bd54f986ac3f02fc504bbd28e5ce03e5b958100b8567012ea0fe2a46884d29dfa18c6a4408fd0283679eb4a4f62c80a40ad748f5c811d943
diff --git a/games-emulation/hatari/hatari-2.1.0.ebuild b/games-emulation/hatari/hatari-2.1.0.ebuild
deleted file mode 100644
index 92eba857519e..000000000000
--- a/games-emulation/hatari/hatari-2.1.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit toolchain-funcs cmake-utils python-single-r1
-
-DESCRIPTION="Atari ST emulator"
-HOMEPAGE="http://hatari.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/hatari/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+sdl2"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	games-emulation/caps
-	sdl2? ( media-libs/libsdl2[X,sound,video] )
-	!sdl2? ( media-libs/libsdl[X,sound,video] )
-	media-libs/portaudio
-	media-libs/portmidi
-	sys-libs/readline:0=
-	media-libs/libpng:0=
-	sys-libs/zlib:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
-	>=games-emulation/emutos-0.9.9.1"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need a TOS ROM to run hatari. EmuTOS, a free TOS implementation,
-has been installed in /usr/lib*/hatari with a .img extension (there
-are several from which to choose).
-Another option is to go to http://www.atari.st/ and get a real TOS:
-http://www.atari.st/
-The first time you run hatari, you should configure it to find the
-TOS you prefer to use.  Be sure to save your settings.
-"
-
-DOCS="readme.txt doc/*.txt"
-HTML_DOCS="doc/"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e '/Encoding/d' ./python-ui/hatariui.desktop || die
-	sed -i -e "s/python/${EPYTHON}/" tools/atari-hd-image.sh || die
-	sed -i -e "s#@DOCDIR@#/usr/share/doc/${PF}/html/#" python-ui/uihelpers.py || die
-}
-
-src_configure() {
-	mycmakeargs=(
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		"-DENABLE_SDL2=$(usex sdl2)"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED%/}"/usr/share/hatari/{hatariui,hconsole}/
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-emulation/hatari/metadata.xml b/games-emulation/hatari/metadata.xml
deleted file mode 100644
index d4511e749d48..000000000000
--- a/games-emulation/hatari/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
-</use>
-</pkgmetadata>
diff --git a/games-emulation/higan-106_p1-r1 b/games-emulation/higan-106_p1-r1
new file mode 100644
index 000000000000..1908f4c9d95b
--- /dev/null
+++ b/games-emulation/higan-106_p1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 x11-libs/pango dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf dev-libs/glib:2 media-libs/fontconfig media-libs/freetype ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev ) app-arch/p7zip virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A multi-system game emulator formerly known as bsnes
+EAPI=6
+HOMEPAGE=https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan
+IUSE=ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext icarus? ( x11-libs/gtksourceview:2.0 x11-libs/gtk+:2 x11-libs/pango dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf dev-libs/glib:2 media-libs/fontconfig media-libs/freetype ) ao? ( media-libs/libao ) openal? ( media-libs/openal ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[X,joystick,video] ) udev? ( virtual/udev )
+REQUIRED_USE=|| ( ao openal alsa pulseaudio oss ) || ( xv opengl sdl )
+SLOT=0
+SRC_URI=https://gitlab.com/higan/higan/repository/41efdba45afa770db99bc7484a8ad340ccc597d2/archive.tar.bz2 -> higan-106_p1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=92b402fce5ca880e1840c756303f5e3c
diff --git a/games-emulation/higan/Manifest b/games-emulation/higan/Manifest
deleted file mode 100644
index 937ad0d49b76..000000000000
--- a/games-emulation/higan/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX higan-106_p1-QA.patch 3708 BLAKE2B 25f3707c4336e423017eb879e9dfc02fee9660ee8c5e8390813906614eab8fd4306eabbe15e4330f7f00efed0231a335ec83a3682eb338bdc3f772546fd5d9b7 SHA512 ba5bf66a242baf7b2385ffd7a26c5a180589f917b5a636fa99dd488b4a733c09e6e3eb3ccc013b63817661c498149d943a53d3e536674251ae94f352516a4f44
-AUX higan-106_p1-header-locations.patch 598 BLAKE2B d7935edf4f241802ffc5200f8b4944fe1dff4596941993c7539e290f1640eb5e552a263d1a8d0c6db6b2d909b35bc34350aa84a4ba7ea9f8fb06d8466c59a673 SHA512 756893707d9048bf9f34818733ab812d7a81da329646c77536fc6feef74e97b6e3804dfdfd062e5899bba30c70343afdd3b62a5dfd1b79488b7fdec7bde57a91
-AUX higan-106_p1-wrapper 166 BLAKE2B 87659c19e485a4eca90178a9c2faf96214af7a13fb16c04a2175f3157dd4b522e6414fed9216a9acb293111f2f994837a9a496075ab0bebd2c78e3a5710330a4 SHA512 db297cfc9b6f5ff1553b52587a9988af46ad7d2aadbaa17743676250679e2bada68d97f85e934ce8c1eb7f57ac3f18c43a33eaca809a1f10f5a4f22c8cbe137a
-DIST higan-106_p1.tar.bz2 954533 BLAKE2B e7ea44f97f7e2c3ce86b57b853aa59c4372f37185846f8a928ba659b525965aed39f7859721394a776990e53e2f671fc0e7071d17f9397973343d9a7adcf70ac SHA512 f4d8dbfacaa20b948bd382fd0ef48e89cbb21a0569a70b6a4beca6c0a2ba404efc4c28d14bfd3df14d4fd76c763ca1537166bb24d765a8da33423bbea32df4c3
-EBUILD higan-106_p1-r1.ebuild 3213 BLAKE2B 0b7dfc5a07055b96c3d8cbd4c936acf6137bcc77d6f906c675910f3e426c169636752d1f9cf33452af2156d345976e4003168377bca172302624d253db7e8519 SHA512 ac879d774978c2804c067e2434296e6d9ed42da7d37dbd2c332506c5eded6cbabe6bd8fe3b07597036bcd3fe784b463442e53d3d389758c0af9f43ed108d7a96
-MISC metadata.xml 377 BLAKE2B aefc33327d342c730de8b2bdd95c2299692c894fd67a3f43d378964e7b776e467d2a4644777e7c8a1eb94b41ee300a65cad084decf64fc02abbac8c02de509c1 SHA512 2faa3ffcca01d5740a5ca1c4f554c51e90e81c6c19cde15cf817c448debb5585e09a1b784d94e3ecd06321ed28a740ce846f1afbd149bce590ca69ef5b1ce9f4
diff --git a/games-emulation/higan/files/higan-106_p1-QA.patch b/games-emulation/higan/files/higan-106_p1-QA.patch
deleted file mode 100644
index 140fdf9a48e7..000000000000
--- a/games-emulation/higan/files/higan-106_p1-QA.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From 3ca37e53f22bfbb4ef436829904dc75b1f4940ec Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 21 Jan 2018 11:16:53 +0100
-Subject: [PATCH] Quickport higan-099-QA.patch to v106r1
-
----
- higan/GNUmakefile               |  5 ++---
- higan/target-tomoko/GNUmakefile |  6 +++---
- icarus/GNUmakefile              |  4 ++--
- nall/GNUmakefile                | 19 -------------------
- 4 files changed, 7 insertions(+), 27 deletions(-)
-
-diff --git a/higan/GNUmakefile b/higan/GNUmakefile
-index 5eac824..2616ed1 100644
---- a/higan/GNUmakefile
-+++ b/higan/GNUmakefile
-@@ -26,7 +26,6 @@ else ifneq ($(filter $(platform),linux bsd),)
-   flags += -fopenmp
-   link += -fopenmp
-   ifeq ($(binary),application)
--    flags += -march=native
-     link += -Wl,-export-dynamic
-     link += -lX11 -lXext
-   else ifeq ($(binary),library)
-@@ -40,9 +39,9 @@ endif
- compile = \
-   $(strip \
-     $(if $(filter %.c,$<), \
--      $(compiler) $(cflags) $(flags) $1 -c $< -o $@, \
-+      $(compiler) $(cflags) $(flags) $(CFLAGS) $1 -c $< -o $@, \
-       $(if $(filter %.cpp,$<), \
--        $(compiler) $(cppflags) $(flags) $1 -c $< -o $@ \
-+        $(compiler) $(cppflags) $(flags) $(CXXFLAGS) $1 -c $< -o $@ \
-       ) \
-     ) \
-   )
-diff --git a/higan/target-tomoko/GNUmakefile b/higan/target-tomoko/GNUmakefile
-index bfdcbe2..bdb6d44 100644
---- a/higan/target-tomoko/GNUmakefile
-+++ b/higan/target-tomoko/GNUmakefile
-@@ -48,10 +48,10 @@ objects := $(ui_objects) $(objects)
- objects := $(patsubst %,obj/%.o,$(objects))
- 
- obj/ruby.o: ../ruby/ruby.cpp $(call rwildcard,../ruby/)
--	$(compiler) $(rubyflags) -c $< -o $@
-+	$(compiler) $(rubyflags) $(CXXFLAGS) -c $< -o $@
- 
- obj/hiro.o: ../hiro/hiro.cpp $(call rwildcard,../hiro/)
--	$(compiler) $(hiroflags) -c $< -o $@
-+	$(compiler) $(hiroflags) $(CXXFLAGS) -c $< -o $@
- 
- obj/ui-tomoko.o: $(ui)/tomoko.cpp $(call rwildcard,$(ui)/)
- obj/ui-program.o: $(ui)/program/program.cpp $(call rwildcard,$(ui)/)
-@@ -67,7 +67,7 @@ obj/ui-resource.o:
- 
- # targets
- build: $(objects)
--	$(strip $(compiler) -o out/$(name) $(objects) $(link))
-+	$(strip $(compiler) $(CXXFLAGS) -o out/$(name) $(objects) $(link))
- ifeq ($(platform),macos)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
-diff --git a/icarus/GNUmakefile b/icarus/GNUmakefile
-index d01465e..999c004 100644
---- a/icarus/GNUmakefile
-+++ b/icarus/GNUmakefile
-@@ -3,7 +3,7 @@ include ../nall/GNUmakefile
- include ../hiro/GNUmakefile
- 
- name := icarus
--flags += -I..
-+flags += -I.. $(CXXFLAGS)
- link +=
- 
- ifeq ($(platform),windows)
-@@ -15,7 +15,7 @@ objects += obj/icarus.o
- objects += $(if $(call streq,$(platform),windows),obj/resource.o)
- 
- all: $(objects)
--	$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink))
-+	$(strip $(compiler) -o out/$(name) $(objects) $(link) $(hirolink) $(LDFLAGS))
- ifeq ($(platform),macos)
- 	@if [ -d out/$(name).app ]; then rm -r out/$(name).app; fi
- 	mkdir -p out/$(name).app/Contents/MacOS/
-diff --git a/nall/GNUmakefile b/nall/GNUmakefile
-index f9865de..f864cde 100644
---- a/nall/GNUmakefile
-+++ b/nall/GNUmakefile
-@@ -59,25 +59,6 @@ ifeq ($(compiler),)
-   endif
- endif
- 
--# build settings
--ifeq ($(build),optimize)
--  flags += -O3
--else ifeq ($(build),release)
--  flags += -O2
--else ifeq ($(build),stable)
--  flags += -O1
--else ifeq ($(build),debug)
--  flags += -g
--else ifeq ($(build),profile)
--  flags += -pg
--  link += -pg
--else ifeq ($(build),instrument)
--  flags += -O3 -fprofile-generate
--  link += -lgcov
--else ifeq ($(build),optimize)
--  flags += -O3 -fprofile-use
--endif
--
- # clang settings
- ifeq ($(findstring clang++,$(compiler)),clang++)
-   flags += -fno-strict-aliasing -fwrapv
--- 
-2.16.0.rc2
-
diff --git a/games-emulation/higan/files/higan-106_p1-header-locations.patch b/games-emulation/higan/files/higan-106_p1-header-locations.patch
deleted file mode 100644
index 7f72a1311491..000000000000
--- a/games-emulation/higan/files/higan-106_p1-header-locations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 420b10135f678367560621416799c48af0ef3764 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Sun, 21 Jan 2018 11:44:22 +0100
-Subject: [PATCH] Patch header locations for Gentoo
-
----
- nall/GNUmakefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/nall/GNUmakefile b/nall/GNUmakefile
-index f864cde..41fdc08 100644
---- a/nall/GNUmakefile
-+++ b/nall/GNUmakefile
-@@ -82,6 +82,7 @@ endif
- 
- # linux settings
- ifeq ($(platform),linux)
-+  flags += -I/usr/include/cairo/ -I/usr/include/gtk-2.0/ -I/usr/include/gtksourceview-2.0/
-   link += -ldl
- endif
- 
--- 
-2.16.0.rc2
-
diff --git a/games-emulation/higan/files/higan-106_p1-wrapper b/games-emulation/higan/files/higan-106_p1-wrapper
deleted file mode 100644
index 1de577fd1923..000000000000
--- a/games-emulation/higan/files/higan-106_p1-wrapper
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-[ -e "${HOME}"/.local/share/higan ] || mkdir "${HOME}"/.local/share/higan
-cp -ru /usr/share/higan/* "${HOME}"/.local/share/higan/
-exec ${0}.bin "$@"
diff --git a/games-emulation/higan/higan-106_p1-r1.ebuild b/games-emulation/higan/higan-106_p1-r1.ebuild
deleted file mode 100644
index a39e0db7e729..000000000000
--- a/games-emulation/higan/higan-106_p1-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs qmake-utils
-
-MY_COMMIT=41efdba45afa770db99bc7484a8ad340ccc597d2
-
-DESCRIPTION="A multi-system game emulator formerly known as bsnes"
-HOMEPAGE="https://byuu.org/emulation/higan/ https://gitlab.com/higan/higan"
-SRC_URI="https://gitlab.com/higan/higan/repository/${MY_COMMIT}/archive.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ao +alsa +icarus openal opengl oss pulseaudio +sdl udev xv"
-REQUIRED_USE="|| ( ao openal alsa pulseaudio oss )
-	|| ( xv opengl sdl )"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	icarus? ( x11-libs/gtksourceview:2.0
-			  x11-libs/gtk+:2
-			  x11-libs/pango
-			  dev-libs/atk
-			  x11-libs/cairo
-			  x11-libs/gdk-pixbuf
-			  dev-libs/glib:2
-			  media-libs/fontconfig
-			  media-libs/freetype
-			)
-	ao? ( media-libs/libao )
-	openal? ( media-libs/openal )
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )
-	xv? ( x11-libs/libXv )
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl[X,joystick,video] )
-	udev? ( virtual/udev )
-"
-DEPEND="${RDEPEND}
-	app-arch/p7zip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}-${MY_COMMIT}-${MY_COMMIT}
-
-disable_module() {
-	sed -i \
-		-e "s|$1\b||" \
-		"${S}"/higan/target-tomoko/GNUmakefile || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-header-locations.patch
-	epatch "${FILESDIR}"/${P}-QA.patch
-
-	sed -i \
-		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
-		nall/dl.hpp || die "fixing libdir failed!"
-
-	eapply_user
-
-	# audio modules
-	use ao || disable_module audio.ao
-	use openal || disable_module audio.openal
-	use pulseaudio ||  { disable_module audio.pulseaudio
-		disable_module audio.pulseaudiosimple ;}
-	use oss || disable_module audio.oss
-	use alsa || disable_module audio.alsa
-
-	# video modules
-	use opengl || disable_module video.glx
-	use xv || disable_module video.xvideo
-	use sdl || disable_module video.sdl
-
-	# input modules
-	use sdl || disable_module input.sdl
-	use udev || disable_module input.udev
-}
-
-src_compile() {
-	local mytoolkit
-
-	mytoolkit="gtk"
-
-	# Needed for fluent audio (even on i5 hardware)
-	export CFLAGS="${CFLAGS} -O3"
-	export CXXFLAGS="${CXXFLAGS} -O3"
-
-	if use icarus; then
-		cd "${S}/icarus" || die
-		emake \
-			platform="linux" \
-			compiler="$(tc-getCXX)"
-	fi
-
-	cd "${S}/higan" || die
-	emake \
-		platform="linux" \
-		compiler="$(tc-getCXX)" \
-		hiro="${mytoolkit}"
-}
-
-src_install() {
-	if use icarus; then
-		newbin "${S}"/icarus/out/icarus icarus
-	fi
-	newbin "${S}"/higan/out/${PN} ${PN}.bin
-	newbin "${FILESDIR}"/${P}-wrapper ${PN}
-	make_desktop_entry "${PN}" "${PN}"
-
-	# copy home directory stuff to a global location (matching "${FILESDIR}"/${P}-wrapper)
-	insinto /usr/share/${PN}
-	doins -r higan/systems/*.sys
-
-	doicon -s 512 higan/data/${PN}.png
-	doicon        higan/data/${PN}.svg
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	#elog "optional dependencies:"
-	#elog "  dev-games/higan-ananke (extra rom load options)"
-	#elog "  games-util/higan-purify (Rom purifier)"
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/higan/metadata.xml b/games-emulation/higan/metadata.xml
deleted file mode 100644
index 5bef912000c6..000000000000
--- a/games-emulation/higan/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="icarus">Build icarus library manager</flag>
-		<flag name="udev">Enable udev based input</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-emulation/hugo-2.12 b/games-emulation/hugo-2.12
new file mode 100644
index 000000000000..4a56aecc09a5
--- /dev/null
+++ b/games-emulation/hugo-2.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/gtk+:2 media-libs/libsdl[video] media-libs/libvorbis virtual/pkgconfig
+DESCRIPTION=PC-Engine (Turbografx16) emulator for linux
+EAPI=5
+HOMEPAGE=http://www.zeograd.com/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 media-libs/libsdl[video] media-libs/libvorbis games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.zeograd.com/download/hugo-2.12.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dff2bee4ef7faa52cc8fa1da3df8b8c5
diff --git a/games-emulation/hugo/Manifest b/games-emulation/hugo/Manifest
deleted file mode 100644
index c4c2fe97a3af..000000000000
--- a/games-emulation/hugo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX hugo-2.12-gcc41.patch 306 BLAKE2B 8539b43f23bbf008f3c000e7fc86480ffba3cd096297bf38b97ff8efe3ee4efe1ac9c6b09361a8a39214103751652362af0ae25e9bc5c8ac706fc77806a66553 SHA512 5b8203867dd6f524ef6f6e70f158b02de45f70aa4f0ac5bd85c171580a7def6c14cd93afe98c90717e10a77fa040ee3d613812ebda6b1768149c8621365ff782
-DIST hugo-2.12.tar.gz 456991 BLAKE2B 21bcb1fbab1020cbc26039b0f9a49ef653ee21409c84a61747940437dd57c39a453772dbbf82d3e74b18b477ed6a505402108fb1969e56279b650a734b91a40b SHA512 38342e6e7a130caeac711de4f72138a5159c2a34e443ce5e16bcb7ac02fbefd085fa5c48583550d8089bfe3528785853df1863e7d1b32652a7f88300ad09d21d
-EBUILD hugo-2.12.ebuild 727 BLAKE2B c057f1963bea30d576f1c93d22c55a5a7eba9d5f36f8f57dfa52b2057cdf9eacb2789e7082191bf9d19d806c5d4d5a6b1fcf6d22629d094965e6cb13cb9dc66d SHA512 1d464f5fa48cfc0726ec2ea7bcc6d285b773bf2efb98214fc4c92c6171b80774d7f355d1d66bd98e57eac5be11a8295c77b5a174db293f4e8b4eb3795dc566dd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/hugo/files/hugo-2.12-gcc41.patch b/games-emulation/hugo/files/hugo-2.12-gcc41.patch
deleted file mode 100644
index 14050cc79f16..000000000000
--- a/games-emulation/hugo/files/hugo-2.12-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pce.h.old	2006-05-02 20:06:13.000000000 +0200
-+++ pce.h	2006-05-02 20:06:33.000000000 +0200
-@@ -196,7 +196,7 @@
- extern UChar language;
- // the current language
- 
--extern int BaseClock, UPeriod;
-+extern int UPeriod;
- 
- extern UChar US_encoded_card;
- // Do we have to swap even and odd bytes in the rom
diff --git a/games-emulation/hugo/hugo-2.12.ebuild b/games-emulation/hugo/hugo-2.12.ebuild
deleted file mode 100644
index 86bcffd6e456..000000000000
--- a/games-emulation/hugo/hugo-2.12.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic games
-
-DESCRIPTION="PC-Engine (Turbografx16) emulator for linux"
-HOMEPAGE="http://www.zeograd.com/"
-SRC_URI="http://www.zeograd.com/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-libs/libsdl[video]
-	media-libs/libvorbis"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}"-gcc41.patch
-	append-cppflags $(pkg-config sdl --cflags)
-
-}
-
-src_install() {
-	dogamesbin hugo
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r pixmaps
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/*html
-	prepgamesdirs
-}
diff --git a/games-emulation/hugo/metadata.xml b/games-emulation/hugo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/hugo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/kigb-2.02 b/games-emulation/kigb-2.02
new file mode 100644
index 000000000000..eba9442c57a8
--- /dev/null
+++ b/games-emulation/kigb-2.02
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=A Gameboy (GB, SGB, GBA) Emulator for Linux
+EAPI=5
+HOMEPAGE=http://kigb.emuunlim.com/
+KEYWORDS=-* ~x86
+LICENSE=all-rights-reserved
+RDEPEND=x11-libs/libXext sys-libs/zlib dev-games/hawknl =virtual/libstdc++-3* games-misc/games-envd
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=http://kigb.emuunlim.com/kigb_lin.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_=cd4236177571ce893bc1c928e26eab8c
diff --git a/games-emulation/kigb/Manifest b/games-emulation/kigb/Manifest
deleted file mode 100644
index f9d0a07f0470..000000000000
--- a/games-emulation/kigb/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kigb 328 BLAKE2B 203e8a844831400c1b4569c9faa4b59a48a5ddd4ca9084c3967298b2aaca204b1490165c3b2b8dfe22fd1a24b22857e97925e474e735059788682ff0c690cc4d SHA512 4316e4b6ece9ce9d1f8e36a1d69d4a3c33ee635c4758ce8e4a6b85b3a13a1cae703340e2479e6615b655312db33c21d8d7ee84233049e63716e83efed1cc3128
-DIST kigb_lin.tar.gz 477324 BLAKE2B 4e15c77bd5a0e1ff0740bd6af53548e54c3dfc7d27ba07290201d11793e38015f12266e169969511f3852cf8742055ea491ce57213e7aefde5ed8b99b1f2e985 SHA512 ca8b10cc05884c92157dde2b034c7e95f28ed7eed771d0383265f942f0cacea791284516b551e96ba07a035068a7039c8faa19ec417ee117b6a350692bbff01d
-EBUILD kigb-2.02.ebuild 863 BLAKE2B bd855bafb96aeb48eab2850042a3830f15e3c6f8df8526cb0e4a7b3c8e1ec8dd652553a9d180c0fed24992346096cfcb763869c36c17fed2334454d9a1469630 SHA512 63f5dfa4e78caf5ec72a06a3d447eb290371237444c4594ffc1acef8d4cc9a8dab99e4f870c6d610807f6d7f3c9ca7b8e1afff72405d4ab92b10071e076a4969
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/kigb/files/kigb b/games-emulation/kigb/files/kigb
deleted file mode 100644
index c07095bb53ee..000000000000
--- a/games-emulation/kigb/files/kigb
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-kigb_dir="${HOME}/.kigb"
-
-if [[ ! -d "${kigb_dir}" ]] ; then
-	mkdir -p "${kigb_dir}"
-	cd "${kigb_dir}"
-	mkdir cfg inp rom save snap state
-	ln -s GENTOODIR/kigb/kigb kigb
-fi
-
-cd "${kigb_dir}"
-exec ./kigb "$@"
diff --git a/games-emulation/kigb/kigb-2.02.ebuild b/games-emulation/kigb/kigb-2.02.ebuild
deleted file mode 100644
index bbccc19ef464..000000000000
--- a/games-emulation/kigb/kigb-2.02.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="A Gameboy (GB, SGB, GBA) Emulator for Linux"
-HOMEPAGE="http://kigb.emuunlim.com/"
-SRC_URI="http://kigb.emuunlim.com/${PN}_lin.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="x11-libs/libXext
-	sys-libs/zlib
-	dev-games/hawknl
-	=virtual/libstdc++-3*"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# use the system version
-	rm -f libNL.so*
-	# wrapper script creates these in the users' home directories.
-	rm -rf cfg inp snap state rom save
-	cp "${FILESDIR}/kigb" "${T}/" || die
-	sed -i \
-		-e "s:GENTOODIR:${GAMES_PREFIX_OPT}:" "${T}/kigb" || die
-}
-
-src_install() {
-	dogamesbin "${T}/kigb"
-	exeinto "${GAMES_PREFIX_OPT}/${PN}"
-	doexe kigb
-	dodoc doc/*
-	prepgamesdirs
-}
diff --git a/games-emulation/kigb/metadata.xml b/games-emulation/kigb/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/kigb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/lxdream-0.9.1-r3 b/games-emulation/lxdream-0.9.1-r3
new file mode 100644
index 000000000000..b9db88bebc21
--- /dev/null
+++ b/games-emulation/lxdream-0.9.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=app-misc/lirc media-libs/alsa-lib media-libs/libpng:0= pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl[sound] ) virtual/opengl x11-libs/gtk+:2 virtual/pkgconfig sys-devel/gettext virtual/os-headers !!gnustep-base/gnustep-gui
+DESCRIPTION=An emulator for the Sega Dreamcast system
+EAPI=6
+HOMEPAGE=http://www.lxdream.org/
+IUSE=debug profile pulseaudio sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/lirc media-libs/alsa-lib media-libs/libpng:0= pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl[sound] ) virtual/opengl x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.lxdream.org/count.php?file=lxdream-0.9.1.tar.gz -> lxdream-0.9.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b7295f4d4b580f4177fe137c8ae2f07
diff --git a/games-emulation/lxdream/Manifest b/games-emulation/lxdream/Manifest
deleted file mode 100644
index 227e0f3ec147..000000000000
--- a/games-emulation/lxdream/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lxdream-0.9.1-glib-single-include.patch 10725 BLAKE2B 01a76a7e7a6477fcf8e9a9b9b44f7fff04b9c6c88fd361ff47b0ef9c754eb263c89c846b3919d2a48bfc2e4c79e123cc45fbb5008c2a7378772342a08ec7099d SHA512 1e8130ae228799f6b0b53895edb309579d47f93e1f5f7e88387bc9b2e97d201603f43eebc084604e8e5b2b3a93be68daa040c995a7eed59f7b3aaeb903b606dc
-DIST lxdream-0.9.1.tar.gz 2556802 BLAKE2B c69452e95d833c42c930f45e8a9d407e8d1246b2f67c21c2763ae5583d271caa9e28b111a0aa6ec7f5ff7ea9867c18d53ebe1a39bd37a2f47e68544e71c6f6e0 SHA512 f56119e99f82931bb22cc596938caba09f02da9a7e74b6c8ce79880214e3566a9a8091b31f89d5dc56f0802d00ac485ce22c3468350d44b2e1cf140f22983055
-EBUILD lxdream-0.9.1-r3.ebuild 1470 BLAKE2B f65c23e37f6cb99540aaf1c90b042eafdeef78d7004844a15c8ffb2174d89b5e96465d530b4be50a0eb2fa8bfd8eb3163cd6b7ba786b3703c9349d9d85b7e7dc SHA512 5e8d3d55615a3aec0b961b36263f587dc120381edf97f5bfb031ab1ab43e5136c7cf51ab3118b964976a54204204788dea536ae00f98a5d67396a49a562d199f
-MISC metadata.xml 379 BLAKE2B 9407fbbb5013bc923a712f50b05cfe8c14d7648bf673a28dcb798d591e52c34e105a95d196d8d95f348eaf0e0c710f6a7263acc51a0f643bdc546093cc159c7f SHA512 ec81121ea013b5ee3e2863c317bad1c4e6c324f44d41202be5f105b7d0416f52d8a5144a9ab354dceb8793c947bf7cc85b192aaee65b0e3f44cfae19340e9399
diff --git a/games-emulation/lxdream/files/lxdream-0.9.1-glib-single-include.patch b/games-emulation/lxdream/files/lxdream-0.9.1-glib-single-include.patch
deleted file mode 100644
index 7872174ed859..000000000000
--- a/games-emulation/lxdream/files/lxdream-0.9.1-glib-single-include.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-Index: lxdream-0.9.1/src/aica/audio.c
-===================================================================
---- lxdream-0.9.1.orig/src/aica/audio.c
-+++ lxdream-0.9.1/src/aica/audio.c
-@@ -19,7 +19,7 @@
- 
- #include "aica/aica.h"
- #include "aica/audio.h"
--#include <glib/gmem.h>
-+#include <glib.h>
- #include "dream.h"
- #include <assert.h>
- #include <string.h>
-Index: lxdream-0.9.1/src/aica/audio.h
-===================================================================
---- lxdream-0.9.1.orig/src/aica/audio.h
-+++ lxdream-0.9.1/src/aica/audio.h
-@@ -20,7 +20,7 @@
- 
- #include <stdint.h>
- #include <stdio.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include "gettext.h"
- #include "plugin.h"
- 
-Index: lxdream-0.9.1/src/cocoaui/cocoa_ctrl.m
-===================================================================
---- lxdream-0.9.1.orig/src/cocoaui/cocoa_ctrl.m
-+++ lxdream-0.9.1/src/cocoaui/cocoa_ctrl.m
-@@ -23,7 +23,7 @@
- #include "maple/maple.h"
- #include "vmu/vmulist.h"
- 
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- 
- #define FIRST_SECONDARY_DEVICE MAPLE_PORTS
- 
-Index: lxdream-0.9.1/src/cocoaui/paths_osx.m
-===================================================================
---- lxdream-0.9.1.orig/src/cocoaui/paths_osx.m
-+++ lxdream-0.9.1/src/cocoaui/paths_osx.m
-@@ -19,7 +19,7 @@
-  */
- 
- #include <string.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- 
- #include "lxdream.h"
- #include "lxpaths.h"
-Index: lxdream-0.9.1/src/config.c
-===================================================================
---- lxdream-0.9.1.orig/src/config.c
-+++ lxdream-0.9.1/src/config.c
-@@ -21,8 +21,7 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include "dream.h"
-Index: lxdream-0.9.1/src/config.h
-===================================================================
---- lxdream-0.9.1.orig/src/config.h
-+++ lxdream-0.9.1/src/config.h
-@@ -19,8 +19,7 @@
- #ifndef lxdream_config_H
- #define lxdream_config_H 1
- 
--#include <glib/gtypes.h>
--#include <glib/glist.h>
-+#include <glib.h>
- #include "gettext.h"
- 
- #ifdef __cplusplus
-Index: lxdream-0.9.1/src/drivers/input_lirc.c
-===================================================================
---- lxdream-0.9.1.orig/src/drivers/input_lirc.c
-+++ lxdream-0.9.1/src/drivers/input_lirc.c
-@@ -28,7 +28,6 @@
- #include <dirent.h>
- #include <ctype.h>
- 
--#include <glib/giochannel.h>
- #include <glib.h>
- 
- #include <lirc/lirc_client.h>
-Index: lxdream-0.9.1/src/drivers/joy_linux.c
-===================================================================
---- lxdream-0.9.1.orig/src/drivers/joy_linux.c
-+++ lxdream-0.9.1/src/drivers/joy_linux.c
-@@ -32,7 +32,6 @@
- #include <ctype.h>
- 
- #include <linux/joystick.h>
--#include <glib/giochannel.h>
- #include <glib.h>
- 
- #include "lxdream.h"
-Index: lxdream-0.9.1/src/drivers/osx_iokit.m
-===================================================================
---- lxdream-0.9.1.orig/src/drivers/osx_iokit.m
-+++ lxdream-0.9.1/src/drivers/osx_iokit.m
-@@ -19,8 +19,7 @@
-  * GNU General Public License for more details.
-  */
- 
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <sys/param.h>
- #include <paths.h>
- #include <string.h>
-Index: lxdream-0.9.1/src/gdlist.c
-===================================================================
---- lxdream-0.9.1.orig/src/gdlist.c
-+++ lxdream-0.9.1/src/gdlist.c
-@@ -19,7 +19,7 @@
- 
- #include <string.h>
- #include <stdlib.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <libgen.h>
- #include "gettext.h"
- #include "gdrom/gdrom.h"
-Index: lxdream-0.9.1/src/gdrom/gddriver.h
-===================================================================
---- lxdream-0.9.1.orig/src/gdrom/gddriver.h
-+++ lxdream-0.9.1/src/gdrom/gddriver.h
-@@ -24,7 +24,7 @@
- #include <stdio.h>
- #include "lxdream.h"
- #include "gdrom/gdrom.h"
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- 
- #ifdef __cplusplus
- extern "C" {
-Index: lxdream-0.9.1/src/gdrom/gdi.c
-===================================================================
---- lxdream-0.9.1.orig/src/gdrom/gdi.c
-+++ lxdream-0.9.1/src/gdrom/gdi.c
-@@ -23,7 +23,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <sys/stat.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include "gdrom/gddriver.h"
- 
- 
-Index: lxdream-0.9.1/src/gdrom/gdrom.c
-===================================================================
---- lxdream-0.9.1.orig/src/gdrom/gdrom.c
-+++ lxdream-0.9.1/src/gdrom/gdrom.c
-@@ -20,7 +20,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <ctype.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include "gdrom/ide.h"
- #include "gdrom/gdrom.h"
- #include "gdrom/gddriver.h"
-Index: lxdream-0.9.1/src/gdrom/gdrom.h
-===================================================================
---- lxdream-0.9.1.orig/src/gdrom/gdrom.h
-+++ lxdream-0.9.1/src/gdrom/gdrom.h
-@@ -22,7 +22,7 @@
- 
- #include "lxdream.h"
- #include "hook.h"
--#include <glib/glist.h>
-+#include <glib.h>
- 
- #ifdef __cplusplus
- extern "C" {
-Index: lxdream-0.9.1/src/gdrom/nrg.c
-===================================================================
---- lxdream-0.9.1.orig/src/gdrom/nrg.c
-+++ lxdream-0.9.1/src/gdrom/nrg.c
-@@ -20,7 +20,7 @@
- #include <assert.h>
- #include <stdio.h>
- #include <errno.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include "gdrom/gddriver.h"
- #include "dream.h"
- 
-Index: lxdream-0.9.1/src/gui.h
-===================================================================
---- lxdream-0.9.1.orig/src/gui.h
-+++ lxdream-0.9.1/src/gui.h
-@@ -19,7 +19,7 @@
- #ifndef lxdream_gui_H
- #define lxdream_gui_H
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #ifdef __cplusplus
- extern "C" {
-Index: lxdream-0.9.1/src/loader.h
-===================================================================
---- lxdream-0.9.1.orig/src/loader.h
-+++ lxdream-0.9.1/src/loader.h
-@@ -20,7 +20,7 @@
- #define lxdream_loader_H 1
- 
- #include <stdio.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #ifdef __cplusplus
- extern "C" {
-Index: lxdream-0.9.1/src/lxdream.h
-===================================================================
---- lxdream-0.9.1.orig/src/lxdream.h
-+++ lxdream-0.9.1/src/lxdream.h
-@@ -20,7 +20,7 @@
- #define lxdream_lxdream_H 1
- 
- #include <stdint.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #include "../config.h"
- 
-Index: lxdream-0.9.1/src/lxpaths.c
-===================================================================
---- lxdream-0.9.1.orig/src/lxpaths.c
-+++ lxdream-0.9.1/src/lxpaths.c
-@@ -19,8 +19,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <wordexp.h>
--#include <glib/gstrfuncs.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- 
- #include "gui.h"
- #include "config.h"
-Index: lxdream-0.9.1/src/maple/maple.c
-===================================================================
---- lxdream-0.9.1.orig/src/maple/maple.c
-+++ lxdream-0.9.1/src/maple/maple.c
-@@ -18,7 +18,7 @@
- #define MODULE maple_module
- 
- #include <assert.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include "dream.h"
- #include "mem.h"
- #include "asic.h"
-Index: lxdream-0.9.1/src/mem.c
-===================================================================
---- lxdream-0.9.1.orig/src/mem.c
-+++ lxdream-0.9.1/src/mem.c
-@@ -20,7 +20,7 @@
- #include <sys/types.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
-Index: lxdream-0.9.1/src/paths_unix.c
-===================================================================
---- lxdream-0.9.1.orig/src/paths_unix.c
-+++ lxdream-0.9.1/src/paths_unix.c
-@@ -18,7 +18,7 @@
- 
- #include <string.h>
- #include <stdlib.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- 
- #include "lxdream.h"
- #include "config.h"
-Index: lxdream-0.9.1/src/plugin.c
-===================================================================
---- lxdream-0.9.1.orig/src/plugin.c
-+++ lxdream-0.9.1/src/plugin.c
-@@ -20,8 +20,7 @@
- #include <dirent.h>
- #include <dlfcn.h>
- #include <string.h>
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include "plugin.h"
- #include "lxpaths.h"
- 
-Index: lxdream-0.9.1/src/pvr2/glutil.c
-===================================================================
---- lxdream-0.9.1.orig/src/pvr2/glutil.c
-+++ lxdream-0.9.1/src/pvr2/glutil.c
-@@ -17,7 +17,7 @@
-  */
- 
- #include <string.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include "pvr2/glutil.h"
- 
- gboolean isGLSecondaryColorSupported()
-Index: lxdream-0.9.1/src/sh4/sh4core.h
-===================================================================
---- lxdream-0.9.1.orig/src/sh4/sh4core.h
-+++ lxdream-0.9.1/src/sh4/sh4core.h
-@@ -19,7 +19,7 @@
- #ifndef lxdream_sh4core_H
- #define lxdream_sh4core_H 1
- 
--#include <glib/gtypes.h>
-+#include <glib.h>
- #include <stdint.h>
- #include <stdio.h>
- #include "mem.h"
-Index: lxdream-0.9.1/src/syscall.h
-===================================================================
---- lxdream-0.9.1.orig/src/syscall.h
-+++ lxdream-0.9.1/src/syscall.h
-@@ -20,7 +20,7 @@
- #define lxdream_syscall_H 1
- 
- #include <stdint.h>
--#include <glib/gtypes.h>
-+#include <glib.h>
- 
- #ifdef __cplusplus
- extern "C" {
-Index: lxdream-0.9.1/src/tools/actparse.c
-===================================================================
---- lxdream-0.9.1.orig/src/tools/actparse.c
-+++ lxdream-0.9.1/src/tools/actparse.c
-@@ -21,7 +21,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <sys/stat.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include "tools/gendec.h"
- 
- static int add_action( struct action *actions, struct ruleset *rules, char *operation, const char *file, int line, char *action )
-Index: lxdream-0.9.1/src/tools/gendec.c
-===================================================================
---- lxdream-0.9.1.orig/src/tools/gendec.c
-+++ lxdream-0.9.1/src/tools/gendec.c
-@@ -23,7 +23,7 @@
- #include <getopt.h>
- #include <errno.h>
- #include <ctype.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <assert.h>
- #include "tools/gendec.h"
- 
-Index: lxdream-0.9.1/src/vmu/vmulist.c
-===================================================================
---- lxdream-0.9.1.orig/src/vmu/vmulist.c
-+++ lxdream-0.9.1/src/vmu/vmulist.c
-@@ -18,8 +18,7 @@
- 
- #include <string.h>
- #include <stdlib.h>
--#include <glib/glist.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include "vmulist.h"
- #include "config.h"
- 
-Index: lxdream-0.9.1/src/vmu/vmuvol.c
-===================================================================
---- lxdream-0.9.1.orig/src/vmu/vmuvol.c
-+++ lxdream-0.9.1/src/vmu/vmuvol.c
-@@ -16,8 +16,7 @@
-  * GNU General Public License for more details.
-  */
- 
--#include <glib/gmem.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <string.h>
- #include <unistd.h>
- #include <stdio.h>
diff --git a/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild b/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
deleted file mode 100644
index a2024a899bc9..000000000000
--- a/games-emulation/lxdream/lxdream-0.9.1-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="An emulator for the Sega Dreamcast system"
-HOMEPAGE="http://www.lxdream.org/"
-SRC_URI="http://www.lxdream.org/count.php?file=${P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# lirc configure option is not recogniced
-IUSE="debug profile pulseaudio sdl" #lirc
-
-RDEPEND="
-	app-misc/lirc
-
-	media-libs/alsa-lib
-	media-libs/libpng:0=
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl[sound] )
-	virtual/opengl
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	virtual/os-headers
-	!!gnustep-base/gnustep-gui" #377635
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}/${PN}-0.9.1-glib-single-include.patch"
-
-	# Make .desktop file pass desktop-file-validate
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/FilePattern/d' \
-		-e '/Categories/s|$|;|' \
-		${PN}.desktop || die
-	# Do not override user-specified CFLAGS
-	sed -i \
-		-e s/'CFLAGS=\"-g -fexceptions\"'/'CFLAGS=\"${CFLAGS} -g -fexceptions\"'/ \
-		-e '/CCOPT/d' \
-		-e '/OBJCOPT/d' \
-		configure || die
-	append-libs -lX11 -lm
-}
-
-src_configure() {
-	# lirc configure option is not recognized
-	# $(use_with lirc) \
-	econf \
-		--datadir="/usr/share" \
-		$(use_enable debug trace) \
-		$(use_enable debug watch) \
-		$(use_enable profile profiled) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sdl) \
-		--without-esd
-}
diff --git a/games-emulation/lxdream/metadata.xml b/games-emulation/lxdream/metadata.xml
deleted file mode 100644
index 4731fb707fd1..000000000000
--- a/games-emulation/lxdream/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chithanh@gentoo.org</email>
-		<name>Chí-Thanh Christopher Nguyễn</name>
-	</maintainer>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/m64py-0.2.4 b/games-emulation/m64py-0.2.4
new file mode 100644
index 000000000000..9dedcb3ac87a
--- /dev/null
+++ b/games-emulation/m64py-0.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A frontend for Mupen64Plus
+EAPI=6
+HOMEPAGE=http://m64py.sourceforge.net/
+IUSE=7z rar python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0
+RDEPEND=dev-python/PyQt5[gui,opengl,widgets,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PySDL2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-libs/libsdl2[joystick,video] >=games-emulation/mupen64plus-core-2.5:0/2-sdl2 7z? ( || ( dev-python/pylzma[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/p7zip ) ) rar? ( || ( dev-python/rarfile[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-arch/unrar app-arch/rar ) ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://sourceforge/m64py/m64py-0.2.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1a697928c0e47dda3c429abbbc7e401
diff --git a/games-emulation/m64py/Manifest b/games-emulation/m64py/Manifest
deleted file mode 100644
index c03daa0feb37..000000000000
--- a/games-emulation/m64py/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST m64py-0.2.4.tar.gz 209621 BLAKE2B 05fe7044ec096767ae1eb57aad9f326b157d67ea709ca0bb74cdd68ae16a23eb662a2842bef5e038d1b29cbf0a5252669ff54268d1227390f47e8c9029b63e6a SHA512 ab78565466c6dcfe604cdc00b7e63dee2f0f33514dbf4f9115af646b1f6562042516513d054bd5cb489ad89c9d30431e9ce531f8b27925ecb9c6f7b509836348
-EBUILD m64py-0.2.4.ebuild 1067 BLAKE2B a21eeabf0ac3bb7c88486ca1ac12efac04c58ade8c666b9efd73c011a1f499879d522c0cb721177b8014a23f4b322fe5229e2eafeceb42ed8b433448609d5e96 SHA512 8a66a89849ace632528543c73725a3ba1c2e60e84a4b81a4c9af4e0cb36bea9c622a4ad130d9ecdef0e74d9a089856ddeed0ae7af858a857e2672af073d8acb6
-MISC metadata.xml 455 BLAKE2B 094f3f1db818c82e55c07512db2e94ed800bfd14595d70aa8ddca7d63e862807c5552210f9a71c01ea0fbcc61f3d46a139a762d1026d75b1f932e15ec7e0e589 SHA512 41d3ca220e71119ec7bf4ea8b1ea92289d901ba3a0058e75423dd50580d03a0cbc9aae2c368fc3c47793e0405c0e167fc546c65f039661b5b11fbb274846301b
diff --git a/games-emulation/m64py/m64py-0.2.4.ebuild b/games-emulation/m64py/m64py-0.2.4.ebuild
deleted file mode 100644
index 7d0c4054d8dc..000000000000
--- a/games-emulation/m64py/m64py-0.2.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 xdg-utils
-
-DESCRIPTION="A frontend for Mupen64Plus"
-HOMEPAGE="http://m64py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/m64py/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 public-domain GPL-2 BSD CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="7z rar"
-
-RDEPEND="
-	dev-python/PyQt5[gui,opengl,widgets,${PYTHON_USEDEP}]
-	dev-python/PySDL2[${PYTHON_USEDEP}]
-	media-libs/libsdl2[joystick,video]
-	>=games-emulation/mupen64plus-core-2.5:0/2-sdl2
-	7z? (
-		|| (
-			dev-python/pylzma[${PYTHON_USEDEP}]
-			app-arch/p7zip
-		)
-	)
-	rar? (
-		|| (
-			dev-python/rarfile[${PYTHON_USEDEP}]
-			app-arch/unrar
-			app-arch/rar
-		)
-	)"
-
-python_prepare_all() {
-	# set the correct search path
-	cat >> src/m64py/platform.py <<-_EOF_
-		SEARCH_DIRS = ["/usr/$(get_libdir)/mupen64plus"]
-_EOF_
-
-	distutils-r1_python_prepare_all
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/games-emulation/m64py/metadata.xml b/games-emulation/m64py/metadata.xml
deleted file mode 100644
index 00cb74caa25a..000000000000
--- a/games-emulation/m64py/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name='7z'>Ensure support for .7z archives.</flag>
-		<flag name='rar'>Ensure support for .rar archives.</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">m64py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mamory-0.2.25-r1 b/games-emulation/mamory-0.2.25-r1
new file mode 100644
index 000000000000..2af946f4f8a3
--- /dev/null
+++ b/games-emulation/mamory-0.2.25-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/expat >=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=ROM management tools and library
+EAPI=6
+HOMEPAGE=http://mamory.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat
+SLOT=0
+SRC_URI=mirror://sourceforge/mamory/mamory-0.2.25.tar.gz
+_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_=91c81601ac19179dc51415972b680514
diff --git a/games-emulation/mamory/Manifest b/games-emulation/mamory/Manifest
deleted file mode 100644
index 58b2d16d4e56..000000000000
--- a/games-emulation/mamory/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mamory-0.2.25.tar.gz 437223 BLAKE2B 2893595245ac3fde7c049448f7dc1cbe0ac24767a7efdcf22b5000154026961ef9b700844cc53d4808e7f90b5042f192d0d2a9338cb47e42d6f9d534f5946044 SHA512 d59539646fa61a3964e46123e0c8d09170f5561355e57b8c93dc89c11d99af1a2edeb60389e7f42b14f431c9c495c6ce20c70517ac4977ccaef62f0ed47f0d76
-EBUILD mamory-0.2.25-r1.ebuild 1051 BLAKE2B ddb02d41af08032313a818b8f066645f28775331a5e08f846f3b8e8c9ac797fe2959bdd528711609e30701428d42987142cb6888cc5d7fb1aca1707951ad9ad5 SHA512 b917e62eb8f075291e5e9dec9c481a60a99eb333bfc8d02e66efee9da457068e92531bd4c743df35ce0fb5133e3f8dd00e47e70e3bbc52f10657bcd65df8278f
-MISC metadata.xml 329 BLAKE2B b6c6f06e91bfcd0d053f2f057b1651981d60204b07faad12072375b97d84808fa77d6c2549ca3dde5a92881840c4f475fe8af578e1c4c0e1320936ebb0fa9e18 SHA512 58aa61207f4409bc50a405342e2f68cf5d576e7819def22d5bd2788869225fc7d4d8769f1efebd78b40195a30e8a104e2d4107dca6bb1d11a66291353088a75c
diff --git a/games-emulation/mamory/mamory-0.2.25-r1.ebuild b/games-emulation/mamory/mamory-0.2.25-r1.ebuild
deleted file mode 100644
index cccd915c6f27..000000000000
--- a/games-emulation/mamory/mamory-0.2.25-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="ROM management tools and library"
-HOMEPAGE="http://mamory.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/expat"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-
-	# Make sure the system expat is used
-	sed -i \
-		-e 's/#ifdef.*SYSEXPAT/#if 1/' \
-		mamory/amlxml.c mamory/amlxml.h || die
-
-	# Remove hardcoded CFLAGS options
-	sed -i \
-		-e '/AC_ARG_ENABLE(debug,/ {N;N;N;d}' \
-		configure.ac || die
-
-	# Make it possible for eautoreconf to fix fPIC etc.
-	sed -i \
-		-e '/libcommon_la_LDFLAGS= -static/d' \
-		common/Makefile.am || die
-
-	AT_M4DIR="config" eautoreconf
-	append-cflags -std=gnu89 # build with gcc5 (bug #570500)
-}
-
-src_configure() {
-	econf \
-		--includedir=/usr/include \
-		--disable-static
-}
-
-src_install() {
-	HTML_DOCS="DOCS/mamory.html" default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/games-emulation/mamory/metadata.xml b/games-emulation/mamory/metadata.xml
deleted file mode 100644
index 20c41e11778e..000000000000
--- a/games-emulation/mamory/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mamory</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mastergear-bin-4.3 b/games-emulation/mastergear-bin-4.3
new file mode 100644
index 000000000000..526f9db3978e
--- /dev/null
+++ b/games-emulation/mastergear-bin-4.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=SEGA Master System / Game Gear emulator
+EAPI=6
+HOMEPAGE=https://fms.komkon.org/MG/
+KEYWORDS=~amd64
+LICENSE=all-rights-reserved
+RDEPEND=>=sys-libs/glibc-2.15 sys-libs/zlib x11-libs/libX11 x11-libs/libXext || ( media-sound/pulseaudio media-sound/apulse )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://fms.komkon.org/MG/MG43-Ubuntu-x86-bin.tgz
+_md5_=88978a9ec5cff940deb45df4687f192d
diff --git a/games-emulation/mastergear-bin/Manifest b/games-emulation/mastergear-bin/Manifest
deleted file mode 100644
index e566a8493899..000000000000
--- a/games-emulation/mastergear-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MG43-Ubuntu-x86-bin.tgz 169112 BLAKE2B d54ad5ce84b02e1ff870510fce71447420a27d90b77101280b131f8862e4549767db5a375142e7eb3293465c5da805acc93f5ee737b3c56df66e1cba9d9420e9 SHA512 b39f03902d5046e8d8a64cd45d5d4fc1522a70d97d812dfa859d315a381181ba3c05a3292e24a92662ee4a95b501e6cb3c516eb1dea9d1d5b7e74abe8a2b3dda
-EBUILD mastergear-bin-4.3.ebuild 585 BLAKE2B 202c653a577b2009a89c320dc54eb6bd304b990a15b5c26472d0a66e6a65cd9fb2e0c6804a02dc2670c89c105873615da08bb90aaca21a2c9b48ddfae2ed4718 SHA512 355eebe6427871fb2ddd9c4153193a21454fe38fbc74200fad652c79d0f321d373a254dd23207ed1454f5301d8f067310ba4409b3de2a3689a0deb88b623f684
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild b/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild
deleted file mode 100644
index da157fcf3639..000000000000
--- a/games-emulation/mastergear-bin/mastergear-bin-4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="SEGA Master System / Game Gear emulator"
-HOMEPAGE="https://fms.komkon.org/MG/"
-SRC_URI="https://fms.komkon.org/MG/MG${PV//\./}-Ubuntu-x86-bin.tgz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror strip"
-
-RDEPEND=">=sys-libs/glibc-2.15
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	|| ( media-sound/pulseaudio media-sound/apulse )"
-
-S="${WORKDIR}"
-
-src_install() {
-	newbin mg mastergear
-	docinto html
-	dodoc MG.html
-}
diff --git a/games-emulation/mastergear-bin/metadata.xml b/games-emulation/mastergear-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/mastergear-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/mednafen-0.9.46 b/games-emulation/mednafen-0.9.46
new file mode 100644
index 000000000000..c8ebccef86f2
--- /dev/null
+++ b/games-emulation/mednafen-0.9.46
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=dev-libs/libcdio >=dev-libs/lzo-2.10 media-libs/libsdl[sound,joystick,opengl,video] media-libs/libsndfile sys-libs/zlib[minizip] virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Argument-driven multi-system emulator utilizing OpenGL and SDL
+EAPI=6
+HOMEPAGE=https://mednafen.github.io/
+IUSE=alsa altivec cjk debugger jack nls pax_kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdio >=dev-libs/lzo-2.10 media-libs/libsdl[sound,joystick,opengl,video] media-libs/libsndfile sys-libs/zlib[minizip] virtual/opengl alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=https://mednafen.github.io/releases/files/mednafen-0.9.46.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=011823ed3813cc72f542ee55fb448fa3
diff --git a/games-emulation/mednafen/Manifest b/games-emulation/mednafen/Manifest
deleted file mode 100644
index 5d0b95a33574..000000000000
--- a/games-emulation/mednafen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mednafen-0.9.46.tar.xz 3187988 BLAKE2B c33da02bfb0cce37e9029efc98d11e233686c41c7ecb51110a3fe805b3a13f2fef293dd86b7bc7a3ff172f7f0f507e07804a2927e5b41c1927ca52673f068dfb SHA512 ea624f076922570001393d5d04cc1b20b3d005d31de4095ee5c7a985be2b61e8d3aa5e78c64e751e8233adc89a31be955372caeb2818d0a5cc71ba9380931620
-EBUILD mednafen-0.9.46.ebuild 3367 BLAKE2B c8029cf25b7211db7a4e3b04eb679cd15cf73307731aba5f4306ab80f4893d3c8e39e56df79fe9c22ee561dfe80ece9cbcc95cec8250a3eb6e766e0b5fb763ed SHA512 3dc665af4a7a96d244d40d01897c53311a55c626f04ace5b1e9db32708613ea816338a042790f4bca5c3d399d8d8f99e857c8f88686210ea0c828d0d70e02a0f
-MISC metadata.xml 475 BLAKE2B f1a569bb5271cd8e5e62dc19873ce2dd5ac1cce0a84ad8c8afd68e38451301eeb7db8200636abcbdca35e0e3d310cb1bc72e3a8e0fe048f24ee483c8ba22fdc7 SHA512 d13e5f6522d5150282ed8bfb44bcdef66a30c392abdd8bf142a0c04fa3d2fd9dc09395510c771fb110cc6123e4f738cc28f33f93cf75a8f5538063eef4ce8cc5
diff --git a/games-emulation/mednafen/mednafen-0.9.46.ebuild b/games-emulation/mednafen/mednafen-0.9.46.ebuild
deleted file mode 100644
index a42d9936b35c..000000000000
--- a/games-emulation/mednafen/mednafen-0.9.46.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pax-utils
-
-DESCRIPTION="Argument-driven multi-system emulator utilizing OpenGL and SDL"
-HOMEPAGE="https://mednafen.github.io/"
-SRC_URI="https://mednafen.github.io/releases/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa altivec cjk debugger jack nls pax_kernel"
-
-RDEPEND="
-	dev-libs/libcdio
-	>=dev-libs/lzo-2.10
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/libsndfile
-	sys-libs/zlib[minizip]
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}
-
-pkg_pretend() {
-	if has ccache ${FEATURES}; then
-		ewarn
-		ewarn "If you experience build failure, try turning off ccache in FEATURES."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Unfortunately, upstream is insane and thinks mucking with CFLAGS is okay, if
-	# it prevents "users who don't understand the consequences of what they're doing".
-	# We use sed's here, as they're more forward-compatible than patches which need to
-	# be constantly rebased. DO NOT REPLACE THEM UNLESS YOU HAVE PERMISSION FROM GAMES.
-	sed -e '/-fno-fast-math/d' \
-		-e '/-fno-unsafe-math-optimizations/d' \
-		-e '/-fno-aggressive-loop-optimizations/d' \
-		-e '/-fno-ipa-icf/d' \
-		-e '/-fno-printf-return-value/d' \
-		-e '/-fomit-frame-pointer/d' \
-		-e '/-fno-pic/d' \
-		-e '/-fno-pie/d' \
-		-e '/-fno-PIC/d' \
-		-e '/-fno-PIE/d' \
-		-e '/-nopie/d' \
-		-e '/-no-pie/d' \
-		-e '/-fno-stack-protector/d' \
-		-e '/-fno-stack-protector-all/d' \
-		-e '/-fno-stack-protector-strong/d' \
-		-e '/-mtune=haswell/d' \
-		-i configure.ac || die
-
-	# Furthermore, upstream is also insane about bundling libraries and considers it
-	# "an aesthetics issue" and is even unwilling to make unbundling optional.
-	# Libs to unbundle: minilzo, minizip
-	sed -e '/PKG_PROG_PKG_CONFIG/a PKG_CHECK_MODULES([LZO], [lzo2])' \
-		-i configure.ac || die
-	sed -e '/bin_PROGRAMS/a mednafen_CPPFLAGS = \$(LZO_CFLAGS)' \
-		-i src/Makefile.am || die
-	sed -e 's:"compress/minilzo.h":<lzo1x.h>:' \
-		-i src/{mednafen,qtrecord}.cpp || die
-	sed -e 's:compress/ioapi.c::' \
-		-e 's:compress/unzip.c::' \
-		-e 's:compress/minilzo.c::' \
-		-i src/compress/Makefile.am.inc || die
-	sed -e 's:"compress/unzip.h":<minizip/unzip.h>:' \
-		-i src/file.cpp || die
-	sed -e 's:\(mednafen_LDADD.*trio/libtrio\.a\):\1 -lminizip \$(LZO_LIBS):' \
-		-i src/Makefile.am || die
-	# delete bundled files just to be sure...
-	rm src/compress/{ioapi.?,*lzo*,unzip.?} || die
-
-	# The insanity continues... upstream now believes it needs to
-	# warn users when compiling with -fPIC/-fPIE enabled
-	sed -e '/Compiling with position-independent code generation enabled is not recommended, for performance reasons/d' \
-		-i src/types.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# very dodgy code (bug #539992)
-	strip-flags
-	append-flags -fomit-frame-pointer -fwrapv
-
-	econf \
-		$(use_enable alsa) \
-		$(use_enable altivec) \
-		$(use_enable cjk cjk-fonts) \
-		$(use_enable debugger) \
-		$(use_enable jack) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dodoc Documentation/cheats.txt
-
-	if use pax_kernel; then
-		pax-mark m "${ED%/}"/usr/bin/mednafen || die
-	fi
-}
diff --git a/games-emulation/mednafen/metadata.xml b/games-emulation/mednafen/metadata.xml
deleted file mode 100644
index 0afad2b3f24e..000000000000
--- a/games-emulation/mednafen/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="debugger">Build with internal debugger</flag>
-		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">mednafen</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mednaffe-0.8.7 b/games-emulation/mednaffe-0.8.7
new file mode 100644
index 000000000000..43ed3585bb30
--- /dev/null
+++ b/games-emulation/mednaffe-0.8.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 games-emulation/mednafen[debugger] >=x11-libs/gtk+-3.4:3 app-arch/unzip 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=A front-end (GUI) for mednafen emulator
+EAPI=6
+HOMEPAGE=https://github.com/AmatCoder/mednaffe
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.32:2 games-emulation/mednafen[debugger] >=x11-libs/gtk+-3.4:3
+SLOT=0
+SRC_URI=https://github.com/AmatCoder/mednaffe/releases/download/0.8.7/mednaffe-0.8.7.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_=57f1b30478405fc7c884bc06439565f9
diff --git a/games-emulation/mednaffe/Manifest b/games-emulation/mednaffe/Manifest
deleted file mode 100644
index c5358cc1cb28..000000000000
--- a/games-emulation/mednaffe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mednaffe-0.8.7.tar.gz 304300 BLAKE2B 80a57f2afbea0e33ec547f16088b678fd9a319a124bbebe71fe7848497e1276ae77c0fb47718324d8549dbb69709685f46c970dedf982f48ac095f1923b42dbd SHA512 3495ecd3b87f19ab65d8760ea8adfa830c4dc9fe959f2e2f349216b36f58d9623c9cfd0c7e40fe5e8b7b90846fe85d9808c2a5885f36d5d8b16659b25cf8a3a1
-EBUILD mednaffe-0.8.7.ebuild 869 BLAKE2B b04ffa62a023f0c2f49babc8ebc88e70d8ab9ab24fea303db31d80aa4c66378659dca954df244c762b3273091b97edc5d16f2caab17a98d28422a988b44e6407 SHA512 ac868f6139863cdbec397523688b342640c5f2403fe6e1ceda3326fa04085f6e823b26e0049f4e49cf3114dcfa14f5afad0f264679f78a9c320bd12032341d91
-MISC metadata.xml 336 BLAKE2B 36957f8dd3f83bd9fbbf5e504e5dd8b0fced6a57b51a4f31bc322b498ef16178641e13c9033cd6e3746677a6e9fe39e10b049f8a681ef04b0426a682ddec70b5 SHA512 5d0ade58e84b321f763690314eb9fa4d8aa2f8b06f4470466101e4213828d92ad200565d1cd5324a0a4e9ccd9daa0a13ff14f9574f6d6f639c92d0d9235dacb7
diff --git a/games-emulation/mednaffe/mednaffe-0.8.7.ebuild b/games-emulation/mednaffe/mednaffe-0.8.7.ebuild
deleted file mode 100644
index 904241ddac84..000000000000
--- a/games-emulation/mednaffe/mednaffe-0.8.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic gnome2-utils
-
-DESCRIPTION="A front-end (GUI) for mednafen emulator"
-HOMEPAGE="https://github.com/AmatCoder/mednaffe"
-SRC_URI="https://github.com/AmatCoder/mednaffe/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	games-emulation/mednafen[debugger]
-	>=x11-libs/gtk+-3.4:3
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	append-cflags -Wl,-export-dynamic
-	sed -i -e 's:$(datadir):/usr/share:' share/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-gtk3
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/mednaffe/metadata.xml b/games-emulation/mednaffe/metadata.xml
deleted file mode 100644
index d5520fd1401b..000000000000
--- a/games-emulation/mednaffe/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">AmatCoder/mednaffe</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mekanix-070-r1 b/games-emulation/mekanix-070-r1
new file mode 100644
index 000000000000..8e50588dc69a
--- /dev/null
+++ b/games-emulation/mekanix-070-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=SG-1000, SC-3000, SF-7000, SSC, SMS, GG, COLECO, and OMV emulator
+EAPI=6
+HOMEPAGE=http://www.smspower.org/meka/
+KEYWORDS=~x86
+LICENSE=mekanix
+RDEPEND=media-libs/libpng x11-libs/libXpm
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://www.smspower.org/meka/releases/mekanix070.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=37174b6194d3fd7603f7012ca8ac6501
diff --git a/games-emulation/mekanix/Manifest b/games-emulation/mekanix/Manifest
deleted file mode 100644
index 8515d7d7d1f1..000000000000
--- a/games-emulation/mekanix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mekanix070.tgz 759553 BLAKE2B ffb8a0392edd8d4887cc668e2d18b5ad955e54bf4c53cc26a06c33a3364bb7db4bd5c6ee8e5406d2885e9c173b16b0894fcc2ee3a111d03c70ad8326920011e1 SHA512 9298d74c0ff7e8d13fbe79f13f2107ea966e6f2602bb3215207a76a433d9f705cd57a33db8295d44cb975e3735a510f23a189d624ea69b83ecfc7ba6509cc3df
-EBUILD mekanix-070-r1.ebuild 702 BLAKE2B 2f3b11c2b186fd5638ae9453d7fc3b3e88b583e44517f0471d3d84ddd430f7cfcff99aab1149031f2c71a09dbd8b60b302b99334711f2830b150a3317427ca0d SHA512 8f128f5446e4dbba8d0de7a9ddd11276de58731fa277109c1739411a9f4ea5872e7ed1fc5024bca0f9706cd8cff4c53fc0db7921bc423f9e7604cb239166fe7f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/mekanix/mekanix-070-r1.ebuild b/games-emulation/mekanix/mekanix-070-r1.ebuild
deleted file mode 100644
index ee7f2d85c12d..000000000000
--- a/games-emulation/mekanix/mekanix-070-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="SG-1000, SC-3000, SF-7000, SSC, SMS, GG, COLECO, and OMV emulator"
-HOMEPAGE="http://www.smspower.org/meka/"
-SRC_URI="http://www.smspower.org/meka/releases/${PN}${PV}.tgz"
-
-LICENSE="mekanix"
-SLOT="0"
-KEYWORDS="~x86"
-RESTRICT="strip"
-IUSE=""
-
-RDEPEND="media-libs/libpng
-	x11-libs/libXpm"
-
-S=${WORKDIR}/${PN}
-
-# file verfies that it's an elf, not win32, binary:
-QA_PREBUILT="opt/${PN}/meka.exe"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins * || die "doins failed"
-	fperms a+x "${dir}/meka.exe"
-	make_wrapper mekanix ./meka.exe "${dir}"
-}
diff --git a/games-emulation/mekanix/metadata.xml b/games-emulation/mekanix/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/mekanix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/metadata.xml b/games-emulation/metadata.xml
deleted file mode 100644
index 1d99058d9f44..000000000000
--- a/games-emulation/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-emulation category contains game platform emulators.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-emulation enthält Emulatoren für verschiedene Spieleplattformen.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-emulation contiene emuladores de juegos de plataforma.
-	</longdescription>
-	<longdescription lang="ja">
-		games-emulationカテゴリーにはプラットフォームをエミュレートしたゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-emulation categorie bevat emulators voor verschillende spelcomputers.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-emulation chứa các bộ mô phỏng nền chơi game.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-emulation contiene emulatori di piattaforme di gioco.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-emulation contém emuladores de plataformas de jogos.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-emulation zawiera emulatory rozmaitych platform dla gier.
-	</longdescription>
-</catmetadata>
diff --git a/games-emulation/mgba-0.6.1 b/games-emulation/mgba-0.6.1
new file mode 100644
index 000000000000..f670a5cc0c91
--- /dev/null
+++ b/games-emulation/mgba-0.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A new Game Boy Advance emulator written in C.
+EAPI=6
+HOMEPAGE=https://mgba.io
+IUSE=debug ffmpeg imagemagick opengl qt5 +sdl
+KEYWORDS=amd64 x86
+LICENSE=MPL-2.0
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.1.tar.gz -> mgba-0.6.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bb51b11aad2a0c3ee662457844b6e596
diff --git a/games-emulation/mgba-0.6.2 b/games-emulation/mgba-0.6.2
new file mode 100644
index 000000000000..414397cbb376
--- /dev/null
+++ b/games-emulation/mgba-0.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Game Boy Advance emulator written in C
+EAPI=6
+HOMEPAGE=https://mgba.io
+IUSE=debug ffmpeg imagemagick opengl qt5 +sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.2.tar.gz -> mgba-0.6.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aee0ccda218d041500929ee673c699f9
diff --git a/games-emulation/mgba-0.6.3 b/games-emulation/mgba-0.6.3
new file mode 100644
index 000000000000..173a74f883a7
--- /dev/null
+++ b/games-emulation/mgba-0.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Game Boy Advance emulator written in C
+EAPI=6
+HOMEPAGE=https://mgba.io
+IUSE=debug ffmpeg imagemagick libav opengl qt5 +sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=dev-db/sqlite:3 media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/mgba-emu/mgba/archive/0.6.3.tar.gz -> mgba-0.6.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2ecf6303963c42b6d16a59507db045fd
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
deleted file mode 100644
index 279d284a9a53..000000000000
--- a/games-emulation/mgba/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX mgba-0.6.3-qt511.patch 975 BLAKE2B 3fdafdd9a10cd643fbf29a76baf4e49db50142a2f1b096f8c8b962e38166756016bf663b53dd6cf3a2e33f2f28313d477463d8807d4ecb3139bf7a0943ae0274 SHA512 41e0ea8568d8ffddac2b9020933fd4a21562049b82bfd95bb0ae372702b3312c7ee3f03e03a36fcaec723d999f7820a785a730354825cee1a737d6c2accbfb29
-DIST mgba-0.6.1.tar.gz 7437240 BLAKE2B d00ed8a517b6e82f477537702d757bd9d86d007ee7bea022b67751b0423a2f386706e410c5e41b984ae8e7e66efabbf41356b846fdcba438cb5a64c89bc2379c SHA512 fb4d2bd490afa052c32d263e4d7b65ff83ccdcad01f5df6572d73c81de3c4e0c268b102ac36cff4a85ab20fc190d2f1a4959a3058e559a528be5e49c4808ce57
-DIST mgba-0.6.2.tar.gz 7441969 BLAKE2B f807a3a26667f50cbf3b87ac6e7887ec7fb99516895e1168855fafee417025a1d1e5605ca3f87a171fde563fd69878d5d164e068247643401c2696164d7460c1 SHA512 8afe4fb331f4163f4cd96cc73a51136bdb9008178b74c0ecb827c1f06dee79eba3cf753e1c35657972d8593ab97d294c15287ebf2c5ffa6a135527d5611d3574
-DIST mgba-0.6.3.tar.gz 7442154 BLAKE2B 2b46cf36174ef0a186b1bc71784820e6ddd7754a7cae695a95dcdae96efff58af70dd14faa2f1f6194a23450943d82aed2394f7bf2821ed91bf558eef6ae9c4d SHA512 d646af7869dbcf8df671a75ecfd8c270950c013b826b23b94bacae43a77243786f198725e1b9bf17827d1ffcf6a8eef70091d53ea878bfb2450472485f42f233
-EBUILD mgba-0.6.1.ebuild 2372 BLAKE2B a1044752dd33c7a2019f88d79cb247013a8de227ae5730cdfbc1ccc28409a9a767fa598a2000db5c962efe11e7f3031ed7b35353606885879838e147c9b20ef8 SHA512 33ebba4a7c94922750bbad82c1c06a1185f03336a2138ecd39bdc5d3dfbee9b7ac5f3b190cc693936790010e5cf86102ef1a4a25cc4ff28114c7710923e911e1
-EBUILD mgba-0.6.2.ebuild 2367 BLAKE2B d9b9d7779b6bcdcb82d883a0f1a6156111037603b04e7e417b7808b30f16f9ab6564145d56fc9534f54d591cde9229adc4e3fc47a34ec7ef41b4b01eb2783ec6 SHA512 97daec41ddf7d211c8ffcca2f6c5f53e7adf44cc02d7f7d35717a7fdb1c2d7d3f448f7df194386b0c168f6d63cbf85443eccddcdcda52d9d6b2384c5af3b56cb
-EBUILD mgba-0.6.3.ebuild 2470 BLAKE2B a00e6509643d0eed1ea8b213f3503791477b55c059085a9ab314f374e1a6c24ddfa1dc313b331fa9779659f76aab8458c22b6b83a5455c2d4d5824c64434a379 SHA512 66ab4004d8d4a22874030438c1bf1b9a02fe95be18f9bbf668cdd3cd111ad335641e2812d2e85485f9cd701f7e7702b3295ed79a7e99342af794697429139e31
-MISC metadata.xml 339 BLAKE2B e8edd01de74aa69c33c51ca095668dd89c74b83bd0c1597baf75f34b839cba3e74a2723b96acad0aef00b7a84628d54f70526f336a2d9880c32403cca153ca1d SHA512 33798a7a9145daff0c4f0e31cbd6ac05e49632edbec02709f51952716af659a7f3e76f378e9432c15e5bda68619816318a1d2fbfa27b4a5ef136970241ebfa03
diff --git a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch b/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
deleted file mode 100644
index 05368f6e30e7..000000000000
--- a/games-emulation/mgba/files/mgba-0.6.3-qt511.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From a2b8c4ae807ae92103e14961fd34377b28cbe219 Mon Sep 17 00:00:00 2001
-From: Vicki Pfau <vi@endrift.com>
-Date: Fri, 25 May 2018 18:04:16 -0700
-Subject: [PATCH] Qt: Fix build with Qt 5.11
-
----
- src/platform/qt/LoadSaveState.cpp | 1 +
- src/platform/qt/Window.h          | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/platform/qt/LoadSaveState.cpp b/src/platform/qt/LoadSaveState.cpp
-index a381c3d22..41ddb842e 100644
---- a/src/platform/qt/LoadSaveState.cpp
-+++ b/src/platform/qt/LoadSaveState.cpp
-@@ -10,6 +10,7 @@
- #include "GamepadButtonEvent.h"
- #include "VFileDevice.h"
- 
-+#include <QAction>
- #include <QDateTime>
- #include <QKeyEvent>
- #include <QPainter>
-diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
-index c009c7ffa..8ee63907d 100644
---- a/src/platform/qt/Window.h
-+++ b/src/platform/qt/Window.h
-@@ -6,6 +6,7 @@
- #ifndef QGBA_WINDOW
- #define QGBA_WINDOW
- 
-+#include <QAction>
- #include <QDateTime>
- #include <QList>
- #include <QMainWindow>
diff --git a/games-emulation/mgba/metadata.xml b/games-emulation/mgba/metadata.xml
deleted file mode 100644
index e4c99df19a2a..000000000000
--- a/games-emulation/mgba/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mgba-emu/mgba</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-emulation/mgba/mgba-0.6.1.ebuild b/games-emulation/mgba/mgba-0.6.1.ebuild
deleted file mode 100644
index 9bd4dc4f28c0..000000000000
--- a/games-emulation/mgba/mgba-0.6.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A new Game Boy Advance emulator written in C."
-HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r "${S}"/src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES=OFF
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		# build fails with sqlite being disabled (0.6.0)
-		-DUSE_SQLITE3=ON
-		-DUSE_ZLIB=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		for size in 16 24 32 48 64 96 128 256; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		dobin ../${P}_build/qt/${PN}-qt
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.6.2.ebuild b/games-emulation/mgba/mgba-0.6.2.ebuild
deleted file mode 100644
index bae8265e6962..000000000000
--- a/games-emulation/mgba/mgba-0.6.2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ffmpeg imagemagick opengl qt5 +sdl"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	ffmpeg? ( virtual/ffmpeg )
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r "${S}"/src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_GLES=OFF
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		# build fails with sqlite being disabled (0.6.0)
-		-DUSE_SQLITE3=ON
-		-DUSE_ZLIB=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/games-emulation/mgba/mgba-0.6.3.ebuild b/games-emulation/mgba/mgba-0.6.3.ebuild
deleted file mode 100644
index c4859e9bec53..000000000000
--- a/games-emulation/mgba/mgba-0.6.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="Game Boy Advance emulator written in C"
-HOMEPAGE="https://mgba.io"
-SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug ffmpeg imagemagick libav opengl qt5 +sdl"
-REQUIRED_USE="|| ( qt5 sdl )
-		qt5? ( opengl )"
-
-RDEPEND="
-	dev-db/sqlite:3
-	media-libs/libpng:0=
-	sys-libs/zlib[minizip]
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:= )
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	opengl? ( virtual/opengl )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-qt511.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Get rid of any bundled stuff we don't want
-	for pkg in libpng lzma sqlite3 zlib ; do
-		rm -r src/third-party/${pkg} || die
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_GL="$(usex opengl)"
-		-DBUILD_PYTHON=OFF
-		-DBUILD_QT="$(usex qt5)"
-		-DBUILD_SDL="$(usex sdl)"
-		-DBUILD_SHARED=ON
-		# test suite fails to build (0.6.0)
-		-DBUILD_SUITE=OFF
-		-DBUILD_TEST=OFF
-		-DM_CORE_GB=ON
-		-DM_CORE_GBA=ON
-		-DUSE_DEBUGGERS="$(usex debug)"
-		-DUSE_EDITLINE="$(usex debug)"
-		-DUSE_EPOXY=OFF
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_GDB_STUB="$(usex debug)"
-		-DUSE_LIBZIP=OFF
-		-DUSE_LZMA=OFF
-		-DUSE_MAGICK="$(usex imagemagick)"
-		-DUSE_MINIZIP=ON
-		-DUSE_PNG=ON
-		# build fails with sqlite being disabled (0.6.3)
-		-DUSE_SQLITE3=ON
-		-DUSE_ZLIB=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use qt5 ; then
-		dobin ../${P}_build/qt/${PN}-qt
-		doman doc/${PN}-qt.6
-		domenu res/${PN}-qt.desktop
-		for size in 16 24 32 48 64 96 128 256; do
-			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
-		done
-	fi
-	if use sdl ; then
-		doman doc/${PN}.6
-		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
-	fi
-
-	dolib.so ../${P}_build/lib${PN}.so*
-}
-
-pkg_preinst() {
-	if use qt5 ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use qt5 ; then
-		xdg_desktop_database_update
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/games-emulation/mupen64plus-2.5 b/games-emulation/mupen64plus-2.5
new file mode 100644
index 000000000000..9b236d71e2c4
--- /dev/null
+++ b/games-emulation/mupen64plus-2.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, meta-package
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+IUSE=+audio-sdl +input-sdl +rsp-hle +ui-console +ui-m64py +video-glide64mk2 +video-rice
+KEYWORDS=~amd64 ~x86
+LICENSE=metapackage
+RDEPEND=>=games-emulation/mupen64plus-core-2.5 audio-sdl? ( >=games-emulation/mupen64plus-audio-sdl-2.5 ) input-sdl? ( >=games-emulation/mupen64plus-input-sdl-2.5 ) rsp-hle? ( >=games-emulation/mupen64plus-rsp-hle-2.5 ) ui-console? ( >=games-emulation/mupen64plus-ui-console-2.5 ) ui-m64py? ( >=games-emulation/m64py-0.2.3-r1 ) video-glide64mk2? ( >=games-emulation/mupen64plus-video-glide64mk2-2.5 ) video-rice? ( >=games-emulation/mupen64plus-video-rice-2.5 )
+SLOT=0
+_md5_=0bfe7134bd0273fe075686f4f710d741
diff --git a/games-emulation/mupen64plus-audio-sdl-2.5 b/games-emulation/mupen64plus-audio-sdl-2.5
new file mode 100644
index 000000000000..53232231b149
--- /dev/null
+++ b/games-emulation/mupen64plus-audio-sdl-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=games-emulation/mupen64plus-core-2.5:0= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:0= ) speex? ( media-libs/speex:0= ) virtual/pkgconfig
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+IUSE=libsamplerate oss speex
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=games-emulation/mupen64plus-core-2.5:0= media-libs/libsdl2:0=[sound] libsamplerate? ( media-libs/libsamplerate:0= ) speex? ( media-libs/speex:0= )
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-audio-sdl/releases/download/2.5/mupen64plus-audio-sdl-src-2.5.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_=6f04acbba408347c72c3452d004cce82
diff --git a/games-emulation/mupen64plus-audio-sdl/Manifest b/games-emulation/mupen64plus-audio-sdl/Manifest
deleted file mode 100644
index 5178a9a602a2..000000000000
--- a/games-emulation/mupen64plus-audio-sdl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-audio-sdl-src-2.5.tar.gz 26147 BLAKE2B bcd0c76d1e4fffb55940889c329574760101177c7cc48bb6ea9a361be01515ec15261bf1254a8c605db2ebf8166d323b43620e8f7c978cc79603be3ad537a191 SHA512 0c63e16449c40f15abdeed968383a218ed9876a92b2c15cbeb6554b20008d6d12996c0fd3bc1c502084791596b8535340596e95a11fe5d27576342740e76db6a
-EBUILD mupen64plus-audio-sdl-2.5.ebuild 1959 BLAKE2B bbc720d2b448e7c9894d8decc0c47e4695cc3c8d6f655f8fc664d8672e8972cb1277a696c5875b02a0d21b8af4c3460f7b3a26b4788c7ce3425402c547a93bf2 SHA512 4dcc0513f5f40de0d0a0603b3c391b827f78fc217ea255c8c4378c41dfe82c8f6efc5c7533fc18c9c54489a8639211f95804c6f1c747e73aeafca8c758ac56fb
-MISC metadata.xml 345 BLAKE2B b5b03b304e1491135b6d30001afe6bd57e29873222bb41cbb4d9d47fd77be1581544139cf4800ad4f15afb4cbd0b9da167b2a6cb3242a2ce0e0689b7b88e6c1c SHA512 f6e02ffd8784ef686cea561d75bac4a5f231fa62e72a089380707663a738e3d10b1f134cce40cc8d60e36cf90ab9303971996b16797253f6509960873e787f2d
diff --git a/games-emulation/mupen64plus-audio-sdl/metadata.xml b/games-emulation/mupen64plus-audio-sdl/metadata.xml
deleted file mode 100644
index 98ab28b06ff8..000000000000
--- a/games-emulation/mupen64plus-audio-sdl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mupen64plus/mupen64plus-audio-sdl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild b/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild
deleted file mode 100644
index 9ddb524fc2d5..000000000000
--- a/games-emulation/mupen64plus-audio-sdl/mupen64plus-audio-sdl-2.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL audio plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libsamplerate oss speex"
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=
-	media-libs/libsdl2:0=[sound]
-	libsamplerate? ( media-libs/libsamplerate:0= )
-	speex? ( media-libs/speex:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-
-		NO_SPEEX=$(usex speex 0 1)
-		NO_SRC=$(usex libsamplerate 0 1)
-		NO_OSS=$(usex oss 0 1)
-		# not packaged (https://github.com/nemomobile/libaudioresource)
-		USE_AUDIORESOURCE=0
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/games-emulation/mupen64plus-core-2.5-r1 b/games-emulation/mupen64plus-core-2.5-r1
new file mode 100644
index 000000000000..e29ce61a16ae
--- /dev/null
+++ b/games-emulation/mupen64plus-core-2.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-libs/zlib:0=[minizip] lirc? ( app-misc/lirc:0 ) osd? ( media-fonts/dejavu media-libs/freetype:2= virtual/opengl:0= virtual/glu:0= ) !<games-emulation/mupen64plus-2.0 virtual/pkgconfig
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, core library
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+IUSE=debugger gles2 lirc new-dynarec +osd cpu_flags_x86_sse
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=media-libs/libpng:0= media-libs/libsdl2:0=[joystick,opengl,video] sys-libs/zlib:0=[minizip] lirc? ( app-misc/lirc:0 ) osd? ( media-fonts/dejavu media-libs/freetype:2= virtual/opengl:0= virtual/glu:0= ) !<games-emulation/mupen64plus-2.0 !<games-emulation/m64py-0.2.3-r1 !<games-emulation/mupen64plus-audio-sdl-2.5 !<games-emulation/mupen64plus-input-sdl-2.5 !<games-emulation/mupen64plus-ui-console-2.5 !<games-emulation/mupen64plus-video-glide64mk2-2.5 !<games-emulation/mupen64plus-video-rice-2.5
+REQUIRED_USE=gles2? ( !osd )
+SLOT=0/2-sdl2
+SRC_URI=https://github.com/mupen64plus/mupen64plus-core/releases/download/2.5/mupen64plus-core-src-2.5.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_=6bc928fa22b99c861fd86d854ae362de
diff --git a/games-emulation/mupen64plus-core/Manifest b/games-emulation/mupen64plus-core/Manifest
deleted file mode 100644
index 05e71b1c2773..000000000000
--- a/games-emulation/mupen64plus-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-core-src-2.5.tar.gz 895890 BLAKE2B 08b55ff5b985838eed19b680635fec074d06aa20366bcc41c512173120b0f76b0cec691d0ee2b02b19eccce03f951c528df30ecbf440601629a5df92fa34db03 SHA512 1bf643798de4f17e2ce4f2a67dfd242a8b24d873c413b49cbcb280e4264131222e3f3bc02c46111868102b0b5174d117ababceab66551cb38b76b22b3a94f697
-EBUILD mupen64plus-core-2.5-r1.ebuild 2741 BLAKE2B 0e72eff2cd6936ad0e0078d8781fb92323acffe3dc54828dddfbeb941258a91096879bf0a4b3e9d29b5859030ba0297d1eee8b6a6080b751e98f031caca53c25 SHA512 b2afc35676acd02b99048331174ab8e8518d9f7c11f9e22b7794769685d31ed0c77d9e4e671cac70fc54cbd2ba291bd225c8837501f833e81e3bfb86cc8d2a3a
-MISC metadata.xml 958 BLAKE2B 33daa914e745751489e0b44160e14b6c9d065b0119872b0c4989b71d3ab7cdba9fdad1381f3248651542f7f31f14fdd9831726abc5c6b9255cf2ee4158c20527 SHA512 f6cc31a8d152fc50d9bbb285acc34e04f6ffb4f4b1ed9e0fe572183c68d382f757a18f6ed00b76ab90a5204afc1712d02f92194b714330548f73f1015541b7ae
diff --git a/games-emulation/mupen64plus-core/metadata.xml b/games-emulation/mupen64plus-core/metadata.xml
deleted file mode 100644
index b4eccd857610..000000000000
--- a/games-emulation/mupen64plus-core/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="debugger">Build the debugger</flag>
-		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
-		<flag name="new-dynarec">Enable new experimental dynamic recompiler implementation (only for x86 and arm)</flag>
-		<flag name="osd">Overlay emulator messages using on-screen-display</flag>
-	</use>
-	<longdescription>Mupen64Plus is a plugin-based N64 emulator for Linux which is capable of accurately playing many games.
-Included are four MIPS R4300 CPU emulators, with dynamic recompilers for 32-bit x86 and 64-bit amd64 systems.</longdescription>
-	<upstream>
-		<remote-id type="google-code">mupen64plus</remote-id>
-		<remote-id type="github">mupen64plus/mupen64plus-core</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild b/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
deleted file mode 100644
index 8efaa9ff810e..000000000000
--- a/games-emulation/mupen64plus-core/mupen64plus-core-2.5-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, core library"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/2-sdl2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debugger gles2 lirc new-dynarec +osd cpu_flags_x86_sse"
-
-RDEPEND="media-libs/libpng:0=
-	media-libs/libsdl2:0=[joystick,opengl,video]
-	sys-libs/zlib:0=[minizip]
-	lirc? ( app-misc/lirc:0 )
-	osd? (
-		media-fonts/dejavu
-		media-libs/freetype:2=
-		virtual/opengl:0=
-		virtual/glu:0=
-	)
-	!<games-emulation/mupen64plus-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# block versions using SDL1
-RDEPEND="${RDEPEND}
-	!<games-emulation/m64py-0.2.3-r1
-	!<games-emulation/mupen64plus-audio-sdl-2.5
-	!<games-emulation/mupen64plus-input-sdl-2.5
-	!<games-emulation/mupen64plus-ui-console-2.5
-	!<games-emulation/mupen64plus-video-glide64mk2-2.5
-	!<games-emulation/mupen64plus-video-rice-2.5"
-
-REQUIRED_USE="gles2? ( !osd )"
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-
-		OSD=$(usex osd 1 0)
-		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
-		LIRC=$(usex lirc 1 0)
-		DEBUGGER=$(usex debugger 1 0)
-		NEW_DYNAREC=$(usex new-dynarec 1 0)
-		USE_GLES=$(usex gles2 1 0)
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-	dodoc -r doc/{emuwiki-api-doc,new_dynarec.txt}
-
-	# replace bundled font with a symlink
-	# TODO: fix the code to not rely on it
-	local font_path=/usr/share/mupen64plus/font.ttf
-	rm "${D%/}/${font_path}" || die
-	if use osd; then
-		dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${font_path}"
-	fi
-}
diff --git a/games-emulation/mupen64plus-input-sdl-2.5 b/games-emulation/mupen64plus-input-sdl-2.5
new file mode 100644
index 000000000000..a125ad9ac447
--- /dev/null
+++ b/games-emulation/mupen64plus-input-sdl-2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=games-emulation/mupen64plus-core-2.5:0= media-libs/libsdl2:0=[joystick] virtual/pkgconfig
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, SDL input plugin
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=games-emulation/mupen64plus-core-2.5:0= media-libs/libsdl2:0=[joystick]
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-input-sdl/releases/download/2.5/mupen64plus-input-sdl-src-2.5.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_=93fcc1aa97d0e70b329472c88b93ea55
diff --git a/games-emulation/mupen64plus-input-sdl/Manifest b/games-emulation/mupen64plus-input-sdl/Manifest
deleted file mode 100644
index 6def5f917f8a..000000000000
--- a/games-emulation/mupen64plus-input-sdl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-input-sdl-src-2.5.tar.gz 50580 BLAKE2B ab75c6e200c2979c75d35082a426266e7f835e0731058f8013d8788802ab9d65363b8820326fbfedc0b384facfaeccf6e04da66e01f79aee3d420f3ebe385461 SHA512 014a5e21feb88b14bcee44a74556a257393b799745308421a611eb3b6c11a390a589fdd393f07e69a128ca60426d4dcf8847bcbabed77b0d570be282550148d6
-EBUILD mupen64plus-input-sdl-2.5.ebuild 1681 BLAKE2B 5eb74028c1914c4057e43fbb5a195111f22a9593db41519ebe7a189d4264791ccb8b3672c79b9f60f5923c50e6c8209c6dd9fb93b12c989058a395c649a5a0db SHA512 42ac79a06506801717db1692bc86813a5737ebafceebfa1e498cd0bef25abc58fe55b28897230a70cdf870ec01e80f079203f4ed2618055e2b820f8163177e46
-MISC metadata.xml 345 BLAKE2B ad9e66275eecd48b36aea9d14bea0b3651adcafdccc82542761d9c8bf2636f2c56f31b7d4e451bbdf0108de016d923b998f59a4ed774a2becb1cde66bf95dd01 SHA512 52f335099ec233825167226c8c15e6b270820eb111c8b89bcb91a4606f7b1d1d79ed12f41ac5ee69d973137c618f038ff55e395097fb1f1517692083ca86c294
diff --git a/games-emulation/mupen64plus-input-sdl/metadata.xml b/games-emulation/mupen64plus-input-sdl/metadata.xml
deleted file mode 100644
index 92306ce86d63..000000000000
--- a/games-emulation/mupen64plus-input-sdl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mupen64plus/mupen64plus-input-sdl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild b/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild
deleted file mode 100644
index fe28b341357a..000000000000
--- a/games-emulation/mupen64plus-input-sdl/mupen64plus-input-sdl-2.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, SDL input plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=
-	media-libs/libsdl2:0=[joystick]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/games-emulation/mupen64plus-rsp-hle-2.5 b/games-emulation/mupen64plus-rsp-hle-2.5
new file mode 100644
index 000000000000..7f2c8e5f460e
--- /dev/null
+++ b/games-emulation/mupen64plus-rsp-hle-2.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=games-emulation/mupen64plus-core-2.0-r1:0=
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=games-emulation/mupen64plus-core-2.0-r1:0=
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-rsp-hle/releases/download/2.5/mupen64plus-rsp-hle-src-2.5.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_=5f473a5c30f5b7e2e0e7b0902364281a
diff --git a/games-emulation/mupen64plus-rsp-hle/Manifest b/games-emulation/mupen64plus-rsp-hle/Manifest
deleted file mode 100644
index e5c156f654bb..000000000000
--- a/games-emulation/mupen64plus-rsp-hle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-rsp-hle-src-2.5.tar.gz 46998 BLAKE2B 3bb5ee627fa4c367e7dd1ef0ac0a1eae1267cf82ac66a35f4dcd972703b9cba832224cab1be20c75e9f61af2afae0c8eb7dd6ba806a47c57eef6e6c5da9e8a5a SHA512 564d96050890cc61df05163f99a0be8198e870f0d4071e87828bf58b283b2be8ca7de20ed03482ea8c45725bdd6f6baea618c068cced407892cf2add6ef373c6
-EBUILD mupen64plus-rsp-hle-2.5.ebuild 1435 BLAKE2B 5568b185559e3c6a5785f696fe81c612df394fef03322a365aca1d0f8d566ba8192d84fd7884cf423fefc66d45a026ead20ef834e6bff730f339e7f033c9672e SHA512 27e3c65ff9d57bf70dc9894f3e90962971d069aecc06f7c9db2dadae82af36f1fb0d2bbe10c70a8f8ce01378382ca8216ca05c7d9aab4ec9ded7ce919021eaba
-MISC metadata.xml 343 BLAKE2B 997f47a4d8c1fccab5b16dd49ab4e791ec1ae114b820ad75839f981e9a72f409951a22abfbb68788ade5dcb1be2dd91aba4fc9771c00519307ee28455ab7aa9d SHA512 7ffba7fdacc44215dba6cf994646ea38ebf94870accc3d6150ca609fcf5dc7b343a52fe6fc0511e5741f24afc20b11c2e1104d39215f7cffdeaf1098efaf709e
diff --git a/games-emulation/mupen64plus-rsp-hle/metadata.xml b/games-emulation/mupen64plus-rsp-hle/metadata.xml
deleted file mode 100644
index 58ffff278779..000000000000
--- a/games-emulation/mupen64plus-rsp-hle/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mupen64plus/mupen64plus-rsp-hle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild b/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild
deleted file mode 100644
index b326e6251588..000000000000
--- a/games-emulation/mupen64plus-rsp-hle/mupen64plus-rsp-hle-2.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, HLE RSP plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0="
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/games-emulation/mupen64plus-ui-console-2.5-r1 b/games-emulation/mupen64plus-ui-console-2.5-r1
new file mode 100644
index 000000000000..53c544344be6
--- /dev/null
+++ b/games-emulation/mupen64plus-ui-console-2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=>=games-emulation/mupen64plus-core-2.0-r1:0= media-libs/libsdl2:0= !<games-emulation/mupen64plus-2.0 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, console UI
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=games-emulation/mupen64plus-core-2.0-r1:0= media-libs/libsdl2:0= !<games-emulation/mupen64plus-2.0
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-ui-console/releases/download/2.5/mupen64plus-ui-console-src-2.5.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_=ab30292f029625c7da94c297694edf70
diff --git a/games-emulation/mupen64plus-ui-console/Manifest b/games-emulation/mupen64plus-ui-console/Manifest
deleted file mode 100644
index 4e31b84ce720..000000000000
--- a/games-emulation/mupen64plus-ui-console/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-ui-console-src-2.5.tar.gz 47852 BLAKE2B 060d93c82b63c5870feffd665513d3a9046c3583103ccd16014865b621f33e2eafc93af5813332ab9416c4b01b6f767ed8b4ff4d08939abee60193638ce9cdb5 SHA512 70293a768c2bc5f80a2f71db229021d497d675536f5dc5eb098f91b62081f993f308d410adebce208a89880f57b037d5b42fa2f95c42ce94ffe2fca326a53046
-EBUILD mupen64plus-ui-console-2.5-r1.ebuild 1972 BLAKE2B fbac239e530710cc18c847be2464b13ff491b00cfb585276058f9a5b81b2817ee3e2603f5aa1ed8cdbd4e4da9cc30c7aed50732b4b463a26fce35c5f3bed8e20 SHA512 bdcc0d134c8bc1651443e671ffe99ad2de7ad2ad6a32643b560fd260522602045e386ead435bc3d927f3864129a7efb7a5f83e404bc29e88c0cf9b484d9b092a
-MISC metadata.xml 346 BLAKE2B 823a53023d0e1834cac987cde3eebf3164767e2793ef0805c28c90a04f040b6d34d8acb8d1f28a528f74b0c269a99bfe8b7d648c5c38c6a89df59846096b79fe SHA512 2e43f2c7bd5fdfffbf8c9ece665093b942d1e3c76b27f851fff7de030ecfc0f38e82e730740e1688413b47e0ba1b752f96ebcd1d1c2a6107bcbd8185630db4c8
diff --git a/games-emulation/mupen64plus-ui-console/metadata.xml b/games-emulation/mupen64plus-ui-console/metadata.xml
deleted file mode 100644
index 1e1acf03361b..000000000000
--- a/games-emulation/mupen64plus-ui-console/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mupen64plus/mupen64plus-ui-console</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5-r1.ebuild b/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5-r1.ebuild
deleted file mode 100644
index d937a15d77d5..000000000000
--- a/games-emulation/mupen64plus-ui-console/mupen64plus-ui-console-2.5-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils gnome2-utils multilib toolchain-funcs xdg-utils
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, console UI"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.0-r1:0=
-	media-libs/libsdl2:0=
-	!<games-emulation/mupen64plus-2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-
-	# avoid appending -fPIE/-fno-PIE
-	sed -i -e '/^if.*PIE/,/endif/d' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/mupen64plus-video-glide64mk2-2.5 b/games-emulation/mupen64plus-video-glide64mk2-2.5
new file mode 100644
index 000000000000..fc80109a281b
--- /dev/null
+++ b/games-emulation/mupen64plus-video-glide64mk2-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2=] media-libs/libpng:0= media-libs/libsdl2:0= media-libs/libtxc_dxtn sys-libs/zlib:0= virtual/opengl:0= hires? ( dev-libs/boost:0= ) virtual/pkgconfig
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+IUSE=gles2 hires cpu_flags_x86_sse
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2=] media-libs/libpng:0= media-libs/libsdl2:0= media-libs/libtxc_dxtn sys-libs/zlib:0= virtual/opengl:0= hires? ( dev-libs/boost:0= )
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-video-glide64mk2/releases/download/2.5/mupen64plus-video-glide64mk2-src-2.5.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_=055799d71257a33e6fdbe8f2b2b7c882
diff --git a/games-emulation/mupen64plus-video-glide64mk2/Manifest b/games-emulation/mupen64plus-video-glide64mk2/Manifest
deleted file mode 100644
index 0d69e8187de0..000000000000
--- a/games-emulation/mupen64plus-video-glide64mk2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-video-glide64mk2-src-2.5.tar.gz 488988 BLAKE2B 7d88125032190906bb39b93ae4c5b92e124a6e151d06e2e0d9650e86ffd3b2c455e30c9d801bbdb46cb3182078dd77fb624e3c80180e83b15f1feb57299ecb7a SHA512 b62620a364ca9e6bf729e5dd07fb84a73745c6533b95468d3f5411c0556824282f760efefea0968b0a9282f77c315bbed8b0b8a59d771893b7fd0f5f24ad725d
-EBUILD mupen64plus-video-glide64mk2-2.5.ebuild 1976 BLAKE2B faabe3e36cfd298620115f2fb72cd87816bc8e8330eb6898ea4f338bb411de54a8ea0c14354dbd32cdbae9bc11bbd8e89e251fe04d7ad1fcd8fa78c08aec545c SHA512 36a21322c9a3c0c92affca2caece4fb9a7f668fd9aa1100415f11e03dee4ee83d35afd85fb6e8eb0a073a70e479310bb710aecb950b713f3fd4ec6087ab2811c
-MISC metadata.xml 519 BLAKE2B 813c2f38ed09e91141b852fa42ac0b979878f7cc3496a9156c422efaac15503e5f5e0bf35f0583cc4011e041a09048add83655da0e96fb35129ae9b0004f03fd SHA512 6b8cf03f4eca8e66800437e90dc66febe000fb6d1710bbac2c6f4b9d83da4c6757baecda7b49bb5b44a524c7d9f48d61b593f88ade68269587a0068ca724415e
diff --git a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml b/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
deleted file mode 100644
index 5bca97be8c20..000000000000
--- a/games-emulation/mupen64plus-video-glide64mk2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
-		<flag name="hires">Support hi-resolution textures (requires <pkg>dev-libs/boost</pkg>)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mupen64plus/mupen64plus-video-glide64mk2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild b/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild
deleted file mode 100644
index 47744ad551a9..000000000000
--- a/games-emulation/mupen64plus-video-glide64mk2/mupen64plus-video-glide64mk2-2.5.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, glide64mk2 video plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gles2 hires cpu_flags_x86_sse"
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=]
-	media-libs/libpng:0=
-	media-libs/libsdl2:0=
-	media-libs/libtxc_dxtn
-	sys-libs/zlib:0=
-	virtual/opengl:0=
-	hires? ( dev-libs/boost:0= )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-
-		NOSSE=$(usex cpu_flags_x86_sse 0 1)
-		HIRES=$(usex hires 1 0)
-		USE_FRAMESKIPPER=1
-		USE_GLES=$(usex gles2 1 0)
-		# use external lib
-		TXCDXTN=1
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/games-emulation/mupen64plus-video-rice-2.5 b/games-emulation/mupen64plus-video-rice-2.5
new file mode 100644
index 000000000000..4b5952ee8db0
--- /dev/null
+++ b/games-emulation/mupen64plus-video-rice-2.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0= virtual/pkgconfig
+DESCRIPTION=A fork of Mupen64 Nintendo 64 emulator, rice video plugin
+EAPI=5
+HOMEPAGE=http://www.mupen64plus.org/
+IUSE=gles2 cpu_flags_x86_sse
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=games-emulation/mupen64plus-core-2.5:0=[gles2=] media-libs/libpng:0= media-libs/libsdl2:0=[video] virtual/opengl:0=
+SLOT=0
+SRC_URI=https://github.com/mupen64plus/mupen64plus-video-rice/releases/download/2.5/mupen64plus-video-rice-src-2.5.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_=7adc3a37f116b57447a3c821507be4b7
diff --git a/games-emulation/mupen64plus-video-rice/Manifest b/games-emulation/mupen64plus-video-rice/Manifest
deleted file mode 100644
index f306995e878f..000000000000
--- a/games-emulation/mupen64plus-video-rice/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mupen64plus-video-rice-src-2.5.tar.gz 339012 BLAKE2B 861f350376e92c24a31955cc39ba33abef9930d4fd598619fd0a6b7ff746b1bb71e1644dfed3aebab902b09c4fcbd1a1755475b11676c6070fe92ea4f30b4802 SHA512 d3e9c3b3097ca9b9d896498bb34374a14ec1948fce8b795e755bb13a88f3066289fe2500666b4057e719bf3f1b38b840f8a60eaeccdcdddfab69b1986c953d61
-EBUILD mupen64plus-video-rice-2.5.ebuild 1820 BLAKE2B dff3baf352a73257784d60429f87ccb840c974dc553d6d1094d1108aa2b6393cccf46422735d468f892b63e1fd3fe28bd2ca6c6536c6f01778e9567e087848d6 SHA512 52ae832baee4ef50de0f9c7584b3dacfa46230f8eba9bcb1b81ee5782ccb22abc4afb9c7119702d0ef4cf4861b7528ad4f358380e93139de98489b13f82141f4
-MISC metadata.xml 417 BLAKE2B 8510b7d913205c08c30afab179d14342bef943520adc195a25dba626d2e24406cb7108c0fcf6c0f0648612d8f9c458661aee4cef60b7b44fb30eccfc10926615 SHA512 620411630a55162b14abef6e6b62a5621de4d53e8bf467faa07f4aa114d7e4be4123f5ef9033cbbe04635e71255ad63f16303eb7b511a3ce151627e54d7d3bb6
diff --git a/games-emulation/mupen64plus-video-rice/metadata.xml b/games-emulation/mupen64plus-video-rice/metadata.xml
deleted file mode 100644
index 6df8a44e7777..000000000000
--- a/games-emulation/mupen64plus-video-rice/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="gles2">Use GLES2 instead of OpenGL</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mupen64plus/mupen64plus-video-rice</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild b/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild
deleted file mode 100644
index a616be06c375..000000000000
--- a/games-emulation/mupen64plus-video-rice/mupen64plus-video-rice-2.5.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN}-src-${PV}
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, rice video plugin"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI="https://github.com/mupen64plus/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gles2 cpu_flags_x86_sse"
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.5:0=[gles2=]
-	media-libs/libpng:0=
-	media-libs/libsdl2:0=[video]
-	virtual/opengl:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch_user
-
-	# avoid implicitly appending CPU flags
-	sed -i -e 's:-mmmx::g' -e 's:-msse::g' projects/unix/Makefile || die
-}
-
-src_compile() {
-	MAKEARGS=(
-		# Note: please keep this in sync in all of mupen64plus-* packages
-
-		-C projects/unix
-
-		# this basically means: GNU userspace
-		UNAME=Linux
-
-		# verbose output
-		V=1
-
-		CROSS_COMPILE="${CHOST}-"
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		PKG_CONFIG="$(tc-getPKG_CONFIG)"
-		# usual CFLAGS, CXXFLAGS and LDFLAGS are respected
-		# so we can leave OPTFLAGS empty
-		OPTFLAGS=
-
-		# paths, some of them are used at compile time
-		PREFIX=/usr
-		LIBDIR=/usr/$(get_libdir)
-
-		# disable unwanted magic
-		LDCONFIG=:
-		INSTALL_STRIP_FLAG=
-
-		# Package-specific stuff
-
-		# CROSS_COMPILE causes it to look for ${CHOST}-sdl2-config...
-		SDL_CFLAGS="$($(tc-getPKG_CONFIG) --cflags sdl2)"
-		SDL_LDLIBS="$($(tc-getPKG_CONFIG) --libs sdl2)"
-
-		NO_ASM=$(usex cpu_flags_x86_sse 0 1)
-		USE_GLES=$(usex gles2 1 0)
-	)
-
-	use amd64 && MAKEARGS+=( HOST_CPU=x86_64 )
-	use x86 && MAKEARGS+=( HOST_CPU=i386 )
-
-	emake "${MAKEARGS[@]}" all
-}
-
-src_install() {
-	emake "${MAKEARGS[@]}" DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
deleted file mode 100644
index 296c18f18523..000000000000
--- a/games-emulation/mupen64plus/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD mupen64plus-2.5.ebuild 850 BLAKE2B c1079b7f95589a9d06483223ff372c2c48a2bf1324b961b537bef75b38339c40969b29f5c252e81c5bd5d7dfebba25c94a73eda1ff535e02e52a5c06c5193e22 SHA512 db172c94bc00f77f37ec07ef03b02f44185c6cd9506d989851a1a7decabe560187eaf460968f60482ec7e8a82e5e7f9ebf4aebf7fec4fdc17d3c360773d8d820
-MISC metadata.xml 1214 BLAKE2B 620c4867d48518b47582ae9ca358e96f73560cae3546ff9903833b0a8f03ad07f2823327a40437bbfd47327420162fabd03c0506cf2e96a2c0b4a813d3eb37d1 SHA512 d52568e17fa4514918c819979277d268a6668ae6962c3d1fe3d0f9287c5189fdff35c63d46d4f86c4a7f2b11ac46c38801d583b939ce8857cd7b43a6572adaed
diff --git a/games-emulation/mupen64plus/metadata.xml b/games-emulation/mupen64plus/metadata.xml
deleted file mode 100644
index 4c302cc76984..000000000000
--- a/games-emulation/mupen64plus/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="audio-sdl">Enable SDL audio plugin.</flag>
-		<flag name="input-sdl">Enable SDL input plugin.</flag>
-		<flag name="rsp-hle">Enable HLE RSP plugin.</flag>
-		<flag name="ui-console">Enable default console UI.</flag>
-		<flag name="ui-m64py">Enable PyQt5 UI using <pkg>games-emulation/m64py</pkg>.</flag>
-		<flag name="video-glide64mk2">Enable Glide64mk2 video plugin.</flag>
-		<flag name="video-rice">Enable Rice video plugin.</flag>
-	</use>
-	<longdescription>Mupen64Plus is a plugin-based N64 emulator for Linux which is capable of accurately playing many games.
-Included are four MIPS R4300 CPU emulators, with dynamic recompilers for 32-bit x86 and 64-bit amd64 systems,
-and necessary plugins for audio, graphical rendering (RDP), signal co-processor (RSP), and input.
-There are 3 OpenGL video plugins included: glN64, RiceVideoLinux, and Glide64.</longdescription>
-	<upstream>
-		<remote-id type="google-code">mupen64plus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/mupen64plus/mupen64plus-2.5.ebuild b/games-emulation/mupen64plus/mupen64plus-2.5.ebuild
deleted file mode 100644
index f52987e83a17..000000000000
--- a/games-emulation/mupen64plus/mupen64plus-2.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator, meta-package"
-HOMEPAGE="http://www.mupen64plus.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+audio-sdl +input-sdl +rsp-hle +ui-console +ui-m64py +video-glide64mk2 +video-rice"
-
-RDEPEND=">=games-emulation/mupen64plus-core-2.5
-	audio-sdl? ( >=games-emulation/mupen64plus-audio-sdl-2.5 )
-	input-sdl? ( >=games-emulation/mupen64plus-input-sdl-2.5 )
-	rsp-hle? ( >=games-emulation/mupen64plus-rsp-hle-2.5 )
-	ui-console? ( >=games-emulation/mupen64plus-ui-console-2.5 )
-	ui-m64py? ( >=games-emulation/m64py-0.2.3-r1 )
-	video-glide64mk2? ( >=games-emulation/mupen64plus-video-glide64mk2-2.5 )
-	video-rice? ( >=games-emulation/mupen64plus-video-rice-2.5 )"
diff --git a/games-emulation/nestopia-1.47_p20170105 b/games-emulation/nestopia-1.47_p20170105
new file mode 100644
index 000000000000..68b99586b086
--- /dev/null
+++ b/games-emulation/nestopia-1.47_p20170105
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=app-arch/libarchive:= media-libs/libao media-libs/libepoxy media-libs/libsdl2[sound,joystick,video] sys-libs/zlib gui? ( x11-libs/gtk+:3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A portable Nintendo Entertainment System emulator written in C++
+EAPI=6
+HOMEPAGE=http://0ldsk00l.ca/nestopia/
+IUSE=doc gui
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/libarchive:= media-libs/libao media-libs/libepoxy media-libs/libsdl2[sound,joystick,video] sys-libs/zlib gui? ( x11-libs/gtk+:3 )
+SLOT=0
+SRC_URI=https://github.com/rdanbrook/nestopia/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> nestopia-1.47_p20170105.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8aca9eda0fdf2b88359f654cc66861b4
diff --git a/games-emulation/nestopia-9999 b/games-emulation/nestopia-9999
new file mode 100644
index 000000000000..5f7949591ec3
--- /dev/null
+++ b/games-emulation/nestopia-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=app-arch/libarchive:= media-libs/libao media-libs/libepoxy media-libs/libsdl2[sound,joystick,video] sys-libs/zlib gui? ( x11-libs/gtk+:3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A portable Nintendo Entertainment System emulator written in C++
+EAPI=6
+HOMEPAGE=http://0ldsk00l.ca/nestopia/
+IUSE=doc gui
+LICENSE=GPL-2+
+RDEPEND=app-arch/libarchive:= media-libs/libao media-libs/libepoxy media-libs/libsdl2[sound,joystick,video] sys-libs/zlib gui? ( x11-libs/gtk+:3 )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	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_=8aca9eda0fdf2b88359f654cc66861b4
diff --git a/games-emulation/nestopia/Manifest b/games-emulation/nestopia/Manifest
deleted file mode 100644
index 247412e32beb..000000000000
--- a/games-emulation/nestopia/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST nestopia-1.47_p20170105.tar.gz 1283456 BLAKE2B 50e70f6f952e3b11b056e398b1b83ffd9458e89a877a8a05c4f9360f047c3a8e1edff2a1316a5d3967db050705dee066bae3452743985b7ce438294fe31d6b78 SHA512 58d1a932a6b90589c66503b2013b1a8162072e77e0416851a1430fa146e7fd85ff7363b70292c69d4c4513e3750aa53436a312c0240a843e42fbb89b554e7a70
-EBUILD nestopia-1.47_p20170105.ebuild 1082 BLAKE2B 6e30ba349b4995b866a9f4fde1b5fe497e5031e6e61556310baa68cdf91cc5acd40c173fb62377d5f9e0dc18f17c344c80c1fdd3517c709c680555ad5fa925a1 SHA512 4b15b0fa719b37017cd6cb06bea788ab3a573d2c6ff94c1b63f753d1cff0ce37d8adae034c387dcb76cbefd65234fda5d4da9fdc9c3eff0d896a663b47e3c91f
-EBUILD nestopia-9999.ebuild 1082 BLAKE2B 6e30ba349b4995b866a9f4fde1b5fe497e5031e6e61556310baa68cdf91cc5acd40c173fb62377d5f9e0dc18f17c344c80c1fdd3517c709c680555ad5fa925a1 SHA512 4b15b0fa719b37017cd6cb06bea788ab3a573d2c6ff94c1b63f753d1cff0ce37d8adae034c387dcb76cbefd65234fda5d4da9fdc9c3eff0d896a663b47e3c91f
-MISC metadata.xml 443 BLAKE2B 260d80735b1430b2c650ae8fceb8c3ab778df8a824c35cc57c1e1b9b3df9ea6feb5185e63af15ec6deca7a39df24b429b7bbb767cc225e115b62c78d9e1471c9 SHA512 287e7bddf8af98427bbebf4e3ed59aa60f314f12cd8c5ffbd95c101a13b4d63b6017f750ecc554df4034d22845a6d0c18aca85a21ed2c04316a53426e054268b
diff --git a/games-emulation/nestopia/metadata.xml b/games-emulation/nestopia/metadata.xml
deleted file mode 100644
index 42c366120ded..000000000000
--- a/games-emulation/nestopia/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">rdanbrook/nestopia</remote-id>
-		<remote-id type="sourceforge">nestopiaue</remote-id>
-	</upstream>
-	<use>
-		<flag name="gui">Enable GUI</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild b/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
deleted file mode 100644
index 932f8edc7412..000000000000
--- a/games-emulation/nestopia/nestopia-1.47_p20170105.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
-HOMEPAGE="http://0ldsk00l.ca/nestopia/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rdanbrook/nestopia.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/rdanbrook/${PN}/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc gui"
-
-RDEPEND="
-	app-arch/libarchive:=
-	media-libs/libao
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	gui? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GTK=$(usex gui)
-		-DENABLE_DOC=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/nestopia/nestopia-9999.ebuild b/games-emulation/nestopia/nestopia-9999.ebuild
deleted file mode 100644
index 932f8edc7412..000000000000
--- a/games-emulation/nestopia/nestopia-9999.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="A portable Nintendo Entertainment System emulator written in C++"
-HOMEPAGE="http://0ldsk00l.ca/nestopia/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rdanbrook/nestopia.git"
-else
-	inherit vcs-snapshot
-	SRC_URI="https://github.com/rdanbrook/${PN}/archive/d7fae2aff1a93eac997d2b480652a1d068a2b6cf.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc gui"
-
-RDEPEND="
-	app-arch/libarchive:=
-	media-libs/libao
-	media-libs/libepoxy
-	media-libs/libsdl2[sound,joystick,video]
-	sys-libs/zlib
-	gui? ( x11-libs/gtk+:3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_GTK=$(usex gui)
-		-DENABLE_DOC=$(usex doc)
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/nestra-0.66-r3 b/games-emulation/nestra-0.66-r3
new file mode 100644
index 000000000000..03a040b7758b
--- /dev/null
+++ b/games-emulation/nestra-0.66-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11[abi_x86_32(-)]
+DESCRIPTION=NES emulation for Linux/x86
+EAPI=6
+HOMEPAGE=http://nestra.linuxgames.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11[abi_x86_32(-)]
+SLOT=0
+SRC_URI=http://nestra.linuxgames.com/nestra-0.66.tar.gz mirror://debian/pool/contrib/n/nestra/nestra_0.66-10.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d2d1980cd5f2f58d5900e775f5de4910
diff --git a/games-emulation/nestra/Manifest b/games-emulation/nestra/Manifest
deleted file mode 100644
index f9cdd9ebcf3e..000000000000
--- a/games-emulation/nestra/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nestra-0.66-exec-stack.patch 239 BLAKE2B 47255490442da874ddea390664928aa77734c67d2dbe84cfe8be82e5fe6042408ca5650164f3c1e8aa396db71be9234933cc18a423b2c08f3c311f589675ec95 SHA512 a65ca4225707a496fcb3fbc968ba301b654c9357b33a6153cb19905080cf1f5ee76bbf6b5510e1886de8a2cfb2c5ebaed3a166d518db50aecfb5953c36ee9a43
-AUX nestra-0.66-include.patch 1297 BLAKE2B 98a52017fc1919fde5125771b267f0ef2b0c73ef29f81f3e2bac3672c6bab5be005028310d031486d143568efbd8ccf7c2d58c4d9bee9d5532e3ac872465fe83 SHA512 f95568a3433094555067a89c59a38519ee2bef6cdce8a0ba962976c5df6be3332fa18c0c4b6635c807ed2b22a40a75e22b9a26282b5e8190659f59c64f212389
-DIST nestra-0.66.tar.gz 49757 BLAKE2B 0ec8603cd9afc33a1b194e1c39cdc8d3173d1ad4c7c76e6e00214883cdfcd8f2cf35bfb4b74e131822aaf8c7864a50980d642bc87aca26372f06b8fab145a7cf SHA512 25f9d0c0359b46ddcd451552e7737b0f955a18e7a4ebd30d5494b12f787b9c45a49579207328c06c10efc7f8283bc688eb2061c538523ed257825b2394d978ce
-DIST nestra_0.66-10.diff.gz 2414 BLAKE2B 5b83ac9eee4d8c141dc473000b5f713ab4eb0a38707334d4fd044b9617f01b83c4a19670ef27874f6511f1f9b1d578ba35d5ba9ac244621b19ca3b9c00d5a30d SHA512 4ea1ad97f6c2eca0434dee4031e0486cc1c7c25237a467d4bf33bd0656b52441143855e07b29e1bdcf95514e19fe68ecb8f73d0972d17d9e3b6fd7a92d2db8c6
-EBUILD nestra-0.66-r3.ebuild 1046 BLAKE2B f36be92637c5125c5019b8c95ab8c8eb28a91999725c2a4de24ea76a46bfca945600dc0eab1b3ed4e8aa126ae7375192858f5d33d782fb087055043a1c77a0a4 SHA512 ae7ec1c29eb73c5cd9f478f84b517fae99dd0e7c3bc421e6850236577c260d35204fa37d6b78963012f1045b1ab30a3db1622feb1be156d93a159856093a4330
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch b/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
deleted file mode 100644
index d9e9b3c61147..000000000000
--- a/games-emulation/nestra/files/nestra-0.66-exec-stack.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/x86.S.orig	2006-01-09 20:02:58.000000000 -0500
-+++ b/x86.S	2006-01-09 20:03:38.000000000 -0500
-@@ -1458,3 +1458,7 @@
-  leal   0x1(%eax),%ebx
-  popl   %eax
-  jmp i_next
-+
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",@progbits
-+#endif
diff --git a/games-emulation/nestra/files/nestra-0.66-include.patch b/games-emulation/nestra/files/nestra-0.66-include.patch
deleted file mode 100644
index 096fd18af47f..000000000000
--- a/games-emulation/nestra/files/nestra-0.66-include.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- a/comptbl.c
-+++ b/comptbl.c
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
-+#include <stdlib.h>
- 
- #define ALLOC_SIZE 0x400000 /* 4MB */
- #define TBL_BASE ((unsigned char *)0x10000000)
---- a/d6502.c
-+++ b/d6502.c
-@@ -1,6 +1,7 @@
- /* 6502 disassembler */
- /* Public Domain */
- 
-+#include <stdio.h>
- #include "globals.h"
- 
- char Opcodes_6502[256][4]={
---- a/emu.c
-+++ b/emu.c
-@@ -12,6 +12,7 @@
- #include <sys/mman.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- 
- #include "mapper.h"
- #include "io.h"
---- a/fb.c
-+++ b/fb.c
-@@ -2,6 +2,8 @@
- /* Framebuffer/pixmap rendering */
- /* Public Domain */
- 
-+#include <stdlib.h>
-+#include <string.h>
- #include <stdio.h>
- #include "mapper.h"
- #include "globals.h"
---- a/io.c
-+++ b/io.c
-@@ -5,6 +5,7 @@
-    to do I/O operations. */
- 
- #include <stdio.h>
-+#include <string.h>
- #include "mapper.h"
- #include "io.h"
- #include "globals.h"
---- a/mapper.c
-+++ b/mapper.c
-@@ -1,6 +1,7 @@
- /* Nestra mapper.c */
- /* Public Domain */
- 
-+#include <string.h>
- #include "mapper.h"
- #include "consts.h"
- 
---- a/x11.c
-+++ b/x11.c
-@@ -1,6 +1,9 @@
- /* Nestra x11.c */
- /* Public Domain */
- 
-+#include <stdlib.h>
-+#include <string.h>
-+#include <stdio.h>
- #include <X11/Xlib.h>
- #include <X11/keysym.h>
- #include <X11/Xutil.h>
diff --git a/games-emulation/nestra/metadata.xml b/games-emulation/nestra/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/nestra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/nestra/nestra-0.66-r3.ebuild b/games-emulation/nestra/nestra-0.66-r3.ebuild
deleted file mode 100644
index 44ca1daa1d33..000000000000
--- a/games-emulation/nestra/nestra-0.66-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit epatch toolchain-funcs flag-o-matic
-
-PATCH="${P/-/_}-10.diff"
-DESCRIPTION="NES emulation for Linux/x86"
-HOMEPAGE="http://nestra.linuxgames.com/"
-SRC_URI="http://nestra.linuxgames.com/${P}.tar.gz
-	mirror://debian/pool/contrib/n/nestra/${PATCH}.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	epatch "${WORKDIR}"/${PATCH}
-	eapply "${FILESDIR}"/${P}-exec-stack.patch
-	eapply "${FILESDIR}"/${P}-include.patch
-
-	append-ldflags -Wl,-z,noexecstack
-	use amd64 && multilib_toolchain_setup x86
-
-	sed -i \
-		-e "s:-L/usr/X11R6/lib:${LDFLAGS}:" \
-		-e 's:-O2 ::' \
-		-e "s:gcc:$(tc-getCC) ${CFLAGS}:" \
-		-e "s:ld:$(tc-getLD) -m elf_i386 $(raw-ldflags):" \
-		Makefile || die
-}
-
-src_compile() {
-	use amd64 && multilib_toolchain_setup x86
-	default
-}
-
-src_install() {
-	dobin nestra
-	einstalldocs
-	doman nestra.6
-}
diff --git a/games-emulation/openmsx-0.14.0 b/games-emulation/openmsx-0.14.0
new file mode 100644
index 000000000000..92824cdeaddb
--- /dev/null
+++ b/games-emulation/openmsx-0.14.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=dev-lang/tcl:0= dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl[sound,video] >=media-libs/glew-1.3.2:0= media-libs/sdl-image[png] media-libs/sdl-ttf virtual/opengl
+DESCRIPTION=MSX emulator that aims for perfection
+EAPI=6
+HOMEPAGE=http://openmsx.org/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl[sound,video] >=media-libs/glew-1.3.2:0= media-libs/sdl-image[png] media-libs/sdl-ttf virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/openmsx-0.14.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=c8f8caacb00798694e71ac90a1cd4c68
diff --git a/games-emulation/openmsx/Manifest b/games-emulation/openmsx/Manifest
deleted file mode 100644
index a2465372542c..000000000000
--- a/games-emulation/openmsx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openmsx-0.14.0.tar.gz 3338719 BLAKE2B e9c09d29bb994f4f40e22271c090580688724cb7024910f0f829a59d0e65e6e70e1c037b943582aac644ee51a00b7e439e751bd84e5828168486b74ee09e8b78 SHA512 74a30de89b4a7cb4d8d5a0ad0c16ab6b58244251ebcbe470cc3cccec6a636492fa8779d1667d76646eabcf8d7d67c53094d5e0a313d452a4a679d797e9394a9b
-EBUILD openmsx-0.14.0.ebuild 1647 BLAKE2B 97b6ed516383c7162051dbf19ec1805b28b3df9a5845f44fd01a30a898b3078827a1a78026b3b113dd45f472f408d1d165e266b0bf2fa4746aa33e187f9cf27a SHA512 47f3bb94878edc3303c467a552262fed6c3aa0d539ef4a6981e9705b4e4166200126f6da93e1e1e6bcf78b38e102d5ebe22c2c5e9f93a0557cb21b2370e9fed9
-MISC metadata.xml 330 BLAKE2B 0557bfe5901a6eb7331ad400d19b438dd3125b0af9426dd7c5bc369e3e5769677e645529b71c19797a57b4e3a43440a94664e80fa941e414a2b29e209382190d SHA512 0e2cbbe9308c1a43be6617797af0abe91bfa1dbb604ef9bc96dfb7c6c7310799c689ff7450afd9eb5b66d7aaeda878e0d046b404a0220b69b5dcf38be346e422
diff --git a/games-emulation/openmsx/metadata.xml b/games-emulation/openmsx/metadata.xml
deleted file mode 100644
index c4d0622638ee..000000000000
--- a/games-emulation/openmsx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">openmsx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/openmsx/openmsx-0.14.0.ebuild b/games-emulation/openmsx/openmsx-0.14.0.ebuild
deleted file mode 100644
index 8b39565b4be2..000000000000
--- a/games-emulation/openmsx/openmsx-0.14.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop readme.gentoo-r1
-
-DESCRIPTION="MSX emulator that aims for perfection"
-HOMEPAGE="http://openmsx.org/"
-SRC_URI="https://github.com/openMSX/openMSX/releases/download/RELEASE_0_14_0/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tcl:0=
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libsdl[sound,video]
-	>=media-libs/glew-1.3.2:0=
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-DOC_CONTENTS="
-If you want to if you want to emulate real MSX systems and not
-only the free C-BIOS machines, put the system ROMs in one of
-the following directories: /usr/share/${PN}/systemroms
-or ~/.openMSX/share/systemroms
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^LDFLAGS:=/d' \
-		-e '/LINK_FLAGS_PREFIX/d' \
-		-e '/LINK_FLAGS+=/s/-s//' \
-		-e '/LINK_FLAGS+=\$(TARGET_FLAGS)/s/$/ $(LDFLAGS)/' \
-		build/main.mk \
-		|| die
-	sed -i -e '/SYMLINK/s:true:false:' build/custom.mk || die
-	sed -i -e 's/GPL.txt//' doc/node.mk || die
-}
-
-src_compile() {
-	emake \
-		CXXFLAGS="${CXXFLAGS}" \
-		INSTALL_SHARE_DIR=/usr/share/${PN} \
-		V=1
-}
-
-src_install() {
-	emake \
-		V=1 \
-		INSTALL_BINARY_DIR="${ED}/usr/bin" \
-		INSTALL_SHARE_DIR="${ED}/usr/share/${PN}" \
-		INSTALL_DOC_DIR="${D}"/usr/share/doc/${PF} \
-		install
-
-	einstalldocs
-	readme.gentoo_create_doc
-
-	for i in 16 32 48 64 128 256 ; do
-		newicon -s "${i}" "share/icons/openMSX-logo-${i}.png" "${PN}.png"
-	done
-	make_desktop_entry "${PN}" "openMSX"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-emulation/pcsx2-1.4.0 b/games-emulation/pcsx2-1.4.0
new file mode 100644
index 000000000000..31e2b23ce4db
--- /dev/null
+++ b/games-emulation/pcsx2-1.4.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A PlayStation 2 emulator
+EAPI=5
+HOMEPAGE=https://www.pcsx2.net
+KEYWORDS=-* amd64 x86
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl[abi_x86_32(-),joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),X]
+SLOT=0
+SRC_URI=https://github.com/PCSX2/pcsx2/archive/v1.4.0.tar.gz -> pcsx2-1.4.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dadc0cc6df6dadfbc5fdaff6c700d688
diff --git a/games-emulation/pcsx2-9999 b/games-emulation/pcsx2-9999
new file mode 100644
index 000000000000..7422d103b1ea
--- /dev/null
+++ b/games-emulation/pcsx2-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X] >=app-eselect/eselect-opengl-1.3.1 dev-cpp/pngpp >=dev-cpp/sparsehash-1.5 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A PlayStation 2 emulator
+EAPI=5
+HOMEPAGE=https://www.pcsx2.net
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2[abi_x86_32(-)] app-arch/xz-utils[abi_x86_32(-)] dev-libs/libaio[abi_x86_32(-)] media-libs/alsa-lib[abi_x86_32(-)] media-libs/libpng:=[abi_x86_32(-)] media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound] media-libs/libsoundtouch[abi_x86_32(-)] media-libs/portaudio[abi_x86_32(-)] >=sys-libs/zlib-1.2.4[abi_x86_32(-)] virtual/jpeg:62[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/gtk+:2[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7911707de31ef9fd54d1df2327229e79
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
deleted file mode 100644
index ed229fa815d8..000000000000
--- a/games-emulation/pcsx2/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pcsx2-1.4.0-gcc5.patch 694 BLAKE2B d523ed4b60730d38febceda5a4ddea3aad96788184cbc19e1d983a37524d63618ce45009fba555f31f75c8a325156ae0cbfff74531c469add6c867ffc73f47e8 SHA512 c95b5abd255f4d0a1d9efa8b45126fea2c57ed2110358687a14d44c5ccc8f670f33a5e9b56bd9e3ea4806ad2429a84b70d796bec9c909262379bba5914e7d51d
-DIST pcsx2-1.4.0.tar.gz 15108326 BLAKE2B 6601019f9bd038d8cb3ed5ebd47daa5b645e537d028581c1235f9ab03f59d281639913ef037be3ef380a76bd48ea4f8728b0339fafcd331b4cfa41681dbcabd0 SHA512 87ae8bdebcaf015ba03c23056bcab32b13d6726a6c3f05e62ef54f472114399debfcfcda4208b066519c2d20345a1bb8c55582eb342dccc168f410687f3766fb
-EBUILD pcsx2-1.4.0.ebuild 2863 BLAKE2B 8f3db9fbbf1062dc9f0c8e795c6030bb1e2408e37f26e0d4fc08d3a68f53fea3cce300d3097ab2ae870bc5038023618f9ff9345d8bc4af6b56259c35ddc322cf SHA512 4d1e1c48d64b8c2e538adf546ac8f9767224d3fdf4d326b72546602e464b6ceced4b0defcd140e6934b5df69ac29a38179ebe12476b6278c60916aafaab7da0a
-EBUILD pcsx2-9999.ebuild 2748 BLAKE2B 7269d9dfe2be80399909b3399ca0a2918e6711cea0a95400e338b6ea1bb2ca688a91d67ec222969487ca17298540496caa33a65a3779d459ac244644b62a98fa SHA512 9f05e4bab5761623335212e94d73a1f12135309c78d846d7d8b13090d3ee365e98fb4dcc305463e82e635485b1e9a75e240e6e7d63fad2224366984bfd7d0f01
-MISC metadata.xml 502 BLAKE2B 26415faa56f60d794446f9354475331a0006a25cfa380fc69aabd3adc01622c425b934ebd94bbc283d749f7a06ef9ddcc123371aefc33b4b6ae0ce5b14c907d3 SHA512 1b095d48c5f126e53f865b982fa337dc25ce736ffda219c0812d86d9120c928d577b588a4587b9eea4c0315bfec67fbd4b281b224182ef2cb8ffb0c231dd83d3
diff --git a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch b/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
deleted file mode 100644
index cfc941f28244..000000000000
--- a/games-emulation/pcsx2/files/pcsx2-1.4.0-gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 71991f24ef75b7da678d8de8d593bf82677d2708 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 9 Jan 2017 18:37:44 +0400
-Subject: [PATCH] x86emitter: gcc 5 compilation fix
-
----
- common/src/x86emitter/cpudetect.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/common/src/x86emitter/cpudetect.cpp b/common/src/x86emitter/cpudetect.cpp
-index 717ca89..cf94d7f 100644
---- a/common/src/x86emitter/cpudetect.cpp
-+++ b/common/src/x86emitter/cpudetect.cpp
-@@ -16,6 +16,9 @@
- #include "PrecompiledHeader.h"
- #include "cpudetect_internal.h"
- #include "internal.h"
-+#if defined(__GNUC__)
-+#include "x86intrin.h"
-+#endif
- 
- using namespace x86Emitter;
- 
--- 
-2.10.2
-
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
deleted file mode 100644
index 16221929ad22..000000000000
--- a/games-emulation/pcsx2/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ykonotopov@gnome.org</email>
-		<name>Yuri Konotopov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
-		<remote-id type="github">PCSX2/pcsx2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild b/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
deleted file mode 100644
index cfd1606f91af..000000000000
--- a/games-emulation/pcsx2/pcsx2-1.4.0.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
-MY_PV="${PV/_/-}"
-
-inherit cmake-utils l10n multilib toolchain-funcs wxwidgets
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
-SRC_URI="https://github.com/PCSX2/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl[abi_x86_32(-),joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:2[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:3.0[abi_x86_32(-),X]
-"
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
-	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
-"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc5.patch )
-
-clean_locale() {
-	rm -R "${S}"/locales/"${1}" || die
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
-			die "${PN} does not compile with gcc less than 4.8"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do clean_locale
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
-
-	if use amd64; then
-		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
-		# https://github.com/PCSX2/pcsx2/pull/422
-		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
-	fi
-
-	local mycmakeargs=(
-		-DARCH_FLAG=
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DEXTRA_PLUGINS=FALSE
-		-DOPTIMIZATION_FLAG=
-		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=FALSE
-		-DWX28_API=FALSE
-	)
-
-	WX_GTK_VER="3.0" need-wxwidgets unicode
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
-	cmake-utils_src_install
-}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
deleted file mode 100644
index 1ab14376a933..000000000000
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PLOCALES="ar_SA ca_ES cs_CZ de_DE es_ES fi_FI fr_FR hr_HR hu_HU id_ID it_IT ja_JP ko_KR ms_MY nb_NO pl_PL pt_BR ru_RU sv_SE th_TH tr_TR zh_CN zh_TW"
-
-inherit cmake-utils git-r3 l10n multilib toolchain-funcs wxwidgets
-
-DESCRIPTION="A PlayStation 2 emulator"
-HOMEPAGE="https://www.pcsx2.net"
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	app-arch/bzip2[abi_x86_32(-)]
-	app-arch/xz-utils[abi_x86_32(-)]
-	dev-libs/libaio[abi_x86_32(-)]
-	media-libs/alsa-lib[abi_x86_32(-)]
-	media-libs/libpng:=[abi_x86_32(-)]
-	media-libs/libsdl2[abi_x86_32(-),haptic,joystick,sound]
-	media-libs/libsoundtouch[abi_x86_32(-)]
-	media-libs/portaudio[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.4[abi_x86_32(-)]
-	virtual/jpeg:62[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/gtk+:2[abi_x86_32(-)]
-	x11-libs/libICE[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/wxGTK:3.0[abi_x86_32(-),-sdl,X]
-"
-# Ensure no incompatible headers from eselect-opengl are installed, bug #510730
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.3.1
-	dev-cpp/pngpp
-	>=dev-cpp/sparsehash-1.5
-"
-
-clean_locale() {
-	rm -R "${S}"/locales/"${1}" || die
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary && $(tc-getCC) == *gcc* ]]; then
-		if [[ $(gcc-major-version) -lt 4 || $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 8 ]] ; then
-			die "${PN} does not compile with gcc less than 4.8"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	l10n_for_each_disabled_locale_do clean_locale
-}
-
-src_configure() {
-	multilib_toolchain_setup x86
-
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
-
-	if use amd64; then
-		# Passing correct CMAKE_TOOLCHAIN_FILE for amd64
-		# https://github.com/PCSX2/pcsx2/pull/422
-		local MYCMAKEARGS=(-DCMAKE_TOOLCHAIN_FILE=cmake/linux-compiler-i386-multilib.cmake)
-	fi
-
-	local mycmakeargs=(
-		-DARCH_FLAG=
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DEXTRA_PLUGINS=FALSE
-		-DOPTIMIZATION_FLAG=
-		-DPACKAGE_MODE=TRUE
-		-DXDG_STD=TRUE
-
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_LIBRARY_PATH="/usr/$(get_libdir)/${PN}"
-		-DDOC_DIR=/usr/share/doc/"${PF}"
-		-DEGL_API=FALSE
-		-DGTK3_API=FALSE
-		-DPLUGIN_DIR="/usr/$(get_libdir)/${PN}"
-		# wxGTK must be built against same sdl version
-		-DSDL2_API=TRUE
-		-DWX28_API=FALSE
-	)
-
-	WX_GTK_VER="3.0" need-wxwidgets unicode
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
-	QA_TEXTRELS="usr/$(get_libdir)/pcsx2/*"
-
-	cmake-utils_src_install
-}
diff --git a/games-emulation/pcsxr-1.9.94-r2 b/games-emulation/pcsxr-1.9.94-r2
new file mode 100644
index 000000000000..302ba209a4c2
--- /dev/null
+++ b/games-emulation/pcsxr-1.9.94-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=dev-libs/glib:2= media-libs/libsdl:0=[joystick] sys-libs/zlib:0= x11-libs/gtk+:3= x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXtst:0= x11-libs/libXv:0= alsa? ( media-libs/alsa-lib:0= ) cdio? ( dev-libs/libcdio:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3:0= ) libav? ( media-video/libav:0= ) ) nls? ( virtual/libintl:0= ) openal? ( media-libs/openal:0= ) opengl? ( virtual/opengl:0= x11-libs/libXxf86vm:0= ) pulseaudio? ( media-sound/pulseaudio:0= ) sdl? ( media-libs/libsdl:0=[sound] ) app-arch/unzip dev-util/intltool x11-base/xorg-proto nls? ( sys-devel/gettext:0 ) x86? ( dev-lang/nasm ) >=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=PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator
+EAPI=6
+HOMEPAGE=http://pcsxr.codeplex.com
+IUSE=alsa cdio ffmpeg libav nls openal opengl oss pulseaudio +sdl
+KEYWORDS=~amd64
+LICENSE=GPL-2 public-domain
+RDEPEND=dev-libs/glib:2= media-libs/libsdl:0=[joystick] sys-libs/zlib:0= x11-libs/gtk+:3= x11-libs/libX11:0= x11-libs/libXext:0= x11-libs/libXtst:0= x11-libs/libXv:0= alsa? ( media-libs/alsa-lib:0= ) cdio? ( dev-libs/libcdio:0= ) ffmpeg? ( !libav? ( >=media-video/ffmpeg-3:0= ) libav? ( media-video/libav:0= ) ) nls? ( virtual/libintl:0= ) openal? ( media-libs/openal:0= ) opengl? ( virtual/opengl:0= x11-libs/libXxf86vm:0= ) pulseaudio? ( media-sound/pulseaudio:0= ) sdl? ( media-libs/libsdl:0=[sound] )
+REQUIRED_USE=?? ( alsa openal oss pulseaudio sdl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~mgorny/dist/pcsxr-1.9.94.zip
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0f423103e1fffbfd1680e6f7462931b7
diff --git a/games-emulation/pcsxr/Manifest b/games-emulation/pcsxr/Manifest
deleted file mode 100644
index e8f69e37dbc2..000000000000
--- a/games-emulation/pcsxr/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pcsxr-1.9.94-disable-sdl2.patch 1059 BLAKE2B 6421cbf6f2df49c2c61cc83602c13b4189781b30ecf3a1f605e537ad0b1c97205c65cd1c51fd58c1b6c0fa4027b7163e9d82228136ccd7bcc508f5917ab46248 SHA512 aa010d8203a45ddd7f93fcc74d3ec9010dcdf6a79d36bb72aa434caccac650c2dee5a74e52e11e40b35356ca30d9a37a52b5e76dcacba64634988b9e57c74171
-AUX pcsxr-1.9.94-ffmpeg3.patch 1890 BLAKE2B 74bd342c5ffb1cd8cc280add5b89aee448d180356e5cf7eb8252414d933c83ee5e0045146e3953f219b4330c2df2e5a4f68c0e07c4d5c1060d1708c2229455ad SHA512 091c435337468aa958c5b6e87a0ce5730675d9f8d109474c92d5e1d61830a8b4c525f8e3208e86654baca5ae602a39bc234a0c54b24b4f51a1297fb123852dc3
-AUX pcsxr-1.9.94-zlib-uncompress2.patch 1522 BLAKE2B c872121a676d42f6855359eafa50be57e42a573ae2b470463fb25322cc5e7004c443de7bb214a55bfb9a99c4f88026892313301fe1c4960e823c842889f28966 SHA512 28350e042810a8f1c3829891d68b028b4c464b75e614f8451f8708bbff0ee47e94146a05cf5e6e3fdfe6ca7eae2e839fc8cbf95df8458e28e3d025feb728c310
-DIST pcsxr-1.9.94.zip 2631125 BLAKE2B 686503faffccc820bcac73bc69056ffe05176779ee49b834ce0da84c40a047b7882ca7b91a7b7f95ab153329ca6368ae545bbe567cac6a9bdba1a434c397862c SHA512 c49471c27692fbf22da32d2f5697a1dfed3dbdbfdb86cb789b0ea6cddb2a7da4f3390e4568f4e9385bf30d6baff0f2a591a80f424cf0c640cae0035ba81dce39
-EBUILD pcsxr-1.9.94-r2.ebuild 2675 BLAKE2B 475bdfe5e53828f78b434cb6c1ea7b86deb7bfbfe83b470f4f6e54fc4ce6f0308e4329883d8564734fc1d1e178179e8e47aeeb8f6a4280078131149b59599f90 SHA512 1210b0fac40c7f310efefaea9342ac4a9a89e6eb366ac7de4db87385627a297947e2cc0d3cbfc3b00104f0c58c41f3aebb2bc6222a7d10f489969f3efcc6960c
-MISC metadata.xml 410 BLAKE2B 43f3920798ece05509e24b693d5b8de55a87337e637bc9b1c6f57ebd79d7c67e3d47c2d8c695cfc3386c733396a7c59e2fcb1f4087fd8b926b30c8962b698d99 SHA512 4c7e8a04412bd0851f4422bd646423558cc7e67ad956b518104285eb537a7a3cbf492239a11a582be65c45229299d0309823f3a6064717704d2fab4c15d2ee52
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-disable-sdl2.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-disable-sdl2.patch
deleted file mode 100644
index 483ea56660e6..000000000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-disable-sdl2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b7864d1b8db75eda19a7601f3e2402a885bb251d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 11 Dec 2013 17:19:09 +0100
-Subject: [PATCH] Disable SDL2 check for Gentoo.
-
-The SDL2 support seems immature at the moment, so we'd prefer pcsxr
-using SDL1 even if SDL2 is installed.
----
- configure.ac | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f79cee0..0c79cff 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -26,8 +26,7 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
- PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.20, [], AC_MSG_ERROR([*** glib2 >= 2.20 not found!]))
- PKG_CHECK_MODULES(GTK3, gtk+-3.0 , [], AC_MSG_ERROR([*** libgtk3 >= 3.0 not found!]))
- 
--PKG_CHECK_MODULES([SDL2], [sdl2 >= 2.0.0],
--   [AC_DEFINE([HAVE_SDL2], [1], [Use SDL2])],
-+AS_IF([true],
-    [PKG_CHECK_MODULES([SDL], [sdl >= 1.2.12],
-        [AC_DEFINE([HAVE_SDL], [1], [Use SDL])
-     ], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!]))
--- 
-1.8.5.1
-
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch
deleted file mode 100644
index 345ed9993ea4..000000000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-ffmpeg3.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/libpcsxcore/cdriso.c	2013-11-09 16:24:14.000000000 +0100
-+++ b/libpcsxcore/cdriso.c	2016-12-12 01:02:25.652521029 +0100
-@@ -266,14 +266,14 @@
- 		}
- 
- 		if (!decoded_frame) {
--			if (!(decoded_frame = avcodec_alloc_frame())) {
-+			if (!(decoded_frame = av_frame_alloc())) {
- 				SysMessage(_(" -> Error allocating audio frame buffer. This track will not be available."));
- 				avformat_close_input(&inAudioFormat);
--				avcodec_free_frame(&decoded_frame);
-+				av_frame_free(&decoded_frame);
- 				return 1; // error decoding frame
- 			}
- 		} else {
--			avcodec_get_frame_defaults(decoded_frame);
-+			av_frame_unref(decoded_frame);
- 		}
- 		len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
- 		if (len > 0 && got_frame) {
-@@ -285,7 +285,7 @@
- 			fwrite(decoded_frame->data[0], 1, data_size, outfile);
- 		}
- 		av_free_packet(&avpkt);
--		//avcodec_free_frame(&decoded_frame);
-+		//av_frame_free(&decoded_frame);
- 	} while (moreFrames >= 0); // TODO: check for possible leaks
- 
- 	// file will be closed later on, now just flush it
-@@ -294,7 +294,7 @@
- 	avformat_close_input(&inAudioFormat);
- 	//avcodec_close(c);
- 	//av_free(c);
--	avcodec_free_frame(&decoded_frame);
-+	av_frame_free(&decoded_frame);
- 	return 0;
- }
- #endif
-@@ -340,12 +340,12 @@
- 	while (avpkt.size > 0) {
- 		int got_frame = 0;
- 		if (!decoded_frame) {
--			if (!(decoded_frame = avcodec_alloc_frame())) {
-+			if (!(decoded_frame = av_frame_alloc())) {
- 				SysPrintf(" -> Error allocating audio frame buffer. Track will not be available.");
- 				return 1; // error decoding frame
- 			}
- 		} else {
--			avcodec_get_frame_defaults(decoded_frame);
-+			av_frame_unref(decoded_frame);
- 		}
- 
- 		len = avcodec_decode_audio4(c, decoded_frame, &got_frame, &avpkt);
-@@ -383,7 +383,7 @@
- 
- 	avcodec_close(c);
- 	av_free(c);
--	avcodec_free_frame(&decoded_frame);
-+	av_frame_free(&decoded_frame);
- 	return 0;
- }
- #endif
diff --git a/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch b/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch
deleted file mode 100644
index 616084b797cd..000000000000
--- a/games-emulation/pcsxr/files/pcsxr-1.9.94-zlib-uncompress2.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From dabb671947ae26942c7ef8a71fef9831e0c1884d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 26 Jan 2017 18:14:01 +0100
-Subject: [PATCH] Fix build against zlib-1.2.9+ (having uncompress2)
-
----
- pcsxr/configure.ac         | 3 +++
- pcsxr/libpcsxcore/cdriso.c | 2 ++
- 2 files changed, 5 insertions(+)
-
-diff --git a/pcsxr/configure.ac b/pcsxr/configure.ac
-index 300bb185..128b4f97 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,6 +113,9 @@ if test "x$have_xtest" = xno; then
- 	AC_MSG_ERROR([unable to find xtest headers])
- fi
- 
-+AC_CHECK_LIB(z, uncompress2,
-+[ AC_DEFINE([HAVE_UNCOMPRESS2], [1], [Define if libz supports uncompress2]) ])
-+
- AM_CONDITIONAL(USE_LIBCDIO, false)
- 
- AC_ARG_ENABLE(libcdio, [  --enable-libcdio        use GNU libcdio for CD-ROM support (default=no)],
-diff --git a/pcsxr/libpcsxcore/cdriso.c b/pcsxr/libpcsxcore/cdriso.c
-index 04e866d9..fb7f28a5 100644
---- a/libpcsxcore/cdriso.c
-+++ b/libpcsxcore/cdriso.c
-@@ -1219,6 +1219,7 @@ static int cdread_sub_mixed(FILE *f, unsigned int base, void *dest, int sector)
- 	return ret;
- }
- 
-+#ifndef HAVE_UNCOMPRESS2
- static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned long in_size)
- {
- 	static z_stream z;
-@@ -1249,6 +1250,7 @@ static int uncompress2(void *out, unsigned long *out_size, void *in, unsigned lo
- 	*out_size -= z.avail_out;
- 	return ret == 1 ? 0 : ret;
- }
-+#endif
- 
- static int cdread_compressed(FILE *f, unsigned int base, void *dest, int sector)
- {
--- 
-2.11.0
-
diff --git a/games-emulation/pcsxr/metadata.xml b/games-emulation/pcsxr/metadata.xml
deleted file mode 100644
index 04c9bdf246b4..000000000000
--- a/games-emulation/pcsxr/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="cdio">Use libcdio for CD support</flag>
-		<flag name="sdl">Use SDL sound backend (other parts of SDL are used unconditionally)</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild b/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild
deleted file mode 100644
index b58d16a4d360..000000000000
--- a/games-emulation/pcsxr/pcsxr-1.9.94-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune versionator
-
-DESCRIPTION="PCSX-Reloaded: a fork of PCSX, the discontinued Playstation emulator"
-HOMEPAGE="http://pcsxr.codeplex.com"
-# codeplex doesn't support direct downloads but GPL-2 doesn't mind me
-# mirroring it.
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.zip"
-
-LICENSE="GPL-2 public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-IUSE="alsa cdio ffmpeg libav nls openal opengl oss pulseaudio +sdl"
-REQUIRED_USE="?? ( alsa openal oss pulseaudio sdl )"
-
-# pcsxr supports both SDL1 and SDL2 but uses the newer version installed
-# since SDL is not properly slotted in Gentoo, just fix it on SDL2
-
-RDEPEND="
-	dev-libs/glib:2=
-	media-libs/libsdl:0=[joystick]
-	sys-libs/zlib:0=
-	x11-libs/gtk+:3=
-	x11-libs/libX11:0=
-	x11-libs/libXext:0=
-	x11-libs/libXtst:0=
-	x11-libs/libXv:0=
-	alsa? ( media-libs/alsa-lib:0= )
-	cdio? ( dev-libs/libcdio:0= )
-	ffmpeg? (
-		!libav? ( >=media-video/ffmpeg-3:0= )
-		libav? ( media-video/libav:0= ) )
-	nls? ( virtual/libintl:0= )
-	openal? ( media-libs/openal:0= )
-	opengl? ( virtual/opengl:0=
-		x11-libs/libXxf86vm:0= )
-	pulseaudio? ( media-sound/pulseaudio:0= )
-	sdl? ( media-libs/libsdl:0=[sound] )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/intltool
-	x11-base/xorg-proto
-	nls? ( sys-devel/gettext:0 )
-	x86? ( dev-lang/nasm )
-"
-
-# it's only the .po file check that fails :)
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}"/${P}-disable-sdl2.patch
-	"${FILESDIR}"/${P}-zlib-uncompress2.patch
-	"${FILESDIR}"/${P}-ffmpeg3.patch
-)
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local sound_backend
-
-	if use alsa; then
-		sound_backend=alsa
-	elif use oss; then
-		sound_backend=oss
-	elif use pulseaudio; then
-		sound_backend=pulseaudio
-	elif use sdl; then
-		sound_backend=sdl
-	elif use openal; then
-		sound_backend=openal
-	else
-		sound_backend=null
-	fi
-
-	local myconf=(
-		$(use_enable nls)
-		$(use_enable cdio libcdio)
-		$(use_enable opengl)
-		$(use_enable ffmpeg ccdda)
-		--enable-sound=${sound_backend}
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-
-	dodoc doc/{keys,tweaks}.txt
-}
-
-pkg_postinst() {
-	local vr
-	for vr in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 1.9.94-r1 ${vr}; then
-			ewarn "Starting with pcsxr-1.9.94-r1, the plugin install path has changed."
-			ewarn "In order for pcsxr to find plugins, you will need to remove stale"
-			ewarn "symlinks from ~/.pcsxr/plugins. You can do this using the following"
-			ewarn "command (as your regular user):"
-			ewarn
-			ewarn " $ find ~/.pcsxr/plugins/ -type l -delete"
-		fi
-	done
-}
diff --git a/games-emulation/ppsspp-1.4.2 b/games-emulation/ppsspp-1.4.2
new file mode 100644
index 000000000000..355fb988d3e6
--- /dev/null
+++ b/games-emulation/ppsspp-1.4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl media-libs/libsdl2 ) qt5? ( dev-db/sqlite dev-qt/assistant:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl media-libs/libsdl2 ) qt5? ( dev-db/sqlite dev-qt/assistant:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.4.2.tar.gz -> ppsspp-1.4.2.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.4.2-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/f32328a88cbf368af90eb79bc7ad5420795d6585.tar.gz -> ppsspp-1.4.2-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/e18cface3db64ccb96738dc128fe769b28fff65c.tar.gz -> ppsspp-1.4.2-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.4.2-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ppsspp-1.4.2-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz -> ppsspp-1.4.2-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.4.2-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ppsspp-1.4.2-ext_SPIRV-Cross.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_=51f56903f7d727d96be60e4e4d54c802
diff --git a/games-emulation/ppsspp-1.4.2-r1 b/games-emulation/ppsspp-1.4.2-r1
new file mode 100644
index 000000000000..98071e103e50
--- /dev/null
+++ b/games-emulation/ppsspp-1.4.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.4.2.tar.gz -> ppsspp-1.4.2.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.4.2-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/f32328a88cbf368af90eb79bc7ad5420795d6585.tar.gz -> ppsspp-1.4.2-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/e18cface3db64ccb96738dc128fe769b28fff65c.tar.gz -> ppsspp-1.4.2-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.4.2-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ppsspp-1.4.2-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz -> ppsspp-1.4.2-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.4.2-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ppsspp-1.4.2-ext_SPIRV-Cross.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_=546c20d0b1dd4083a7fd78edb42197d9
diff --git a/games-emulation/ppsspp-1.5.4 b/games-emulation/ppsspp-1.5.4
new file mode 100644
index 000000000000..94fae98acbd5
--- /dev/null
+++ b/games-emulation/ppsspp-1.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl media-libs/libsdl2 ) qt5? ( dev-db/sqlite dev-qt/assistant:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl media-libs/libsdl2 ) qt5? ( dev-db/sqlite dev-qt/assistant:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.5.4.tar.gz -> ppsspp-1.5.4.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.5.4-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ppsspp-1.5.4-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ppsspp-1.5.4-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.5.4-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ppsspp-1.5.4-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ppsspp-1.5.4-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ppsspp-1.5.4-ext_SPIRV-Cross.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_=7e83f16af199173f7b186f84a3e193d2
diff --git a/games-emulation/ppsspp-1.5.4-r1 b/games-emulation/ppsspp-1.5.4-r1
new file mode 100644
index 000000000000..91d8ff37ed86
--- /dev/null
+++ b/games-emulation/ppsspp-1.5.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.5.4.tar.gz -> ppsspp-1.5.4.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.5.4-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ppsspp-1.5.4-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ppsspp-1.5.4-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.5.4-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ppsspp-1.5.4-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ppsspp-1.5.4-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ppsspp-1.5.4-ext_SPIRV-Cross.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_=4f496940ba5301f7e2df3b209e5f176c
diff --git a/games-emulation/ppsspp-9999 b/games-emulation/ppsspp-9999
new file mode 100644
index 000000000000..143e037e36e4
--- /dev/null
+++ b/games-emulation/ppsspp-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d620ec088a59075e4a49876970159b1a
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
deleted file mode 100644
index 0fbf1c279269..000000000000
--- a/games-emulation/ppsspp/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-AUX ppsspp-1.4-O2.patch 1576 BLAKE2B 5831befac76d1a674c0bf453043c1ac36435c76f04ec5bd95885582c9f44c283232a9dbbea629433629d9fbfd5cc1415f5e0f47c50dbbdb9e834891280e98a49 SHA512 39f18c074e56aa823b223a78b099771257b4a5672a41c6d271cee5b817a2a63d17f57ad9f936da41185dae5b4bf2a94cc62cf92596d94b6e0660f1b05bf9ac2f
-AUX ppsspp-1.4.2-assets-lookup.patch 525 BLAKE2B e0614d010e1708cfdfeba376ece25c6bb121e79dae7243988706a80d6ef022ba52286878c9e7c868bbe23aca6c5182ca1e0c6b5baaa6e4b32e2c79eb4febd10f SHA512 9963aad44ce72e9625cdf816bf58743ab8936d8f1fd3c75ac9ddbda5e179cd71fa4d23321c42ba4d56bd472cc016a62430a0c6d8b84792e2851977a5155cbdb1
-DIST ppsspp-1.4.2-assets_lang.tar.gz 273563 BLAKE2B 54ab5cabe00ec8bd24fef62bc17894e8c663141283207eaa8ec79313d4d6131c3bb32f1d07f7e191592e973831e3852eff96d9e682d294d2cdf5967f95e0cae3 SHA512 b252e3335c84bedd24764caab15909f31dd8de60578b2c32ceab200a53de5689d8e82e1853c921d8835b780cefda10ea2ebe5e98e2afb4ba44204cc2b5209a5a
-DIST ppsspp-1.4.2-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
-DIST ppsspp-1.4.2-ext_SPIRV-Cross.tar.gz 193267 BLAKE2B d7eb87441b78f95a6d37cec9d787728a8381fc0b1368a4856f8cf34ec813f891c16b35634630714239c661508143042909df6432922d5e703967941d28ead3a9 SHA512 0b24d28c9e98b170dc4ae51269dce04c100f9116e5fb66268b23878eab4ee7bfc28d257208e094fedf23be89a488e9497bb246d369711b72bf5e39332225d7bf
-DIST ppsspp-1.4.2-ext_armips.tar.gz 163666 BLAKE2B e9ec7d5e30027315d2f8b8b634ad99854ab9609f823e250a5cc63272cb938bc9e43c2c3ed53ceceee97fff93bbf42c150103b7c24a679c2af9eb14821df2a244 SHA512 9423bdbc1428700979c13276a427975733a07908fdf021dc6ab88cec0d37e9523aacd4a2a03eef23638070293dde3f1641647c47095ef2751982b9f9893c1baa
-DIST ppsspp-1.4.2-ext_armips_ext_tinyformat.tar.gz 22284 BLAKE2B d37c35efeb42e3998603127f8758cec29103b5f7700ff465d5234e032822965e9249b6d183dba9962a76bed06abeaf0c40ab701425d1fb4d64ffd83c9987fe8d SHA512 fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1
-DIST ppsspp-1.4.2-ext_glslang.tar.gz 1685246 BLAKE2B c5a58a40587bd93d3b3d50a636714b599eb7eab3d7f798ffbd694b00a31f00b365ec88d47a94536fb6fac77b29377bdc46092fdd3c0d67631d2a8cd4af9ed34d SHA512 3605fb8a3c5dafcab97578030be4af3703f1475c8e9fd58412a514dcaa0ea6c7bf3a279510759496ab34b979a3d260d3da3d6f00d504c9c5e0f9a7b5a61399bc
-DIST ppsspp-1.4.2-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
-DIST ppsspp-1.4.2-pspautotests.tar.gz 35084214 BLAKE2B b4c1b40cd016ac6a6547fbf6421bb9cdb35dfb0705c275d07c1fdb4f26a148cece3f125b32f0b15212148570179378cb845c0f56ff5529fe76ccbefab8384d8d SHA512 d42050bbbff976c2e09815e736b416a2b29baaed8516537429e47933738ae93c8bbe762088d150fed3fb2b781b79041834c6fdab362f667b16a5697423c78449
-DIST ppsspp-1.4.2.tar.gz 18922775 BLAKE2B ce680f53f8d1e8e34b79b7af6e53b20be4c331722c3b213c0b08478035d12b379e902c7ba58f45305410fbb491a28fb324c436cb310be66904d5cf3acd076a4b SHA512 fb36e211afa83363d036fac757010c6be9d1bcb4c0984f18ddf17871b04bc2b9b89f94341f6c0ada3a2709426cda863e2da5c66d60b72220dcceba7a5deca7e5
-DIST ppsspp-1.5.4-assets_lang.tar.gz 347859 BLAKE2B 648915773856a64dafb5d159e0917b4345ff99dba7b7dae4f343ecd81e1d835cb958766ab8928118ae4768564414e3dcceba474e05e99be23d56c9447c59786b SHA512 72983f01c51900fa133ca83d226a5daec78153c9d70fc1ca6233b531f3c5d5da5e307e377560789cecccad7a98ba8f66da104cc4375f51576f90c535dc980b98
-DIST ppsspp-1.5.4-dx9sdk.tar.gz 14582591 BLAKE2B 12a370e262d045bab6f85237160189921e0bc9992726bb60d241c20a5714128995cf110bb5889c530f8cc3497a34645a96ff31b7b61fb3004279f26b15287435 SHA512 2c54b441b0a31f63ecab1bd2ab14254fb2047d35d2765262d43277330a8428fbf4c8848d5f730456a033cf84258f6b60a467213f8339289b3ab83ed7e94c65b7
-DIST ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz 228943 BLAKE2B 0b4ed8a751737bf6fce9fa766f0b8dc0671b49a6adf026c369ebd3776d9d8c23acd08b6d3f41666a6e23410ffb243917a844d9de85e3eca5ce04935421aaca98 SHA512 5fe2f772b571da0627fb9d9c424bea2b4ea1c0563e36ff455ddaf1b92ea3d5ee636e039a0619e0971478ce10e163b45258e9b03d2610c573f74d1cfd08549bb8
-DIST ppsspp-1.5.4-ext_armips.tar.gz 191245 BLAKE2B 8bfeb8828bc2496c0222b22547820f00c5a695dc9469a2ce6b8fe7bc15e72af862a957e632af1829bfdd4cf663a586baa10495896971b9b138780ddc387aae9b SHA512 9ab376b928fadcbff7256ff10d6581e4960e00e48a93f47f7e90b1998022a8d03cadef20880aa020fe6b62e4fa43cf28fc68dc5b10e93b1212fd6788ae493dba
-DIST ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz 22284 BLAKE2B d37c35efeb42e3998603127f8758cec29103b5f7700ff465d5234e032822965e9249b6d183dba9962a76bed06abeaf0c40ab701425d1fb4d64ffd83c9987fe8d SHA512 fb063ea9b632c8a9a0203c181830cb2feed9142fcf4d69c11cc0a3e8dcbb3cea51dde6bb351df567b3f105a4da99fd2e72ba3572d3fc0e9a45364f4115d6c3d1
-DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B a9bfae046335f8cba72fc92208fd0370d1808d242c00964c5507ce7d6aab2ad10ef839e8f46c46ba9ac039e11469e26877f89a51843ad035f33b434212a18317 SHA512 333a93707e067ac1d98c69533c2d206675d75aa54195326accf33e8401ac2fb412d2e2525b0ee1313f141872aa6ea430ae5424e8712483c59f77dc3adbcb4f59
-DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
-DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b SHA512 1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f
-DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B 10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db SHA512 dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714
-EBUILD ppsspp-1.4.2-r1.ebuild 3149 BLAKE2B 6e5793b47694b730e8c54abf6656d32f06230dc52a12de21570d9250494fafcf91fbf0a4926180dfb5d81344dab940e18c456d19c10282a41f4c28d5d303039a SHA512 bb496040f78fe330c714ffde35cf364c961b2fddc7b20a53f857050f33529eb8a2b3d1f3e837a010d3d8ecd002723ee45a6051a8aa4853c8255e4e358a2eab38
-EBUILD ppsspp-1.4.2.ebuild 3294 BLAKE2B 70e77c3a3560aef03626b1398c4b4b37d45d57eb546e4e85b87d8e7560b0a30a2a779b24725f1329a167d8e496346d2273fa98ff32bbed1a0c56ccaf45687888 SHA512 a886a1b98c06ded0c52d2052a7f75c5cc313ef87b64997508a95c45db86df20c069aa38961ce385a127debf0757d8f3baf6ecc75482fadd5005faab8d80f7feb
-EBUILD ppsspp-1.5.4-r1.ebuild 3156 BLAKE2B daa114667318aede5fbfc1b8a02a6b8920c81dd2fda241b57a4c6011974b97d4e48c5da511eb40d5c8c661045a9189170d16e3057f1cf229acc95486a2ad09cc SHA512 8697cb9a5ba55f6ef84ac9a2896cc16ac23ab106e619324e95ff0cf2b2711cb4f24d7042977d1b7881f8f3bb6abbdac0a53654b12b6d4eb743169c2369d89e28
-EBUILD ppsspp-1.5.4.ebuild 3301 BLAKE2B 900cfb98f21129adb7fee7eac4a2b1b5dcae11e6f5f5eb6a9af8373cf428771d0ee7fe44de2732afe9fcb250ddce65f5092503849c8105e1e507120cd4eef4a8 SHA512 37281cec1fff6577fd102e449eb070d15e035ae735cba4c0e91f4d4b963af02d6c057947211cf8402537403990abc9f15650654bd282073b8f23dbedfa7a8b68
-EBUILD ppsspp-9999.ebuild 2164 BLAKE2B fbdc48fdfb6a2c963f15b13b1c0eb39ce8dca8101105ac5ac260c56007f8af1dbd8821ffad1495d1bcb79e05e42f0917b6c7145a2976e0be54b8948ae7eaa63c SHA512 538bec64d920089826856c6c19c2db352d211d2c8dd6dd74ef00f7fa082a65d5f119c0beaaca8acd49e4da48c28b59340fd78640022d9d3bebb2e883980d0bb5
-MISC metadata.xml 677 BLAKE2B b19f83bb3fa7ff9a1b6d8c9ea4caf75d6a32cd2bb78e43bae9e07c217d69108b8c6f8b00f7f81f9f2a2823cac8414b9b2022f443cdfe3e4132273617fab3f806 SHA512 57b8a912c8a000574da72dd02db7b91a3d0f9bd4d5a833afb93afe24fcd4b0e6a1f382a827f9c53e575368b8747ec62dc050da092eb1368875cb77326f2e9e74
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch b/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
deleted file mode 100644
index 55954c7c7389..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4-O2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19038c88a436..bf50f5cf52fb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -195,11 +195,11 @@ if(NOT MSVC)
- 
- 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
- 	set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
--	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -D_NDEBUG")
- 	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
- 	set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -D_NDEBUG")
--	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -D_NDEBUG")
-+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -D_NDEBUG")
- 	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O2 -g -D_NDEBUG")
- 	#TODO: Remove this and include the file properly everywhere it makes sense
- 	# First step is too use the macros everywhere
-@@ -509,10 +509,10 @@ include_directories(ext/cityhash)
- 
- if (NOT MSVC)
- 	# These can be fast even for debug.
--	set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O3")
--	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O3")
-+	set_target_properties(udis86 PROPERTIES COMPILE_FLAGS "-O2")
-+	set_target_properties(cityhash PROPERTIES COMPILE_FLAGS "-O2")
- 	if(NOT ZLIB_FOUND)
--		set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O3")
-+		set_target_properties(zlib PROPERTIES COMPILE_FLAGS "-O2")
- 	endif()
- endif()
- 
diff --git a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch b/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
deleted file mode 100644
index 2a136a39e8de..000000000000
--- a/games-emulation/ppsspp/files/ppsspp-1.4.2-assets-lookup.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
-index 717177ef81ff..22239782210d 100644
---- a/UI/NativeApp.cpp
-+++ b/UI/NativeApp.cpp
-@@ -317,7 +317,7 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
- 
- 	// We want this to be FIRST.
- #ifdef USING_QT_UI
--	VFSRegister("", new AssetsAssetReader());
-+	VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));
- #elif defined(IOS)
- 	// Packed assets are included in app
- 	VFSRegister("", new DirectoryAssetReader(external_dir));
diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
deleted file mode 100644
index 69ffc51152a5..000000000000
--- a/games-emulation/ppsspp/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="headless">Build headless version of the PPSSPP</flag>
-		<flag name="system-ffmpeg">Use the system-wide media-video/ffmpeg instead of bundled</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>
-		<remote-id type="github">hrydgard/ppsspp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/ppsspp/ppsspp-1.4.2-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.4.2-r1.ebuild
deleted file mode 100644
index b50b2c98db5c..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.4.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop cmake-utils
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
-	https://github.com/hrydgard/ppsspp-lang/archive/f32328a88cbf368af90eb79bc7ad5420795d6585.tar.gz -> ${P}-assets_lang.tar.gz
-	https://github.com/hrydgard/pspautotests/archive/e18cface3db64ccb96738dc128fe769b28fff65c.tar.gz -> ${P}-pspautotests.tar.gz
-	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
-	https://github.com/hrydgard/glslang/archive/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt5 sdl headless libav +system-ffmpeg"
-REQUIRED_USE="
-	!headless? ( || ( qt5 sdl ) )
-	?? ( qt5 sdl )
-"
-
-RDEPEND="sys-libs/zlib
-	system-ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	sdl? ( media-libs/libsdl2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-assets-lookup.patch
-	"${FILESDIR}"/${PN}-1.4-O2.patch
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" || die
-	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
-	if ! use system-ffmpeg; then
-		list+=( ffmpeg )
-	fi
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSING_QT_UI=$(usex qt5)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DHEADLESS=$(usex headless)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	if use qt5 || use sdl ; then
-		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-		local i
-		for i in 16 24 32 48 64 96 128 256 512 ; do
-			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-		done
-		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-	fi
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-1.4.2.ebuild b/games-emulation/ppsspp/ppsspp-1.4.2.ebuild
deleted file mode 100644
index 7a5ad73a8935..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.4.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
-	https://github.com/hrydgard/ppsspp-lang/archive/f32328a88cbf368af90eb79bc7ad5420795d6585.tar.gz -> ${P}-assets_lang.tar.gz
-	https://github.com/hrydgard/pspautotests/archive/e18cface3db64ccb96738dc128fe769b28fff65c.tar.gz -> ${P}-pspautotests.tar.gz
-	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
-	https://github.com/hrydgard/glslang/archive/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt5 sdl headless libav +system-ffmpeg"
-REQUIRED_USE="
-	!headless? ( || ( qt5 sdl ) )
-	?? ( qt5 sdl )
-"
-
-RDEPEND="sys-libs/zlib
-	system-ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	sdl? (
-		media-libs/libsdl
-		media-libs/libsdl2
-	)
-	qt5? (
-		dev-db/sqlite
-		dev-qt/assistant:5
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-assets-lookup.patch
-	"${FILESDIR}"/${PN}-1.4-O2.patch
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" || die
-	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
-	if ! use system-ffmpeg; then
-		list+=( ffmpeg )
-	fi
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSING_QT_UI=$(usex qt5)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DHEADLESS=$(usex headless)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	if use qt5 || use sdl ; then
-		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-		local i
-		for i in 16 24 32 48 64 96 128 256 512 ; do
-			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-		done
-		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-	fi
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r1.ebuild
deleted file mode 100644
index 023b9217fe85..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop cmake-utils
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
-	https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ${P}-assets_lang.tar.gz
-	https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ${P}-pspautotests.tar.gz
-	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
-	https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt5 sdl headless libav +system-ffmpeg"
-REQUIRED_USE="
-	!headless? ( || ( qt5 sdl ) )
-	?? ( qt5 sdl )
-"
-
-RDEPEND="sys-libs/zlib
-	system-ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	sdl? ( media-libs/libsdl2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
-	"${FILESDIR}"/${PN}-1.4-O2.patch
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" || die
-	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
-	if ! use system-ffmpeg; then
-		list+=( ffmpeg )
-	fi
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSING_QT_UI=$(usex qt5)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DHEADLESS=$(usex headless)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	if use qt5 || use sdl ; then
-		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-		local i
-		for i in 16 24 32 48 64 96 128 256 512 ; do
-			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-		done
-		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-	fi
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4.ebuild
deleted file mode 100644
index 3204b52eb098..000000000000
--- a/games-emulation/ppsspp/ppsspp-1.5.4.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="https://www.ppsspp.org/"
-SRC_URI="
-	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
-	https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ${P}-assets_lang.tar.gz
-	https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ${P}-pspautotests.tar.gz
-	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
-	https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ${P}-ext_glslang.tar.gz
-	https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ${P}-ext_armips.tar.gz
-	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
-	https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+qt5 sdl headless libav +system-ffmpeg"
-REQUIRED_USE="
-	!headless? ( || ( qt5 sdl ) )
-	?? ( qt5 sdl )
-"
-
-RDEPEND="sys-libs/zlib
-	system-ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	sdl? (
-		media-libs/libsdl
-		media-libs/libsdl2
-	)
-	qt5? (
-		dev-db/sqlite
-		dev-qt/assistant:5
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
-	"${FILESDIR}"/${PN}-1.4-O2.patch
-)
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cd "${S}" || die
-	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
-	if ! use system-ffmpeg; then
-		list+=( ffmpeg )
-	fi
-	for i in "${list[@]}"; do
-		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
-	done
-}
-
-src_prepare() {
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSING_QT_UI=$(usex qt5)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DHEADLESS=$(usex headless)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	if use qt5 || use sdl ; then
-		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-		local i
-		for i in 16 24 32 48 64 96 128 256 512 ; do
-			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-		done
-		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-	fi
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
deleted file mode 100644
index 5ece82adfcce..000000000000
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils git-r3
-
-DESCRIPTION="A PSP emulator written in C++."
-HOMEPAGE="https://www.ppsspp.org/"
-EGIT_REPO_URI="https://github.com/hrydgard/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+qt5 sdl headless libav +system-ffmpeg"
-REQUIRED_USE="
-	!headless? ( || ( qt5 sdl ) )
-	?? ( qt5 sdl )
-"
-EGIT_SUBMODULES=( '*' )
-
-RDEPEND="sys-libs/zlib
-	system-ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	sdl? ( media-libs/libsdl2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)"
-
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	use system-ffmpeg && EGIT_SUBMODULES+=( '-ffmpeg' )
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	# https://github.com/hrydgard/ppsspp/blob/150619c5a341f372266bec86fd874ac5a1343a43/UI/NativeApp.cpp#L318
-	# patch ppsspp to use /usr/share instead of working dir to find the assets
-	sed -i 's|VFSRegister("", new AssetsAssetReader());|VFSRegister("", new DirectoryAssetReader("/usr/share/ppsspp/assets/"));|g' UI/NativeApp.cpp || die "Patching qt assets path failed"
-
-	sed -i -e "s#-O3#-O2#g;" "${S}"/CMakeLists.txt || die
-	if ! use system-ffmpeg; then
-		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
-	fi
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSING_QT_UI=$(usex qt5)
-		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
-		-DHEADLESS=$(usex headless)
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
-	insinto /usr/share/"${PN}"
-	doins -r "${BUILD_DIR}/assets"
-	if use qt5 || use sdl ; then
-		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
-		local i
-		for i in 16 24 32 48 64 96 128 256 512 ; do
-			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
-		done
-		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
-	fi
-}
-
-pkg_postinst() {
-	if use system-ffmpeg; then
-		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
-		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
-	fi
-}
diff --git a/games-emulation/raine-0.51.9 b/games-emulation/raine-0.51.9
new file mode 100644
index 000000000000..47a48b4d556a
--- /dev/null
+++ b/games-emulation/raine-0.51.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-cpp/muParser media-libs/libsdl[sound,joystick,video] sys-libs/zlib media-libs/sdl-image[png] media-libs/sdl-ttf dev-lang/nasm app-arch/unzip
+DESCRIPTION=R A I N E M680x0 Arcade Emulation
+EAPI=5
+HOMEPAGE=http://rainemu.swishparty.co.uk/
+KEYWORDS=~x86
+LICENSE=Artistic
+RDEPEND=dev-cpp/muParser media-libs/libsdl[sound,joystick,video] sys-libs/zlib media-libs/sdl-image[png] media-libs/sdl-ttf games-misc/games-envd
+SLOT=0
+SRC_URI=http://rainemu.swishparty.co.uk/html/archive/raines-0.51.9.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=822c65977d750743004d75560728acf7
diff --git a/games-emulation/raine/Manifest b/games-emulation/raine/Manifest
deleted file mode 100644
index 458c32e8cc7e..000000000000
--- a/games-emulation/raine/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX raine-0.51.9-ldflags.patch 436 BLAKE2B c74bce3d761358d4ff0e469b197e4eb8b1632d59ae2508ff54061b8fd14daba8547079866b91dd7149ad581222672ffdee028955fe26ee006d75f75079e9e993 SHA512 d4b6e1ce4a6ede3c17f0b6aac5a556e52eada51c75381bca7c0fbb48ec105d0a332392837de0182ab361f6e7a44258a2bf87c0010301ef201a22980f055d9e6e
-AUX raine-0.51.9-libpng15.patch 296 BLAKE2B 464b855426c405ba7d98e17c9df2cf89d395aa61ddb179252da300de378e6fd6c2d6b8e5223ed796d9680d6bcf7bb8cc2339c7e8912f464d17c7dbb1b04ba377 SHA512 6e15b001a2a113605ae5c7d026865b8aaef38cbfe57b471624687de1f904fd26618ef1b1156d3d50ad5f39710d2122a4f90ae9f30358f3d955a4a9ea223db1b2
-AUX raine-0.51.9-underlink.patch 483 BLAKE2B cf6759591fe406a65a6466b9cbf1bcb4bf3ab7fc1236dcbe0c7a729e0047e51302abd528b8fdecdf2d8704d24a80f35eb1d4200cb3ba3c298bc92964858d6cb4 SHA512 72ded715c9e1c7b92d6cb8e3e6ccc339de050a36fe777681db39e8910e6f7734ba6f6e80708f93f6f8f078f268412b4f27fcd877c7b012ed3a630ee0d94ba023
-DIST raines-0.51.9.tar.bz2 2095980 BLAKE2B df83e0869229fc832e356d5cd122c737bfafe3b4ee8b8914cb14e30b9f48b97145123f989e36a2a01243bc62d2f49f50e5e43f2da2a433751410f72a23edd315 SHA512 e21346d72c63d8ba1bc6832bd885fa9ec0865c788742e572ef9941d3a4fd3f23710d076253d7a50878ef512ff3024e57098c0ba28c0c794bdefa994b8b7780bf
-EBUILD raine-0.51.9.ebuild 1331 BLAKE2B 7093b566c9c3a38360ba8909ca3f58f74121599bb55fa6aa65133451894d51a5c3421492711ff4a3ffa13d618d8f63b782d1682b3135d82356b05812b776e5a5 SHA512 9f6224b331a030825873736c2952e754b7732117339d973f4a950d387f3a4b6918332b380dfbcb6cc9eba570c1dd6d47356a87941a7a0d4cd46d93724d598130
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/raine/files/raine-0.51.9-ldflags.patch b/games-emulation/raine/files/raine-0.51.9-ldflags.patch
deleted file mode 100644
index f011cd6a1e5c..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2010-10-08 10:04:46.000000000 +0200
-+++ makefile	2010-10-08 10:05:25.000000000 +0200
-@@ -995,7 +995,7 @@
- else
- 	@echo Linking Raine...
- endif
--	$(LDV) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
-+	$(LDV) $(LDFLAGS) $(LFLAGS) -g -Wall -Wno-write-strings -o $(RAINE_EXE) $(OBJS) $(LIBS) -lstdc++
- 
- converter: source/bonus/converter.c
- 	$(CCV) $(CFLAGS) -c $< -o $(OBJDIR)/converter.o
diff --git a/games-emulation/raine/files/raine-0.51.9-libpng15.patch b/games-emulation/raine/files/raine-0.51.9-libpng15.patch
deleted file mode 100644
index 675df24801dc..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-libpng15.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/388255
-
---- source/savepng.c
-+++ source/savepng.c
-@@ -203,7 +203,7 @@
- 	goto Error;
- 
-     /* Set error handling. */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	/* If we get here, we had a problem reading the file. */
- 	goto Error;
-     }
diff --git a/games-emulation/raine/files/raine-0.51.9-underlink.patch b/games-emulation/raine/files/raine-0.51.9-underlink.patch
deleted file mode 100644
index e9eb42bedbb3..000000000000
--- a/games-emulation/raine/files/raine-0.51.9-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2011-06-16 08:25:35.000000000 +0200
-+++ makefile	2011-06-16 08:25:57.000000000 +0200
-@@ -294,7 +294,7 @@
-    LIBS_DEBUG = -lz `allegro-config --libs ` `libpng-config --ldflags` 
-    LIBS_STATIC = -lz `allegro-config --static` `libpng-config --static --ldflags`
- else
--   LIBS = -lz `libpng-config --ldflags` 
-+   LIBS = -lz -lm `libpng-config --ldflags` 
-    LIBS_DEBUG = -lz `libpng-config --ldflags`
-    LIBS_STATIC = -lz `libpng-config --static --ldflags`
- endif
diff --git a/games-emulation/raine/metadata.xml b/games-emulation/raine/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/raine/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/raine/raine-0.51.9.ebuild b/games-emulation/raine/raine-0.51.9.ebuild
deleted file mode 100644
index 5aaef97c6506..000000000000
--- a/games-emulation/raine/raine-0.51.9.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic eutils games
-
-DESCRIPTION="R A I N E  M680x0 Arcade Emulation"
-HOMEPAGE="http://rainemu.swishparty.co.uk/"
-SRC_URI="http://rainemu.swishparty.co.uk/html/archive/raines-${PV}.tar.bz2"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="dev-cpp/muParser
-	media-libs/libsdl[sound,joystick,video]
-	sys-libs/zlib
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	app-arch/unzip"
-
-src_prepare() {
-	echo > detect-cpu
-	echo > cpuinfo
-	sed -i \
-		-e "/^NEO/s:^:#:" \
-		-e "s:nasmw:nasm:" \
-		-e "/bindir/s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
-		-e "/sharedir =/s:=.*:=\$(DESTDIR)${GAMES_DATADIR}:" \
-		-e "/mandir/s:=.*:=\$(DESTDIR)/usr/share/man/man6:" \
-		makefile || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-libpng15.patch
-	has_version '>=sys-libs/zlib-1.2.5.1-r1' && \
-		sed -i -e '1i#define OF(x) x' source/mini-unzip/ioapi.h
-	append-ldflags -Wl,-z,noexecstack
-}
-
-src_compile() {
-	local myopts
-
-	emake \
-		_MARCH="${CFLAGS}" \
-		VERBOSE=1 \
-		${myopts}
-}
-
-src_install() {
-	default
-	keepdir "${GAMES_DATADIR}"/${PN}/{roms,artwork,emudx,scripts/raine}
-	dodoc docs/readme.txt
-	prepgamesdirs
-}
diff --git a/games-emulation/snes9x-1.55 b/games-emulation/snes9x-1.55
new file mode 100644
index 000000000000..0f743d6f02fd
--- /dev/null
+++ b/games-emulation/snes9x-1.55
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-libs/libpng:0= ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) virtual/pkgconfig x11-base/xorg-proto nls? ( dev-util/intltool ) >=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=Super Nintendo Entertainment System (SNES) emulator
+EAPI=6
+HOMEPAGE=https://github.com/snes9xgit/snes9x
+IUSE=alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
+RDEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-libs/libpng:0= ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.55.tar.gz -> snes9x-1.55.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_=172f6dfac51cb05cb4cc37872ecfcc22
diff --git a/games-emulation/snes9x-1.56 b/games-emulation/snes9x-1.56
new file mode 100644
index 000000000000..9503b650bd63
--- /dev/null
+++ b/games-emulation/snes9x-1.56
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-libs/libpng:0= ) gtk? ( dev-libs/glib:2 dev-libs/libxml2 >=x11-libs/gtk+-3.0:3 x11-libs/libXrandr x11-misc/xdg-utils alsa? ( media-libs/alsa-lib ) joystick? ( media-libs/libsdl2[joystick] ) opengl? ( media-libs/libepoxy virtual/opengl ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto nls? ( dev-util/intltool ) >=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=Super Nintendo Entertainment System (SNES) emulator
+EAPI=6
+HOMEPAGE=https://github.com/snes9xgit/snes9x
+IUSE=alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio xinerama +xv
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP
+RDEPEND=sys-libs/zlib:=[minizip] x11-libs/libX11 x11-libs/libXext png? ( media-libs/libpng:0= ) gtk? ( dev-libs/glib:2 dev-libs/libxml2 >=x11-libs/gtk+-3.0:3 x11-libs/libXrandr x11-misc/xdg-utils alsa? ( media-libs/alsa-lib ) joystick? ( media-libs/libsdl2[joystick] ) opengl? ( media-libs/libepoxy virtual/opengl ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) xv? ( x11-libs/libXv ) ) xinerama? ( x11-libs/libXinerama )
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://github.com/snes9xgit/snes9x/archive/1.56.tar.gz -> snes9x-1.56.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_=2bf84a626998bc309b649f57afdfdace
diff --git a/games-emulation/snes9x/Manifest b/games-emulation/snes9x/Manifest
deleted file mode 100644
index 7e0cf5fad416..000000000000
--- a/games-emulation/snes9x/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX snes9x-1.53-cross-compile.patch 892 BLAKE2B 9fb806ad16d48d5f07f1ab84feb5f7eafa52a1157eb25675650f08c8fbab8a42318d3277efbdd45f03250df2e9187c76df43312f7ffb2f226423e757b5f6e91c SHA512 4867b9a3e3f2a65684157b26e4b0b63971d37ad5abb16125567e89bc4116482488416ca51d30f639ef63886b05431c56b75978fe073a4755c48988f5ea9eaee5
-AUX snes9x-1.55-build-system.patch 1825 BLAKE2B eb9bf6da1d9728c3bd657701d66da72caf185facbfc51030baf532f4757a8562319bf0b4daf9ac79068c63ef9d4fbb0df5681a71ea081effd826dceae6d32448 SHA512 afbd2b70eff128f89d231b7e623775746ad52d29a3f9b9a8dbbb38aff3f5ca7dbef1f938535c69ff9578a6467a25b441215dfab275dd22f2fbd5b22ebfa19731
-AUX snes9x-1.56-build-system.patch 1633 BLAKE2B 4a0ae3a90a15e29aea8d937f874aed9aa8b29c25eb03a90c9a0bf2b50f8c6271fcc43c7d61c2898e5d99128c0ab663d31de0e3498a5e16ba865d9c5572f12e6e SHA512 3ddc7272dab74ba3125409dbbf427160d08330cfc84c7f3393fbb68884f6129849efe042943899fbf3dca65ac326e15579722e757c3e30ebd4b452b784f1bf59
-DIST snes9x-1.55.tar.gz 2252841 BLAKE2B 52b2e3d5539d95df63ef6f90c974895bc3a3dbe1e89b3a9513a8504eab308d4827f116ebc13fd89ac9c01f7394067eeddf7fd6f640fd071ee8558a6a79f2b56c SHA512 61d1d6f9c1fc4fbf6253ac7a7d214c771563d7d60238197b2f1525a58f8f9011446f400767d39ec464c69d80574a7dcd78557c8f47605df992af28cb107c0f6e
-DIST snes9x-1.56.tar.gz 2876904 BLAKE2B b58dd5c31627cbb374183adb5fe0328739bbebda8c6907ab7f9153085c45d612e51c91ad3223cc10694c9c36a00f69c303c5865d3b022f2769353884056a91b2 SHA512 b8c9438a451ed9a52a66dc04e2bea841aaa9403a2fd266e7042555f93a159ced76061233220eb6fac0f106cea08835c13ef008b2432f6d658689e0fa8ee563e6
-EBUILD snes9x-1.55.ebuild 2628 BLAKE2B 48b8a8c0e9388c0f11e3ffa5d919c0bb731ebb33a7f456012c7d508aca5096de7f919d168d5f2eac04a5b9190c9f8bba568ce1a4fd041abcb0f2c4b5f0b36a35 SHA512 e3f14efadcd4915991a97d90e26dccf159ebc47e25b9070c358670e1231a1fe831977042c08d7bc80ca9b84163a5fb0a560936f36a11dbf54c7ba45c34bc57eb
-EBUILD snes9x-1.56.ebuild 2789 BLAKE2B 23180ff3ded88ad924eff4e9bebf5745c6e479e91552738b0afb5389d8dadc2bb22edd814d33f9d3fb01eeac2bf344d85dc159812b982b2e1b93e64c60efd991 SHA512 e121f01eba1b46e3b22cf5f2cf8878863a279aa4516ac71a46a30a5380f6fb75ad7979ac96a848f4e399191ac4ebdbed7844d4ee2c509c0baa8b359a1c72b017
-MISC metadata.xml 560 BLAKE2B ed9f05b3f484347825048ae3d45e9a880e5b7405b229b7e15f350dbc43bfec51691c21e558ae87f630ed392e19ddfa5eaf3d9d15ddb551476d13d9fbf224f97b SHA512 3922d16510b8818739e582c8faf84287dc265f810df5957dc923efab912e20f95b7fb9fc84023d481b44ce6c653f2bc00e83d6a150d9294feeb60dc8c3a2eeca
diff --git a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch b/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
deleted file mode 100644
index 7a0fe8a8bde8..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.53-cross-compile.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -4,7 +4,7 @@ AC_REVISION([$Revision: 1.1 $])
- 
- AC_CONFIG_SRCDIR([unix.cpp])
- 
--AC_CANONICAL_TARGET
-+AC_CANONICAL_HOST
- 
- AC_PROG_CC
- AC_PROG_CXX
-@@ -38,7 +38,7 @@ AC_DEFUN([AC_S9X_COMPILER_FLAG],
- 				return (argc);
- 			}
- 		],
--		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"])
-+		[snes9x_cv_option_$2="yes"], [snes9x_cv_option_$2="no"], [snes9x_cv_option_$2="yes"])
- 	])
- 
- 	CXXFLAGS="[$]OLD_CXXFLAGS"
-@@ -94,7 +94,7 @@ AC_MSG_CHECKING([whether the OS is Linux])
- 
- AC_CACHE_VAL([snes9x_cv_linux_os],
- [
--	case "$target" in
-+	case "$host" in
- 		*-*-linux*)
- 			snes9x_cv_linux_os="yes"
- 			;;
-@@ -332,7 +332,7 @@ AC_DEFUN([AC_S9X_CHECK_SAR],
- 			return (i < 0 ? 0 : 1);
- 		}
- 	],
--	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"])
-+	[snes9x_sar_$1="yes"], [snes9x_sar_$1="no"], [snes9x_sar_$1=$GCC])
- 
- 	CXXFLAGS="[$]OLD_CXXFLAGS"
- 
diff --git a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch b/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
deleted file mode 100644
index 30811ef421e0..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.55-build-system.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- a/gtk/configure.ac
-+++ b/gtk/configure.ac
-@@ -33,7 +33,7 @@
- 
- AM_GLIB_GNU_GETTEXT
- 
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
-+snes9xlocaledir='$(localedir)'
- AC_SUBST(snes9xlocaledir)
- 
- AC_ARG_WITH(debug,
---- a/unix/configure.ac
-+++ b/unix/configure.ac
-@@ -56,49 +56,6 @@
- # *** Execution begins here ***
- # *****************************
- 
--# Remove -g and -O2 flags manually.
--
--if test "x$CFLAGS" != "x"; then
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--if test "x$CXXFLAGS" != "x"; then
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--# Test what compiler flags we should use.
--
--AC_ARG_ENABLE([debug],
--	[AS_HELP_STRING([--enable-debug],
--		[leave debug information in the final binary (default: no)])],
--	[], [enable_debug="no"])
--
--if test "x$enable_debug" = "xyes"; then
--	AC_S9X_COMPILER_FLAG([-g],  [g])
--	AC_S9X_COMPILER_FLAG([-O0], [o0])
--else
--	AC_S9X_COMPILER_FLAG([-O3], [o3], [
--		AC_S9X_COMPILER_FLAG([-O2], [o2], [
--			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
--	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
--fi
--
--AC_ARG_ENABLE([mtune],
--	[AS_HELP_STRING([--enable-mtune],
--		[use the specified value for the -mtune/-mcpu flag (default: no)])],
--	[], [enable_mtune="no"])
--
--if test "x$enable_mtune" != "xno"; then
--	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
--	[
--		AC_MSG_WARN([-mtune failed, trying -mcpu...])
--		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
--			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
--	])
--fi
--
- AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
- AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
- AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])
diff --git a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch b/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
deleted file mode 100644
index d2ee182cb7cd..000000000000
--- a/games-emulation/snes9x/files/snes9x-1.56-build-system.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- snes9x-1.56/gtk/configure.ac
-+++ snes9x-1.56/gtk/configure.ac
-@@ -33,8 +33,8 @@
- 
- AM_GLIB_GNU_GETTEXT
- 
--snes9xlocaledir='${prefix}/${DATADIRNAME}/locale'
--snes9xdatadir='${prefix}/${DATADIRNAME}/snes9x'
-+snes9xlocaledir='$(localedir)'
-+snes9xdatadir='$(datadir)/snes9x'
- 
- AC_SUBST(snes9xlocaledir)
- AC_SUBST(snes9xdatadir)
---- snes9x-1.56/unix/configure.ac
-+++ snes9x-1.56/unix/configure.ac
-@@ -56,37 +56,6 @@
- # *** Execution begins here ***
- # *****************************
- 
--# Test what compiler flags we should use.
--
--AC_ARG_ENABLE([debug],
--	[AS_HELP_STRING([--enable-debug],
--		[leave debug information in the final binary (default: no)])],
--	[], [enable_debug="no"])
--
--if test "x$enable_debug" = "xyes"; then
--	AC_S9X_COMPILER_FLAG([-g],  [g])
--	AC_S9X_COMPILER_FLAG([-O0], [o0])
--else
--	AC_S9X_COMPILER_FLAG([-O3], [o3], [
--		AC_S9X_COMPILER_FLAG([-O2], [o2], [
--			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
--	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
--fi
--
--AC_ARG_ENABLE([mtune],
--	[AS_HELP_STRING([--enable-mtune],
--		[use the specified value for the -mtune/-mcpu flag (default: no)])],
--	[], [enable_mtune="no"])
--
--if test "x$enable_mtune" != "xno"; then
--	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
--	[
--		AC_MSG_WARN([-mtune failed, trying -mcpu...])
--		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
--			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
--	])
--fi
--
- AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
- AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
- AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])
diff --git a/games-emulation/snes9x/metadata.xml b/games-emulation/snes9x/metadata.xml
deleted file mode 100644
index 197a5fc2e9d4..000000000000
--- a/games-emulation/snes9x/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="netplay">Enable playing ROMs over the network (not recommended)</flag>
-		<flag name="xrandr">Enable support for the X xrandr extension</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">snes9x-gtk</remote-id>
-		<remote-id type="github">snes9xgit/snes9x</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/snes9x/snes9x-1.55.ebuild b/games-emulation/snes9x/snes9x-1.55.ebuild
deleted file mode 100644
index 639a39ffc5c6..000000000000
--- a/games-emulation/snes9x/snes9x-1.55.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic gnome2-utils xdg-utils
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x"
-SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio +xv +xrandr"
-RESTRICT="bindist"
-
-RDEPEND="
-	sys-libs/zlib:=[minizip]
-	x11-libs/libX11
-	x11-libs/libXext
-	png? ( media-libs/libpng:0= )
-	gtk? (
-		>=x11-libs/gtk+-2.10:2
-		x11-misc/xdg-utils
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		joystick? ( >=media-libs/libsdl-1.2.12[joystick] )
-		opengl? ( virtual/opengl )
-		xv? ( x11-libs/libXv )
-		xrandr? ( x11-libs/libXrandr )
-		alsa? ( media-libs/alsa-lib )
-		pulseaudio? ( media-sound/pulseaudio )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.55-build-system.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	rm -r unzip || die
-	default
-	cd unix || die
-	eautoreconf
-	if use gtk; then
-		cd ../gtk || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-
-	# build breaks when zlib/zip support is disabled
-	econf \
-		--enable-gzip \
-		--enable-zip \
-		--with-system-zip \
-		$(use_enable joystick gamepad) \
-		$(use_enable debug debugger) \
-		$(use_enable netplay) \
-		$(use_enable png screenshot)
-
-	if use gtk; then
-		cd ../gtk || die
-		econf \
-			--with-zlib \
-			--with-system-zip \
-			$(use_enable nls) \
-			$(use_with opengl) \
-			$(use_with joystick) \
-			$(use_with xv) \
-			$(use_with xrandr) \
-			$(use_with netplay) \
-			$(use_with alsa) \
-			$(use_with oss) \
-			$(use_with pulseaudio) \
-			$(use_with portaudio) \
-			$(use_with png screenshot)
-	fi
-}
-
-src_compile() {
-	emake
-	use gtk && emake -C ../gtk
-}
-
-src_install() {
-	dobin ${PN}
-
-	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
-
-	if use gtk; then
-		emake -C ../gtk DESTDIR="${D}" install
-		dodoc ../gtk/{AUTHORS,doc/README}
-	fi
-
-	docinto html
-	dodoc {.,..}/docs/*.html
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/games-emulation/snes9x/snes9x-1.56.ebuild b/games-emulation/snes9x/snes9x-1.56.ebuild
deleted file mode 100644
index 652a1c859215..000000000000
--- a/games-emulation/snes9x/snes9x-1.56.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic gnome2-utils xdg-utils
-
-DESCRIPTION="Super Nintendo Entertainment System (SNES) emulator"
-HOMEPAGE="https://github.com/snes9xgit/snes9x"
-SRC_URI="https://github.com/snes9xgit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Snes9x GPL-2 GPL-2+ LGPL-2.1 LGPL-2.1+ ISC MIT ZLIB Info-ZIP"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="alsa debug gtk joystick multilib netplay nls opengl oss png pulseaudio portaudio xinerama +xv"
-RESTRICT="bindist"
-
-RDEPEND="
-	sys-libs/zlib:=[minizip]
-	x11-libs/libX11
-	x11-libs/libXext
-	png? ( media-libs/libpng:0= )
-	gtk? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		>=x11-libs/gtk+-3.0:3
-		x11-libs/libXrandr
-		x11-misc/xdg-utils
-		alsa? ( media-libs/alsa-lib )
-		joystick? ( media-libs/libsdl2[joystick] )
-		opengl? (
-			media-libs/libepoxy
-			virtual/opengl
-		)
-		portaudio? ( >=media-libs/portaudio-19_pre )
-		pulseaudio? ( media-sound/pulseaudio )
-		xv? ( x11-libs/libXv )
-	)
-	xinerama? ( x11-libs/libXinerama )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	nls? ( dev-util/intltool )"
-
-S="${WORKDIR}/${P}/unix"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.53-cross-compile.patch
-	"${FILESDIR}"/${PN}-1.56-build-system.patch
-)
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-	rm -r unzip || die
-	default
-	cd unix || die
-	eautoreconf
-	if use gtk; then
-		cd ../gtk || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-
-	# build breaks when zlib/zip support is disabled
-	local myeconfargs=(
-		--enable-gzip
-		--enable-zip
-		--with-system-zip
-		$(use_enable joystick gamepad)
-		$(use_enable debug debugger)
-		$(use_enable netplay)
-		$(use_enable png screenshot)
-		$(use_enable xinerama)
-	)
-	econf "${myeconfargs[@]}"
-
-	if use gtk; then
-		cd ../gtk || die
-		myeconfargs=(
-			--with-gtk3
-			--with-zlib
-			--with-system-zip
-			--without-gtk2
-			$(use_enable nls)
-			$(use_with opengl)
-			$(use_with joystick)
-			$(use_with xv)
-			$(use_with netplay)
-			$(use_with alsa)
-			$(use_with oss)
-			$(use_with pulseaudio)
-			$(use_with portaudio)
-			$(use_with png screenshot)
-		)
-		econf "${myeconfargs[@]}"
-	fi
-}
-
-src_compile() {
-	emake
-	use gtk && emake -C ../gtk
-}
-
-src_install() {
-	dobin ${PN}
-
-	dodoc ../docs/{snes9x.conf.default,{changes,control-inputs,controls,snapshots}.txt}
-
-	if use gtk; then
-		emake -C ../gtk DESTDIR="${D}" install
-		dodoc ../gtk/{AUTHORS,doc/README}
-	fi
-
-	docinto html
-	dodoc {.,..}/docs/*.html
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use gtk ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/games-emulation/stella-4.7.2-r1 b/games-emulation/stella-4.7.2-r1
new file mode 100644
index 000000000000..186938b29534
--- /dev/null
+++ b/games-emulation/stella-4.7.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0= sys-libs/zlib >=sys-apps/sed-4
+DESCRIPTION=Stella Atari 2600 VCS Emulator
+EAPI=6
+HOMEPAGE=http://stella.sourceforge.net/
+IUSE=joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ BSD
+RDEPEND=media-libs/libsdl2[joystick?,opengl,video] media-libs/libpng:0= sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/stella/stella-4.7.2-src.tar.xz
+_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_=989c694d9b49512c87b8e0e42802933a
diff --git a/games-emulation/stella/Manifest b/games-emulation/stella/Manifest
deleted file mode 100644
index e504b14973d3..000000000000
--- a/games-emulation/stella/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST stella-4.7.2-src.tar.xz 1715332 BLAKE2B 7b397a4e662f8db247a67ddedb314c9b11ee4e99d55768b1cd8e2587b452fab9c5d45c840bf1577833712a2c96d42985d39437d1fac16e93c35762e015ddf445 SHA512 dcfaba9b554ab08c9ba79c8e95551bc688fae4ab0ab368df11c05f3dc7c9431d32068d5dd658ec4d1aa8cb826c7205fc4f301145a149d32369833409992455e2
-EBUILD stella-4.7.2-r1.ebuild 1327 BLAKE2B 5932b462fe8a66386fe6dcd5d1d91b46c584b943b3081e47bc0e33d34e409773cbb63034fbc55609c19649d760050833062fc7813f109677423e3b7775817baa SHA512 cc81a37cc9362b1c2e07fd4f7e6216523a45659c6395da0627089e6a5a17a47eb71432a718e32aa2911fa3f4279c2b15b948f49d742ce3776942e02930cc27cd
-MISC metadata.xml 329 BLAKE2B 3ee498d6ed1bda6ccdd1e6e6a7eae732766c005ae6bf4c02b09f8f5de417d9f4c20ae925a2d7d148204f0c43a4c4ef1310cd6d925dee4beb2ede0c74ae34b636 SHA512 80e6880e6edea2eab64504d6cdf4496f94f9bfb6a4ea63da347b9fb05ca3fa999d646406e22563799d8ba40c1d3d095094ea8d86a500bb490ce2034c3ff38182
diff --git a/games-emulation/stella/metadata.xml b/games-emulation/stella/metadata.xml
deleted file mode 100644
index 2fd0b9ad7a0a..000000000000
--- a/games-emulation/stella/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">stella</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/stella/stella-4.7.2-r1.ebuild b/games-emulation/stella/stella-4.7.2-r1.ebuild
deleted file mode 100644
index 1412860717cd..000000000000
--- a/games-emulation/stella/stella-4.7.2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Stella Atari 2600 VCS Emulator"
-HOMEPAGE="http://stella.sourceforge.net/"
-SRC_URI="mirror://sourceforge/stella/${P}-src.tar.xz"
-
-LICENSE="GPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick"
-
-RDEPEND="
-	media-libs/libsdl2[joystick?,opengl,video]
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/INSTALL/s/-s //' \
-		-e '/STRIP/d' \
-		-e "/icons/d" \
-		-e '/INSTALL.*DOCDIR/d' \
-		-e '/INSTALL.*\/applications/d' \
-		-e '/CXXFLAGS+=/s/-fomit-frame-pointer//' \
-		Makefile || die
-}
-
-src_configure() {
-	# not an autoconf script
-	./configure \
-		--prefix="/usr" \
-		--bindir="/usr/bin" \
-		--docdir="/usr/share/doc/${PF}" \
-		--datadir="/usr/share" \
-		$(use_enable joystick) \
-		|| die
-}
-
-src_install() {
-	local i
-
-	DOCS="Announce.txt Changes.txt Copyright.txt README-SDL.txt Readme.txt Todo.txt" \
-		default
-
-	for i in 16 22 24 32 48 64 128 ; do
-		newicon -s ${i} src/common/stella-${i}x${i}.png stella.png
-	done
-	domenu src/unix/stella.desktop
-	HTML_DOCS="docs/*" einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-emulation/vbam-2.0.1-r1 b/games-emulation/vbam-2.0.1-r1
new file mode 100644
index 000000000000..478cc21d3d48
--- /dev/null
+++ b/games-emulation/vbam-2.0.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] ) app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
+EAPI=6
+HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
+IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
+SLOT=0
+SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.0.1.tar.gz -> vbam-2.0.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce84f2772dd535b7055af94c15669886
diff --git a/games-emulation/vbam-2.0.2 b/games-emulation/vbam-2.0.2
new file mode 100644
index 000000000000..747f721daca5
--- /dev/null
+++ b/games-emulation/vbam-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] ) app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
+EAPI=6
+HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
+IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
+SLOT=0
+SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.0.2.tar.gz -> vbam-2.0.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be0801b987eefd0652738e3267e518ac
diff --git a/games-emulation/vbam-9999 b/games-emulation/vbam-9999
new file mode 100644
index 000000000000..9679f8408566
--- /dev/null
+++ b/games-emulation/vbam-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] ) app-arch/zip wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
+EAPI=6
+HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
+IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib:= virtual/glu virtual/opengl ffmpeg? ( media-video/ffmpeg:= ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0-gtk3[X,opengl] )
+REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be0801b987eefd0652738e3267e518ac
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
deleted file mode 100644
index b1f7690180f9..000000000000
--- a/games-emulation/vbam/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX vbam-2.0.1-changelog-update.patch 3547 BLAKE2B cd9c3aaab79e4342d7bdbc903331ef0d7fd54b63422715e8d0dfe27cbbfcc729804ec018beb434faa9b89ca5bce417f382debfc74b111a5dae4e8974e2cec38f SHA512 792ad5848a373a0a5040132417e7a9eb4cccf3155e31beda61b6236edc80ce74018ad8d7bd67829c981b60a8940904629c64b3d392ca25d0bb58461d64e228e3
-AUX vbam-2.0.1-read-version-from-changelog.patch 2701 BLAKE2B cf9c826bc75fb956becb99decadc36e41a1944b64095729826e732341c36aef1df9ef73b424501e9d0dcb9e8146d50c0b91641237b2b3c83e13d2bb2ab375311 SHA512 2a1793c8c4f0dff020337eccc9ff94c357b8f1ce2dde8aab612c4a06b5adbfbf3261b91643bfdab958ddf77f2e5f751997840cdcd89dd4d77744de8caf1f4285
-DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752 SHA512 d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
-DIST vbam-2.0.2.tar.gz 2959204 BLAKE2B 79b288e59a843d2065eac63e74984bf134d9f5dadbc687da245030ad16b138125baab0fe1fb19acac9c117e30b95e57f1880b43817f75361600fb62efd1d5272 SHA512 9aafb8ef307fbbfbc5ae6dc35bc3042934e25a30069a71949e4c8e777fd862d94ec60c189823f4acdea4cb1338098fa85a55e090fa6023c07368cbb7638dd910
-EBUILD vbam-2.0.1-r1.ebuild 2243 BLAKE2B b76bb006b86d23077c09481277340c18dd06275cd8ceb0ae374d0fa4075cdce036950013787f74babd8730539faca14afd83e0878503a9901f2552d473df3387 SHA512 c49c9d5c71cef41b194a5ed229c2ec6405b2268a83e86ff654e183e598c6170f74628a1f187bc89faf06a258738f7109df4a956718a9e830caea8648cc86299c
-EBUILD vbam-2.0.2.ebuild 2133 BLAKE2B 7cb6802db60dfb7e6686d6daa6c52d9bfa477ffd78b77b78a8c3bd955a6563950eab13ba762d99c4f7a1f466cfe224927c884fceb5144afd6a44e7c7edf8e269 SHA512 2026cbe925ea3159a82b47c1be373ef37e5236661fe15bd1f4d191073da3fab04e23cf7fac5d6540f03f3b29066119787c5d95270baad23ab9b260087c288e6c
-EBUILD vbam-9999.ebuild 2133 BLAKE2B 7cb6802db60dfb7e6686d6daa6c52d9bfa477ffd78b77b78a8c3bd955a6563950eab13ba762d99c4f7a1f466cfe224927c884fceb5144afd6a44e7c7edf8e269 SHA512 2026cbe925ea3159a82b47c1be373ef37e5236661fe15bd1f4d191073da3fab04e23cf7fac5d6540f03f3b29066119787c5d95270baad23ab9b260087c288e6c
-MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
deleted file mode 100644
index 6d4f87f2d772..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 30b6ecf1a5c0eac73aaf3dabd98e41c908daa94a Mon Sep 17 00:00:00 2001
-From: Zach Bacon <zachbacon@budgiemedia.rocks>
-Date: Thu, 12 Oct 2017 00:49:05 +0000
-Subject: [PATCH] Add a changelog
-
-Gonna try and keep this up to date as often as possible.
----
- CHANGELOG.md | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 81 insertions(+)
- create mode 100644 CHANGELOG.md
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-new file mode 100644
-index 00000000..c24ac560
---- /dev/null
-+++ b/CHANGELOG.md
-@@ -0,0 +1,81 @@
-+# Changelog
-+All notable changes to this project will be documented in this file.
-+
-+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-+
-+## [Unreleased]
-+
-+## [2.0.1] - 10/11/2017
-+### Added
-+- initial installer script
-+- gitter.im badge in readme
-+- 32bit cross compiling support on 64bit linux
-+- added support for GNUInstallDirs to cmake
-+- Include new translations from transifex
-+- Added WxWidgets ABI compiler check
-+- Add linux Joystick reference to issue template
-+- Add #ubckyde <cmath> fir std::cell()
-+- 
-+
-+### Changed
-+- Fix 2xSaImmx.asm linking issue
-+- cmake: default to ENABLE_ASM_CORE=OFF
-+- libretro merging from upstream libretro fork.
-+- better fix for clipped video in GL Fullscreen.
-+- Fix flibc crash: add log message on fopen failure
-+- fix gameboy header-detection in libretro interface
-+- hotfix for potential buffer-overflow
-+- delete memory in common/array.h on destruction
-+- SDL: improve error msg for unwritable config
-+- SDL: fix deflt bat saving, improve dir checking
-+- fix portability issue with strerror_r()
-+- Windows doesn't have sterror_r
-+- wx/wxvbam: fix GetAbsolutePath 
-+- fix a memory leak due to wrong syntax
-+- regenerate translation files
-+- fix errors reported by SUSE's post build linter
-+- SUSE Lint: fix a few classes of warnings
-+- let cmake escape -D preproc. definitions
-+- fix memory viewer xrc on wx 3.1+
-+- Improving README
-+- SoundSDL: lock conditional code cleanup
-+- remove the default F11 keybinding for save state
-+- hopefully fix resize artifacts on game panel
-+- soundSDL: write silence when paused
-+- cleanup SoundSDL  #139 #130 #97 #67 #65 #46 #47
-+- document how to provice symbolic backtraces
-+- "no throttle" fixes/cleanup
-+- only use -mtune=generic on x86/amd64
-+- installdeps: use -j$(nproc) not -j8 in info
-+- use -fabi-version=2 for GCC turn off LTO
-+- installdeps: minor refactoring/cleanup
-+- improve Wx GCC ABI check
-+- minor improvements for Wx Compile tests
-+- fix wx ABI check for Win32/MinGW
-+- installdeps: fedora fixes, including m32
-+- cmake: wx and cross compiling fixes
-+- restore wx 2.7 compat, improve string processing
-+- rename CMakeScripts/ to cmake/
-+- work around gcc lto wrappers bug with gcc 7.x
-+- update README.md
-+- remove doctoc title from README.md TOC
-+- improve win32 dependencies git submodule handling
-+- use num cpu cores to parallelize LTO link with gcc
-+- fix huge app icon in Win volume settings
-+- fix deadlock in SoundSDL:deinit()
-+- added executable extension for sdl binary
-+- default LTO to off on 64bit MinGW
-+- minor code cleanup
-+- deps: dont check result of apt-get update 
-+- read version and subversion info from Git
-+- fix error and version info in shallow git clones
-+- refactor/cleanup GitTagVersion.cmake
-+
-+### Removed
-+- Cairo Renderer: it never performed well to begin with
-+
-+
-+
-+[2.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/throttle...v2.0.1
-+
diff --git a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch b/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
deleted file mode 100644
index 5dce58395343..000000000000
--- a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 46486381f0c18110002ec62108969be957b419be Mon Sep 17 00:00:00 2001
-From: Rafael Kitover <rkitover@gmail.com>
-Date: Wed, 11 Oct 2017 19:17:25 -0700
-Subject: [PATCH] read version info from CHANGELOG.md if no git
-
-If git tags are not available, set the version and revision by finding
-the first version tag in `CHANGELOG.md` of the form
-
-```
-```
-
-Where N.N.N is the number version (number of components can vary) and
-the revision (as speicified by -REV) is optional.
-
-TODO: support named revision without a version number of the form
-`[REV]`.
----
- CMakeLists.txt               |  9 +++------
- cmake/ChangeLogVersion.cmake | 25 +++++++++++++++++++++++++
- 2 files changed, 28 insertions(+), 6 deletions(-)
- create mode 100644 cmake/ChangeLogVersion.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bd09527d..4ad859b2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -112,15 +112,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-     # of files that depend on version.h
-     include(GetGitRevisionDescription)
-     get_git_head_revision(REFSPEC COMMITHASH)
--else()
--    message(WARNING "Git not found, cannot set version info")
- endif()
- 
--# no git or no tags
-+# no git or no tags, use ChangeLog
- if(NOT VERSION)
--    set(VERSION  2.0.0)
--    set(REVISION "unknown")
--    set(VERSION_RELEASE 0)
-+    include(ChangeLogVersion)
-+    changelog_version(VERSION REVISION VERSION_RELEASE)
- endif()
- 
- # generate version.h
-diff --git a/cmake/ChangeLogVersion.cmake b/cmake/ChangeLogVersion.cmake
-new file mode 100644
-index 00000000..101d23bd
---- /dev/null
-+++ b/cmake/ChangeLogVersion.cmake
-@@ -0,0 +1,25 @@
-+function(changelog_version version revision version_release)
-+    set(${version}         "" CACHE STRING "Latest ChangeLog Version"  FORCE)
-+    set(${revision}        "" CACHE STRING "Latest ChangeLog Revision" FORCE)
-+    set(${version_release} 0  CACHE STRING "Is this a versioned release without revision" FORCE)
-+
-+    file(READ CHANGELOG.md changelog_file)
-+
-+    if(NOT changelog_file)
-+        return()
-+    endif()
-+
-+    string(REGEX MATCH "\n## +\\[([0-9.]+)(-([^] ]+))?\\] +- +[0-9][0-9]?/" match_out "${changelog_file}")
-+
-+    set(changelog_version "${CMAKE_MATCH_1}")
-+
-+    set(is_version_release 0)
-+    set(changelog_revision "${CMAKE_MATCH_3}")
-+    if(NOT changelog_revision)
-+        set(is_version_release 1)
-+    endif()
-+
-+    set(${version}         "${changelog_version}"  CACHE STRING "Latest ChangeLog Version"  FORCE)
-+    set(${revision}        "${changelog_revision}" CACHE STRING "Latest ChangeLog Revision" FORCE)
-+    set(${version_release} "${is_version_release}" CACHE STRING "Is this a versioned release without revision" FORCE)
-+endfunction()
diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml
deleted file mode 100644
index 599894ffa29b..000000000000
--- a/games-emulation/vbam/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="link">Enable GBA linking functionality</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">visualboyadvance-m/visualboyadvance-m</remote-id>
-		<remote-id type="sourceforge">vbam</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/vbam/vbam-2.0.1-r1.ebuild b/games-emulation/vbam/vbam-2.0.1-r1.ebuild
deleted file mode 100644
index 7895e9c087d2..000000000000
--- a/games-emulation/vbam/vbam-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
-
-RDEPEND="
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-changelog-update.patch
-	"${FILESDIR}"/${P}-read-version-from-changelog.patch
-)
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/games-emulation/vbam/vbam-2.0.2.ebuild b/games-emulation/vbam/vbam-2.0.2.ebuild
deleted file mode 100644
index 53f480e326ee..000000000000
--- a/games-emulation/vbam/vbam-2.0.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
-
-RDEPEND="
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
deleted file mode 100644
index 53f480e326ee..000000000000
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0-gtk3"
-inherit gnome2-utils wxwidgets xdg-utils cmake-utils
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/visualboyadvance-m-${PV}"
-fi
-
-DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
-HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
-
-RDEPEND="
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl2[joystick]
-	link? ( >=media-libs/libsfml-2.0:= )
-	sys-libs/zlib:=
-	virtual/glu
-	virtual/opengl
-	ffmpeg? ( media-video/ffmpeg:= )
-	lirc? ( app-misc/lirc )
-	nls? ( virtual/libintl )
-	wxwidgets? (
-		openal? ( media-libs/openal )
-		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	)"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	wxwidgets? ( virtual/imagemagick-tools )
-	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-src_configure() {
-	use wxwidgets && setup-wxwidgets
-	local mycmakeargs=(
-		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_LINK=$(usex link)
-		-DENABLE_LIRC=$(usex lirc)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_OPENAL=$(usex openal)
-		-DENABLE_SDL=$(usex sdl)
-		-DENABLE_WX=$(usex wxwidgets)
-		-DENABLE_ASM_CORE=$(usex x86)
-		-DENABLE_ASM_SCALERS=$(usex x86)
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use sdl ; then
-		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.6
-	fi
-	use wxwidgets && doman src/debian/visualboyadvance-m.6
-}
-
-pkg_preinst() {
-	if use wxwidgets ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
-
-pkg_postrm() {
-	if use wxwidgets ; then
-		gnome2_icon_cache_update
-		xdg_desktop_database_update
-	fi
-}
diff --git a/games-emulation/vgba-4.8-r1 b/games-emulation/vgba-4.8-r1
new file mode 100644
index 000000000000..996d5c6081f1
--- /dev/null
+++ b/games-emulation/vgba-4.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Gameboy Advance (GBA) emulator for Linux
+EAPI=6
+HOMEPAGE=http://www.komkon.org/fms/VGBA/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=VGBA
+RDEPEND=x11-libs/libXext sys-libs/zlib
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://fms.komkon.org/VGBA/VGBA48-Linux-Ubuntu-bin.tgz
+_md5_=0cf8b7f16a9363ec6441ddfa9edf70b4
diff --git a/games-emulation/vgba/Manifest b/games-emulation/vgba/Manifest
deleted file mode 100644
index b0343e38d6c9..000000000000
--- a/games-emulation/vgba/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST VGBA48-Linux-Ubuntu-bin.tgz 219565 BLAKE2B 3c00fae6b807e5a63ee719581e1e8a14ad123fa819e1f05008169435b4e2f06187f544e42d6a8b94ef1eec7f914ad3c3dd1282cf8186c67e69c2ac53c2d6ac53 SHA512 02362bad94ef93c8aa34bd18d8e6588aadd7d4218ce1c6307468877ac1ddadec073bca001c3d392db2554d937bee51541a76a8b2b15ea35a3c6db5822d6191bc
-EBUILD vgba-4.8-r1.ebuild 529 BLAKE2B 0f2787b236d2f207233a2ec7ac786c7530a007af7639d0cbc9870e0404b66fe755b362de183ee43e9b085af731ab2c007af160b3624272fd3ae6d018a2ff26b5 SHA512 b62c015b2a51d6380a284031ab69d4a2f71fd0d7c25d3d61558ce3db648d8a956af0a99400bf153b71aa7e66215f843781c98757def6ca82ac66a345550a2df1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/vgba/metadata.xml b/games-emulation/vgba/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/vgba/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/vgba/vgba-4.8-r1.ebuild b/games-emulation/vgba/vgba-4.8-r1.ebuild
deleted file mode 100644
index b3a974dbfd82..000000000000
--- a/games-emulation/vgba/vgba-4.8-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Gameboy Advance (GBA) emulator for Linux"
-HOMEPAGE="http://www.komkon.org/fms/VGBA/"
-SRC_URI="http://fms.komkon.org/VGBA/VGBA${PV/.}-Linux-Ubuntu-bin.tgz"
-
-LICENSE="VGBA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libXext
-	sys-libs/zlib
-"
-
-QA_PREBUILT="/opt/bin/vgba"
-
-S="${WORKDIR}"
-
-src_install() {
-	into /opt
-	dobin vgba
-	HTML_DOCS="VGBA.html" einstalldocs
-}
diff --git a/games-emulation/yabause-0.9.14 b/games-emulation/yabause-0.9.14
new file mode 100644
index 000000000000..ac43c1b77c01
--- /dev/null
+++ b/games-emulation/yabause-0.9.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=x11-libs/libXrandr openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A Sega Saturn emulator
+EAPI=5
+HOMEPAGE=http://yabause.org/
+IUSE=openal opengl pic qt5 sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXrandr openal? ( media-libs/openal ) opengl? ( media-libs/freeglut virtual/glu virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) !qt5? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gtkglext ) sdl? ( media-libs/libsdl2[opengl?,video] ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/yabause/yabause-0.9.14.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c8934ec4dfff5846feda6ff9e72ec25
diff --git a/games-emulation/yabause/Manifest b/games-emulation/yabause/Manifest
deleted file mode 100644
index 25365c78d8f0..000000000000
--- a/games-emulation/yabause/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX yabause-0.9.14-RWX.patch 688 BLAKE2B eb74169adfdee83d68458ebf4e6e274cb94f7e1866f0d7489b9d1ba067df1110213edb80c1cfd53a00c84723249bd7d0e0529afe0d48541bbe6310b055ade06a SHA512 9da2ca641bcd0df8c05d9d5727158952ff41a8d88f685b9263661bf0fe71eca8b338c37fbcdfce252131c5fe6e4a73fa27ae51d161495f8596feeebc3f2d6d63
-AUX yabause-0.9.14-cmake.patch 1905 BLAKE2B 59a479173d555262877626dedad50ea2cde8cecc5d2127cd8e36af4fdb4ec3d438917294d10378d7442086eaad8740a02f88086516cf7e7aed29a6dc65adbf1f SHA512 13e6c72113e06a0baee7051122c1d2cc56a13ecacd383e76aad0d6784b2bcb7593d8ff27184231e9356a2aa0bff98a74d0af2860dea62075d3d2992e8a56eec2
-DIST yabause-0.9.14.tar.gz 1662762 BLAKE2B 83f3bcdf8d513a87ed596171cfc1768cdb1cd2f3329766b92ef2e94f176fbafe16ac4970c5515e5d12537b20bd6473b209b1ec6090a07d6d1521b7d2094957ed SHA512 8b14d9146cf12d104fcf43369cd949f1f47e7891a54241914f6141facf871bcc158f4e80a8c5b61fdeefe6f1b8d425ff301ba653df134a030c323c9e3ccf3a58
-EBUILD yabause-0.9.14.ebuild 1515 BLAKE2B f439c4a4b1a72e9034b68238ef19855347ea8cf4441f704b907a3e440e1fb146f6adc77ee5a0a7fe2df1886a4b786b24fb2c86cca8a7836c1b3673a98a48284b SHA512 9ac2f7400a883c732edf2e0b5204a825ae32c468a621daacfc57eb9f329e768a83ab4ba412b7517b41391b6120c48a182222b3e3eae725f6f9445dc46cbe27cb
-MISC metadata.xml 428 BLAKE2B 7707db2fbcc0dd98e8bc2721abef693d8c06625ce607beaf419e0a60c21f96bea529780f912764f90dae2a6ac66650893d3d2ea7751ac33242a5eb804ef174f0 SHA512 1695012927826ba97b0457e9d1051396a1da0b582cebf64269fe02431c019dbf4ca20a42368b825a28ba24b0a781126be82727428e3ab92adffc667bb6c575ef
diff --git a/games-emulation/yabause/files/yabause-0.9.14-RWX.patch b/games-emulation/yabause/files/yabause-0.9.14-RWX.patch
deleted file mode 100644
index 8022be90f852..000000000000
--- a/games-emulation/yabause/files/yabause-0.9.14-RWX.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x64.s
-+++ yabause-0.9.13/src/sh2_dynarec/linkage_x64.s
-@@ -747,3 +747,11 @@
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- yabause-0.9.13.orig/src/sh2_dynarec/linkage_x86.s
-+++ yabause-0.9.13/src/sh2_dynarec/linkage_x86.s
-@@ -743,3 +743,7 @@
- 	ret
- 	/* Set breakpoint here for debugging */
- 	.size	breakpoint, .-breakpoint
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-emulation/yabause/files/yabause-0.9.14-cmake.patch b/games-emulation/yabause/files/yabause-0.9.14-cmake.patch
deleted file mode 100644
index a126c010bb7a..000000000000
--- a/games-emulation/yabause/files/yabause-0.9.14-cmake.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- yabause-0.9.13.orig/l10n/CMakeLists.txt
-+++ yabause-0.9.13/l10n/CMakeLists.txt
-@@ -2,9 +2,12 @@
- 
- set(LANGS de es fr it lt nl pt pt_BR sv)
- 
-+# paths
-+set(TRANSDIR "share/yabause/yts" CACHE STRING "dir to translation files")
-+
- if (UNIX AND NOT APPLE)
-     foreach(LANG ${LANGS})
--	    install(FILES "yabause_${LANG}.yts" DESTINATION "share/yabause/yts" RENAME "${LANG}.yts")
-+	    install(FILES "yabause_${LANG}.yts" DESTINATION ${TRANSDIR} RENAME "${LANG}.yts")
-     endforeach()
- elseif (WIN32)
-     foreach(LANG ${LANGS})
---- yabause-0.9.13.orig/src/gtk/CMakeLists.txt
-+++ yabause-0.9.13/src/gtk/CMakeLists.txt
-@@ -59,7 +59,10 @@
- yab_port_success(yabause-gtk)
- configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
- 
--install(TARGETS yabause-gtk DESTINATION "bin")
-+# paths
-+set(BINDIR "bin" CACHE STRING "dir to binary")
-+
-+install(TARGETS yabause-gtk DESTINATION ${BINDIR})
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
- install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
- install(FILES "yabause.png" DESTINATION "share/pixmaps")
---- yabause-0.9.13.orig/src/qt/CMakeLists.txt
-+++ yabause-0.9.13/src/qt/CMakeLists.txt
-@@ -237,6 +237,9 @@
- yab_port_success(yabause-qt)
- configure_file(yabause.desktop.in ${YAB_PORT_NAME}.desktop)
- 
-+# paths
-+set(BINDIR "bin" CACHE STRING "dir to binary")
-+
- if (WIN32)
- 	install(TARGETS yabause-qt DESTINATION ".")
- 	if (GLUT_FOUND)
-@@ -277,7 +280,7 @@
- 		endif()
- 	endif ()
- else ()
--	install(TARGETS yabause-qt DESTINATION "bin")
-+	install(TARGETS yabause-qt DESTINATION ${BINDIR})
- 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${YAB_PORT_NAME}.desktop DESTINATION "share/applications")
- 	install(FILES "doc/yabause.1" DESTINATION "${YAB_MAN_DIR}/man1" RENAME "${YAB_PORT_NAME}.1")
- 	install(FILES "resources/icons/yabause.png" DESTINATION "share/pixmaps")
diff --git a/games-emulation/yabause/metadata.xml b/games-emulation/yabause/metadata.xml
deleted file mode 100644
index 518c975f9d26..000000000000
--- a/games-emulation/yabause/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">yabause</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-emulation/yabause/yabause-0.9.14.ebuild b/games-emulation/yabause/yabause-0.9.14.ebuild
deleted file mode 100644
index b13959e8a4a0..000000000000
--- a/games-emulation/yabause/yabause-0.9.14.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils games
-
-DESCRIPTION="A Sega Saturn emulator"
-HOMEPAGE="http://yabause.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openal opengl pic qt5 sdl"
-
-# x11-libs/libXrandr is an automagic dep
-# qt5 over qt4 and libsdl2 over libsdl is
-# also done automatically.  Send patches
-# upstream to make the choices explicit.
-RDEPEND="
-	x11-libs/libXrandr
-	openal? ( media-libs/openal )
-	opengl? (
-		media-libs/freeglut
-		virtual/glu
-		virtual/opengl
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
-	!qt5? (
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-	)
-	sdl? ( media-libs/libsdl2[opengl?,video] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-RWX.patch
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINDIR="${GAMES_BINDIR}"
-		-DTRANSDIR="${GAMES_DATADIR}"/${PN}/yts
-		-DYAB_OPTIMIZATION=""
-		$(cmake-utils_use sdl YAB_WANT_SDL)
-		$(cmake-utils_use openal YAB_WANT_OPENAL)
-		$(cmake-utils_use opengl YAB_WANT_OPENGL)
-		$(cmake-utils_use !pic SH2_DYNAREC)
-		-DYAB_PORTS=$(usex qt5 "qt" "gtk")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog GOALS README README.LIN
-	prepgamesdirs
-}
diff --git a/games-emulation/zinc-1.1-r1 b/games-emulation/zinc-1.1-r1
new file mode 100644
index 000000000000..78655aeb9db6
--- /dev/null
+++ b/games-emulation/zinc-1.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades
+EAPI=6
+HOMEPAGE=http://caesar.logiqx.com/php/emulator.php?id=zinc_linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=freedist
+RDEPEND=x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://caesar.logiqx.com/zips/emus/linux/zinc_linux/zinc11-lnx.tar.bz2
+_md5_=aa975e33c2aea099ec2a2d8a26464e5a
diff --git a/games-emulation/zinc/Manifest b/games-emulation/zinc/Manifest
deleted file mode 100644
index abb9d51aa400..000000000000
--- a/games-emulation/zinc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zinc11-lnx.tar.bz2 305824 BLAKE2B d0328f1cdb1000eed54259bdd7801244b61d8936af8b95d8658c66241bdaacd7292095b4b86465f7617807870f2485b4ed11a8c203be917afcce6279d9d5e19a SHA512 8511ebb867347adfc00448a74548b4a22a2d854a14c663a626d33738e89d2cabd3248837a26d5ed099ef4dc40a0f451df639663774926e797ddc846a7270af4b
-EBUILD zinc-1.1-r1.ebuild 720 BLAKE2B c2086d73effa22b485389aaabd826078b364a3bb6f161113c4ec1f0de4b149c34799da0f5b18a37e79aebf88fc7cc9950ea20ffc5dc321e171c8cd8f9949cc51 SHA512 19e5d82276e64769f857a85097435177bd50af5ef8da6bd90355f689ac58b2acd059922e8977d644c18b50d4065f04d93a844c3e593c249065c8f3819bf030c7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-emulation/zinc/metadata.xml b/games-emulation/zinc/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-emulation/zinc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-emulation/zinc/zinc-1.1-r1.ebuild b/games-emulation/zinc/zinc-1.1-r1.ebuild
deleted file mode 100644
index 69f75f4b58ff..000000000000
--- a/games-emulation/zinc/zinc-1.1-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An x86 binary-only emulator for Sony ZN-1, ZN-2, and Namco System 11 arcades"
-HOMEPAGE="http://caesar.logiqx.com/php/emulator.php?id=zinc_linux"
-SRC_URI="http://caesar.logiqx.com/zips/emus/linux/zinc_linux/${P//[-.]/}-lnx.tar.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-QA_PREBUILT="/opt/bin/zinc /usr/lib*/*.so"
-
-RDEPEND="
-	x11-libs/libXext[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-
-S="${WORKDIR}/zinc"
-
-src_install() {
-	exeinto /opt/bin
-	doexe zinc
-	dolib.so libcontrolznc.so librendererznc.so libsoundznc.so libs11player.so
-	einstalldocs
-}
diff --git a/games-emulation/zsnes-1.51-r6 b/games-emulation/zsnes-1.51-r6
new file mode 100644
index 000000000000..9101453551fb
--- /dev/null
+++ b/games-emulation/zsnes-1.51-r6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] ) dev-lang/nasm debug? ( 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=SNES (Super Nintendo) emulator that uses x86 assembly
+EAPI=6
+HOMEPAGE=http://www.zsnes.com/ http://ipherswipsite.com/zsnes/
+IUSE=ao custom-cflags +debug opengl pax_kernel png
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b6e0776e067ebdc897d6a959cfc26bfa
diff --git a/games-emulation/zsnes-1.51-r7 b/games-emulation/zsnes-1.51-r7
new file mode 100644
index 000000000000..fa53b55d7ea7
--- /dev/null
+++ b/games-emulation/zsnes-1.51-r7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] ) dev-lang/nasm debug? ( 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=SNES (Super Nintendo) emulator that uses x86 assembly
+EAPI=6
+HOMEPAGE=http://www.zsnes.com/ http://ipherswipsite.com/zsnes/
+IUSE=ao custom-cflags +debug opengl pax_kernel png
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video,abi_x86_32(-)] >=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)] ao? ( media-libs/libao[abi_x86_32(-)] ) debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] ) opengl? ( virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0=[abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://sourceforge/zsnes/zsnes151src.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e9c85e87d34287a1f7ee5a167affc8ab
diff --git a/games-emulation/zsnes/Manifest b/games-emulation/zsnes/Manifest
deleted file mode 100644
index c24684152b52..000000000000
--- a/games-emulation/zsnes/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX zsnes-1.51-CC-quotes.patch 740 BLAKE2B f41e66a5d2f9b54c8ed4f17fafc7afdd73e35202c083d1db375b26b89f03b991d36d279d10c7c17076f31b87d1fbad276e5c5c4ce333d2cb0f0fc7641b562845 SHA512 2347910158934a7c8b90a6739f923d7a1f94e963515dca42d45eb97e6165c5f80c30d28fd151537a7a80bba16d2462568ff1c1dac93a855990f0418aaf059776
-AUX zsnes-1.51-arch.patch 2484 BLAKE2B 036f749d832efc976a7225e47d6b7ac5e1b69af235a4196e9706fe46d447793a1e3f88e49fe34229cd71353b987b7ef123bbebf7c822ca32025c60b0c9813b57 SHA512 cc75584780e442d7fbcd4e26a9395d8e85570883f93f63b1fcb604d601acde88295861e15a6cee1d50bca836fc52efd4f5df9c84fb73fbe04fa76ec34ae3b4a1
-AUX zsnes-1.51-archopt-july-23-update.patch 12672 BLAKE2B d12246a4913d2355a7c2c26686714e61ff3791c29f93f473619225b9bd180d329c48d07123141d657faf3fe75de4e49d31b80b4577f9a646a531774abba24b4a SHA512 ac30370957721ccc4bc8681dc00110bd68dee6d65a2c3daa39df2fe45a4fa7106f9c3097b2bd9cc3dbc83e3c6344811e8719f48ba6e4896768c17357730c5719
-AUX zsnes-1.51-buffer.patch 3091 BLAKE2B a87e0b6547aeaa9f585d76a8ee080895573015fe42b0df2161268754ff01c046fd234997000ef484f66710dfd30e145d9d4db2f373a568e99deec2a8637db285 SHA512 0faf34338ff3fd85985dc16d2a58aa9e2ac1887db8d26bc210fc6965f6cc743c6c56b8b58bea72341d8ee1fed59c438db801000be5ae6bf4e26789e9bed89d25
-AUX zsnes-1.51-cross-compile.patch 934 BLAKE2B be18829454407c99aba00cb8126573f5f3e3ed8e18b2bb50811b855ba81137a16b90601c28cab9fce8d865e522cb66bb797d46a22090dd994c71aef672be99f2 SHA512 ece4a9f51314c7318babaf689fb44c1502ec5bc32808613211865daf1368cc1069b70ad4c1c4ec7b127cf707a0b093c356a8b50e5357099894656c78cf28738f
-AUX zsnes-1.51-depbuild.patch 559 BLAKE2B 38309177599aee8dafcbded6a027d66b991e85aac4c77fda0485b7777467c056386797041223a556b3cfff4b926e5a0b4004baae4264a765354a6dc2cb39ac75 SHA512 46955153ec6d2ecd5a295117c3ecc911a566de69f29f4d29decc98867d03e4a53a980a3c75d8ff19bbd1655eb291069fbbd598e002a73ebdbdc94c135f852c6e
-AUX zsnes-1.51-gcc43.patch 913 BLAKE2B 7ac3d5b8f556d577c1a1065bbe4e275742fdde0486411cc82f2dc552e8d90b82eb7dceefcdd87252633154b8249213f9dfe6724f4f0ee4eef3f8f691081355c7 SHA512 8684b9b8c01d2d9f27bf27a86e4705b3408a2891347045266040397b649eb162962e8384746930c9837ac9b21bfd626d6e241d8a6c73b46a0e348274dd8688d3
-AUX zsnes-1.51-gcc47.patch 312 BLAKE2B 927c6179fbbcd3fb161b5b18e025090acce178eae0586b7c20e48cdba091572d30c224aa80bb8a49c16d29fb9045c0207b26692651a15a53c2b4b90780c3f0c2 SHA512 aa9f111359e96118729e684562618d72231c5c475e736c53862cfe9d21b8c4db29056ec0476dcc7e50dd501a77619671fb8834be093086c7e752100c917060fc
-AUX zsnes-1.51-libao-thread.patch 667 BLAKE2B 76bc0abf16f68c9752a727817cff209daa2c0c29f31e6045441e202083f47559cb50c1a6a998c12621a298fa3901bc1d52701b176b8fd594ca116f990d3c5208 SHA512 43c28d4539df5c8ea4d3d0415c65afec3eb9215971a5ff0532b3b147b2fa3f870aadf07eb1e643e986c39d56760c0292447d467418865826ddc8c7aea64cc005
-AUX zsnes-1.51-libpng.patch 858 BLAKE2B f0ad46176cf5729d0a5be9e4307a28628e38c3d18043f0ff897dfd1cf901f0f9fb7ff80d25095fdaa9b6b1be52fe3c95f4e28b65042b4c4aad33a27125c7eb02 SHA512 2c25fb3294357a38ed8e119d4b4d60f7bd6f28724b2274a620465962e96e008f2a29273f46d4813e91b9128879218f401bb91b1a6df4c156b9ff7856b26657b0
-AUX zsnes-1.51-libpng15.patch 510 BLAKE2B 6281a27c6029ee94947b282fe5c06a67e7670d3168d5f4ae90573d12e8e6d5c467a9691cdd161158f117e341466bc7a3e99d516b95624534773027279aba4f7a SHA512 4191987cad2f8dd7d7fd1d4f8f0c60de07059f18a60cb9bb94f1e5c35c06122032de9887762ebcf2d255f24c3e90aa5b4f6a7540a8e4dbdc4ce5f7d3b3e3b532
-AUX zsnes-1.51-stack-align-v2.patch 1451 BLAKE2B b4570fa9d614d516375f1b7d2a9b3b7c9bf432f453425d2ee3035e78d8d946355551044d712528907c3a1f29b3531034b5949224398801e04270df85ada5ab00 SHA512 c3be01f36973615c55c643d1d916742f8e3a34e9957b42d1d7224a99790713025bb154e5e8c2833fd1e8d26240c6251a70c8a9f36fefe661480077b1b06871c8
-AUX zsnes-1.51-stack-align.patch 283 BLAKE2B 2ae8aaf28975f0f88ed77eafb3977706bd662215a7e286c32ce6a138993bda00c05012bc92bd106b6607d524990ccccf094e647c44a350babf3755c2dc6bf3a6 SHA512 543876c459d7448bb7707677de432dd0140320ab77752f1d9fbee4f58ea34158f1e223f46d5aa9e2858b902513a915517f27e86e51f2263f667a6baea608fb55
-DIST zsnes151src.tar.bz2 1071712 BLAKE2B e942c699bd227942563deb23b105339aa9ffd8a5623200ca142a777508b4ebaf47859170016490f53a3af2bfb15293c17a99a7658e1f3f0afd7df8cd63200b9a SHA512 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353
-EBUILD zsnes-1.51-r6.ebuild 3198 BLAKE2B cf8d5505e5eef6c3d864cddc82dfd9af86ce32780c651536547994218e55658450ce8fb507126850ff16541fa342a6a99d13bf25d550d46072f07c338f8c14e0 SHA512 4a9a696fdfbc4f31c95fe5e81fd6a27b569771d8fe36b24a088594f0a36fbf13a6c30dc562e57a7e4842569b9b4a15a459f17bd24101f685160650232ccaddb6
-EBUILD zsnes-1.51-r7.ebuild 3173 BLAKE2B c0ae44e8340ddce0d6a7cd4e5f7ce56e7b6b0b142194874f0f3f1681fbb3eb9a92fa149f2ce7edbbebe6136b5940b2601c4be4be360f574c83644a1af97ad094 SHA512 e5acf4bce2632ff23550c37e0f27c602240e1f9ac3ef0287d81b4a35f80a33557728f9d4721d62985c19e64d9b392f8283edb58c22131c0ee74e6d78bbd94aac
-MISC metadata.xml 484 BLAKE2B ad2da7cec97ca32be7ae42000312cdebd1c5dc5fce4ccc6f99fd16e69208350a5e714201e0bc258e8d4eb980357fe2517cc9b177e3ad74507b44d31ecdc8fe27 SHA512 02318871d54bfa7d9c4ba2a64f3ed7c83bf45b04a5c66dda5659d935b943a2415e6eaad124ac34e3c4235ba57f21c1189b03fec4f622c19eec1873531727a622
diff --git a/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch b/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
deleted file mode 100644
index d3230d6d70d5..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-CC-quotes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig
-+++ src/Makefile.in
-@@ -95,7 +95,7 @@
- %.o: %.cpp
- 	@CXX@ @CXXFLAGS@ -o $@ -c $<
- %.o %.h: %.psr $(PSR)
--	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
-+	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
- 
- default: main
- all: main tools--- zsnes_1_51/src/Makefile.in.orig	2009-02-25 18:02:07.000000000 +0100
-@@ -133,7 +133,7 @@
- 
- include makefile.dep
- makefile.dep: $(TOOL_D)/depbuild Makefile
--	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
-+	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
- 
- Makefile: Makefile.in config.status
- 	./config.status
diff --git a/games-emulation/zsnes/files/zsnes-1.51-arch.patch b/games-emulation/zsnes/files/zsnes-1.51-arch.patch
deleted file mode 100644
index b39549871b7f..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-arch.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/configure.in.orig
-+++ b/configure.in
-@@ -233,72 +233,8 @@
-   debug=no)
- AC_MSG_CHECKING(if you want gdb friendly executable)
- AC_MSG_RESULT($debug)
--if test x$debug = xyes; then
--dnl - It is easier to debug zsnes with no optimization enabled.
--  ZSNESEXE="zsnesd"
--  PSR_TEMP=""
--  CFLAGS="$CFLAGS -Wall -W -DDEBUG -O0 -fno-omit-frame-pointer -gstabs3"
--  NFLAGS="$NFLAGS -DDEBUG -g -F stabs -s -O0"
--else
--  ZSNESEXE="zsnes"
--  PSR_TEMP="	rm -f t_\$*.c"
--
--  CFLAGSBAK="$CFLAGS"
--  AC_ARG_VAR(force_arch, [Force architecture to optimize GCC/G++ for])
--  AC_MSG_CHECKING(which cpu architecture to optimize for)
--  if test x$force_arch != x; then
--    CFLAGS="$CFLAGS -march=$force_arch"
--    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]])],
--    [AC_MSG_RESULT(forcing $force_arch)],
--    [AC_MSG_RESULT($force_arch ??)
--    AC_MSG_WARN(incorrect force_arch parameter)
--    force_arch=""
--    CFLAGS="$CFLAGSBAK"
--    AC_MSG_CHECKING(for autodetected architecture)])
--  else
--    if test x$ARCH_INFO = x; then
--      case x$target in
--        i686-*-*)
--          AC_MSG_RESULT(guessing i686)
--          CFLAGS="$CFLAGS -march=i686"
--          ;;
--        i586-*-*)
--          AC_MSG_RESULT(guessing i586)
--          CFLAGS="$CFLAGS -march=i586"
--          ;;
--        i486-*-*)
--          AC_MSG_RESULT(guessing i486)
--          CFLAGS="$CFLAGS -march=i486"
--          ;;
--        *)
--          AC_MSG_RESULT(guessing i386)
--          CFLAGS="$CFLAGS -march=i386"
--          AC_MSG_WARN([This is not what you want, use --target or force-arch])
--          ;;
--      esac
--    else
--      AC_MSG_RESULT($ARCH_INFO)
--      CFLAGS="$CFLAGS -march=$ARCH_INFO"
--    fi
--  fi
--
--  AC_ARG_ENABLE(release,
--    [  --enable-release        Build ultra-optimized release binary (zsnes)],
--    release=$enableval,
--    release=no)
--  AC_MSG_CHECKING(if you want crazy optimizations)
--  AC_MSG_RESULT($release)
--  if test x$release = xyes; then
--    if test x$force_arch = x; then
--      AC_MSG_WARN([If you intend to distribute this binary, make sure you use force_arch and set to i586 (or whichever CPU Arch you intend for)])
--    fi
--    CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr $STRIP -D__RELEASE__"
--    NFLAGS="$NFLAGS -O99999999 -D__RELEASE__"
--  else
--    CFLAGS="$CFLAGS -O3 -fomit-frame-pointer $STRIP"
--    NFLAGS="$NFLAGS -O1"
--  fi
--fi
-+ZSNESEXE="zsnes"
-+PSR_TEMP="	rm -f t_\$*.c"
- CXXFLAGS="$CFLAGS -fno-rtti"
- 
- if test x$enable_jma != xno; then
diff --git a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch b/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
deleted file mode 100644
index b3e466036f22..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-archopt-july-23-update.patch
+++ /dev/null
@@ -1,502 +0,0 @@
---- a/tools/archopt.c.old
-+++ b/tools/archopt.c
-@@ -1,8 +1,30 @@
-+/*
-+Copyright (C) 2005-2007 Nach, grinvader ( http://www.zsnes.com )
-+
-+This program is free software; you can redistribute it and/or
-+modify it under the terms of the GNU General Public License
-+version 2 as published by the Free Software Foundation.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program; if not, write to the Free Software
-+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <ctype.h>
- 
-+#ifdef _M_X64
-+#define __x86_64__
-+#endif
-+
-+#ifdef __GNUC__
- #ifdef __x86_64__
- #define cpuid(in, a, b, c, d) asm volatile("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
- #else
-@@ -13,6 +35,22 @@
-   movl %%ebx,%%edi;\
-   popl %%ebx": "=a" (a), "=D" (b), "=c" (c), "=d" (d) : "a" (in));
- #endif
-+#else
-+char cpubuf[256];
-+int z_in, z_a, z_b, z_c, z_d;
-+void cpuid_run()
-+{
-+  _asm {
-+    mov eax,z_in
-+    cpuid
-+    mov z_a,eax
-+    mov z_b,ebx
-+    mov z_c,ecx
-+    mov z_d,edx
-+  };
-+}
-+#define cpuid(in, a, b, c, d) z_in = in; cpuid_run(); a = z_a; b = z_b; c = z_c; d = z_d;
-+#endif
- 
- char *x86_flags[] =
- {      "fpu",        "vme",        "de",         "pse",        "tsc",    "msr",      "pae",    "mce",
-@@ -62,6 +100,7 @@
- {
-   int have = 0x200000;
-   #ifndef __x86_64__
-+  #ifdef __GNUC__
-   asm volatile
-   (
-   "  pushfl;"
-@@ -76,6 +115,23 @@
-     : "=a" (have)
-     : "c" (have)
-   );
-+  #else
-+  z_c = have;
-+  _asm {
-+    mov ecx,z_c
-+    pushfd
-+    pop eax
-+    mov edx,eax
-+    xor eax,ecx
-+    push eax
-+    popfd
-+    pushfd
-+    pop eax
-+    xor eax,edx
-+    mov z_a,eax
-+  };
-+  have = z_a;
-+  #endif
-   #endif
-   return(have);
- }
-@@ -196,238 +252,268 @@
-   cpu = "native";
- #endif
- #endif
--
--  if (!cpu && *cpu_family && *vendor_id)
-+  if (!cpu)
-   {
--    if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+    if (!cpu && *cpu_family && *vendor_id)
-     {
--      if (strstr(flags, " mmx "))
-+      #ifdef __GNUC__
-+      if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-       {
--        #if __GNUC__ > 2
--        if (strstr(flags, " 3dnow "))
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-+          #if __GNUC__ > 2
-+          if (strstr(flags, " 3dnow "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
--            if (strstr(flags, " sse "))
-+            if (strstr(flags, " 3dnowext ") && (atoi(cpu_family) > 5))
-             {
--              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--              if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-+              if (strstr(flags, " sse "))
-               {
--                if (strstr(model_name, "Opteron"))
--                {
--                  cpu = "opteron";
--                }
--                else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                if (strstr(flags, " sse2 ") && strstr(flags, " lm ")) //Need two checks to protect Semprons
-                 {
--                  cpu = "athlon64";
-+                  if (strstr(model_name, "Opteron"))
-+                  {
-+                    cpu = "opteron";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) 64")) //Also athlon-fx
-+                  {
-+                    cpu = "athlon64";
-+                  }
-+                  else
-+                  {
-+                    cpu = "k8";
-+                  }
-                 }
--                else
-+                #endif
-+                if (!cpu)
-                 {
--                  cpu = "k8";
-+                  if (strstr(model_name, "Athlon(tm) 4"))
-+                  {
-+                    cpu = "athlon-4";
-+                  }
-+                  else if (strstr(model_name, "Athlon(tm) MP"))
-+                  {
-+                    cpu = "athlon-mp";
-+                  }
-+                  else
-+                  {
-+                    cpu = "athlon-xp";
-+                  }
-                 }
-               }
-+
-+              if (!cpu && (atoi(model) > 3))
-+              {
-+                cpu = "athlon-tbird";
-+              }
-               #endif
-+
-               if (!cpu)
-               {
--                if (strstr(model_name, "Athlon(tm) 4"))
--                {
--                  cpu = "athlon-4";
--                }
--                else if (strstr(model_name, "Athlon(tm) MP"))
--                {
--                  cpu = "athlon-mp";
--                }
--                else
--                {
--                  cpu = "athlon-xp";
--                }
-+                cpu = "athlon";
-               }
-             }
- 
--            if (!cpu && (atoi(model) > 3))
--            {
--              cpu = "athlon-tbird";
--            }
--            #endif
--
-+            #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-             if (!cpu)
-             {
--              cpu = "athlon";
-+              int model_num = atoi(model);
-+              if ((model_num == 9) || (model_num >= 13))
-+              {
-+                cpu = "k6-3";
-+              }
-+              else
-+              {
-+                cpu = "k6-2";
-+              }
-             }
-+            #endif
-           }
-+          #endif
- 
--          #if __GNUC__ > 3 || __GNUC_MINOR__ > 0
-           if (!cpu)
-           {
--            int model_num = atoi(model);
--            if ((model_num == 9) || (model_num >= 13))
--            {
--              cpu = "k6-3";
--            }
--            else
--            {
--              cpu = "k6-2";
--            }
-+            cpu = "k6";
-           }
--          #endif
--        }
--        #endif
--
--        if (!cpu)
--        {
--          cpu = "k6";
-         }
-       }
--    }
--    else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
--    {
--      #if __GNUC__ > 2
--      if (strstr(flags, " mmx "))
-+      else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-       {
--        if (strstr(flags, " sse "))
-+        #if __GNUC__ > 2
-+        if (strstr(flags, " mmx "))
-         {
--          if (strstr(flags, " sse2 "))
-+          if (strstr(flags, " sse "))
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--            if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-+            if (strstr(flags, " sse2 "))
-             {
--              if (strstr(flags, " lm "))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+              if (strstr(flags, " pni ") && strcmp(cpu_family, "6"))
-               {
--                cpu = "nocona";
-+                if (strstr(flags, " lm "))
-+                {
-+                  cpu = "nocona";
-+                }
-+                else
-+                {
-+                  cpu = "prescott";
-+                }
-               }
--              else
-+              #endif
-+
-+              if (!cpu)
-               {
--                cpu = "prescott";
-+                if (!strcmp(cpu_family, "6"))
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  cpu = "pentium-m";
-+                  #else
-+                  cpu = "pentium3";
-+                  #endif
-+                }
-+                else
-+                {
-+                  #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+                  if (strstr(model_name, "Mobile"))
-+                  {
-+                    cpu = "pentium4m";
-+                  }
-+                  #endif
-+
-+                  if (!cpu)
-+                  {
-+                    cpu = "pentium4";
-+                  }
-+                }
-               }
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              if (!strcmp(cpu_family, "6"))
-+              #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+              if (strstr(model_name, "Mobile"))
-               {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                cpu = "pentium-m";
--                #else
--                cpu = "pentium3";
--                #endif
-+                cpu = "pentium3m";
-               }
--              else
--              {
--                #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--                if (strstr(model_name, "Mobile"))
--                {
--                  cpu = "pentium4m";
--                }
--                #endif
-+              #endif
- 
--                if (!cpu)
--                {
--                  cpu = "pentium4";
--                }
-+              if (!cpu)
-+              {
-+                cpu = "pentium3";
-               }
-             }
-           }
-           else
-           {
--            #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
--            if (strstr(model_name, "Mobile"))
-+            if (!strcmp(cpu_family, "6"))
-             {
--              cpu = "pentium3m";
-+              cpu = "pentium2";
-             }
--            #endif
--
--            if (!cpu)
-+            else
-             {
--              cpu = "pentium3";
-+              cpu = "pentium-mmx";
-             }
-           }
-         }
--        else
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          int family = atoi(cpu_family);
-+          if (family > 5)
-+          {
-+            cpu = "pentiumpro";
-+          }
-+          else if (family == 5)
-+          {
-+            cpu = "pentium";
-+          }
-+        }
-+      }
-+      #if __GNUC__ > 2
-+      #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
-+      else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
-+      {
-+        if (strstr(flags, " 3dnow "))
-         {
--          if (!strcmp(cpu_family, "6"))
-+          if (atoi(cpu_family) > 5)
-           {
--            cpu = "pentium2";
-+            cpu = "c3";
-           }
-           else
-           {
--            cpu = "pentium-mmx";
-+            cpu = "winchip2";
-           }
-         }
-+        #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+        else if (strstr(flags, " sse "))
-+        {
-+          cpu = "c3-2";
-+        }
-+        #endif
-+
-+        if (!cpu)
-+        {
-+          cpu = "winchip-c6";
-+        }
-       }
-       #endif
-+      #endif
- 
-       if (!cpu)
-       {
-         int family = atoi(cpu_family);
-         if (family > 5)
-         {
--          cpu = "pentiumpro";
-+          cpu = "i686";
-         }
-         else if (family == 5)
-         {
--          cpu = "pentium";
-+          cpu = "i586";
-         }
--      }
--    }
--    #if __GNUC__ > 2
--    #if __GNUC__ > 3 || __GNUC_MINOR__ > 2
--    else if (!strcmp(vendor_id, "CentaurHauls") && strstr(flags, " mmx "))
--    {
--      if (strstr(flags, " 3dnow "))
--      {
--        if (atoi(cpu_family) > 5)
-+        else if (family == 4)
-         {
--          cpu = "c3";
-+          cpu = "i486";
-         }
-         else
-         {
--          cpu = "winchip2";
-+          cpu = "i386";
-         }
-       }
--      #if __GNUC__ > 3 || __GNUC_MINOR__ > 3
-+      #else //MSVC
-+      cpu = cpubuf;
-+      *cpu = 0;
-+
-+      if (strstr(flags, " sse2 "))
-+      {
-+        strcat(cpu, " /arch:SSE2");
-+      }
-       else if (strstr(flags, " sse "))
-       {
--        cpu = "c3-2";
-+        strcat(cpu, " /arch:SSE");
-       }
--      #endif
- 
--      if (!cpu)
-+      #ifdef __x86_64__
-+      if (strstr(flags, " lm ")) //64 bit
-       {
--        cpu = "winchip-c6";
-+        if (!strcmp(vendor_id, "AuthenticAMD") || strstr(model_name, "AMD"))
-+        {
-+          strcat(cpu, " /favor:AMD64");
-+        }
-+        else if (!strcmp(vendor_id, "GenuineIntel") || strstr(model_name, "Intel"))
-+        {
-+          strcat(cpu, " /favor:EM64T");
-+        }
-       }
-+      #endif
-+      #endif
-     }
--    #endif
--    #endif
--
--    if (!cpu)
-+    else
-     {
--      int family = atoi(cpu_family);
--      if (family > 5)
--      {
--        cpu = "i686";
--      }
--      else if (family == 5)
--      {
--        cpu = "i586";
--      }
--      else if (family == 4)
--      {
--        cpu = "i486";
--      }
--      else
--      {
--        cpu = "i386";
--      }
-+      puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
-+      return(1);
-     }
--    puts(cpu);
--  }
--  else
--  {
--    puts("Could not open /proc/cpuinfo, and CPUID instruction not available.");
--    return(1);
-   }
-+  puts(cpu);
- 
-   return(0);
- }
diff --git a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch b/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
deleted file mode 100644
index eb463682196d..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-buffer.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- src/initc.c.fortify
-+++ src/initc.c
-@@ -1464,8 +1464,8 @@
-   clearmem2();
- }
- 
--extern unsigned char BRRBuffer[32];
--extern unsigned char echoon0;
-+extern unsigned char BRRBuffer[];
-+extern unsigned char echoon0[];
- extern unsigned int PHdspsave;
- extern unsigned int PHdspsave2;
- unsigned char echobuf[90000];
-@@ -1479,7 +1479,7 @@
-   memset(vidmemch4, 0, 4096);
-   memset(vidmemch8, 0, 4096);
-   memset(BRRBuffer, 0, PHdspsave);
--  memset(&echoon0, 0, PHdspsave2);
-+  memset(echoon0, 0, PHdspsave2);
-   memset(echobuf, 0, 90000);
-   memset(spcBuffera, 0, 65536*4+4096);
-   memset(DSPMem, 0, 256);
-@@ -1822,7 +1822,7 @@
- 
- extern unsigned int nmiprevaddrl, nmiprevaddrh, nmirept, nmiprevline, nmistatus;
- extern unsigned char spcnumread, yesoutofmemory;
--extern unsigned char NextLineCache, sramsavedis, sndrot, regsbackup[3019];
-+extern unsigned char NextLineCache, sramsavedis, sndrot[], regsbackup[3019];
- extern unsigned int Voice0Freq, Voice1Freq, Voice2Freq, Voice3Freq;
- extern unsigned int Voice4Freq, Voice5Freq, Voice6Freq, Voice7Freq;
- extern unsigned int dspPAdj;
-@@ -2621,7 +2621,7 @@
-     }
- 
-     sramsavedis = 0;
--    memcpy(&sndrot, regsbackup, 3019);
-+    memcpy(sndrot, regsbackup, 3019);
- 
-     if (yesoutofmemory) { asm_call(outofmemfix); }
-     asm_call(GUIDoReset);
---- src/zstate.c.fortify
-+++ src/zstate.c
-@@ -99,15 +99,15 @@
-   copy_func(buffer, &cycpbl, 4);
-   copy_func(buffer, &cycpblt, 4);
-   //SNES PPU Register status
--  copy_func(buffer, &sndrot, 3019);
-+  copy_func(buffer, sndrot, 3019);
- }
- 
- static void copy_spc_data(unsigned char **buffer, void (*copy_func)(unsigned char **, void *, size_t))
- {
-   //SPC stuff, DSP stuff
-   copy_func(buffer, SPCRAM, PHspcsave);
--  copy_func(buffer, &BRRBuffer, PHdspsave);
--  copy_func(buffer, &DSPMem, sizeof(DSPMem));
-+  copy_func(buffer, BRRBuffer, PHdspsave);
-+  copy_func(buffer, DSPMem, sizeof(DSPMem));
- }
- 
- static void copy_extra_data(unsigned char **buffer, void (*copy_func)(unsigned char **, void *, size_t))
-@@ -156,7 +156,7 @@
-     /*
-     if (buffer) //Rewind stuff
-     {
--      copy_func(&buffer, &echoon0, PHdspsave2);
-+      copy_func(&buffer, echoon0, PHdspsave2);
-     }
-     */
-   }
---- src/gblvars.h.fortify
-+++ src/gblvars.h
-@@ -33,9 +33,9 @@
- extern unsigned int SfxR0, *setaramdata, ramsize, *sram, nmiprevaddrh;
- extern unsigned int tempesi, tempedi, tempedx, tempebp;
- extern unsigned int SPCMultA, PHnum2writespc7110reg, PHdspsave2;
--extern unsigned char sndrot, SPCRAM[65472], DSPMem[256], SA1Status, *SA1RAMArea;
--extern unsigned char DSP1Enable, DSP1COp, prevoamptr, BRRBuffer[32], *romdata;
--extern unsigned char curcyc, echoon0, spcnumread, NextLineCache, HIRQNextExe;
-+extern unsigned char sndrot[], SPCRAM[65472], DSPMem[256], SA1Status, *SA1RAMArea;
-+extern unsigned char DSP1Enable, DSP1COp, prevoamptr, BRRBuffer[], *romdata;
-+extern unsigned char curcyc, echoon0[], spcnumread, NextLineCache, HIRQNextExe;
- extern unsigned char vidmemch4[4096], vidmemch8[4096], vidmemch2[4096];
- 
- extern bool C4Enable, SFXEnable, SA1Enable, SPC7110Enable, SETAEnable, DSP4Enable, spcon;
diff --git a/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch b/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
deleted file mode 100644
index 5c412e3e649b..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-cross-compile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/acinclude.m4
-+++ src/acinclude.m4
-@@ -107,7 +107,7 @@ int main (int argc, char *argv[])
-   with_zlib=yes,
-   with_zlib=no,
-   [AC_MSG_RESULT(cross-compiling)
--  with_zlib=""
-+  with_zlib="cross"
-   AC_MSG_WARN(Assuming zlib is available)])
- 
- if test x$with_zlib != x; then
-@@ -116,7 +116,7 @@ fi
- if test x$with_zlib = xyes; then
-   ZLIB_VERSION=$(<conf.zlibtest)
-   ifelse([$2], , :, [$2])
--else
-+elif test x$with_zlib != xcross; then
-   ZLIB_CFLAGS=""
-   ZLIB_LIBS=""
-   ZLIB_VERSION=""
---- src/Makefile.in
-+++ src/Makefile.in
-@@ -103,8 +103,10 @@ main: makefile.dep $(Z_OBJS)
- 	@ZC@ -o @ZSNESEXE@ $(Z_OBJS) @ZCFLAGS@ @LDFLAGS@
- 	rm -f version.o
- 
-+BUILD_CXX ?= g++
-+BUILD_CXXFLAGS ?= -O2 -pipe
- $(PSR): parsegen.cpp
--	@CXX@ @CXXFLAGS@ -o $@ $< -lz
-+	$(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $< -lz
- 
- TOOLSEXE=$(TOOL_D)/archopt $(TOOL_D)/cutrtype $(TOOL_D)/extraext\
- 	$(TOOL_D)/macroll $(TOOL_D)/minwhite $(TOOL_D)/nreplace\
diff --git a/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch b/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
deleted file mode 100644
index 2dbb5f558a46..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-depbuild.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/tools/depbuild.cpp.orig
-+++ src/tools/depbuild.cpp
-@@ -130,7 +130,20 @@
- void dependency_calculate_asm(const char *filename)
- {
-   string command = nasm + " " + nflags + " -M " + filename;
--  system(command.c_str());
-+  FILE *fp = popen(command.c_str(), "r");
-+  if (fp)
-+  {
-+    char line[256];
-+    while (fgets(line, sizeof(line), fp)) //Process all lines of output
-+    {
-+      cout << line;
-+    }
-+    pclose(fp);
-+  }
-+  else
-+  {
-+    cerr << "Failed on: " << filename << "\n";
-+  }
- }
- 
- void dependency_calculate_psr(const char *filename)
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
deleted file mode 100644
index 4650bc12a7d1..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc43.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/parsegen.cpp
-+++ src/parsegen.cpp
-@@ -31,6 +31,7 @@
- #include <sstream>
- #include <set>
- #include <stack>
-+#include <cstring>
- using namespace std;
- 
- #include <errno.h>
-@@ -1828,7 +1829,7 @@
-   }
- }
- 
--int main(size_t argc, const char **argv)
-+int main(int argc, const char **argv)
- {
-   const char *cheader_file = 0;
-   bool compile = false;
---- src/tools/depbuild.cpp
-+++ src/tools/depbuild.cpp
-@@ -24,6 +24,7 @@
- #include <iostream>
- #include <string>
- #include <cstdio>
-+#include <cstdlib>
- using namespace std;
- 
- #include "fileutil.h"
-@@ -183,7 +184,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   if (argc < 5)
-   {
---- src/tools/strutil.h
-+++ src/tools/strutil.h
-@@ -25,6 +25,7 @@
- #include <string>
- #include <vector>
- #include <cctype>
-+#include <cstring>
- 
- struct ci_char_traits : public std::char_traits<char>
- {
diff --git a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch b/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
deleted file mode 100644
index b3250fee679b..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-gcc47.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix compile with gcc47
-Bug #419635
-https://bugs.gentoo.org/show_bug.cgi?id=419635
-Submitted by Nikos Chantziaras
-
---- src/tools/depbuild.cpp
-+++ src/tools/depbuild.cpp
-@@ -25,6 +25,7 @@
- #include <string>
- #include <cstdio>
- #include <cstdlib>
-+#include <unistd.h>
- using namespace std;
- 
- #include "fileutil.h"
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch b/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
deleted file mode 100644
index 1ae0a1467b3e..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-libao-thread.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/linux/audio.c.old   2007-01-09 20:19:12.000000000 -0500 
-+++ b/linux/audio.c   2007-12-30 20:33:07.000000000 -0500 
-@@ -177,11 +177,7 @@ 
-   }
-   else
-   {
--    if (pthread_create(&audio_thread, 0, SoundThread_ao, 0))
--    {
--      puts("pthread_create() failed.");
--    }
--    else if (pthread_mutex_init(&audio_mutex, 0))
-+    if (pthread_mutex_init(&audio_mutex, 0))
-     {
-       puts("pthread_mutex_init() failed.");
-     }
-@@ -189,6 +185,10 @@
-     {
-       puts("pthread_cond_init() failed.");
-     }
-+    else if (pthread_create(&audio_thread, 0, SoundThread_ao, 0))
-+    {
-+      puts("pthread_create() failed.");
-+    }
-     InitSampleControl();
-   }
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
deleted file mode 100644
index fd974e799e30..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-libpng.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -163,21 +163,21 @@
-   libpng_prefix="")
- 
- min_libpng_version=ifelse([$1], ,1.2.0,$1)
--tempLIBS="$LIBS"
--tempCFLAGS="$CFLAGS"
--if test x$libpng_prefix != x ; then
--  LIBPNG_LIBS="-L$libpng_prefix"
--  LIBPNG_CFLAGS="-I$libpng_prefix"
--fi
--LIBPNG_LIBS="$LIBPNG_LIBS -lpng -lm"
--LIBS="$LIBS $LIBPNG_LIBS"
--CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
- 
- AC_MSG_CHECKING(for libpng - version >= $min_libpng_version)
- 
- dnl <--- disable for no user choice part #2
- if test x$enable_libpng != xno; then
- dnl --->
-+  tempLIBS="$LIBS"
-+  tempCFLAGS="$CFLAGS"
-+  if test x$libpng_prefix != x ; then
-+    LIBPNG_LIBS="-L$libpng_prefix"
-+    LIBPNG_CFLAGS="-I$libpng_prefix"
-+  fi
-+  LIBPNG_LIBS="$LIBPNG_LIBS -lpng -lm"
-+  LIBS="$LIBS $LIBPNG_LIBS"
-+  CFLAGS="$CFLAGS $LIBPNG_CFLAGS"
- 
-   AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <png.h>
diff --git a/games-emulation/zsnes/files/zsnes-1.51-libpng15.patch b/games-emulation/zsnes/files/zsnes-1.51-libpng15.patch
deleted file mode 100644
index b32c30967547..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-libpng15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use existing png_set_IHDR() and stop accessing PNG structure members directly
-
---- src/zip/zpng.c
-+++ src/zip/zpng.c
-@@ -129,7 +129,6 @@
-         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
-                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
--        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
- 
-         //Allocate an array of scanline pointers
-         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch
deleted file mode 100644
index 35613a953596..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-stack-align-v2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-zsnes call C initialization code from assembler.
-
-Example backtrace:
-
-    Thread 1 "zsnes" received signal SIGSEGV, Segmentation fault.
-    => 0xf7550275 <+37>:    vmovdqa (%esp),%xmm1
-    ...
-    #13 0x5699ef82 in InitSound () at linux/audio.c:336
-    #14 0x569a25af in initwinvideo () at linux/sdllink.c:1080
-    #15 0x5699fc13 in initvideo () at linux/sdllink.c:1298
-    #16 0x56f9d5bc in regptwa ()
-    #17 0x56a34b50 in SA1tableG ()
-    #18 0x56f84788 in selcB800 ()
-    ...
-
-Call to 'initwinvideo' (first C function) looks like that:
-  NEWSYM InitPreGame   ; Executes before starting/continuing a game
-      mov byte[pressed+1],2
-      pushad
-      call Start60HZ
-  %ifdef __OPENGL__
-      call drawscreenwin
-  %endif
-      call initwinvideo
-
-Note: pushad / call does not 16-byte maintain stack alignment
-and breaks i386 ABI.
-
-We apply realignment attribute to all functions noticed by users.
-Bug: https://bugs.gentoo.org/503138
---- src/linux/sdllink.c.old
-+++ src/linux/sdllink.c
-@@ -773,11 +773,11 @@ BOOL InitInput()
- {
-   InitJoystickInput();
-   return TRUE;
- }
- 
--int startgame()
-+int __attribute__((force_align_arg_pointer)) startgame()
- {
-   static bool ranonce = false;
-   int status;
- 
-   if (!ranonce)
---- a/linux/sdllink.c
-+++ b/linux/sdllink.c
-@@ -897,7 +897,7 @@ bool OGLModeCheck()
-    return(cvidmode > 4);
- }
- 
--void initwinvideo(void)
-+void __attribute__((force_align_arg_pointer)) initwinvideo(void)
- {
-   DWORD newmode = 0;
- 
diff --git a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch b/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
deleted file mode 100644
index 5dcbf3ad9ebc..000000000000
--- a/games-emulation/zsnes/files/zsnes-1.51-stack-align.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/linux/sdllink.c.old
-+++ src/linux/sdllink.c
-@@ -773,11 +773,11 @@ BOOL InitInput()
- {
-   InitJoystickInput();
-   return TRUE;
- }
- 
--int startgame()
-+int __attribute__((force_align_arg_pointer)) startgame()
- {
-   static bool ranonce = false;
-   int status;
- 
-   if (!ranonce)
diff --git a/games-emulation/zsnes/metadata.xml b/games-emulation/zsnes/metadata.xml
deleted file mode 100644
index 8eb5529c51c4..000000000000
--- a/games-emulation/zsnes/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="debug">Enable the builtin debugger</flag>
-    <flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">zsnes</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-emulation/zsnes/zsnes-1.51-r6.ebuild b/games-emulation/zsnes/zsnes-1.51-r6.ebuild
deleted file mode 100644
index bf1934226ab9..000000000000
--- a/games-emulation/zsnes/zsnes-1.51-r6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
-HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="ao custom-cflags +debug opengl pax_kernel png"
-
-RDEPEND="
-	media-libs/libsdl[sound,video,abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
-	ao? ( media-libs/libao[abi_x86_32(-)] )
-	debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
-	opengl? ( virtual/opengl[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0=[abi_x86_32(-)] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	debug? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${PN}_${PV//./_}/src"
-
-src_prepare() {
-	default
-
-	# Fixing compilation without libpng installed
-	# Fix bug #186111
-	# Fix bug #214697
-	# Fix bug #170108
-	# Fix bug #260247
-	# Fix compability with libpng15 wrt #378735
-	# Fix buffer overwrite #257963
-	# Fix gcc47 compile #419635
-	# Fix stack alignment issue #503138
-	eapply \
-		"${FILESDIR}"/${P}-libpng.patch \
-		"${FILESDIR}"/${P}-archopt-july-23-update.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-libao-thread.patch \
-		"${FILESDIR}"/${P}-depbuild.patch \
-		"${FILESDIR}"/${P}-CC-quotes.patch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-buffer.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-stack-align.patch \
-		"${FILESDIR}"/${P}-cross-compile.patch \
-		"${FILESDIR}"/${P}-arch.patch
-
-	# The sdl detection logic uses AC_PROG_PATH instead of
-	# AC_PROG_TOOL, so force the var to get set the way we
-	# need for things to work correctly.
-	tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config
-
-	sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
-
-	# Remove hardcoded CFLAGS and LDFLAGS
-	sed -i \
-		-e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
-		-e '/^LDFLAGS=.*local/d' \
-		-e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
-		-e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \
-		-e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \
-		configure.in || die
-	sed -i \
-		-e 's/configure.in/configure.ac/' \
-		Makefile.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	export BUILD_CXX=$(tc-getBUILD_CXX)
-	export NFLAGS=-O1
-	use amd64 && multilib_toolchain_setup x86
-	use custom-cflags || strip-flags
-
-	append-cppflags -U_FORTIFY_SOURCE	#257963
-
-	econf \
-		$(use_enable ao libao) \
-		$(use_enable debug debugger) \
-		$(use_enable png libpng) \
-		$(use_enable opengl) \
-		--disable-debug \
-		--disable-cpucheck
-}
-
-src_compile() {
-	emake makefile.dep
-	emake
-}
-
-src_install() {
-	dobin zsnes
-	if use pax_kernel; then
-		pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
-	fi
-
-	newman linux/zsnes.1 zsnes.6
-
-	dodoc \
-		../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
-		../docs/readme.txt/*
-	HTML_DOCS="../docs/readme.htm/*" einstalldocs
-
-	make_desktop_entry zsnes ZSNES
-	newicon icons/48x48x32.png ${PN}.png
-}
diff --git a/games-emulation/zsnes/zsnes-1.51-r7.ebuild b/games-emulation/zsnes/zsnes-1.51-r7.ebuild
deleted file mode 100644
index 9613a4888e85..000000000000
--- a/games-emulation/zsnes/zsnes-1.51-r7.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic toolchain-funcs pax-utils
-
-DESCRIPTION="SNES (Super Nintendo) emulator that uses x86 assembly"
-HOMEPAGE="http://www.zsnes.com/ http://ipherswipsite.com/zsnes/"
-SRC_URI="mirror://sourceforge/zsnes/${PN}${PV//./}src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="ao custom-cflags +debug opengl pax_kernel png"
-
-RDEPEND="
-	media-libs/libsdl[sound,video,abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.3-r1[abi_x86_32(-)]
-	ao? ( media-libs/libao[abi_x86_32(-)] )
-	debug? ( sys-libs/ncurses:0=[abi_x86_32(-)] )
-	opengl? ( virtual/opengl[abi_x86_32(-)] )
-	png? ( media-libs/libpng:0=[abi_x86_32(-)] )
-"
-DEPEND="${RDEPEND}
-	dev-lang/nasm
-	debug? ( virtual/pkgconfig )
-"
-
-S="${WORKDIR}/${PN}_${PV//./_}/src"
-
-PATCHES=(
-	# Fixing compilation without libpng installed
-	"${FILESDIR}"/${P}-libpng.patch
-
-	# Fix bug #186111
-	# Fix bug #214697
-	# Fix bug #170108
-	# Fix bug #260247
-	"${FILESDIR}"/${P}-archopt-july-23-update.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-libao-thread.patch
-	"${FILESDIR}"/${P}-depbuild.patch
-	"${FILESDIR}"/${P}-CC-quotes.patch
-
-	# Fix compability with libpng15 wrt #378735
-	"${FILESDIR}"/${P}-libpng15.patch
-
-	# Fix buffer overwrite #257963
-	"${FILESDIR}"/${P}-buffer.patch
-	# Fix gcc47 compile #419635
-	"${FILESDIR}"/${P}-gcc47.patch
-	# Fix stack alignment issue #503138
-	"${FILESDIR}"/${P}-stack-align-v2.patch
-
-	"${FILESDIR}"/${P}-cross-compile.patch
-	"${FILESDIR}"/${P}-arch.patch
-)
-
-src_prepare() {
-	default
-
-	# The sdl detection logic uses AC_PROG_PATH instead of
-	# AC_PROG_TOOL, so force the var to get set the way we
-	# need for things to work correctly.
-	tc-is-cross-compiler && export ac_cv_path_SDL_CONFIG=${CHOST}-sdl-config
-
-	sed -i -e '67i#define OF(x) x' zip/zunzip.h || die
-
-	# Remove hardcoded CFLAGS and LDFLAGS
-	sed -i \
-		-e '/^CFLAGS=.*local/s:-pipe.*:-Wall -I.":' \
-		-e '/^LDFLAGS=.*local/d' \
-		-e '/\w*CFLAGS=.*fomit/s:-O3.*$STRIP::' \
-		-e '/lncurses/s:-lncurses:`pkg-config ncurses --libs`:' \
-		-e '/lcurses/s:-lcurses:`pkg-config ncurses --libs`:' \
-		configure.in || die
-	sed -i \
-		-e 's/configure.in/configure.ac/' \
-		Makefile.in || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	tc-export CC
-	export BUILD_CXX=$(tc-getBUILD_CXX)
-	export NFLAGS=-O1
-	use amd64 && multilib_toolchain_setup x86
-	use custom-cflags || strip-flags
-
-	append-cppflags -U_FORTIFY_SOURCE	#257963
-
-	econf \
-		$(use_enable ao libao) \
-		$(use_enable debug debugger) \
-		$(use_enable png libpng) \
-		$(use_enable opengl) \
-		--disable-debug \
-		--disable-cpucheck
-}
-
-src_compile() {
-	emake makefile.dep
-	emake
-}
-
-src_install() {
-	dobin zsnes
-	if use pax_kernel; then
-		pax-mark m "${D}""${GAMES_BINDIR}"/zsnes || die
-	fi
-
-	newman linux/zsnes.1 zsnes.6
-
-	dodoc \
-		../docs/{readme.1st,authors.txt,srcinfo.txt,stdards.txt,support.txt,thanks.txt,todo.txt,README.LINUX} \
-		../docs/readme.txt/*
-	HTML_DOCS="../docs/readme.htm/*" einstalldocs
-
-	make_desktop_entry zsnes ZSNES
-	newicon icons/48x48x32.png ${PN}.png
-}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9e9b81a2bf02..850ef79d7ae6 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/exult-9999 b/games-engines/exult-9999
new file mode 100644
index 000000000000..f1e582ee4763
--- /dev/null
+++ b/games-engines/exult-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure postinst prepare unpack
+DEPEND=>=media-libs/libpng-1.2.43-r2:0 games-misc/exult-sound media-libs/libvorbis sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) timidity? ( >=media-sound/timidity++-2 ) zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=an Ultima 7 game engine that runs on modern operating systems
+EAPI=6
+HOMEPAGE=http://exult.sourceforge.net/
+IUSE=+sdl2 timidity zlib
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libpng-1.2.43-r2:0 games-misc/exult-sound media-libs/libvorbis sdl2? ( media-libs/libsdl2[sound,video,X] ) !sdl2? ( media-libs/libsdl[sound,video,X] ) timidity? ( >=media-sound/timidity++-2 ) zlib? ( sys-libs/zlib )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=24ca73e094a07acdb61ccc22a82e58a5
diff --git a/games-engines/exult/Manifest b/games-engines/exult/Manifest
deleted file mode 100644
index 55569314e770..000000000000
--- a/games-engines/exult/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD exult-9999.ebuild 1287 BLAKE2B 6185596314e1d416197f6b9416ab9c217bbcfdbdc131e3f7d9b771ee2dc7c2c79f6ff5b0ab232def81fa78e412ec085b1f0f74b577d4cd05e6ba64e64988c6d8 SHA512 a6716dbb375f4153bf109e7e8742e93b4802213040d288726b092087e487332140c5c7a273da4d52bc452fe80e7d9b1f31b55982921fd824d4311809c224c608
-MISC metadata.xml 451 BLAKE2B 60126c876c87417af2a8f3b28e30dd3a16ec6afb9bc3119a82de8846364c056091e754f35ba7db90acd2ab29a041463e4a0aae098e527d334ae7aaa72dfb362d SHA512 5ac44e7312b3dca5e663a98d0c67e2f8ee82df786121e21c1b1fbef541b2a83197f622048d8d977e61fe4e4dda43ea6c9b61f8cd1d9b78dbf9beb90ede8e77f2
diff --git a/games-engines/exult/exult-9999.ebuild b/games-engines/exult/exult-9999.ebuild
deleted file mode 100644
index 3463a5baa5aa..000000000000
--- a/games-engines/exult/exult-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools multilib eutils git-r3
-
-DESCRIPTION="an Ultima 7 game engine that runs on modern operating systems"
-HOMEPAGE="http://exult.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/exult/exult"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+sdl2 timidity zlib"
-
-DEPEND="
-	>=media-libs/libpng-1.2.43-r2:0
-	games-misc/exult-sound
-	media-libs/libvorbis
-	sdl2? ( media-libs/libsdl2[sound,video,X] )
-	!sdl2? ( media-libs/libsdl[sound,video,X] )
-	timidity? ( >=media-sound/timidity++-2 )
-	zlib? ( sys-libs/zlib )
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/_/}
-DOCS=(
-	AUTHORS ChangeLog FAQ NEWS README README.1ST
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--x-libraries="/usr/$(get_libdir)" \
-		--disable-tools \
-		--disable-opengl \
-		--enable-mods \
-		--with-desktopdir=/usr/share/applications \
-		--with-icondir=/usr/share/pixmaps \
-		--with-sdl=$(usex sdl2 sdl2 sdl12) \
-		$(use_enable timidity timidity-midi) \
-		$(use_enable zlib zip-support)
-}
-
-pkg_postinst() {
-	elog "You *must* have the original Ultima7 The Black Gate and/or"
-	elog "The Serpent Isle installed."
-	elog "See documentation in /usr/share/doc/${PF} for information."
-}
diff --git a/games-engines/exult/metadata.xml b/games-engines/exult/metadata.xml
deleted file mode 100644
index a676c5e60d97..000000000000
--- a/games-engines/exult/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">exult</remote-id>
-		<remote-id type="github">exult/exult</remote-id>
-	</upstream>
-	<use>
-		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-engines/frobtads-1.2.3-r1 b/games-engines/frobtads-1.2.3-r1
new file mode 100644
index 000000000000..808f04dc1ca8
--- /dev/null
+++ b/games-engines/frobtads-1.2.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install test
+DEPEND=net-misc/curl sys-libs/ncurses:0
+DESCRIPTION=Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures
+EAPI=6
+HOMEPAGE=http://www.tads.org/frobtads.htm
+IUSE=debug tads2compiler tads3compiler
+KEYWORDS=~amd64 ~x86
+LICENSE=TADS2 TADS3
+RDEPEND=net-misc/curl sys-libs/ncurses:0
+RESTRICT=!tads3compiler? ( test )
+SLOT=0
+SRC_URI=http://www.tads.org/frobtads/frobtads-1.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2ebce1927e7a067e485ae98da8ad9cb0
diff --git a/games-engines/frobtads-1.2.4 b/games-engines/frobtads-1.2.4
new file mode 100644
index 000000000000..c14907b36954
--- /dev/null
+++ b/games-engines/frobtads-1.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure test
+DEPEND=net-misc/curl sys-libs/ncurses:0
+DESCRIPTION=Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures
+EAPI=6
+HOMEPAGE=http://www.tads.org/frobtads.htm
+IUSE=debug tads2compiler tads3compiler
+KEYWORDS=~amd64 ~x86
+LICENSE=TADS2 TADS3
+RDEPEND=net-misc/curl sys-libs/ncurses:0
+RESTRICT=!tads3compiler? ( test )
+SLOT=0
+SRC_URI=https://github.com/realnc/frobtads/releases/download/1.2.4/frobtads-1.2.4.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_=5620164469b2df0ec02d2709407f8810
diff --git a/games-engines/frobtads/Manifest b/games-engines/frobtads/Manifest
deleted file mode 100644
index b16691571e38..000000000000
--- a/games-engines/frobtads/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST frobtads-1.2.3.tar.gz 5227704 BLAKE2B fd481201da6dbddf3b0f5adf7c600282c9500bd65cebebf13e23b139ca1e9793091c6df50bebebed179c6f775d188c8ccbe8450d0058863c55dd322e8a92ce32 SHA512 4efb888860edda24bb5a5812967d0b863614558e9839cf0cfabc649ab0175719bf663de5e725034ba160c015d269dbe2df046cf47ad1019e668bf5b1fb564d7d
-DIST frobtads-1.2.4.tar.bz2 3801366 BLAKE2B 871a4cfd432f1a72915de0652def2f2a9a3cf1bfa20b070c2e59ced673c736584a36b3d17e7d5812ad7cd883c3e038e49f962635a5794d6c914d99651bfd0a55 SHA512 f49f58114cbd78f23fcc3835025af7874da968af825abd449e9ab83c4a90e8d70f8cfafa83780f0631ae9bd2793cce2d5dd947c13ee38ba0d06829d2803abf12
-EBUILD frobtads-1.2.3-r1.ebuild 1084 BLAKE2B 3b4ac366d3b1730473a251261f0c08f24ae8b5c3a9e70fe9f359574a409c2f8f4b62806c92f48ae26c2e5998933a64c098940c33050961ce93becc5c48495c18 SHA512 8f7b51246acedd865d9a396819545964fbcfc69f61c8381b0da2387fb8695fe9655d07097d448a74a8a3606ff3b9f32c738f829e9942ee8bdfc8b332f435c909
-EBUILD frobtads-1.2.4.ebuild 1006 BLAKE2B cda1e9f790d9dd484b026e97389a04480b22f7887581cdf68f102ba877ee6d6d31de66a4745e6e2e32167f79e733cd5b4a473a4d80b85d79985eb01c5c5b3155 SHA512 26e02d7c095cc5c5b0bfa1a0db650b9045c4ab648c6484f4f1237352693dfa15abea91e8b7014082b30245987f52de22b4e5aa29a24c272fb22b26a154bdf1ae
-MISC metadata.xml 394 BLAKE2B db39dd99a448935896847c3ce0c824a3043d65d82e7d35cad3afab2538aebffca96c532f83182bf2e28fab22fcb0d6145e6e5a383def6d956db6d0558e73f481 SHA512 591c0df18a2e4e1469e1f95dce9c74f3b66261377b88ec9dde79c56094253a5579427a2fa836fb1c2926344b95a471b7d13bda4a53f4c6a064b06c61d89e1ab3
diff --git a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild b/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
deleted file mode 100644
index 7b35a8571c33..000000000000
--- a/games-engines/frobtads/frobtads-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
-HOMEPAGE="http://www.tads.org/frobtads.htm"
-SRC_URI="http://www.tads.org/frobtads/${P}.tar.gz"
-
-LICENSE="TADS2 TADS3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tads2compiler tads3compiler"
-
-RESTRICT="!tads3compiler? ( test )"
-
-RDEPEND="net-misc/curl
-	sys-libs/ncurses:0"
-DEPEND=${RDEPEND}
-
-DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
-
-src_configure() {
-	append-cxxflags -fpermissive
-	append-libs $(curl-config --libs)
-	econf \
-		$(use_enable debug error-checking) \
-		$(use_enable debug t3debug) \
-		$(use_enable tads2compiler t2-compiler) \
-		$(use_enable tads3compiler t3-compiler)
-}
-
-src_test() {
-	emake -j1 sample
-	./frob -i plain -p samples/sample.t3 <<- END_FROB_TEST
-		save
-		testsave.sav
-		restore
-		testsave.sav
-	END_FROB_TEST
-	[[ $? -eq 0 ]] || die "Failed to run test game"
-}
-
-src_install() {
-	default
-}
diff --git a/games-engines/frobtads/frobtads-1.2.4.ebuild b/games-engines/frobtads/frobtads-1.2.4.ebuild
deleted file mode 100644
index 7f2b43c14462..000000000000
--- a/games-engines/frobtads/frobtads-1.2.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Curses-based interpreter and dev tools for TADS 2 and TADS 3 text adventures"
-HOMEPAGE="http://www.tads.org/frobtads.htm"
-SRC_URI="https://github.com/realnc/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="TADS2 TADS3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tads2compiler tads3compiler"
-
-RESTRICT="!tads3compiler? ( test )"
-
-RDEPEND="net-misc/curl
-	sys-libs/ncurses:0"
-DEPEND=${RDEPEND}
-
-DOCS=( doc/{AUTHORS,BUGS,ChangeLog.old,NEWS,README,SRC_GUIDELINES,THANKS} )
-
-src_configure() {
-	econf \
-		$(use_enable debug error-checking) \
-		$(use_enable debug t3debug) \
-		$(use_enable tads2compiler t2-compiler) \
-		$(use_enable tads3compiler t3-compiler)
-}
-
-src_test() {
-	emake -j1 sample
-	./frob -i plain -p samples/sample.t3 <<- END_FROB_TEST
-		save
-		testsave.sav
-		restore
-		testsave.sav
-	END_FROB_TEST
-	[[ $? -eq 0 ]] || die "Failed to run test game"
-}
diff --git a/games-engines/frobtads/metadata.xml b/games-engines/frobtads/metadata.xml
deleted file mode 100644
index 89569b770284..000000000000
--- a/games-engines/frobtads/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="tads2compiler">Build TADS2 compiler</flag>
-    <flag name="tads3compiler">Build TADS3 compiler</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-engines/frotz-2.43-r1 b/games-engines/frotz-2.43-r1
new file mode 100644
index 000000000000..ebf57e585b85
--- /dev/null
+++ b/games-engines/frotz-2.43-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/ncurses:0 alsa? ( oss? ( media-libs/alsa-oss ) )
+DESCRIPTION=Curses based interpreter for Z-code based text games
+EAPI=6
+HOMEPAGE=http://frotz.sourceforge.net/
+IUSE=alsa oss
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0 alsa? ( oss? ( media-libs/alsa-oss ) )
+SLOT=0
+SRC_URI=http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/frotz-2.43.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_=6ce9a0d428c78a450f31a5bac0955f34
diff --git a/games-engines/frotz/Manifest b/games-engines/frotz/Manifest
deleted file mode 100644
index fa77a80eb365..000000000000
--- a/games-engines/frotz/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX frotz-2.43-glibc2.10.patch 859 BLAKE2B 6d8994a0bc80d9bc24ed76e6016f549b7c6b9cbcf9ed081b3ba4ebedee872bf9e04a7b62a1d8995da5942f3a8c271cf67287d4d4d96b5f3998b9561ea7c6ede6 SHA512 467477b2740667b1f8356845f7ec30a8318120313dc2bbfa2bcbde2c9cde77269349b6e7076397a7c837d9a1e72aa8fe59007fd73bd0de14b6c8244514fb81d2
-AUX frotz-2.43-ldflags.patch 665 BLAKE2B 0c744231190a308761c73f847ea6842259f424cb5ae33f1cc8311e7dc77a3ac9dd85bfc7f99070980042ab83418dd2b3b5a17c4ff29527065eb9d473ded85cff SHA512 9d750679169daa67fcd6580edd5dd53f80ab490e2637d524be9525f99764b5203242a9f9e93262d9c1abcc6d62b994f7d943040931b30ab2ce1ac9a6b772e107
-DIST frotz-2.43.tar.gz 160771 BLAKE2B edee48050b247320df3d02ea4682579d4f933a5853cc9a31f56c4d12596d5e5657e79e176ed1725e72028497a843db1d0b13833ffe44e41ec7f532f0d40ccaf9 SHA512 654f2ca2d1a625df8f88b5629e09a873668cea42688acdf154636b066b94fc9d70b7f45acb33a71d234c19b59c394c63aee38d6224245b3b329210e6b4a58409
-EBUILD frotz-2.43-r1.ebuild 1075 BLAKE2B a3ff1a05881e507a648516abc200721ecedb9ab7cf87f4b6b7673fdcd0114228309274c64f67a242404c21af16bea3cd3319f3c586e4a22e7cf69ef163e6f66f SHA512 00953652ed45fe80f9332758e5399afbbb479d2ef74f1e4e50e7eddda4566e57b4aaf2d51649f792f91abc75a580b8e3ccd677a3fc9bf1af5f07f2c710ad7e16
-MISC metadata.xml 328 BLAKE2B 650d86497c2eb4a36a16c14f088d691a6a586917592b4e3192bb321bb7007f402cbfc45cb272556a78831bab46fe57bde78f6db6b459d26064856f8308a9c19a SHA512 37fcc943d9d2700b5d88e71666af1a3ebe5baf905095d864066ebe20ac7edd54bfcafacc31684ae1eeed5197096cecbfec57c01ff5be1b567af1cc21c7294d6a
diff --git a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch b/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
deleted file mode 100644
index 3f2639ec47d0..000000000000
--- a/games-engines/frotz/files/frotz-2.43-glibc2.10.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/dumb/dumb_input.c
-+++ b/src/dumb/dumb_input.c
-@@ -79,7 +79,7 @@
- /* Read one line, including the newline, into s.  Safely avoids buffer
-  * overruns (but that's kind of pointless because there are several
-  * other places where I'm not so careful).  */
--static void getline(char *s)
-+static void get_line(char *s)
- {
-   int c;
-   char *p = s;
-@@ -203,7 +203,7 @@
-       fputs(prompt, stdout);
-     else
-       dumb_show_prompt(show_cursor, (timeout ? "tTD" : ")>}")[type]);
--    getline(s);
-+    get_line(s);
-     if ((s[0] != '\\') || ((s[1] != '\0') && !islower(s[1]))) {
-       /* Is not a command line.  */
-       translate_special_chars(s);
-@@ -265,7 +265,7 @@
- 	  if (!*current_page)
- 	    break;
- 	  printf("HELP: Type <return> for more, or q <return> to stop: ");
--	  getline(s);
-+	  get_line(s);
- 	  if (!strcmp(s, "q\n"))
- 	    break;
- 	}
diff --git a/games-engines/frotz/files/frotz-2.43-ldflags.patch b/games-engines/frotz/files/frotz-2.43-ldflags.patch
deleted file mode 100644
index c8b4e35eee20..000000000000
--- a/games-engines/frotz/files/frotz-2.43-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile	2010-10-04 14:13:37.000000000 +0200
-+++ b/Makefile	2010-10-04 14:14:06.000000000 +0200
-@@ -162,7 +162,7 @@
- $(NAME): $(NAME)-curses
- 
- $(NAME)-curses:		soundcard.h  $(COMMON_TARGET) $(CURSES_TARGET)
--	$(CC) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
-+	$(CC) $(LDFLAGS) -o $(BINNAME)$(EXTENSION) $(TARGETS) $(LIB) $(CURSES) \
- 		$(SOUND_LIB)
- 
- all:	$(NAME) d$(NAME)
-@@ -170,7 +170,7 @@
- dumb:		$(NAME)-dumb
- d$(NAME):	$(NAME)-dumb
- $(NAME)-dumb:		$(COMMON_TARGET) $(DUMB_TARGET)
--	$(CC) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
-+	$(CC) $(LDFLAGS) -o d$(BINNAME)$(EXTENSION) $(COMMON_TARGET) \
- 		$(DUMB_TARGET) $(LIB)
- 
- .SUFFIXES:
diff --git a/games-engines/frotz/frotz-2.43-r1.ebuild b/games-engines/frotz/frotz-2.43-r1.ebuild
deleted file mode 100644
index 08d19d78526c..000000000000
--- a/games-engines/frotz/frotz-2.43-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Curses based interpreter for Z-code based text games"
-HOMEPAGE="http://frotz.sourceforge.net/"
-SRC_URI="http://www.ifarchive.org/if-archive/infocom/interpreters/frotz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa oss"
-
-DEPEND="sys-libs/ncurses:0
-	alsa? ( oss? ( media-libs/alsa-oss ) )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-glibc2.10.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CC /d' \
-		Makefile \
-		|| die
-}
-
-src_compile() {
-	local OPTS="CONFIG_DIR=/etc"
-	use oss && OPTS="${OPTS} SOUND_DEFS=-DOSS_SOUND SOUND_DEV=/dev/dsp"
-	emake ${OPTS} all
-}
-
-src_install () {
-	dobin {d,}frotz
-	doman doc/*.6
-	dodoc AUTHORS BUGS ChangeLog HOW_TO_PLAY README TODO \
-		doc/{frotz.conf-big,frotz.conf-small}
-}
-
-pkg_postinst() {
-	echo
-	elog "Global config file can be installed in /etc/frotz.conf"
-	elog "Sample config files are in /usr/share/doc/${PF}"
-	echo
-}
diff --git a/games-engines/frotz/metadata.xml b/games-engines/frotz/metadata.xml
deleted file mode 100644
index 051541926fbb..000000000000
--- a/games-engines/frotz/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">frotz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/gargoyle-2011.1-r1 b/games-engines/gargoyle-2011.1-r1
new file mode 100644
index 000000000000..dd374ffd9b29
--- /dev/null
+++ b/games-engines/gargoyle-2011.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2 app-arch/unzip dev-util/ftjam virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=An Interactive Fiction (IF) player supporting all major formats
+EAPI=6
+HOMEPAGE=http://ccxvii.net/gargoyle/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2 MIT Hugo Glulxe
+RDEPEND=media-fonts/libertine media-fonts/liberation-fonts media-libs/freetype:2 media-libs/libpng:0 media-libs/sdl-mixer media-libs/sdl-sound[modplug,mp3,vorbis] sys-libs/zlib virtual/jpeg:0 x11-libs/gtk+:2
+SLOT=0
+SRC_URI=https://garglk.googlecode.com/files/gargoyle-2011.1-sources.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fb8d1d3fb28ec3c71e12d0a0f95c1f4
diff --git a/games-engines/gargoyle/Manifest b/games-engines/gargoyle/Manifest
deleted file mode 100644
index 44fcb1627a6a..000000000000
--- a/games-engines/gargoyle/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gargoyle-2011.1-desktopfile.patch 1265 BLAKE2B 1fcbc1eded032ef11ef357e03c614067b18c21a268b4a3bebe4516a0ed196660292b311c9769d66853ffbbf2535808d014991bd42155919b913965223a4523dc SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e
-DIST gargoyle-2011.1-sources.zip 11291660 BLAKE2B aac47c41bd02e772c4717dfdeae8678105f72704641ea3df39105d412afe61734cc43f863b9556e38ea34287259df9f4d72ae93b3092d0372434b9f59f99483d SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f
-EBUILD gargoyle-2011.1-r1.ebuild 3017 BLAKE2B 12371e41ca78403ba1452da2a2c5dbac287912b8dbcd7afe524984b8442bb4cf5701f3073f27a64c5adadccfebfaaef9e543b883026b4eae4b185cc151eac6b7 SHA512 0daa2b0ef761c935d0e7d47fd42060ebf5db4331634bba8e1812a619d8fb31cdb0f2aec197cf7d30e1bff357ccd60888ac5107c7e9644f8ddeed9520a9b1ac9e
-MISC metadata.xml 329 BLAKE2B cc77f8750b5385687d311159b8edbf296284013812d4be5fe0076468c02758dcac19c77b5e6f38c4fbdac51f1c69b34cfd39d5d19235d18ec80076ceba98e2b3 SHA512 f6b913db889e2434a76d61526ff2cf3f719322991bb26891ac0383fcb8f11cf69cfc895a7cddd35074c2dee9a5ceac0fd8c0172542401d302ec39e9cac180b2c
diff --git a/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch b/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
deleted file mode 100644
index 6b66328da016..000000000000
--- a/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Aug 21 19:06:54 UTC 2012
-Subject: desktop file
-
-fix QA issues:
-
-# desktop-file-validate /usr/share/applications/gargoyle.desktop
-/usr/share/applications/gargoyle.desktop: error: file contains at least one line ending with a carriage return, while lines should only be separated by a line feed character. First such line is: "[Desktop Entry]"
-/usr/share/applications/gargoyle.desktop: error: (will be fatal in the future): value "gargoyle-house.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
-
---- garglk/gargoyle.desktop
-+++ garglk/gargoyle.desktop
-@@ -1,9 +1,9 @@
--[Desktop Entry]

--Version=1.0

--Type=Application

--Name=Gargoyle

--GenericName=Interactive Fiction interpreter

--Comment=Interactive Fiction multi-interpreter that supports all major IF formats

--Icon=gargoyle-house.png

--Exec=gargoyle

--Categories=Game;

-+[Desktop Entry]
-+Version=1.0
-+Type=Application
-+Name=Gargoyle
-+GenericName=Interactive Fiction interpreter
-+Comment=Interactive Fiction multi-interpreter that supports all major IF formats
-+Icon=gargoyle-house
-+Exec=gargoyle
-+Categories=Game;
diff --git a/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild b/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
deleted file mode 100644
index 82e11b237828..000000000000
--- a/games-engines/gargoyle/gargoyle-2011.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
-# interpreters are licensed under GPLv2, BSD or MIT license, except:
-#   - glulxe: custom license, see "terps/glulxle/README"
-#   - hugo: custom license, see "licenses/HUGO License.txt"
-# Since we don't compile or install any of the bundled fonts, their licenses
-# don't apply. (Fonts are installed through dependencies instead.)
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils multilib multiprocessing toolchain-funcs
-
-DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
-HOMEPAGE="http://ccxvii.net/gargoyle/"
-SRC_URI="https://garglk.googlecode.com/files/${P}-sources.zip"
-
-LICENSE="BSD GPL-2 MIT Hugo Glulxe"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-fonts/libertine
-	media-fonts/liberation-fonts
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/sdl-mixer
-	media-libs/sdl-sound[modplug,mp3,vorbis]
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-util/ftjam
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Substitute custom CFLAGS/LDFLAGS.
-	sed -i -e \
-		"/^\s*OPTIM = / {
-			s/ \(-O.*\)\? ;/ ;/
-			a LINKFLAGS = ${LDFLAGS} ;
-			a SHRLINKFLAGS = ${LDFLAGS} ;
-		}" Jamrules || die
-
-	# Don't link against libraries used indirectly through SDL_sound.
-	sed -i -e "/GARGLKLIBS/s/-lsmpeg -lvorbisfile//g" Jamrules || die
-
-	# Convert garglk.ini to UNIX format.
-	edos2unix garglk/garglk.ini
-
-	epatch "${FILESDIR}"/${P}-desktopfile.patch
-	append-cflags -std=gnu89 # build with gcc5 (bug #573378)
-	append-cxxflags -std=gnu++11 # code assumes C++11 semantics (bug #642996)
-	default
-}
-
-src_compile() {
-	# build system messes up flags and toolchain completely
-	# append flags to compiler commands to have consistent behavior
-	jam \
-		-sAR="$(tc-getAR) cru" \
-		-sCC="$(tc-getCC) ${CFLAGS}" \
-		-sCCFLAGS="" \
-		-sC++="$(tc-getCXX) ${CXXFLAGS}" \
-		-sCXX="$(tc-getCXX) ${CXXFLAGS}" \
-		-sC++FLAGS="" \
-		-sGARGLKINI="/etc/garglk.ini" \
-		-sUSESDL=yes \
-		-sBUNDLEFONTS=no \
-		-dx \
-		-j$(makeopts_jobs) || die
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	_BINDIR="/usr/libexec/${PN}" \
-	_APPDIR="/usr/libexec/${PN}" \
-	_LIBDIR="/usr/$(get_libdir)" \
-	EXEMODE=755 \
-	FILEMODE=755 \
-	jam install || die
-
-	# Install config file.
-	insinto "/etc"
-	newins garglk/garglk.ini garglk.ini
-
-	# Install application entry and icon.
-	domenu garglk/${PN}.desktop
-	doicon -s 32 garglk/${PN}-house.png
-
-	# Symlink binaries to avoid name clashes.
-	for terp in advsys agility alan2 alan3 frotz geas git glulxe hugo jacl \
-		level9 magnetic nitfol scare tadsr
-	do
-		dosym "../libexec/${PN}/${terp}" \
-			"/usr/bin/${PN}-${terp}"
-	done
-
-	# Also symlink the main binary since it resides in libexec.
-	dosym "../libexec/${PN}/${PN}" \
-		"/usr/bin/${PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/gargoyle/metadata.xml b/games-engines/gargoyle/metadata.xml
deleted file mode 100644
index 6842fdda8f83..000000000000
--- a/games-engines/gargoyle/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">garglk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/gemrb-0.8.3-r1 b/games-engines/gemrb-0.8.3-r1
new file mode 100644
index 000000000000..1b749d96c328
--- /dev/null
+++ b/games-engines/gemrb-0.8.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=media-libs/freetype media-libs/libpng:0= >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Reimplementation of the Infinity engine
+EAPI=6
+HOMEPAGE=http://gemrb.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freetype media-libs/libpng:0= >=media-libs/libsdl-1.2[video] media-libs/libvorbis media-libs/openal media-libs/sdl-mixer sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/gemrb/gemrb-0.8.3.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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec08f2856962681f8bfb6088ff2ae3b7
diff --git a/games-engines/gemrb/Manifest b/games-engines/gemrb/Manifest
deleted file mode 100644
index 0d1201c42be7..000000000000
--- a/games-engines/gemrb/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gemrb-0.8.3.tar.gz 12370971 BLAKE2B ccb35d96bec5805df4086789eb43d52cd496be1aeb8fe5ee3ce7c096843075551f8b6bf37dc217b39e487ec33eeef3e1b10bd3e20814974bf5abc61ce017908c SHA512 6f091ba54d129c47b6ad7c3b1da898c7ef79b80629b373527963a0b35096ccbf91650087c4884081d306da4be7b4cfa1dc2f6d931d7140d7eccb380d9806db1c
-EBUILD gemrb-0.8.3-r1.ebuild 1386 BLAKE2B be98f210ee7e1b047f7156337ebbadb6b48a61c5143072fdefbd74dbff217e735f2b55eb19ca7fceebb8fb47a4f4ff5bea4abf458c43db3dc7335c9ee1ef2549 SHA512 ea7494bc0f78a11bc7ab01bc2c9b9f01b9aefc1b4abc5b7a44ce66a37c4776f92c878fe6265f75517712edc919003eb55a0bf6db5c5d3e85e29ef705dd85951a
-MISC metadata.xml 328 BLAKE2B 2e880539889540e163dfc2c24fe0338269256439e136b24b1d43260c1b493c8c7483c518b7490c2a43ec73cdf5023be6bce61f280390db88c5e644b5f43b58a9 SHA512 553586a61d8d824dbc4e9b4e19ad2eb3dc1ab10b42fcf1692853fc9b9c07ed4b0baa8d076a23a3b28250e198befe94e3050cb71b392d07e5b3535d5f6d50b676
diff --git a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild b/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
deleted file mode 100644
index 6ec09ffb5278..000000000000
--- a/games-engines/gemrb/gemrb-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-single-r1 cmake-utils
-
-DESCRIPTION="Reimplementation of the Infinity engine"
-HOMEPAGE="http://gemrb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gemrb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	media-libs/freetype
-	media-libs/libpng:0=
-	>=media-libs/libsdl-1.2[video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl-mixer
-	sys-libs/zlib
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i \
-		-e '/COPYING/d' \
-		CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBIN_DIR=bin
-		-DDATA_DIR=share/gemrb
-		-DDOC_DIR=share/doc/${PF}
-		-DICON_DIR=share/pixmaps
-		-DLIB_DIR=$(get_libdir)
-		-DMAN_DIR=share/man/man6
-		-DMENU_DIR=share/applications
-		-DSVG_DIR=share/icons/hicolor/scalable/apps
-		-DSYSCONF_DIR=/etc/${PN}
-		# needed, causes massive QA warnings otherwise
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED%/}"/usr/bin/extend2da.py
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/gemrb/metadata.xml b/games-engines/gemrb/metadata.xml
deleted file mode 100644
index 48acc454984a..000000000000
--- a/games-engines/gemrb/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gemrb</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/love-0.7.2-r2 b/games-engines/love-0.7.2-r2
new file mode 100644
index 000000000000..e9478637d53f
--- /dev/null
+++ b/games-engines/love-0.7.2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng:0 media-libs/tiff:0
+DESCRIPTION=A framework for 2D games in Lua
+EAPI=6
+HOMEPAGE=http://love2d.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+SLOT=0.7
+SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.7.2-linux-src.tar.gz
+_md5_=20488224906737afee1d9dea5fc65bb8
diff --git a/games-engines/love-0.8.0-r1 b/games-engines/love-0.8.0-r1
new file mode 100644
index 000000000000..f383a5cd0229
--- /dev/null
+++ b/games-engines/love-0.8.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng:0 media-libs/tiff:0
+DESCRIPTION=A framework for 2D games in Lua
+EAPI=6
+HOMEPAGE=http://love2d.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=ZLIB
+RDEPEND=dev-games/physfs dev-lang/lua:0[deprecated] media-libs/devil[mng,png,tiff] media-libs/freetype:2 media-libs/libmodplug media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
+SLOT=0
+SRC_URI=https://www.bitbucket.org/rude/love/downloads/love-0.8.0-linux-src.tar.gz
+_md5_=4677f6381102ce4517add3fd7a28e579
diff --git a/games-engines/love/Manifest b/games-engines/love/Manifest
deleted file mode 100644
index da538154885b..000000000000
--- a/games-engines/love/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX love-0.8.0-freetype2.patch 823 BLAKE2B 1927b092c6a107aa034b65bc4fc665f711b6070f44901ae9b402734c7339d07b39989651d729f91901efce50d9e2c5ccbe5f8a84fe8a8f72b455c2e3243fbe82 SHA512 fb4326f474b403cd3ec0bf679b4177dae070faf91848825c75800a2adb5ca1c91d26a555b61f7b031632fd64f50b239bfabb2967cb5e1d7ca1a249544faa0142
-DIST love-0.7.2-linux-src.tar.gz 900209 BLAKE2B abd0db98d210c5523d3b5a75c30bcfa2fc9d7760c7642d08dda28690ab72ddf8a0c7b60793cd7b0f902a8e3fcf2750748c75caf29638a7455572d84683be7820 SHA512 cbca1d7e3425d1ecbdae019212dfa2814d8ac3bad1faedd4b052cf3e89b5bf2fac6e422283628e4c125858c9db050dee2129476d1a73ec44ffe8a4704f170f61
-DIST love-0.8.0-linux-src.tar.gz 1027356 BLAKE2B bfbc2f9a3d5c3beffb4790a69716416815534c3b390b1554722eceaec57a7530377c06c15c6551aa972b33176bccdadfc8ad12bc186ceda201527bd9f8286d6f SHA512 6a0e28d102b950d3dddf7101996fe0ad04dfd7d4ec5e58797b41ef3382b60e74f90c6e707f882cf43cc0c5cc98703857eefc6418e6a6fd34e88f8019143f55a4
-EBUILD love-0.7.2-r2.ebuild 848 BLAKE2B 7ad7ad32850328b502c106714b1a8074122d429b5536333957b80b45e597536981a8569c6735078f34a8412c068a6a19fcb23953b4798c19abcc98a6cc6c259e SHA512 db2c45809a19d7b3f30ec8772d1208d449ca8e5c121a30bcc92e1ffba35d13f801fb8c0f622867314c164b3dc0b61679cf234e73266536b3322d1139a5ce7685
-EBUILD love-0.8.0-r1.ebuild 758 BLAKE2B d8462edf603283285d463ad560a59c8c985f31ea82ca0604b91269cac150ef84575d03a6dc0df0563abd3aefafb2b37dafe3291e36c5846bb6e8936a82003015 SHA512 e4d045bd0d071011500500748cb6b82b3b9b4aebbd252b2a16a87e1c8aa01c74f69a22caaf366b89aebf31ded5e31d22a2e9ca7abb141b31b27f00b255ab2d51
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/games-engines/love/files/love-0.8.0-freetype2.patch b/games-engines/love/files/love-0.8.0-freetype2.patch
deleted file mode 100644
index 07c655c41203..000000000000
--- a/games-engines/love/files/love-0.8.0-freetype2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- love-0.8.0/src/modules/font/freetype/Font.h
-+++ love-0.8.0/src/modules/font/freetype/Font.h
-@@ -30,10 +30,10 @@
- #else
- #include <ft2build.h>
- #endif
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
- 
- namespace love
- {
---- love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
-+++ love-0.8.0/src/modules/font/freetype/TrueTypeRasterizer.h
-@@ -27,10 +27,10 @@
- 
- // TrueType2
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftoutln.h>
--#include <freetype/fttrigon.h>
-+#include FT_FREETYPE_H
-+#include FT_GLYPH_H
-+#include FT_OUTLINE_H
-+#include FT_TRIGONOMETRY_H
- 
- namespace love
- {
diff --git a/games-engines/love/love-0.7.2-r2.ebuild b/games-engines/love/love-0.7.2-r2.ebuild
deleted file mode 100644
index e29f78d0863e..000000000000
--- a/games-engines/love/love-0.7.2-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0.7"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/physfs
-	dev-lang/lua:0[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype:2
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	media-libs/libmng:0
-	media-libs/tiff:0
-"
-
-S="${WORKDIR}/${PN}-HEAD"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.0-freetype2.patch )
-
-src_install() {
-	DOCS="readme.txt changes.txt" \
-		default
-
-	mv "${ED}/usr/bin/${PN}" "${ED}/usr/bin/${PN}-${SLOT}" || die
-}
diff --git a/games-engines/love/love-0.8.0-r1.ebuild b/games-engines/love/love-0.8.0-r1.ebuild
deleted file mode 100644
index 4545622486fc..000000000000
--- a/games-engines/love/love-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A framework for 2D games in Lua"
-HOMEPAGE="http://love2d.org/"
-SRC_URI="https://www.bitbucket.org/rude/${PN}/downloads/${P}-linux-src.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-games/physfs
-	dev-lang/lua:0[deprecated]
-	media-libs/devil[mng,png,tiff]
-	media-libs/freetype:2
-	media-libs/libmodplug
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-sound/mpg123
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	media-libs/libmng:0
-	media-libs/tiff:0
-"
-
-PATCHES=( "${FILESDIR}"/${P}-freetype2.patch )
-
-src_install() {
-	DOCS="readme.md changes.txt" \
-		default
-}
diff --git a/games-engines/love/metadata.xml b/games-engines/love/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/games-engines/love/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/games-engines/metadata.xml b/games-engines/metadata.xml
deleted file mode 100644
index 9e9c62112e6b..000000000000
--- a/games-engines/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-engines category contains game engines.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-engines contiene motores de juegos.
-	</longdescription>
-	<longdescription lang="ja">
-		games-enginesカテゴリーにはゲーム・エンジンが含まれています。
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-engines chứa các game engine.
-	</longdescription>
-	<longdescription lang="nl">
-		De games-engines category bevat spel-engines.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-engines enthält Game-Engines.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-engines contiene motori di gioco.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-engines contém engines de jogos.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-engines zawiera silniki gier.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-engines/nazghul-0.7.1-r1 b/games-engines/nazghul-0.7.1-r1
new file mode 100644
index 000000000000..b83aae212c95
--- /dev/null
+++ b/games-engines/nazghul-0.7.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libpng:0 >=media-libs/libsdl-1.2.3[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[midi,vorbis,wav]
+DESCRIPTION=A computer role-playing game (CRPG) engine with game called HaximA
+EAPI=6
+HOMEPAGE=http://myweb.cableone.net/gmcnutt/nazghul.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:0 >=media-libs/libsdl-1.2.3[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[midi,vorbis,wav]
+SLOT=0
+SRC_URI=mirror://sourceforge/nazghul/nazghul-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0a5067b2368373f9fc7fdeb4a7065198
diff --git a/games-engines/nazghul/Manifest b/games-engines/nazghul/Manifest
deleted file mode 100644
index 03813437e913..000000000000
--- a/games-engines/nazghul/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nazghul-0.7.1.tar.gz 7929363 BLAKE2B 4afcfcf47082cf75a98ce73ef115cf0a2f4b35e48cdfaddf362106114447543e853f22365ae773fa2489deb47caca3fa888e738213de294b2516b9f06672dff5 SHA512 6484698609ad88c9d7d2d6c2dc93aee98614917b53dca826a2827a9375192e323e40de1f69a3de1e8dab35f02834430e1ee947f4bf6088fbf510c416da1d8c0f
-EBUILD nazghul-0.7.1-r1.ebuild 904 BLAKE2B fd244eb2b9d6e641f1394ac06deabebc67d7cb919a7ac6c0f8792c07953e0f3d214eeceae552cd09b81d25ae00b600c7f9f5861db2f2275468c14aed08f17105 SHA512 b943b643c273d19f9024a6e40e5fadc1b30ab80e9809f04452675558ce8cc05c08573086978432bcc8818d336dfa7154249f8163ad9d52e7ddd2857569e65501
-MISC metadata.xml 330 BLAKE2B 8a1fa464b38ef7c1c4f34958bf0849ee0f82db4e8c421f02397da457c1b0e2b2d4fe09e051f706a0237919edcc11bb2b13363ec05f0dcc1ca6cfc96856bbd193 SHA512 13146683d0f1943936e5c43ac8e0495fbaff76c788ea3ec3eb3437e0eb84268d2c969a11b97c0792cad64e7e32aabbbe4f2ef65ad038af4e4c9cacadecfe9467
diff --git a/games-engines/nazghul/metadata.xml b/games-engines/nazghul/metadata.xml
deleted file mode 100644
index bdd8777f9e45..000000000000
--- a/games-engines/nazghul/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">nazghul</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/nazghul/nazghul-0.7.1-r1.ebuild b/games-engines/nazghul/nazghul-0.7.1-r1.ebuild
deleted file mode 100644
index 14be63f70af6..000000000000
--- a/games-engines/nazghul/nazghul-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A computer role-playing game (CRPG) engine with game called HaximA"
-HOMEPAGE="http://myweb.cableone.net/gmcnutt/nazghul.html"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libpng:0
-	>=media-libs/libsdl-1.2.3[X,sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[midi,vorbis,wav]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	ecvs_clean
-
-	default
-}
-
-src_install() {
-	default
-	dodoc doc/{GAME_RULES,GHULSCRIPT,MAP_HACKERS_GUIDE,USERS_GUIDE}
-
-	dodoc doc/*html
-	dodoc doc/*gif
-
-	docinto engine_extension_and_design
-	dodoc doc/engine_extension_and_design/*
-
-	docinto world_building
-	dodoc doc/world_building/*
-
-	doicon icons/haxima.png
-	make_desktop_entry haxima.sh HaximA haxima
-}
diff --git a/games-engines/odamex-0.7.0-r1 b/games-engines/odamex-0.7.0-r1
new file mode 100644
index 000000000000..bab1dd4ac459
--- /dev/null
+++ b/games-engines/odamex-0.7.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend test
+DEPEND=dedicated? ( >=net-libs/miniupnpc-1.8:0= ) !dedicated? ( media-libs/libpng:0= >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:3.0[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8:0= ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=An online multiplayer, free software engine for Doom and Doom II
+EAPI=5
+HOMEPAGE=http://odamex.net/
+IUSE=dedicated +odalaunch master portmidi server
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dedicated? ( >=net-libs/miniupnpc-1.8:0= ) !dedicated? ( media-libs/libpng:0= >=media-libs/libsdl-1.2.9[X,sound,joystick,video] >=media-libs/sdl-mixer-1.2.6 odalaunch? ( x11-libs/wxGTK:3.0[X] ) portmidi? ( media-libs/portmidi ) server? ( >=net-libs/miniupnpc-1.8:0= ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/odamex/Odamex/0.7.0/odamex-src-0.7.0.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	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=87c82efad1861e7139cf1eba90da1366
diff --git a/games-engines/odamex/Manifest b/games-engines/odamex/Manifest
deleted file mode 100644
index 1df4b384f4d7..000000000000
--- a/games-engines/odamex/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 1-odamex-0.7.0-install-rules.patch 2713 BLAKE2B 885f9d88127bae449383b66305ae266bceccd8b9d321ff2a850cf85732e254281ea7222a95d6c1890d16633e0237df9c5f23a3a65aeb111dfcb18221b3e00dea SHA512 8ad2f8eaaf6697275daec6ff3076c3f8359eed46bc89bb8567f25e5c825ef065ae875c7c607a5bb99fd62bf8e616e4c0296af374817e9fe02abcd311b306a453
-AUX 2-odamex-0.7.0-cmake-options.patch 3459 BLAKE2B 3fa5b4f813a3e1fcbab917d7468807335883c78d328fd554c7c85e937023a2674610878449b93359059075133fbf68a38ff60b3dc73dfb50fc74362f5d2ceed2 SHA512 ef5ac9a88b189fb4276989e1de6e2723491777fa0cc12cd5dd38b9c992ed22e6be6892371efa4cf4af28eda85883056c27efa3ed074b878f89325333476dd19d
-AUX 3-odamex-0.7.0-wad-search-path.patch 1758 BLAKE2B a202ea34cf7c219b611d48601affd505614454b04a43d5678f70cc400e7100c65cce955bd378f4f51479572f09bcde447da425ac0a794a1a45227533ded9eb1c SHA512 031507d97734e75cddbcde5b09a7e483f1110dd08e692652b71a79e7f90b703090798916b3f25a74e18f29e0091e2f018d93662d82f994fb11317ba0215dfd10
-AUX 4-odamex-0.7.0-odalauncher-bin-path.patch 1671 BLAKE2B 833c95320ce5567fea90b12eedd7e2703540bff8f1a38e99ec80563ac4556ffe748b946948bb46d12064a08ed46a8c42fac92fbc5d6d408478067650718d92b8 SHA512 4ab5c84d5e3e1465fb02c775fad0208bf177264137d82297515c8f2bf188e9f4ce79a5510e28dfc4811392ecef407b89267e2baf45d37c236fb86cfc066c1ed2
-AUX odamex-0.7.0-gcc6.patch 1149 BLAKE2B e97191c08be8f1987c3374c4920b9016beb1e824e5e7781c8d4ec9088d9eb977e2dbb155ab7930914e3bae295098156c05d0726da7ee2df82a80a90d1ee333a7 SHA512 e34fc554016d67e42d95b9f2e964b69282791a9c07c9976c49990778188bfc1dab5784b29a798e10d6fcd8cc36893bd3416b57c8e2c9f1bd67587a3524c0a422
-AUX odamex-0.7.0-miniupnpc.patch 1144 BLAKE2B feb91380a8f1677f6aae2d29a569f3e452e6464c48962fe7f718a83733ce160b6bf2d4d0c84be78fbdb3f9102862571c13c69a9163a822f003743167d52a564d SHA512 0a805aca36687f183aa168972ecc9bfcd04c117787e42967fbf62b08873943b9f6c5118f15089a70ede43335ce571216255f315e08ce08f89ff23f6859507951
-AUX odamex-0.7.0-miniupnpc20.patch 846 BLAKE2B 3c55c9a761e5abe0de591ce6a53efc915eb7c6a0bdbd308ebff7fc9aa19517d647b882eaeec163a673f071a2f7aab505864ef8e7e64ffb2961682fb024cee190 SHA512 a55e2fea8742bed18765824131d87321e72df293c8e10b6682ade542b7f8feda10f89acbea9dc98749b509c117ae94c070b065ec95434118c73845f74e187664
-DIST odamex-src-0.7.0.tar.bz2 8435860 BLAKE2B 9720efdf262047074fed593360b0c38864d5d0f9c076a45d6df9aaf362cba35f41eeafab968338be0911681726872c33e3625934176f75068ca4933655876f7b SHA512 410f3c2588e4d57006e5bb50eaa0f6c1a83cf197ce40daabb958667483eb6c85138206ac74b8aee64c4208c4360415ad16d1698534be5c7abec1493a0f91aa8b
-EBUILD odamex-0.7.0-r1.ebuild 2680 BLAKE2B 7dab16f3b940503a9710ae254921a28b47c9f4afc27c3ce68080fa266ca2e349a8ee5f66d54e99728b0e69469454a17cc771cb9dd07570e40320d34642cd026c SHA512 45a4c37fe091c908e9aada85da92c508f8eacdc6bddca74e5c3ee4044417fb516e2d4b7ad8e2b7b0e687ebf4918592562c0a09a0e71a5b1fd0a630f9109e9c3d
-MISC metadata.xml 1467 BLAKE2B 43e3e80b72476360be1f5a345946a96c4ba0b6068209afa8506325a9a8467d56c8f19b62e5713a8d41c6a84cdc24c8218b8dd73453feb7ac621e3338a9421e16 SHA512 386792eba91c781bdb52d0f3d262a516843b3ab17e9522e23506fb7327ca726178ac387d577464faa1608fd396e81b3be813ab2bdac6b92caf10a9133a28332b
diff --git a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch b/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch
deleted file mode 100644
index 618f9fd87c2c..000000000000
--- a/games-engines/odamex/files/1-odamex-0.7.0-install-rules.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 1352b633388dd9d82b8cb7e3d11932d0b569da4e Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:07:37 +0100
-Subject: [PATCH 1/4] make install destinations modifiable
-
----
- CMakeLists.txt           | 5 +++--
- client/CMakeLists.txt    | 2 +-
- master/CMakeLists.txt    | 4 ++++
- odalaunch/CMakeLists.txt | 2 +-
- server/CMakeLists.txt    | 2 +-
- 5 files changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 11e52d1..262e3db 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,5 @@
- include(CMakeDependentOption)

-+include(GNUInstallDirs)

- 

- project(Odamex)

- cmake_minimum_required(VERSION 2.8)

-@@ -113,10 +114,10 @@ if(NOT APPLE)
-       set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF)

-   else()

-     install(FILES odamex.wad LICENSE README

--      DESTINATION share/odamex

-+      DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex

-       COMPONENT common)

-     install(FILES ${CONFIG_SAMPLES}

--      DESTINATION share/odamex/config-samples

-+      DESTINATION ${CMAKE_INSTALL_DATADIR}/odamex/config-samples

-       COMPONENT common)

- 

-     option(ODAMEX_COMPONENT_PACKAGES "Create several rpm/deb packages for repository maintainers." OFF)

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 510b820..3f73ab5 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -228,7 +228,7 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
-       COMPONENT client)

-   else()

-     install(TARGETS odamex

--      RUNTIME DESTINATION bin

-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-       COMPONENT client)

-   endif()

- endif()

-diff --git a/master/CMakeLists.txt b/master/CMakeLists.txt
-index 7fc386b..5bdc048 100644
---- a/master/CMakeLists.txt
-+++ b/master/CMakeLists.txt
-@@ -14,3 +14,7 @@ if(WIN32)
- elseif(SOLARIS)

-   target_link_libraries(odamast socket nsl)

- endif()

-+

-+if(UNIX)

-+	install( TARGETS odamast DESTINATION ${CMAKE_INSTALL_BINDIR} )

-+endif()

-diff --git a/odalaunch/CMakeLists.txt b/odalaunch/CMakeLists.txt
-index 4ca5920..0b134ef 100644
---- a/odalaunch/CMakeLists.txt
-+++ b/odalaunch/CMakeLists.txt
-@@ -71,7 +71,7 @@ if(wxWidgets_FOUND)
-       COMPONENT odalaunch)

-   else()

-     install(TARGETS odalaunch

--      RUNTIME DESTINATION bin

-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-       COMPONENT odalaunch)

-   endif()

- 

-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index b046714..d33b974 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -73,6 +73,6 @@ elseif(WIN32)
-     COMPONENT server)

- else()

-   install(TARGETS odasrv

--    RUNTIME DESTINATION bin

-+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

-     COMPONENT server)

- endif()

--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch b/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch
deleted file mode 100644
index 1de502711406..000000000000
--- a/games-engines/odamex/files/2-odamex-0.7.0-cmake-options.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From 851bc58a74eadd89838c924167f27df1b9d3be37 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:14:20 +0100
-Subject: [PATCH 2/4] add various cmake options
-
----
- CMakeLists.txt        | 26 ++++++++++++++++++++++----
- client/CMakeLists.txt | 34 ++++++++++++++++++++--------------
- 2 files changed, 42 insertions(+), 18 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 262e3db..91d5c50 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,13 @@
- include(CMakeDependentOption)

- include(GNUInstallDirs)

- 

-+# options

-+option(BUILD_CLIENT "Build client target" 1)

-+option(BUILD_SERVER "Build server target" 1)

-+option(BUILD_MASTER "Build master server target" 1)

-+cmake_dependent_option( BUILD_ODALAUNCH "Build odalaunch target" 1 BUILD_CLIENT 0 )

-+cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT 0 )

-+

- project(Odamex)

- cmake_minimum_required(VERSION 2.8)

- 

-@@ -73,10 +80,21 @@ if(USE_INTREE_PORTMIDI)
- endif()

- 

- # Subdirectories for Odamex projects

--add_subdirectory(client)

--add_subdirectory(server)

--add_subdirectory(master)

--add_subdirectory(odalaunch)

-+if(BUILD_CLIENT)

-+	add_subdirectory(client)

-+endif()

-+if(BUILD_SERVER)

-+	add_subdirectory(server)

-+endif()

-+if(BUILD_MASTER)

-+	add_subdirectory(master)

-+endif()

-+if(BUILD_ODALAUNCH)

-+	add_subdirectory(odalaunch)

-+endif()

-+if(NOT BUILD_CLIENT AND NOT BUILD_SERVER AND NOT BUILD_MASTER)

-+	message(FATAL_ERROR "No target chosen, doing nothing.")

-+endif()

- 

- # Disable the ag-odalaunch target completely: -DNO_AG-ODALAUNCH_TARGET

- # This is only really useful when setting up a universal build.

-diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
-index 3f73ab5..7363c5a 100644
---- a/client/CMakeLists.txt
-+++ b/client/CMakeLists.txt
-@@ -107,17 +107,21 @@ include_directories(${PNG_INCLUDE_DIRS})
- add_definitions(-DUSE_PNG)

- 

- # PortMidi configuration

--if(USE_INTREE_PORTMIDI)

--  include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)

--  add_definitions(-DPORTMIDI)

-+if(ENABLE_PORTMIDI)

-+	if(USE_INTREE_PORTMIDI)

-+	  include_directories(../libraries/portmidi/pm_common/ ../libraries/portmidi/porttime/)

-+	  add_definitions(-DPORTMIDI)

-+	else()

-+	  find_package(PortMidi QUIET)

-+	  if(PORTMIDI_FOUND)

-+		include_directories(${PORTMIDI_INCLUDE_DIR})

-+		add_definitions(-DPORTMIDI)

-+	  else()

-+		message(WARNING "PortMidi not found, client will be built without PortMidi support.")

-+	  endif()

-+	endif()

- else()

--  find_package(PortMidi QUIET)

--  if(PORTMIDI_FOUND)

--    include_directories(${PORTMIDI_INCLUDE_DIR})

--    add_definitions(-DPORTMIDI)

--  else()

--    message(WARNING "PortMidi not found, client will be built without PortMidi support.")

--  endif()

-+	message(STATUS "Portmidi disabled.")

- endif()

- 

- # Find Mac frameworks

-@@ -147,10 +151,12 @@ if(SDL_FOUND AND SDLMIXER_FOUND)
-   target_link_libraries(odamex ${ZLIB_LIBRARY})

-   target_link_libraries(odamex ${PNG_LIBRARY} ${ZLIB_LIBRARY})

- 

--  if(USE_INTREE_PORTMIDI)

--    target_link_libraries(odamex portmidi-static)

--  elseif(PORTMIDI_FOUND)

--    target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

-+  if(ENABLE_PORTMIDI)

-+	  if(USE_INTREE_PORTMIDI)

-+		target_link_libraries(odamex portmidi-static)

-+	  elseif(PORTMIDI_FOUND)

-+		target_link_libraries(odamex ${PORTMIDI_LIBRARIES})

-+	  endif()

-   endif()

- 

-   if(WIN32)

--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch b/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch
deleted file mode 100644
index 77fb4e48996e..000000000000
--- a/games-engines/odamex/files/3-odamex-0.7.0-wad-search-path.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 9af4e992ff9fa10816beba36478c711ac2c8542a Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:17:21 +0100
-Subject: [PATCH 3/4] add odamex.wad install destination to wad search path
-
----
- CMakeLists.txt    | 9 +++++++++
- common/d_main.cpp | 2 ++
- config.h.in       | 6 ++++++
- 3 files changed, 17 insertions(+)
- create mode 100644 config.h.in
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 91d5c50..a06613e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,15 @@
- 

- set(PROJECT_VERSION 0.7.0)

- set(PROJECT_COPYRIGHT "2006-2014")

-+

-+configure_file (

-+  "${PROJECT_SOURCE_DIR}/config.h.in"

-+  "${PROJECT_BINARY_DIR}/config.h"

-+  )

-+

-+include_directories(

-+	${PROJECT_BINARY_DIR}

-+)

- 

- # Default build type

- if(NOT MSVC)

-diff --git a/common/d_main.cpp b/common/d_main.cpp
-index 31d4f59..be0ffd2 100644
---- a/common/d_main.cpp
-+++ b/common/d_main.cpp
-@@ -23,6 +23,7 @@
- //-----------------------------------------------------------------------------

- 

- #include "version.h"

-+#include "config.h"

- 

- #include <sstream>

- #include <string>

-@@ -506,6 +507,7 @@ static std::string BaseFileSearch(std::string file, std::string ext = "", std::s
- 	D_AddSearchDir(dirs, getenv("DOOMWADDIR"), separator);

- 	D_AddSearchDir(dirs, getenv("DOOMWADPATH"), separator);

- 	D_AddSearchDir(dirs, getenv("HOME"), separator);

-+	D_AddSearchDir(dirs, CMAKE_WADDIR, separator);

- 

- 	// [AM] Search additional paths based on platform

- 	D_AddPlatformSearchDirs(dirs);

-diff --git a/config.h.in b/config.h.in
-new file mode 100644
-index 0000000..e91b3a6
---- /dev/null
-+++ b/config.h.in
-@@ -0,0 +1,6 @@
-+#ifndef CONFIG_H
-+#define CONFIG_H
-+
-+#define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
-+
-+#endif
--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch b/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch
deleted file mode 100644
index acb2692e75fb..000000000000
--- a/games-engines/odamex/files/4-odamex-0.7.0-odalauncher-bin-path.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 672b2e61f3c0347c29746a4a22fe3ab912e88d62 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 27 Mar 2014 21:19:48 +0100
-Subject: [PATCH 4/4] use CMAKE_BINDIR as default bin patch in odalauncher
-
----
- config.h.in                | 1 +
- odalaunch/src/dlg_main.cpp | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/config.h.in b/config.h.in
-index e91b3a6..7019a02 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -2,5 +2,6 @@
- #define CONFIG_H
- 
- #define CMAKE_WADDIR "@CMAKE_INSTALL_DATADIR@"
-+#define CMAKE_BINDIR "@CMAKE_INSTALL_BINDIR@"
- 
- #endif
-diff --git a/odalaunch/src/dlg_main.cpp b/odalaunch/src/dlg_main.cpp
-index a95a5f6..abbfc0a 100644
---- a/odalaunch/src/dlg_main.cpp
-+++ b/odalaunch/src/dlg_main.cpp
-@@ -27,6 +27,7 @@
- #include "str_utils.h"
- 
- #include "md5.h"
-+#include "config.h"
- 
- #include <wx/settings.h>
- #include <wx/menu.h>
-@@ -42,6 +43,7 @@
- #include <wx/process.h>
- #include <wx/toolbar.h>
- #include <wx/xrc/xmlres.h>
-+#include <wx/string.h>
- #include <wx/cmdline.h>
- 
- #ifdef __WXMSW__
-@@ -205,10 +207,12 @@ dlgMain::dlgMain(wxWindow* parent, wxWindowID id)
-     }
-     #endif
- 
-+    const char *cmake_bindir_str = CMAKE_BINDIR;
-+    wxString cmake_bindir = wxString::FromAscii(cmake_bindir_str);
-     launchercfg_s.get_list_on_start = 1;
-     launchercfg_s.show_blocked_servers = 0;
-     launchercfg_s.wad_paths = wxGetCwd();
--    launchercfg_s.odamex_directory = wxGetCwd();
-+    launchercfg_s.odamex_directory = cmake_bindir;
- 
-     m_LstCtrlServers = XRCCTRL(*this, "Id_LstCtrlServers", LstOdaServerList);
-     m_LstCtrlPlayers = XRCCTRL(*this, "Id_LstCtrlPlayers", LstOdaPlayerList);
--- 
-1.9.1
-
diff --git a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch b/games-engines/odamex/files/odamex-0.7.0-gcc6.patch
deleted file mode 100644
index 9e341b881ccd..000000000000
--- a/games-engines/odamex/files/odamex-0.7.0-gcc6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Bug: https://bugs.gentoo.org/610566
-Commit: https://github.com/odamex/odamex/commit/1d8121c78fe2db9befb05dd40ceb9b86062024e4
-
-From 1d8121c78fe2db9befb05dd40ceb9b86062024e4 Mon Sep 17 00:00:00 2001
-From: rice <russell@odamex.net>
-Date: Tue, 30 Aug 2016 08:37:15 +0000
-Subject: [PATCH] - Apply patch from bug 1177, thanks RjY!
-
-SVN r5444 (trunk)
----
- common/m_vectors.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/common/m_vectors.cpp b/common/m_vectors.cpp
-index b51e4e40..2eb48a04 100644
---- a/common/m_vectors.cpp
-+++ b/common/m_vectors.cpp
-@@ -541,16 +541,16 @@ void M_PerpendicularVec3(v3double_t *dest, const v3double_t *src)
- {
- 	// find the smallest component of the vector src
- 	v3double_t tempvec;
--	double minelem = src->x;
-+	double minelem = fabs(src->x);
- 	double *mincomponent = &(tempvec.x);
--	if (abs(src->y) < minelem)
-+	if (fabs(src->y) < minelem)
- 	{
--		minelem = abs(src->y);
-+		minelem = fabs(src->y);
- 		mincomponent = &(tempvec.y);
- 	}
--	if (abs(src->z) < minelem)
-+	if (fabs(src->z) < minelem)
- 	{
--		minelem = abs(src->z);
-+		minelem = fabs(src->z);
- 		mincomponent = &(tempvec.z);
- 	}
- 	
diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch
deleted file mode 100644
index 34896e2a4e8b..000000000000
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Mar 27 21:16:02 UTC 2014
-Subject: unbundle miniupnpc
-
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -29,8 +29,7 @@
- set(JSONCPP_SOURCE ${JSONCPP_DIR}/jsoncpp.cpp)

- 

- # MiniUPnPc

--set(MINIUPNPC_DIR ../libraries/libminiupnpc)

--set(MINIUPNPC_STATIC_LIBRARIES upnpc-static)

-+set(MINIUPNPC_DIR /usr/include/miniupnpc)

- 

- # Platform definitions

- define_platform()

-@@ -54,7 +53,7 @@
-   ${COMMON_SOURCES} ${COMMON_HEADERS}

-   ${SERVER_SOURCES} ${SERVER_HEADERS}

-   ${SERVER_WIN32_HEADERS} ${SERVER_WIN32_RESOURCES})

--target_link_libraries(odasrv ${MINIUPNPC_STATIC_LIBRARIES})

-+target_link_libraries(odasrv -lminiupnpc)

- 

- if(WIN32)

-   target_link_libraries(odasrv winmm wsock32)

---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -71,7 +71,6 @@
- set(UPNPC_BUILD_TESTS OFF CACHE INTERNAL "" FORCE)

- set(UPNPC_INSTALL OFF CACHE INTERNAL "" FORCE)

- mark_as_advanced(FORCE UPNPC_INSTALL)

--add_subdirectory(libraries/libminiupnpc)

- 

- # PortMidi

- cmake_dependent_option(USE_INTREE_PORTMIDI "Compile with the version of PortMidi included in the source tree." ON "WIN32" OFF)

diff --git a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch b/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
deleted file mode 100644
index 716a07fe628a..000000000000
--- a/games-engines/odamex/files/odamex-0.7.0-miniupnpc20.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: common/i_net.cpp
-===================================================================
---- common/i_net.cpp	(revision 5459)
-+++ common/i_net.cpp	(working copy)
-@@ -151,7 +151,11 @@
- 
- 	Printf(PRINT_HIGH, "UPnP: Discovering router (max 1 unit supported)\n");
- 
-+#if MINIUPNPC_API_VERSION < 14
- 	devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, &res);
-+#else
-+	devlist = upnpDiscover(sv_upnp_discovertimeout.asInt(), NULL, NULL, 0, 0, 2, &res);
-+#endif
- 
- 	if (!devlist || res != UPNPDISCOVER_SUCCESS)
-     {
-@@ -179,7 +183,11 @@
-       //      " desc: %s\n st: %s\n",
-         //    dev->descURL, dev->st);
- 
-+#if MINIUPNPC_API_VERSION < 16
-     descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0);
-+#else
-+    descXML = (char *)miniwget(dev->descURL, &descXMLsize, 0, &res);
-+#endif
- 
-     if (descXML)
-     {
diff --git a/games-engines/odamex/metadata.xml b/games-engines/odamex/metadata.xml
deleted file mode 100644
index 39562f87b323..000000000000
--- a/games-engines/odamex/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mwoodj@knology.net</email>
-		<name>Mike Wood</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="odalaunch">Build the wxwidgets based launcher.</flag>
-		<flag name="master">Build master server target (advertises odamex server list)</flag>
-		<flag name="portmidi">Enable portmidi support.</flag>
-		<flag name="server">Build server target.</flag>
-	</use>
-	<upstream>
-		<changelog>http://odamex.net/changelog.php</changelog>
-		<doc lang="en">http://odamex.net/wiki/Odamex</doc>
-		<bugs-to>http://odamex.net/bugs/</bugs-to>
-		<remote-id type="sourceforge">odamex</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		Odamex is a free and open source port for the classic
-		first-person-shooter Doom. Odamex's goal is to emulate the feel of and
-		retain many aspects of the original Doom executables while offering a
-		broader expanse of security features, personal configuration, gameplay
-		options, and editing features. Odamex can run on a wide range of
-		operating systems and hardware, so players should be able to play
-		on almost any platform. 
-	</longdescription>
-</pkgmetadata>
diff --git a/games-engines/odamex/odamex-0.7.0-r1.ebuild b/games-engines/odamex/odamex-0.7.0-r1.ebuild
deleted file mode 100644
index 0d2e515d29dc..000000000000
--- a/games-engines/odamex/odamex-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit cmake-utils eutils gnome2-utils readme.gentoo-r1 wxwidgets
-
-MY_P=${PN}-src-${PV}
-DESCRIPTION="An online multiplayer, free software engine for Doom and Doom II"
-HOMEPAGE="http://odamex.net/"
-SRC_URI="mirror://sourceforge/${PN}/Odamex/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +odalaunch master portmidi server"
-
-RDEPEND="
-	dedicated? ( >=net-libs/miniupnpc-1.8:0= )
-	!dedicated? (
-		media-libs/libpng:0=
-		>=media-libs/libsdl-1.2.9[X,sound,joystick,video]
-		>=media-libs/sdl-mixer-1.2.6
-		odalaunch? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )
-		portmidi? ( media-libs/portmidi )
-		server? ( >=net-libs/miniupnpc-1.8:0= )
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOC_CONTENTS="
-	This is just the engine, you will need doom resource files in order to play.
-	Check: http://odamex.net/wiki/FAQ#What_data_files_are_required.3F
-"
-
-S="${WORKDIR}/src-${PV:2:3}"
-
-pkg_pretend() {
-	if ! test-flag-CXX -std=c++11; then
-		die "You need at least GCC 4.7.x or Clang >= 3.0 for C++11-specific compiler flags"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/1-${P}-install-rules.patch \
-		"${FILESDIR}"/2-${P}-cmake-options.patch \
-		"${FILESDIR}"/3-${P}-wad-search-path.patch \
-		"${FILESDIR}"/4-${P}-odalauncher-bin-path.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch \
-		"${FILESDIR}"/${P}-miniupnpc20.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-
-	rm -r libraries/libminiupnpc || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_INTREE_PORTMIDI=OFF
-		-DCMAKE_INSTALL_BINDIR="/usr/bin"
-		-DCMAKE_INSTALL_DATADIR="/usr/share"
-		$(cmake-utils_use_build master MASTER)
-	)
-
-	if use dedicated ; then
-		mycmakeargs+=(
-			-DBUILD_CLIENT=OFF
-			-DBUILD_ODALAUNCH=OFF
-			-DBUILD_SERVER=ON
-			-DENABLE_PORTMIDI=OFF
-		)
-	else
-		mycmakeargs+=(
-			-DBUILD_CLIENT=ON
-			$(cmake-utils_use_build odalaunch ODALAUNCH)
-			$(cmake-utils_use_build server SERVER)
-			$(cmake-utils_use_enable portmidi PORTMIDI)
-		)
-	fi
-
-	append-cxxflags -std=c++11
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-
-	if ! use dedicated ; then
-		newicon -s 128 "${S}/media/icon_${PN}_128.png" "${PN}.png"
-		make_desktop_entry ${PN}
-
-		if use odalaunch ; then
-			newicon -s 128 "${S}/media/icon_odalaunch_128.png" "odalaunch.png"
-			make_desktop_entry odalaunch "Odamex Launcher" odalaunch
-		fi
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/openmw-0.43.0-r1 b/games-engines/openmw-0.43.0-r1
new file mode 100644
index 000000000000..6ed33544fc0b
--- /dev/null
+++ b/games-engines/openmw-0.43.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-games/mygui || ( ( >=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] dev-games/openscenegraph-qt ) <dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib] ) dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) virtual/pkgconfig doc? ( app-doc/doxygen[doc] dev-python/sphinx ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Open source reimplementation of TES III: Morrowind
+EAPI=6
+HOMEPAGE=https://openmw.org/
+IUSE=doc devtools +qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 MIT BitstreamVera ZLIB
+RDEPEND=dev-games/mygui || ( ( >=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib] dev-games/openscenegraph-qt ) <dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib] ) dev-libs/boost:=[threads] dev-libs/tinyxml[stl] media-libs/libsdl2[joystick,opengl,video,X] media-libs/openal media-video/ffmpeg:= >=sci-physics/bullet-2.86 virtual/opengl qt5? ( app-arch/unshield dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=https://github.com/OpenMW/openmw/archive/openmw-0.43.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0031cf109400b790d3e331e0f79b52b7
diff --git a/games-engines/openmw/Manifest b/games-engines/openmw/Manifest
deleted file mode 100644
index 9bc9c7baf7b9..000000000000
--- a/games-engines/openmw/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX openmw-0.43.0-qt-5.11b3.patch 2842 BLAKE2B 29bf75b29144c6a9eadb316998b16bf2b2e492624d70d7a2a3578b67ec3446b2359642dc13c242131c803f3e300af3d0f0dad09f19f9462f2b42beccc0d84c87 SHA512 1cc4bc7c9fdaadf829ab8526d9fbd72a0058628293b133e701bd187f80ed234e7951d4cc2ec07fdcb521d685ff1471ef27b78b5db77156bbecc2165b653f7897
-DIST openmw-0.43.0.tar.gz 5023421 BLAKE2B c99e3a23b22b642dea9e8f2d9414e00aa6a05c4331a9715882465781caca60cd857675d87079bafc3596783e257213bec9d6f1f4e78a3d795e973fb1d895811e SHA512 e902dd2274c05838bb1171f07d7a673fc7b85d1290a9e01c8ab89f1c279bd236332ecdc0f2b7944ec7209a0e6022ff472639b5724bf26904e3a2d338c7be401a
-EBUILD openmw-0.43.0-r1.ebuild 3291 BLAKE2B e35859cbdca3aea7d6ac5cead05681d090c9164905958c92ad5c7c9a046e3eb345b7fe03b68b123650d2f2ec239ffd50be57acfa794a145b831c17a49b1b1dd9 SHA512 bc8393f838424342ff29fea1b4bdfbfe5082edcbadc256a9771cfaf2139464d1e97ac7bdb57de61e8dd15edd61c97e3af10a7b649bd163a44daceeea8ae197f0
-MISC metadata.xml 1044 BLAKE2B 132bf7783f4cdac33cfb9bffac4e8a0baf7380f8bb91b262c087ebab4848e6fc97dbac258d600836f1d447536077f063d0dc0ca7348179a61310806f5862ecfe SHA512 c47622fc66013a7c61b1f865619a77707b296b051df54bd75048073b6b5875d97fb300d490a5aba923cc369566ffb5f3dbab16451d1bf48f5f91de18ee7c2116
diff --git a/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch b/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch
deleted file mode 100644
index 85b290e660ba..000000000000
--- a/games-engines/openmw/files/openmw-0.43.0-qt-5.11b3.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 2c9d46a60bd8d35f132cb106e5255d590b13640b Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 17 Apr 2018 23:03:56 +0200
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
-
----
- apps/launcher/CMakeLists.txt | 2 +-
- apps/opencs/CMakeLists.txt   | 2 +-
- apps/wizard/CMakeLists.txt   | 2 +-
- components/CMakeLists.txt    | 2 +-
- extern/osgQt/CMakeLists.txt  | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
-index aec8c2533..99e7b4daa 100644
---- a/apps/launcher/CMakeLists.txt
-+++ b/apps/launcher/CMakeLists.txt
-@@ -106,7 +106,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-         target_link_libraries(openmw-launcher ${QT_QTMAIN_LIBRARY})
-     endif(WIN32)
- else()
--    qt5_use_modules(openmw-launcher Widgets Core)
-+    target_link_libraries(openmw-launcher Qt5::Widgets Qt5::Core)
- endif()
- 
- if (BUILD_WITH_CODE_COVERAGE)
-diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
-index b9279bf91..f07b518a9 100644
---- a/apps/opencs/CMakeLists.txt
-+++ b/apps/opencs/CMakeLists.txt
-@@ -246,7 +246,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-         target_link_libraries(openmw-cs ${QT_QTMAIN_LIBRARY})
-     endif()
- else()
--    qt5_use_modules(openmw-cs Widgets Core Network OpenGL)
-+    target_link_libraries(openmw-cs Qt5::Widgets Qt5::Core Qt5::Network Qt5::OpenGL)
- endif()
- 
- if (WIN32)
-diff --git a/apps/wizard/CMakeLists.txt b/apps/wizard/CMakeLists.txt
-index 5f7338e52..8d97bbcbf 100644
---- a/apps/wizard/CMakeLists.txt
-+++ b/apps/wizard/CMakeLists.txt
-@@ -118,7 +118,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-         target_link_libraries(openmw-wizard ${QT_QTMAIN_LIBRARY})
-     endif()
- else()
--    qt5_use_modules(openmw-wizard Widgets Core)
-+    target_link_libraries(openmw-wizard Qt5::Widgets Qt5::Core)
- endif()
- 
- if (OPENMW_USE_UNSHIELD)
-diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
-index 8256f1443..ecb844a9b 100644
---- a/components/CMakeLists.txt
-+++ b/components/CMakeLists.txt
-@@ -216,7 +216,7 @@ if (USE_QT)
-         ${QT_QTCORE_LIBRARY}
-         ${QT_QTGUI_LIBRARY})
-     else()
--        qt5_use_modules(components Widgets Core)
-+        target_link_libraries(components Qt5::Widgets Qt5::Core)
-     endif()
- endif()
- 
-diff --git a/extern/osgQt/CMakeLists.txt b/extern/osgQt/CMakeLists.txt
-index 3bd08a390..78a4e6034 100644
---- a/extern/osgQt/CMakeLists.txt
-+++ b/extern/osgQt/CMakeLists.txt
-@@ -12,7 +12,7 @@ if (DESIRED_QT_VERSION MATCHES 4)
-     include(${QT_USE_FILE})
-     target_link_libraries(${OSGQT_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTOPENGL_LIBRARY})
- else()
--    qt5_use_modules(${OSGQT_LIBRARY} Core OpenGL)
-+    target_link_libraries(${OSGQT_LIBRARY} Qt5::Core Qt5::OpenGL)
- endif()
- 
- link_directories(${CMAKE_CURRENT_BINARY_DIR})
--- 
-2.17.0
-
diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
deleted file mode 100644
index 191124d297e1..000000000000
--- a/games-engines/openmw/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="devtools">Install development tools like
-			bsatool, esmtool and opencs.</flag>
-	</use>
-	<upstream>
-		<changelog>https://github.com/OpenMW/openmw/releases</changelog>
-		<doc lang="en">https://wiki.openmw.org</doc>
-		<bugs-to>https://bugs.openmw.org/</bugs-to>
-		<remote-id type="github">OpenMW/openmw</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		OpenMW is a new and modern engine based on the one that runs the 2002
-		open-world RPG Morrowind. The engine (OpenMW) will come with its own
-		editor (OpenCS) which will allow the user to edit or create their own
-		games. Both OpenCS and OpenMW are written from scratch and aren’t
-		made to support any third party programs the original Morrowind
-		engine uses to improve its functionality.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-engines/openmw/openmw-0.43.0-r1.ebuild b/games-engines/openmw/openmw-0.43.0-r1.ebuild
deleted file mode 100644
index 0efb2c196763..000000000000
--- a/games-engines/openmw/openmw-0.43.0-r1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Open source reimplementation of TES III: Morrowind"
-HOMEPAGE="https://openmw.org/"
-SRC_URI="https://github.com/OpenMW/openmw/archive/${P}.tar.gz"
-
-LICENSE="GPL-3 MIT BitstreamVera ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc devtools +qt5"
-
-RDEPEND="
-	dev-games/mygui
-	|| (
-		(
-			>=dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,sdl,svg,truetype,zlib]
-			dev-games/openscenegraph-qt
-		)
-		<dev-games/openscenegraph-3.5.5[ffmpeg,jpeg,png,qt5,sdl,svg,truetype,zlib]
-	)
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml[stl]
-	media-libs/libsdl2[joystick,opengl,video,X]
-	media-libs/openal
-	media-video/ffmpeg:=
-	>=sci-physics/bullet-2.86
-	virtual/opengl
-	qt5? (
-		app-arch/unshield
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[doc] dev-python/sphinx )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# We don't install license files
-	sed -e '/LICDIR/d' \
-		-i CMakeLists.txt || die
-	# Use the system tinyxml headers
-	sed -e 's/"tinyxml.h"/<tinyxml.h>/g' \
-		-e 's/"tinystr.h"/<tinystr.h>/g' \
-		-i extern/oics/ICSPrerequisites.h || die
-}
-
-src_configure() {
-	use devtools && ! use qt5 && \
-		elog "'qt5' USE flag is disabled, 'openmw-cs' will not be installed"
-
-	local mycmakeargs=(
-		-DBUILD_BSATOOL=$(usex devtools)
-		-DBUILD_DOCS=$(usex doc)
-		-DBUILD_ESMTOOL=$(usex devtools)
-		-DBUILD_LAUNCHER=$(usex qt5)
-		-DBUILD_NIFTEST=$(usex devtools)
-		-DBUILD_OPENCS=$(usex devtools $(usex qt5))
-		-DBUILD_WIZARD=$(usex qt5)
-		-DBUILD_UNITTESTS=OFF
-		-DGLOBAL_DATA_PATH=/usr/share
-		-DICONDIR="/usr/share/icons/hicolor/256x256/apps"
-		-DMORROWIND_DATA_FILES="/usr/share/morrowind-data"
-		-DUSE_SYSTEM_TINYXML=ON
-		-DDESIRED_QT_VERSION=5
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use doc ; then
-		cmake-utils_src_compile doc
-		find "${CMAKE_BUILD_DIR}"/docs/Doxygen/html \
-			-name '*.md5' -type f -delete || die
-		HTML_DOCS=( "${CMAKE_BUILD_DIR}"/docs/Doxygen/html/. )
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	local DOC_CONTENTS="
-	You need the original Morrowind data files. If you haven't
-	installed them yet, you can install them straight via the
-	installation wizard which is the officially supported method
-	(either by using the launcher or by calling 'openmw-wizard'
-	directly).\n"
-
-	if ! use qt5; then
-		local DOC_CONTENTS+="\n\n
-		USE flag 'qt5' is disabled, 'openmw-launcher' and
-		'openmw-wizard' are not available. You are on your own for
-		making the Morrowind data files available and pointing
-		openmw at them.\n\n
-		Additionally; you must import the Morrowind.ini file before
-		running openmw with the Morrowind data files for the first
-		time. Typically this can be done like so:\n\n
-		\t mkdir -p ~/.config/openmw\n
-		\t openmw-iniimporter /path/to/Morrowind.ini ~/.config/openmw/openmw.cfg"
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/openxcom-1.0.0_p20180317 b/games-engines/openxcom-1.0.0_p20180317
new file mode 100644
index 000000000000..c0c9eaa56bd0
--- /dev/null
+++ b/games-engines/openxcom-1.0.0_p20180317
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis] doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=An open-source reimplementation of the popular UFO: Enemy Unknown
+EAPI=6
+HOMEPAGE=https://openxcom.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ CC-BY-SA-4.0
+RDEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis]
+SLOT=0
+SRC_URI=https://github.com/SupSuper/OpenXcom/archive/ea9ac466221f8b4f8974d2db1c42dc4ad6126564.tar.gz -> openxcom-1.0.0_p20180317.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bde30ff0612181d0215fb2fa07889f03
diff --git a/games-engines/openxcom-9999 b/games-engines/openxcom-9999
new file mode 100644
index 000000000000..b9146363d818
--- /dev/null
+++ b/games-engines/openxcom-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis] doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=An open-source reimplementation of the popular UFO: Enemy Unknown
+EAPI=6
+HOMEPAGE=https://openxcom.org/
+IUSE=doc
+LICENSE=GPL-3+ CC-BY-SA-4.0
+RDEPEND=>=dev-cpp/yaml-cpp-0.5.1 media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[flac,mikmod,vorbis]
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	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_=65e70f8f27cc1f8526a18d34176340f4
diff --git a/games-engines/openxcom/Manifest b/games-engines/openxcom/Manifest
deleted file mode 100644
index a4124c1a1aec..000000000000
--- a/games-engines/openxcom/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST openxcom-1.0.0_p20180317.tar.gz 2801430 BLAKE2B 8a3718fc99f733c145034509b596de8dd17a8bdfe1aa05b68571c66245eea45f997488e57a2811f604e0aac702e30614fcd55ecc71858f49b357afb9e8fc5de4 SHA512 57ff9a9cbbbf48b8c4f792458edf0590d7d0df9a5805eab13a4c984713311e98587afca00778e82bd66fb2f330b354ca80703b87922a92f9ae48e5bdecf68442
-EBUILD openxcom-1.0.0_p20180317.ebuild 1690 BLAKE2B a46c2486a3d63e53ba50d3f6e3f41987cbdfe05b61aba997cad9f8fa99a6d69ee0e0cb5f6c77fde3a76185c81862dfdf02e67cb5365a82c0709621ac62ad9d71 SHA512 a5fe223e4cba4e530a99712f5e2650b50758fccebac99e8f036890efcfec672bed5dbca692ca8288ebc078b84589b850ab9635b965366c47138c0417ddfe43d6
-EBUILD openxcom-9999.ebuild 1572 BLAKE2B 3c949b4b4c1d130adf0a7dfcef819028d5019492243d79ad715be3f8c01f77af2405e381f8167a6ad802f3a03a5b139b23a4e808d39d04b5d2bb202a81e84ced SHA512 931ae79bc045eb233f83e521f5429958057940c5155077ddbe7a49867e8d9f72bbe79ad8c0f908d784a05ef48d63e069abf4da011d0259091add59915ab221df
-MISC metadata.xml 335 BLAKE2B c1f058cb6d2d5fb842d9c198a4d68e43457d6bb7f5bed00d5365d1418afc83a54d3d8d816a312f715abf57d942877874ed92cf716477ab912fe2480afbea32bf SHA512 6d1deba17f18970b9425af0038c24be6f0e0fea46a095d34055884d8899442bc1f0a4f72343f2cf1f66f63c5287dc0373086e111b45ee64a47b8715e2237d6cd
diff --git a/games-engines/openxcom/metadata.xml b/games-engines/openxcom/metadata.xml
deleted file mode 100644
index 86822013a1c2..000000000000
--- a/games-engines/openxcom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">SupSuper/OpenXcom</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild b/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild
deleted file mode 100644
index d76a38f5f0b2..000000000000
--- a/games-engines/openxcom/openxcom-1.0.0_p20180317.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils
-
-COMMIT="ea9ac466221f8b4f8974d2db1c42dc4ad6126564"
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
-HOMEPAGE="https://openxcom.org/"
-SRC_URI="https://github.com/SupSuper/OpenXcom/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[flac,mikmod,vorbis]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-S="${WORKDIR}/OpenXcom-${COMMIT}"
-DOCS=( README.md )
-
-src_compile() {
-	use doc && cmake-utils_src_compile doxygen
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
-	elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND,"
-	elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to"
-	elog "/usr/share/${PN}/UFO"
-	echo
-	elog "If you want to play the TFTD mod, you need to copy ANIMS, FLOP_INT,"
-	elog "GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH, UNITS folders"
-	elog "from the original Terror from the Deep game to"
-	elog "/usr/share/${PN}/TFTD"
-	echo
-	elog "If you need or want text in some language other than english, download:"
-	elog "https://openxcom.org/translations/latest.zip and uncompress it in"
-	elog "/usr/share/${PN}/common/Language"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/openxcom/openxcom-9999.ebuild b/games-engines/openxcom/openxcom-9999.ebuild
deleted file mode 100644
index 7726841e5584..000000000000
--- a/games-engines/openxcom/openxcom-9999.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils gnome2-utils git-r3
-
-DESCRIPTION="An open-source reimplementation of the popular UFO: Enemy Unknown"
-HOMEPAGE="https://openxcom.org/"
-EGIT_REPO_URI="https://github.com/SupSuper/OpenXcom.git"
-
-LICENSE="GPL-3+ CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc"
-
-RDEPEND=">=dev-cpp/yaml-cpp-0.5.1
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[flac,mikmod,vorbis]"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-DOCS=( README.md )
-
-src_compile() {
-	use doc && cmake-utils_src_compile doxygen
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	use doc && dodoc -r "${CMAKE_BUILD_DIR}"/docs/html/*
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
-	elog "In order to play you need copy GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND,"
-	elog "TERRAIN, UFOGRAPH, UFOINTRO, UNITS folders from original X-COM game to"
-	elog "/usr/share/${PN}/UFO"
-	echo
-	elog "If you want to play the TFTD mod, you need to copy ANIMS, FLOP_INT,"
-	elog "GEODATA, GEOGRAPH, MAPS, ROUTES, SOUND, TERRAIN, UFOGRAPH, UNITS folders"
-	elog "from the original Terror from the Deep game to"
-	elog "/usr/share/${PN}/TFTD"
-	echo
-	elog "If you need or want text in some language other than english, download:"
-	elog "https://openxcom.org/translations/latest.zip and uncompress it in"
-	elog "/usr/share/${PN}/common/Language"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/qtads-2.1.7-r1 b/games-engines/qtads-2.1.7-r1
new file mode 100644
index 000000000000..92d48c16024f
--- /dev/null
+++ b/games-engines/qtads-2.1.7-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[sound] media-libs/sdl-mixer[midi,vorbis] media-libs/sdl-sound[mp3] dev-qt/qtcore:5 dev-qt/qtgui:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Multimedia interpreter for TADS text adventures
+EAPI=6
+HOMEPAGE=http://qtads.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound] media-libs/sdl-mixer[midi,vorbis] media-libs/sdl-sound[mp3] dev-qt/qtcore:5 dev-qt/qtgui:5
+SLOT=0
+SRC_URI=mirror://sourceforge/qtads/qtads-2.1.7.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d550d8c8570cee5f052fd847c943df3d
diff --git a/games-engines/qtads/Manifest b/games-engines/qtads/Manifest
deleted file mode 100644
index 32678d3baed8..000000000000
--- a/games-engines/qtads/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qtads-2.1.7.tar.bz2 2562026 BLAKE2B daa66022db1b187c2d74fc762fdb60beefb0988401464382d14c6f9bc1455a8046e212cdba9d834decb0efe053b3bb430392696b12bd4f94aaa006744c53a65e SHA512 ab88aa20991642df6048af49d2cd7b804dbb98b3f5c6ab38ad974e8b39531d880eac0eae0ba773f332e9568578b76b677bc35753f7d1e6d9a99d919b15f4c6ee
-EBUILD qtads-2.1.7-r1.ebuild 930 BLAKE2B d8df948d8da8a646e0a2f4e6586e10b03afdc1fd3bd2b9aa9a7a4f50babae0b98166ab2a993625f1b4508090c095ee1d4fde94508547ef5d7db4b5b5380c7cdc SHA512 ea1feb7b2aabc0f403e3176b1a51f3c5924b787a73bdcbd28dc557ffa049f57d7e6b3b14b9885ac66892e6f3ba74e36dd7dcb1a6bc2bfd599486ab85c6c93b5c
-MISC metadata.xml 338 BLAKE2B e923224db53da22487dff5dc33486c7a9b7391d7dbf26a5c11392e0b0808b177488b8b442b888077039d66679cdbd9e87a8389ae347cbc17443eda7e86078015 SHA512 18a82c16eb83363eb440ad9ca6ce1c612a17011194b3e1f50ac2563c0ef72c96c8618643f25ed8df81c852045a281498fabf18468c2181051f28e584738b8472
diff --git a/games-engines/qtads/metadata.xml b/games-engines/qtads/metadata.xml
deleted file mode 100644
index b4146b480895..000000000000
--- a/games-engines/qtads/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">qtads</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-engines/qtads/qtads-2.1.7-r1.ebuild b/games-engines/qtads/qtads-2.1.7-r1.ebuild
deleted file mode 100644
index 500c1f64211d..000000000000
--- a/games-engines/qtads/qtads-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils qmake-utils xdg flag-o-matic
-
-DESCRIPTION="Multimedia interpreter for TADS text adventures"
-HOMEPAGE="http://qtads.sourceforge.net"
-SRC_URI="mirror://sourceforge/qtads/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound]
-	media-libs/sdl-mixer[midi,vorbis]
-	media-libs/sdl-sound[mp3]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# bug 654356 temp fix
-	append-cxxflags -fpermissive
-	eqmake5 qtads.pro -after CONFIG-=silent
-}
-
-src_install() {
-	dobin qtads
-	dodoc AUTHORS HTML_TADS_LICENSE NEWS README
-	insinto /usr
-	doins -r share
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/games-engines/renpy-6.99.12.4-r3 b/games-engines/renpy-6.99.12.4-r3
new file mode 100644
index 000000000000..9b3b108a4930
--- /dev/null
+++ b/games-engines/renpy-6.99.12.4-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-eselect/eselect-renpy-0.7 dev-libs/fribidi ~dev-python/pygame_sdl2-6.99.12.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/python-exec-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/glew:0 media-libs/libpng:0 media-libs/libsdl2[video] media-libs/freetype:2 sys-libs/zlib virtual/ffmpeg dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pkgconfig >=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=Visual novel engine written in python
+EAPI=6
+HOMEPAGE=https://www.renpy.org
+IUSE=development doc examples python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-renpy-0.7 dev-libs/fribidi ~dev-python/pygame_sdl2-6.99.12.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-lang/python-exec-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/glew:0 media-libs/libpng:0 media-libs/libsdl2[video] media-libs/freetype:2 sys-libs/zlib virtual/ffmpeg 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(-)]
+REQUIRED_USE=examples? ( development ) || ( python_targets_python2_7 )
+SLOT=6.99
+SRC_URI=https://www.renpy.org/dl/6.99.12.4/renpy-6.99.12.4-source.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e302fd2c4b82ccccc3d82951a6dcff8f
diff --git a/games-engines/renpy/Manifest b/games-engines/renpy/Manifest
deleted file mode 100644
index 0ed3c48c4c4a..000000000000
--- a/games-engines/renpy/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX renpy-6.99.12.4-compat-infinite-loop.patch 1612 BLAKE2B e6c3a794e4cc94c6a4938290c428117d7b6288058a9d1faf3a0df8501bf30f3b7ef9bee266acf5bf14d1841122e3d05ac2fd66bbcc03b9aa0e18ffb7a1fbc416 SHA512 86cdba778680b46434c49bba345c37d626888d85c24c4f801396fed160d05607ae6c761cd9930b054e09f8a2d107a4ca05f1e5eed0dc4f51ea4ac2625f8cc77a
-AUX renpy-6.99.12.4-compat-style.patch 1964 BLAKE2B cea736433c1b7248c2e1a38b10cd904ef756378abd6dcf520a72c13f38a0b08511df412b4d320788b80e052d1a924e5703ffdfa7e28933d85b247359f55b467d SHA512 199297d0841dd0212708bfbf3aa1950a6c7ba623da156994f09b73f3e797662ad92f85d40c896169d3643be2f20e2deb91357ed8f8c668ad06140b0f582650a5
-AUX renpy-6.99.12.4-compat-window.patch 2488 BLAKE2B 37b8a2145f548fa0e3a569ac290884f68084fcedfd355f8256ef2b98108c4fe393f14ba7f23343c6ed76e481c6e2a721f4aeaaaefd1b4c2b14c2fd6f0ec97a08 SHA512 238d727750b114bd9e68b8d144adab0c470defcd386bd934d2c830f15947718d7dfa5001ef92733a0c3a7ac4b40ca459243b0c68ff8239b960290840d3d7dbf2
-AUX renpy-6.99.12.4-multiple-abi.patch 11945 BLAKE2B 97b4d69a820c5147a64cedd3a677223510952c8b47c3cc05817c193b7d43bbc919436d5bc66e8c9981a676d0ad8a614d0e35a8cabd054e7e6e161b7badc0f154 SHA512 4ff4926ba5e92b2e72e206093a770b5d334a0c25fd4ace48c54b0ec6d8dfcb64a137f97238793703af927906d2df0723d2e36920ed50c6686fe8ba3602880759
-AUX renpy.1 4642 BLAKE2B 446100972a1cb82dd91a25bb03895bdf717f33d1ffa27497a1e71ec561a1cb3ef986962943d890e209231b788d141a5ab86fdbefbc01a8f1c760b998e1b99a46 SHA512 2727a6ff9675a2b82a979faf5d75e7b3b96915f4c7382d22bba35d74674e613f45d4e8437e24edb410aac45cd8d219cc68e118387e538aafb32b0c312443b066
-DIST renpy-6.99.12.4-source.tar.bz2 18192453 BLAKE2B eb00db04fc6ed0aafa0428c3ba0ffe986634f8b536a7cd6c88c6082789554f6d9631f433baa3e34ab91d19509ccef5617e3fe8ec410b96f4b87d489656cc893b SHA512 375b67e15630fc21915136e70bc93db6da7c2da192d39b1256822513ae44974124522c85f1976f2af62df27b5fa11493af488b02abcf0081eeae03e1a69dfca5
-EBUILD renpy-6.99.12.4-r3.ebuild 2600 BLAKE2B c3c5a18a8c0690ab7f842a3e9d52ded8e1db1cd2901ad0356069bcb6837b614c88d3965c7a26d3f61ff772b4a5189949c72e2146c2195039d79d107904f8e43f SHA512 e5d8187c6a2c57212adfa7b24e0939facba7e53ef9308aa29cbdb3a07b1711ef2e233fb24463ef850babf01b27109b435253eb47601f874b3ad3e414a70cfeff
-MISC metadata.xml 1063 BLAKE2B 397a9759c24976baaf19f8603b716edbaaa67c6c1ebb4fa9d971004a05d3b61a1b7fef806b7964b23c9f37c6f91dd3f22c5ae5ee007a760183ffa3cdcf5f4253 SHA512 801640d22f7d54fa918564d14aa0bfbd63c6f106dd1ff690740b93bb7da51012c42b4b75431e3741c47049121bcfb908c3a1cde6b41091b51079c5f0cacc0753
diff --git a/games-engines/renpy/files/renpy-6.99.12.4-compat-infinite-loop.patch b/games-engines/renpy/files/renpy-6.99.12.4-compat-infinite-loop.patch
deleted file mode 100644
index 3a2942cb04fd..000000000000
--- a/games-engines/renpy/files/renpy-6.99.12.4-compat-infinite-loop.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Adapted from git HEAD:
-commit ff308191a190bf7c5c2118a31f3d8569a0904c04
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date:   Mon Jul 17 08:00:07 2017 +0300
-
-    Increase infinite loop hardcoded values
-    
-    On many old hardware, e.g on my Atom netbook games hit this limit,
-    but otherwise work fine. Increasing the limit helps. People are
-    also reporting this issue in many cases (old laptops, stow tablets,
-    etc where games fail due to this issue and work otherwise):
-    
-    https://translationprojectvisualnovels.blogspot.ru/2016/09/monster-girl-quest-android-15092016.html
-    https://lemmasoft.renai.us/forums/viewtopic.php?f=8&t=30521&start=90
-    https://steamcommunity.com/app/356530/discussions/0/365163686036650662/
-    (and many more, just google)
-
-index 00c7562..a7e361c 100644
---- a/renpy/display/core.py
-+++ b/renpy/display/core.py
-@@ -2845,7 +2845,7 @@ class Interface(object):
- 
-             while rv is None:
- 
--                renpy.execution.not_infinite_loop(10)
-+                renpy.execution.not_infinite_loop(50)
- 
-                 # Check for a change in fullscreen preference.
-                 if ((self.fullscreen != renpy.game.preferences.fullscreen) or
-diff --git a/renpy/main.py b/renpy/main.py
-index 6f14d77..960d2fd 100644
---- a/renpy/main.py
-+++ b/renpy/main.py
-@@ -318,7 +318,7 @@ def main():
-     game.contexts = [ renpy.execution.Context(False) ]
-     game.contexts[0].init_phase = True
- 
--    renpy.execution.not_infinite_loop(60)
-+    renpy.execution.not_infinite_loop(300)
- 
-     # Load the script.
-     renpy.game.exception_info = 'While loading the script.'
diff --git a/games-engines/renpy/files/renpy-6.99.12.4-compat-style.patch b/games-engines/renpy/files/renpy-6.99.12.4-compat-style.patch
deleted file mode 100644
index 122ebf1e43e6..000000000000
--- a/games-engines/renpy/files/renpy-6.99.12.4-compat-style.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 1d350d993d2b51df7880e92b48ed103e059ec385
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date:   Sun Jul 16 17:07:27 2017 +0300
-
-    Fix compatibility problem With ElvenRelations-1.2:
-    
-    When starting game:
-    
-    Full traceback:
-      File "/home/andrew/src/_compat/styles.rpymc", line 22, in script
-      File "/usr/lib64/python2.7/site-packages/renpy699/renpy/ast.py", line 814, in execute
-        renpy.python.py_exec_bytecode(self.code.bytecode, self.hide, store=self.store)
-      File "/usr/lib64/python2.7/site-packages/renpy699/renpy/python.py", line 1719, in py_exec_bytecode
-        exec bytecode in globals, locals
-      File "renpy/common/_compat/styles.rpym", line 374, in <module>
-        style.selected_button = _SelectedCompat('button')
-      File "renpy/common/_compat/styles.rpym", line 347, in __init__
-        self.target = target
-      File "renpy/style.pyx", line 378, in renpy.style.StyleCore.__setattr__ (gen/renpy.style.c:6236)
-        raise Exception("Style property {} is not known.".format(name))
-    Exception: Style property target is not known.
-    
-    "button*" properties are no longer present in RenPy, so relevant
-    code is removed.
-
-diff --git a/renpy/common/_compat/styles.rpym b/renpy/common/_compat/styles.rpym
-index d83eeb0..174f0b6 100644
---- a/renpy/common/_compat/styles.rpym
-+++ b/renpy/common/_compat/styles.rpym
-@@ -371,13 +371,6 @@ init python:
-             self.property_updates = [ ]
- 
- 
--    style.selected_button = _SelectedCompat('button')
--    style.selected_button_text = _SelectedCompat('button_text')
--    style.gm_nav_selected_button = _SelectedCompat('gm_nav_button')
--    style.gm_nav_selected_button_text = _SelectedCompat('gm_nav_button_text')
--    style.prefs_selected_button = _SelectedCompat('prefs_button')
--    style.prefs_selected_button_text = _SelectedCompat('prefs_button_text')
--
-     def _apply_selected_compat():
-         for scs in _selected_compat:
-             scs.apply()
diff --git a/games-engines/renpy/files/renpy-6.99.12.4-compat-window.patch b/games-engines/renpy/files/renpy-6.99.12.4-compat-window.patch
deleted file mode 100644
index 8c8bd21b4f65..000000000000
--- a/games-engines/renpy/files/renpy-6.99.12.4-compat-window.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit cf3f7fd4cb69c154f43a5e00c7501463a6d63ff5
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date:   Sun Jul 16 16:59:14 2017 +0300
-
-    Fix compatibility problem with Katawa Shoujo 1.3.1
-    
-    The game fails to start with renpy-6.99.12.4:
-    
-    I'm sorry, but an uncaught exception occurred.
-    
-    While running game code:
-      File "game/ui_settings.rpy", line 21, in <module>
-      File "renpy/common/00compat.rpy", line 134, in _set_script_version
-        config.window_auto_hide.remove("call screen")
-    ValueError: list.remove(x): x not in list
-    
-    -- Full Traceback ------------------------------------------------------------
-    
-    Full traceback:
-      File "/home/rondo/ui_settings.rpyc", line 2, in script
-      File "/usr/lib64/python2.7/site-packages/renpy699/renpy/ast.py", line 814, in execute
-        renpy.python.py_exec_bytecode(self.code.bytecode, self.hide, store=self.store)
-      File "/usr/lib64/python2.7/site-packages/renpy699/renpy/python.py", line 1695, in py_exec_bytecode
-        exec bytecode in globals, locals
-      File "game/ui_settings.rpy", line 21, in <module>
-      File "/usr/lib64/python2.7/site-packages/renpy699/renpy/defaultstore.py", line 92, in __setattr__
-        renpy.store._set_script_version(value)  # E1101 @UndefinedVariable
-      File "renpy/common/00compat.rpy", line 134, in _set_script_version
-        config.window_auto_hide.remove("call screen")
-      File "/usr/lib64/python2.7/site-packages/renpy699/renpy/python.py", line 610, in do_mutation
-        return method(self, *args, **kwargs)
-    ValueError: list.remove(x): x not in list
-    
-    This happens because "call screen" element is being unconditionally
-    removed from config.window_auto_hide list, though it is not always
-    present there. A simple if check fixes this.
-
-diff --git a/renpy/common/00compat.rpy b/renpy/common/00compat.rpy
-index c16ad1d..eefb8e0 100644
---- a/renpy/common/00compat.rpy
-+++ b/renpy/common/00compat.rpy
-@@ -131,7 +131,8 @@ init -1900 python:
-         if version <= (6, 99, 10):
-             config.new_translate_order = False
-             config.old_say_args = True
--            config.window_auto_hide.remove("call screen")
-+            if "call screen" in config.window_auto_hide:
-+                config.window_auto_hide.remove("call screen")
-             config.quit_action = ui.gamemenus("_quit_prompt")
-             config.enforce_window_max_size = False
-             config.splashscreen_suppress_overlay = False
diff --git a/games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch b/games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch
deleted file mode 100644
index 3a7355e60bed..000000000000
--- a/games-engines/renpy/files/renpy-6.99.12.4-multiple-abi.patch
+++ /dev/null
@@ -1,357 +0,0 @@
-From 7aa51dae5eb2f2123fee9bca23a2ce2f1b1c3f10 Mon Sep 17 00:00:00 2001
-From: hasufell <hasufell@gentoo.org>
-Date: Thu, 20 Aug 2015 01:10:58 +0200
-Subject: [PATCH] Fix multiple abi support
-
----
- renpy.py        | 128 ++--------------------------------------------------
- renpy/common.py | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- renpy/main.py   |   6 +--
- 3 files changed, 144 insertions(+), 127 deletions(-)
- create mode 100644 renpy/common.py
-
-diff --git a/renpy.py b/renpy.py
-index 7548cf6..8ec7353 100644
---- a/renpy.py
-+++ b/renpy.py
-@@ -28,122 +28,9 @@
- import os
- import sys
- import warnings
--
--# Functions to be customized by distributors. ################################
--
--# Given the Ren'Py base directory (usually the directory containing
--# this file), this is expected to return the path to the common directory.
--
--
--def path_to_common(renpy_base):
--    return renpy_base + "/renpy/common"
--
--# Given a directory holding a Ren'Py game, this is expected to return
--# the path to a directory that will hold save files.
--
--
--def path_to_saves(gamedir, save_directory=None):
--    import renpy  # @UnresolvedImport
--
--    if save_directory is None:
--        save_directory = renpy.config.save_directory
--        save_directory = renpy.exports.fsencode(save_directory)
--
--    # Makes sure the permissions are right on the save directory.
--    def test_writable(d):
--        try:
--            fn = os.path.join(d, "test.txt")
--            open(fn, "w").close()
--            open(fn, "r").close()
--            os.unlink(fn)
--            return True
--        except:
--            return False
--
--    # Android.
--    if renpy.android:
--        paths = [
--            os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
--            os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
--            os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
--            ]
--
--        for rv in paths:
--            if os.path.isdir(rv) and test_writable(rv):
--                break
--
--        print("Saving to", rv)
--
--        # We return the last path as the default.
--
--        return rv
--
--    if renpy.ios:
--        from pyobjus import autoclass
--        from pyobjus.objc_py_types import enum
--
--        NSSearchPathDirectory = enum("NSSearchPathDirectory", NSDocumentDirectory=9)
--        NSSearchPathDomainMask = enum("NSSearchPathDomainMask", NSUserDomainMask=1)
--
--        NSFileManager = autoclass('NSFileManager')
--        manager = NSFileManager.defaultManager()
--        url = manager.URLsForDirectory_inDomains_(
--            NSSearchPathDirectory.NSDocumentDirectory,
--            NSSearchPathDomainMask.NSUserDomainMask,
--            ).lastObject()
--
--        # url.path seems to change type based on iOS version, for some reason.
--        try:
--            rv = url.path().UTF8String().decode("utf-8")
--        except:
--            rv = url.path.UTF8String().decode("utf-8")
--
--        print("Saving to", rv)
--        return rv
--
--    # No save directory given.
--    if not save_directory:
--        return gamedir + "/saves"
--
--    # Search the path above Ren'Py for a directory named "Ren'Py Data".
--    # If it exists, then use that for our save directory.
--    path = renpy.config.renpy_base
--
--    while True:
--        if os.path.isdir(path + "/Ren'Py Data"):
--            return path + "/Ren'Py Data/" + save_directory
--
--        newpath = os.path.dirname(path)
--        if path == newpath:
--            break
--        path = newpath
--
--    # Otherwise, put the saves in a platform-specific location.
--    if renpy.macintosh:
--        rv = "~/Library/RenPy/" + save_directory
--        return os.path.expanduser(rv)
--
--    elif renpy.windows:
--        if 'APPDATA' in os.environ:
--            return os.environ['APPDATA'] + "/RenPy/" + save_directory
--        else:
--            rv = "~/RenPy/" + renpy.config.save_directory
--            return os.path.expanduser(rv)
--
--    else:
--        rv = "~/.renpy/" + save_directory
--        return os.path.expanduser(rv)
--
--
--# Returns the path to the Ren'Py base directory (containing common and
--# the launcher, usually.)
--def path_to_renpy_base():
--    renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
--    renpy_base = os.path.abspath(renpy_base)
--
--    return renpy_base
--
--##############################################################################
-+from distutils.sysconfig import get_python_lib
-+sys.path.append(get_python_lib() + "/renpy@SLOT@")
-+import renpy.common as common
- 
- # The version of the Mac Launcher and py4renpy that we require.
- macos_version = (6, 14, 0)
-@@ -154,21 +45,9 @@ except:
-     print("Ren'Py requires at least python 2.6.")
-     sys.exit(0)
- 
--android = ("ANDROID_PRIVATE" in os.environ)
--
--# Android requires us to add code to the main module, and to command some
--# renderers.
--if android:
--    __main__ = sys.modules["__main__"]
--    __main__.path_to_renpy_base = path_to_renpy_base
--    __main__.path_to_common = path_to_common
--    __main__.path_to_saves = path_to_saves
--    os.environ["RENPY_RENDERER"] = "gl"
--
--
- def main():
- 
--    renpy_base = path_to_renpy_base()
-+    renpy_base = common.path_to_renpy_base()
- 
-     # Add paths.
-     if os.path.exists(renpy_base + "/module"):
-diff --git a/renpy/common.py b/renpy/common.py
-new file mode 100644
-index 0000000..0d60e36
---- /dev/null
-+++ b/renpy/common.py
-@@ -0,0 +1,137 @@
-+# This file is part of Ren'Py. The license below applies to Ren'Py only.
-+# Games and other projects that use Ren'Py may use a different license.
-+
-+# Copyright 2004-2015 Tom Rothamel <pytom@bishoujo.us>
-+#
-+# Permission is hereby granted, free of charge, to any person
-+# obtaining a copy of this software and associated documentation files
-+# (the "Software"), to deal in the Software without restriction,
-+# including without limitation the rights to use, copy, modify, merge,
-+# publish, distribute, sublicense, and/or sell copies of the Software,
-+# and to permit persons to whom the Software is furnished to do so,
-+# subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be
-+# included in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+import os
-+import sys
-+import warnings
-+from distutils.sysconfig import get_python_lib
-+
-+# Given the Ren'Py base directory (usually the directory containing
-+# this file), this is expected to return the path to the common directory.
-+def path_to_common(renpy_base):
-+    return renpy_base + "/renpy/common"
-+
-+# Given a directory holding a Ren'Py game, this is expected to return
-+# the path to a directory that will hold save files.
-+def path_to_saves(gamedir, save_directory=None):
-+    import renpy #@UnresolvedImport
-+
-+    if save_directory is None:
-+        save_directory = renpy.config.save_directory
-+
-+    # Makes sure the permissions are right on the save directory.
-+    def test_writable(d):
-+        try:
-+            fn = os.path.join(d, "test.txt")
-+            open(fn, "w").close()
-+            open(fn, "r").close()
-+            os.unlink(fn)
-+            return True
-+        except:
-+            return False
-+
-+
-+    # Android.
-+    if renpy.android:
-+        paths = [
-+            os.path.join(os.environ["ANDROID_OLD_PUBLIC"], "game/saves"),
-+            os.path.join(os.environ["ANDROID_PRIVATE"], "saves"),
-+            os.path.join(os.environ["ANDROID_PUBLIC"], "saves"),
-+            ]
-+
-+        for rv in paths:
-+            if os.path.isdir(rv) and test_writable(rv):
-+                break
-+
-+        print "Saving to", rv
-+
-+        # We return the last path as the default.
-+
-+        return rv
-+
-+    if renpy.ios:
-+        from pyobjus import autoclass
-+        from pyobjus.objc_py_types import enum
-+
-+        NSSearchPathDirectory = enum("NSSearchPathDirectory", NSDocumentDirectory=9)
-+        NSSearchPathDomainMask = enum("NSSearchPathDomainMask", NSUserDomainMask=1)
-+
-+        NSFileManager = autoclass('NSFileManager')
-+        manager = NSFileManager.defaultManager()
-+        url = manager.URLsForDirectory_inDomains_(
-+            NSSearchPathDirectory.NSDocumentDirectory,
-+            NSSearchPathDomainMask.NSUserDomainMask,
-+            ).lastObject()
-+
-+        # url.path seems to change type based on iOS version, for some reason.
-+        try:
-+            rv = url.path().UTF8String().decode("utf-8")
-+        except:
-+            rv = url.path.UTF8String().decode("utf-8")
-+
-+        print "Saving to", rv
-+        return rv
-+
-+    # No save directory given.
-+    if not save_directory:
-+        return gamedir + "/saves"
-+
-+    # Search the path above Ren'Py for a directory named "Ren'Py Data".
-+    # If it exists, then use that for our save directory.
-+    path = renpy.config.renpy_base
-+
-+    while True:
-+        if os.path.isdir(path + "/Ren'Py Data"):
-+            return path + "/Ren'Py Data/" + save_directory
-+
-+        newpath = os.path.dirname(path)
-+        if path == newpath:
-+            break
-+        path = newpath
-+
-+    # Otherwise, put the saves in a platform-specific location.
-+    if renpy.macintosh:
-+        rv = "~/Library/RenPy/" + save_directory
-+        return os.path.expanduser(rv)
-+
-+    elif renpy.windows:
-+        if 'APPDATA' in os.environ:
-+            return os.environ['APPDATA'] + "/RenPy/" + save_directory
-+        else:
-+            rv = "~/RenPy/" + renpy.config.save_directory
-+            return os.path.expanduser(rv)
-+
-+    else:
-+        rv = "~/.renpy/" + save_directory
-+        return os.path.expanduser(rv)
-+
-+
-+# Returns the path to the Ren'Py base directory (containing common and
-+# the launcher, usually.)
-+def path_to_renpy_base():
-+    renpy_base = os.path.dirname(os.path.realpath(sys.argv[0]))
-+    renpy_base = get_python_lib() + "/renpy@SLOT@"
-+    renpy_base = os.path.abspath(renpy_base)
-+
-+    return renpy_base
-diff --git a/renpy/main.py b/renpy/main.py
-index 73e7239..6807ba1 100644
---- a/renpy/main.py
-+++ b/renpy/main.py
-@@ -27,7 +27,7 @@ import os
- import sys
- import time
- import zipfile
--import __main__
-+import renpy.common as common
- 
- 
- last_clock = time.time()
-@@ -273,7 +273,7 @@ def main():
-     renpy.config.searchpath = [ renpy.config.gamedir ]
- 
-     # Find the common directory.
--    commondir = __main__.path_to_common(renpy.config.renpy_base)  # E1101 @UndefinedVariable
-+    commondir = common.path_to_common(renpy.config.renpy_base)  # E1101 @UndefinedVariable
- 
-     if os.path.isdir(commondir):
-         renpy.config.searchpath.append(commondir)
-@@ -371,7 +371,7 @@ def main():
- 
-     # Find the save directory.
-     if renpy.config.savedir is None:
--        renpy.config.savedir = __main__.path_to_saves(renpy.config.gamedir)  # E1101 @UndefinedVariable
-+        renpy.config.savedir = common.path_to_saves(renpy.config.gamedir)  # E1101 @UndefinedVariable
- 
-     if renpy.game.args.savedir:  # @UndefinedVariable
-         renpy.config.savedir = renpy.game.args.savedir  # @UndefinedVariable
-diff --git a/renpy/script.py b/renpy/script.py
-index 73e7239..6807ba1 100644
---- a/renpy/script.py
-+++ b/renpy/script.py
-@@ -150,8 +150,8 @@ import os
-            if renpy.loader.loadable(i):
-                return None
-
--        import __main__
--        backups = __main__.path_to_saves(renpy.config.gamedir, "backups")  # @UndefinedVariable
-+        import renpy.common as common
-+        backups = common.path_to_saves(renpy.config.gamedir, "backups")  # @UndefinedVariable
-
-        if backups is None:
-            return
--- 
-2.5.0
-
diff --git a/games-engines/renpy/files/renpy.1 b/games-engines/renpy/files/renpy.1
deleted file mode 100644
index e8b7a2b61958..000000000000
--- a/games-engines/renpy/files/renpy.1
+++ /dev/null
@@ -1,163 +0,0 @@
-.\" Copyright © 2015 Andrew Savchenko
-.\" Distributed under the terms of GNU FDL-1.3+ license,
-.\" based on original Ren'Py documentation licensed under MIT.
-.TH renpy 1 "31 May 2015" "Ren'Py" "Ren'Py Gentoo's manual"
-.SH NAME
-renpy \- a visual novel engine
-
-.SH SYNOPSIS
-.BI renpy " game_directory"
-.\" ****************************************************************
-.SH DESCRIPTION
-
-.B renpy
-(Ren'Py) is a visual novel engine \- used by hundreds of creators
-from around the world \- that helps you use words, images, and
-sounds to tell interactive stories that run on computers and mobile
-devices. These can be both visual novels and life simulation games.
-The easy to learn script language allows anyone to efficiently
-write large visual novels, while its 
-.BR python (1)
-scripting is enough for complex simulation games.
-.\" ****************************************************************
-.SH RUNNING A GAME
-
-In order to run a game, provide
-.I game_directory
-as an argument to
-.BR renpy .
-Exact directory name may vary depending or a game, but usually
-this path corresponds to
-.I */game
-wildcard and contains
-.I script_version.rpy*
-file within. Game directory usually contains other
-.IR *.rpy* " and  " *.rpa " files."
-
-One may use
-.BR find (1)
-tool to locate required directory within unpacked game top
-directory:
-.RS
-
-find -O3 
-.I top_directory
--type f -iname "script_version.rpy*"
-
-.RE
-A directory one level above may be provided as an argument as well.
-.\" ****************************************************************
-.SH PORTABILITY
-
-All
-.B renpy
-games are written in
-.BR python (1),
-so one can run then on any platform and architecture.
-
-As you may have noticed, Ren'Py games are often distributed in
-different archives for different architectures. This happens due to
-bundling of
-.BR python (1)
-interpreter and required libraries in a game's tarball. Since you
-are using OS native
-.B renpy
-setup, you should be able to run any of these games.
-.\" ****************************************************************
-.SH GAMES CATALOGUE
-
-A large catalogue of Ren'Py powered games is available at
-.IR http://games.renpy.org/ .
-.\" ****************************************************************
-.SH TROUBLESHOOTING
-
-In some cases game may fail to run with current
-.B renpy
-version due to various errors.
-
-In such case please try to use the closest
-.B renpy
-version to one used by game developer. Most games contain
-.IR script_version.rpy " file in the " game " directory."
-This file actually contains
-.B renpy
-version used during a game build.
-You may install multiple slots of
-.B renpy
-in Gentoo and use
-.BI eselect " renpy"
-module to switch between various versions.
-
-If
-.I game
-directory contains both 
-.IR *.rpyc " (or " *.rpyo ") and " *.rpy " files, delete"
-.IR *.rpyc " (or " *.rpyo ") files, they will be regenerated by"
-the interpreter.
-Another solution will be to switch between version of
-.BR python (1)
-using
-.IR eselect (1)
-tool in order to find one suitable to interpret game's
-.IR *.rpyc " files."
-
-Some games may lack general media files, e.g.
-.I click.ogg
-sound, so you should create or download one and place in the
-.I game
-directory.
-
-Also please pay attention to
-.I problems.html
-page from
-.B renpy
-html documentation, see
-.B FURTHER READING
-section.
-.\" ****************************************************************
-.SH ENVIRONMENT VARIABLES
-
-.B renpy
-supports a number of environment variables to control its
-behaviour. Please refer to html docs for further details
-(see
-.B FURTHER READING
-section).
-.\" ****************************************************************
-.SH FURTHER READING
-
-.B renpy
-comes with extensive html documentation. To use it install
-.B renpy
-with
-.I USE="doc"
-and go to 
-.I /usr/share/doc/renpy-*/html/doc/index.html
-
-Alternatively one may refer to online documentation:
-.IR http://www.renpy.org/doc/html/ .
-Be warned that online docs maybe different from your current active
-version, so it recommended to use shipped documentation instead.
-.\" ****************************************************************
-.SH BUGS
-
-Any bugs related to Gentoo packaging (e.g. omitted dependencies)
-please report on bugzilla:
-.IR https://bugs.gentoo.org .
-
-For bugs in the Ren'Py engine itself, please contact upstream:
-.I https://github.com/renpy/renpy/issues
-and add a Gentoo bug if you feel it necessary.
-
-For issues with games themselves please contact corresponding
-authors.
-.\" ****************************************************************
-.SH SEE ALSO
-
-.BR python (1)
-\- an interpreter used by Ren'Py engine.
-
-.BR unrpa (1)
-\- a tool to unpack
-.I *.rpa
-data files (Ren'Py Archives).
diff --git a/games-engines/renpy/metadata.xml b/games-engines/renpy/metadata.xml
deleted file mode 100644
index 98b754cf6590..000000000000
--- a/games-engines/renpy/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
-	<longdescription>
-		Ren'Py is a free and cross-platform visual novel engine that
-		helps you use words,
-		pictures, and sounds to tell stories with the computer.
-		It`s easy and efficient script language makes it possible for
-		non-programmers to make visual novels,
-		while its Python support allows for complex simulation games.
-	</longdescription>
-	<use>
-		<flag name="development">Install IDE for game developers and
-			an empty game template</flag>
-	</use>
-	<upstream>
-		<maintainer status="active">
-			<email>pytom@bishoujo.us</email>
-			<name>Tom Rothamel</name>
-		</maintainer>
-		<changelog>http://www.renpy.org/latest.html</changelog>
-		<bugs-to>https://github.com/renpy/renpy/issues</bugs-to>
-		<doc>http://renpy.org/wiki/renpy/doc</doc>
-		<remote-id type="github">renpy/renpy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild b/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
deleted file mode 100644
index c330a8ab54ba..000000000000
--- a/games-engines/renpy/renpy-6.99.12.4-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit eutils gnome2-utils toolchain-funcs versionator distutils-r1
-
-DESCRIPTION="Visual novel engine written in python"
-HOMEPAGE="https://www.renpy.org"
-SRC_URI="https://www.renpy.org/dl/${PV}/${P}-source.tar.bz2"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-MYSLOT=$(delete_all_version_separators ${SLOT})
-KEYWORDS="amd64 x86"
-IUSE="development doc examples"
-REQUIRED_USE="examples? ( development )"
-
-RDEPEND="
-	>=app-eselect/eselect-renpy-0.7
-	dev-libs/fribidi
-	~dev-python/pygame_sdl2-${PV}[${PYTHON_USEDEP}]
-	>=dev-lang/python-exec-0.3[${PYTHON_USEDEP}]
-	media-libs/glew:0
-	media-libs/libpng:0
-	media-libs/libsdl2[video]
-	media-libs/freetype:2
-	sys-libs/zlib
-	virtual/ffmpeg"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multiple-abi.patch
-	"${FILESDIR}"/${P}-compat-window.patch #601200
-	"${FILESDIR}"/${P}-compat-style.patch
-	"${FILESDIR}"/${P}-compat-infinite-loop.patch
-)
-
-python_prepare_all() {
-	export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags fribidi)"
-	distutils-r1_python_prepare_all
-
-	einfo "Deleting precompiled python files"
-	find . -name '*.py[co]' -print -delete || die
-
-	sed -i \
-		-e "s/@SLOT@/${MYSLOT}/" \
-		renpy.py renpy/common.py || die "setting slot failed!"
-}
-
-python_compile() {
-	cd "${S}"/module || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd "${S}"/module || die
-	distutils-r1_python_install --install-lib="$(python_get_sitedir)/renpy${MYSLOT}"
-
-	cd "${S}" || die
-	python_newscript renpy.py ${PN}-${SLOT}
-
-	python_moduleinto renpy${MYSLOT}
-	python_domodule renpy
-	if use development ; then
-		python_domodule launcher templates
-	fi
-	if use examples ; then
-		python_domodule the_question tutorial
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use development; then
-		newicon -s 32 launcher/game/images/logo32.png ${P}.png
-		make_desktop_entry ${PN}-${SLOT} "Ren'Py ${PV}" ${P}
-	fi
-
-	if use doc; then
-		insinto "/usr/share/doc/${PF}/html"
-		doins -r doc/*
-	fi
-	newman "${FILESDIR}/${PN}.1" "${P}.1"
-}
-
-pkg_preinst() {
-	use development && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use development && gnome2_icon_cache_update
-
-	einfo "running: eselect renpy update --if-unset"
-	eselect renpy update --if-unset
-}
-
-pkg_postrm() {
-	use development && gnome2_icon_cache_update
-
-	einfo "running: eselect renpy update --if-unset"
-	eselect renpy update --if-unset
-}
diff --git a/games-engines/residualvm-0.2.1-r1 b/games-engines/residualvm-0.2.1-r1
new file mode 100644
index 000000000000..4b8c28d42fca
--- /dev/null
+++ b/games-engines/residualvm-0.2.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl >=sys-apps/sed-4
+DESCRIPTION=A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures
+EAPI=6
+HOMEPAGE=http://www.residualvm.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=media-libs/alsa-lib media-libs/freetype:2 media-libs/libsdl[X,sound,alsa,joystick,opengl,video] sys-libs/zlib virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/residualvm/residualvm-0.2.1-sources.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_=14700c4881d0a319b29ed4774e2f3975
diff --git a/games-engines/residualvm/Manifest b/games-engines/residualvm/Manifest
deleted file mode 100644
index b853dcbd8487..000000000000
--- a/games-engines/residualvm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST residualvm-0.2.1-sources.tar.bz2 5533814 BLAKE2B befcb42c823d31ff1e8793d0c902bfdf6b3728530c97b3f43ada5d3b2903a0cddba3247095d1674e62cdd75a6db28a7a5f3b1437e5c39cb5eccb37dff9d52fad SHA512 9eed93770ef1ad828934c32e937b861c93f1ebbb0d936f3f56668e654588f734dc88e29446f0a69f8f26475e96b8ce7ca85318758b99aabc9586756692c721da
-EBUILD residualvm-0.2.1-r1.ebuild 1791 BLAKE2B 72cb7fe160b57c2e5d2858fd2aeb3f5b82041374f7523a64f43b69eb211c877d69898e1c2fcf15ba7111ea75ca24a14215cf0d892a65a4ccca47d2e659eed9e8 SHA512 e18cd04be84436fc4f13de9c9aaafa27f5888dfb0cc24e6713916105d515089e1ca23c7870da98138d8c2e673b8f79d54e13904b5b1966530277e485b875f661
-MISC metadata.xml 333 BLAKE2B 37cda9e5ddf385a47b3ad7c5678bd318b79b5c6b87dab92523ad6fd44b850470eae65a01562213709c0b2f6f943c023e5892588ffe484fae12780e531c1725f0 SHA512 41e3a0c69255f5f64ff9c3806e7f1871e0721dc9554d92f370e809487975454b6747818c93da77ad2b8c579b26948ac0a48ac4bb9969838e91f48f51dae2d2f7
diff --git a/games-engines/residualvm/metadata.xml b/games-engines/residualvm/metadata.xml
deleted file mode 100644
index f346e5457981..000000000000
--- a/games-engines/residualvm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">residualvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/residualvm/residualvm-0.2.1-r1.ebuild b/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
deleted file mode 100644
index 5d005b46ebc2..000000000000
--- a/games-engines/residualvm/residualvm-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs gnome2-utils
-
-DESCRIPTION="A cross-platform 3D game interpreter for play LucasArts' LUA-based 3D adventures"
-HOMEPAGE="http://www.residualvm.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# TODO: fix dynamic plugin support
-# games crash without media-libs/libsdl[alsa]
-RDEPEND="
-	media-libs/alsa-lib
-	media-libs/freetype:2
-	media-libs/libsdl[X,sound,alsa,joystick,opengl,video]
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# not an autotools script
-	# most configure options currently do nothing, verify on version bump !!!
-	# disable explicitly, otherwise we get unneeded linkage (some copy-paste build system)
-	./configure \
-		--backend=sdl \
-		--disable-debug \
-		--disable-faad \
-		--disable-flac \
-		--disable-fluidsynth \
-		--disable-libunity \
-		--disable-mad \
-		--disable-sparkle \
-		--disable-translation \
-		--disable-tremor \
-		--disable-vorbis \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-all-engines \
-		--enable-release-mode \
-		--enable-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake \
-		VERBOSE_BUILD=1 \
-		AR="$(tc-getAR) cru" \
-		RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	dobin residualvm
-
-	insinto "/usr/share/${PN}"
-	doins gui/themes/modern.zip dists/engine-data/residualvm-grim-patch.lab
-
-	doicon -s scalable icons/${PN}.svg
-	doicon -s 256 icons/${PN}.png
-	domenu dists/${PN}.desktop
-
-	doman dists/${PN}.6
-	dodoc AUTHORS README.md KNOWN_BUGS TODO
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/scummvm-1.9.0 b/games-engines/scummvm-1.9.0
new file mode 100644
index 000000000000..2215b54fbea1
--- /dev/null
+++ b/games-engines/scummvm-1.9.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth ) app-arch/xz-utils x86? ( dev-lang/nasm ) >=sys-apps/sed-4
+DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
+EAPI=6
+HOMEPAGE=http://scummvm.sourceforge.net/
+IUSE=aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
+RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://scummvm.org/frs/scummvm/1.9.0/scummvm-1.9.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=549a9e6a77536077a9b16e3758f371ad
diff --git a/games-engines/scummvm-2.0.0 b/games-engines/scummvm-2.0.0
new file mode 100644
index 000000000000..218440478f8f
--- /dev/null
+++ b/games-engines/scummvm-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth ) app-arch/xz-utils truetype? ( virtual/pkgconfig ) x86? ( dev-lang/nasm ) >=sys-apps/sed-4
+DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
+EAPI=6
+HOMEPAGE=http://scummvm.sourceforge.net/
+IUSE=aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
+RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://scummvm.org/frs/scummvm/2.0.0/scummvm-2.0.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=77d778d47f4f99317578b32dc57d9de7
diff --git a/games-engines/scummvm-tools-1.8.0-r1 b/games-engines/scummvm-tools-1.8.0-r1
new file mode 100644
index 000000000000..40ac48c5eef4
--- /dev/null
+++ b/games-engines/scummvm-tools-1.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=utilities for the SCUMM game engine
+EAPI=6
+HOMEPAGE=http://scummvm.sourceforge.net/
+IUSE=flac iconv mad png vorbis
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://scummvm.org/frs/scummvm-tools/1.8.0/scummvm-tools-1.8.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=3302adb1fb1e7100a9c2ddf71ca272d2
diff --git a/games-engines/scummvm-tools-2.0.0-r1 b/games-engines/scummvm-tools-2.0.0-r1
new file mode 100644
index 000000000000..f3c69f984762
--- /dev/null
+++ b/games-engines/scummvm-tools-2.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=utilities for the SCUMM game engine
+EAPI=6
+HOMEPAGE=http://scummvm.sourceforge.net/
+IUSE=flac iconv mad png vorbis
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://scummvm.org/frs/scummvm-tools/2.0.0/scummvm-tools-2.0.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=cfcdeaac1600744ec8ab7e969ada0434
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
deleted file mode 100644
index 840736aa0c6b..000000000000
--- a/games-engines/scummvm-tools/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a8a1dd025bfa872bd78cc31f05c01b2d559f619f3f1f15dd9f26a66d192410fc5404a5b0afee636cd33603112535500d07459 SHA512 4d2f06dcc3092dd5abab218b68c83dfc2353810b56e3a1d41fab1c7eb20b008ed2e54af486c4c4f2ecbd383ef0afa6f333ed90c694ed3b1733393a6f2ef6fbe3
-DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb SHA512 eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
-DIST scummvm-tools-2.0.0.tar.xz 866668 BLAKE2B 51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff SHA512 a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60
-EBUILD scummvm-tools-1.8.0-r1.ebuild 1304 BLAKE2B 4b785438ab857a6f5e91cafc38321d6da9564c4158cf836dff9de4f48532cb107a66e6cd0e510e8635ee889c5c5f57589bcfe44ed7014360f03c5a0d6802f1c1 SHA512 42ff6659c2505d40df6b107958e138d3e346402b1bbed325a10a30bb5041091096a07e78114fdb8ac597b76aa5a9fda3f01b76350d1416565185738bc18c4cf1
-EBUILD scummvm-tools-2.0.0-r1.ebuild 1329 BLAKE2B e9df7435834d8c821d9c1d9474e1db6548660a7e8bc63b4afb3a5030129e8ccdb161a6b91f018b49a8486dcd033ee5503109ad980e446ac7d436071e5d15d99e SHA512 c374224b21960b1645d56bf215373054a8bfbb2b6a92e524e0afb936c3609f397d8540b26b3f51ea8b39acb0dd4d2ca967626bb35fd3659dd2aef21613c841a8
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch b/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch
deleted file mode 100644
index 604db075395c..000000000000
--- a/games-engines/scummvm-tools/files/scummvm-tools-1.8.0-binprefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scummvm-tools-1.7.0.orig/Makefile.common
-+++ scummvm-tools-1.7.0/Makefile.common
-@@ -312,7 +312,7 @@
- install: $(TARGETS)
- 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(BINDIR)
- 	$(INSTALL) -p -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
--	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR) ; done
-+	for i in $^ ; do $(INSTALL) -p -m 0755 $$i $(DESTDIR)$(BINDIR)/$(EXEPREFIX)$$i ; done
- 	$(INSTALL) -m 0755 -d $(DESTDIR)$(DATADIR)/scummvm-tools
- 	$(INSTALL) -p -m 0644 $(srcdir)/gui/media/*.* $(DESTDIR)$(DATADIR)/scummvm-tools
- 
diff --git a/games-engines/scummvm-tools/metadata.xml b/games-engines/scummvm-tools/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-engines/scummvm-tools/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
deleted file mode 100644
index 114768f9f886..000000000000
--- a/games-engines/scummvm-tools/scummvm-tools-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit wxwidgets eutils flag-o-matic
-
-DESCRIPTION="utilities for the SCUMM game engine"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND=">=dev-libs/boost-1.32
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}
-	flac? ( media-libs/flac )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	mad? ( media-libs/libmad )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-binprefix.patch"
-)
-
-src_prepare() {
-	default
-
-	need-wxwidgets unicode
-	rm -rf *.bat dists/win32 || die
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
-}
-
-src_configure() {
-	# Not an autoconf script
-	./configure \
-		--disable-tremor \
-		--enable-verbose-build \
-		--mandir=/usr/share/man \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) || die
-}
-
-src_install() {
-	EXEPREFIX="${PN}-" default
-}
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
deleted file mode 100644
index 66e28b742a40..000000000000
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit wxwidgets eutils flag-o-matic
-
-DESCRIPTION="utilities for the SCUMM game engine"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND=">=dev-libs/boost-1.32
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}
-	flac? ( media-libs/flac )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	mad? ( media-libs/libmad )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
-)
-
-src_prepare() {
-	default
-
-	need-wxwidgets unicode
-	rm -rf *.bat dists/win32 || die
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
-}
-
-src_configure() {
-	# Not an autoconf script
-	./configure \
-		--prefix=/usr \
-		--disable-tremor \
-		--enable-verbose-build \
-		--mandir=/usr/share/man \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) || die
-}
-
-src_install() {
-	EXEPREFIX="${PN}-" default
-}
diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest
deleted file mode 100644
index 719bb82ab845..000000000000
--- a/games-engines/scummvm/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX scummvm-2.0.0-freetype_pkgconfig.patch 3651 BLAKE2B 59d53792e79b01e65d604f35b7947c83f700fa6019625c925f798bd389fbe3e1f21b28577ed93ce9c22ebd065ab61538cc80792a9a7c5e71248e6fd6a61690e1 SHA512 6e4cae49814442d111fb07f238108cbe995a8af4d0e23951e4d040d08db7e3925ff97b91b9053495cfd757396ed8790ec4dc8a44d7782cde915837118be95b44
-DIST scummvm-1.9.0.tar.xz 22020384 BLAKE2B 10f2c20cf1e32a60897c9e909e0bfda7827a646eb38aaf4923b76708fb5b797c66f94d92f7c095ca77570712223cd0d037fccc563c709448d4d2093299050773 SHA512 c81248e8474ad5b354a46741ab2e40b8ddfb99e196b0c837424e9ccced285d03d5f12fc41be57034be53bdb8254a61ca0c9d9cd9a2340875d32e1bffa31699c2
-DIST scummvm-2.0.0.tar.xz 21291656 BLAKE2B 303aa4254d1c940ce6d65d192f2678a033015f1b85e38c62902aa8fac05a1ff33fd7e3fe9de47825cd0cf72076027adb21c72a63a38349f9ee8f63566f3db948 SHA512 5f4c11145c5dfcc7ae95d5c0e5ac9e938912cc5060b9d5fdfcb699a745755b31412e44199e487ad388ca5e091afc3366f874610adb44d440f336e26d6cd4812c
-EBUILD scummvm-1.9.0.ebuild 2572 BLAKE2B 31a15a603f5b6fa33ad38da05a439e0285e4af3cf9212c8e9e403775184045a60ccff0910733ad258772420325d2395f52a54a75582f177b87bd3ad628324f0d SHA512 6d6d2bbddd94c21be730b1903f6c315a2fffe0d4ac95b41ab5cc41e08c67871a74936faaacdd49b3c2a0118caef8c7a5703ff850bc938449e233a7acfa08b606
-EBUILD scummvm-2.0.0.ebuild 2674 BLAKE2B da7418300d9679edba0a941b91300ee9cdc998375ff256910add03158e0038e8663f225585dd4f065173886bc7b1ff88a66d3e9ba73e1f60682f2339795b7dbd SHA512 a4617505bc8f601e78cf347e2459a4f1bdd3a5957ac500a4bf57a0cec574df8e110bd9fb6ef7ca7d44378b236f571b88b4724de4d41ebef45ba77a15a2b43ab7
-MISC metadata.xml 594 BLAKE2B 0c282f09b9bb6fbd7bf89a07595064c7102ad05b39cba2689451fd9555206eb66ee331fcec41b75b7c0a41b01a2301c142608d1a4d4371fcc59d45a2d337ec7d SHA512 6f1c61823667d4fa79900a3be3cb553e37bded1e39124f037cbef7a81bad52f4fbdd79987e28505ea27261b4ca2728bc63eeec0f93034a6e67c5504d915fbfd6
diff --git a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch b/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index ca5c5e892710..000000000000
--- a/games-engines/scummvm/files/scummvm-2.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 48a3f5bcba1837517e3d9d029ebe5e8fbd3f0966 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 6 May 2018 20:55:29 +0200
-Subject: [PATCH] Prefer pkg-config over freetype-config if possible
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.
----
- configure | 56 ++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/configure b/configure
-index 8e2a387acc..210951e343 100755
---- a/configure
-+++ b/configure
-@@ -204,6 +204,7 @@ _sparklepath=
- _sdlconfig=sdl2-config
- _libcurlconfig=curl-config
- _freetypeconfig=freetype-config
-+_freetype_found="false"
- _sdlpath="$PATH"
- _freetypepath="$PATH"
- _libcurlpath="$PATH"
-@@ -4668,28 +4669,45 @@ echo "$_libunity"
- #
- # Check for FreeType2 to be present
- #
--if test "$_freetype2" != "no"; then
--
--	# Look for the freetype-config script
--	find_freetypeconfig
--
--	if test -z "$_freetypeconfig"; then
--		_freetype2=no
-+find_freetype() {
-+        # Wrapper function which tries to find freetype
-+        # either by callimg freetype-config or by using
-+        # pkg-config.
-+        # As of freetype-2.9.1 the freetype-config file
-+        # no longer gets installed by default.
-+
-+	if pkg-config --exists freetype2; then
-+		FREETYPE2_LIBS=`pkg-config --libs freetype2`
-+		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-+		FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
-+		_freetype_found="true"
- 	else
--		# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
--		# This means we can't pass it a --prefix that includes $SYSROOT.
--		freetypeprefix="$_freetypepath"
--		if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
--			teststring=VeryImplausibleSysrootX1Y2Z3
--			if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
--				echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
--				freetypeprefix="${freetypeprefix##$SYSROOT}"
-+		# Look for the freetype-config script
-+		find_freetypeconfig
-+		if test -n "$_freetypeconfig"; then
-+			# Since 2.3.12, freetype-config prepends $SYSROOT to everything.
-+			# This means we can't pass it a --prefix that includes $SYSROOT.
-+			freetypeprefix="$_freetypepath"
-+			if test -n "$SYSROOT" -a "$SYSROOT" != "/"; then
-+				teststring=VeryImplausibleSysrootX1Y2Z3
-+				if ( env SYSROOT=/$teststring "$_freetypeconfig" --cflags | grep $teststring 2> /dev/null > /dev/null ); then
-+					echo "Adapting FreeType prefix to SYSROOT" >> "$TMPLOG"
-+					freetypeprefix="${freetypeprefix##$SYSROOT}"
-+				fi
- 			fi
-+			FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
-+			FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
-+			FREETYPE2_STATIC_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --static --libs 2>/dev/null`
-+			_freetype_found="true"
- 		fi
-+	fi
-+}
- 
--		FREETYPE2_LIBS=`$_freetypeconfig --prefix="$freetypeprefix" --libs`
--		FREETYPE2_CFLAGS=`$_freetypeconfig --prefix="$freetypeprefix" --cflags`
--
-+if test "$_freetype2" != "no"; then
-+	find_freetype
-+	if test $_freetype_found != true; then
-+		_freetype2=no
-+	else
- 		if test "$_freetype2" = "auto"; then
- 			_freetype2=no
- 
-@@ -4709,7 +4727,7 @@ EOF
- 			# required flags for static linking. We abuse this to detect
- 			# FreeType2 builds which are static themselves.
- 			if test "$_freetype2" != "yes"; then
--				FREETYPE2_LIBS=`$_freetypeconfig --prefix="$_freetypepath" --static --libs 2>/dev/null`
-+				FREETYPE2_LIBS="$FREETYPE2_STATIC_LIBS"
- 				cc_check_no_clean $FREETYPE2_CFLAGS $FREETYPE2_LIBS && _freetype2=yes
- 			fi
- 			cc_check_clean
--- 
-2.17.0
-
diff --git a/games-engines/scummvm/metadata.xml b/games-engines/scummvm/metadata.xml
deleted file mode 100644
index 3f7ace82af07..000000000000
--- a/games-engines/scummvm/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="fluidsynth">compile with support for fluidsynth</flag>
-    <flag name="mpeg2">enable mpeg2 codec for cutscenes</flag>
-    <flag name="unsupported">enable unsupported and/or broken game engines (you're on your own)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">scummvm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-engines/scummvm/scummvm-1.9.0.ebuild b/games-engines/scummvm/scummvm-1.9.0.ebuild
deleted file mode 100644
index 5e45b6299556..000000000000
--- a/games-engines/scummvm/scummvm-1.9.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
-	zlib? ( sys-libs/zlib )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	flac? ( media-libs/flac )
-	opengl? ( virtual/opengl )
-	truetype? ( media-libs/freetype:2 )
-	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	x86? ( dev-lang/nasm )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-	default
-
-	# -g isn't needed for nasm here
-	sed -i \
-		-e '/NASMFLAGS/ s/-g//' \
-		configure || die
-	sed -i \
-		-e '/INSTALL.*doc/d' \
-		-e '/INSTALL.*\/pixmaps/d' \
-		-e 's/-s //' \
-		ports.mk || die
-}
-
-src_configure() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure \
-		--backend=sdl \
-		--host=${CHOST} \
-		--enable-verbose-build \
-		--prefix=/usr \
-		--libdir="/usr/$(get_libdir)" \
-		--opengl-mode=$(usex opengl auto none) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable !debug release-mode) \
-		$(use_enable flac) \
-		$(usex fluidsynth '' --disable-fluidsynth) \
-		$(use_enable jpeg) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg2) \
-		$(use_enable png) \
-		$(use_enable theora theoradec) \
-		$(use_enable truetype freetype2) \
-		$(usex unsupported --enable-all-engines '') \
-		$(use_enable vorbis) \
-		$(use_enable zlib) \
-		$(use_enable x86 nasm) \
-		${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-	make_desktop_entry scummvm ScummVM scummvm "Game;AdventureGame"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild
deleted file mode 100644
index b4df47b76af2..000000000000
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib"
-RESTRICT="test"  # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
-	zlib? ( sys-libs/zlib )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libogg media-libs/libvorbis )
-	theora? ( media-libs/libtheora )
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	mp3? ( media-libs/libmad )
-	mpeg2? ( media-libs/libmpeg2 )
-	flac? ( media-libs/flac )
-	opengl? ( virtual/opengl )
-	truetype? ( media-libs/freetype:2 )
-	fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	truetype? ( virtual/pkgconfig )
-	x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
-
-src_prepare() {
-	default
-
-	# -g isn't needed for nasm here
-	sed -i \
-		-e '/NASMFLAGS/ s/-g//' \
-		configure || die
-	sed -i \
-		-e '/INSTALL.*doc/d' \
-		-e '/INSTALL.*\/pixmaps/d' \
-		-e 's/-s //' \
-		ports.mk || die
-}
-
-src_configure() {
-	use x86 && append-ldflags -Wl,-z,noexecstack
-
-	# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
-	SDL_CONFIG="sdl2-config" \
-	./configure \
-		--backend=sdl \
-		--host=${CHOST} \
-		--enable-verbose-build \
-		--prefix=/usr \
-		--libdir="/usr/$(get_libdir)" \
-		--opengl-mode=$(usex opengl auto none) \
-		$(use_enable aac faad) \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable !debug release-mode) \
-		$(use_enable flac) \
-		$(usex fluidsynth '' --disable-fluidsynth) \
-		$(use_enable jpeg) \
-		$(use_enable mp3 mad) \
-		$(use_enable mpeg2) \
-		$(use_enable png) \
-		$(use_enable theora theoradec) \
-		$(use_enable truetype freetype2) \
-		$(usex unsupported --enable-all-engines '') \
-		$(use_enable vorbis) \
-		$(use_enable zlib) \
-		$(use_enable x86 nasm) \
-		${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
-	emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
-	default
-	doicon -s scalable icons/scummvm.svg
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/games-engines/solarus-1.3.1-r1 b/games-engines/solarus-1.3.1-r1
new file mode 100644
index 000000000000..b3e600e126ee
--- /dev/null
+++ b/games-engines/solarus-1.3.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An open-source Zelda-like 2D game engine
+EAPI=6
+HOMEPAGE=http://www.solarus-games.org/
+IUSE=doc luajit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-games/physfs media-libs/libmodplug >=media-libs/libsdl2-2.0.1[X,joystick,video] media-libs/libvorbis media-libs/openal media-libs/sdl2-image[png] >=media-libs/sdl2-ttf-2.0.12 luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:0 )
+SLOT=0
+SRC_URI=http://www.zelda-solarus.com/downloads/solarus/solarus-1.3.1-src.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_=4c144d59eb8165e92ca0358f1a69751f
diff --git a/games-engines/solarus/Manifest b/games-engines/solarus/Manifest
deleted file mode 100644
index bd245b4988c4..000000000000
--- a/games-engines/solarus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST solarus-1.3.1-src.tar.gz 2450599 BLAKE2B e8aefa36d48753b1362283c8818b6efdc82c2d6ed7612c15d5e45b035a131ec6fd5792f85e4b956afa3e1d51e0dc311d7d6fabb5750b7b8781c69169b61fe1d9 SHA512 f52a46add1432a98931db8d26496371b5ff843151c8ac0fdaf1e774be37399d9be6c401f263a65aa08b96f3eebda367b4ccb07ef6cb9740b3112b01e4763556b
-EBUILD solarus-1.3.1-r1.ebuild 1076 BLAKE2B 2859414875bbba299b01c2becde2e24bccc88b6235f077c964723b9d18157f2c3d34aeac4f52cad6a756c65551728f711c32d3c8bae11a00ec2af27c8c2a39d9 SHA512 45b0cfcab36c51aa8fb86a53c3b8472006526a29f1a990adfda71ddbd410c71f93ba87d179b23429fbf8d70fe61a0cf1d39b0a4134b2141dfea843e5a405f4d0
-MISC metadata.xml 418 BLAKE2B 5bf684de11834b52dc4093d84a72b6c0707707fa8e31dfdd66a58942dc94f08e8db5b39d6aa1698587af11610eca08b80fc348a023c93d09d39cd115b6c81a34 SHA512 349717aa1b9c57fc9141beb4f16b377bd3ba31002a85023fad25a8a2332b9092180c58f37ba91aef05abb46405a56580202e0b67373ea049fc0d7bc029b3d2c5
diff --git a/games-engines/solarus/metadata.xml b/games-engines/solarus/metadata.xml
deleted file mode 100644
index e9b337da9ffb..000000000000
--- a/games-engines/solarus/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="doc">Install doxygen developer documentation.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">christopho/solarus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/solarus/solarus-1.3.1-r1.ebuild b/games-engines/solarus/solarus-1.3.1-r1.ebuild
deleted file mode 100644
index 31ce4cefa293..000000000000
--- a/games-engines/solarus/solarus-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="An open-source Zelda-like 2D game engine"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc luajit"
-
-RDEPEND="
-	dev-games/physfs
-	media-libs/libmodplug
-	>=media-libs/libsdl2-2.0.1[X,joystick,video]
-	media-libs/libvorbis
-	media-libs/openal
-	media-libs/sdl2-image[png]
-	>=media-libs/sdl2-ttf-2.0.12
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0 )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DESTINATION="/usr/bin"
-		-DSOLARUS_USE_LUAJIT="$(usex luajit)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	if use doc ; then
-		cd doc || die
-		doxygen || die
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman solarus.6
-	use doc && dodoc -r doc/${PV%.*}/html/*
-}
diff --git a/games-engines/stratagus-2.4.1 b/games-engines/stratagus-2.4.1
new file mode 100644
index 000000000000..2ced2612e5ad
--- /dev/null
+++ b/games-engines/stratagus-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[sound,opengl,video] sys-libs/zlib bzip2? ( app-arch/bzip2 ) fluidsynth? ( media-sound/fluidsynth ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) ) doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A realtime strategy game engine
+EAPI=6
+HOMEPAGE=https://launchpad.net/stratagus/
+IUSE=bzip2 debug doc fluidsynth mikmod mng theora vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-lang/lua-5:0 dev-lua/toluapp media-libs/libpng:0 virtual/opengl x11-libs/libX11 media-libs/libsdl[sound,opengl,video] sys-libs/zlib bzip2? ( app-arch/bzip2 ) fluidsynth? ( media-sound/fluidsynth ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) vorbis? ( media-libs/libogg media-libs/libvorbis theora? ( media-libs/libtheora ) )
+REQUIRED_USE=theora? ( vorbis )
+SLOT=0
+SRC_URI=https://github.com/Wargus/stratagus/archive/v2.4.1.tar.gz -> stratagus-2.4.1.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_=04773915a035b2a6f8d55bf768c1f129
diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest
deleted file mode 100644
index cd253adbded4..000000000000
--- a/games-engines/stratagus/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX stratagus-2.3.0-debug.patch 667 BLAKE2B 6f81f640dc5773a29f5c97732c1ace1de8969a27029637551cf0aee2edadd3afeaeedf7ced5e03cf344af4f726a045a9fbeecc71074603d023837da7ca7a2218 SHA512 751efd651b7beeeca702ad0fd6743c47041607ab0a127f4da1c219c10a55c44abf611aa7215c08f75a899d61cc8e499801d6d003f79520bff022df46ef98949f
-AUX stratagus-2.3.0-doc.patch 378 BLAKE2B 673afcbcf6131a49d03b683db2b430795b30226a97d4355ba88780bc4543f08c51b49c3726a79bc93620cd23595e2dcef62452d6afc989aa2ea06f616ce86fa6 SHA512 185b4a82d4960369bdff7c5522418553838d0d2c0947d8f75a55bf7a22741b9be20a20b60ae086ee04bd31ecf963c5c58167ef6b57b777659832a82d79726483
-DIST stratagus-2.4.1.tar.gz 1087678 BLAKE2B be7fc8322aee2a28c80833d44c3180e26b961ce9dfd1bc5e0a8e3fa0caac74bf713224de4c38b2ebf6d5aeabbe778a5664346c6a444b066f07f719bba5317bac SHA512 1f0420677df72e3e2d2f31e60030fa2eba4c3d1ab80cfc79c045724fe39ac237846bc38e8762ee9aa51768a443cdbbaa1fe91bf80fb2164261288a1bb17e27cd
-EBUILD stratagus-2.4.1.ebuild 1523 BLAKE2B 3b165318ba374101a436297ef4e8bdfefe977fa60ef850001f1de415135babc0d6692a4321c3a56a7249ccbc5cf903b1322e4c51e202c590636125ab43d41251 SHA512 0751342ca95b1384e116732401481c341c0c79555eecda4ab6dda0318d0823c6130ea4a4e988ec97c77a315bc5f70db8be4b36c6cd9e705a7fe0885d86bab269
-MISC metadata.xml 468 BLAKE2B 8c8195ecd200944aa9923b2556768b47b66689424d9e0039970f60a9faf94477830490aec5c886c5e2425fa36dd9d4e18a2c9042657187e78ce022afdf5e928e SHA512 80c9342fa0155fd762f9585fcd3aaf2f472e4d6d75439926ed6fd9711c25821fee9193c011bbc6efdca644d0a41ad57966ff19effa5b36b277295b15b25cd642
diff --git a/games-engines/stratagus/files/stratagus-2.3.0-debug.patch b/games-engines/stratagus/files/stratagus-2.3.0-debug.patch
deleted file mode 100644
index 41817865c577..000000000000
--- a/games-engines/stratagus/files/stratagus-2.3.0-debug.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Oct 18 14:31:37 UTC 2012
-Subject: build-system
-
-do not rename the target if debug is enabled
-
---- stratagus_2.2.7.orig/CMakeLists.txt
-+++ stratagus_2.2.7.orig/CMakeLists.txt
-@@ -911,10 +911,6 @@
- add_executable(stratagus WIN32 ${stratagus_SRCS} ${stratagus_HDRS})
- target_link_libraries(stratagus ${stratagus_LIBS})
- 
--if(CMAKE_BUILD_TYPE STREQUAL "Debug")
--	set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg)
--endif()
--
- if(WIN32 AND MINGW AND ENABLE_STATIC)
- 	set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,10485760")
- endif()
diff --git a/games-engines/stratagus/files/stratagus-2.3.0-doc.patch b/games-engines/stratagus/files/stratagus-2.3.0-doc.patch
deleted file mode 100644
index 1605b81411fa..000000000000
--- a/games-engines/stratagus/files/stratagus-2.3.0-doc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- stratagus_2.2.7.orig/CMakeLists.txt
-+++ stratagus_2.2.7.orig/CMakeLists.txt
-@@ -1050,7 +1050,7 @@
- 		doc/media.html
- 		doc/metaserver_protocol.txt
- 		doc/README-SDL.txt
--		DESTINATION share/doc/stratagus
-+		DESTINATION ${DOCDIR}
- 	)
- 	install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR})
- endif(ENABLE_DOC AND DOXYGEN_FOUND)
diff --git a/games-engines/stratagus/metadata.xml b/games-engines/stratagus/metadata.xml
deleted file mode 100644
index 3914695ecbc2..000000000000
--- a/games-engines/stratagus/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="fluidsynth">compile with support for fluidsynth</flag>
-	</use>
-	<upstream>
-		<remote-id type="launchpad">stratagus</remote-id>
-		<remote-id type="sourceforge">stratagus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-engines/stratagus/stratagus-2.4.1.ebuild b/games-engines/stratagus/stratagus-2.4.1.ebuild
deleted file mode 100644
index a692d77f9475..000000000000
--- a/games-engines/stratagus/stratagus-2.4.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils
-
-DESCRIPTION="A realtime strategy game engine"
-HOMEPAGE="https://launchpad.net/stratagus/"
-SRC_URI="https://github.com/Wargus/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bzip2 debug doc fluidsynth mikmod mng theora vorbis"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-lang/lua-5:0
-	dev-lua/toluapp
-	media-libs/libpng:0
-	virtual/opengl
-	x11-libs/libX11
-	media-libs/libsdl[sound,opengl,video]
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	fluidsynth? ( media-sound/fluidsynth )
-	mikmod? ( media-libs/libmikmod )
-	mng? ( media-libs/libmng )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		theora? ( media-libs/libtheora )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
-
-REQUIRED_USE="theora? ( vorbis )"
-PATCHES=(
-	"${FILESDIR}/${PN}"-2.3.0-debug.patch
-	"${FILESDIR}/${PN}"-2.3.0-doc.patch
-)
-
-src_configure() {
-	# there are in-source switches
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local mycmakeargs=(
-		-DGAMEDIR="/usr/bin"
-		-DDOCDIR="/usr/share/doc/${PF}"
-		-DWITH_BZIP2=$(usex bzip2)
-		-DENABLE_DOC=$(usex doc)
-		-DWITH_FLUIDSYNTH=$(usex fluidsynth)
-		-DWITH_MIKMOD=$(usex mikmod)
-		-DWITH_MNG=$(usex mng)
-		-DWITH_OGGVORBIS=$(usex vorbis)
-		-DWITH_THEORA=$(usex theora)
-		-DENABLE_DEV=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/games-engines/xzip-1.8.2-r3 b/games-engines/xzip-1.8.2-r3
new file mode 100644
index 000000000000..97f444e33b95
--- /dev/null
+++ b/games-engines/xzip-1.8.2-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libX11
+DESCRIPTION=X interface to Z-code based text games
+EAPI=6
+HOMEPAGE=http://www.eblong.com/zarf/xzip.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.eblong.com/zarf/ftp/xzip182.tar.Z
+_md5_=a4536b44b332dac798dc1df304c5248f
diff --git a/games-engines/xzip/Manifest b/games-engines/xzip/Manifest
deleted file mode 100644
index b65f1fda6f00..000000000000
--- a/games-engines/xzip/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xzip182.tar.Z 136032 BLAKE2B 71c25bc8b353426c01938097e2a0ed7e027a0d7925dec50c18042deda3052ad0b1a613c7ff22d43f3712f29142a8c8c79924e17d2ae081147ccdbd5c634011e9 SHA512 b86099424ff35abd90737461e3d29d515d909b41c6a5411971fedb28f1f3284b13ea972380349f8c44fd39779c34258a99c5a9c0fb6a81e2bf919e9c38107bbd
-EBUILD xzip-1.8.2-r3.ebuild 559 BLAKE2B d4dad0a392180c79ffc35839c2298610703d4c36ffa757a7cd8eff63454041adc2ff6023446f2f445424dc7ea6aad348e1dc0d5ae4b609dff44fdf6990ac209e SHA512 210ab5f4968d5751e6849b8c67f5093f6406abf46b719ba51ed6e0a367e9052bb4d5bfd07d22901f5b8fd91c1e1ba66ef203848624873f3fda017adb797347e1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-engines/xzip/metadata.xml b/games-engines/xzip/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-engines/xzip/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-engines/xzip/xzip-1.8.2-r3.ebuild b/games-engines/xzip/xzip-1.8.2-r3.ebuild
deleted file mode 100644
index b961ce3ca312..000000000000
--- a/games-engines/xzip/xzip-1.8.2-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="X interface to Z-code based text games"
-HOMEPAGE="http://www.eblong.com/zarf/xzip.html"
-SRC_URI="http://www.eblong.com/zarf/ftp/xzip182.tar.Z"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="x11-libs/libX11"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/xzip"
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} -DAUTO_END_MODE" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xzip
-	dodoc README
-	doman xzip.1
-}
diff --git a/games-engines/zoom-1.1.5-r1 b/games-engines/zoom-1.1.5-r1
new file mode 100644
index 000000000000..aaa252844477
--- /dev/null
+++ b/games-engines/zoom-1.1.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/fontconfig media-libs/libpng:0 >=media-libs/t1lib-5 x11-libs/libSM x11-libs/libXft dev-lang/perl x11-base/xorg-proto
+DESCRIPTION=A fast, clean, modern Z-code interpreter for X
+EAPI=6
+HOMEPAGE=http://www.logicalshift.co.uk/unix/zoom/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/fontconfig media-libs/libpng:0 >=media-libs/t1lib-5 x11-libs/libSM x11-libs/libXft
+SLOT=0
+SRC_URI=http://www.logicalshift.co.uk/unix/zoom/zoom-1.1.5.tar.gz
+_md5_=b3f0a95fb9d27bce1ad5702f8441f52b
diff --git a/games-engines/zoom/Manifest b/games-engines/zoom/Manifest
deleted file mode 100644
index 85968270aed5..000000000000
--- a/games-engines/zoom/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX zoom-1.1.5-gcc7.patch 1732 BLAKE2B 3e7ce92fc7804dabdcd37db32f8dbbdccd4716b52d5266507df01cec35db40b0cafd753c32c4fb7b341c7ee784d752968f99cf06a20d067055c796b175ac5cca SHA512 8b8e130cf889efa48c737145044b23a858419d03ffc7af90fdd875e54a6e3b2f5df148d7755cd325b798445d2190db38ee193a135cae46867a3be7971e346f49
-DIST zoom-1.1.5.tar.gz 2185098 BLAKE2B 899ee9afef431d2cf5a36cbb8c8c5452b8a5a24ce705ed6a5cdba5a6331e4a86fe819a9309748d1f8b7faf9e1d3267a86bc65ded8a52d17d9d2a4cdd6ab600a2 SHA512 800b29e3517ce39000d8c05148d6af0d7c8666db20a06867e35076ffa1914b845e8fa0153571975e59842672572b80826ee8dbe3b2d4bc98c07394054e9bd7ca
-EBUILD zoom-1.1.5-r1.ebuild 605 BLAKE2B 12ef4a5be5e50a086833f1e300a069c34f8d40f15feecb959e60a910ff498c70d53f4eb1622cf24387fc1abf20b255a8c6d73c53aa4aee789127e0655f975a17 SHA512 4917db5ce1be6e271436cbd0951a25ea51da9084221bf507468edeed911badf8d0b296f89c2202cc57ee3e5e8ffd775c1c861cd8b93477035b7881d3ae24970c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-engines/zoom/files/zoom-1.1.5-gcc7.patch b/games-engines/zoom/files/zoom-1.1.5-gcc7.patch
deleted file mode 100644
index 6f50d3f43624..000000000000
--- a/games-engines/zoom/files/zoom-1.1.5-gcc7.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Bug: https://bugs.gentoo.org/617808
-Upstream commit: https://github.com/Logicalshift/zoom/commit/6b0ad57dd2c125c9126e9b7913560ad25709a36f
-
-From 6b0ad57dd2c125c9126e9b7913560ad25709a36f Mon Sep 17 00:00:00 2001
-From: Andrew Hunter <andrew@logicalshift.co.uk>
-Date: Sat, 3 Mar 2012 16:31:35 +0000
-Subject: [PATCH] Inline functions need to be marked as static in order to
- compile with LLVM
-
----
- src/interp.c   | 4 ++--
- src/tokenise.c | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/interp.c b/src/interp.c
-index a5fa8fe..3d446fa 100644
---- a/src/interp.c
-+++ b/src/interp.c
-@@ -232,7 +232,7 @@ ZFrame* call_routine(ZDWord* pc, ZStack* stack, ZDWord start)
-   return newframe;
- }
- 
--inline void store(ZStack* stack, int var, ZWord value)
-+static inline void store(ZStack* stack, int var, ZWord value)
- {
- #ifdef DEBUG
-   printf_debug("Storing %i in Variable #%x\n", value, var);
-@@ -253,7 +253,7 @@ inline void store(ZStack* stack, int var, ZWord value)
-     }
- }
- 
--inline void store_nopush(ZStack* stack, int var, ZWord value)
-+static inline void store_nopush(ZStack* stack, int var, ZWord value)
- {
- #ifdef DEBUG
-     printf_debug("Storing %i in Variable #%x\n", value, var);
-diff --git a/src/tokenise.c b/src/tokenise.c
-index 5925169..fb442d0 100644
---- a/src/tokenise.c
-+++ b/src/tokenise.c
-@@ -154,9 +154,9 @@ ZDictionary* dictionary_cache(const ZUWord dict_pos)
- 
- int cache = 1;
- 
--inline ZUWord lookup_word(unsigned int*  word,
--			  int            wordlen,
--			  ZUWord         dct)
-+static inline ZUWord lookup_word(unsigned int*  word,
-+                                 int            wordlen,
-+                                 ZUWord         dct)
- {
-   ZByte packed[12];
-   int zscii_len;
diff --git a/games-engines/zoom/metadata.xml b/games-engines/zoom/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-engines/zoom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-engines/zoom/zoom-1.1.5-r1.ebuild b/games-engines/zoom/zoom-1.1.5-r1.ebuild
deleted file mode 100644
index f5f33fac05c6..000000000000
--- a/games-engines/zoom/zoom-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A fast, clean, modern Z-code interpreter for X"
-HOMEPAGE="http://www.logicalshift.co.uk/unix/zoom/"
-SRC_URI="http://www.logicalshift.co.uk/unix/zoom/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/fontconfig
-	media-libs/libpng:0
-	>=media-libs/t1lib-5
-	x11-libs/libSM
-	x11-libs/libXft"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-gcc7.patch )
-
-src_install() {
-	default
-	dodoc -r manual/*
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index e65f87ba6ca8..98402ce3af62 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/aaquake2-0.1 b/games-fps/aaquake2-0.1
new file mode 100644
index 000000000000..89086b57556c
--- /dev/null
+++ b/games-fps/aaquake2-0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/aalib app-arch/unzip
+DESCRIPTION=text mode Quake II
+EAPI=5
+HOMEPAGE=https://www.jfedor.org/aaquake2/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/aalib games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/source/q2source-3.21.zip https://www.jfedor.org/aaquake2/quake2-ref_softaa-0.1.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_=d951010f54bc014d3b61322852d23fae
diff --git a/games-fps/aaquake2/Manifest b/games-fps/aaquake2/Manifest
deleted file mode 100644
index 0df2df94a45d..000000000000
--- a/games-fps/aaquake2/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 0.1-gentoo.patch 2539 BLAKE2B 7235721af47a838b94a1b690b045d27e9dc6ea8705a31ff89855e7fc6033b4774d58dd41f5988e342140fe6bc206f577490b25d41c3ce364c8fe10165fdb66ba SHA512 2d288074c7181f0359d83b84dc4733d99924455fe733b67e52ee95976e8103536e2935b79ab9a1b8fc481c57d1c7472386fdb9e185db64adca61ea376aae1d09
-AUX aaquake2-0.1-gcc41.patch 739 BLAKE2B bcc9a33912c860f2d167390f447478f993b12b85f8c65285c7926a6cde844de597de39c894e671255543970d6a0b69db216d70b98f3e2fd7f85e449c15546b05 SHA512 d5678631a35cb19beb99001fdaeb2223c89e699cd57dbaee8c0c30d77d8d75cc9505bb382c1cbda00f308133c26551f2e528b2880de378df92e3ec5370e8135e
-AUX aaquake2-0.1-glibc.patch 338 BLAKE2B 7daab77b94bc7d043e80c8f22358af9bf9e34e3742b3269a2c05387ddbb928f6122fa5db4481fb901658bc3da9b407bf7c806468e6d366045028d90d4541533e SHA512 6aca1c77b20030c3a70fbec76ec5c27ec767434069fa4cddcac478e52cc52d286b4c9765e50309e64aff0a0fcb3021c47059a5b027ad98cb5a3d3ced0d92e824
-AUX aaquake2-0.1-ldflags.patch 3564 BLAKE2B 569d2796e96c86843285b86ecc51875c1b2e1e5898ad611ef557fb5effeef46596ea83fc92be84dad2c4a668d9af2a3af78bcc6563256f39aecca11cce177e72 SHA512 4ef54ac768e76e4abc917f9c6ddbde426bbd8c71510ce398bbebaf1a5969ee59ca642dedea32b3150a58c2550b14b0a8953123017bf101ec3fac09f90e92ad72
-DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
-DIST quake2-ref_softaa-0.1.tar.gz 12931 BLAKE2B b20644662b903e7604f53283008b54c86e83e7b1dd6b66a505bbaa41fdfaa3c783cbb73d320418595498b54ddc2f72e94d53096bc82cb173be9fcdd192dee2b9 SHA512 d5f7e46485084217f5cb8fdcfa360106eafbfac9dad03e4853367e9cf6857a9789ec4d37d3bca656730282649b3e33b0ab04d4c0a73de36f794d98f3c048401c
-EBUILD aaquake2-0.1.ebuild 1464 BLAKE2B 4201ced22006e750064336fe4d9646a118b069d2f602974db7d794003f8e034ca1f754c655045f425238fd018703583140245a1f573adb097254e02f0c388471 SHA512 0367992b1d5d4513b837bf0567154c917871fb6eaf0950357caa0877ca721adc5e317038494bdb08b91433799bd027a168b6577e0f8d9fc41c50a659e31dcfbe
-MISC metadata.xml 627 BLAKE2B f3919c638d66c1ea85f095ed0218b44ddc636e42f4a29f5ad3b9444e89a27d10e7dfd98814f2388d9a9b49296b584df31853036a9d851569c6eb88669e1cbdf7 SHA512 f212c3b4649df80d15c769067fe816d491201fc3d9193f5a54bad860aa19aab23cd5d6f82be7985ffe9493079de3c56348052657ac55bbbe8e298392887fabc1
diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
deleted file mode 100644
index a7aa57c721bd..000000000000
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="text mode Quake II"
-HOMEPAGE="https://www.jfedor.org/aaquake2/"
-SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
-	https://www.jfedor.org/aaquake2/quake2-ref_softaa-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="media-libs/aalib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/quake2-3.21/linux
-
-src_prepare() {
-	cd .. && epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc41.patch
-	cd "${S}" && epatch \
-		"${FILESDIR}"/${P}-glibc.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" sys_linux.c || die
-	sed -i \
-		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c || die
-}
-
-src_compile() {
-	mkdir -p releasei386-glibc/ref_soft
-	emake -j1 \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release
-}
-
-src_install() {
-	cd release* || die
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softaa.so
-	dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_softx.so
-	dosym ref_softaa.so "$(games_get_libdir)"/${PN}/ref_soft.so
-	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so
-
-	newgamesbin quake2 aaquake2
-
-	insinto "${GAMES_SYSCONFDIR}"
-	echo "$(games_get_libdir)"/${PN} > ${PN}.conf
-	doins ${PN}.conf
-
-	prepgamesdirs
-}
diff --git a/games-fps/aaquake2/files/0.1-gentoo.patch b/games-fps/aaquake2/files/0.1-gentoo.patch
deleted file mode 100644
index cc7bb1733f64..000000000000
--- a/games-fps/aaquake2/files/0.1-gentoo.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- linux/Makefile.old
-+++ linux/Makefile
-@@ -54,7 +54,7 @@
- RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- else
--RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -g $(GENTOO_CFLAGS) -DGENTOO_DATADIR=\\\"$(GENTOO_DATADIR)\\\" -O6 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
- 
-@@ -92,7 +92,7 @@
- #############################################################################
- 
- ifeq ($(ARCH),axp)
--TARGETS=$(BUILDDIR)/q2ded \
-+TARGETS=\
- 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
- 	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
- #	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
-@@ -100,11 +100,7 @@
- else
- TARGETS=$(BUILDDIR)/quake2 \
- 	$(BUILDDIR)/game$(ARCH).$(SHLIBEXT) \
--	$(BUILDDIR)/ref_soft.$(SHLIBEXT) \
--	$(BUILDDIR)/ref_softx.$(SHLIBEXT) \
- 	$(BUILDDIR)/ref_softaa.$(SHLIBEXT) \
--	$(BUILDDIR)/ref_gl.$(SHLIBEXT) \
--	$(BUILDDIR)/ref_glx.$(SHLIBEXT) \
- 	$(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) \
- #	$(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) \
- #	$(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT)
-@@ -125,9 +121,6 @@
- build_release:
- 	@-mkdir $(BUILD_RELEASE_DIR) \
- 		$(BUILD_RELEASE_DIR)/client \
--		$(BUILD_RELEASE_DIR)/ded \
--		$(BUILD_RELEASE_DIR)/ref_soft \
--		$(BUILD_RELEASE_DIR)/ref_gl \
- 		$(BUILD_RELEASE_DIR)/game \
- 		$(BUILD_RELEASE_DIR)/ctf \
- #		$(BUILD_RELEASE_DIR)/xatrix \
---- linux/sys_linux.c.old
-+++ linux/sys_linux.c
-@@ -220,7 +220,7 @@
- 	char	curpath[MAX_OSPATH];

- 	char	*path;

- #ifdef __i386__

--	const char *gamename = "gamei386.so";

-+	const char *gamename = "GENTOO_DIR/gamei386.so";

- #elif defined __alpha__

- 	const char *gamename = "gameaxp.so";

- #else

-@@ -250,6 +250,14 @@
- 		{

- 			Com_Printf ("LoadLibrary (%s)\n",name);

- 			break;

-+		} else {

-+			sprintf (name, "%s", gamename);

-+			game_library = dlopen (name, RTLD_LAZY );

-+			if (game_library)

-+			{

-+				Com_Printf ("LoadLibrary (%s)\n",name);

-+				break;

-+			}

- 		}

- 	}

- 

---- qcommon/files.c.old
-+++ qcommon/files.c
-@@ -865,7 +865,7 @@
- 	//

- 	// start up with baseq2 by default

- 	//

--	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );

-+	FS_AddGameDirectory (va(BASEDIRNAME) );

- 

- 	// any set gamedirs will be freed up to here

- 	fs_base_searchpaths = fs_searchpaths;

---- qcommon/qcommon.h.old
-+++ qcommon/qcommon.h
-@@ -25,7 +25,7 @@
- 

- #define	VERSION		3.21

- 

--#define	BASEDIRNAME	"baseq2"

-+#define	BASEDIRNAME	GENTOO_DATADIR

- 

- #ifdef WIN32

- 

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch b/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
deleted file mode 100644
index bb2e8e5979e5..000000000000
--- a/games-fps/aaquake2/files/aaquake2-0.1-gcc41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- game/g_local.h.old
-+++ game/g_local.h
-@@ -458,11 +458,6 @@
- extern	int	sm_meat_index;

- extern	int	snd_fry;

- 

--extern	int	jacket_armor_index;

--extern	int	combat_armor_index;

--extern	int	body_armor_index;

--

--

- // means of death

- #define MOD_UNKNOWN			0

- #define MOD_BLASTER			1

---- ctf/g_local.h.old
-+++ ctf/g_local.h
-@@ -466,11 +466,6 @@
- extern	int	sm_meat_index;

- extern	int	snd_fry;

- 

--extern	int	jacket_armor_index;

--extern	int	combat_armor_index;

--extern	int	body_armor_index;

--

--

- // means of death

- #define MOD_UNKNOWN			0

- #define MOD_BLASTER			1

-@@ -556,10 +556,6 @@
- 

- extern	cvar_t	*sv_maplist;

- 

--//ZOID

--extern	qboolean	is_quad;

--//ZOID

--

- #define world	(&g_edicts[0])

- 

- // item spawnflags

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch b/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
deleted file mode 100644
index 638e91b2c393..000000000000
--- a/games-fps/aaquake2/files/aaquake2-0.1-glibc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- rw_aa.c.old
-+++ rw_aa.c
-@@ -61,7 +61,7 @@
- #include <signal.h>

- #include <sys/mman.h>

- 

--#include <asm/io.h>

-+#include <sys/io.h>

- 

- #include <aalib.h>

- 

---- rw_in_aa.c.old
-+++ rw_in_aa.c
-@@ -46,7 +46,7 @@
- #include <signal.h>

- #include <sys/mman.h>

- 

--#include <asm/io.h>

-+#include <sys/io.h>

- 

- #include <aalib.h>

- 

diff --git a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch b/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
deleted file mode 100644
index dc2359ac48d7..000000000000
--- a/games-fps/aaquake2/files/aaquake2-0.1-ldflags.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- Makefile.old
-+++ Makefile
-@@ -59,7 +59,7 @@
- endif
- 
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
--LDFLAGS=-ldl -lm
-+LDLIBS=-ldl -lm
- SVGALDFLAGS=-lvga -lm
- XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
- AALDFLAGS=-lm -laa
-@@ -195,7 +195,7 @@
- endif
- 
- $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
- 	$(DO_CC)
-@@ -374,7 +374,7 @@
- 	$(BUILDDIR)/ded/cd_null.o
- 
- $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
- 	$(DO_DED_CC)
-@@ -503,7 +503,7 @@
- 	$(BUILDDIR)/game/m_flash.o
- 
- $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
- 
- $(BUILDDIR)/game/g_ai.o :        $(GAME_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -682,7 +682,7 @@
- 	$(BUILDDIR)/ctf/q_shared.o
- 
- $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
- 
- $(BUILDDIR)/ctf/g_ai.o :       $(CTF_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -821,7 +821,7 @@
- 	$(BUILDDIR)/xatrix/q_shared.o
- 
- $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
- 
- $(BUILDDIR)/xatrix/g_ai.o :        $(XATRIX_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -1048,7 +1048,7 @@
- 	$(BUILDDIR)/rogue/q_shared.o
- 
- $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
- 
- $(BUILDDIR)/rogue/dm_ball.o :      $(ROGUE_DIR)/dm_ball.c
- 	$(DO_SHLIB_CC)
-@@ -1291,15 +1291,15 @@
- 	$(BUILDDIR)/ref_soft/rw_in_aa.o
- 
- $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
- 
- $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
- 
- $(BUILDDIR)/ref_softaa.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_AA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_AA_OBJS) $(AALDFLAGS)
- 
- $(BUILDDIR)/ref_soft/r_aclip.o :      $(REF_SOFT_DIR)/r_aclip.c
-@@ -1445,10 +1445,10 @@
- 	$(BUILDDIR)/ref_gl/gl_glx.o
- 
- $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
- 
- $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
- 
- $(BUILDDIR)/ref_gl/gl_draw.o :        $(REF_GL_DIR)/gl_draw.c
- 	$(DO_GL_SHLIB_CC)
diff --git a/games-fps/aaquake2/metadata.xml b/games-fps/aaquake2/metadata.xml
deleted file mode 100644
index 0ac912115906..000000000000
--- a/games-fps/aaquake2/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-aaquake2 - Text Mode Quake II
-
-What?
-Just what you heard - text mode Quake II.
-
-Why?
-Why not? You can watch TV in text mode, you can play DVDs in text mode, 
-you can play Quake 1 in text mode. Quake II is the logical next step.
-
-Or, as the author of ttyquake put it, "If you have to ask why, you're 
-not a member of the intended audience." 
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/aaut-1 b/games-fps/aaut-1
new file mode 100644
index 000000000000..dc6f188ae94b
--- /dev/null
+++ b/games-fps/aaut-1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=ascii mode unreal tournament
+EAPI=5
+HOMEPAGE=http://icculus.org/~chunky/ut/aaut/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=|| ( games-fps/unreal-tournament games-fps/unreal-tournament-goty ) media-libs/aalib games-misc/games-envd
+SLOT=0
+_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_=b3820a3e4fff0187b1f336068b78d076
diff --git a/games-fps/aaut/Manifest b/games-fps/aaut/Manifest
deleted file mode 100644
index 40aa5dce1fca..000000000000
--- a/games-fps/aaut/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX aaut 130 BLAKE2B d38d36b99b15875604a09c22d51456e9cb21c5302567baa112d2cccd44de351c49c7801d0f784d21700b78666203b42c91f233345bf583c92b2d4e4fb5b5cdf5 SHA512 95ca9e718dafed4190b733cec3f2409cfeea251965084a79a8c22ffb4aca4e017867e062679403e9f21c0c975b02005808c25e829d07bc228b68c7ccedf9f7ae
-EBUILD aaut-1.ebuild 436 BLAKE2B 6fa979ac22dfc43e9c8daa44f5b1c3ab1f1ce23d30752e681dcb9fadd4d388b7fcbb82f8cd286f086d64c2ec65c134ceb93ea3f1072ce07b976341adbcdee2a7 SHA512 9c25a5044e965eb24a98138eed18685f8f66263f097cd55cf9834cb386581d54ee43883c7889b9e9a4323ee7a553fc12471fda179d881932606abb198184c77c
-MISC metadata.xml 473 BLAKE2B e01e252890b36c72e23b69068ecd032125bcb4bba5bbdc17177f27f3bef409991c1ef568c8fc286755c6549766e31d22ed4dc774b19d59f8711b5b346e175a1f SHA512 5ecddbe93ff1401fdce2a74fa0b7f44a3e0475eeb21b2563578bc3a96559e87911d88f45f2bb9c085ec2c6ff778a5067557416a3e5bb94f398d1fb86061af56c
diff --git a/games-fps/aaut/aaut-1.ebuild b/games-fps/aaut/aaut-1.ebuild
deleted file mode 100644
index acde5a8582fb..000000000000
--- a/games-fps/aaut/aaut-1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="ascii mode unreal tournament"
-HOMEPAGE="http://icculus.org/~chunky/ut/aaut/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="|| (
-		games-fps/unreal-tournament
-		games-fps/unreal-tournament-goty )
-	media-libs/aalib"
-
-src_install() {
-	dogamesbin "${FILESDIR}/aaut"
-	prepgamesdirs
-}
diff --git a/games-fps/aaut/files/aaut b/games-fps/aaut/files/aaut
deleted file mode 100644
index d7f9aa805abf..000000000000
--- a/games-fps/aaut/files/aaut
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-[ -z "${AAOPTS}" ] && AAOPTS="-width 150 -height 70"
-SDL_VIDEODRIVER="aalib"
-export AAOPTS SDL_VIDEODRIVER
-exec ut "$@"
diff --git a/games-fps/aaut/metadata.xml b/games-fps/aaut/metadata.xml
deleted file mode 100644
index 1e1a02589cef..000000000000
--- a/games-fps/aaut/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-AAUT: Text Mode Unreal Tournament
-Remember, Kids. It's not big, and it's not clever
-
-Is UT just a little too high-end for your 
-look-I'm-using-my-15-year-old-P100-as-a-Linux-box machine?
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/alienarena-20130827-r1 b/games-fps/alienarena-20130827-r1
new file mode 100644
index 000000000000..2c985461b649
--- /dev/null
+++ b/games-fps/alienarena-20130827-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst
+DEPEND=!dedicated? ( virtual/jpeg:0 media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) net-misc/curl ) !dedicated? ( dga? ( x11-base/xorg-proto ) vidmode? ( x11-base/xorg-proto ) ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Fast-paced multiplayer deathmatch game
+EAPI=6
+HOMEPAGE=http://red.planetarena.org/
+IUSE=dedicated +dga +vidmode +zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 free-noncomm
+RDEPEND=!dedicated? ( virtual/jpeg:0 media-libs/openal media-libs/libvorbis media-libs/freetype:2 virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) net-misc/curl )
+SLOT=0
+SRC_URI=http://icculus.org/alienarena/Files/alienarena-7.66-linux20130827.tar.gz http://red.planetarena.org/files/alienarena-7.66-linux20130827.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_=9a541ccaf898de2419cd57f5be69609f
diff --git a/games-fps/alienarena/Manifest b/games-fps/alienarena/Manifest
deleted file mode 100644
index d373144c0bf1..000000000000
--- a/games-fps/alienarena/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX alienarena-20130827-format.patch 400 BLAKE2B b98e23612337d8adcb2a0337ea2d7b0b6bcc5f2cafcd4c11996d94198c0bf4904e6ab5dcd33f690e6bfe3aee22a1d4cc85df522be139ee5bfe4c117ec2cbdfa8 SHA512 f64c502e306a7508258c62882711cc2a8b3261ebea2dd12a43624bb21d5c74f361ae82db3c629a3e903eab166c25013473fc4f0739bddc476e6740a06b69e2a6
-DIST alienarena-7.66-linux20130827.tar.gz 617636649 BLAKE2B 9f15772f12329dc48496d3f998f2913e801b3d2523be63c1b87b72ca278d70cbb32b676652b5287cc7adc5aeb98f7afdf4160a1f9125c1c92b63bf502809e08d SHA512 6b86387b12fc82c01cf7945df5da7beb1a60e42a492b70096c64ace254d6300107a4b40762d20969eefbfe11c7365fbb3a5603b71f288e2330410feef48141a3
-EBUILD alienarena-20130827-r1.ebuild 1496 BLAKE2B 5a300f1d79c38cf061b19d0901fd34c65d76ca9658e7c20cf4381087027b000089f1d1bd83e2f568f984c3ce4289e00ea536bea2d039b379894c8fe8bcbaa0fe SHA512 ffdfc4d2ff979c6bf1cd78508328916cdded0791d045223a38491b2a1ea2cdb63798035513a59d60e1afaafe110d7c8eba8c872feadc4304d6963fbf01387e5c
-MISC metadata.xml 377 BLAKE2B 7eb47fff4c65e732aeba6aa299d74e2e8bbb70b2ae0236c2ea9fe821829e5fc4d1a2d2658de762fd238ed9884e65fe822f1b8f9cf7b3bf92a69cf9e4680ca0f9 SHA512 50fc923e0986e11991d55b60137facbf8234dd9d180336664030a1c3d7dfa60665326e1937170b1803577cc55774a806824e2611fb3a1552d31426da5f662b4d
diff --git a/games-fps/alienarena/alienarena-20130827-r1.ebuild b/games-fps/alienarena/alienarena-20130827-r1.ebuild
deleted file mode 100644
index 8f32fffbdf54..000000000000
--- a/games-fps/alienarena/alienarena-20130827-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-MY_PN="alienarena-7.66"
-
-DESCRIPTION="Fast-paced multiplayer deathmatch game"
-HOMEPAGE="http://red.planetarena.org/"
-SRC_URI="http://icculus.org/alienarena/Files/${MY_PN}-linux${PV}.tar.gz
-	http://red.planetarena.org/files/${MY_PN}-linux${PV}.tar.gz"
-
-LICENSE="GPL-2 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated +dga +vidmode +zlib"
-
-UIRDEPEND="
-	virtual/jpeg:0
-	media-libs/openal
-	media-libs/libvorbis
-	media-libs/freetype:2
-	virtual/glu
-	virtual/opengl
-	dga? ( x11-libs/libXxf86dga )
-	vidmode? ( x11-libs/libXxf86vm )
-	zlib? ( sys-libs/zlib )
-	net-misc/curl
-"
-UIDEPEND="
-	dga? ( x11-base/xorg-proto )
-	vidmode? ( x11-base/xorg-proto )
-"
-RDEPEND="!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
-	!dedicated? ( ${UIDEPEND} )
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_PN/_/.}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
-
-src_configure() {
-	econf \
-		--with-icondir=/usr/share/icons/hicolor/48x48/apps/ \
-		--without-system-libode \
-		--disable-documents \
-		$(use_enable !dedicated client) \
-		$(use_with zlib) \
-		$(use_with vidmode xf86vm) \
-		$(use_with dga xf86dga)
-}
-
-src_install() {
-	DOCS="docs/README.txt README" default
-	if ! use dedicated ; then
-		make_desktop_entry ${PN} "Alien Arena"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch b/games-fps/alienarena/files/alienarena-20130827-format.patch
deleted file mode 100644
index 3162a558afad..000000000000
--- a/games-fps/alienarena/files/alienarena-20130827-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/game/p_client.c.old	2016-01-18 20:13:25.147714704 +0100
-+++ b/source/game/p_client.c	2016-01-18 20:13:38.776476727 +0100
-@@ -2123,7 +2123,7 @@
- #else

- 	ent->ctype = 0; //alien is default

- 	sprintf(modelpath, "players/%s/human", playermodel);

--	sprintf(ent->charModel, playermodel);

-+	sprintf(ent->charModel, "%s", playermodel);

- 	Q2_FindFile (modelpath, &file);

- 	if(file) 

- 	{ 

diff --git a/games-fps/alienarena/metadata.xml b/games-fps/alienarena/metadata.xml
deleted file mode 100644
index 6767cd3e05d6..000000000000
--- a/games-fps/alienarena/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="vidmode">Link against <pkg>x11-libs/libXxf86vm</pkg>. Required for full-screen support.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-fps/avp-20150214-r1 b/games-fps/avp-20150214-r1
new file mode 100644
index 000000000000..36a2d04ba8d1
--- /dev/null
+++ b/games-fps/avp-20150214-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=media-libs/libsdl[video,joystick,opengl] media-libs/openal virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Linux port of Aliens vs Predator
+EAPI=6
+HOMEPAGE=http://www.icculus.org/avp/
+KEYWORDS=~amd64 ~x86
+LICENSE=AvP
+RDEPEND=media-libs/libsdl[video,joystick,opengl] media-libs/openal
+SLOT=0
+SRC_URI=http://www.icculus.org/avp/files/avp-20150214.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_=09dc8dca95411e5619676ddf6d92b3bb
diff --git a/games-fps/avp/Manifest b/games-fps/avp/Manifest
deleted file mode 100644
index 372a3bd1ee63..000000000000
--- a/games-fps/avp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST avp-20150214.tar.gz 1718303 BLAKE2B cc328bdb8c35046d7bde587c7feff22e890c2c68c4890ef431ccd0b3acfbbd08c784164f59a0111a6d0b6ded63a8edfb026b17e92f74554b9a948426be8c8185 SHA512 c485a55ff455498bcf82bc17f2056d35d4c646bdf7809f4c326fc7063a9ce5db9e4893af67dff3f6bedb7d5f96e82f792d7f516044fdbab638113091a5505158
-EBUILD avp-20150214-r1.ebuild 853 BLAKE2B 4d36bc15b891a0a30a04b3ccdb077afa93d4594c9314b92d1522f643b124d598fb3c723934ceaa1c3458765c717167585e47838450a629713c9b57170920a354 SHA512 a4a61535565aca35c1460cd01730331862c2fe0395876961e7844995a2a5953ed8d86ff8b359b38558e824e3c05397dae505f8747f73ffaf1a121347c26812ea
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/avp/avp-20150214-r1.ebuild b/games-fps/avp/avp-20150214-r1.ebuild
deleted file mode 100644
index 7a41b588eaad..000000000000
--- a/games-fps/avp/avp-20150214-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils cmake-utils
-
-DESCRIPTION="Linux port of Aliens vs Predator"
-HOMEPAGE="http://www.icculus.org/avp/"
-SRC_URI="http://www.icculus.org/avp/files/${P}.tar.gz"
-
-LICENSE="AvP"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[video,joystick,opengl]
-	media-libs/openal"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CMAKE_BUILD_TYPE=Release
-
-src_configure() {
-	local mycmakeargs=(
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		-DSDL_TYPE=SDL
-		-DOPENGL_TYPE=OPENGL
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-	dodoc README
-}
-
-pkg_postinst() {
-	elog "Please follow the instructions in /usr/share/doc/${PF}"
-	elog "to install the rest of the game."
-}
diff --git a/games-fps/avp/metadata.xml b/games-fps/avp/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/avp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/blackshades-20070723-r1 b/games-fps/blackshades-20070723-r1
new file mode 100644
index 000000000000..91980a9721de
--- /dev/null
+++ b/games-fps/blackshades-20070723-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/freealut media-libs/libsdl media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl
+DESCRIPTION=You control a psychic bodyguard, and try to protect the VIP
+EAPI=6
+HOMEPAGE=http://www.wolfire.com/blackshades.html http://www.icculus.org/blackshades/
+KEYWORDS=~amd64 ~x86
+LICENSE=blackshades
+RDEPEND=media-libs/freealut media-libs/libsdl media-libs/libvorbis media-libs/openal virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=http://filesingularity.timedoctor.org/Textures.tar.bz2 mirror://gentoo/blackshades-20070723.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_=a62c42e01f465cf93e8fa9b3e8dd84d3
diff --git a/games-fps/blackshades/Manifest b/games-fps/blackshades/Manifest
deleted file mode 100644
index be97a4333f21..000000000000
--- a/games-fps/blackshades/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX blackshades-datadir.patch 249 BLAKE2B ed0c1a3cf60eef43cf848c26eb64e6e3cb814e1533fdc810c1d2c2124454b76bbb22aa23ada77bf0c09cacf8d54c01fc6d0f04570d1d06c49983fabcd641d37f SHA512 e1f564b29fee08ab3f335933acafb90ddf2e382f7ad72a7d7d9410d3a46222864e8370ee48bbd117493ee01c01a6ba58a8f68daa6641d250cb6c6dd135ac84dd
-DIST Textures.tar.bz2 340110 BLAKE2B fa0f10c1658235352153bfaca8301090ad1db78bdd25980f50b54e0a386433cb0b0e20b04baa206eba877374b8432c73b106d9a8cc9e58d0b652746e92ad2a2f SHA512 42a2a28072972b0919a67a17ab06cf74d6bb611cbf91ff017d72726fa2d01b3c5dec905c6760a199b710eabfff8d980867269d6ad3476096beab5c4edb2cae10
-DIST blackshades-20070723.tar.bz2 761669 BLAKE2B 5baf7465ddc82c4de3d3063ae91a44550ebf067dc2fca0d001736516511e20d249f01f15f4845dfb6d9e1ac359940f42d583c4c48579c460465a9e58e97c0478 SHA512 9477c59d685227650980c16aeb59f567764bc983c01da4e256b2ec582b5a063ef89222eb4ab0d42552bf6a4ffd95ba270229800decc9ba7a9b289f093c5b9c61
-EBUILD blackshades-20070723-r1.ebuild 1266 BLAKE2B 479e06daec59436ecc9bc8345f8418166102f9876c566a5d1eeeab9879665e8bdd02a261c06146601824104485a17eb4df2a762ae55e43c6b1652f383d6c5a8f SHA512 f6b39d40ece5a33caa9c95bedd97dc9060cb3f624f23472730e53129c5ebbca675e5edff0f93f5b675c2170645303755cf9aaf6e5ad02dc843f6175f7ddd5b76
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/blackshades/blackshades-20070723-r1.ebuild b/games-fps/blackshades/blackshades-20070723-r1.ebuild
deleted file mode 100644
index a531ebbe5987..000000000000
--- a/games-fps/blackshades/blackshades-20070723-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="You control a psychic bodyguard, and try to protect the VIP"
-HOMEPAGE="http://www.wolfire.com/blackshades.html
-	http://www.icculus.org/blackshades/"
-SRC_URI="http://filesingularity.timedoctor.org/Textures.tar.bz2
-	mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="blackshades"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/freealut
-	media-libs/libsdl
-	media-libs/libvorbis
-	media-libs/openal
-	virtual/glu
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-datadir.patch
-)
-
-src_prepare() {
-	default
-
-	rm -rf Data/Textures || die
-	rm -f ../Textures/{,Blood/}._* || die
-	mv -f ../Textures Data || die "mv failed"
-	sed -i \
-		-e "s/-O2 \(-Wall\) -g/${CXXFLAGS} \1/" \
-		-e "/^LINKER/s:$: ${LDFLAGS}:" \
-		Makefile \
-		|| die "sed Makefile failed"
-	sed -i "s:@DATADIR@:/usr/share/${PN}:" \
-		Source/Main.cpp \
-		|| die "sed Main.cpp failed"
-}
-
-src_compile() {
-	emake bindir
-	emake
-}
-
-src_install() {
-	newbin objs/blackshades ${PN}
-	insinto /usr/share/${PN}
-	doins -r Data
-	dodoc IF_THIS_IS_A_README_YOU_HAVE_WON Readme TODO uDevGame_Readme
-	make_desktop_entry ${PN} "Black Shades"
-}
diff --git a/games-fps/blackshades/files/blackshades-datadir.patch b/games-fps/blackshades/files/blackshades-datadir.patch
deleted file mode 100644
index ee6cdf8e0364..000000000000
--- a/games-fps/blackshades/files/blackshades-datadir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Source/Main.cpp
-+++ b/Source/Main.cpp
-@@ -1,6 +1,7 @@
- /********************> Headers <*****/
- 
- #include "Game.h"
-+#include <unistd.h>
- 
- 
- 
-@@ -17,6 +18,7 @@
- int 	main( int argc, char *argv[] )
- 
- 	{
-+	chdir("@DATADIR@");
- 
- 	
- #ifdef OS9 
diff --git a/games-fps/blackshades/metadata.xml b/games-fps/blackshades/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/blackshades/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/darkplaces-20140513-r1 b/games-fps/darkplaces-20140513-r1
new file mode 100644
index 000000000000..b9acf4078533
--- /dev/null
+++ b/games-fps/darkplaces-20140513-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=lights? ( || ( app-arch/unrar app-arch/rar ) ) opengl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm x11-base/xorg-proto ) !opengl? ( sdl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm x11-base/xorg-proto ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm x11-base/xorg-proto ) ) ) virtual/pkgconfig app-arch/unzip
+DESCRIPTION=Enhanced engine for iD Software's Quake 1
+EAPI=6
+HOMEPAGE=http://icculus.org/twilight/darkplaces/
+IUSE=alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-misc/curl cdinstall? ( games-fps/quake1-data ) demo? ( games-fps/quake1-demodata ) textures? ( >=games-fps/quake1-textures-20050820 ) opengl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) !opengl? ( sdl? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) !opengl? ( !sdl? ( !dedicated? ( virtual/jpeg:0 media-libs/libogg media-libs/libvorbis virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl ) x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm ) ) )
+SLOT=0
+SRC_URI=http://icculus.org/twilight/darkplaces/files/darkplacesengine20140513.zip lights? ( http://www.fuhquake.net/files/extras/fuhquake-lits.rar http://www.kgbsyndicate.com/romi/id1.pk3 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4abef158208be99ef6fe60c6411e1b6a
diff --git a/games-fps/darkplaces/Manifest b/games-fps/darkplaces/Manifest
deleted file mode 100644
index ffbc908c47ee..000000000000
--- a/games-fps/darkplaces/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST darkplacesengine20140513.zip 28113487 BLAKE2B 9e3ffa759921fd61d1308f7c08cc1253a5a3d32c57e8dd8c2a05771aa0b5019fac7932ad337e4be95545bf093f4a2f20d221328ae0bfa45c2b00a7f5700fc04a SHA512 45864b590057c6de0ea978b3cc967feb879b87b2d376f3b4d8525e037b10ca1fc68599c152506494bb06669c6c2304e0aa0ee1b28f7a0d589d10c23f7285052c
-DIST fuhquake-lits.rar 8388829 BLAKE2B fb9c4db151deb43424de9331641154f412394ae6346864bc62a210c7d8d12c6ed6c8647cb4cd83fa853155c5f562f7e9b8d3c779fe74c1bb3f05bb6f627b1d5e SHA512 6e59f5e08a6c401b329b86b0cd677a04b1a5aee11f24973c77c9e7ea50cab9dedf4fc15c4f3d6b73bdc87bacdc9612a3c244d0a4ceceef943abb6e256ac23925
-DIST id1.pk3 350470 BLAKE2B 76426667de5f42633f608b75286671344d439398aa9b819e9ba3979ca317a93930b1077de7efb4b1bad670a6341c7536d572cfc2590a5812c71dd0c4e8def784 SHA512 d4d7233bc1e5049e89d09448818219b0ce7941fecde5381cd95933e4c96ebc9b4e34ff7eae5eb5d0d1e3cc2ceb4f5254f4d600aded7dda373713149817621331
-EBUILD darkplaces-20140513-r1.ebuild 4349 BLAKE2B 168c527e8b886ff65886c4f27c0161b1699a3652934b639968914f22ee3e55161abb908a065eb145e7ca37db6073aabe0f43a7e36ce291b112f26c05b8dc1919 SHA512 61984cf0e710c3fa838d09b25b21c0268bae358e4252ee19fcdc727fd7e7da504403ab00e7fd1061201a6223f723423deedb96d4e553de5afced5b1ae8bf094d
-MISC metadata.xml 567 BLAKE2B 46fb34c2aab597b51dd9e8d5effb76af828734a9a7826c503de0a843d12ddeb275d31d846f419635450a3ce1880eb31a1942e684cdc82d1aad83d1aa1cc97d17 SHA512 719f0053b4390b1dccb63e70bddb518f9aad79c8b240dd37ed16b1680a1053a51e309632893c87c51d6057e2602bc6a3fbe8c7d11330da76d5646b3c8c542bbd
diff --git a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild b/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
deleted file mode 100644
index 7ba3bcdb4ce9..000000000000
--- a/games-fps/darkplaces/darkplaces-20140513-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic unpacker
-
-# Latest versions are in http://icculus.org/twilight/darkplaces/files/
-MY_PV="${PV/_beta/beta}"
-MY_ENGINE="${PN}engine${MY_PV}.zip"
-
-# Different Quake 1 engines expect the lights in different directories
-# http://www.fuhquake.net/download.html and http://www.kgbsyndicate.com/romi/
-MY_LIGHTS="fuhquake-lits.rar"
-
-DESCRIPTION="Enhanced engine for iD Software's Quake 1"
-HOMEPAGE="http://icculus.org/twilight/darkplaces/"
-SRC_URI="http://icculus.org/twilight/${PN}/files/${MY_ENGINE}
-	lights? (
-		http://www.fuhquake.net/files/extras/${MY_LIGHTS}
-		http://www.kgbsyndicate.com/romi/id1.pk3 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdinstall cdsound debug dedicated demo lights opengl oss sdl textures"
-
-UIRDEPEND="
-	virtual/jpeg:0
-	media-libs/libogg
-	media-libs/libvorbis
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl )
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-"
-UIDEPEND="
-	x11-base/xorg-proto
-"
-RDEPEND="
-	net-misc/curl
-	cdinstall? ( games-fps/quake1-data )
-	demo? ( games-fps/quake1-demodata )
-	textures? ( >=games-fps/quake1-textures-20050820 )
-	opengl? ( ${UIRDEPEND} )
-	!opengl? ( sdl? ( ${UIRDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? ( ${UIRDEPEND} ) ) )
-"
-DEPEND="lights? ( || (
-			app-arch/unrar
-			app-arch/rar ) )
-	opengl? (
-		${UIRDEPEND}
-		${UIDEPEND} )
-	!opengl? ( sdl? (
-		${UIRDEPEND}
-		${UIDEPEND} ) )
-	!opengl? ( !sdl? ( !dedicated? (
-		${UIRDEPEND}
-		${UIDEPEND} ) ) )
-	virtual/pkgconfig
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${PN}"
-dir="/usr/share/quake1"
-
-opengl_client() { use opengl || ( ! use dedicated && ! use sdl ) }
-
-src_unpack() {
-	if use lights ; then
-		unpack "${MY_LIGHTS}"
-		unpack_zip "${DISTDIR}"/id1.pk3
-		mv *.lit maps/ || die
-		mv ReadMe.txt rtlights.txt
-	fi
-	unpack "${MY_ENGINE}"
-	unpack ./${PN}*.zip
-}
-
-src_prepare() {
-	default
-
-	rm "${WORKDIR}"/README-SDL.txt
-	cd "${S}"
-	rm mingw_note.txt
-
-	strip-flags
-
-	# Only additional CFLAGS optimization is the -march flag
-	local march=$(get-flag -march)
-	sed -i \
-		-e "s:-lasound:$(pkg-config --libs alsa):" \
-		-e "/^CPUOPTIMIZATIONS/d" \
-		-e '/^OPTIM_RELEASE/s/=.*/=$(CFLAGS)/' \
-		-e '/^OPTIM_DEBUG/s/=.*/=$(CFLAGS)/' \
-		-e '/^LDFLAGS_DEBUG/s/$/ $(LDFLAGS)/' \
-		-e '/^LDFLAGS_RELEASE/s/$/ $(LDFLAGS)/' \
-		-e "s:strip:true:" \
-		makefile.inc || die
-
-	if ! use cdsound ; then
-		# Turn the CD accesses off
-		sed -i \
-			-e "s:/dev/cdrom:/dev/null:" \
-			cd_linux.c || die
-		sed -i \
-			-e 's:COM_CheckParm("-nocdaudio"):1:' \
-			cd_shared.c || die
-	fi
-}
-
-src_compile() {
-	local opts="DP_FS_BASEDIR=\"${dir}\" DP_LINK_TO_LIBJPEG=1"
-
-	# Preferred sound is alsa
-	local sound_api="NULL"
-	use oss && sound_api="OSS"
-	use alsa && sound_api="ALSA"
-	opts="${opts} DP_SOUND_API=${sound_api}"
-
-	local type="release"
-	use debug && type="debug"
-
-	# Only compile a maximum of 1 client
-	if use sdl ; then
-		emake ${opts} "sdl-${type}"
-	elif opengl_client ; then
-		emake ${opts} "cl-${type}"
-	fi
-
-	if use dedicated ; then
-		emake ${opts} "sv-${type}"
-	fi
-}
-
-src_install() {
-	if opengl_client || use sdl ; then
-		local type=glx
-
-		use sdl && type=sdl
-
-		# darkplaces executable is needed, even just for demo
-		newbin "${PN}-${type}" ${PN}
-		newicon darkplaces72x72.png ${PN}.png
-
-		if use demo ; then
-			# Install command-line for demo, even if not desktop entry
-			make_wrapper ${PN}-demo "${PN} -game demo"
-		fi
-
-		if use demo && ! use cdinstall ; then
-			make_desktop_entry ${PN}-demo "Dark Places (Demo)"
-		else
-			# Full version takes precedence over demo
-			make_desktop_entry ${PN} "Dark Places"
-		fi
-	fi
-
-	if use dedicated ; then
-		newbin ${PN}-dedicated ${PN}-ded
-	fi
-
-	dodoc *.txt ChangeLog todo "${WORKDIR}"/*.txt
-
-	if use lights ; then
-		insinto "${dir}"/id1
-		doins -r "${WORKDIR}"/{cubemaps,maps}
-		if use demo ; then
-			# Set up symlinks, for the demo levels to include the lights
-			local d
-			for d in cubemaps maps ; do
-				dosym "${dir}/id1/${d}" "${dir}/demo/${d}"
-			done
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if ! use cdinstall && ! use demo ; then
-		elog "Place pak0.pak and pak1.pak in ${dir}/id1"
-	fi
-
-	if use sdl && ! use alsa ; then
-		ewarn "Select opengl with alsa, instead of sdl USE flag, for better audio latency."
-	fi
-}
diff --git a/games-fps/darkplaces/metadata.xml b/games-fps/darkplaces/metadata.xml
deleted file mode 100644
index f8d65d3d1216..000000000000
--- a/games-fps/darkplaces/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="cdsound">Enables using CD audio in the engine</flag>
-    <flag name="demo">Uses the demo data from quake1 (quake1-demodata)</flag>
-    <flag name="lights">Install and setup the updated light maps</flag>
-    <flag name="textures">Install and setup the updated textures</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/doom-data-1-r2 b/games-fps/doom-data-1-r2
new file mode 100644
index 000000000000..e2d58ae072ad
--- /dev/null
+++ b/games-fps/doom-data-1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Collection of doom wad files from id
+EAPI=6
+HOMEPAGE=http://www.idsoftware.com/
+IUSE=doomsday
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=freedist
+RDEPEND=doomsday? ( games-fps/doomsday )
+SLOT=0
+SRC_URI=mirror://gentoo/doom1.wad.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d7489223d1761e99d8f75574f123dafa
diff --git a/games-fps/doom-data/Manifest b/games-fps/doom-data/Manifest
deleted file mode 100644
index c4056bcb87f6..000000000000
--- a/games-fps/doom-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doom1.wad.bz2 1689021 BLAKE2B 45ab359525cec44ac6f58110be80e76a75e0d5e186c1fc6bb67e055e7a7e03d2596c2e99cb3636484245d1af85d6b93830f07d8548df99f5f40e55d249bcef16 SHA512 f3aa78fd1e36d2dbd176c8c5284f8cee4f39d8e34df5386fd668565e752410e2b776413c78c1e7a3571695a1668f1e4820338ebc9a2b1a0ed1a81896260534fe
-EBUILD doom-data-1-r2.ebuild 900 BLAKE2B 9a8e2c28cbc9dbc48fb6e986f557fe7629752358822af27a833f7172ef52bde43da146cb855ffc8ebfea4bc920dd4b58ad3088dbaaffa3eabb3ad14910e7639b SHA512 c0b0d7b36df52b3165a07d63297fa14513d6fc1ee01cb0174c8333def136b1ab197dc9ea1c338a58098c003b2c980c6d52397cd316a823a6a89dca2414aafdc4
-MISC metadata.xml 347 BLAKE2B 4655211a8c43a4659d40a685721f45ba4abce6277eba9ec94b19755dff4824feef2bb704d7f5746cb43d91eef2ab9f72a47fe4a116f994cddb8bcc0cf7371180 SHA512 2cf8dbebdc411b37294374d196748fa23a741e5ae37946d87b74fabba84dc67811db3f5e215b82be1ec0e8543ea4e0b5e3a5e46412dffb576b3492ebb79edd3a
diff --git a/games-fps/doom-data/doom-data-1-r2.ebuild b/games-fps/doom-data/doom-data-1-r2.ebuild
deleted file mode 100644
index dcbff4655ed9..000000000000
--- a/games-fps/doom-data/doom-data-1-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Collection of doom wad files from id"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://gentoo/doom1.wad.bz2"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doomsday"
-
-RDEPEND="doomsday? ( games-fps/doomsday )"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/doom-data
-	doins *.wad
-	if use doomsday; then
-		# Make wrapper for doomsday
-		make_wrapper doomsday-demo "jdoom -file \
-			/usr/share/doom-data/doom1.wad"
-		make_desktop_entry doomsday-demo "Doomsday - Demo"
-	fi
-}
-
-pkg_postinst() {
-	if use doomsday; then
-		elog "To use the doomsday engine, run doomsday-demo"
-	else
-		elog "A Doom engine is required to play the wad"
-		elog "Enable the doomsday use flag if you want to use"
-		elog "	the doomsday engine"
-	fi
-}
diff --git a/games-fps/doom-data/metadata.xml b/games-fps/doom-data/metadata.xml
deleted file mode 100644
index 343e8213e1cf..000000000000
--- a/games-fps/doom-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="doomsday">Add wrapper to run it within doomsday</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/doom3-1.3.1304-r1 b/games-fps/doom3-1.3.1304-r1
new file mode 100644
index 000000000000..ee70fb24ff0a
--- /dev/null
+++ b/games-fps/doom3-1.3.1304-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=app-arch/bzip2 app-arch/tar
+DESCRIPTION=3rd installment of the classic iD 3D first-person shooter
+EAPI=5
+HOMEPAGE=http://www.doom3.com/
+IUSE=cdinstall dedicated roe
+KEYWORDS=~amd64 ~x86
+LICENSE=DOOM3
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) !dedicated? ( >=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(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] ) cdinstall? ( >=games-fps/doom3-data-1.1.1282-r1 roe? ( games-fps/doom3-roe ) ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://idsoftware/doom3/linux/doom3-linux-1.3.1.1304.x86.run http://zerowing.idsoftware.com/linux/doom3.png
+_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_=d7a3f637ca3e36de5568b97b1f102269
diff --git a/games-fps/doom3-cdoom-1.3.1 b/games-fps/doom3-cdoom-1.3.1
new file mode 100644
index 000000000000..169e1565fd33
--- /dev/null
+++ b/games-fps/doom3-cdoom-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Classic Doom - Doom 1 conversion for Doom 3
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/classic-doom-3
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GameFront
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=classic_doom_3_131.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ef968a419384f73141f42dcbbd263e8e
diff --git a/games-fps/doom3-cdoom/Manifest b/games-fps/doom3-cdoom/Manifest
deleted file mode 100644
index f3153b61641f..000000000000
--- a/games-fps/doom3-cdoom/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST classic_doom_3_131.zip 212329377 BLAKE2B 285bef3185c18cbc2e40f3cf54843dc1e37fabcf032453f8580308e8efb1da59a7d5815ad53a71752ff019671fc2949d10cf89a4ac9c21f292513af3f0c4b6f9 SHA512 6e997b6d3c35296b1d0c9ece288cc9d8d8dee1dcc42b38e068e7c101c79ab01475093777bfcd6ffeab1943fef3bc1f62e5917288c4a28789448454db9e656e51
-EBUILD doom3-cdoom-1.3.1.ebuild 643 BLAKE2B 8e90c999e1b43ef4620c5438fea8c402b5889f360f3a6e081ac7318c8cdbd26347e131367c4d7e23b03520634286ee35441c4a53b1aa5b4a483e21e2c04ed642 SHA512 9d8e8717db4a226cc9e2e3459e342c7b8fb8fee6ac1614a3010e0212851060f897c02d80910a52ca525217d00ef59ec7eb35d4504612fa82832509ea66945ba6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild b/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
deleted file mode 100644
index 41cce5766df9..000000000000
--- a/games-fps/doom3-cdoom/doom3-cdoom-1.3.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Doom 1 conversion for Doom 3"
-MOD_NAME="Classic Doom"
-MOD_DIR="cdoom"
-MOD_ICON="cdoom.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/classic-doom-3"
-SRC_URI="classic_doom_3_${PV//.}.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "http://www.filefront.com/8748743"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	cd ${MOD_DIR} || die
-	rm -f *.{bat,url} cdoom_{dll,mac}.pk4
-}
diff --git a/games-fps/doom3-cdoom/metadata.xml b/games-fps/doom3-cdoom/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-cdoom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-chextrek-0.52 b/games-fps/doom3-chextrek-0.52
new file mode 100644
index 000000000000..845bcc8b0ce6
--- /dev/null
+++ b/games-fps/doom3-chextrek-0.52
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Chex Trek: Beyond the Quest - Green slimeballs mod for kids
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/chex-trek-beyond-the-quest
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GameFront
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=chextrek_beta_052.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=236ec1b10ea54fb1f9b92ced06669387
diff --git a/games-fps/doom3-chextrek/Manifest b/games-fps/doom3-chextrek/Manifest
deleted file mode 100644
index 560a439da555..000000000000
--- a/games-fps/doom3-chextrek/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chextrek_beta_052.zip 97683796 BLAKE2B f26d9ac130b202fc9b8142d2b7b78eef18b4b27caf8bdc6fa7a525d11c77645d03c397773de95718eb7c69145318644463d26dd17775b2aeddd14cb6be59706d SHA512 b8dcb80bb4d945c42acd446f7e9f07e1f4d3c0048b386709577b77233f7a971b6be6a9e1be7cd17d7d8491cd558f73ee82b94785de122bf781078f6705d04457
-EBUILD doom3-chextrek-0.52.ebuild 822 BLAKE2B af81af5858213250fc7b908129888b39e89b825391a014c35aa8b72c7b8b29757b452f494dfcc40e842f460a52e4adcd2ab45b66847331bae4705b418e1f1c15 SHA512 bcb5517196abe147ec91e899bc1e98a0d17e6bd151d6a6f0c692466db1724a98a58061e848bba032d42ce655dac0b5b7d8168ff7ab8b7b55011af63c72aaa427
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild b/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
deleted file mode 100644
index 2f9b99a7b4fb..000000000000
--- a/games-fps/doom3-chextrek/doom3-chextrek-0.52.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Green slimeballs mod for kids"
-MOD_NAME="Chex Trek: Beyond the Quest"
-MOD_DIR="chextrek"
-MOD_ICON="flem.ico"
-
-inherit games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/chex-trek-beyond-the-quest"
-SRC_URI="chextrek_beta_${PV/.}.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "https://www.moddb.com/mods/chex-trek-beyond-the-quest/downloads/chex-trek-beta-052"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	mv -f chextrek_beta* ${MOD_DIR} || die
-}
-
-pkg_postinst() {
-	games-mods_pkg_postinst
-
-	elog "Press 'E' to open doors in the game."
-	elog "Press 'M' to toggle the map."
-}
diff --git a/games-fps/doom3-chextrek/metadata.xml b/games-fps/doom3-chextrek/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-chextrek/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-data-1.1.1282-r1 b/games-fps/doom3-data-1.1.1282-r1
new file mode 100644
index 000000000000..f8e0c71c15cc
--- /dev/null
+++ b/games-fps/doom3-data-1.1.1282-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Doom 3 - data portion
+EAPI=5
+HOMEPAGE=http://www.doom3.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=DOOM3
+PROPERTIES=interactive
+RDEPEND=games-fps/doom3 games-misc/games-envd
+SLOT=0
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=019ba34bf2879378b4d24ace2043e11c
diff --git a/games-fps/doom3-data/Manifest b/games-fps/doom3-data/Manifest
deleted file mode 100644
index 32b03c503c5d..000000000000
--- a/games-fps/doom3-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD doom3-data-1.1.1282-r1.ebuild 977 BLAKE2B c34ba06fc2072450d130efaca6b26facd918c557c7063af1fad30985b7e466e5bd474bbf06311a164278d156f06feb0ce5ad2e13a746b21d2bcf06445c278400 SHA512 6aed225b474521b5619b08ea6ab0524f1a674abefb6c52967b16ed6b27ccd72b0f2243503088ced9f850d6274cb049a618428fe84689cdc97d2710af51ec5d06
-MISC metadata.xml 591 BLAKE2B ab53c17f71fdba0e4e72b7a117caed25571f0bdaf99d5903b81455d9cb419a1d2b4e8a2e4b5df2466f16554920b0e265e8390b263688ce1bd8647ebf8bac5e98 SHA512 c3c4b6bece181e97442362164c3a87f2c3c8bbaf378ea3f629497983c2a57077d92c9caf84fd7104c47430329e6789539bbb58bab92e6a6aecd47e93c04fd4f2
diff --git a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild b/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
deleted file mode 100644
index cdb2aea6ab45..000000000000
--- a/games-fps/doom3-data/doom3-data-1.1.1282-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cdrom games
-
-DESCRIPTION="Doom 3 - data portion"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI=""
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-fps/doom3"
-
-S=${WORKDIR}
-
-src_install() {
-	cdrom_get_cds \
-		Setup/Data/base/pak002.pk4 \
-		Setup/Data/base/pak000.pk4 \
-		Setup/Data/base/pak003.pk4
-
-	insinto "${GAMES_PREFIX_OPT}"/doom3/base
-
-	einfo "Copying files from CD 1..."
-	doins "${CDROM_ROOT}"/Setup/Data/base/pak002.pk4
-
-	cdrom_load_next_cd
-	einfo "Copying files from CD 2..."
-	doins "${CDROM_ROOT}"/Setup/Data/base/pak00{0,1}.pk4
-
-	cdrom_load_next_cd
-	einfo "Copying files from CD 3..."
-	doins "${CDROM_ROOT}"/Setup/Data/base/pak00{3,4}.pk4
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "This is just the data portion of the game. You will need to install"
-	elog "games-fps/doom3 to play the game."
-}
diff --git a/games-fps/doom3-data/metadata.xml b/games-fps/doom3-data/metadata.xml
deleted file mode 100644
index 5d323b38e051..000000000000
--- a/games-fps/doom3-data/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-This is the data portion of the commercial Id Software game Doom III.  This is
-commercial software and requires the purchase of Doom III from any retailer.
-This package copies files from the Doom III media and is interactive, in that
-regard.  To play the game, you will still need games-fps/doom3 merged.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/doom3-demo-1.1.1286-r1 b/games-fps/doom3-demo-1.1.1286-r1
new file mode 100644
index 000000000000..728537f5c95f
--- /dev/null
+++ b/games-fps/doom3-demo-1.1.1286-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Doom III - 3rd installment of the classic id 3D first-person shooter
+EAPI=5
+HOMEPAGE=http://www.doom3.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=DOOM3
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) >=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(-)] games-misc/games-envd
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://3dgamers/doom3/doom3-linux-1.1.1286-demo.x86.run mirror://idsoftware/doom3/linux/doom3-linux-1.1.1286-demo.x86.run mirror://gentoo/doom3.png
+_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_=a89f37da431330eac152a7ed57772e25
diff --git a/games-fps/doom3-demo/Manifest b/games-fps/doom3-demo/Manifest
deleted file mode 100644
index 45d63f8cb84d..000000000000
--- a/games-fps/doom3-demo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST doom3-linux-1.1.1286-demo.x86.run 485257318 BLAKE2B 47405fa9ce9c9dc73306a2ff8394e897d4b190348d4f6e65e3db24350b93d14598a571dde5a56cd01a7178b7287a6bece165ac5eb1af914fdd1df5fbafa2512d SHA512 9eeada64b60ef06c8380411050ea794a863c9672578bf4593a35835c6d4b7dc5d0ba8e8cb5e5c46cbbdfd7410483e5f6321ac1393655f29b481aea99dc00b3db
-DIST doom3.png 6502 BLAKE2B e467e622bb8955024aaf13dc97e0facc7f83aa344007172890d1982f39d35a643c859663fbdc60424332fe1b4b57711b7ce75fcdda8c77b4b2e8e6b71e9431e2 SHA512 9a2b3831babbf3fa0d354e1a4a779c972676edbcc0b287de9b9f3eb830e0a00d557ba9645fbf0e58e07d5705efb0ef2b7ab96cd92493e2a0afc30c8842c0043b
-EBUILD doom3-demo-1.1.1286-r1.ebuild 1469 BLAKE2B b008c5965ae127006f4ca5d39177b01903b13770906576e308006de4708994b7a16314bcdf3c98583f43d034b3176f70d251d3de94eeeba4995b2d8226c0c074 SHA512 ba3991d6737c39f11f78349751aa22434adfef2c403cc92c824b16098037c3a1d5337ef381cd2d92f9f351b0f54abd848c90d40460e54bf63cd9846ad687431c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild b/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
deleted file mode 100644
index c3f4751a0421..000000000000
--- a/games-fps/doom3-demo/doom3-demo-1.1.1286-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="Doom III - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI="mirror://3dgamers/doom3/doom3-linux-${PV}-demo.x86.run
-	mirror://idsoftware/doom3/linux/doom3-linux-${PV}-demo.x86.run
-	mirror://gentoo/doom3.png"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip mirror"
-QA_EXECSTACK="${GAMES_PREFIX_OPT:1}/${PN}/*"
-
-# Do not remove the amd64 dep unless you are POSITIVE that it is not necessary.
-# See bug #88227 for more.
-RDEPEND="sys-libs/glibc
-	sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	>=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(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unpack_makeself doom3-linux-${PV}-demo.x86.run
-}
-
-src_install() {
-	insinto "${dir}"
-	doins License.txt README version.info
-
-	insinto "${dir}"/demo
-	doins demo/* || die "doins base"
-
-	exeinto "${dir}"
-	doexe gamex86.so bin/Linux/x86/doom.x86
-
-	newicon "${DISTDIR}"/doom3.png ${PN}.png
-
-	games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
-	make_desktop_entry ${PN} "Doom III (Demo)"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "To play the game run:"
-	elog " doom3-demo"
-}
diff --git a/games-fps/doom3-demo/metadata.xml b/games-fps/doom3-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-ducttape-0007 b/games-fps/doom3-ducttape-0007
new file mode 100644
index 000000000000..5b6d4594085f
--- /dev/null
+++ b/games-fps/doom3-ducttape-0007
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Duct Tape - sticks flashlights to your machinegun and shotgun
+EAPI=5
+HOMEPAGE=http://ducttape.glenmurphy.com/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://ducttape.glenmurphy.com/ducttape0007.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c56b292ba8a25779e2a52ca8a2d38bb5
diff --git a/games-fps/doom3-ducttape/Manifest b/games-fps/doom3-ducttape/Manifest
deleted file mode 100644
index f1ba3ac5f1f4..000000000000
--- a/games-fps/doom3-ducttape/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ducttape0007.zip 66501 BLAKE2B 393f295da2093ab70b4392097ea6301c06b5c977a787fe3e319a591ee7faddca46551c4142ace34d95d9c59b19ac4369c1882307dd8f930f487184e848248ed0 SHA512 90c2a271881b3cc7823be5f01b0809d99aabb6f8a88c9a3806d6b4adc0f86a9a0f63cd34498fcd99ff1eb25de4271aac5912495a469bbb72d4b9ae7b90f003a2
-EBUILD doom3-ducttape-0007.ebuild 752 BLAKE2B a69ba2c84574989947658e7285b9cdfde351bd3fe0cd19c66e53376288258911a74e66d1c44a8619791e919d699c60546c63229e6a3b3fa54b115583facde89b SHA512 99386e825eaf510f6b604e1b681c9fdbee1202187c1db250c4253877c338aaa14d203a4fa8cfb931c71d0071fea12554c4a853975f27a06f66a8d734d8f1176b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild b/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
deleted file mode 100644
index 4553ae0e3326..000000000000
--- a/games-fps/doom3-ducttape/doom3-ducttape-0007.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="sticks flashlights to your machinegun and shotgun"
-MOD_NAME="Duct Tape"
-MOD_DIR="ducttape"
-
-inherit games games-mods
-
-HOMEPAGE="http://ducttape.glenmurphy.com/"
-SRC_URI="http://ducttape.glenmurphy.com/ducttape${PV}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	mkdir ${MOD_DIR} || die
-	cd ${MOD_DIR} || die
-	unpack ${A}
-}
-
-src_prepare() {
-	rm -f ${MOD_DIR}/pak002.pk4 || die # for doom3-roe
-}
-
-pkg_postinst() {
-	games-mods_pkg_postinst
-
-	elog "To use old saved games with this mod, run:"
-	elog " mkdir -p ~/.doom3/ducttape"
-	elog " cp -r ~/.doom3/base/savegames ~/.doom3/ducttape"
-}
diff --git a/games-fps/doom3-ducttape/metadata.xml b/games-fps/doom3-ducttape/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-ducttape/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-eventhorizon-1.3 b/games-fps/doom3-eventhorizon-1.3
new file mode 100644
index 000000000000..a20990dca108
--- /dev/null
+++ b/games-fps/doom3-eventhorizon-1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Event Horizon - single-player mission based on the Event Horizon film
+EAPI=5
+HOMEPAGE=http://www.gamefront.com/files/10716974
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch mirror
+SLOT=0
+SRC_URI=event_horizon_xv_1.3.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0029d0180c7dcefd1fd06d81c20373fe
diff --git a/games-fps/doom3-eventhorizon/Manifest b/games-fps/doom3-eventhorizon/Manifest
deleted file mode 100644
index a93da76289b0..000000000000
--- a/games-fps/doom3-eventhorizon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST event_horizon_xv_1.3.zip 108659988 BLAKE2B 6779fdcfb35b70872d7c7f1a94a4c177ff8904cc8dd39f5daad2af75874d9b39042d1e41a596acf48ae0aef549fff93bacffee1a7ec76de3bbf49f6e83b2efbb SHA512 af8d406b8b87ba22a43558cec034b5810bcee2a7dbb4bf87fd879d25f67b247e0d751443b4fcfe0a1b5072376f3941dd8e59d6d10e9ae9304c05b7ef6ae31944
-EBUILD doom3-eventhorizon-1.3.ebuild 651 BLAKE2B 94bcfc6a8f90f11c14e68d74b9e4c07c2fe9f1937ecdb51370f7e12bd379f58a5cd3489d01e7a7961a9ac9508e9ed6bcda86f4bf8a17c4692270be47dd494acd SHA512 42655f46815d4922bb050f918678e089a4784ab1ddd7694960dad51d01af95144e041f1500837581d77db84f53a5303d05cd6acf0796be6095cb91c218f6df5f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild b/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
deleted file mode 100644
index add575517592..000000000000
--- a/games-fps/doom3-eventhorizon/doom3-eventhorizon-1.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="single-player mission based on the Event Horizon film"
-MOD_NAME="Event Horizon"
-MOD_DIR="eventhorizon"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.gamefront.com/files/10716974"
-SRC_URI="event_horizon_xv_${PV}.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch mirror"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please download \"${SRC_URI}\" from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-}
-
-src_prepare() {
-	mv -f event_horizon* ${MOD_DIR} || die
-}
diff --git a/games-fps/doom3-eventhorizon/metadata.xml b/games-fps/doom3-eventhorizon/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-eventhorizon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-hellcampaign-1-r1 b/games-fps/doom3-hellcampaign-1-r1
new file mode 100644
index 000000000000..7798b9a88f02
--- /dev/null
+++ b/games-fps/doom3-hellcampaign-1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Hell Campaign - map pack for Doom 3
+EAPI=5
+HOMEPAGE=http://www.gamefront.com/files/listing/gamingfiles/Doom_III/Maps/Map_Packs/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GameFront
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=sp_hc_final.zip hardcorehellcampaign_patch.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1ea6f2fde43722b670df268d9ee03dc4
diff --git a/games-fps/doom3-hellcampaign/Manifest b/games-fps/doom3-hellcampaign/Manifest
deleted file mode 100644
index fbb256737c6a..000000000000
--- a/games-fps/doom3-hellcampaign/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hardcorehellcampaign_patch.zip 532844 BLAKE2B d6f4ac0bf3aa5d1cda257207c8645689d0e55ea35e91f8964d7b18a067b0bf65950a5a6fa771862fab4820f648526b08eae1195a4ef5bf87041f9a0f39e98c3a SHA512 643d883c1e114af49dc573c90c19b6793cfb6f399a0050bd0c084aa56773c1a72b54cd22ec147f1981cfd1400a3253be44fc0add7b8bb1d5add8fe8163a781a0
-DIST sp_hc_final.zip 113992555 BLAKE2B b2864f2d2961e84c1335e97bd1106614c7d501cb7a95d9f3ac4c634f7c5437a67e4714a8b1931e144ca2dc2f7cd00c84272a65ec03e55f159f1e8af63cee1ab3 SHA512 3af8466822882fda9094fd64ec50bbe7afa0e70e8e6dafa649f7798a14da37cfa1f725b855980e16cbe3cc48799363784f762782612617fdcd008b9490f07f2e
-EBUILD doom3-hellcampaign-1-r1.ebuild 1113 BLAKE2B 108a65210916b6baa5a62473903f3689e93ec8a96040cb44b948258dba60fb749e4981ef9ea9f6dc5f55434fd2e4bb2b4fb27a717ca0d849b4f561baa5a4ad54 SHA512 d2657eb1428d642b36b65dc996e6a988133e8cee1fc0ee0413d4f4833ff12ba24584a814742bb90404ac075c6b86875ef0ccfad93851a144246083afdcf520ef
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild b/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
deleted file mode 100644
index 80c4babebdec..000000000000
--- a/games-fps/doom3-hellcampaign/doom3-hellcampaign-1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="map pack for Doom 3"
-MOD_NAME="Hell Campaign"
-MOD_DIR="hell_campaign"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.gamefront.com/files/listing/gamingfiles/Doom_III/Maps/Map_Packs/"
-SRC_URI="sp_hc_final.zip
-	hardcorehellcampaign_patch.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download the following files:"
-	elog "http://www.filefront.com/4445166"
-	elog "http://www.filefront.com/4593578"
-	elog "and move them to ${DISTDIR}"
-}
-
-src_unpack() {
-	mkdir ${MOD_DIR}
-	cd ${MOD_DIR}
-	unpack ${A}
-}
-
-src_prepare() {
-	cd ${MOD_DIR}
-
-	# Prevent "non-portable" upper-case-filename warnings in Doom 3
-	mv -f "Hardcore Hell Campaign.pk4" hardcore_hell_campaign.pk4 || die
-	mv -f Q2Textures.pk4 q2Textures.pk4 || die
-	mv -f Q3Textures.pk4 q3Textures.pk4 || die
-
-	mv -f "Hardcore Hell Campaign.rtf" readme.rtf || die
-
-	# Show nice description in "mods" menu within Doom 3
-	echo "${MOD_NAME}" > description.txt
-}
diff --git a/games-fps/doom3-hellcampaign/metadata.xml b/games-fps/doom3-hellcampaign/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-hellcampaign/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-inhell-1.1-r1 b/games-fps/doom3-inhell-1.1-r1
new file mode 100644
index 000000000000..650600842563
--- /dev/null
+++ b/games-fps/doom3-inhell-1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 In Hell - Ultimate Doom-inspired levels for Doom 3
+EAPI=5
+HOMEPAGE=http://www.doomerland.de.vu/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GameFront
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=in_hell_v11.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=310398093d3de07dd75dc013c5618c13
diff --git a/games-fps/doom3-inhell/Manifest b/games-fps/doom3-inhell/Manifest
deleted file mode 100644
index 5d33bebcd23c..000000000000
--- a/games-fps/doom3-inhell/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST in_hell_v11.zip 356652597 BLAKE2B af2f072413d417a3d06d099b4c5c2b2ac5c3fde9e54a90be81ad12d2103252476ee048f4b38dc241b73f82099f58568c02ceb4e754f7a8fa3b1ae2193b8d161f SHA512 6d97856f518161a445eb1b01eef9a987b9e0675729734539b57c56ff798cb257a6e337cd19c3b37dbea5bf5b22ae6694957a08e3fe8bc3207ea1b7982e3f8624
-EBUILD doom3-inhell-1.1-r1.ebuild 582 BLAKE2B 9799b55ba36c9d42e8a63f96fd555231a0a114f4c07e372237e8f206d98ccda21c731f8ab52798809b8fd4cc58dd0773b4b3f4badd63b01c106f90c9a0cbe93a SHA512 2d68bd3abca0b55390497f72b05c436335442aad7a5da056bd6aa205d52a9a928ab187c79909840c65c2aabdd0c56249e088c090620d414ff4911a91f1cb97f0
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild b/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
deleted file mode 100644
index bdd54df23fba..000000000000
--- a/games-fps/doom3-inhell/doom3-inhell-1.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Ultimate Doom-inspired levels for Doom 3"
-MOD_NAME="In Hell"
-MOD_DIR="inhell"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.doomerland.de.vu/"
-SRC_URI="in_hell_v${PV/.}.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "http://www.filefront.com/4631315"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	mv -f In_Hell ${MOD_DIR} || die
-}
diff --git a/games-fps/doom3-inhell/metadata.xml b/games-fps/doom3-inhell/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-inhell/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-lms-4 b/games-fps/doom3-lms-4
new file mode 100644
index 000000000000..96c7a44b8ed0
--- /dev/null
+++ b/games-fps/doom3-lms-4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Last Man Standing - add co-op support or play against swarms of monsters
+EAPI=5
+HOMEPAGE=https://www.doom3coop.com
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GameFront
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=LastManStandingCoop4Multiplatform.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cf360ca7426ebc1ecca81a7753a4ddfb
diff --git a/games-fps/doom3-lms/Manifest b/games-fps/doom3-lms/Manifest
deleted file mode 100644
index fcb891bc051f..000000000000
--- a/games-fps/doom3-lms/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST LastManStandingCoop4Multiplatform.zip 309768743 BLAKE2B 3ae67e85eb267e62d1158832f215c2c6b3e9dcf2593824ad45318c151e847eb8f057e2b6336c4e5c148194d0006496164cfccd7b93d1590e7fa2ac50b97c5b1c SHA512 f3d6fb1beab25dafc51a59153edb4cbb173ea4cdfd924b8f9610873bc1326efc2d85d62a23c6523b4a61319718a35ed44fecdf59bc8346fb1abb159ac93e6b15
-EBUILD doom3-lms-4.ebuild 670 BLAKE2B 04820c135ea27744dea917fd39565f2edaa5447519b2854858e5237c7a21d65129f66c4400bd47e06611591277310d74f324619ee5bea82413ce4000b8084eb4 SHA512 a3eb3e59cc282d7174e7decb5a0fec109baee1446eab6b8f92689c65f9c9c9e9a9c7d5e41d719c38bf534a3f633e510f78447c717dd77a393961f1ba7d46b2f1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-lms/doom3-lms-4.ebuild b/games-fps/doom3-lms/doom3-lms-4.ebuild
deleted file mode 100644
index c931cd3f1b92..000000000000
--- a/games-fps/doom3-lms/doom3-lms-4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="add co-op support or play against swarms of monsters"
-MOD_NAME="Last Man Standing"
-MOD_DIR="lms4"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.doom3coop.com"
-SRC_URI="LastManStandingCoop4Multiplatform.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "http://www.moddb.com/mods/last-man-standing-coop/downloads"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	cd ${MOD_DIR} || die
-	rm -f *.{bat,url} game_lms40{0,2}.pk4
-}
diff --git a/games-fps/doom3-lms/metadata.xml b/games-fps/doom3-lms/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-lms/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-mitm-20070129 b/games-fps/doom3-mitm-20070129
new file mode 100644
index 000000000000..a295c089b001
--- /dev/null
+++ b/games-fps/doom3-mitm-20070129
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Doom 3 Make it to Morning - Single player maps
+EAPI=5
+HOMEPAGE=http://www.jimwilkie.co.uk/mitm/
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-fps/doom3-roe games-fps/doom3[opengl,roe] games-misc/games-envd dedicated? ( games-fps/doom3[dedicated] ) opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/doom3[opengl] games-fps/doom3[-dedicated] ) ) )
+RESTRICT=fetch
+SLOT=0
+SRC_URI=MakeItToMorning1-6.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a2d76252cc97e5a043af371b2b582d0e
diff --git a/games-fps/doom3-mitm/Manifest b/games-fps/doom3-mitm/Manifest
deleted file mode 100644
index 08075680efd2..000000000000
--- a/games-fps/doom3-mitm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MakeItToMorning1-6.zip 184131772 BLAKE2B 03de634789cdd62293b39617e807d9137e9fef84849555cb6b87ade9bcd1f3ad2f9973cb2510716a5fe38a5bbb1b2ebfa4a38357a65ae9355af7d53785edd048 SHA512 5c8b58b51fb4308366db74705c6f1c5ed7a99f41992000c0ceb3b57fe1d61cb617cc03725ab213d6d7cfbad76104efebe647e50d5ad78e5b0ec480ed840118ea
-EBUILD doom3-mitm-20070129.ebuild 1065 BLAKE2B e48aa506232b0454c8062ff14758838068dcfc452c2caa3e3bfa1d20103e72625bb881933cdbc03b4e45be688ce3b358c7719a2db3b5981ce9036ff81fa6784c SHA512 35d412afae56a9b8fd4413a2fcd6fb1e6d648aac7f341344d5a2b32428719fffb58232e3910a0b0555c00a8ef32199ce395f8f803474ae3375a5a94b7dfaf11f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild b/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
deleted file mode 100644
index 7b38c2520cbd..000000000000
--- a/games-fps/doom3-mitm/doom3-mitm-20070129.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Single player maps"
-MOD_NAME="Make it to Morning"
-
-inherit eutils games games-mods
-
-HOMEPAGE="http://www.jimwilkie.co.uk/mitm/"
-SRC_URI="MakeItToMorning1-6.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND="games-fps/doom3-roe
-	games-fps/doom3[opengl,roe]"
-
-pkg_nofetch() {
-	elog "Go to http://www.gamewatcher.com/mods/doom-3-resurrection-of-evil-mod/make-it-to-morning-1-6"
-	elog "and download ${A} and place the file in ${DISTDIR}"
-}
-
-src_unpack() {
-	mkdir mitm || die
-	cd mitm || die
-	unpack ${A}
-}
-
-src_install() {
-	games_make_wrapper ${PN} \
-		"doom3 +set fs_game_base d3xp +set fs_game mitm +map mitm"
-	make_desktop_entry ${PN} "Doom 3 - ${MOD_NAME} (1)" doom3
-	local i
-	for i in {2..6} ; do
-		games_make_wrapper ${PN}${i} \
-			"doom3 +set fs_game_base d3xp +set fs_game mitm +map mitm${i}"
-		make_desktop_entry ${PN}${i} "Doom 3 - ${MOD_NAME} (${i})" doom3
-	done
-	games-mods_src_install
-}
diff --git a/games-fps/doom3-mitm/metadata.xml b/games-fps/doom3-mitm/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/doom3-mitm/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/doom3-roe-1 b/games-fps/doom3-roe-1
new file mode 100644
index 000000000000..ddd9dc1381e0
--- /dev/null
+++ b/games-fps/doom3-roe-1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Doom III: Resurrection of Evil expansion pack
+EAPI=5
+HOMEPAGE=http://www.doom3.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=DOOM3
+PROPERTIES=interactive
+RDEPEND=>=games-fps/doom3-1.3.1302-r2 games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4c32c516cf793c563ea065abc3dc112c
diff --git a/games-fps/doom3-roe/Manifest b/games-fps/doom3-roe/Manifest
deleted file mode 100644
index a8bc306fede9..000000000000
--- a/games-fps/doom3-roe/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD doom3-roe-1.ebuild 1125 BLAKE2B 39336ef1c81bbd9ce7cf241a4769bfb273f683826db9cd948bdea246ad08c1eef3fbad1bfca898b179a1e95a6ab4304f8ccd23186c87356a854bb4b76300f2bf SHA512 6298e6825517288bd5bc745c342d4c87e39aedfa7f25875aca52f7ce174bbeec3feba66888e59aead072bcf4e1f8952befcdde192f7ec35a7971fabc3aa5acfc
-MISC metadata.xml 708 BLAKE2B 13bbc429d58051c74aa1be7c2f817c8608789ee089d14e39d7fc1835e99c346d947da3deafe4704e5cc785b626e2f4e0e9059ef60db8a0f3ad42e8ada85fed9c SHA512 b6e3b1a4256c90d51a69f0c74f6a4e991f62af0721fce6c4e2ba884c08f92f7083c4b9ab1ea736f39f5886a2b246e11ababb6c0906151fe50fa0a0adaa8c01bf
diff --git a/games-fps/doom3-roe/doom3-roe-1.ebuild b/games-fps/doom3-roe/doom3-roe-1.ebuild
deleted file mode 100644
index 1c8c05a0b84d..000000000000
--- a/games-fps/doom3-roe/doom3-roe-1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cdrom games
-
-DESCRIPTION="Doom III: Resurrection of Evil expansion pack"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI=""
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND=">=games-fps/doom3-1.3.1302-r2"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/doom3
-Ddir=${D}/${dir}
-
-src_unpack() {
-	cdrom_get_cds Setup/Data/d3xp/pak000.pk4
-	# Change from showing "d3xp" in the "mods" menu within Doom 3
-	# The ^1 changes the text to red
-	echo '^1Resurrection of Evil' > description.txt
-}
-
-src_install() {
-	insinto "${dir}"/d3xp
-
-	einfo "Copying file from the disk..."
-	doins "${CDROM_ROOT}"/Setup/Data/d3xp/pak000.pk4
-
-	doins description.txt
-
-	find "${Ddir}" -exec touch '{}' +
-
-	games_make_wrapper ${PN} "doom3 +set fs_game d3xp"
-	make_desktop_entry ${PN} "Doom III - Resurrection of Evil" doom3
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is just the data portion of the game.  You will need to emerge"
-	elog "games-fps/doom3 to play the game."
-	echo
-}
diff --git a/games-fps/doom3-roe/metadata.xml b/games-fps/doom3-roe/metadata.xml
deleted file mode 100644
index 1cfc52506137..000000000000
--- a/games-fps/doom3-roe/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Science has unlocked the gates to the unknown, and now only one man stands
-between Hell and Earth. A sci-fi horror masterpiece, DOOM 3 is like nothing you
-have experienced. Dramatic storyline, pulse-pounding action, incredible
-graphics, and revolutionary technology combine to draw you into the most
-frightening and gripping first person gaming experience ever created. For more
-information, checkout http://www.doom3.com
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/doom3/Manifest b/games-fps/doom3/Manifest
deleted file mode 100644
index d1c91a6f2603..000000000000
--- a/games-fps/doom3/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST doom3-linux-1.3.1.1304.x86.run 21145838 BLAKE2B ac69b20193b188556143ff57464f81c088dc008abfda98ff49d8a2d802fa06ff383e6bcde4a8a056066e8cd663a07fa01f4f171e30ec5fe9185fd975a13efb60 SHA512 f2a42478d84a6242a7982d1acd726b746596b7a13147acbd920d618223d6f52ab4c49aa7d7f07067674da2881372a181396a0bdd476e3956fb702c76eebb0d02
-DIST doom3.png 6502 BLAKE2B e467e622bb8955024aaf13dc97e0facc7f83aa344007172890d1982f39d35a643c859663fbdc60424332fe1b4b57711b7ce75fcdda8c77b4b2e8e6b71e9431e2 SHA512 9a2b3831babbf3fa0d354e1a4a779c972676edbcc0b287de9b9f3eb830e0a00d557ba9645fbf0e58e07d5705efb0ef2b7ab96cd92493e2a0afc30c8842c0043b
-EBUILD doom3-1.3.1304-r1.ebuild 2468 BLAKE2B e5d8c74d8ca00b94b73d89c5a49d36269e6bf275a8d13b44ff692dea545549e922e860f58c34259b6bceef1d789dcce0fffd20d7c32c50dc5c813413267ad47a SHA512 ad05556e1bdc829156ad8d21807dbc3df276e75f082a8f477f24bda8918dcf0c0705493fbbae3e3a8a687a1f73d5b515504b7ac9b71360c3c3af990a9149a9ca
-MISC metadata.xml 891 BLAKE2B 0b944b27943005ae45f7adcf1c5106b104f8c6d96adfe656cfed97c640793bfa5bd93799d8387393b7277bd9eaffbd5d4236755e705475836e2c13646ddffc53 SHA512 6652538b02d91c4fcb4ae39e6abdbfa66339481a4dc33c177cb9b5fca1787025b0819fcccd89de53fbc851b12db3d1b77f4d0c2baa03766f74e79458d463bdcd
diff --git a/games-fps/doom3/doom3-1.3.1304-r1.ebuild b/games-fps/doom3/doom3-1.3.1304-r1.ebuild
deleted file mode 100644
index 04242157ec3f..000000000000
--- a/games-fps/doom3/doom3-1.3.1304-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_PV="1.3.1.1304"
-
-DESCRIPTION="3rd installment of the classic iD 3D first-person shooter"
-HOMEPAGE="http://www.doom3.com/"
-SRC_URI="mirror://idsoftware/doom3/linux/doom3-linux-${MY_PV}.x86.run
-	http://zerowing.idsoftware.com/linux/${PN}.png"
-
-LICENSE="DOOM3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall dedicated roe"
-RESTRICT="strip"
-
-DEPEND="app-arch/bzip2
-	app-arch/tar"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	!dedicated? (
-		>=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(-)]
-		>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	)
-	cdinstall? (
-		>=games-fps/doom3-data-1.1.1282-r1
-		roe? ( games-fps/doom3-roe ) )"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_TEXTRELS="${dir:1}/pb/pbcl.so
-	${dir:1}/pb/pbcls.so
-	${dir:1}/pb/pbag.so
-	${dir:1}/pb/pbsv.so
-	${dir:1}/pb/pbags.so"
-
-QA_EXECSTACK="${dir:1}/doom.x86
-	${dir:1}/doomded.x86"
-
-pkg_pretend() {
-	if use dedicated; then
-		ewarn "${CATEGORY}/${PN}[dedicated] will only install the dedicated game server"
-	fi
-}
-
-src_unpack() {
-	unpack_makeself ${PN}-linux-${MY_PV}.x86.run
-}
-
-src_install() {
-	insinto "${dir}"
-	doins License.txt CHANGES README version.info ${PN}.png
-	doins -r base d3xp pb
-
-	exeinto "${dir}"
-	doexe openurl.sh bin/Linux/x86/doomded.x86
-	if ! use dedicated; then
-		doexe bin/Linux/x86/doom.x86
-
-		games_make_wrapper ${PN} ./doom.x86 "${dir}" "${dir}"
-		doicon "${DISTDIR}"/${PN}.png || die "doicon"
-		make_desktop_entry ${PN} "Doom III"
-	fi
-	games_make_wrapper ${PN}-ded ./doomded.x86 "${dir}" "${dir}"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall; then
-		elog "You need to copy pak000.pk4, pak001.pk4, pak002.pk4, pak003.pk4, and"
-		elog "pak004.pk4 from either your installation media or your hard drive to"
-		elog "${dir}/base before running the game,"
-		elog "or 'emerge games-fps/doom3-data' to install from CD."
-		if use roe ; then
-			echo
-			elog "To use the Resurrection of Evil expansion pack, you also need to copy"
-			elog "pak000.pk4 to ${dir}/d3xp from the RoE CD before running the game,"
-			elog "or 'emerge doom3-roe' to install from CD."
-		fi
-	fi
-
-	if ! use dedicated; then
-	echo
-	elog "To play the game, run:"
-	elog " doom3"
-	fi
-	echo
-	elog "To start the dedicated server, run:"
-	elog " doom3-ded"
-}
diff --git a/games-fps/doom3/metadata.xml b/games-fps/doom3/metadata.xml
deleted file mode 100644
index 23889c3beb20..000000000000
--- a/games-fps/doom3/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Science has unlocked the gates to the unknown, and now only one man stands
-between Hell and Earth. A sci-fi horror masterpiece, DOOM 3 is like nothing you
-have experienced. Dramatic storyline, pulse-pounding action, incredible
-graphics, and revolutionary technology combine to draw you into the most
-frightening and gripping first person gaming experience ever created. For more
-information, checkout http://www.doom3.com
-</longdescription>
-  <use>
-    <flag name="dedicated">install only as a dedicated game server</flag>
-    <flag name="roe">Adds support for the Resurrection of Evil expansion</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/doomsday-2.0.3 b/games-fps/doomsday-2.0.3
new file mode 100644
index 000000000000..b64ab8bd8f48
--- /dev/null
+++ b/games-fps/doomsday-2.0.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5[-gles2] dev-qt/qtcore:5 net-misc/curl sys-libs/zlib media-libs/assimp fmod? ( media-libs/fmod ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0 ) 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(-)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A modern gaming engine for Doom, Heretic, and Hexen
+EAPI=6
+HOMEPAGE=http://www.dengine.net
+IUSE=fluidsynth openal +doom demo freedoom heretic hexen tools fmod python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+
+PDEPEND=demo? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom )
+RDEPEND=dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtgui:5[-gles2] dev-qt/qtcore:5 net-misc/curl sys-libs/zlib media-libs/assimp fmod? ( media-libs/fmod ) fluidsynth? ( media-sound/fluidsynth ) openal? ( media-libs/openal ) tools? ( sys-libs/ncurses:0 )
+REQUIRED_USE=|| ( python_targets_python2_7 ) demo? ( doom ) freedoom? ( doom )
+SLOT=0
+SRC_URI=https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/2.0.3/doomsday-2.0.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a1a09408d6e19f3a06c9fc0c03d11d82
diff --git a/games-fps/doomsday-resources-1.01-r1 b/games-fps/doomsday-resources-1.01-r1
new file mode 100644
index 000000000000..9f13f49143b8
--- /dev/null
+++ b/games-fps/doomsday-resources-1.01-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Improved models & textures for doomsday
+EAPI=5
+HOMEPAGE=http://www.doomsdayhq.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=free-noncomm
+RDEPEND=>=games-fps/doomsday-1.9.8 games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/deng/jdoom-resource-pack-1.01.zip mirror://sourceforge/deng/jdoom-details.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_=2568a4d19b5c25499c56a0ddda4d80cf
diff --git a/games-fps/doomsday-resources/Manifest b/games-fps/doomsday-resources/Manifest
deleted file mode 100644
index 76b505c2f20d..000000000000
--- a/games-fps/doomsday-resources/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jdoom-details.zip 1379495 BLAKE2B 9ab216895ac44431ce39a89a75c00a4b076edf577cb1489f5d6b7050d69664cdd2b74976dcd43152adbf56b49602a063ca18ab121def79248ce1d1e89cab665c SHA512 94f0c29940795368e9ffdb9fad57f0de65a936a90ad6256effe6fbaa72d1ddf45a016bb72431d1603ade84c01036f84b7dc3e739d04e6c33a41bdf50a9b45dce
-DIST jdoom-resource-pack-1.01.zip 23114845 BLAKE2B 42d514a80ffb15adfd505a96e2ef7152ad1d9a2de111f4f00ffbc4f5da514d3901b8a8f64ce3a85daa51b194d696acbc8dd8f953122fb3019bd7c2c459f5e011 SHA512 ec40f3920338040803b7cb3029e6b52352179fe63a1c56bb74ff398e9eca0ae4c7c058213c812644add70b833c26f9a69844c2ae068cdf7d4c7a4f6c9e277636
-EBUILD doomsday-resources-1.01-r1.ebuild 909 BLAKE2B 181b73af006439a87303cdafb0743cbedb595fd90d606ca0822d3e6df5fbc4e34cab6e37bf95e6c52922cb4eacf57764f607c6e5840f7c3315e4d05450d63902 SHA512 98696ede580ebbba812a67c33c65c6d9151bd72664ad6ad1bce5ab69f1e1bfc92ca0d1717b0e237b421641bb0f77e49ad7c6c46aa1d91c99fd1b9f239e6683cf
-MISC metadata.xml 327 BLAKE2B aa7f8c1d71b7ec0f8378b2e62ed9b0b7da2cf993c7098a2e389e4a1ec345fd3eea7d6182c6af6492482bb69b0231242140ff1b043b1de0d013d5eecd21838dbe SHA512 a28389106aa0322f671b0c09000457a24d4ccfe12e18385e9c6e10bfe5043e46318d6eefd264102f6ed65fe4f9a1511da0ba24baa0841a5072e17011520f6028
diff --git a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild b/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
deleted file mode 100644
index 884a7ef7f3f1..000000000000
--- a/games-fps/doomsday-resources/doomsday-resources-1.01-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Improved models & textures for doomsday"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/jdoom-resource-pack-${PV}.zip
-	mirror://sourceforge/deng/jdoom-details.zip"
-
-LICENSE="free-noncomm"		#505636
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-fps/doomsday-1.9.8"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/doomsday/data/jdoom/auto
-	doins data/jDoom/* *.pk3
-
-	# The definitions file cannot be auto-loaded
-	insinto "${GAMES_DATADIR}"/doomsday/defs/jdoom
-	doins defs/jDoom/*
-
-	dodoc *.txt docs/*
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Add the following to the jdoom/doomsday command-line options:"
-	elog "  -def ${GAMES_DATADIR}/doomsday/defs/jdoom/jDRP.ded"
-}
diff --git a/games-fps/doomsday-resources/metadata.xml b/games-fps/doomsday-resources/metadata.xml
deleted file mode 100644
index f2f6b346799c..000000000000
--- a/games-fps/doomsday-resources/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">deng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/doomsday/Manifest b/games-fps/doomsday/Manifest
deleted file mode 100644
index 5678892783a9..000000000000
--- a/games-fps/doomsday/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doomsday-2.0.3.tar.gz 18060670 BLAKE2B e01545f5d719310a78f01de77249a72f9c3c61a1d295ee0827475439b63653f613660bdc033c1651180cc390469c89120d262c15c6e22cece52600e2889e1437 SHA512 4f8e737df9e004cf3ac3cf16b84ffce0c85e2180af552bac41a224595c7f6932397c39f7d3e9fa522e1ae62828cb87f564a5fa411e742eb07bbee96f14c3ee7c
-EBUILD doomsday-2.0.3.ebuild 1752 BLAKE2B b65b8da028703868366192847f12b26e22a3f5b4a4a88a7d17f2b0d9378ecbdb21a3e5f1561c90e8465b4ce7403190d89afdc1da3a5e500b2f681be8dbf9a3b1 SHA512 d954a9b61ee050ec9f30e376aee0e79be62ab6ff254db77dbd1f855c6d79e5ca104e1d47aef3418911f2ba963296d8da5f6ee486e43df1bc50dbbbaf48753b58
-MISC metadata.xml 956 BLAKE2B 762c3c0aa85b8d59cdc333f381e4028c7708d113017c84d7dad4ae2659f7c9c875ec410c04b29baccfb9df267f6a081a2cd5321068a328cfe95d2861d0108c7d SHA512 2efbdb770fec0865b8f6a2b6a1ceab526842f2ff70eb9317048d3595b19ed43ba7a67857d7e698081e28463c9a925630030674992d267e6ec5a37efe67c39cfa
diff --git a/games-fps/doomsday/doomsday-2.0.3.ebuild b/games-fps/doomsday/doomsday-2.0.3.ebuild
deleted file mode 100644
index c50b22ad60ee..000000000000
--- a/games-fps/doomsday/doomsday-2.0.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 readme.gentoo-r1 cmake-utils
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.dengine.net"
-SRC_URI="https://downloads.sourceforge.net/project/deng/Doomsday%20Engine/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+ LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="fluidsynth openal +doom demo freedoom heretic hexen tools fmod"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	demo? ( doom ) freedoom? ( doom )
-"
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtgui:5[-gles2]
-	dev-qt/qtcore:5
-	net-misc/curl
-	sys-libs/zlib
-	media-libs/assimp
-	fmod? ( media-libs/fmod )
-	fluidsynth? ( media-sound/fluidsynth )
-	openal? ( media-libs/openal )
-	tools? ( sys-libs/ncurses:0 )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-"
-PDEPEND="
-	demo? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )
-"
-
-S="${WORKDIR}/${P}/${PN}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-You need to copy Doom, Doom 2, Chex Quest, Heretic, Hexen, HexenDD,
-and Doom64 wads to a folder of your choice. Then configure in game
-engine where that folder is. This is different than old versions,
-which had centralized launchers for each game, and required the
-files to be in a specific place
-"
-
-internal_src_configure() {
-	export QT_SELECT=qt5
-	local mycmakeargs=(
-		-DPYTHON_EXECUTABLE="${PYTHON}"
-		-DDENG_ASSIMP_EMBEDDED=off
-	)
-	cmake-utils_src_configure
-}
-
-src_configure() {
-	python_foreach_impl internal_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml
deleted file mode 100644
index 851017e48a82..000000000000
--- a/games-fps/doomsday/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag>
-		<flag name="doom">Install launcher for jdoom game</flag>
-		<flag name="fluidsynth">Build the FluidSynth sound driver</flag>
-		<flag name="fmod">Enable support for fmod music and sound effects lib</flag>
-		<flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freedoom</pkg></flag>
-		<flag name="heretic">Install launcher for jheretic game</flag>
-		<flag name="hexen">Install launcher for jhexen game</flag>
-		<flag name="tools">Build additional tools such as doomsday-shell, md2tool and texc</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">deng</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/duke3d-20040817-r2 b/games-fps/duke3d-20040817-r2
new file mode 100644
index 000000000000..2bce54ced8d8
--- /dev/null
+++ b/games-fps/duke3d-20040817-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl media-libs/sdl-mixer media-sound/timidity++ media-sound/timidity-eawpatches perl? ( dev-lang/perl[-ithreads] ) opengl? ( virtual/opengl ) demo? ( app-arch/unzip ) !pic? ( x86? ( dev-lang/nasm ) )
+DESCRIPTION=Port of the original Duke Nukem 3D
+EAPI=5
+HOMEPAGE=http://icculus.org/projects/duke3d/
+IUSE=demo pic perl opengl
+KEYWORDS=~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-mixer media-sound/timidity++ media-sound/timidity-eawpatches perl? ( dev-lang/perl[-ithreads] ) opengl? ( virtual/opengl ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/duke3d-20040817.tar.bz2 demo? ( ftp://ftp.3drealms.com/share/3dduke13.zip ftp://ftp.planetmirror.com/pub/gameworld/downloads/3dduke13.zip )
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a2d2da18de822d8fe9cc385258981832
diff --git a/games-fps/duke3d-data-1.0-r4 b/games-fps/duke3d-data-1.0-r4
new file mode 100644
index 000000000000..89fb63c4564a
--- /dev/null
+++ b/games-fps/duke3d-data-1.0-r4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=gog? ( app-arch/unzip )
+DESCRIPTION=Duke Nukem 3D data files
+EAPI=5
+HOMEPAGE=http://www.3drealms.com/
+IUSE=gog cdinstall
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=DUKE3D gog? ( GOG-EULA )
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=|| ( games-fps/eduke32 games-fps/duke3d )
+REQUIRED_USE=^^ ( cdinstall gog )
+RESTRICT=mirror bindist gog? ( fetch )
+SLOT=0
+SRC_URI=gog? ( gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh )
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f56b9dcb10364968216f459776019a0b
diff --git a/games-fps/duke3d-data/Manifest b/games-fps/duke3d-data/Manifest
deleted file mode 100644
index 431aef1fb05d..000000000000
--- a/games-fps/duke3d-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh 31969896 BLAKE2B 7e93515f8aedaedf6f0dc90faf5e7fef165c000414ae9dc62bad77c78568ecdec1f16b72befe1c80c7c9c8c4bd7fb11f2fd3c36f53aa9ef9d787f8b7215228f3 SHA512 d06f20bc1334172b80e4a75bd3321c3835cd95ac823836899fda8d5f8667ac83471b04a5863646aa953a39fd1cb64eb1818ee668340ede62d0a356ebdcb4065c
-EBUILD duke3d-data-1.0-r4.ebuild 1789 BLAKE2B e0487a217eb7e7452f26fbbf0ecd74e465c266144a01fb631f87261795fe25604067e7ed476cbd12d5f044020a5deadf8b6587149669a355735597222c97d609 SHA512 60e9c27f77748143e12ab76581183a091af3209496c26817b7709f96801e9043a3b9b355574e60fef7d90371850b872b0c0d984e888fffd92ee60c764f6a60a2
-MISC metadata.xml 339 BLAKE2B afb442a147713d5f9000bb54afb2b62841086063b530f74a1da843ed7d08c3ffa995d98964f5e59b344c54eea7ea27ccc3eb563ea94e31452b352c80dc3848d3 SHA512 f5cfb8b76fafaea5c08660ecb9ed1a3d25efc85898b37a249c945547c4c4fc40335ec19711025955e12f6e3922f418f81e42c5dcc9a7f8ad82d3cc9dabbe50ef
diff --git a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild b/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
deleted file mode 100644
index 100efef9882d..000000000000
--- a/games-fps/duke3d-data/duke3d-data-1.0-r4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom unpacker
-
-GOG_FILE="gog_duke_nukem_3d_atomic_edition_2.0.0.9.sh"
-DESCRIPTION="Duke Nukem 3D data files"
-HOMEPAGE="http://www.3drealms.com/"
-SRC_URI="gog? ( ${GOG_FILE} )"
-
-LICENSE="DUKE3D gog? ( GOG-EULA )"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="gog"
-REQUIRED_USE="^^ ( cdinstall gog )"
-RESTRICT="mirror bindist gog? ( fetch )"
-
-RDEPEND="|| ( games-fps/eduke32 games-fps/duke3d )"
-DEPEND="gog? ( app-arch/unzip )"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo "Please download ${GOG_FILE} from your GOG.com account after buying Duke Nukem 3d"
-	einfo "and put it into ${DISTDIR}."
-}
-
-src_unpack() {
-	if use cdinstall ; then
-		export CDROM_NAME_SET=(
-			"Existing Install"
-			"Duke Nukem 3D CD"
-			"Duke Nukem 3D Atomic Edition CD"
-			)
-		cdrom_get_cds duke3d.grp:dvd/dn3dinst/duke3d.grp:atominst/duke3d.grp
-
-		if [[ ${CDROM_SET} -ne 0
-			&& ${CDROM_SET} -ne 1
-			&& ${CDROM_SET} -ne 2 ]]
-		then
-			die "Error locating data files.";
-		fi
-	else
-		unpack_zip "${DISTDIR}"/${GOG_FILE}
-		cd data/noarch/data || die
-
-		# convert to lowercase
-		find . -type f \
-			-execdir sh -c 'echo "converting ${1} to lowercase"
-			lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-			[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-	fi
-}
-
-src_install() {
-	local DATAROOT
-
-	insinto /usr/share/duke3d
-
-	if use cdinstall ; then
-		case ${CDROM_SET} in
-		0) DATAROOT="" ;;
-		1) DATAROOT="dn3dinst/" ;;
-		2) DATAROOT="atominst/" ;;
-		esac
-
-		# avoid double slash
-		doins "${CDROM_ROOT}"/${DATAROOT}{duke3d.grp,duke.rts,game.con,user.con,demo?.dmo,defs.con}
-	else
-		doins data/noarch/data/{duke3d.grp,duke.rts,game.con,user.con,demo?.dmo,defs.con}
-	fi
-}
diff --git a/games-fps/duke3d-data/metadata.xml b/games-fps/duke3d-data/metadata.xml
deleted file mode 100644
index bb71cbd28b6a..000000000000
--- a/games-fps/duke3d-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="gog">Extract the data from the GOG.com installer.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-fps/duke3d-demodata-1.3 b/games-fps/duke3d-demodata-1.3
new file mode 100644
index 000000000000..b79ea8ce12f7
--- /dev/null
+++ b/games-fps/duke3d-demodata-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Duke Nukem 3D 1.3d shareware data
+EAPI=5
+HOMEPAGE=http://www.3drealms.com/duke3d/
+KEYWORDS=~amd64 ~x86
+LICENSE=DUKE3D
+RDEPEND=games-fps/eduke32 games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://ftp.3drealms.com/share/3dduke13.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_=cdfd792e188cb9edc6b6b553ce5be127
diff --git a/games-fps/duke3d-demodata/Manifest b/games-fps/duke3d-demodata/Manifest
deleted file mode 100644
index 1103c2132991..000000000000
--- a/games-fps/duke3d-demodata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
-EBUILD duke3d-demodata-1.3.ebuild 1136 BLAKE2B 0223ae9ec801d575d630cdbbf0f6a609b99a4e67b108a14b3c02e4a8c44e0a5a1df0c46ab69d3affb70a35eca592b0dd68f118e519c485edc8bd6fae4fc93b29 SHA512 1c234c8c8759d68b5b0b81afae55add183754c8237b84fc935a22e6c847e17c4692940f1e7dae21e9c108b542a24d3c735a51e18579c8376b2473867b0aeec03
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild b/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
deleted file mode 100644
index dbe45f7cb3f2..000000000000
--- a/games-fps/duke3d-demodata/duke3d-demodata-1.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit games
-
-DESCRIPTION="Duke Nukem 3D 1.3d shareware data"
-HOMEPAGE="http://www.3drealms.com/duke3d/"
-SRC_URI="ftp://ftp.3drealms.com/share/3dduke13.zip"
-
-LICENSE="DUKE3D"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="games-fps/eduke32"
-
-S=${WORKDIR}
-
-src_unpack() {
-	default
-	rm LICENSE.TXT || die
-	mv DN3DSW13.SHR DN3DSW13.SHR.zip || die
-	unpack ./DN3DSW13.SHR.zip
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/duke3d
-
-	# convert to lowercase
-	find . \( -iname "*.CON" -o -iname "*.DMO" -o -iname "*.RTS" -o -iname "*.GRP" -o -iname "*.PCK" -o -iname "*.INI" \) \
-		-exec sh -c 'echo "${1}"
-	mv "${1}" "$(echo "${1}" | tr [:upper:] [:lower:])"' - {} \;
-
-	doins {defs,game,user}.con demo{1,2,3}.dmo duke.rts duke3d.grp modem.pck ultramid.ini
-
-	dodoc FILE_ID.DIZ README.DOC
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	einfo "Please note that many addons for Duke Nukem 3D require the registered version"
-	einfo "and will not work with this shareware version."
-	echo
-}
diff --git a/games-fps/duke3d-demodata/metadata.xml b/games-fps/duke3d-demodata/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-fps/duke3d-demodata/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-fps/duke3d/Manifest b/games-fps/duke3d/Manifest
deleted file mode 100644
index 520c2e10e5e3..000000000000
--- a/games-fps/duke3d/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 20040817-credits.patch 1271 BLAKE2B 9602782518bbc25b92dd72d8c10f57c7842ea97121b642aec2a61a6dcf233a285159459aaaab8c3772eab30fbe049444a4fff4f7bf329f1defeb121b354269ee SHA512 40648806d616846198a990b6e0608c76fe44ddaaa593d855fafa89697f575fe968232939cc28602db60d0e941b9067705b38c5eb66ed0a824ed8007f5d5deb70
-AUX 20040817-duke3d-makefile-opts.patch 867 BLAKE2B c382bbd818ab15173a2d4e3053dcb3c243e54f3e7f1df2dfffae53f7e5d6b320586c431cffdfd0f2311970d35870f5973b80817ce8f1f219a88f6d715cfeb202 SHA512 752937486d8f16bb7ced895b1659571aaa99ae94b14cca543f5c248cd532d52a580d324978a8b71c27e99423cdbad95266b5c58eca6e027c49fbb64ef186c6bf
-AUX 20040817-endian.patch 744 BLAKE2B c1af086ff1d452b356348ed019d743e1ed692cf3e448de55dc4ee741b563dfbdbf22303bb1b952bbf710005736794d5f07d1ec8d756e41cc0d5de39bb5156c4b SHA512 44fe2bc1509f528bc74a542325703a845d0ad9198b102d400108eb7999c73d776c0ed552b98746a5dae4dd4e8bdfc558efe83d7d5e30dac2e211076244fdbe70
-AUX 20040817-gcc34.patch 1886 BLAKE2B 7f8359098d1cbbbe94417ed899ccde72e9fee2316b3120d68d066765ac1e9b8d7d8624d4c1dcbea8f7b146070e4a87514b67af4a333a2f4f1b51a439d9ba5c94 SHA512 96e6ccffaa0334b1acfeb6542cf729eab22be5ea04c8985f5133c3a73d3ba26a568de7de00ff9bfbdc822edfb1b1438740f742d92b5fb3da62887e2aaf3f1076
-AUX duke3d-20040817-as-needed.patch 2730 BLAKE2B 86fcfead798ffb14b4399a8d931c93635656957372cc7fdd7e126e0013c03c8de5921e24a4314ef1134af0805475df62f53aa52d5b840f6ba42be7099c04ac35 SHA512 e9032d43edfb03bebd63de8cdd666e2ffd8bd1ec7e45dc2b50f6ca9db09853dba627f66454549a6c473984e610046a48539323a0ec02f2a19e2c3df4d15ceee0
-AUX duke3d-20040817-gcc4.patch 10413 BLAKE2B ddb013a5ff9e48fd7b871fa254c514f33148087c0593fbdc40878e17c339d928f7b497152f32fa17f895398e556cfaf8d2a8c1ea889f26dd5b6243ddd0ac3b68 SHA512 d00c07b987e10485313dea04d4b42bff530275f8c618e46104d435d3f65671d2271dc1c41426d816eddb9c41c0677269d4930f57780b23451355581e48f70dcf
-AUX duke3d-20040817-ldflags.patch 2132 BLAKE2B 2ad5c888753ac91b17209c99a0b97b6d3db0108083d8b98e2c4877f660f9390d43b0ef7260a199819d08e0a8c86e2924f0436d840ba5bf0322d3f8ab8a88da96 SHA512 afdcbc422b98c3c07bc4aea54865f2c7a167838eaa2270109e0066fb2e1db069bf5034bb78c0dd428baa0372465be4614125243a33aedfba19938b8e8f905b27
-AUX duke3d-20040817-noinline.patch 545 BLAKE2B b257119e4ac991f3ce2f7135d387baf40fb7fa168c2a130995916efb03fe0ab2efd170b3f3bfd2748a2716cd7c83f6238075b150205a70ada802c6191e028686 SHA512 aad5543419c762083a908b3905c22efa102cc6d9724a7fb5ee5eab96fd490c1afce632395a53049ec1b6d2123aed1c2440e583994773916eb1268bc75471ea79
-AUX duke3d.cfg 4314 BLAKE2B a6db96d8bf23823ce1df5458248a5a6b5b1ceb3f119bb939206b886311ebe7bedec9d7ff93a509bd7873a57ff9b0b28d5d5b16d1fe5dbb8bc4e7c2d9e6c5c3a8 SHA512 5b4d020d6ea9b5bfdc4333c2a0b90667577662ed32a826263560e74bd436372d689d179290a87c86d921c4accbaa75da013a3426d98f49cc7ffb6a1be5fb25a7
-AUX network.cfg 398 BLAKE2B 7f60933e9cabb129899021c3b70315cad6d9e608c53b26a39575ffc7e4a121d47b3c8e6cbb1a1363d25e142914e6224977f16856fcc972bc003333687356b0fa SHA512 89a5261453c5ad14caed7e768ef6a337f601afd2e02809987708cfad9f356847a3249ab7b1fb6f0e084874100afc1494d62e4d898f4433c1f4f763a1e822f26b
-DIST 3dduke13.zip 5924374 BLAKE2B 177329f04defdd2a2ab35a1926a321bbc8de023878ad6bec610669b5578cbe2f38bc0b03a37c0d0d2dcc99acf2b473ddf683b498b971b857b20964bcdbc7d7c8 SHA512 eb92daa88b4e7cfeebe1fb3d2c021e0a4a66262d0d6e76b5e27fe3cedd382e381d23b392a6d9adb42a418b9318e011c2d8adfbdc77d7c5371e61d8c091c7eb65
-DIST duke3d-20040817.tar.bz2 1509273 BLAKE2B 261ffcce5d3ed68f52e04167c43ae70ccb08818fce8a0790ef333ad1b421d9184e9c9ede7c2e6a5eb73978f384e6439439824ac7da7c4ac2f23ef87820a6c4cc SHA512 a08aa07153458501fb01878769af9797460525015b34d743250e3f04f15ee2dcfbb4110c94c83912ba2435e6d6c48127e2d36c0dc29833e0f6f95e3b925b571c
-EBUILD duke3d-20040817-r2.ebuild 2810 BLAKE2B 3724a3ffc357bbc82ad05dc02b6979fd40dbff34ebc5e4fdfa18ca468dafb5f1439d3235dca937d330c401505be26e80fa13300a5355ed099ba98d6ec2615b43 SHA512 bc8336762f214e334cf78da61ac077f2760bdeab4e6162184b2fbc90e8f24377c45fead7b82ec13a08755521edc1e32c019aa9b59a5b39020c992bf075e6849c
-MISC metadata.xml 2851 BLAKE2B 9f72d139d238f08adfc7c404dd93aa49d593d738d0080b8f4345aebc2f4ae308576f950ad97b1b35f1051368b1fc10892ed1d2446bdbfb06a24a3132dc39df55 SHA512 ae872ac33570fc2f067e50a29e4a9c8d51477d64cbf2596889421a09a07b78e9041d8c60abf33cdaa4f16a6079fc49bd4307493620ea8d47c74b37b4cc697d04
diff --git a/games-fps/duke3d/duke3d-20040817-r2.ebuild b/games-fps/duke3d/duke3d-20040817-r2.ebuild
deleted file mode 100644
index e75632b67acc..000000000000
--- a/games-fps/duke3d/duke3d-20040817-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-fromcvs=0
-inherit unpacker eutils flag-o-matic games
-
-DEMO="3dduke13.zip"
-
-DESCRIPTION="Port of the original Duke Nukem 3D"
-HOMEPAGE="http://icculus.org/projects/duke3d/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	demo? (
-		ftp://ftp.3drealms.com/share/${DEMO}
-		ftp://ftp.planetmirror.com/pub/gameworld/downloads/${DEMO}
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~hppa ~x86"
-IUSE="demo pic perl opengl"
-
-RDEPEND="media-libs/libsdl
-	media-libs/sdl-mixer
-	media-sound/timidity++
-	media-sound/timidity-eawpatches
-	perl? ( dev-lang/perl[-ithreads] )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	demo? ( app-arch/unzip )
-	!pic? ( x86? ( dev-lang/nasm ) )"
-
-S=${WORKDIR}/${PN}
-
-use_tf() { use ${1} && echo "true" || echo "false"; }
-
-src_unpack() {
-	unpack ${A}
-	if use demo ; then
-		unpack_zip DN3DSW13.SHR
-	fi
-}
-
-src_prepare() {
-	# configure buildengine
-	cd "${S}/source/buildengine"
-	sed -i \
-		-e "/^useperl := / s:=.*:= $(use_tf perl):" \
-		-e "/^useopengl := / s:=.*:= $(use_tf opengl):" \
-		-e "/^usephysfs := / s:=.*:= false:" \
-		-e 's:-O3::' -e 's: -g : :' \
-		-e 's:/usr/lib/perl5/i386-linux/CORE/libperl.a::' \
-		Makefile || die
-	epatch "${FILESDIR}/${PV}-endian.patch"
-
-	# configure duke3d
-	cd "${S}/source"
-	# need to sync features with build engine
-	epatch \
-		"${FILESDIR}/${PV}-credits.patch" \
-		"${FILESDIR}/${PV}-duke3d-makefile-opts.patch" \
-		"${FILESDIR}/${PV}-gcc34.patch" \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-noinline.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "/^use_opengl := / s:=.*:= $(use_tf opengl):" \
-		-e "/^use_physfs := / s:=.*:= false:" \
-		Makefile || die
-	if ! use pic && use x86 ; then
-		sed -i \
-			-e 's:^#USE_ASM:USE_ASM:' buildengine/Makefile || die
-		sed -i \
-			-e '/^#use_asm := /s:#::' Makefile || die
-	fi
-
-	# causes crazy redefine errors with gcc-3.[2-4].x
-	replace-flags -O3 -O2
-	strip-flags #203969
-}
-
-src_compile() {
-	emake -C source/buildengine OPTFLAGS="${CFLAGS}"
-	emake -C source OPTIMIZE="${CFLAGS}"
-}
-
-src_install() {
-	games_make_wrapper duke3d "${GAMES_BINDIR}/duke3d.bin" "${GAMES_DATADIR}/${PN}"
-	newgamesbin source/duke3d duke3d.bin
-
-	dodoc readme.txt
-
-	cd testdata
-	insinto "${GAMES_DATADIR}/${PN}"
-	newins defs.con DEFS.CON
-	newins game.con GAME.CON
-	newins user.con USER.CON
-	newins "${FILESDIR}/network.cfg" network.cfg.template
-	if use demo ; then
-		doins "${WORKDIR}/DUKE3D.GRP"
-	fi
-
-	insinto "${GAMES_SYSCONFDIR}"
-	doins "${FILESDIR}/duke3d.cfg"
-	dosym "${GAMES_SYSCONFDIR}/duke3d.cfg" "${GAMES_DATADIR}/${PN}/DUKE3D.CFG"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	use demo || elog "Put the data files in ${GAMES_DATADIR}/${PN} before playing"
-}
diff --git a/games-fps/duke3d/files/20040817-credits.patch b/games-fps/duke3d/files/20040817-credits.patch
deleted file mode 100644
index 19eefa4bf423..000000000000
--- a/games-fps/duke3d/files/20040817-credits.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/menues.c	2003-08-17 22:16:10.000000000 +0200
-+++ b/menues.c	2004-03-29 01:59:28.000000000 +0200
-@@ -1747,9 +1747,10 @@
-         case 996:
-         case 997:
- 
--//            rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
--//            rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
--//            menutext(c,24,0,0,"CREDITS");
-+            c = (320>>1);
-+            rotatesprite(c<<16,200<<15,65536L,0,MENUSCREEN,16,0,10+64,0,0,xdim-1,ydim-1);
-+            rotatesprite(c<<16,19<<16,65536L,0,MENUBAR,16,0,10,0,0,xdim-1,ydim-1);
-+            menutext(c,24,0,0,"CREDITS");
- 
-             if(KB_KeyPressed(sc_Escape)) { cmenu(0); break; }
- 
-@@ -1926,6 +1927,21 @@
- 
-             menutext(c,67+16+16+16+16+16,SHX(-7),PHX(-7),"QUIT");
- 
-+    gametext(c,67+16+16+16+16+16+16+16,"Duke Nukem 3D for "
-+#if defined PLATFORM_MACOSX
-+            "MacOS"
-+#elif defined PLATFORM_DOS
-+            "MS-Dos"
-+#elif defined PLATFORM_WIN32
-+            "Win32"
-+#elif defined PLATFORM_UNIX
-+            "Gentoo"
-+#else       
-+            "unknown"
-+#endif      
-+            ,16,2+8+16);
-+    gametext(c,67+16+16+16+16+16+16+16+9,"build " __DATE__ " " __TIME__,16,2+8+16);
-+
-             break;
- // CTW END - MODIFICATION
- 
diff --git a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch b/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
deleted file mode 100644
index 9ed2a0052153..000000000000
--- a/games-fps/duke3d/files/20040817-duke3d-makefile-opts.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/Makefile.orig	2003-08-17 17:45:35.948650760 -0400
-+++ b/Makefile	2003-08-17 17:46:36.894385600 -0400
-@@ -4,6 +4,8 @@
- beos := false
- macosx := false
- #use_asm := true
-+use_opengl := true
-+use_physfs := false
- 
- #-----------------------------------------------------------------------------#
- # If this makefile fails to detect Cygwin correctly, or you want to force
-@@ -80,6 +81,10 @@
- 	buildengine/pragmas.o \
- 	buildengine/unix_compat.o
- 
-+ifeq ($(strip $(use_opengl)),true)
-+	BUILDOBJS += buildengine/buildgl.o
-+endif
-+
- ifeq ($(strip $(use_asm)),true)
- 	BUILDOBJS += buildengine/a_gnu.o buildengine/a_nasm.o
- else
-@@ -106,6 +106,10 @@
- 
- LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
- 
-+ifeq ($(strip $(use_physfs)),true)
-+	LDLIBS += -lphysfs
-+endif
-+
- # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
- #LDLIBS += -Wl,-E
- 
diff --git a/games-fps/duke3d/files/20040817-endian.patch b/games-fps/duke3d/files/20040817-endian.patch
deleted file mode 100644
index 3bcdc1379db6..000000000000
--- a/games-fps/duke3d/files/20040817-endian.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- buildengine/platform.h.old	2003-08-07 12:06:17.000000000 +0200
-+++ buildengine/platform.h	2004-08-24 18:35:05.292291088 +0200
-@@ -5,6 +5,7 @@
- #include "win32_compat.h"
- #elif (defined PLATFORM_UNIX)
- #include "unix_compat.h"
-+#include <endian.h>
- #elif (defined PLATFORM_DOS)
- #include "doscmpat.h"
- #else
-@@ -60,9 +61,15 @@
- #define BUILDSWAP_INTEL16(x) _swap16(x)
- #define BUILDSWAP_INTEL32(x) _swap32(x)
- #else
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
- #define PLATFORM_LITTLEENDIAN 1
- #define BUILDSWAP_INTEL16(x) (x)
- #define BUILDSWAP_INTEL32(x) (x)
-+#else
-+#define PLATFORM_BIGENDIAN 1
-+#define BUILDSWAP_INTEL16(x) _swap16(x)
-+#define BUILDSWAP_INTEL32(x) _swap32(x)
-+#endif
- #endif
- 
- extern int has_altivec;  /* PowerPC-specific. */
diff --git a/games-fps/duke3d/files/20040817-gcc34.patch b/games-fps/duke3d/files/20040817-gcc34.patch
deleted file mode 100644
index a7de9c116383..000000000000
--- a/games-fps/duke3d/files/20040817-gcc34.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- source/astub.c.orig	2004-08-22 14:44:50.691126872 +0100
-+++ source/astub.c	2004-08-22 14:47:15.532107696 +0100
-@@ -540,6 +540,11 @@
-         return(tempbuf);
- } //end
- 
-+void SpriteName(short spritenum, char *lo2)
-+{
-+    sprintf(lo2,names[sprite[spritenum].picnum]);
-+}// end SpriteName
-+
- const char *ExtGetSpriteCaption(short spritenum)
- {
- 
-@@ -608,7 +613,11 @@
- //  y1, y2  0-143  (status bar is 144 high, origin is top-left of STATUS BAR)
- //  col     0-15
- 
--
-+void PrintStatus(char *string,int num,char x,char y,char color)
-+{
-+     sprintf(tempbuf,"%s %d",string,num);
-+     printext16(x*8,y*8,color,-1,tempbuf,0);
-+}
- 
- void TotalMem()
- {
-@@ -1276,18 +1285,6 @@
- 
- }
- 
--
--void PrintStatus(char *string,int num,char x,char y,char color)
--{
--     sprintf(tempbuf,"%s %d",string,num);
--     printext16(x*8,y*8,color,-1,tempbuf,0);
--}
--
--void SpriteName(short spritenum, char *lo2)
--{
--    sprintf(lo2,names[sprite[spritenum].picnum]);
--}// end SpriteName
--
- char GAMEpalette[768];
- char WATERpalette[768];
- char SLIMEpalette[768];
-@@ -1326,6 +1323,17 @@
-  ReadGamePalette();
- }// end ReadPaletteTable
- 
-+void Ver()
-+{
-+ sprintf(tempbuf,"DUKE NUKEM BUILD: V032696");
-+ if (qsetmode == 200)    //In 3D mode
-+ { printext256(60*8,24*8,11,-1,tempbuf,1);
-+   rotatesprite((320-8)<<16,(200-8)<<16,64<<9,0,SPINNINGNUKEICON+(((4-totalclock>>3))&7),0,0,0,0,0,xdim-1,ydim-1);
-+ }else
-+ { printext16(0,0,15,-1,tempbuf,0);
-+ }
-+}
-+
- void Keys3d(void)
- {
-     long i,count,rate,nexti;
-@@ -2206,17 +2214,6 @@
-         }
- }
- 
--void Ver()
--{
-- sprintf(tempbuf,"DUKE NUKEM BUILD: V032696");
-- if (qsetmode == 200)    //In 3D mode
-- { printext256(60*8,24*8,11,-1,tempbuf,1);
--   rotatesprite((320-8)<<16,(200-8)<<16,64<<9,0,SPINNINGNUKEICON+(((4-totalclock>>3))&7),0,0,0,0,0,xdim-1,ydim-1);
-- }else
-- { printext16(0,0,15,-1,tempbuf,0);
-- }
--}
--
- ActorMem(int i)
- {int total=0,j;
-     switch(i)
diff --git a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch b/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
deleted file mode 100644
index c7793a833bf9..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-as-needed.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -ur duke3d/source/buildengine/Makefile duke3d-patched/source/buildengine/Makefile
---- source/buildengine/Makefile	2004-05-15 05:15:05.000000000 +0200
-+++ source/buildengine/Makefile	2008-02-27 23:10:46.000000000 +0100
-@@ -99,11 +99,11 @@
-   ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
-     $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
-   else
--    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
-+    SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL
-   endif
- else
-   SDL_CFLAGS := $(shell sdl-config --cflags)
--  SDL_LDFLAGS := $(shell sdl-config --libs)
-+  SDL_LIBS := $(shell sdl-config --libs)
- endif
- 
- CC = gcc
-@@ -202,7 +202,7 @@
- ASMFLAGS = -f $(ASMOBJFMT) $(ASMDEFS)
- LINKER = gcc
- CFLAGS += $(USE_ASM) -funsigned-char  -DPLATFORM_UNIX -Wall $(SDL_CFLAGS) -fno-omit-frame-pointer
--LDFLAGS += $(SDL_LDFLAGS)
-+LDLIBS += $(SDL_LIBS)
- 
- # Rules for turning source files into .o files
- %.o: %.c
-@@ -236,17 +236,17 @@
- 
- ifeq ($(strip $(usedlls)),true)
- $(ENGINEDLL) : $(ENGINEOBJS)
--	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS)
-+	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS)
- 
- $(NETDLL) : $(NETOBJS)
--	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS)
-+	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS)
- endif
- 
- $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS)
--	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(LDPERL) $(PERLOBJS) $(GAMEOBJS) $(ENGINEDLL) $(NETDLL)
-+	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
- 
- $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS)
--	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(ENGINEDLL)
-+	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
- 
- listclean:
- 	@echo "A 'make clean' would remove" $(CLEANUP)
-diff -ur duke3d/source/Makefile duke3d-patched/source/Makefile
---- source/Makefile	2004-05-15 05:14:16.000000000 +0200
-+++ source/Makefile	2008-02-27 23:09:57.000000000 +0100
-@@ -45,11 +45,11 @@
-   ifeq ($(strip $(SDL_LIB_DIR)),please_set_me_cygwin_users)
-     $(error Cygwin users need to set the SDL_LIB_DIR envr var.)
-   else
--    SDL_LDFLAGS := -L$(SDL_LIB_DIR) -lSDL
-+    SDL_LIBS := -L$(SDL_LIB_DIR) -lSDL
-   endif
- else
-   SDL_CFLAGS := $(shell sdl-config --cflags)
--  SDL_LDFLAGS := $(shell sdl-config --libs) -L.
-+  SDL_LIBS := $(shell sdl-config --libs) -L.
- endif
- 
- ifeq ($(strip $(macosx)),true)
-@@ -104,7 +104,7 @@
- #CC = icc
- #CFLAGS = -g $(SDL_CFLAGS) -DUSE_SDL=1 -DPLATFORM_UNIX=1 -DUSE_I386_ASM=1 $(EXTRACFLAGS) -O2
- 
--LDLIBS = $(SDL_LDFLAGS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
-+LDLIBS = $(SDL_LIBS) -lSDL -lSDL_mixer $(EXTRALDFLAGS)
- 
- # !!! FIXME: Do we even need this? It doesn't fly on MacOS X.  --ryan.
- #LDLIBS += -Wl,-E
diff --git a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch b/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
deleted file mode 100644
index 3aaf67c6c90b..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-gcc4.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-iff -ur duke3d/source/buildengine/a.c duke3d-gcc4/source/buildengine/a.c
---- source/buildengine/a.c	2004-11-25 13:55:21.000000000 -0500
-+++ source/buildengine/a.c	2005-06-18 18:14:24.000000000 -0400
-@@ -186,7 +186,9 @@
-     if (i3 == 0)
-     {
- 	    i1 += i4;
--	    ((unsigned long)i4) >>= mach3_al;
-+			unsigned long temp = i4;
-+	    temp >>= mach3_al;
-+			i4 = temp;
- 	    i4 = (i4&0xffffff00) | (source[i4]&0xff);
- 	    *dest = ((unsigned char*)i2)[i4];
- 	    return i1;
-diff -ur duke3d/source/buildengine/pragmas.c duke3d-gcc4/source/buildengine/pragmas.c
---- source/buildengine/pragmas.c	2003-07-25 20:11:32.000000000 -0400
-+++ source/buildengine/pragmas.c	2005-06-18 18:25:37.000000000 -0400
-@@ -56,28 +56,39 @@
- 
- void clearbufbyte(void *buffer, int size, long fill_value) {
-   int lsize;
-+	unsigned char *p=buffer;
-+	unsigned short *s=buffer;
-   switch(size){
-   case 0: return;
--  case 1: *((unsigned char*)buffer)++ = fill_value; return;
--  case 2: *((unsigned short*)buffer)++ = fill_value; return;
--  case 3: { unsigned char *p=buffer; p[2]=p[1]=p[0] = fill_value;} return;
-+  case 1: *p = fill_value; return;
-+  case 2: *s = fill_value; return;
-+  case 3: { p[2]=p[1]=p[0] = fill_value;} return;
-   default:
- 	if ((int)buffer&1) {
--		*((unsigned char*)buffer)++ = fill_value; size--;
-+		*p = fill_value; ++p; size--;
-+		buffer = p;
- 	}
- 	if ((int)buffer&2) {
--		*((unsigned short*)buffer)++ = fill_value; size-=2;
-+		*s = fill_value; ++s; size-=2;
-+		buffer = s;
- 	}
- 	lsize = size>>2;
-+	unsigned int *up = buffer;
- 	while(lsize) {
--		*((unsigned int*)buffer)++ = fill_value;
-+		*up = fill_value;
-+		++up;
- 		lsize--;
- 	}
-+	buffer = up;
- 	if (size&2) {
--		*((unsigned short*)buffer)++ = fill_value;
-+		s = buffer;
-+		*s = fill_value;
-+		++s;
- 	}
- 	if (size&1) {
--		*((unsigned char*)buffer)++ = fill_value;
-+		p = buffer;
-+		*p = fill_value;
-+		++p;
- 	}
-   }
- }
-@@ -122,7 +133,7 @@
- 	{
- 		*((unsigned short *)source) = ((linum>>16)&0xffff);
- 		linum += linum_inc;
--		((unsigned char*)source) = ((unsigned char*)source) + 2;
-+		source = ((unsigned char*)source) + 2;
- 		size--;
- 		if (size == 0) return;
- 	}
-
-diff -u -r duke3d/source/buildengine/a.h duke3d.gcc4.1.1/source/buildengine/a.h
---- source/buildengine/a.h	2003-04-11 08:54:06.000000000 +0200
-+++ source/buildengine/a.h	2006-06-22 12:14:40.366393568 +0200
-@@ -116,56 +116,56 @@
- 
-   #if ((defined __GNUC__) && (!defined C_IDENTIFIERS_UNDERSCORED))
- 
--    long asm_mmxoverlay(void) __attribute__ ((alias ("_asm_mmxoverlay")));
--    long asm_sethlinesizes(long,long,long) __attribute__ ((alias ("_asm_sethlinesizes")));
--    long asm_setpalookupaddress(char *) __attribute__ ((alias ("_asm_setpalookupaddress")));
--    long asm_setuphlineasm4(long,long) __attribute__ ((alias ("_asm_setuphlineasm4")));
--    long asm_hlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_hlineasm4")));
--    long asm_setuprhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setuprhlineasm4")));
--    long asm_rhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_rhlineasm4")));
--    long asm_setuprmhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setuprmhlineasm4")));
--    long asm_rmhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_rmhlineasm4")));
--    long asm_setupqrhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setupqrhlineasm4")));
--    long asm_qrhlineasm4(long,long,long,long,long,long) __attribute__ ((alias ("_asm_qrhlineasm4")));
--    long asm_setvlinebpl(long) __attribute__ ((alias ("_asm_setvlinebpl")));
--    long asm_fixtransluscence(long) __attribute__ ((alias ("_asm_fixtransluscence")));
--    long asm_prevlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_prevlineasm1")));
--    long asm_vlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_vlineasm1")));
--    long asm_setuptvlineasm(long) __attribute__ ((alias ("_asm_setuptvlineasm")));
--    long asm_tvlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tvlineasm1")));
--    long asm_setuptvlineasm2(long,long,long) __attribute__ ((alias ("_asm_setuptvlineasm2")));
--    long asm_tvlineasm2(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tvlineasm2")));
--    long asm_mvlineasm1(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mvlineasm1")));
--    long asm_setupvlineasm(long) __attribute__ ((alias ("_asm_setupvlineasm")));
--    long asm_vlineasm4(long,long) __attribute__ ((alias ("_asm_vlineasm4")));
--    long asm_setupmvlineasm(long) __attribute__ ((alias ("_asm_setupmvlineasm")));
--    long asm_mvlineasm4(long,long) __attribute__ ((alias ("_asm_mvlineasm4")));
--    void asm_setupspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_setupspritevline")));
--    void asm_spritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_spritevline")));
--    void asm_msetupspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_msetupspritevline")));
--    void asm_mspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mspritevline")));
--    void asm_tsetupspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tsetupspritevline")));
--    void asm_tspritevline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_tspritevline")));
--    long asm_mhline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mhline")));
--    long asm_mhlineskipmodify(long,long,long,long,long,long) __attribute__ ((alias ("_asm_mhlineskipmodify")));
--    long asm_msethlineshift(long,long) __attribute__ ((alias ("_asm_msethlineshift")));
--    long asm_thline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_thline")));
--    long asm_thlineskipmodify(long,long,long,long,long,long) __attribute__ ((alias ("_asm_thlineskipmodify")));
--    long asm_tsethlineshift(long,long) __attribute__ ((alias ("_asm_tsethlineshift")));
--    long asm_setupslopevlin(long,long,long) __attribute__ ((alias ("_asm_setupslopevlin")));
--    long asm_slopevlin(long,long,long,long,long,long) __attribute__ ((alias ("_asm_slopevlin")));
--    long asm_settransnormal(void) __attribute__ ((alias ("_asm_settransnormal")));
--    long asm_settransreverse(void) __attribute__ ((alias ("_asm_settransreverse")));
--    long asm_setupdrawslab(long,long) __attribute__ ((alias ("_asm_setupdrawslab")));
--    long asm_drawslab(long,long,long,long,long,long) __attribute__ ((alias ("_asm_drawslab")));
--    long asm_stretchhline(long,long,long,long,long,long) __attribute__ ((alias ("_asm_stretchhline")));
--    long asm_isvmwarerunning(void) __attribute__ ((alias ("_asm_isvmwarerunning")));
-+    long asm_mmxoverlay(void) asm ("_asm_mmxoverlay");
-+    long asm_sethlinesizes(long,long,long) asm ("_asm_sethlinesizes");
-+    long asm_setpalookupaddress(char *) asm ("_asm_setpalookupaddress");
-+    long asm_setuphlineasm4(long,long) asm ("_asm_setuphlineasm4");
-+    long asm_hlineasm4(long,long,long,long,long,long) asm ("_asm_hlineasm4");
-+    long asm_setuprhlineasm4(long,long,long,long,long,long) asm ("_asm_setuprhlineasm4");
-+    long asm_rhlineasm4(long,long,long,long,long,long) asm ("_asm_rhlineasm4");
-+    long asm_setuprmhlineasm4(long,long,long,long,long,long) asm ("_asm_setuprmhlineasm4");
-+    long asm_rmhlineasm4(long,long,long,long,long,long) asm ("_asm_rmhlineasm4");
-+    long asm_setupqrhlineasm4(long,long,long,long,long,long) asm ("_asm_setupqrhlineasm4");
-+    long asm_qrhlineasm4(long,long,long,long,long,long) asm ("_asm_qrhlineasm4");
-+    long asm_setvlinebpl(long) asm ("_asm_setvlinebpl");
-+    long asm_fixtransluscence(long) asm ("_asm_fixtransluscence");
-+    long asm_prevlineasm1(long,long,long,long,long,long) asm ("_asm_prevlineasm1");
-+    long asm_vlineasm1(long,long,long,long,long,long) asm ("_asm_vlineasm1");
-+    long asm_setuptvlineasm(long) asm ("_asm_setuptvlineasm");
-+    long asm_tvlineasm1(long,long,long,long,long,long) asm ("_asm_tvlineasm1");
-+    long asm_setuptvlineasm2(long,long,long) asm ("_asm_setuptvlineasm2");
-+    long asm_tvlineasm2(long,long,long,long,long,long) asm ("_asm_tvlineasm2");
-+    long asm_mvlineasm1(long,long,long,long,long,long) asm ("_asm_mvlineasm1");
-+    long asm_setupvlineasm(long) asm ("_asm_setupvlineasm");
-+    long asm_vlineasm4(long,long) asm ("_asm_vlineasm4");
-+    long asm_setupmvlineasm(long) asm ("_asm_setupmvlineasm");
-+    long asm_mvlineasm4(long,long) asm ("_asm_mvlineasm4");
-+    void asm_setupspritevline(long,long,long,long,long,long) asm ("_asm_setupspritevline");
-+    void asm_spritevline(long,long,long,long,long,long) asm ("_asm_spritevline");
-+    void asm_msetupspritevline(long,long,long,long,long,long) asm ("_asm_msetupspritevline");
-+    void asm_mspritevline(long,long,long,long,long,long) asm ("_asm_mspritevline");
-+    void asm_tsetupspritevline(long,long,long,long,long,long) asm ("_asm_tsetupspritevline");
-+    void asm_tspritevline(long,long,long,long,long,long) asm ("_asm_tspritevline");
-+    long asm_mhline(long,long,long,long,long,long) asm ("_asm_mhline");
-+    long asm_mhlineskipmodify(long,long,long,long,long,long) asm("_asm_mhlineskipmodify");
-+    long asm_msethlineshift(long,long) asm("_asm_msethlineshift");
-+    long asm_thline(long,long,long,long,long,long) asm("_asm_thline");
-+    long asm_thlineskipmodify(long,long,long,long,long,long) asm("_asm_thlineskipmodify");
-+    long asm_tsethlineshift(long,long) asm("_asm_tsethlineshift");
-+    long asm_setupslopevlin(long,long,long) asm("_asm_setupslopevlin");
-+    long asm_slopevlin(long,long,long,long,long,long) asm("_asm_slopevlin");
-+    long asm_settransnormal(void) asm("_asm_settransnormal");
-+    long asm_settransreverse(void) asm("_asm_settransreverse");
-+    long asm_setupdrawslab(long,long) asm("_asm_setupdrawslab");
-+    long asm_drawslab(long,long,long,long,long,long) asm("_asm_drawslab");
-+    long asm_stretchhline(long,long,long,long,long,long) asm("_asm_stretchhline");
-+    long asm_isvmwarerunning(void) asm("_asm_isvmwarerunning");
- 
-     /*
- 	 * !!! I need a reference to this, for mprotect(), but the actual function
-      * !!!  is never called in BUILD...just from other ASM routines. --ryan.
- 	 */
--    long asm_prohlineasm4(void) __attribute__ ((alias ("_asm_prohlineasm4")));
-+    long asm_prohlineasm4(void) asm("_asm_prohlineasm4");
- 
-   #endif /* ELF/GCC */
- #endif /* defined USE_I386_ASM */
diff --git a/games-fps/duke3d/files/duke3d-20040817-ldflags.patch b/games-fps/duke3d/files/duke3d-20040817-ldflags.patch
deleted file mode 100644
index 79179e663805..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-ldflags.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- source/buildengine/Makefile.old	2010-10-08 14:32:05.000000000 +0200
-+++ source/buildengine/Makefile	2010-10-08 14:35:10.000000000 +0200
-@@ -73,7 +73,7 @@
- endif
- 
- ifeq ($(strip $(solaris)),true)
--  LDFLAGS += -lsocket -lnsl
-+  LIBS += -lsocket -lnsl
-   CFLAGS += -DPLATFORM_SOLARIS
- endif
- 
-@@ -129,7 +129,7 @@
- 
- ifeq ($(strip $(macosx)),true)
-   CFLAGS += -DPLATFORM_MACOSX=1 -faltivec -falign-loops=32 -falign-functions=32
--  LDFLAGS += -framework AppKit -lSDL -lSDLmain
-+  LIBS += -framework AppKit -lSDL -lSDLmain
- endif
- 
- ifeq ($(strip $(useopengl)),true)
-@@ -146,7 +146,7 @@
- 
- ifeq ($(strip $(usephysfs)),true)
-   CFLAGS += -DUSE_PHYSICSFS
--  LDFLAGS += -lphysfs
-+  LIBS += -lphysfs
- endif
- 
- ifeq ($(strip $(usedlls)),true)
-@@ -236,17 +236,17 @@
- 
- ifeq ($(strip $(usedlls)),true)
- $(ENGINEDLL) : $(ENGINEOBJS)
--	$(LINKER) -shared -o $(ENGINEDLL) $(LDFLAGS) $(ENGINEOBJS) $(LDLIBS)
-+	$(LINKER) -shared -o $(ENGINEDLL) $(LIBS) $(ENGINEOBJS) $(LDLIBS)
- 
- $(NETDLL) : $(NETOBJS)
--	$(LINKER) -shared -o $(NETDLL) $(LDFLAGS) $(NETOBJS) $(LDLIBS)
-+	$(LINKER) -shared -o $(NETDLL) $(LIBS) $(NETOBJS) $(LDLIBS)
- endif
- 
- $(GAMEEXE) : $(ENGINEDLL) $(NETDLL) $(GAMEOBJS) $(PERLOBJS)
--	$(LINKER) -o $(GAMEEXE) $(LDFLAGS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
-+	$(LINKER) $(LDFLAGS) -o $(GAMEEXE) $(LIBS) $(PERLOBJS) $(GAMEOBJS) $(LDPERL) $(LDLIBS) $(ENGINEDLL) $(NETDLL)
- 
- $(BUILDEXE) : $(ENGINEDLL) $(BUILDOBJS)
--	$(LINKER) -o $(BUILDEXE) $(LDFLAGS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
-+	$(LINKER) $(LDFLAGS) -o $(BUILDEXE) $(LIBS) $(BUILDOBJS) $(LDLIBS) $(ENGINEDLL)
- 
- listclean:
- 	@echo "A 'make clean' would remove" $(CLEANUP)
---- source/Makefile.old	2010-10-08 14:35:54.000000000 +0200
-+++ source/Makefile	2010-10-08 14:37:34.000000000 +0200
-@@ -152,10 +152,10 @@
- 	sounds.o \
- 	dukemusc.o \
- 	audiolib/audiolib.a
--	$(CC) $^ $(BUILDOBJS) $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $^ $(BUILDOBJS) $(LDLIBS) -o $@
- 
- build: astub.o
--	$(CC) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@
-+	$(CC) $(LDFLAGS) $^ $(BUILDOBJS) buildengine/build.o $(LDLIBS) -o $@
- 
- clean:
- 	$(MAKE) -C audiolib clean
diff --git a/games-fps/duke3d/files/duke3d-20040817-noinline.patch b/games-fps/duke3d/files/duke3d-20040817-noinline.patch
deleted file mode 100644
index a41c5c01d063..000000000000
--- a/games-fps/duke3d/files/duke3d-20040817-noinline.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- source/buildengine/engine.c.old     2009-02-06 09:11:54.000000000 +0100
-+++ source/buildengine/engine.c 2009-02-06 09:19:12.000000000 +0100
-@@ -391,6 +391,7 @@
-            modify exact [eax ebx ecx]\
- 
-     #elif (defined __GNUC__) || (defined __ICC)
-+       __attribute__ ((noinline))
-         static long nsqrtasm(int i1)
-         {
-             long retval;
-@@ -601,6 +602,7 @@
- 
-     #elif (defined __GNUC__) || (defined __ICC)
- 
-+       __attribute__ ((noinline))
-         int setgotpic(long i1)
-         {
-             int retval = 0;
diff --git a/games-fps/duke3d/files/duke3d.cfg b/games-fps/duke3d/files/duke3d.cfg
deleted file mode 100644
index 2e8c4a0671b7..000000000000
--- a/games-fps/duke3d/files/duke3d.cfg
+++ /dev/null
@@ -1,194 +0,0 @@
-[Setup]
-SetupVersion = "1.3D"
-
-[Screen Setup]
-ScreenMode = 2
-ScreenWidth = 1024
-ScreenHeight = 768
-Shadows = 1
-Password = ""
-Detail = 1
-Tilt = 1
-Messages = 1
-Out = 0
-ScreenSize = 8
-ScreenGamma = 0
-
-[Sound Setup]
-FXDevice = 0
-MusicDevice = 0
-FXVolume = 220
-MusicVolume = 200
-NumVoices = 8
-NumChannels = 2
-NumBits = 16
-MixRate = 44100
-MidiPort = 0x330
-BlasterAddress = 0x220
-BlasterType = 1
-BlasterInterrupt = 5
-BlasterDma8 = 1
-BlasterDma16 = 5
-BlasterEmu = 0x620
-ReverseStereo = 0
-SoundToggle = 1
-VoiceToggle = 1
-AmbienceToggle = 1
-MusicToggle = 1
-
-[KeyDefinitions]
-Move_Forward = "Up" "Kpad8"
-Move_Backward = "Down" "Kpad2"
-Turn_Left = "Left" "Kpad4"
-Turn_Right = "Right" "KPad6"
-Strafe = "LAlt" "RAlt"
-Fire = "LCtrl" "RCtrl"
-Open = "Space" ""
-Run = "LShift" "RShift"
-AutoRun = "CapLck" ""
-Jump = "A" "/"
-Crouch = "Z" ""
-Look_Up = "PgUp" "Kpad9"
-Look_Down = "PgDn" "Kpad3"
-Look_Left = "Insert" "Kpad0"
-Look_Right = "Delete" "Kpad."
-Strafe_Left = "," ""
-Strafe_Right = "." ""
-Aim_Up = "Home" "KPad7"
-Aim_Down = "End" "Kpad1"
-Weapon_1 = "1" ""
-Weapon_2 = "2" ""
-Weapon_3 = "3" ""
-Weapon_4 = "4" ""
-Weapon_5 = "5" ""
-Weapon_6 = "6" ""
-Weapon_7 = "7" ""
-Weapon_8 = "8" ""
-Weapon_9 = "9" ""
-Weapon_10 = "0" ""
-Inventory = "Enter" "KpdEnt"
-Inventory_Left = "[" ""
-Inventory_Right = "]" ""
-Holo_Duke = "H" ""
-Jetpack = "J" ""
-NightVision = "N" ""
-MedKit = "M" ""
-TurnAround = "BakSpc" ""
-SendMessage = "T" ""
-Map = "Tab" ""
-Shrink_Screen = "-" "Kpad-"
-Enlarge_Screen = "=" "Kpad+"
-Center_View = "KPad5" ""
-Holster_Weapon = "ScrLck" ""
-Show_Opponents_Weapon = "W" ""
-Map_Follow_Mode = "F" ""
-See_Coop_View = "K" ""
-Mouse_Aiming = "U" ""
-Toggle_Crosshair = "I" ""
-Steroids = "R" ""
-Quick_Kick = "`" ""
-Next_Weapon = "'" ""
-Previous_Weapon = ";" ""
-
-[Controls]
-ControllerType = 1
-JoystickPort = 0
-MouseSensitivity = 32768
-ExternalFilename = "EXTERNAL.EXE"
-EnableRudder = 0
-MouseAiming = 0
-MouseButton0 = "Fire"
-MouseButtonClicked0 = ""
-MouseButton1 = "Strafe"
-MouseButtonClicked1 = "Open"
-MouseButton2 = "Move_Forward"
-MouseButtonClicked2 = ""
-JoystickButton0 = "Fire"
-JoystickButtonClicked0 = ""
-JoystickButton1 = "Strafe"
-JoystickButtonClicked1 = "Inventory"
-JoystickButton2 = "Run"
-JoystickButtonClicked2 = "Jump"
-JoystickButton3 = "Open"
-JoystickButtonClicked3 = "Crouch"
-JoystickButton4 = "Aim_Down"
-JoystickButtonClicked4 = ""
-JoystickButton5 = "Look_Right"
-JoystickButtonClicked5 = ""
-JoystickButton6 = "Aim_Up"
-JoystickButtonClicked6 = ""
-JoystickButton7 = "Look_Left"
-JoystickButtonClicked7 = ""
-MouseAnalogAxes0 = "analog_turning"
-MouseDigitalAxes0_0 = ""
-MouseDigitalAxes0_1 = ""
-MouseAnalogScale0 = 0
-MouseAnalogAxes1 = "analog_moving"
-MouseDigitalAxes1_0 = ""
-MouseDigitalAxes1_1 = ""
-MouseAnalogScale1 = 0
-JoystickAnalogAxes0 = "analog_turning"
-JoystickDigitalAxes0_0 = ""
-JoystickDigitalAxes0_1 = ""
-JoystickAnalogScale0 = 0
-JoystickAnalogAxes1 = "analog_moving"
-JoystickDigitalAxes1_0 = ""
-JoystickDigitalAxes1_1 = ""
-JoystickAnalogScale1 = 0
-JoystickAnalogAxes2 = "analog_strafing"
-JoystickDigitalAxes2_0 = ""
-JoystickDigitalAxes2_1 = ""
-JoystickAnalogScale2 = 0
-JoystickAnalogAxes3 = ""
-JoystickDigitalAxes3_0 = "Run"
-JoystickDigitalAxes3_1 = ""
-JoystickAnalogScale3 = 0
-GamePadDigitalAxes0_0 = "Turn_Left"
-GamePadDigitalAxes0_1 = "Turn_Right"
-GamePadDigitalAxes1_0 = "Move_Forward"
-GamePadDigitalAxes1_1 = "Move_Backward"
-MouseAimingFlipped = 0
-GameMouseAiming = 0
-AimingFlag = 0
-
-[Comm Setup]
-ComPort = 2
-IrqNumber = 65535
-UartAddress = 65535
-PortSpeed = 9600
-ToneDial = 1
-SocketNumber = 65535
-NumberPlayers = 2
-ModemName = ""
-InitString = "ATZ"
-HangupString = "ATH0=0"
-DialoutString = ""
-PlayerName = "DUKE"
-RTSName = "DUKE.RTS"
-PhoneNumber = ""
-ConnectType = 0
-CommbatMacro#0 = "An inspiration for birth control."
-CommbatMacro#1 = "You're gonna die for that!"
-CommbatMacro#2 = "It hurts to be you."
-CommbatMacro#3 = "Lucky Son of a Bitch."
-CommbatMacro#4 = "Hmmm....Payback time."
-CommbatMacro#5 = "You bottom dwelling scum sucker."
-CommbatMacro#6 = "Damn, you're ugly."
-CommbatMacro#7 = "Ha ha ha...Wasted!"
-CommbatMacro#8 = "You suck!"
-CommbatMacro#9 = "AARRRGHHHHH!!!"
-
-[Misc]
-Executions = 5
-RunMode = 0
-Crosshairs = 1
-WeaponChoice0 = 3
-WeaponChoice1 = 4
-WeaponChoice2 = 5
-WeaponChoice3 = 7
-WeaponChoice4 = 8
-WeaponChoice5 = 6
-WeaponChoice6 = 0
-WeaponChoice7 = 2
-WeaponChoice8 = 9
-WeaponChoice9 = 1
diff --git a/games-fps/duke3d/files/network.cfg b/games-fps/duke3d/files/network.cfg
deleted file mode 100644
index 46db8b3119fb..000000000000
--- a/games-fps/duke3d/files/network.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-# lifted from happypenguin.org
-
-INTERFACE [your ip address]
-
-# only peer appears to work [SERVER or CLIENT or PEER]
-MODE peer
-
-# create an allow line for everyone who will connect
-ALLOW [another player's ip address]
-ALLOW [another player's ip address]
-ALLOW [another player's ip address]
-ALLOW [another player's ip address]
-
-# try to find [number] of players and start the game
-BROADCAST [number] 
diff --git a/games-fps/duke3d/metadata.xml b/games-fps/duke3d/metadata.xml
deleted file mode 100644
index 1f342d0fbdcc..000000000000
--- a/games-fps/duke3d/metadata.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-The third chapter in the series, and the first with a 3D perspective 
-(the original Duke Nukem and the sequel, Duke Nukem II, are side 
-scrolling platform games). This game, set sometime in the early 21st 
-century, begins in a ravaged LA, which was overtaken by aliens while you 
-were abducted during Duke Nukem II. Duke, upon returning to Earth, finds 
-himself with another mess to clean up, and another alien race that needs 
-exterminating. Duke is a can-do hero who realizes that sometimes 
-innocent people have to die in order to save Earth, so accuracy of gun 
-fire is not a real concern to him. :) 
-
-This game has a long list of cool things that haven't been attempted in 
-3D action games, yet. The weapons, for example, kick-butt: 
-
-    * There's a mine that can be placed on any wall and sends out a 
-laser trip beam-- perfect for multiplayer games. 
-    * There's also a shrinker ray that reduces an opponent to the size 
-of a G.I. Joe, at which point they are foot fodder--watch them splat! 
-    * As in Shadow Warrior, you can swim under water, and even shoot 
-players who are standing outside the water, or vice versa.
-
- What works:
-    * Basic gameplay seems fine.
-    * Sound and music.
-    * keyboard input.
-    * mouse input.
-    * Hi-res (what would be "VESA modes" in DOS).
-    * Windowed/fullscreen support.
-    * Save games.
-    * Record and playback demos compatible with the Atomic Edition (1.5).
-    * Shareware and retail versions should all work.
-    * BUILD editor works to a large degree.
-    * DukeBots for multiplayer AI.
-    * Assembly code all has portable C fallbacks, now.
-    * TCP/IP Networking!
-    * Linux/x86 port.
-    * Windows/x86 port.
-    * BeOS/x86 port.
-    * (incomplete) MacOS X port. 
-
-What doesn't work/known bugs:
-    * Joystick input isn't working yet.
-    * File cases need to be exact in some places, not others.
-    * Engine (game?) relies on compiler treating "char" as "unsigned" by default...this needs to be flushed out, for sanity's sake. But I'm anal. :)
-    * Netcode handles packet loss _VERY_ poorly...it's fine for stable connections and LANs, though.
-    * Configuring a multiplayer game involves editing text files and filling in IP addresses. Not very user-friendly.
-    * Some text prompts try to read the SDL input queue instead of stdin like they should.
-    * Probably other stuff. Do NOT consider this stable and complete yet! 
-</longdescription>
-  <use>
-    <flag name="demo">Install the demo files</flag>
-    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/eduke32-20180702.6937 b/games-fps/eduke32-20180702.6937
new file mode 100644
index 000000000000..b90b53b0994f
--- /dev/null
+++ b/games-fps/eduke32-20180702.6937
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) app-arch/unzip x86? ( dev-lang/nasm ) >=sys-apps/sed-4
+DESCRIPTION=An open source engine port of the classic PC first person shooter Duke Nukem 3D
+EAPI=6
+HOMEPAGE=http://www.eduke32.com/
+IUSE=cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=BUILDLIC GPL-2 HRP
+RDEPEND=media-libs/libsdl2[joystick,opengl?,sound,video,X] media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?] sys-libs/zlib:= flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) opengl? ( virtual/glu virtual/opengl ) png? ( media-libs/libpng:0= ) timidity? ( media-sound/timidity-freepats ) vpx? ( media-libs/libvpx:= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) xmp? ( media-libs/exempi:= ) cdinstall? ( games-fps/duke3d-data ) demo? ( games-fps/duke3d-demodata )
+REQUIRED_USE=cdinstall? ( !demo ) demo? ( !cdinstall ) hrp? ( ^^ ( demo cdinstall ) !voxels ) offensive? ( ^^ ( demo cdinstall ) ) opl? ( ^^ ( demo cdinstall ) !sc-55 ) psx? ( ^^ ( demo cdinstall ) ) sc-55? ( ^^ ( demo cdinstall ) !opl ) voxels? ( !hrp ) vpx? ( opengl )
+SLOT=0
+SRC_URI=http://dukeworld.com/eduke32/synthesis/20180702-6937/eduke32_src_20180702-6937.tar.xz http://www.eduke32.com/images/eduke32_classic.png hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> duke3d_hrp-5.4.zip ) offensive? ( http://www.duke4.org/files/nightfright/related/duke3d_xxx.zip -> duke3d_xxx-1.33.zip ) opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> duke3d_musopl-2.01.zip ) psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> duke3d_psx-1.11.zip ) sc-55? ( http://www.duke4.org/files/nightfright/music/duke3d_music-sc55.zip -> duke3d_music-sc55-4.02.zip ) voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> duke3d_voxels-1.21.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	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_=1be49671d65817925c0fc186be820422
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
deleted file mode 100644
index 19ca4a0b2b8f..000000000000
--- a/games-fps/eduke32/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
-AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
-AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
-DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
-DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
-DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
-DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c17b1163107e1f8c6eab4be2b5a2ed74f302604f5769d3bb71d3ce8355b69b75352dc470918ebd5c0c73d68665 SHA512 e98f3bbfb2055fa72c4376ebbdb64814b1bca7c66968ffea8ca4d980d432f59f6ae013c889a57a28b2961bbeca2cc80b83b573dc0cbc2550cd9f428cf9d2a625
-DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
-DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
-DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20180702-6937.tar.xz 14703496 BLAKE2B b1028551621bf12cbf8e6b0626cfb9634aa096d59a9dcc173cdb89614e68006d56468e2507e8f44f9c7a81e3c2bb392b79ccdafda420d456e169f135f78e106b SHA512 f219c30c6b5892846cc1f2a025e192d868610607213671658a62bcc833a5e0d8f5a3841681475574451e9938a8b8f47410e5f7f34267b618d03a2f154539cfef
-EBUILD eduke32-20180702.6937.ebuild 6076 BLAKE2B e3e92d3a8fbca3591855495294ec06bedd7b545f8d618f3730e9544df02a7559229291915db32ed0ae236fdcd0c9eb058c3ee2ec6345daabfe7c469e20ab88e2 SHA512 ab65151e77139a4805a6a2292540e6c30c8eec695195bc28d2ff294ddac29fbbac42eacc00a35e61e4270aa25dbfe483b2c0448cb265421e1d5b1439d2c5e2d5
-MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20180702.6937.ebuild b/games-fps/eduke32/eduke32-20180702.6937.ebuild
deleted file mode 100644
index c42e95c4417b..000000000000
--- a/games-fps/eduke32/eduke32-20180702.6937.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eapi7-ver gnome2-utils toolchain-funcs
-
-MY_BUILD="$(ver_cut 2)"
-MY_DATE="$(ver_cut 1)"
-
-MY_PN_HRP="duke3d_hrp"
-MY_PN_OPL="duke3d_musopl"
-MY_PN_PSX="duke3d_psx"
-MY_PN_SC55="duke3d_music-sc55"
-MY_PN_VOXELS="duke3d_voxels"
-MY_PN_XXX="duke3d_xxx"
-
-MY_PV_HRP="5.4"
-MY_PV_OPL="2.01"
-MY_PV_PSX="1.11"
-MY_PV_SC55="4.02"
-MY_PV_VOXELS="1.21"
-MY_PV_XXX="1.33"
-
-DESCRIPTION="An open source engine port of the classic PC first person shooter Duke Nukem 3D"
-HOMEPAGE="http://www.eduke32.com/"
-SRC_URI="http://dukeworld.com/eduke32/synthesis/${MY_DATE}-${MY_BUILD}/${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
-	http://www.eduke32.com/images/eduke32_classic.png
-	hrp? ( http://www.duke4.org/files/nightfright/hrp/duke3d_hrp.zip -> ${MY_PN_HRP}-${MY_PV_HRP}.zip )
-	offensive? ( http://www.duke4.org/files/nightfright/related/${MY_PN_XXX}.zip -> ${MY_PN_XXX}-${MY_PV_XXX}.zip )
-	opl? ( http://www.moddb.com/downloads/mirror/95750/102/ce9e8f422c6cccdb297852426e96740a -> ${MY_PN_OPL}-${MY_PV_OPL}.zip )
-	psx? ( http://www.duke4.org/files/nightfright/related/duke3d_psx.zip -> ${MY_PN_PSX}-${MY_PV_PSX}.zip )
-	sc-55? ( http://www.duke4.org/files/nightfright/music/${MY_PN_SC55}.zip -> ${MY_PN_SC55}-${MY_PV_SC55}.zip )
-	voxels? ( https://www.dropbox.com/s/yaxfahyvskyvt4r/duke3d_voxels.zip -> ${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip )"
-
-KEYWORDS="~amd64 ~hppa ~x86"
-LICENSE="BUILDLIC GPL-2 HRP"
-SLOT="0"
-IUSE="cdinstall demo flac fluidsynth gtk hrp offensive opengl opl png psx sc-55 server sdk timidity tools vorbis voxels vpx xmp"
-REQUIRED_USE="cdinstall? ( !demo )
-	demo? ( !cdinstall )
-	hrp? ( ^^ ( demo cdinstall )
-		!voxels )
-	offensive? ( ^^ ( demo cdinstall ) )
-	opl? ( ^^ ( demo cdinstall )
-		!sc-55 )
-	psx? ( ^^ ( demo cdinstall ) )
-	sc-55? ( ^^ ( demo cdinstall )
-		!opl )
-	voxels? ( !hrp )
-	vpx? ( opengl )"
-
-S="${WORKDIR}/${PN}_${MY_DATE}-${MY_BUILD}"
-
-MY_DEPEND_RDEPEND="media-libs/libsdl2[joystick,opengl?,sound,video,X]
-	media-libs/sdl2-mixer[flac?,fluidsynth?,midi,timidity?,vorbis?]
-	sys-libs/zlib:=
-	flac? ( media-libs/flac )
-		gtk? ( x11-libs/gtk+:2 )
-	opengl? ( virtual/glu
-		virtual/opengl )
-	png? ( media-libs/libpng:0= )
-	timidity? ( media-sound/timidity-freepats )
-	vpx? ( media-libs/libvpx:= )
-	vorbis? ( media-libs/libogg
-		media-libs/libvorbis )
-	xmp? ( media-libs/exempi:= )"
-
-RDEPEND="${MY_DEPEND_RDEPEND}
-	cdinstall? ( games-fps/duke3d-data )
-	demo? ( games-fps/duke3d-demodata )"
-
-DEPEND="${MY_DEPEND_RDEPEND}
-	app-arch/unzip
-	x86? ( dev-lang/nasm )"
-
-PATCHES=( "${FILESDIR}/log-to-tmpdir.patch" "${FILESDIR}/search-duke3d-path.patch" )
-
-src_unpack() {
-	# Extract only the eduke32 archive
-	unpack ${PN}_src_${MY_DATE}-${MY_BUILD}.tar.xz
-
-	# Unpack only the documentation
-	if use hrp; then
-		unzip -q "${DISTDIR}"/${MY_PN_HRP}-${MY_PV_HRP}.zip hrp_readme.txt hrp_todo.txt || die
-	fi
-	if use offensive; then
-		unzip -q "${DISTDIR}"/${MY_PN_XXX}-${MY_PV_XXX}.zip xxx_readme.txt || die
-	fi
-	if use opl; then
-		unzip -q "${DISTDIR}"/${MY_PN_OPL}-${MY_PV_OPL}.zip readme.txt || die
-	fi
-	if use sc-55; then
-		unzip -q "${DISTDIR}"/${MY_PN_SC55}-${MY_PV_SC55}.zip readme/music_readme.txt || die
-	fi
-	if use voxels; then
-		unzip -q "${DISTDIR}"/${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip voxelpack_readme.txt || die
-	fi
-}
-
-src_compile() {
-	local myemakeopts=(
-		ALLOCACHE_AS_MALLOC=0
-		AS=$(tc-getAS)
-		CC=$(tc-getCC)
-		CXX=$(tc-getCXX)
-		CLANG=0
-		CPLUSPLUS=1
-		CUSTOMOPT=""
-		DEBUGANYWAY=0
-		F_JUMP_TABLES=""
-		FORCEDEBUG=0
-		HAVE_FLAC=$(usex flac 1 0)
-		HAVE_GTK2=$(usex gtk 1 0)
-		HAVE_VORBIS=$(usex vorbis 1 0)
-		HAVE_XMP=$(usex xmp 1 0)
-		LINKED_GTK=$(usex gtk 1 0)
-		LTO=1
-		LUNATIC=0
-		KRANDDEBUG=0
-		MEMMAP=0
-		MIXERTYPE=SDL
-		NETCODE=$(usex server 1 0)
-		NOASM=0
-		OPTLEVEL=0
-		OPTOPT=""
-		PACKAGE_REPOSITORY=1
-		POLYMER=$(usex opengl 1 0)
-		PRETTY_OUTPUT=0
-		PROFILER=0
-		RELEASE=1
-		RENDERTYPE=SDL
-		SDL_TARGET=2
-		SIMPLE_MENU=0
-		STRIP=""
-		TANDALONE=0
-		STARTUP_WINDOW=$(usex gtk 1 0)
-		USE_OPENGL=$(usex opengl 1 0)
-		USE_LIBVPX=$(usex vpx 1 0)
-		USE_LIBPNG=$(usex png 1 0)
-		USE_LUAJIT_2_1=0
-		WITHOUT_GTK=$(usex gtk 0 1)
-	)
-
-	emake "${myemakeopts[@]}"
-
-	if use tools; then
-		emake utils "${myemakeopts[@]}"
-	fi
-}
-
-src_install() {
-	local binary
-	local binaries=(
-		eduke32
-		mapster32
-		"${FILESDIR}"/eduke32-bin
-	)
-	for binary in "${binaries[@]}"; do
-		dobin "${binary}"
-	done
-
-	if use tools; then
-		local tool
-		local tools=(
-			arttool
-			bsuite
-			cacheinfo
-			generateicon
-			givedepth
-			ivfrate
-			kextract
-			kgroup
-			kmd2tool
-			makesdlkeytrans
-			map2stl
-			md2tool
-			mkpalette
-			transpal
-			unpackssi
-			wad2art
-			wad2map
-		)
-		for tool in "${tools[@]}"; do
-			dobin ${tool}
-		done
-	fi
-
-	keepdir /usr/share/games/eduke32
-	insinto /usr/share/games/eduke32
-	if use hrp; then
-		doins "${DISTDIR}"/${MY_PN_HRP}-${MY_PV_HRP}.zip
-	fi
-	if use offensive; then
-		doins "${DISTDIR}"/${MY_PN_XXX}-${MY_PV_XXX}.zip
-	fi
-	if use opl; then
-		doins "${DISTDIR}"/${MY_PN_OPL}-${MY_PV_OPL}.zip
-	fi
-	if use psx; then
-		doins "${DISTDIR}"/${MY_PN_PSX}-${MY_PV_PSX}.zip
-	fi
-	if use sc-55; then
-		doins "${DISTDIR}"/${MY_PN_SC55}-${MY_PV_SC55}.zip
-	fi
-	if use sdk; then
-		doins -r package/sdk
-	fi
-	if use voxels; then
-		doins "${DISTDIR}"/${MY_PN_VOXELS}-${MY_PV_VOXELS}.zip
-	fi
-
-	newicon "${DISTDIR}"/eduke32_classic.png eduke32.png
-
-	make_desktop_entry eduke32-bin EDuke32 eduke32 Game
-	make_desktop_entry mapster32 Mapster32 eduke32 Game
-
-	local DOCS=( package/sdk/samples/*.txt source/build/doc/*.txt source/duke3d/src/lunatic/doc/*.txt )
-	if use hrp; then
-		DOCS+=( "${WORKDIR}"/hrp_readme.txt "${WORKDIR}"/hrp_todo.txt )
-	fi
-	if use offensive; then
-		DOCS+=( "${WORKDIR}"/xxx_readme.txt )
-	fi
-	if use opl; then
-		DOCS+=( "${WORKDIR}"/readme.txt )
-	fi
-	if use sc-55; then
-		DOCS+=( "${WORKDIR}"/readme/music_readme.txt )
-	fi
-	if use voxels; then
-		DOCS+=( "${WORKDIR}"/voxelpack_readme.txt )
-	fi
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/eduke32/files/eduke32-bin b/games-fps/eduke32/files/eduke32-bin
deleted file mode 100755
index 18e5b08e1eaa..000000000000
--- a/games-fps/eduke32/files/eduke32-bin
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-# Get all installed zip files
-zips=$(ls /usr/share/games/eduke32/*.zip)
-
-# Create opts for eduke32
-for zip in ${zips[@]}; do
-	opts+="-g ${zip} "
-done
-
-# Switch to /tmp, for writing there the log file and run eduke32 with set opts
-cd /tmp && eduke32 ${opts}
diff --git a/games-fps/eduke32/files/log-to-tmpdir.patch b/games-fps/eduke32/files/log-to-tmpdir.patch
deleted file mode 100644
index 24cec1b00af1..000000000000
--- a/games-fps/eduke32/files/log-to-tmpdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/duke3d/src/game.cpp	2018-05-08 19:32:19.000000000 +0200
-+++ b/source/duke3d/src/game.cpp	2018-05-10 23:46:21.540213019 +0200
-@@ -6234,7 +6234,7 @@
-     }
-     else
- #endif
--    OSD_SetLogFile(APPBASENAME ".log");
-+    OSD_SetLogFile("/tmp/" APPBASENAME ".log");
- 
-     OSD_SetFunctions(GAME_drawosdchar,
-                      GAME_drawosdstr,
diff --git a/games-fps/eduke32/files/search-duke3d-path.patch b/games-fps/eduke32/files/search-duke3d-path.patch
deleted file mode 100644
index c35af40c749e..000000000000
--- a/games-fps/eduke32/files/search-duke3d-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/duke3d/src/common.cpp	2018-04-12 23:03:47.000000000 +0200
-+++ b/source/duke3d/src/common.cpp	2018-05-11 00:04:36.590712915 +0200
-@@ -794,6 +794,8 @@
- 
-     addsearchpath("/usr/share/games/jfduke3d");
-     addsearchpath("/usr/local/share/games/jfduke3d");
-+    addsearchpath("/usr/share/games/duke3d");
-+    addsearchpath("/usr/share/duke3d");
-     addsearchpath("/usr/share/games/eduke32");
-     addsearchpath("/usr/local/share/games/eduke32");
- #elif defined EDUKE32_OSX
diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
deleted file mode 100644
index 15de77d47f59..000000000000
--- a/games-fps/eduke32/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		EDuke32 is an awesome, free homebrew game engine and source port
-		of the classic PC first person shooter Duke Nukem 3D - Duke3D
-		for short to Windows, Linux, Mac OS X, FreeBSD and several handhelds.
-	</longdescription>
-	<use>
-		<flag name="demo">Install the Duke Nukem 3D demo files, provided by <pkg>games-fps/duke3d-demodata</pkg>.</flag>
-		<flag name="fluidsynth">Install <pkg>media-libs/sdl2-mixer</pkg> with fluidsynth support.</flag>
-		<flag name="hrp">Install the Duke Nukem 3D High Resolution Pack.</flag>
-		<flag name="offensive">Install the Duke Nukem 3D XXX Pack.</flag>
-		<flag name="opl">Install the Duke Nukem 3D OPL music files.</flag>
-		<flag name="psx">Install the Duke Nukem 3D PSX high resolution voice files.</flag>
-		<flag name="sc-55">Install the Duke Nukem 3D Roland SC-55 music files.</flag>
-		<flag name="server">Enable support for multiplayer.</flag>
-		<flag name="sdk">Install the SDK files.</flag>
-		<flag name="tools">Install the support tools for mapster32.</flag>
-		<flag name="voxels">Install the Duke Nukem 3D Voxels Pack.</flag>
-		<flag name="vpx">Enable support for <pkg>media-libs/libvpx</pkg>.</flag>
-		<flag name="xmp">Enable support for <pkg>media-libs/exempi</pkg>.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-fps/enemy-territory-2.60b-r1 b/games-fps/enemy-territory-2.60b-r1
new file mode 100644
index 000000000000..46c340ee34b2
--- /dev/null
+++ b/games-fps/enemy-territory-2.60b-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=standalone multi-player game based on Return to Castle Wolfenstein
+EAPI=5
+HOMEPAGE=http://www.idsoftware.com/
+IUSE=dedicated
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RTCW-ETEULA
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run mirror://idsoftware/et/linux/et-linux-2.60.x86.run ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-2.60.x86.run mirror://idsoftware/et/ET-2.60b.zip dedicated? ( https://dev.gentoo.org/~wolf31o2/sources/dump/enemy-territory-all-0.1.tar.bz2 mirror://gentoo/enemy-territory-all-0.1.tar.bz2 )
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b30681b28f222523900f9312c0dc4ac8
diff --git a/games-fps/enemy-territory-etpro-3.2.6-r1 b/games-fps/enemy-territory-etpro-3.2.6-r1
new file mode 100644
index 000000000000..f0f398e6568a
--- /dev/null
+++ b/games-fps/enemy-territory-etpro-3.2.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory ETPro - Minor additions to Enemy Territory to make it more fun
+EAPI=5
+HOMEPAGE=http://etpro.anime.net/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/enemy-territory[dedicated] ) opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://bani.anime.net/etpro/etpro-3_2_6.zip http://www.enemyterritory.sk/files/etpro-3_2_6.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=20d5772ba1bc7313e22fe908f1002031
diff --git a/games-fps/enemy-territory-etpro/Manifest b/games-fps/enemy-territory-etpro/Manifest
deleted file mode 100644
index f4769d1832f0..000000000000
--- a/games-fps/enemy-territory-etpro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST etpro-3_2_6.zip 3698539 BLAKE2B 08179b55e4c3dacdde65e12a94946f28e9f28d32c989a408bf53af7480b41d4ae442c2309ead867f8745d5b575380430b931a5cefa06f0280bc2f5eca17140da SHA512 366da5b7aaaa4b88da050aca95342425cba855182c59bf2fbe104252cc2241f79be629ae5dc15f9c396284910eb63721db01fc0aa02303cc51015d36263db9de
-EBUILD enemy-territory-etpro-3.2.6-r1.ebuild 537 BLAKE2B c9073ed33d089d1796530a6fd6c357912a2dd39d3c21b5123d7f8dba746d2deac832f8f470ba9b80eecaa59bb433afd636b4bb317538f62d69a2c245a9b5d044 SHA512 52ef43888d08678aab3a6caed4a080272b786d804cf10ecf266d0d969cb5845c0024cbe8d507df77598719f5ba5374ab04dce7878069fdc379ce3a4f78efabf9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild b/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
deleted file mode 100644
index d86355ef1353..000000000000
--- a/games-fps/enemy-territory-etpro/enemy-territory-etpro-3.2.6-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GAME="enemy-territory"
-MOD_DESC="Minor additions to Enemy Territory to make it more fun"
-MOD_NAME="ETPro"
-MOD_DIR="etpro"
-
-inherit games games-mods
-
-HOMEPAGE="http://etpro.anime.net/"
-SRC_URI="http://bani.anime.net/etpro/etpro-${PV//./_}.zip
-	http://www.enemyterritory.sk/files/etpro-${PV//./_}.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/enemy-territory-etpro/metadata.xml b/games-fps/enemy-territory-etpro/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/enemy-territory-etpro/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/enemy-territory-omnibot-0.85 b/games-fps/enemy-territory-omnibot-0.85
new file mode 100644
index 000000000000..70c037f3f282
--- /dev/null
+++ b/games-fps/enemy-territory-omnibot-0.85
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory Omnibot - Bots for Ennemy Territory
+EAPI=5
+HOMEPAGE=http://www.omni-bot.com/
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( games-fps/enemy-territory[dedicated] ) opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://omni-bot.invisionzone.com/index.php?/files/getdownload/208-omni-bot-enemy-territory -> omni-bot_0_85_ET_linux.zip http://omni-bot.invisionzone.com/index.php?/files/getdownload/207-omni-bot-enemy-territory -> omni-bot_0_85_ET_waypoint_mod.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fee36890513605cdc132305f2a3f0427
diff --git a/games-fps/enemy-territory-omnibot/Manifest b/games-fps/enemy-territory-omnibot/Manifest
deleted file mode 100644
index b9774a888b3f..000000000000
--- a/games-fps/enemy-territory-omnibot/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST omni-bot_0_85_ET_linux.zip 19662449 BLAKE2B c4327be6a60e23982569f84243736cbc9068948b0dc1d113057d750194e6ab0b516e2305f24091b970f2ce3274e612ca9ffef70c6eef5c18d7a1080c2f7d910f SHA512 83ca166556cbbae26ab8d498437b5922e1db5ad4e7be3718a6ccc158af8f143550b159bcc01b48e7c82901285edc3cbde02e59f7bb3d068d016c2fe5e0728b93
-DIST omni-bot_0_85_ET_waypoint_mod.zip 4344830 BLAKE2B cb37d4f4ef5be155b45ff40ea3d1813fdb723e15301140e57397f3f0f8940f0073f06324b2e21913d92e5d4a3a4a17999d52ccdcadb54fbea4f8c565d3142805 SHA512 e63eb693879a4e85add3ac3def6698aa1a08c3293c2180664903adfede8aa6df682afb8ed8f549d573d3baee236d5eefe50a4f1142798cf1ac13e75b80b99558
-EBUILD enemy-territory-omnibot-0.85.ebuild 641 BLAKE2B 1ab3d6b3546033e2912d7be039b1272f4424ef892cc7f04ad46a8930b3025fd88d5755b6110ff06bd1fb85778a1c6d42c9f59cc752eed99456dd3f8bcee9abd1 SHA512 508df412492bccbc27cea01f1eb72a29052556b110bc17ef91b4ab393844931847455bff7b5d4757114612610ab0aabf5631a00c713a0aa605bc540177956053
-MISC metadata.xml 368 BLAKE2B c7ddfd60946ebc15ec02840097337c6c69c04bccfe62871a9504b92d2a1f0bb2a55ce54f3460ba26e4d77f36e1ce317cbc536c27ed40c5d4413ba38e797bfee9 SHA512 99b24da1ab137ccf7078a2d845e52ed4cbb22b8e64f0b2514a3c02d87cbf1210fc0e60d938864623994a9f47f9e6bbe92a54eb361030bedd35afd18759d3137d
diff --git a/games-fps/enemy-territory-omnibot/enemy-territory-omnibot-0.85.ebuild b/games-fps/enemy-territory-omnibot/enemy-territory-omnibot-0.85.ebuild
deleted file mode 100644
index f2e55798684e..000000000000
--- a/games-fps/enemy-territory-omnibot/enemy-territory-omnibot-0.85.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GAME="enemy-territory"
-MOD_DESC="Bots for Ennemy Territory"
-MOD_NAME="Omnibot"
-MOD_DIR="omnibot"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.omni-bot.com/"
-MY_PV="${PV//./_}"
-SRC_URI="http://omni-bot.invisionzone.com/index.php?/files/getdownload/208-omni-bot-enemy-territory -> omni-bot_${MY_PV}_ET_linux.zip
-	http://omni-bot.invisionzone.com/index.php?/files/getdownload/207-omni-bot-enemy-territory -> omni-bot_${MY_PV}_ET_waypoint_mod.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip"
diff --git a/games-fps/enemy-territory-omnibot/metadata.xml b/games-fps/enemy-territory-omnibot/metadata.xml
deleted file mode 100644
index 907a3f30fd04..000000000000
--- a/games-fps/enemy-territory-omnibot/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>junghans@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	</pkgmetadata>
diff --git a/games-fps/enemy-territory-truecombat-0.49b b/games-fps/enemy-territory-truecombat-0.49b
new file mode 100644
index 000000000000..de19816f2ffe
--- /dev/null
+++ b/games-fps/enemy-territory-truecombat-0.49b
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory True Combat - a team-based realism modification
+EAPI=5
+HOMEPAGE=http://www.truecombatelite.com/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=~virtual/libstdc++-3.3 games-misc/games-envd dedicated? ( games-fps/enemy-territory[dedicated] ) opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/enemy-territory[opengl] games-fps/enemy-territory[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://dragons-perch.net/tce/tcetest049.zip http://freeserver.name/files/installer/linux/tcetest049.zip http://mirror.rosvosektori.net/tcetest049.zip http://dragons-perch.net/tce/tce049b_all_os_fixed.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bc36a68d903ca85777218eb768f7af8a
diff --git a/games-fps/enemy-territory-truecombat/Manifest b/games-fps/enemy-territory-truecombat/Manifest
deleted file mode 100644
index 79aed18da578..000000000000
--- a/games-fps/enemy-territory-truecombat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST tce049b_all_os_fixed.zip 6795533 BLAKE2B e2dc54e031d6d0e6f67a965ef2a92808af08305b9a9a14f46d374bc16b761f557a99182a86a09bd3993b733a84a980fc82665911442d3388f00375789efc0304 SHA512 8814f193437551c29edf88087229ee813317df10e264c3a0200942ef7c1e876aacff4d985d28bd59d1b3bd9589c86ad034d59a8f434cb443a31e07db9b0562da
-DIST tcetest049.zip 472749193 BLAKE2B da9ac999c282540a2dd022d4a77a0b5e2f9ccd5da01384e52e7dfdaa4997ed791152a9f480bce8804729dcf4742b8b64b5a89e06b577a76c1bc91c9787fc5f37 SHA512 9c5dfaad2f427b4fdc3fa0d5ed7b88e68776167049e0fa75e72a84a6735ff1e97926dfd0d5c290351ac0eb3123018afc1f478d8c0506b4c8ddfa39cc22474985
-EBUILD enemy-territory-truecombat-0.49b.ebuild 844 BLAKE2B 56747341ab576baab8c60e8edc89c6b021f5f29c78bc8bea3579ed7877a20ea60166c2e0278e9febc1defcc0478b3d972b53d16308a89278ee0b24979261bc8d SHA512 b8311768259dd3f2eda7096947ec3cc4443ceb78b85e03cd2474e7fdad0864be63348c24737be27e07306b1556e92a187139cf1c4dadc13d85426639031cc14a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild b/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
deleted file mode 100644
index ec5f4920f712..000000000000
--- a/games-fps/enemy-territory-truecombat/enemy-territory-truecombat-0.49b.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GAME="enemy-territory"
-MOD_DESC="a team-based realism modification"
-MOD_NAME="True Combat"
-MOD_DIR="tcetest"
-MOD_ICON="tce_icon_pc.ico"
-
-inherit games games-mods
-
-MY_PV=${PV/.}
-HOMEPAGE="http://www.truecombatelite.com/"
-SRC_URI="http://dragons-perch.net/tce/tcetest049.zip
-	http://freeserver.name/files/installer/linux/tcetest049.zip
-	http://mirror.rosvosektori.net/tcetest049.zip
-	http://dragons-perch.net/tce/tce${MY_PV}_all_os_fixed.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-RDEPEND="~virtual/libstdc++-3.3"
-
-QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*.so"
-
-src_unpack() {
-	unpack tcetest049.zip
-	cd ${MOD_DIR} || die
-	unpack tce${MY_PV}_all_os_fixed.zip
-}
-
-src_prepare() {
-	rm -rf ${MOD_DIR}/Mac*
-}
diff --git a/games-fps/enemy-territory-truecombat/metadata.xml b/games-fps/enemy-territory-truecombat/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/enemy-territory-truecombat/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/enemy-territory/Manifest b/games-fps/enemy-territory/Manifest
deleted file mode 100644
index 397706a0f6be..000000000000
--- a/games-fps/enemy-territory/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST ET-2.60b.zip 4143401 BLAKE2B d7af97b7d5c30feeef46ec47e159120be50d276013b0627152ad503e62f17513350d7920cab42fa6082dada262b2a460ff1510de20f178626eebfd046cbb9daa SHA512 f86d0d172a170cd894f1c60a817d2159768bf7d03cb0146f3470edd54828096a62e890c24bac80a5851adc9356cb2716d5f0c756fab063a9c0eb561b72825b84
-DIST enemy-territory-all-0.1.tar.bz2 876 BLAKE2B fa144dee1768266841a77b6dab9bc27db3846f6697bb923c1e9d688a33422afdbdaa0c3c9a699e54bd8513f20aec9b2173e583c66604b3b2e783fc86769866cf SHA512 7e00ac4a30ebbbc5db646e0edf6683d8e4d99756c1010922ccfd16a3dc27c0a5b23a91c9f3adb3e120bfcd5f9a3302a466a86888ff1496dda29a3b09e87eacb2
-DIST et-linux-2.60.x86.run 270965248 BLAKE2B c774c8ccd4dc72e0b6afcd779dfc0dfad0c7f4fb208b549b04aa2fa1f9b2fd6c884a928a70b23adcd4789b7c446051a7b1fa88f4d87278b04f5461fbc3dd2869 SHA512 7321a3d831dd375c49aff81f30098c5201880e9fc783a25dd7dee3bd2211372e0e07a482e6c78982bc1f27d62bceb769dffc30f820c3144b4a64268fd9ef5cfe
-EBUILD enemy-territory-2.60b-r1.ebuild 3270 BLAKE2B 2005efddb1f293f38fb8d048b1284780a90e13991ec19444348e77eea44b7317f930afbc81ff94b3b60703a2b5eff70a709bb00cf4aeff17b99d43ea6069d777 SHA512 1916e4eac3058a7df30bf99255cfced33a1f57a25d9978e4d53d15417b98fd3aeb53ca21ce5a5eaa69e2b602d2b58ebe70471f63ab66cecf6c00cb242cc7f981
-MISC metadata.xml 1044 BLAKE2B 728088321b9eed48827feffbeaa22496d43e0ecc336c7bd271b8365c4d401c02ca5deffb8e999d5305bc9bd977d754ccd29384c7b0de4e53af44de6f8106ee61 SHA512 8ec59ef948ae9471580cb39a80bb99fc1b524c45ad60f031560fde9f2358998335e414ba09fa49c9909a005da424db84543a0b39a8b68479c097d392c2ce9bb9
diff --git a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild b/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
deleted file mode 100644
index 0f2d212e0452..000000000000
--- a/games-fps/enemy-territory/enemy-territory-2.60b-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="standalone multi-player game based on Return to Castle Wolfenstein"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://3dgamers/wolfensteinet/et-linux-2.60.x86.run
-	mirror://idsoftware/et/linux/et-linux-2.60.x86.run
-	ftp://ftp.red.telefonica-wholesale.net/GAMES/ET/linux/et-linux-2.60.x86.run
-	mirror://idsoftware/et/ET-${PV}.zip
-	dedicated? (
-		https://dev.gentoo.org/~wolf31o2/sources/dump/${PN}-all-0.1.tar.bz2
-		mirror://gentoo/${PN}-all-0.1.tar.bz2
-	)"
-
-LICENSE="RTCW-ETEULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="mirror strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	dedicated? ( app-misc/screen )
-	!dedicated? (
-		virtual/opengl[abi_x86_32(-)]
-		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}/et.x86
-	${dir:1}/etded.x86
-	${dir:1}/etmain/cgame.mp.i386.so
-	${dir:1}/etmain/qagame.mp.i386.so
-	${dir:1}/etmain/ui.mp.i386.so
-	${dir:1}/pb/pbag.so
-	${dir:1}/pb/pbags.so
-	${dir:1}/pb/pbcl.so
-	${dir:1}/pb/pbcls.so
-	${dir:1}/pb/pbsv.so
-	${dir:1}/pb/pbweb.x86"
-
-src_unpack() {
-	unpack_makeself et-linux-2.60.x86.run
-	if use dedicated; then
-		unpack ${PN}-all-0.1.tar.bz2
-	fi
-	unpack ET-${PV}.zip
-}
-
-src_prepare() {
-	if use dedicated ; then
-		sed 's@/sbin/runscript@/sbin/openrc-run@' \
-			-i et-ded.rc || die
-	fi
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe openurl.sh
-
-	insinto "${dir}"
-	dodoc CHANGES README
-
-	cp -r Docs pb etmain "${Ddir}" || die
-	chmod og+x "${Ddir}"/pb/pbweb.x86 || die
-
-	if ! use dedicated ; then
-		doicon ET.xpm
-		doexe "Enemy Territory 2.60b"/linux/et.x86
-		games_make_wrapper et ./et.x86 "${dir}" "${dir}"
-		make_desktop_entry et "Enemy Territory" ET
-	else
-		doexe "Enemy Territory 2.60b"/linux/etded.x86
-		games_make_wrapper et-ded ./etded.x86 "${dir}"
-		newinitd "${S}"/et-ded.rc et-ded
-		sed -i \
-			-e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
-			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
-			"${D}"/etc/init.d/et-ded || die
-		newconfd "${S}"/et-ded.conf.d et-ded
-		# TODO: move this to /var/ perhaps ?
-		keepdir "${dir}/etwolf-homedir"
-		chmod g+rw "${Ddir}/etwolf-homedir"
-		dosym "${dir}/etwolf-homedir" "${GAMES_PREFIX}/.etwolf"
-	fi
-
-	prepgamesdirs
-	chmod g+rw "${Ddir}" "${Ddir}/etmain"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "There are two possible security bugs in this package, both causing a"
-	ewarn "denial of service.  One affects the game when running a server, the"
-	ewarn "other when running as a client."
-	ewarn "For more information, see bug #82149."
-	echo
-	if ! use dedicated; then
-		elog "To play the game run:"
-		elog " et"
-		echo
-	else
-		elog "To start a dedicated server run:"
-		elog " /etc/init.d/et-ded start"
-		echo
-		elog "To run the dedicated server at boot, type:"
-		elog " rc-update add et-ded default"
-		echo
-		elog "The dedicated server is started under the ${GAMES_USER_DED} user account."
-		echo
-		ewarn "Store your configurations under ${dir}/etwolf-homedir or they"
-		ewarn "will be erased on the next upgrade."
-		ewarn "See bug #132795 for more info."
-		echo
-	fi
-}
diff --git a/games-fps/enemy-territory/metadata.xml b/games-fps/enemy-territory/metadata.xml
deleted file mode 100644
index 8ab2e0c01fff..000000000000
--- a/games-fps/enemy-territory/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Enemy Territory is a first-person 3-D shooter based loosely on the original Wolfenstein series by id software.  The game takes place in North Africa and Europe during World War II and allows you to play as either the Axis or the Allies.  There are several classes of characters you can play, each with their own special abilities and weapon choices.  You can also gain proficiency in your specialties and increase your abilities by performing your class's specialized duties, which helps promote teamwork.  Enemy Territory was originally to be a single and milti-player add-on for Return to Castle Wofenstein, but John Carmack and company were not happy with the progress they had made on it, so instead, they released it as a multi-player stand-alone game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/etqw-bin-1.5-r1 b/games-fps/etqw-bin-1.5-r1
new file mode 100644
index 000000000000..da3dfb4a100d
--- /dev/null
+++ b/games-fps/etqw-bin-1.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory: Quake Wars
+EAPI=5
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] cdinstall? ( games-fps/etqw-data ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-1.5-full.x86.run
+_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_=0d7fabdb983e5008e0c80b5b9718356f
diff --git a/games-fps/etqw-bin/Manifest b/games-fps/etqw-bin/Manifest
deleted file mode 100644
index 0dacdbad9fb4..000000000000
--- a/games-fps/etqw-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ETQW-client-1.5-full.x86.run 556383725 BLAKE2B 8fcaa8518c7c452a4fe593a00beea0f5a6d5849c72b03d4a443fffde8540ea53b7bf0376d90b2f2ed4e3a736628f8871e009a49b938344516b2db0495cf1e826 SHA512 32bb3d7ef47790ac6b790a5a5d61592c3504d034372254102985e58dee25b5d200e507330226bf8458c628154c246b2abcb08bf550fa044189c4c8de813af0c2
-EBUILD etqw-bin-1.5-r1.ebuild 2012 BLAKE2B 688f996448189c1525475aea0534e09b69d09f7da0b3626c38fbf251afe61ceefb16e925abc81eba5fab7d4e498484d83f81a0314a6267ab0757b1343f9630ed SHA512 6314fd268f98d28fce833aa8c3cba5be60ad8d50372a810cfbf3f29bf04903569ca82016b2ff8e7bd063a123c90b09442287afce1fac20c036f94f73562f54a6
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild b/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
deleted file mode 100644
index 8270e50c21ee..000000000000
--- a/games-fps/etqw-bin/etqw-bin-1.5-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Enemy Territory: Quake Wars"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI="ftp://ftp.i3d.net/Games/Enemy%20Territory%20Quake%20Wars/Patches/ETQW-client-${PV}-full.x86.run"
-
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall"
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=virtual/jpeg-62:62[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	cdinstall? ( games-fps/etqw-data )"
-
-S=${WORKDIR}/data
-dir=${GAMES_PREFIX_OPT}/etqw
-
-QA_PREBUILT="${dir:1}/*.x86
-	${dir:1}/*.so*"
-
-src_unpack() {
-	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip
-	unpack ./${A}.zip
-	rm -f ${A}.zip
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r base pb *.png
-	dodoc *.txt
-
-	exeinto "${dir}"
-	doexe etqw{,ded,-rthread}.x86 openurl.sh libCgx86.so libSDL*.id.so*
-
-	newicon etqw_icon.png etqw.png
-	games_make_wrapper etqw ./etqw.x86 "${dir}" "${dir}"
-	make_desktop_entry etqw "Enemy Territory: Quake Wars" etqw
-
-	games_make_wrapper etqw-dedicated ./etqwded.x86 "${dir}" "${dir}"
-	make_desktop_entry etqw-dedicated "Enemy Territory: Quake Wars (dedicated server)" etqw
-
-	games_make_wrapper etqw-rthread ./etqw-rthread.x86 "${dir}" "${dir}"
-	make_desktop_entry etqw-rthread "Enemy Territory: Quake Wars (SMP)" etqw
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall ; then
-		elog "You need to copy pak00*.pk4, zpak_*.pk4 and the megatextures"
-		elog "directory to ${dir}/base before running the game."
-	fi
-	elog "To change the game language from English, add"
-	elog "seta sys_lang \"your_language\" to your autoexec.cfg file."
-	elog "Menu fonts may not show up until you do so."
-}
diff --git a/games-fps/etqw-bin/metadata.xml b/games-fps/etqw-bin/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-fps/etqw-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-fps/etqw-data-1.0 b/games-fps/etqw-data-1.0
new file mode 100644
index 000000000000..c7ede5c48f24
--- /dev/null
+++ b/games-fps/etqw-data-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst preinst setup unpack
+DESCRIPTION=Enemy Territory: Quake Wars data files
+EAPI=0
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
+IUSE=videos
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ETQW
+PROPERTIES=interactive
+RDEPEND=games-misc/games-envd
+SLOT=0
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=df962036de84be4a124baff7bf2e4e86
diff --git a/games-fps/etqw-data/Manifest b/games-fps/etqw-data/Manifest
deleted file mode 100644
index 7c6214fe2f0c..000000000000
--- a/games-fps/etqw-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD etqw-data-1.0.ebuild 1301 BLAKE2B d8d4e6fb5ccb3df9e3f336c16a87cceba197236e8bc91b3fdfffc4c184a553cb2b95be9801af42b6d0248816279efaf3aba51f2efce0d1d392c9ba6a690848ff SHA512 f17c60fc3705f86d052082d1806e7a3f1e9450469bbbe4c4b4d72e7f4fb357361cfa46cd596be6cca54bcc4e618b4aa09e35c9509f981b65d11362ca00687147
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/etqw-data/etqw-data-1.0.ebuild b/games-fps/etqw-data/etqw-data-1.0.ebuild
deleted file mode 100644
index 048efa9cd245..000000000000
--- a/games-fps/etqw-data/etqw-data-1.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils cdrom games
-
-DESCRIPTION="Enemy Territory: Quake Wars data files"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI=""
-
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="videos"
-
-S=${WORKDIR}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/etqw
-
-	cdrom_get_cds Setup/Data/base/DEU:Setup/Data/base/POL:Setup/Data/base
-
-	cd "${CDROM_ROOT}"/Setup/Data/base
-	insinto "${dir}"/base
-	doins pak00{0..4}.pk4 || die "doins pak failed"
-	doins -r megatextures || die "doins megatextures failed"
-
-	case ${CDROM_SET} in
-		0)
-			doins \
-				zpak_english000.pk4 \
-				DEU/zpak_german000.pk4 \
-				ESP/zpak_spanish000.pk4 \
-				FRA/zpak_french000.pk4 \
-				|| die "doins zpak failed"
-			;;
-		1)
-			doins \
-				POL/zpak_polish000.pk4 \
-				RUS/zpak_russian000.pk4 \
-				|| die "doins zpak failed"
-			;;
-		2)
-			doins zpak_english000.pk4 || die "doins zpak failed"
-			;;
-	esac
-
-	if use videos ; then
-		case ${CDROM_SET} in
-			0|2)
-				doins -r video || die "doins video failed"
-				;;
-		esac
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is just the data portion of the game. You will need to install"
-	elog "games-fps/etqw-bin to play it."
-}
diff --git a/games-fps/etqw-data/metadata.xml b/games-fps/etqw-data/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-fps/etqw-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-fps/etqw-demo-2.0_p1-r1 b/games-fps/etqw-demo-2.0_p1-r1
new file mode 100644
index 000000000000..abbddc888d18
--- /dev/null
+++ b/games-fps/etqw-demo-2.0_p1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory: Quake Wars demo
+EAPI=5
+HOMEPAGE=http://zerowing.idsoftware.com/linux/etqw/
+KEYWORDS=~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)] >=virtual/jpeg-62:62[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://idsoftware/etqw/ETQW-demo2-client-full.r1.x86.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_=32b3bfa88d8d86bf8bed408168861f9b
diff --git a/games-fps/etqw-demo/Manifest b/games-fps/etqw-demo/Manifest
deleted file mode 100644
index 27fa7eec7fdc..000000000000
--- a/games-fps/etqw-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ETQW-demo2-client-full.r1.x86.run 691248874 BLAKE2B 42692da7b2f7f35730dea9557c26bb189ac555eccdaf2873d3b5e91bff640b1cd121022aa671c990f92164a97874e9f46f47c76ad01f2ff2973ad3edea6898db SHA512 41332208626449da74bea71a9926258f50986f0af85045d470d4405d27e497085ba318337181802be58eb50c724ab91df6b9c810e5fcc5f8dc131486d6529f38
-EBUILD etqw-demo-2.0_p1-r1.ebuild 1571 BLAKE2B 543abe8bd0d12d46745eb178d4741788e45f759cf736b31e5bab290bcbfe6028a71a4e2414c9b24d30517bcbb1e7529f58d90f9d8a2742fe40c95e820a632ac3 SHA512 5491d3b22dcbc7c3d623863e61f5db062a8998f888a4554a02ebae745cd7cbb19c9edd3967c9387459825dd12e1eacf752ab43554d4affe39412b54837ac2824
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild b/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
deleted file mode 100644
index 8915a443830f..000000000000
--- a/games-fps/etqw-demo/etqw-demo-2.0_p1-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker eutils versionator games
-
-MY_MAJOR=$(get_major_version)
-MY_REV=$(get_version_component_range 3)
-MY_BODY="ETQW-demo${MY_MAJOR}-client-full.r${MY_REV/p/}.x86"
-
-DESCRIPTION="Enemy Territory: Quake Wars demo"
-HOMEPAGE="http://zerowing.idsoftware.com/linux/etqw/"
-SRC_URI="mirror://idsoftware/etqw/${MY_BODY}.run"
-
-# See copyrights.txt
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip mirror"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)]
-	>=virtual/jpeg-62:62[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[video,sound,opengl,abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_PREBUILT="${dir:1}/guis/libmojosetupgui_ncurses.so
-	${dir:1}/data/*
-	${dir:1}/data/pb/*.so"
-
-src_unpack() {
-	# exit status of 1 should just be warnings, not corrupt archive
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r guis scripts
-
-	cd data
-	insinto "${dir}"/data
-	doins -r base pb etqw_icon.png
-	dodoc README.txt EULA.txt copyrights.txt etqwtv.txt
-
-	exeinto "${dir}"/data
-	doexe etqw *\.x86 etqw-* libCgx86* libSDL* *.sh
-
-	games_make_wrapper ${PN} ./etqw.x86 "${dir}"/data "${dir}"/data
-	# Matches with desktop entry for enemy-territory-truecombat
-	make_desktop_entry ${PN} "Enemy Territory - Quake Wars (Demo)"
-
-	games_make_wrapper ${PN}-ded ./etqwded.x86 "${dir}"/data "${dir}"/data
-
-	prepgamesdirs
-}
diff --git a/games-fps/etqw-demo/metadata.xml b/games-fps/etqw-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/etqw-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ezquake-bin-2.2 b/games-fps/ezquake-bin-2.2
new file mode 100644
index 000000000000..1c9b1ad08138
--- /dev/null
+++ b/games-fps/ezquake-bin-2.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=cdinstall? ( games-fps/quake1-data )
+DESCRIPTION=Quakeworld client with mqwcl functionality and many more features
+EAPI=5
+HOMEPAGE=http://ezquake.sf.net/
+IUSE=cdinstall
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=cdinstall? ( games-fps/quake1-data ) virtual/opengl x11-libs/libXxf86dga x11-libs/libXxf86vm games-misc/games-envd
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=amd64? ( mirror://sourceforge/ezquake/ezquake_linux-x86_64.1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux64_2.2.tar.gz ) x86? ( mirror://sourceforge/ezquake/ezquake_linux-x86_1.9.3.tar.gz mirror://sourceforge/ezquake/ezquake_linux32_2.2.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_=d80fd4804e5779995cc4eb782e61adda
diff --git a/games-fps/ezquake-bin/Manifest b/games-fps/ezquake-bin/Manifest
deleted file mode 100644
index 87e86e0d944c..000000000000
--- a/games-fps/ezquake-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ezquake_linux-x86_1.9.3.tar.gz 19230315 BLAKE2B df2128f8aa05a1e4d970b52d193539a93ac2d849720859d97a223a5dc313ff7142bfbc0dd2ac405eede96e247d032483c392c9d1fe0d20e107fbd4be79210fd7 SHA512 c362b0103fa4beb578fec5653b4b9196d0202a00c662e3e001615c07041968daa7bd8edf194e310ac8501d01768b2bda79e250830733fb4dd56cb1517844d79f
-DIST ezquake_linux-x86_64.1.9.3.tar.gz 18624824 BLAKE2B 619d2ef3c03a9d105000c75c0c2d21398d4080810b7cab6d6a143ac0a4513420f0756c01d932f7332cbd87dfba335d6b82b1ee122fb94c2fcf4331e7beab7689 SHA512 4c2f5060bbf08ca3b9583d4c3502e69bf6d503efd0e14df9d5fe54e1e8ac1c5ca0b920c3748e4a8e1f86c60d6e5809977352636d4758fd9cb3934cea03b1138f
-DIST ezquake_linux32_2.2.tar.gz 1685934 BLAKE2B f4e1374992ac548c45ca59161c0e86214f50db17502f6bc89d56ec4e9c596478399ff02c86a539e3590f0ad82d90dd7b2f02df25089573068b4e24e1085d0898 SHA512 2a42b43a0b4ad75c22c58bb53f8161eec1460cac3b841ccf2593e0cb803c4ef5cee23f939f859eb6d95409a01c4ccc3eabae108eac6c1cb850f9c5c3445bf5ab
-DIST ezquake_linux64_2.2.tar.gz 1804397 BLAKE2B 9ad294fda829a9dd68201a7c5deb9e3a708f4ac81caa97745e965bcececfc0c1aa787b53ad5465238452bee4ded256214eb234658e8bc17795ef519faaa67057 SHA512 c1f1772971980a7b349da6c6eea5643591d5bc81a939b28e50651c5773d8372277fb6bc9a5681c59e8273ca6250fa712c3b76db488bf521dd3675aabd5e1af8e
-EBUILD ezquake-bin-2.2.ebuild 1947 BLAKE2B 320e929a05931406741c86197f2942edd1f5ced3e39624d3cc548cceff87213987b444d2941ff9c89e5719953a21aa0780dbe3c812b80e2f9b7d158986df95ff SHA512 00f22b5412d339d18b4d533cf976ae604649473ccf98217425977959f323980d06e2c9fa534c2e4bb0c94e0a124a8f2110316d7668bfeb5797c9edc261e9252f
-MISC metadata.xml 340 BLAKE2B 0e535869685c648fd759901404ee04e736d85783bd09f34756917ce5bfb1239048accdf32fd59ae3a11828da8dbc6ca1b337f28259013b864b9e02e687758cac SHA512 4922600550155470211bb2fe2eab50f02e120d82261d2956f7f73604ec5e76c71e37be5d9a542d9f963eaa0927da7bcb9b464428a7b778d17a383135e423063e
diff --git a/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild b/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild
deleted file mode 100644
index 5e6fe5800999..000000000000
--- a/games-fps/ezquake-bin/ezquake-bin-2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_FULL_PV=1.9.3
-MY_PN="${PN/-bin/}"
-DESCRIPTION="Quakeworld client with mqwcl functionality and many more features"
-HOMEPAGE="http://ezquake.sf.net/"
-SRC_URI="
-	amd64? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_64.${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux64_${PV}.tar.gz )
-	x86? ( mirror://sourceforge/${MY_PN}/${MY_PN}_linux-x86_${MY_FULL_PV}.tar.gz
-		mirror://sourceforge/${MY_PN}/${MY_PN}_linux32_${PV}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip mirror"
-IUSE="cdinstall"
-
-DEPEND="cdinstall? ( games-fps/quake1-data )"
-RDEPEND="${DEPEND}
-		virtual/opengl
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm"
-
-S=${WORKDIR}/${MY_PN}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-QA_PREBUILT="${dir:1}/ezquake*"
-
-src_unpack() {
-	unpack ${A}
-	if use amd64; then
-		mv ${MY_PN}_linux-x86_64.${MY_FULL_PV} "${MY_PN}"
-		mv ezquake-gl_linux-x64.glx "${MY_PN}"/ezquake-gl.glx
-	else
-		mv ${MY_PN}_linux-x86.${MY_FULL_PV} "${MY_PN}"
-		mv ezquake-gl_linux-x86.glx "${MY_PN}"/ezquake-gl.glx
-	fi
-}
-
-src_install() {
-	exeinto "${dir}"
-	insinto "${dir}"
-
-	doexe ezquake-gl.glx
-	doins -r ezquake qw
-	dosym "${GAMES_DATADIR}"/quake1/id1 "${dir}"/id1
-	games_make_wrapper ezquake-gl.glx ./ezquake-gl.glx "${dir}" "${dir}"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall; then
-		elog "NOTE that this client doesn't include .pak files. You *should*"
-		elog "enable \"cdinstall\" flag or install quake1-demodata with the symlink use flag."
-		elog "You can also copy the files from your Quake1 CD to"
-		elog "  ${dir}/quake1/id1 (all names lowercase)"
-		elog ""
-		elog "You may also want to check:"
-		elog " http://fuhquake.quakeworld.nu - complete howto on commands and variables"
-		elog " http://equake.quakeworld.nu - free package containing various files"
-	fi
-}
diff --git a/games-fps/ezquake-bin/metadata.xml b/games-fps/ezquake-bin/metadata.xml
deleted file mode 100644
index 8789378885ba..000000000000
--- a/games-fps/ezquake-bin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">ezquake</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-fps/freedoom-0.10.1-r1 b/games-fps/freedoom-0.10.1-r1
new file mode 100644
index 000000000000..544a1ca4e75a
--- /dev/null
+++ b/games-fps/freedoom-0.10.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Freedoom - Open Source Doom resources
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/freedoom/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedoom-0.10.1.zip https://github.com/freedoom/freedoom/releases/download/v0.10.1/freedm-0.10.1.zip
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=8692ada031f3b3a1ef2e1c005621b824
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
deleted file mode 100644
index 78ede7d22c24..000000000000
--- a/games-fps/freedoom/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST freedm-0.10.1.zip 7230096 BLAKE2B 2b553e6f263acbd6c63ddb123d1bf9fe80ce1d7a3a6b7e1b7ec64446acb520c147336da5431c5c93f0843ecfa039645cc21a4a62b39268b34f99306e1eae4f14 SHA512 cc3b393e20b503e83ca2bf90ac528d42c951881b58d22970b154fd262e69f7bae038f7300d74e467af6e31e626a12d4a9fb5bf5ff3e9da84506df41be18577f2
-DIST freedoom-0.10.1.zip 18496121 BLAKE2B b9fe88e086fb35b29d9562c5ac1335bd7eeb18ea7900c44d4ca7707bc52f03b73ec1190c578f57548320c70c0f73415a268d737cc545310fecb66ba47d242107 SHA512 a98d400267801dfdf67aa035def6d62fffff1c3a2d1aebd482929274e1f86e05e79c9cbe528a80d5c87df7306364ca74a3b03674273a0079bad724e7b23e38eb
-EBUILD freedoom-0.10.1-r1.ebuild 1107 BLAKE2B 20f9de2e03a87686acd9fd69bd3400332f7bcdce6dfbb31e498dbdb52503b6fc626c26c77f261338f1685cabc5b9c0bf34582c8fc212f756e139f711c1e0120a SHA512 c4d2d314dd2c298e86de7e9616fa77901d321075404269a0e1b48a44f019a0f0559661c16c3e19b53cb2783c2a3a9e240bdce5d387647784740c8324fba7dd68
-MISC metadata.xml 345 BLAKE2B 856529c69e0cede9d5ddfc4476945783de0ba760f0c1719d1f58a012da24a6739757af14561a04e9393c49cdd7e2cf69fb3a2a690140adbe3e0635953175c46b SHA512 d830ba46200839ec37d298883c566cc63eafbc45ad6683ef028d4168e0bd4aa245fb13d4c5e84eb5113ee37db85d018f8ef7222da00682524157ff5d29a6da6b
diff --git a/games-fps/freedoom/freedoom-0.10.1-r1.ebuild b/games-fps/freedoom/freedoom-0.10.1-r1.ebuild
deleted file mode 100644
index 357def0066df..000000000000
--- a/games-fps/freedoom/freedoom-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1
-
-DESCRIPTION="Freedoom - Open Source Doom resources"
-HOMEPAGE="http://www.nongnu.org/freedoom/"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip
-	https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-A Doom engine is required to play the wad
-but games-fps/doomsday doesn't count since it doesn't
-have the necessary features.
-To play freedoom with Doom engines which do not support
-subdirectories, create symlinks by running the following:
-(Be careful of overwriting existing wads.)
-
-# cd /usr/share/doom-data
-# ln -sn freedoom/*.wad .
-"
-
-src_install() {
-	insinto /usr/share/doom-data/${PN}
-	doins */*.wad
-	dodoc "${P}"/CREDITS
-	HTMLDOCS="${P}/README.html" einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-fps/freedoom/metadata.xml b/games-fps/freedoom/metadata.xml
deleted file mode 100644
index 700dad658c01..000000000000
--- a/games-fps/freedoom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">freedoom/freedoom</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-fps/glxquake-bin-0-r2 b/games-fps/glxquake-bin-0-r2
new file mode 100644
index 000000000000..b6d11ccde999
--- /dev/null
+++ b/games-fps/glxquake-bin-0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=A binary that works with any 3D-graphics-card that supports the glx X-extension
+EAPI=5
+HOMEPAGE=http://mfcn.ilo.de/glxquake/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libXxf86dga[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.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_=42875a9f9b5043a8ef7456eded0670f6
diff --git a/games-fps/glxquake-bin/Manifest b/games-fps/glxquake-bin/Manifest
deleted file mode 100644
index 2bfbc4adc7e7..000000000000
--- a/games-fps/glxquake-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST glxquake.tar.gz 164094 BLAKE2B 4f9fa9c1e65dc8f1b3721dd068b9920c622a042875d4cb43a15b6d514bfd5e827f776b142a2087ef62e0adbd539c11a53d2b1f3769545b730531ddbbaaa348fb SHA512 0adb92dbdc8b3130bef7e46ad95a7efa6ddb3723e3e8891cacc3c2e46bccacb6235f688e12b8a1f35099615b6683b1409b2e380fd4278e0827897b2e0c8f3090
-EBUILD glxquake-bin-0-r2.ebuild 1154 BLAKE2B 42b2b9b445e61a06a6ed029876952f38bde7db67e1240e596a9e3719891ebe6a8493318de2e2a8d41159f6d684916e20f81399d10e526626ca7a6762c3869d55 SHA512 fcd428a392de67eadf279d2a2f5de1b81152d5c0a0c10e8eb8c58432a5ba97f8d7439cb44d0d15ef4752a5e7307f4690ec8fc25d34fee3bc0c2af8543102d382
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild b/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
deleted file mode 100644
index 14f81de25338..000000000000
--- a/games-fps/glxquake-bin/glxquake-bin-0-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="A binary that works with any 3D-graphics-card that supports the glx X-extension"
-HOMEPAGE="http://mfcn.ilo.de/glxquake/"
-SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/glxquake/glxquake.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	x11-libs/libXxf86dga[abi_x86_32(-)]"
-
-S=${WORKDIR}/glxquake
-
-QA_PREBUILT="${GAMES_BINDIR:1}/glquake"
-
-src_install() {
-	dogamesbin glquake
-	dodoc README
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play with it, create a subdirectory called id1"
-	elog "Copy the pak0.pak, and eventually pak1.pak into this subdirectory"
-	elog "You can eventually get pak0.pak emerging games-fps/quake1-demodata"
-	elog "The file pak0.pak will be on the ${GAMES_DATADIR}/quake1/demo/"
-	elog "You can now run glxquake by executing glquake"
-}
diff --git a/games-fps/glxquake-bin/metadata.xml b/games-fps/glxquake-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/glxquake-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/industri-1.01 b/games-fps/industri-1.01
new file mode 100644
index 000000000000..aafab85cfb47
--- /dev/null
+++ b/games-fps/industri-1.01
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl x11-libs/libXxf86dga x11-libs/libXext x11-libs/libX11 x11-libs/libXxf86vm media-libs/libpng:0 cdinstall? ( games-fps/quake1-data ) x11-base/xorg-proto app-arch/unzip
+DESCRIPTION=Quake/Tenebrae based, single player game
+EAPI=5
+HOMEPAGE=http://industri.sourceforge.net/
+IUSE=cdinstall
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl x11-libs/libXxf86dga x11-libs/libXext x11-libs/libX11 x11-libs/libXxf86vm media-libs/libpng:0 cdinstall? ( games-fps/quake1-data ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/industri/industri_BIN-1.01-src.tar.gz mirror://sourceforge/industri/industri-1.00.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_=80d16facd1918497fae106085eaea34b
diff --git a/games-fps/industri/Manifest b/games-fps/industri/Manifest
deleted file mode 100644
index 641cc08c2f07..000000000000
--- a/games-fps/industri/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX industri-1.01-exec-stack.patch 642 BLAKE2B cc7ab05c14499a2075605bb2a3b818eed7b219e92b49d90ad777d74481387ac20cae3e85611e9150644ffdb99014c25aceb2c678889332ec4d97b1801f27824e SHA512 c23b38be46b3b692f7b04415b2893c9884d76e627910f9e93579c286e2142fd36bff0c335beffd541226920ce22dfbdb6ffc51537b42afe6d660466905c7be3e
-AUX industri-1.01-glext.patch 983 BLAKE2B 370d7c55d61e38716e84d0af84772b186312a46e12d3bcabf74e2a3d43708798ad7ffda2f1881e8355246ea67b0b7a5f4caddcfa3b5f670dca181e11d95b5e51 SHA512 0d17e3c54fdce139a25b9c51892cf7d9c9b04b0fe2d4f543cabdce141cfe321892dbc630f40ba3e75ffb1612f6c1df5d4108f95d3a06bce3b7f49601cbb2282a
-AUX industri-1.01-ldflags.patch 840 BLAKE2B a4187070a6205de7187cb606baf9e7ae7ab5332d6e4c53c24cc3329fbc29fdd4e10bcf3f340dca9f2df5abfa594b10e902a7625940a411df4cbbb102479dddce SHA512 fc45f5edb2dfabf8815186c66cf071f119cb0c83cd785fa3be083bbcb1be11c1c898f73f7b1b3d3af83c95daddbc0fe226cfaa0ed9c0b9776d718a10562b496e
-AUX industri.pretty 42 BLAKE2B 2a53501c32d6b88a2d56c3560a6f55b4fe62c53a5aa659854b0c2dc2e440bc36572dee3e11bde73bcda30c03e0532d3977e7a17810bd721571a13a74ce0d63e1 SHA512 4cd0732b3a9cc3a48a759b68b03c249c854ce90234984ca770f8e3fc61e7bd01651012d64320d9114eb4567ccab254b183af15bdce51dee25a71c35613013df1
-DIST industri-1.00.zip 30339989 BLAKE2B e673bef0e5b79a9081ffe48c9e106de8f3900c3e57d8a9af3f48942a2257305e58b74a41c0338f5349c0414847415547c5bb86c8f4c42a8f41adb7b8621215e0 SHA512 e0eea9d881819fbcc039d91ed613bb4603e76302c892ed315bf1535b023173b742f4b881dc345f9eaca255a5531e3afc5584c2da948a9c6127c9a815a6bfcae9
-DIST industri_BIN-1.01-src.tar.gz 1086838 BLAKE2B 82a88fc640834c8c56deb9a30ea36cfaf7a631b4d1773a4bde588b64b56ab1471f54975fc5a250546685201829a790fd334f973826372dfb32f1abc0a2c3a761 SHA512 023dfcc72faa685a042afcf66b21e040b21c881f3d936af9e4da3e7836320a262c014296ab6fa564d93038c34a106f70f7cc8dd760c6b79e11689df92bff3625
-EBUILD industri-1.01.ebuild 1837 BLAKE2B 28e1565e2214fe15a5b1cdcd480e7950c8454ab7cc2c60312a73c6f6a09456fce8874f61a88c3367175671166d6e2f45777e5aec23b3c7a753e4971f9660d707 SHA512 092ed982e86942cb9d81aef4f26d530b4385fcb0a70b2442a918f3ffb6aa40f561c7097d4c5e193ffccb2b6bc85b132ea7de4861d94b9db226b256956e000f6d
-MISC metadata.xml 753 BLAKE2B 58d04346b2529f24ebb8558c2ae7c15b0677f2c22951a0ecfb5367e706632b92a5c2e8196a2d010409214aa0da24b655c5a9b0055ff0cc144b8210ff4c257248 SHA512 fe652528480dd111ae034805ffe48a75682fef68562e8ad55218f0b41b3ab05fd99d1b33b0959a09ed3fad97fe66d8171efd8e79f5472956aa42ac3263e6f9b0
diff --git a/games-fps/industri/files/industri-1.01-exec-stack.patch b/games-fps/industri/files/industri-1.01-exec-stack.patch
deleted file mode 100644
index bc74e951fe6a..000000000000
--- a/games-fps/industri/files/industri-1.01-exec-stack.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- math.s
-+++ math.s
-@@ -416,3 +416,6 @@
- 	call	C(BOPS_Error)
- 
- #endif	// id386
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- snd_mixa.s
-+++ snd_mixa.s
-@@ -216,3 +216,6 @@
- 
- #endif	// id386
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- sys_dosa.s
-+++ sys_dosa.s
-@@ -93,3 +93,6 @@
- 
- 	ret
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- worlda.s
-+++ worlda.s
-@@ -142,3 +142,6 @@
- 
- #endif	// id386
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-fps/industri/files/industri-1.01-glext.patch b/games-fps/industri/files/industri-1.01-glext.patch
deleted file mode 100644
index 8a5042e431f2..000000000000
--- a/games-fps/industri/files/industri-1.01-glext.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- glquake.h.old	2011-04-29 12:36:53.000000000 +0200
-+++ glquake.h	2011-04-29 12:44:39.000000000 +0200
-@@ -977,6 +977,7 @@
- #define GL_MAP2_VERTEX_ATTRIB15_4_NV      0x867F
- 
- /* NV_vertex_program */
-+#ifndef GL_NV_vertex_program
- typedef GLboolean (APIENTRY * PFNGLAREPROGRAMSRESIDENTNVPROC) (GLsizei n, const GLuint *programs, GLboolean *residences);
- typedef void (APIENTRY * PFNGLBINDPROGRAMNVPROC) (GLenum target, GLuint id);
- typedef void (APIENTRY * PFNGLDELETEPROGRAMSNVPROC) (GLsizei n, const GLuint *programs);
-@@ -1040,6 +1041,7 @@
- typedef void (APIENTRY * PFNGLVERTEXATTRIBS4FVNVPROC) (GLuint index, GLsizei count, const GLfloat *v);
- typedef void (APIENTRY * PFNGLVERTEXATTRIBS4SVNVPROC) (GLuint index, GLsizei count, const GLshort *v);
- typedef void (APIENTRY * PFNGLVERTEXATTRIBS4UBVNVPROC) (GLuint index, GLsizei count, const GLubyte *v);
-+#endif
- 
- extern PFNGLAREPROGRAMSRESIDENTNVPROC qglAreProgramsResidentNV ;
- extern PFNGLBINDPROGRAMNVPROC qglBindProgramNV ;
diff --git a/games-fps/industri/files/industri-1.01-ldflags.patch b/games-fps/industri/files/industri-1.01-ldflags.patch
deleted file mode 100644
index 987d464f6b48..000000000000
--- a/games-fps/industri/files/industri-1.01-ldflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- linux/Makefile.old	2010-10-13 11:37:27.000000000 +0200
-+++ linux/Makefile	2010-10-13 11:38:20.000000000 +0200
-@@ -42,7 +42,7 @@
- RELEASE_CFLAGS = $(BASE_CFLAGS) -O2 -march=pentium4 -pipe -msse -mfpmath=sse \
- 	-fomit-frame-pointer -fexpensive-optimizations
- DEBUG_CFLAGS  = $(BASE_CFLAGS) -g 
--LDFLAGS       = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) 
-+LDLIBS        = -lm -ldl $(X11_LIBS) $(OPENGL_LIBS) $(PNG_LIBS) $(OPENAL_LIBS) 
- 
- DO_GL_CC      = $(CC) $(CFLAGS) -o $@ -c $<
- DO_GL_AS      = $(CC) $(CFLAGS) -DELF -x assembler-with-cpp -o $@ -c $<
-@@ -156,7 +156,7 @@
- 
- 
- $(BUILDDIR)/bin/industri.run : $(GLQUAKE_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(GLQUAKE_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/glquake/cl_demo.o :      $(MOUNT_DIR)/cl_demo.c
- 	$(DO_GL_CC)
diff --git a/games-fps/industri/files/industri.pretty b/games-fps/industri/files/industri.pretty
deleted file mode 100644
index b328c803b9df..000000000000
--- a/games-fps/industri/files/industri.pretty
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec industri +sh_glares 1 "$@"
diff --git a/games-fps/industri/industri-1.01.ebuild b/games-fps/industri/industri-1.01.ebuild
deleted file mode 100644
index 70c8dba417f3..000000000000
--- a/games-fps/industri/industri-1.01.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="Quake/Tenebrae based, single player game"
-HOMEPAGE="http://industri.sourceforge.net/"
-SRC_URI="mirror://sourceforge/industri/industri_BIN-${PV}-src.tar.gz
-	mirror://sourceforge/industri/industri-1.00.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="cdinstall"
-
-RDEPEND="virtual/opengl
-	x11-libs/libXxf86dga
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	media-libs/libpng:0
-	cdinstall? ( games-fps/quake1-data )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	app-arch/unzip"
-
-S=${WORKDIR}/industri_BIN
-
-src_prepare() {
-	mv linux/Makefile{.i386linux,}
-	sed -i -e "s:-mpentiumpro.*:${CFLAGS} \\\\:" linux/Makefile || die
-
-	# Remove duplicated typedefs #71841
-	for typ in PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC PFNGLVERTEXARRAYRANGEAPPLEPROC ; do
-		if echo '#include <GL/gl.h>' | $(tc-getCC) -E - 2>/dev/null | grep -sq ${typ} ; then
-			sed -i \
-				-e "/^typedef.*${typ}/d" \
-				glquake.h || die
-		fi
-	done
-
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
-		gl_warp.c || die
-
-	epatch "${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-glext.patch
-}
-
-src_compile() {
-	emake \
-		-C linux \
-		MASTER_DIR="${GAMES_DATADIR}"/quake1 \
-		build_release
-}
-
-src_install() {
-	newgamesbin linux/release*/bin/industri.run industri
-	dogamesbin "${FILESDIR}"/industri.pretty
-	insinto /usr/share/icons
-	doins industri.ico quake.ico
-	dodoc linux/README
-	cd "${WORKDIR}"/${PN}
-	dodoc *.txt
-	insinto "${GAMES_DATADIR}"/quake1/${PN}
-	doins *.pak *.cfg
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use cdinstall ; then
-		elog "You need to copy pak0.pak to ${GAMES_DATADIR}/quake1 to play."
-	fi
-}
diff --git a/games-fps/industri/metadata.xml b/games-fps/industri/metadata.xml
deleted file mode 100644
index 4ed41644ffca..000000000000
--- a/games-fps/industri/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-industri is a Quake based, single player game using a modified version of the 
-Tenebrae 1.x engine. The Tenebrae engine is an Open Source (GNU GPL) modification 
-of Quake that brings per-pixel lighting, stencil shadows, hi-res textures, 
-bumpmap and normalmaps to the gaming experince.
-
-The focus of industri is a rich single-player game and engine. There is no 
-multi-player at all.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">industri</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/legends-0.4.1.43-r2 b/games-fps/legends-0.4.1.43-r2
new file mode 100644
index 000000000000..d834438c382a
--- /dev/null
+++ b/games-fps/legends-0.4.1.43-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=Fast-paced first-person-shooter online multiplayer game, similar to Tribes
+EAPI=6
+HOMEPAGE=http://legendsthegame.net/
+IUSE=+dedicated
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Legends LGPL-2.1+
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) media-fonts/font-adobe-75dpi media-libs/libsdl[video,sound,opengl,abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] media-libs/libogg[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://legendsthegame.net/files/legends_linux-0.4.1.43.run mirror://gentoo/legends.png
+_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_=cd5481e39a51bd057b18ba8b2d615422
diff --git a/games-fps/legends/Manifest b/games-fps/legends/Manifest
deleted file mode 100644
index 73c8d619d299..000000000000
--- a/games-fps/legends/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST legends.png 5092 BLAKE2B 74715a28e6c25e3ce9a3357be23b07a998181e12e7a19d721b094c10b7f1312b273307ad1ac2830c0d71a710434be679149e0d758ee5a785cebc6b71d91f965f SHA512 7b9f336335dc69e2fbc24286b2076a228739ab4abf1b77d977321d9dccfb453897bdbd51388e3ed54369ba39b7faa92e458700928d8bf5ccc0f3639f8737489a
-DIST legends_linux-0.4.1.43.run 123964866 BLAKE2B d16da9613a13c4d78d207fc474b859e222d6c387a676bc2fe851f34fed7e689a5457a022674e2e96abd7cfc8e9e68977078811147ffe44388986796a2157cd69 SHA512 17b1caa3aa6124f2389e2220ced82c41c4523897bde2f8211d219dc9ef8620583c4ae68999b0761155e3d45cb1ad9679cd65ba50c8440dd1848ef3b1a7a590d2
-EBUILD legends-0.4.1.43-r2.ebuild 1856 BLAKE2B 17a7e175a6d5ec4f9914b7436c909ee1e20eadcbf711b7030385d2c45162eb7414a453aeaa18aa2269d96c1512c198dd15106a0c942fb61bc9ef5611a2f5465e SHA512 f0c2de1529d004821b6b308553b1845908ce04e6ae85c2da00f788b935e91cde46bceeb22585064f3a1bd7c7238082f2eb9bb7a14d6324694774c175c6df28e6
-MISC metadata.xml 1427 BLAKE2B c9e4086f3639e290c414a48d30a56a56c9f541f2e4ad082a19f6361c55f2f57e862ab571e27d63bdb04702c64c2bc53404d345a8f1328902d03aaac2b4f3d150 SHA512 987ace71750e486c141c1010d1699194c656fda09a4952b51b31ad8f526de8f77372e57632d1636034e6de080871a4fc3140b1e2a49e98b3758d907a0eb3bba3
diff --git a/games-fps/legends/legends-0.4.1.43-r2.ebuild b/games-fps/legends/legends-0.4.1.43-r2.ebuild
deleted file mode 100644
index 0412178e3f4b..000000000000
--- a/games-fps/legends/legends-0.4.1.43-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-MY_P=${PN}_linux-${PV}
-dir=/opt/${PN}
-
-DESCRIPTION="Fast-paced first-person-shooter online multiplayer game, similar to Tribes"
-HOMEPAGE="http://legendsthegame.net/"
-SRC_URI="http://legendsthegame.net/files/${MY_P}.run
-	mirror://gentoo/${PN}.png"
-
-LICENSE="Legends LGPL-2.1+"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+dedicated"
-RESTRICT="strip"
-
-QA_TEXTRELS="${dir:1}/libSDL-1.3.so.0"
-QA_FLAGS_IGNORED="${dir:1}/libSDL-1.3.so.0 ${dir:1}/LinLegends ${dir:1}/lindedicated"
-
-DEPEND=""
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	media-fonts/font-adobe-75dpi
-	media-libs/libsdl[video,sound,opengl,abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	media-libs/libogg[abi_x86_32(-)]
-	media-libs/libvorbis[abi_x86_32(-)]
-	media-libs/openal[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself ${MY_P}.run
-	cd "${S}"
-
-	# keep libSDL-1.3.so because legends requires it as of 0.4.0, and
-	# 1.2.6 is highest in portage
-	# rm libSDL-*.so*
-	rm runlegends libSDL-1.2.so.0 libopenal.so libogg.so.0 libvorbis.so.0 *.DLL || die
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r * || die "doins * failed"
-
-	rm "${D}/${dir}/"/{lindedicated,LinLegends,*.so.0}
-	exeinto "${dir}"
-	doexe lindedicated LinLegends *.so.0 || die "doexe failed"
-
-	make_wrapper ${PN} "./LinLegends" "${dir}" "${dir}"
-	if use dedicated ; then
-		make_wrapper ${PN}-ded "./lindedicated" "${dir}" "${dir}"
-	fi
-
-	doicon "${DISTDIR}"/${PN}.png || die "doicon failed"
-	make_desktop_entry legends "Legends"
-}
-
-pkg_postinst() {
-	ewarn "Version ${PV} of ${PN} may give problems if there are"
-	ewarn "config-files from earlier versions.  Removing the ~/.legends dir"
-	ewarn "and restarting will solve this."
-	echo
-}
diff --git a/games-fps/legends/metadata.xml b/games-fps/legends/metadata.xml
deleted file mode 100644
index f1ba53514225..000000000000
--- a/games-fps/legends/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Legends is a fast-paced first-person-perspective online multiplayer 
-game. The game is designed to take advantage of the beautiful 
-environments available from the Torque engine it is based on while still 
-offering the breakneck pacing and variety of styles available from such 
-classics as Quake and Tribes.
-
-Gameplay is not the strafe-strafe-jump-strafe-shoot-strafe-run-like-hell 
-style a lot of games espouse; the addition of a jetpack adds a third 
-dimension of mobility that makes skill, forethought, and restraint 
-necessities to winning.
-
-Team sizes are going to be ideal between 10 and 15 on each side, and the 
-network code will allow anyone with any bandwidth to play relatively 
-smoothly. Game type offerings will range from the classic Capture the 
-Flag to our own new type, affectionately called "Knockout".
-
-Plenty of maps will be provided by us, but the beauty of this game is 
-its customization possibilities. Mission creation has never been easier, 
-with a stable, full-featured editor integrated into the game engine 
-itself. Skins, models, and effects can all be modified by the end-user 
-with commonly available tools. 
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/lsdldoom-1.5 b/games-fps/lsdldoom-1.5
new file mode 100644
index 000000000000..0dd863be5971
--- /dev/null
+++ b/games-fps/lsdldoom-1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer net? ( media-libs/sdl-net )
+DESCRIPTION=Port of ID's doom to SDL
+EAPI=5
+HOMEPAGE=http://jesshaas.com/lsdldoom/
+IUSE=+net +shareware freedoom
+KEYWORDS=~arm ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer net? ( media-libs/sdl-net ) shareware? ( games-fps/doom-data ) freedoom? ( games-fps/freedoom ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://jesshaas.com/lsdldoom/src/lsdldoom-1.5.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_=cf8c5370782b762d8283d5cc250e29fc
diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
deleted file mode 100644
index d3598b55d17b..000000000000
--- a/games-fps/lsdldoom/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lsdldoom-1.5-paths.patch 2315 BLAKE2B cf95f2bffe29975281125a1dcb7b1da96d5c9eb8333761cb754837e4cb188ed0cc85d110fea1d0bbf9c11474c66868b23109512fe433d2f7a33692b1cd280300 SHA512 c1222ed33816ddd4aa9101ca55a8d70f9913320736f6b50a80e95ff6ee721fd794509aeb2196e8480ea469d7ed45686402f32df6592fa75bf4c55d296592564d
-DIST lsdldoom-1.5.tar.gz 1227060 BLAKE2B cda64dc664f9fbe20264ef3a140a5f9eaad9589138df58cbe311b59208094affbdf090a0ebc8cd8f1841e46c69cccb2e5b17fb3a6ae927b00c3ae38d83f7bb77 SHA512 49d68040c312e8a27b452eb54acb1a4197dee157678de9e902cc2f17a38e621c5980eadf9c78e1945b9d5fb863dd1bdbdcd08c1c5e50971ee73857b7b3e47e33
-EBUILD lsdldoom-1.5.ebuild 814 BLAKE2B 408320357c2439374f179591ed81512aaa3e1a6275157fa0366577030a5cda71491cabd76377e597b565e87da2b85b8fc5d4cee9931c73f94975f3a39b5c7167 SHA512 82a3ee2ad9258b70c96479930109242560fac734b1a10706c503ea155d31bc87020b81d260dc2db07914e0b840c68493671b8c78f8d6587ad1065649c54ed1fd
-MISC metadata.xml 486 BLAKE2B 8ab7197444deb3b435ad00d20a452414e0b371c5e26864ebf1f2694a2c18ab39b391bbfe087e7e675a9da2ad12484eb3962d19f5408b2d540e4d9a9a0d08073d SHA512 7f58f30b49baa935063333338a91229452f799321774779ac67d965b5ccbeb40825fa97cffe2932d625219142767184e516159343b84f598559673f30ed2c1a1
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch b/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
deleted file mode 100644
index 686e3450a620..000000000000
--- a/games-fps/lsdldoom/files/lsdldoom-1.5-paths.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -urN lsdldoom-1.5.orig//Makefile.in lsdldoom-1.5/Makefile.in
---- lsdldoom-1.5.orig//Makefile.in	2011-10-23 22:17:01.582705152 -0700
-+++ lsdldoom-1.5/Makefile.in	2011-10-23 22:18:00.846237242 -0700
-@@ -209,7 +209,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/share/doc/@PACKAGE@
-+docdir = /usr/share/doc/$(PF)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -urN lsdldoom-1.5.orig//configure lsdldoom-1.5/configure
---- lsdldoom-1.5.orig//configure	2011-10-23 22:17:01.544700322 -0700
-+++ lsdldoom-1.5/configure	2011-10-23 22:18:00.829235080 -0700
-@@ -5689,10 +5689,10 @@
- then exec_prefix=$prefix
- fi
- 
--gamesdir=$prefix/games
-+gamesdir=$bindir
- exp_gamesdir=`eval "echo $gamesdir"`
- exp_datadir=`eval "echo $datadir"`
--waddir=$exp_datadir/games/doom
-+waddir=$exp_datadir/doom-data
- cat >>confdefs.h <<_ACEOF
- #define DOOMWADDIR "$waddir"
- _ACEOF
-diff -urN lsdldoom-1.5.orig//data/Makefile.in lsdldoom-1.5/data/Makefile.in
---- lsdldoom-1.5.orig//data/Makefile.in	2011-10-23 22:17:01.634711762 -0700
-+++ lsdldoom-1.5/data/Makefile.in	2011-10-23 22:18:00.844236988 -0700
-@@ -188,7 +188,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--waddir = $(datadir)/games/doom
-+waddir = $(datadir)/doom-data
- wad_DATA = boomlump.wad
- EXTRA_DIST = boomlump.wad
- all: all-am
-diff -urN lsdldoom-1.5.orig//doc/Makefile.in lsdldoom-1.5/doc/Makefile.in
---- lsdldoom-1.5.orig//doc/Makefile.in	2011-10-23 22:17:00.348548297 -0700
-+++ lsdldoom-1.5/doc/Makefile.in	2011-10-23 22:18:00.840236480 -0700
-@@ -158,7 +158,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = $(prefix)/share/doc/@PACKAGE@
-+docdir = /usr/share/doc/$(PF)
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-diff -urN lsdldoom-1.5.orig//src/Makefile.in lsdldoom-1.5/src/Makefile.in
---- lsdldoom-1.5.orig//src/Makefile.in	2011-10-23 22:17:01.041636386 -0700
-+++ lsdldoom-1.5/src/Makefile.in	2011-10-23 22:18:00.835235845 -0700
-@@ -242,7 +242,7 @@
- # Process this file with automake to produce Makefile.in
- #
- #
--gamesdir = $(prefix)/games
-+gamesdir = $(bindir)
- games_PROGRAMS = @BUILD_SDLDOOM@ @BUILD_SERVER@
- @I386_ASM_FALSE@ASMS = 
- @I386_ASM_TRUE@ASMS = drawspan.S drawcol.S drawasm.h
diff --git a/games-fps/lsdldoom/lsdldoom-1.5.ebuild b/games-fps/lsdldoom/lsdldoom-1.5.ebuild
deleted file mode 100644
index 805a8dfc2d87..000000000000
--- a/games-fps/lsdldoom/lsdldoom-1.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Port of ID's doom to SDL"
-HOMEPAGE="http://jesshaas.com/lsdldoom/"
-SRC_URI="http://jesshaas.com/lsdldoom/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~x86"
-IUSE="+net +shareware freedoom"
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	net? ( media-libs/sdl-net )"
-RDEPEND="${DEPEND}
-	shareware? ( games-fps/doom-data )
-	freedoom? ( games-fps/freedoom )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-paths.patch
-}
-
-src_configure() {
-	# cpu-opt -> just adds -mcpu crap to CFLAGS
-	egamesconf \
-		--disable-dependency-tracking \
-		--disable-cpu-opt \
-		$(use_enable net net-game)
-}
-
-src_install() {
-	DOCS="ChangeLog" \
-		default
-	prepgamesdirs
-}
diff --git a/games-fps/lsdldoom/metadata.xml b/games-fps/lsdldoom/metadata.xml
deleted file mode 100644
index fdebef0b5c68..000000000000
--- a/games-fps/lsdldoom/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="net">Enables network game support</flag>
-	<flag name="shareware">Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
-	<flag name="freedoom">Install <pkg>games-fps/freedoom</pkg> wad file</flag>
-</use>
-</pkgmetadata>
diff --git a/games-fps/metadata.xml b/games-fps/metadata.xml
deleted file mode 100644
index 9df41d653f06..000000000000
--- a/games-fps/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-fps category contains first person shooter games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-fps enthält Egoshooter.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-fps contiene juegos de disparo en primera persona.
-	</longdescription>
-	<longdescription lang="ja">
-		games-fpsカテゴリーにはファースト・パーソン・シューター・ゲームが
-		含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-fps categorie bevat schietspellen (uit persoonsperspectief).
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-fps chứa các trò chơi bắn súng dạng "First Person Shooter (FPS)".
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-fps contiene giochi sparatutto in prima persona "First Person Shooter (FPS)".
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-fps contém jogos de tiro em primeira pessoa.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-fps zawiera gry akcji oglądane z perspektywy pierwszej
-		osoby.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-fps/nexuiz-2.5.2-r1 b/games-fps/nexuiz-2.5.2-r1
new file mode 100644
index 000000000000..81e608bff88c
--- /dev/null
+++ b/games-fps/nexuiz-2.5.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=virtual/jpeg:0 net-misc/curl opengl? ( media-libs/libmodplug media-libs/libogg >=media-libs/libpng-1.4:0 media-libs/libtheora media-libs/libvorbis x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl[joystick,opengl,video] ) ) !dedicated? ( !opengl? ( media-libs/libmodplug media-libs/libogg >=media-libs/libpng-1.4:0 media-libs/libtheora media-libs/libvorbis x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl[joystick,opengl,video] ) ) ) app-arch/unzip opengl? ( x11-base/xorg-proto ) !dedicated? ( !opengl? ( x11-base/xorg-proto ) )
+DESCRIPTION=Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine
+EAPI=6
+HOMEPAGE=http://www.nexuiz.com/
+IUSE=alsa dedicated maps opengl sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0 net-misc/curl opengl? ( media-libs/libmodplug media-libs/libogg >=media-libs/libpng-1.4:0 media-libs/libtheora media-libs/libvorbis x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl[joystick,opengl,video] ) ) !dedicated? ( !opengl? ( media-libs/libmodplug media-libs/libogg >=media-libs/libpng-1.4:0 media-libs/libtheora media-libs/libvorbis x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXpm x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl alsa? ( media-libs/alsa-lib ) sdl? ( media-libs/libsdl[joystick,opengl,video] ) ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/nexuiz/nexuiz-252.zip maps? ( mirror://sourceforge/nexuiz/nexmappack_r2.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7766a1615db509d71a0f9af81cadaa45
diff --git a/games-fps/nexuiz/Manifest b/games-fps/nexuiz/Manifest
deleted file mode 100644
index b8da8286d5bf..000000000000
--- a/games-fps/nexuiz/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX nexuiz-2.5.2-libpng-1.4.patch 1607 BLAKE2B dbe06a42ecfc2fda130d2eb29a1cbefcf59631b7b5662e73ae8557cf90b7f3083369dc1d277529f09504e1cd74e17a7eee0d6176713b561ad608f9a2e03d9868 SHA512 38aa8fbd0765283c03c0bf6cc13362ed692f4776a12ad23ef582eb9c238fda6eea475284a662ba84d70eab7a7df71a0cb28b5b90f19c12d2594c3ba67f0851aa
-DIST nexmappack_r2.zip 113533483 BLAKE2B 32da18020e80835c0fea24280c4793fc33d017774311fb154ec438de97c46f58608cb83cdc8b27fd033c4086384b5bb3d5ffc9a8841618d7cc54401073cc7d8b SHA512 f7e2dd60530b58f3fc505cdf0d605208b6905136586107210031233cb870b1892bae59efc4fb38403a4f0fc5301321297d03107b38daa501cb90e5669455eac0
-DIST nexuiz-252.zip 931253731 BLAKE2B 620d46cf90ef73cd0039721597d11b7a5924a6614f065d413339f6e01fff8396b49a576bd293f3f64882e51c05fd0dea190eb8c9fbef5ab57cdd26736ccffd4c SHA512 da661eb2ff1764fed1d5f5547b89e4f9aa47613d41a3999c0202d8858ec2b882e4ef0ec182a81d1bdb25dff2ef65aad6af132009884e3557206941a736c2a68c
-EBUILD nexuiz-2.5.2-r1.ebuild 2532 BLAKE2B 2f7f9955e6970fa0b402421246edf312aa0984e5f91aa64618b482f24c8057f8125a50e78e65021fd4e8f79a09f38d3c02987e7a1882d6e9a95a1cfc43638fd7 SHA512 f4dc28ac428b31c352794d2a361cbb41d633cf82fbc1c00eccd520dbe77a7ca1ce84479f6a82d9b596f73ff3a48652ad6f26fade745b30b18faf051478bbd545
-MISC metadata.xml 416 BLAKE2B 5401c62409ae99347c0ed229edeb5af36b4200b1ba5e9cf35bf70674ac1119fe93bb22bb99f24a4b38b0dfced7d89a724f1985b119b237be1f49c566d27d797a SHA512 f07e139d436fba2f1ef78c41788f8e860258755de93cb8bb1b7f4315b6f9efa140013584f627cbb4cd1d46bb3071021f8d3cef2084e46a81fdd52d9d277ede34
diff --git a/games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch b/games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch
deleted file mode 100644
index 0e064f8b6c3f..000000000000
--- a/games-fps/nexuiz/files/nexuiz-2.5.2-libpng-1.4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-fix compatibility with >=libpng-1.4
-https://bugs.gentoo.org/show_bug.cgi?id=491610
-
-diff -Nur darkplaces.old/image_png.c darkplaces/image_png.c
---- darkplaces.old/image_png.c	2009-09-15 06:08:02.000000000 +0300
-+++ darkplaces/image_png.c	2010-01-28 01:23:24.000000000 +0200
-@@ -36,7 +36,7 @@
- static void*			(*qpng_create_info_struct)	(void*);
- static void				(*qpng_read_info)			(void*, void*);
- static void				(*qpng_set_expand)			(void*);
--static void				(*qpng_set_gray_1_2_4_to_8)	(void*);
-+static void				(*qpng_set_expand_gray_1_2_4_to_8)	(void*);
- static void				(*qpng_set_palette_to_rgb)	(void*);
- static void				(*qpng_set_tRNS_to_alpha)	(void*);
- static void				(*qpng_set_gray_to_rgb)		(void*);
-@@ -61,7 +61,7 @@
- 	{"png_create_info_struct",	(void **) &qpng_create_info_struct},
- 	{"png_read_info",			(void **) &qpng_read_info},
- 	{"png_set_expand",			(void **) &qpng_set_expand},
--	{"png_set_gray_1_2_4_to_8",	(void **) &qpng_set_gray_1_2_4_to_8},
-+	{"png_set_expand_gray_1_2_4_to_8",	(void **) &qpng_set_expand_gray_1_2_4_to_8},
- 	{"png_set_palette_to_rgb",	(void **) &qpng_set_palette_to_rgb},
- 	{"png_set_tRNS_to_alpha",	(void **) &qpng_set_tRNS_to_alpha},
- 	{"png_set_gray_to_rgb",		(void **) &qpng_set_gray_to_rgb},
-@@ -110,7 +110,7 @@
- #elif defined(MACOSX)
- 		"libpng12.0.dylib",
- #else
--		"libpng12.so.0",
-+		"libpng14.so.0",
- 		"libpng.so", // FreeBSD
- #endif
- 		NULL
-@@ -311,7 +311,7 @@
- 	{
- 		qpng_set_gray_to_rgb(png);
- 		if (my_png.BitDepth < 8)
--			qpng_set_gray_1_2_4_to_8(png);
-+			qpng_set_expand_gray_1_2_4_to_8(png);
- 	}
- 
- 	if (qpng_get_valid(png, pnginfo, PNG_INFO_tRNS))
diff --git a/games-fps/nexuiz/metadata.xml b/games-fps/nexuiz/metadata.xml
deleted file mode 100644
index 8655ab7fd6f6..000000000000
--- a/games-fps/nexuiz/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="maps">Install the community map pack</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">nexuiz</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild b/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
deleted file mode 100644
index 2778fcff0c04..000000000000
--- a/games-fps/nexuiz/nexuiz-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_PN=Nexuiz
-MY_P=${PN}-${PV//./}
-MAPS=nexmappack_r2
-DESCRIPTION="Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
-HOMEPAGE="http://www.nexuiz.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
-	maps? ( mirror://sourceforge/${PN}/${MAPS}.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa dedicated maps opengl sdl"
-
-# no headers for libpng needed
-UIRDEPEND="
-	media-libs/libmodplug
-	media-libs/libogg
-	>=media-libs/libpng-1.4:0
-	media-libs/libtheora
-	media-libs/libvorbis
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	sdl? ( media-libs/libsdl[joystick,opengl,video] )"
-UIDEPEND="x11-base/xorg-proto"
-RDEPEND="virtual/jpeg:0
-	net-misc/curl
-	opengl? ( ${UIRDEPEND} )
-	!dedicated? ( !opengl? ( ${UIRDEPEND} ) )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	opengl? ( ${UIDEPEND} )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
-
-S=${WORKDIR}/darkplaces
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libpng-1.4.patch
-)
-
-src_unpack() {
-	unpack ${MY_P}.zip
-
-	local f
-	for f in "${MY_PN}"/sources/*.zip ; do
-		unpack ./${f}
-	done
-
-	if use maps ; then
-		cd "${WORKDIR}"/${MY_PN}
-		unpack ${MAPS}.zip
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Make the game automatically look in the correct data directory
-	sed -i \
-		-e "/^CC=/d" \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "/-lm/s:$: ${LDFLAGS}:" \
-		-e '/^STRIP/s/strip/true/' \
-		makefile.inc || die
-
-	sed -i \
-		-e '1i DP_LINK_TO_LIBJPEG=1' \
-		-e "s:ifdef DP_.*:DP_FS_BASEDIR=/usr/share/${PN}\n&:" \
-		makefile || die
-
-	if ! use alsa ; then
-		sed -i \
-			-e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
-			makefile || die
-	fi
-}
-
-src_compile() {
-	if use opengl || ! use dedicated ; then
-		emake cl-${PN}
-		if use sdl ; then
-			emake sdl-${PN}
-		fi
-	fi
-
-	if use dedicated ; then
-		emake sv-${PN}
-	fi
-}
-
-src_install() {
-	if use opengl || ! use dedicated ; then
-		dobin ${PN}-glx
-		doicon ${PN}.xpm
-		make_desktop_entry ${PN}-glx "Nexuiz (GLX)"
-		if use sdl ; then
-			dobin ${PN}-sdl
-			make_desktop_entry ${PN}-sdl "Nexuiz (SDL)"
-			dosym ${PN}-sdl /usr/bin/${PN}
-		else
-			dosym ${PN}-glx /usr/bin/${PN}
-		fi
-	fi
-
-	if use dedicated ; then
-		dobin ${PN}-dedicated
-	fi
-
-	cd "${WORKDIR}"/${MY_PN} || die
-
-	dodoc Docs/*.txt
-	dodoc -r readme.html Docs
-
-	insinto /usr/share/${PN}
-
-	if use dedicated ; then
-		doins -r server
-	fi
-
-	doins -r data havoc
-}
diff --git a/games-fps/openarena-0.8.8-r1 b/games-fps/openarena-0.8.8-r1
new file mode 100644
index 000000000000..eda6002b7d05
--- /dev/null
+++ b/games-fps/openarena-0.8.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis ) app-arch/unzip
+DESCRIPTION=Open-source replacement for Quake 3 Arena
+EAPI=6
+HOMEPAGE=http://openarena.ws/
+IUSE=+curl +openal +vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,opengl,video] media-libs/speex media-libs/speexdsp virtual/jpeg:0 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp curl? ( net-misc/curl ) openal? ( media-libs/openal ) vorbis? ( media-libs/libvorbis )
+SLOT=0
+SRC_URI=mirror://sourceforge/oarena/openarena-0.8.8.zip mirror://sourceforge/oarena/src/openarena-engine-source-0.8.8.tar.bz2
+_eclasses_=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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=b3eee15f66296c23c8f48436d959c634
diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest
deleted file mode 100644
index 523e9d5cc047..000000000000
--- a/games-fps/openarena/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX openarena-0.8.8-makefile.patch 763 BLAKE2B 0e671cf5be41b48670954fa133d11806b1ad4becb98379e34bd7ea7127af467c15db9421f8590c3a73fbe0890e5e3f2a348437bef4cea7910400f488bedc3168 SHA512 2cc60cfd43536f55690dd90346f11d383f39d20be4509167604d0506bddd6375a73e933eeed2c7fbbd0e2c2c9c7ce126943549a9e0194d0f831d0a9b9e59c376
-AUX openarena-0.8.8-unbundling.patch 3054 BLAKE2B f1f90e3d61d77ec2d36fcc9ce55a53d456084b9862687b49037fceefca7758784e886bf66a689fba7a202a3ead60823311c9f31da804509dc3b60e4b12869964 SHA512 85a7300e78f741d0bcb4c949e17ffac13790bbdf0942fc739fa357ac5cec7a27c67393bb42342981a78fbb12141e3a9e1ffead352db6073bdf63b4135f4dbb43
-DIST openarena-0.8.8.zip 425189255 BLAKE2B f8a8d20cee344a615907e85b8487b8211246888b63d001b5f0fe1b676a699d9268cdf15d7c749837e5789ef254e959f289d9026a1ea3924f50b291a4c7224f28 SHA512 9fa4dabe8a3428dc3cbec97f3b4d20c04569c14cdd00b60e6391c6dd61e310f246ff5ec97e7549821b3d6f5f94b140eb5411a2ddd83dafcad66937b7f78ea8dd
-DIST openarena-engine-source-0.8.8.tar.bz2 3777830 BLAKE2B c20e2ad37aeb3467e2ebd90eab599c4e25a2dc834df81286b01bde9c7081b1b954e3524e5c4110bddcbda5593a40e595aa0a1eae8f20b98a06b4410fcb93f4c8 SHA512 d4ba3655fae500cf5b7475c83d39c81b6abc759da15cfb4ea9e1dc0f47ffb11c1bbbc2b6f85d613ab1d729978eda93d4d7677c9a45a33853e363c820d8b81c43
-EBUILD openarena-0.8.8-r1.ebuild 1790 BLAKE2B 84b530c8efd5617b062b4194e885ad41dcb23cace4a48d5d5c6460e32839ccc99ccd1695c1322916418be6cfad4956c74d1c2eac86a9a93eb4b77b737622260c SHA512 fa0c3302527b579bde188c1c44d928026181d5ccf1e88a871583d1ad0394a56e5d6dc2cdd907e603e52b155e1ee76bc9a99cd43397fa6ed8081487890975d987
-MISC metadata.xml 329 BLAKE2B e35a14a26bbcd2aa34d851acbc510d5e4ba3fa9ee9dc9ecc1c75995c6b8d3f0aea569f55c402295f1835e71d2d8609c226ccd20f9c4f5819c071c54e7d19e08b SHA512 40e88c8cec824e6c3d815516c018292ec64e5b968ede35a4c3c235331cfb32370ceffa954f01ceedffbf64e182f4e6c753a5fe45ce2ed627b6383dfc6b0d39f7
diff --git a/games-fps/openarena/files/openarena-0.8.8-makefile.patch b/games-fps/openarena/files/openarena-0.8.8-makefile.patch
deleted file mode 100644
index d72bbe79b29d..000000000000
--- a/games-fps/openarena/files/openarena-0.8.8-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu May 17 23:34:20 UTC 2012
-Subject: flags, arch
-
---- openarena-engine-source-0.8.8/Makefile
-+++ openarena-engine-source-0.8.8/Makefile
-@@ -73,6 +73,10 @@
- 
- ifndef ARCH
- ARCH=$(COMPILE_ARCH)
-+else
-+  ifeq ($(ARCH),amd64)
-+    ARCH=x86_64
-+  endif
- endif
- export ARCH
- 
-@@ -263,8 +267,7 @@
-   endif
-   endif
- 
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
--    -pipe -DUSE_ICON
-+  BASE_CFLAGS = -fno-strict-aliasing -DUSE_ICON -I.
-   CLIENT_CFLAGS = $(SDL_CFLAGS)
-   SERVER_CFLAGS =
- 
-@@ -335,7 +338,7 @@
-   THREAD_LIBS=-lpthread
-   LIBS=-ldl -lm
- 
--  CLIENT_LIBS=$(SDL_LIBS) -lGL
-+  CLIENT_LIBS=$(SDL_LIBS) -lGL -ljpeg
- 
-   ifeq ($(USE_OPENAL),1)
-     ifneq ($(USE_OPENAL_DLOPEN),1)
\ No newline at end of file
diff --git a/games-fps/openarena/files/openarena-0.8.8-unbundling.patch b/games-fps/openarena/files/openarena-0.8.8-unbundling.patch
deleted file mode 100644
index b2c872f34cbd..000000000000
--- a/games-fps/openarena/files/openarena-0.8.8-unbundling.patch
+++ /dev/null
@@ -1,104 +0,0 @@
---- openarena-engine-source-0.8.8/Makefile
-+++ openarena-engine-source-0.8.8/Makefile
-@@ -1406,41 +1406,6 @@
-   $(B)/client/l_script.o \
-   $(B)/client/l_struct.o \
-   \
--  $(B)/client/jcapimin.o \
--  $(B)/client/jcapistd.o \
--  $(B)/client/jccoefct.o  \
--  $(B)/client/jccolor.o \
--  $(B)/client/jcdctmgr.o \
--  $(B)/client/jchuff.o   \
--  $(B)/client/jcinit.o \
--  $(B)/client/jcmainct.o \
--  $(B)/client/jcmarker.o \
--  $(B)/client/jcmaster.o \
--  $(B)/client/jcomapi.o \
--  $(B)/client/jcparam.o \
--  $(B)/client/jcphuff.o \
--  $(B)/client/jcprepct.o \
--  $(B)/client/jcsample.o \
--  $(B)/client/jdapimin.o \
--  $(B)/client/jdapistd.o \
--  $(B)/client/jdatasrc.o \
--  $(B)/client/jdcoefct.o \
--  $(B)/client/jdcolor.o \
--  $(B)/client/jddctmgr.o \
--  $(B)/client/jdhuff.o \
--  $(B)/client/jdinput.o \
--  $(B)/client/jdmainct.o \
--  $(B)/client/jdmarker.o \
--  $(B)/client/jdmaster.o \
--  $(B)/client/jdpostct.o \
--  $(B)/client/jdsample.o \
--  $(B)/client/jdtrans.o \
--  $(B)/client/jerror.o \
--  $(B)/client/jfdctflt.o \
--  $(B)/client/jidctflt.o \
--  $(B)/client/jmemmgr.o \
--  $(B)/client/jmemnobs.o \
--  $(B)/client/jutils.o \
-   \
-   $(B)/client/tr_animation.o \
-   $(B)/client/tr_backend.o \
---- openarena-engine-source-0.8.8/code/renderer/tr_image_jpg.c
-+++ openarena-engine-source-0.8.8/code/renderer/tr_image_jpg.c
-@@ -31,7 +31,7 @@
-  */
- 
- #define JPEG_INTERNALS
--#include "../jpeg-6b/jpeglib.h"
-+#include <jpeglib.h>
- 
- void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) {
-   /* This struct contains the JPEG decompression parameters and pointers to
-@@ -131,7 +131,10 @@
-   }
- 
-   memcount = pixelcount * 4;
--  row_stride = cinfo.output_width * cinfo.output_components;
-+  if (3 == cinfo.output_components)
-+    row_stride = cinfo.output_width * 4;
-+  else
-+    row_stride = cinfo.output_width * cinfo.output_components;
- 
-   out = ri.Malloc(memcount);
- 
-@@ -144,14 +147,26 @@
-   /* Here we use the library's state variable cinfo.output_scanline as the
-    * loop counter, so that we don't have to keep track ourselves.
-    */
-+  buf = out;
-   while (cinfo.output_scanline < cinfo.output_height) {
-     /* jpeg_read_scanlines expects an array of pointers to scanlines.
-      * Here the array is only one element long, but you could ask for
-      * more than one scanline at a time if that's more convenient.
-      */
--	buf = ((out+(row_stride*cinfo.output_scanline)));
- 	buffer = &buf;
-     (void) jpeg_read_scanlines(&cinfo, buffer, 1);
-+    if (3 == cinfo.output_components) {
-+      /* turn RGB into RGBA */
-+      int ioffset = cinfo.output_width * 3 - 1;
-+      int ooffset = cinfo.output_width * 4 - 1;
-+      do {
-+	buf[ooffset--] = 255;
-+	buf[ooffset--] = buf[ioffset--];
-+	buf[ooffset--] = buf[ioffset--];
-+	buf[ooffset--] = buf[ioffset--];
-+      } while (ioffset > 0);
-+    }
-+    buf += row_stride;
-   }
-   
-   buf = out;
-@@ -176,7 +191,7 @@
- 		buf[--dindex] = greyshade;
- 	} while(sindex);
-   }
--  else
-+  else if (4 == cinfo.output_components) 
-   {
- 	// clear all the alphas to 255
- 	int	i;
\ No newline at end of file
diff --git a/games-fps/openarena/metadata.xml b/games-fps/openarena/metadata.xml
deleted file mode 100644
index fb6c4d02068e..000000000000
--- a/games-fps/openarena/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">oarena</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/openarena/openarena-0.8.8-r1.ebuild b/games-fps/openarena/openarena-0.8.8-r1.ebuild
deleted file mode 100644
index 7440f19e8ec0..000000000000
--- a/games-fps/openarena/openarena-0.8.8-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop epatch flag-o-matic versionator
-
-DESCRIPTION="Open-source replacement for Quake 3 Arena"
-HOMEPAGE="http://openarena.ws/"
-SRC_URI="mirror://sourceforge/oarena/${P}.zip
-	mirror://sourceforge/oarena/src/${PN}-engine-source-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl +openal +vorbis"
-
-RDEPEND="
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/speex
-	media-libs/speexdsp
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	curl? ( net-misc/curl )
-	openal? ( media-libs/openal )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-MY_S="${WORKDIR}/${PN}-engine-source-${PV}"
-BUILD_DIR="${PN}-build"
-DIR="/usr/share/${PN}"
-
-src_prepare() {
-	default
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-unbundling.patch
-	cd "${MY_S}"
-	touch jpegint.h
-}
-
-src_compile() {
-	local myopts
-
-	# enable voip, disable mumble
-	# also build always server and use smp by default
-	myopts="USE_INTERNAL_SPEEX=0 USE_VOIP=1 USE_MUMBLE=0
-		BUILD_SERVER=1 BUILD_CLIENT_SMP=1 USE_LOCAL_HEADERS=0"
-	use curl || myopts="${myopts} USE_CURL=0"
-	use openal || myopts="${myopts} USE_OPENAL=0"
-	use vorbis || myopts="${myopts} USE_CODEC_VORBIS=0"
-
-	cd "${MY_S}"
-	emake \
-		V=1 \
-		DEFAULT_BASEDIR="${DIR}" \
-		BR="${BUILD_DIR}" \
-		${myopts} \
-		OPTIMIZE=
-}
-
-src_install() {
-	cd "${MY_S}"/"${BUILD_DIR}"
-	newbin openarena-smp.* "${PN}"
-	newbin oa_ded.* "${PN}-ded"
-	cd "${S}"
-
-	insinto "${DIR}"
-	doins -r baseoa missionpack
-
-	dodoc CHANGES CREDITS LINUXNOTES README
-	newicon "${MY_S}"/misc/quake3.png ${PN}.png
-	make_desktop_entry ${PN} "OpenArena"
-}
diff --git a/games-fps/postal2-1409.2-r2 b/games-fps/postal2-1409.2-r2
new file mode 100644
index 000000000000..20fb1f0a5750
--- /dev/null
+++ b/games-fps/postal2-1409.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-util/loki_patch
+DESCRIPTION=Postal 2: Share the Pain
+EAPI=5
+HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=postal2
+KEYWORDS=~amd64 ~x86
+LICENSE=postal2
+PROPERTIES=interactive
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://updatefiles.linuxgamepublishing.com/postal2/postal2-1409.1.run http://updatefiles.linuxgamepublishing.com/postal2/postal2-1409.2.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_=ec8ab791af686173d8d0ce9e04a25e0e
diff --git a/games-fps/postal2/Manifest b/games-fps/postal2/Manifest
deleted file mode 100644
index d73f9c22f532..000000000000
--- a/games-fps/postal2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST postal2-1409.1.run 4816304 BLAKE2B a93e7af6f5332572c8344f3431ae540dd8e1b5e820244d710e578d69577dfcc533cdade56fc021d5254db30998a3b734bb527ca4e4d2f238c6ee33540b212f22 SHA512 5ff4880435394c552e7c1f33baf8dfdb71eb56fe5e3067eeb746826a25e585d3901292618668de50dc8bf641b2628a26a82cdf5b642e33f4113b55d72df9c4fe
-DIST postal2-1409.2.run 5645624 BLAKE2B 3aa4b466995344e767223d7c3296b498ca74f6b960fc32b4da7632b939df81e9d7a58836d3b9d26f5f85e51f3ba6e4a27e5b447c8318d90deede21498177ff95 SHA512 9fafcfec30d99e30b879318a96f484d3723853a213606f58b02a37631b4393ab4925022fcef3f84c95907269c6675090100358c16cec8b779140bf83fe7cb660
-EBUILD postal2-1409.2-r2.ebuild 1666 BLAKE2B ae877d64f61a0051dd375c3a235d39d2341b22459265c2c39a2c084725ffcae4a601eac3a87967b0b36d9aa891c5b4176cb1c6fb7190dcba08631eab348ab4e4 SHA512 b73dbcc452265a2143fa42b768229e88e2e23ea36b2071241d64ec56362571d0c78cb95ec7e8e00f230305a3448c87a4ea4aee718e9a24d8b8c4ddff61a3d03d
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-fps/postal2/metadata.xml b/games-fps/postal2/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-fps/postal2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-fps/postal2/postal2-1409.2-r2.ebuild b/games-fps/postal2/postal2-1409.2-r2.ebuild
deleted file mode 100644
index f0ee7ff50e1c..000000000000
--- a/games-fps/postal2/postal2-1409.2-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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="Postal 2: Share the Pain"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=postal2"
-SRC_URI="http://updatefiles.linuxgamepublishing.com/${PN}/${P/%?/1}.run
-	http://updatefiles.linuxgamepublishing.com/${PN}/${P}.run"
-
-LICENSE="postal2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND="sys-libs/glibc
-	sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cdrom_get_cds .installation_data/linux-specific.tar.bz2
-	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}
-
-	dodir "${dir}"
-	cd "${D}/${dir}"
-
-	ln -s "${CDROM_ROOT}"/.installation_data/*.bz2 .
-	unpack ./*.bz2
-	rm -f ./*.bz2
-
-	local d
-	for d in "${S}"/* ; do
-		pushd "${d}" > /dev/null
-		loki_patch patch.dat "${D}/${dir}" || die "loki_patch ${d} failed"
-		popd > /dev/null
-	done
-
-	rm -f System/{libstdc++.so.5,libgcc_s.so.1}
-
-	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so
-	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0
-
-	games_make_wrapper ${PN} ./${PN}-bin "${dir}"/System .
-	doicon "${CDROM_ROOT}"/.installation_data/${PN}.xpm
-	make_desktop_entry ${PN} "Postal 2: Share the Pain"
-
-	prepgamesdirs
-}
diff --git a/games-fps/postal2mp-demo-1409 b/games-fps/postal2mp-demo-1409
new file mode 100644
index 000000000000..bce69dfc116f
--- /dev/null
+++ b/games-fps/postal2mp-demo-1409
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=You play the Postal Dude: Postal 2 is only as violent as you are
+EAPI=5
+HOMEPAGE=http://icculus.org/news/news.php?id=4419
+KEYWORDS=~amd64 ~x86
+LICENSE=postal2
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) >=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://treefort.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2 http://0day.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2 http://cyberstalker.dk/sponsored-by-dkchan.org/Postal2STP-FreeMP-linux.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2c029ea81e227b2e2d458c9b60911a4b
diff --git a/games-fps/postal2mp-demo/Manifest b/games-fps/postal2mp-demo/Manifest
deleted file mode 100644
index 373caac5ccbb..000000000000
--- a/games-fps/postal2mp-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Postal2STP-FreeMP-linux.tar.bz2 591082047 BLAKE2B b633ec1d5337438af3abfee30584b6977136abd6aaa52b1ba946f30ccc7a03c3de6539fa2d3519a5e106af4113d0ee9171fbe92fdeb3057db052f870e4ae3bec SHA512 92580c2ce0593f37890013a5b2e5c1d420b57ae4e90569725446dbb2c939d1dd29b6df566783f020419dd8c4b1301213d1e8d9d581c95efd3f5950e8e54b46d1
-EBUILD postal2mp-demo-1409.ebuild 1462 BLAKE2B 8327290b7e045c9a3b03afc97a322150aff40cad7a4f787d53587ee5f9ef5dcfe5e37bf2893b1ad7aceae2a7998fb30a94c4590ec16d3443649c730bb2d5dde1 SHA512 652979dbb2d4b43a807b18cb1321f20285d390c02f99ed7e7690b3586200a61690d817ce4bf4da961f4880df05c635bb67d5b497b2fd5c12d328290706c542d4
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/postal2mp-demo/metadata.xml b/games-fps/postal2mp-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/postal2mp-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
deleted file mode 100644
index d01d21b14e0b..000000000000
--- a/games-fps/postal2mp-demo/postal2mp-demo-1409.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker multilib games
-
-DESCRIPTION="You play the Postal Dude: Postal 2 is only as violent as you are"
-HOMEPAGE="http://icculus.org/news/news.php?id=4419"
-SRC_URI="http://treefort.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2
-	http://0day.icculus.org/postal2/Postal2STP-FreeMP-linux.tar.bz2
-	http://cyberstalker.dk/sponsored-by-dkchan.org/Postal2STP-FreeMP-linux.tar.bz2"
-
-LICENSE="postal2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="sys-libs/glibc
-	sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	>=media-libs/libsdl-1.2.15-r4[X,opengl,abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]"
-DEPEND=""
-
-QA_PREBUILT="${GAMES_PREFIX_OPT:1}/${PN}/System/*"
-
-S=${WORKDIR}/Postal2STP-FreeMP-linux
-
-src_install() {
-	has_multilib_profile && ABI=x86
-
-	dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/System/postal2-bin
-
-	rm "${ED}/${dir}"/System/{openal.so,libSDL-1.2.so.0,libstdc++.so.5,libgcc_s.so.1} || die
-	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so
-	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0
-
-	games_make_wrapper ${PN} ./postal2-bin "${dir}"/System .
-	newicon postal2.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Postal 2: Share the Pain (Demo)"
-
-	prepgamesdirs
-}
diff --git a/games-fps/prboom-2.5.0-r1 b/games-fps/prboom-2.5.0-r1
new file mode 100644
index 000000000000..de1530ee84b0
--- /dev/null
+++ b/games-fps/prboom-2.5.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu
+DESCRIPTION=Port of ID's doom to SDL and OpenGL
+EAPI=6
+HOMEPAGE=http://prboom.sourceforge.net/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,video] media-libs/sdl-mixer media-libs/sdl-net !<games-fps/lsdldoom-1.5 virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/prboom/prboom-2.5.0.tar.gz mirror://gentoo/prboom.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4b810e04c77b642653282950bec9291b
diff --git a/games-fps/prboom/Manifest b/games-fps/prboom/Manifest
deleted file mode 100644
index b558a0db3d4b..000000000000
--- a/games-fps/prboom/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX prboom-2.5.0-libpng14.patch 547 BLAKE2B b159e7e2654aad0c9d37109c5d6919ca4cc5d29401f839c45690a73ce6b8391aa5ab4f4f1495d48635f87eca0c25b671ef60753ad636f8ee8be0bebd3db56c0b SHA512 0ecebc1f9b8db2662ba643ee36422f11152870e95305cd0e7fda351b4397df002ba8a770664be451fc86c46afd85bd7122aa3a1ed75901d48197accdf35464cf
-AUX prboom-2.5.0-nvidia-test.c 90 BLAKE2B 60afd518380bb119087a3ddde1ce1af2490a650184677e7720dd40be601c227ccf450d68bf1f8afaa54c62ff4272d4a7351b36d7eb1f000b19b48c68ef6f6a6e SHA512 2b864be0a40c213c4dfbef18b25db34ac62968f932f534dbe549019f0000ff7ce524e345740aff8c5b8aecdd2e5df9e42fef298d11f5d2366ad324c3003c4466
-AUX prboom-2.5.0-nvidia.patch 1746 BLAKE2B 94acec8ebe5a1ce554c257790ac1721c68e5adf8537acf600b0ea8b3d291f29d80bab1f689c3e1d436a86412f07479a23c231f610f313ae38d8cb101f9d9754b SHA512 f9f99aa310b82e467fda789630a156c6d96b0cf7ff65678365a4b466f5d9a98773daf529f79a35178cd127460199be589a443d9562932332a5a82f7804269592
-DIST prboom-2.5.0.tar.gz 1049505 BLAKE2B eb044c091279e04bfb65f9fea26bb706be213510b82a95ebe9d482a7c5d2c2ca5a51776afb3af6e8cebeba5df2441922f2298e52c54414b56e98e637c6feb544 SHA512 9e25b55047c66931ea010751fb64484e466395b04dfb738ed9dc515bd8b78e1124a337da33bf7be6e97280016ed1f01c852d8bc12704bdb82074488d7b5d2894
-DIST prboom.png 4254 BLAKE2B cf70f0ee9d41ad41c3f326b30a12df90f76fdb788d252b29bce1925ef253ec272feedc7040a8bf33146f313517afdc038c66324b9c671d90a7db89a5da2569db SHA512 72631d253c6754484ab1c96c953ed37a734197fa851dc88156fd3d4fb8396a77347805233481470b936a504d08e06d994de1eba613e6bf70a89db8fc7ee9b1ac
-EBUILD prboom-2.5.0-r1.ebuild 2010 BLAKE2B f1b0a15691446d91f2143ee808e1d0b285c5223607416936b50def2c304287d080427627e332482399252d6e8e1910821d947c75c40976aa9fb66ce04a717b15 SHA512 15b2d4337f9d9d9b4ad909a7096bc4b533988e7fe6f27f0852ecbb95f76f4833274d5092eaf48beb7ec24c5599bf5d95f84794f60d83d66a13bacd6961fd21df
-MISC metadata.xml 329 BLAKE2B 6c5388579683b49a47404b9f68b46ac1f1a67596bbb523a80fe247ec6fe48d3a4b59ea15aa7be0201879c5f8f050d1713cc2d8c28f128009ba92c8662f71a28f SHA512 a1c50442cb2fb1e0b536fd7b2402f74f4edf3a8edb0ff45ea6873cf24402fd5c37535006604e98b3c0073f9788763efaff2e51a91cd44b7fc37343549be87e80
diff --git a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch b/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
deleted file mode 100644
index 3dea0e7a983b..000000000000
--- a/games-fps/prboom/files/prboom-2.5.0-libpng14.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=308739
-
---- a/src/SDL/i_sshot.c
-+++ b/src/SDL/i_sshot.c
-@@ -231,7 +231,7 @@
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
diff --git a/games-fps/prboom/files/prboom-2.5.0-nvidia-test.c b/games-fps/prboom/files/prboom-2.5.0-nvidia-test.c
deleted file mode 100644
index f9e4bd700f8a..000000000000
--- a/games-fps/prboom/files/prboom-2.5.0-nvidia-test.c
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <SDL/SDL_opengl.h>
-PFNGLCOLORTABLEEXTPROC glColorTableEXT;
-int main(){return 0;}
diff --git a/games-fps/prboom/files/prboom-2.5.0-nvidia.patch b/games-fps/prboom/files/prboom-2.5.0-nvidia.patch
deleted file mode 100644
index c602c784c13f..000000000000
--- a/games-fps/prboom/files/prboom-2.5.0-nvidia.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/src/gl_intern.h.orig	2003-09-21 16:39:30.247451624 -0400
-+++ b/src/gl_intern.h	2003-09-21 16:39:41.610724144 -0400
-@@ -84,6 +84,6 @@
- #define min(a,b) ((a)<(b)?(a):(b))
- #endif
- 
--PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
-+//PFNGLCOLORTABLEEXTPROC gld_ColorTableEXT;
- 
- #endif // _GL_INTERN_H
---- a/src/gl_main.c.orig	2003-09-21 16:39:55.436622288 -0400
-+++ b/src/gl_main.c	2003-09-21 16:43:00.943420968 -0400
-@@ -285,6 +285,7 @@
- 
-     if (strcasecmp(extension, "GL_EXT_texture_filter_anisotropic") == 0)
-       gl_texture_filter_anisotropic = true;
-+/*
-     else if (strcasecmp(extension, "GL_EXT_paletted_texture") == 0) {
-       if (gl_use_paletted_texture) {
-         gl_paletted_texture = true;
-@@ -304,6 +305,7 @@
- 	else
-           lprintf(LO_INFO,"using GL_EXT_shared_texture_palette\n",glGetString(GL_VENDOR));
-       }
-+*/
- 
-     extension = p;
-   } while (*extension != '\0');
-@@ -761,7 +763,7 @@
-     pal[transparent_pal_index*4+1]=0;
-     pal[transparent_pal_index*4+2]=0;
-     pal[transparent_pal_index*4+3]=0;
--    gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
-+//    gld_ColorTableEXT(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
-     W_UnlockLumpName("PLAYPAL");
-   } else {
-     if (palette>0)
---- a/src/gl_texture.c.orig	2003-09-21 16:43:18.450759448 -0400
-+++ b/src/gl_texture.c	2003-09-21 16:43:39.549551944 -0400
-@@ -178,7 +178,7 @@
-   pal[transparent_pal_index*4+1]=0;
-   pal[transparent_pal_index*4+2]=0;
-   pal[transparent_pal_index*4+3]=0;
--  gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
-+//  gld_ColorTableEXT(target, GL_RGBA, 256, GL_RGBA, GL_UNSIGNED_BYTE, pal);
-   W_UnlockLumpName("PLAYPAL");
- }
- 
diff --git a/games-fps/prboom/metadata.xml b/games-fps/prboom/metadata.xml
deleted file mode 100644
index 55dd7e52946f..000000000000
--- a/games-fps/prboom/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">prboom</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/prboom/prboom-2.5.0-r1.ebuild b/games-fps/prboom/prboom-2.5.0-r1.ebuild
deleted file mode 100644
index 9cb1017bc0a2..000000000000
--- a/games-fps/prboom/prboom-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Port of ID's doom to SDL and OpenGL"
-HOMEPAGE="http://prboom.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	!<games-fps/lsdldoom-1.5
-	virtual/opengl
-	virtual/glu
-"
-DEPEND="${RDEPEND}"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-To play the original Doom levels, place doom.wad and/or doom2.wad
-into /usr/share/doom-data
-Then run ${PN} accordingly.
-
-doom1.wad is the shareware demo wad consisting of 1 episode,
-and doom.wad is the full Doom 1 set of 3 episodes
-(or 4 in the Ultimate Doom wad).
-
-You can even emerge doom-data and/or freedoom to play for free.
-"
-
-src_prepare() {
-	default
-
-	ebegin "Detecting NVidia GL/prboom bug"
-	$(tc-getCC) "${FILESDIR}"/${P}-nvidia-test.c 2> /dev/null
-	local ret=$?
-	eend ${ret} "NVidia GL/prboom bug found ;("
-	[ ${ret} -eq 0 ] || eapply "${FILESDIR}"/${P}-nvidia.patch
-
-	eapply "${FILESDIR}"/${P}-libpng14.patch
-
-	sed -i \
-		-e '/^gamesdir/ s/\/games/\/bin/' \
-		src/Makefile.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's/: install-docDATA/:/' \
-		-e '/^SUBDIRS/ s/doc//' \
-		Makefile.in \
-		|| die "sed failed"
-	sed -i \
-		-e 's:-ffast-math $CFLAGS_OPT::' \
-		configure \
-		|| die "sed configure failed"
-}
-
-src_configure() {
-	# leave --disable-cpu-opt in otherwise the configure script
-	# will append -march=i686 and crap ... let the user's CFLAGS
-	# handle this ...
-	econf \
-		--enable-gl \
-		--disable-i386-asm \
-		--disable-cpu-opt \
-		--with-waddir="/usr/share/doom-data"
-}
-
-src_install() {
-	default
-
-	doman doc/*.{5,6}
-
-	dodoc doc/README.* doc/*.txt
-	readme.gentoo_create_doc
-
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "PrBoom"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-fps/quake1-data-2.40 b/games-fps/quake1-data-2.40
new file mode 100644
index 000000000000..e06ed5966c13
--- /dev/null
+++ b/games-fps/quake1-data-2.40
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/lha
+DESCRIPTION=iD Software's Quake 1 ... the data files
+EAPI=5
+HOMEPAGE=http://www.idsoftware.com/games/quake/quake/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RDEPEND=!games-fps/quake1-demodata[symlink] games-misc/games-envd
+SLOT=0
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c9b9674c382b70b781aaf3ce7a8978d4
diff --git a/games-fps/quake1-data/Manifest b/games-fps/quake1-data/Manifest
deleted file mode 100644
index 23df2121b2c5..000000000000
--- a/games-fps/quake1-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD quake1-data-2.40.ebuild 1560 BLAKE2B b1b5ec112c089c9bccf674b87717b41e2ee3a25d0f8864564ed88a1755245cf7fc35559fb9e44e31971a2ff37d14a1304b329493067f00588dec0dd75ae0edbe SHA512 2c707806c09b87ce4211fc88b270688256fe5fdc697d3ea11b4d77b9b0ac636124f987c5fa9def893559b979eb6b9609cb1dc85a12424d22a88ffd1cdc4a3f3d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-data/metadata.xml b/games-fps/quake1-data/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-data/quake1-data-2.40.ebuild b/games-fps/quake1-data/quake1-data-2.40.ebuild
deleted file mode 100644
index b5b088ccdbbb..000000000000
--- a/games-fps/quake1-data/quake1-data-2.40.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if installing off of the 1.01 cd, need to fetch the
-#       quake shareware and use that pak0
-# http://linux.omnipotent.net/article.php?article_id=11287
-# ftp://ftp.cdrom.com/pub/idgames/idstuff/quake/quake106.zip
-
-EAPI=5
-inherit eutils cdrom games
-
-DESCRIPTION="iD Software's Quake 1 ... the data files"
-HOMEPAGE="http://www.idsoftware.com/games/quake/quake/"
-SRC_URI=""
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/lha"
-RDEPEND="!games-fps/quake1-demodata[symlink]"
-
-S=${WORKDIR}
-
-src_unpack() {
-	export CDROM_NAME_SET=("Existing Install" "Quake CD (1.01)" "Ultimate Quake Collection" "Quake CD (newer)")
-	cdrom_get_cds id1:q101_int.1:Setup/ID1:resource.1
-	if [[ ${CDROM_SET} == "1" ]] ; then
-		echo ">>> Unpacking q101_int.lha to ${PWD}"
-		cat "${CDROM_ROOT}"/q101_int.1 "${CDROM_ROOT}"/q101_int.2 > \
-			"${S}"/q101_int.exe
-		lha xqf "${S}"/q101_int.exe || die
-		rm -f q101_int.exe
-	elif [[ ${CDROM_SET} == "3" ]] ; then
-		echo ">>> Unpacking resource.1 to ${PWD}"
-		lha xqf "${CDROM_ROOT}"/resource.1 || die
-	fi
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/quake1/id1
-	case ${CDROM_SET} in
-		0)  doins "${CDROM_ROOT}"/id1/*
-		    dodoc "${CDROM_ROOT}"/*.txt
-		    ;;
-		1|3)doins id1/*
-		    dodoc *.txt
-		    ;;
-		2)  newins "${CDROM_ROOT}"/Setup/ID1/PAK0.PAK pak0.pak
-		    newins "${CDROM_ROOT}"/Setup/ID1/PAK1.PAK pak1.pak
-		    dodoc "${CDROM_ROOT}"/Docs/*
-		    ;;
-	esac
-	prepgamesdirs
-}
diff --git a/games-fps/quake1-demodata-1.06 b/games-fps/quake1-demodata-1.06
new file mode 100644
index 000000000000..a49f841f5619
--- /dev/null
+++ b/games-fps/quake1-demodata-1.06
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/lha app-arch/unzip
+DESCRIPTION=Demo data for Quake 1
+EAPI=5
+HOMEPAGE=https://en.wikipedia.org/wiki/Quake_I
+IUSE=symlink
+KEYWORDS=~amd64 ~x86
+LICENSE=quake1-demodata
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/quake/quake106.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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ad0828b814bf09bf39daf13960eca27f
diff --git a/games-fps/quake1-demodata/Manifest b/games-fps/quake1-demodata/Manifest
deleted file mode 100644
index 42a818047274..000000000000
--- a/games-fps/quake1-demodata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quake106.zip 9094045 BLAKE2B 39d639a7c4daf48bacfed3d8f7488131cabd61eba3d1969b23958f4f35ac7f693a165500a4a1cf2b917bb8d363d360a402c7100ba8f6b7083c7eaba1fe16756a SHA512 8960c48d9c3c8bb142fd812968d29f05304384bd559b5cdb1d2cb8b6faac84d30ebf9cdf5e5e4eb3739907d9b599ca2ba34035647c58a8ed1874bdc7f0b75e1d
-EBUILD quake1-demodata-1.06.ebuild 1649 BLAKE2B 0cb318c5343cec04bc601b03b08ce00c31f28ea67757e6ea066a1786b30399ebe0e5ad1f4df8ebb0f260b0d9fd63f204f5813676900cb93841022f73b3a787d7 SHA512 5e54e5e87fbe59ba0a08ffdeea300958ec4c7246fc984ef72e565028c328a4420ec4a51f55e181755e28a8f1572182a4a77badd225b04f45ca6b3dcafe88e98b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-demodata/metadata.xml b/games-fps/quake1-demodata/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-demodata/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
deleted file mode 100644
index 7b8a34815e89..000000000000
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator games
-
-MY_PV=$(delete_all_version_separators)
-MY_PN="quake"
-
-DESCRIPTION="Demo data for Quake 1"
-HOMEPAGE="https://en.wikipedia.org/wiki/Quake_I"
-SRC_URI="mirror://idsoftware/${MY_PN}/${MY_PN}${MY_PV}.zip"
-
-# See licinfo.txt
-LICENSE="quake1-demodata"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="symlink"
-
-RDEPEND=""
-DEPEND="app-arch/lha
-	app-arch/unzip"
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}1
-
-pkg_setup() {
-	games_pkg_setup
-
-	if has_version "games-fps/quake1-data" ; then
-		ewarn "games-fps/quake1-data already includes the demo data,"
-		ewarn "so this installation is not very useful."
-		echo
-		if use symlink ; then
-			eerror "The symlink for the demo data conflicts with the cdinstall data"
-			die "Remove the 'symlink' USE flag for this package"
-		fi
-		ebeep
-		epause
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# File rename for bug #159100
-	mv resource.{1,x}
-
-	lha xfq resource.x || die "lha failed"
-	# Don't want to conflict with the cdinstall files
-	mv id1 demo
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r demo
-
-	dodoc *.txt
-
-	if use symlink ; then
-		# Make the demo the default, so that people can just run it,
-		# without having to mess with command-line options.
-		cd "${D}/${dir}" && ln -sfn demo id1
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is just the demo data."
-	elog "You will still need a Quake 1 client, to play, such as darkplaces."
-	echo
-
-	if use symlink ; then
-		elog "id1 has been symlinked to demo, for convenience, within:"
-		elog "${dir}"
-		echo
-	fi
-}
diff --git a/games-fps/quake1-killer-2.2z b/games-fps/quake1-killer-2.2z
new file mode 100644
index 000000000000..1ddf27119850
--- /dev/null
+++ b/games-fps/quake1-killer-2.2z
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=The Killer Quake Patch
+EAPI=5
+HOMEPAGE=http://kqp.horoy.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=quake1-killer
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.gamers.org/pub/idgames2/quakec/compilations/kqp220z.zip mirror://gentoo/kqp220z.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_=d1a9d275ca56b48f0181efb1794355d2
diff --git a/games-fps/quake1-killer/Manifest b/games-fps/quake1-killer/Manifest
deleted file mode 100644
index 7018b29eb81f..000000000000
--- a/games-fps/quake1-killer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kqp220z.zip 2952348 BLAKE2B 1e31576e137d9943bc3eb62ceac9ca3e6e66f5081252422818f24fe8710f9ba5b2212dd5dff146ced751873872aa23fdb988b96d34ef157ec922fddcf7fdc15a SHA512 8149795435cf72c4358dc35cce473482b718b67cc799ce4739d975cf5fe3e856735cbcd1f40c7b6a345aee8bf830147ecb37e312b1cb141b40c14cc95fd0f56e
-EBUILD quake1-killer-2.2z.ebuild 646 BLAKE2B 01d5b2cacb23ed8dc71966aaf8d80ff140f82604a6dd404ca9fecdf10e0fb5c0b851f0b95cd09eed6da65ffb226113f82f1abacc199443799c9096f337d0468f SHA512 56fffc89e5cc1ebbb78052f529d1c4e7c095bf79d776578d5a86fa5e9becfe668085fe743445d1935b4ad7c7c0692e696e9dbb6cbbb051a4b70d2dc8267ac2e8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-killer/metadata.xml b/games-fps/quake1-killer/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-killer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild b/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
deleted file mode 100644
index 258296f7f514..000000000000
--- a/games-fps/quake1-killer/quake1-killer-2.2z.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="The Killer Quake Patch"
-HOMEPAGE="http://kqp.horoy.com/"
-SRC_URI="http://www.gamers.org/pub/idgames2/quakec/compilations/kqp220z.zip
-	mirror://gentoo/kqp220z.zip"
-
-LICENSE="quake1-killer"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	echo ">>> Unpacking kqp220z.zip to ${PWD}"
-	unzip -qoL "${DISTDIR}"/kqp220z.zip || die "unpacking kqp220z.zip failed"
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/quake1/killer"
-	doins -r *
-	prepgamesdirs
-}
diff --git a/games-fps/quake1-rally-1.2 b/games-fps/quake1-rally-1.2
new file mode 100644
index 000000000000..5c8c82ab0a48
--- /dev/null
+++ b/games-fps/quake1-rally-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=TC which turns Quake into a Rally racing game
+EAPI=5
+HOMEPAGE=http://wiki.quakeworld.nu/Quake_Rally
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://ehall.freeshell.org/quake/qr12.zip http://ehall.freeshell.org/quake/qrlo1.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_=2d6dae53a2bacb17e41261ea10382a7a
diff --git a/games-fps/quake1-rally/Manifest b/games-fps/quake1-rally/Manifest
deleted file mode 100644
index a4d4981e02b7..000000000000
--- a/games-fps/quake1-rally/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST qr12.zip 9885866 BLAKE2B a2fa1ad28033bd5530c53c132b44732325fcfc58585474859b6e3cc34c94751142ff69bcaf01062a8adb16e259583bae923c90d294b08ea7278862621c39a8b2 SHA512 a49b00e67b95c06b4898ad8e1f9e0a718c025736e7d68d3aa8e6ff9cf3062ea8a0cd0ea0deee5c2af8e3e30652c4420cd4b030b3bd8f1dd4ace9236bfaaf5e5a
-DIST qrlo1.zip 4086037 BLAKE2B 066945f0121efe38a222dc475d30d759ad50ab0c58f98e798955b18b3723001e2aeeac8d2627972bb3e9706786032ccf53e7fd96874815ae13f9167589435854 SHA512 94af61a0f6978c39425cbc414e094417deef99f109aac2905877b3723873657c3ef7d7ae7d3b247144d68eabbfb79750a654e627ac039d315ff0f2fd323f395d
-EBUILD quake1-rally-1.2.ebuild 929 BLAKE2B b446cebd96148077c9f0756cf711bd19c8b409e71521edc2e9ee8eb6150fb7517724077a003e3d2feca957b410d201a8739e907314bdb22b80c45b9b236ea659 SHA512 efba1aed594e9a8e759654165f7967c9e2c96409a3fbc117e07fd5800dd8b2741baf96840b3a4c5f477dc69493e7085734a1b857f5b73d5c9290c634badb913d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-rally/metadata.xml b/games-fps/quake1-rally/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-rally/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-rally/quake1-rally-1.2.ebuild b/games-fps/quake1-rally/quake1-rally-1.2.ebuild
deleted file mode 100644
index e7c086e83cbe..000000000000
--- a/games-fps/quake1-rally/quake1-rally-1.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="TC which turns Quake into a Rally racing game"
-HOMEPAGE="http://wiki.quakeworld.nu/Quake_Rally"
-SRC_URI="http://ehall.freeshell.org/quake/qr12.zip
-	http://ehall.freeshell.org/quake/qrlo1.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	echo ">>> Unpacking qr12.zip to ${PWD}"
-	unzip -qoLL "${DISTDIR}"/qr12.zip || die "unpacking qr12.zip failed"
-	echo ">>> Unpacking qrlo1.zip to ${PWD}"
-	unzip -qoLL "${DISTDIR}"/qrlo1.zip || die "unpacking qrlo1.zip failed"
-	rm -f button.wav qrally.exe
-	cd rally
-	edos2unix $(find . -name '*.txt' -o -name '*.cfg')
-	mv rally{,.example}.cfg
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/quake1"
-	doins -r *
-	prepgamesdirs
-}
diff --git a/games-fps/quake1-teamfortress-2.9 b/games-fps/quake1-teamfortress-2.9
new file mode 100644
index 000000000000..e9a4ecbb11af
--- /dev/null
+++ b/games-fps/quake1-teamfortress-2.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=The classic Team Fortress Quake World mod
+EAPI=5
+HOMEPAGE=http://www.planetfortress.com/teamfortress/
+KEYWORDS=~amd64 ~x86
+LICENSE=quake1-teamfortress
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/tf28.zip mirror://gentoo/tf29qw.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_=4a54fc04c928eb271148fdb7318dfc79
diff --git a/games-fps/quake1-teamfortress/Manifest b/games-fps/quake1-teamfortress/Manifest
deleted file mode 100644
index 7cb703baff5d..000000000000
--- a/games-fps/quake1-teamfortress/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST tf28.zip 4204316 BLAKE2B 9cb90e942d58380e8b9fd8ec527232d7461860621ed2bce888fadbbae03ad7c4cfb96035b74dc10c1a3124659869c161bb716178b7d7954fac2a6c828cbbef1f SHA512 2b158982fbf501712fa31fae7b8d34ce4adf41c7ada7c32549bc94ea7370f56b7ebb03f08f70c38c4e53a4ba49a95cbd23acda39eddc4a360d236cc0129a3262
-DIST tf29qw.zip 626175 BLAKE2B b480cfc0f3ce330142fc1816632b6da8207b532fac9f5e47fd93d4b1b8bc3fc02dbfc541f1ef052782db0ae6251bec90b09f384e607b6ec9272386b6e18623e4 SHA512 77ea488e5d9fcd3ad91317f2a35bd9e19ca38712cf9bf248bcfa88d1a5a66577ccc504476ecfb5d06bb7a28cd93ce92d3728f4be825c93567c8c2b61cb80c08d
-EBUILD quake1-teamfortress-2.9.ebuild 857 BLAKE2B 25253ea854401ca24110656b077c48c56c7e05d1b743880c9dfac41b5fffe59d682be0218259d4b0f9ffa16709924cd75876c2a730da870861fc1e2e5304ab08 SHA512 1ac13963cc26e7933374a42e33223cf2a06e20b862fa78c00758fd2450b2964794fac98c1fff552420b0e1ade02bf4ec7f665d7da2ab1a8555b666310494469b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-teamfortress/metadata.xml b/games-fps/quake1-teamfortress/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-teamfortress/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild b/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
deleted file mode 100644
index 19e52511fc51..000000000000
--- a/games-fps/quake1-teamfortress/quake1-teamfortress-2.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="The classic Team Fortress Quake World mod"
-HOMEPAGE="http://www.planetfortress.com/teamfortress/"
-SRC_URI="mirror://gentoo/tf28.zip
-	mirror://gentoo/tf29qw.zip"
-
-LICENSE="quake1-teamfortress"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	echo ">>> Unpacking tf28.zip to ${PWD}"
-	unzip -qoL "${DISTDIR}"/tf28.zip || die "unpacking tf28.zip failed"
-	cd fortress
-	echo ">>> Unpacking tf29qw.zip to ${PWD}"
-	unzip -qoL "${DISTDIR}"/tf29qw.zip || die "unpacking tf29qw.zip failed"
-
-	edos2unix $(find . -name '*.txt' -o -name '*.cfg')
-	mv server.cfg server.example.cfg
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/quake1"
-	doins -r *
-	prepgamesdirs
-}
diff --git a/games-fps/quake1-textures-20050820 b/games-fps/quake1-textures-20050820
new file mode 100644
index 000000000000..48e961cf8b3f
--- /dev/null
+++ b/games-fps/quake1-textures-20050820
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip || ( app-arch/unrar app-arch/rar )
+DESCRIPTION=Collection of graphical improvements for Quake 1
+EAPI=5
+HOMEPAGE=http://facelift.quakedev.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=quake1-textures
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=http://facelift.quakedev.com/download/SKINSbmodels-48files-4-23-05.zip http://facelift.quakedev.com/download/textures-486files-8-20-05.rar
+_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_=c8cb85ae0e5fc20acd93b9a5094e242d
diff --git a/games-fps/quake1-textures/Manifest b/games-fps/quake1-textures/Manifest
deleted file mode 100644
index f30678a7a3c0..000000000000
--- a/games-fps/quake1-textures/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST SKINSbmodels-48files-4-23-05.zip 12627945 BLAKE2B 0197f230ef0506aa2fe6ff47e270da9ccc28c78ac3f9e3f961e1026921723999606a41082072ea8c498d9ee49ad7a7c796c21566dc3a1fbab0ccfac2535921d4 SHA512 dcd39b7d8544d4c381b2917820e1cec193f4279eca1c2d1b260cfc0d019a224bef84b4cd6a19da37331913533541d90ac72ac119592eb95cc82c9e2bac8ab37e
-DIST textures-486files-8-20-05.rar 207799283 BLAKE2B 3c59200ded0fecf986261ebe9f85e63291e3c003821f5f8e6157bbe4731ceba98133d0bf98a0dd5ca4b5a52fe2f490e0c65e98e53dcf4f994f47e550f0c4f29e SHA512 3809bea3ff1d7bc7acff51d8f19890677a563778cfb418d3f6ae940ceffa8953a1cf10dd7cc3a5d30715e6d2e79331ec88dd72f1ba22ebec0d179a01ad0eda2a
-EBUILD quake1-textures-20050820.ebuild 1014 BLAKE2B a5cb1d36d13b9dfd8daa0f76a09435ff23a4f7d95bdb93f4db3210a907635a9b12ef09798362249c178850bde54f6ab3082d5e44b8be909fd3ee42a34f7f16d6 SHA512 338fcdfc6fb881239a231e2aad25ebaa1943030009632e9a2525a7c96b0665c327b631c38c3fb6f572aa4606b49c24a44febbc1d2a2d224442844d8f45264bad
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-textures/metadata.xml b/games-fps/quake1-textures/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake1-textures/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake1-textures/quake1-textures-20050820.ebuild b/games-fps/quake1-textures/quake1-textures-20050820.ebuild
deleted file mode 100644
index 4489581ed4ad..000000000000
--- a/games-fps/quake1-textures/quake1-textures-20050820.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_SKINS="SKINSbmodels-48files-4-23-05.zip"
-MY_TEXTURES="textures-486files-8-20-05.rar"
-
-DESCRIPTION="Collection of graphical improvements for Quake 1"
-HOMEPAGE="http://facelift.quakedev.com/"
-SRC_URI="http://facelift.quakedev.com/download/${MY_SKINS}
-	http://facelift.quakedev.com/download/${MY_TEXTURES}"
-
-LICENSE="quake1-textures"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	|| (
-		app-arch/unrar
-		app-arch/rar )"
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/quake1
-
-src_unpack() {
-	unpack ${A}
-
-	mv readme.txt skins.txt
-}
-
-src_install() {
-	insinto "${dir}"/id1/textures
-	doins -r *.tga
-
-	# Set up symlink, for the demo levels to include the textures
-	dosym "${dir}/id1/textures" "${dir}/demo/textures"
-
-	dodoc *.txt
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "Use a Quake 1 client (e.g. darkplaces) to take advantage of these."
-}
diff --git a/games-fps/quake2-data-3.20 b/games-fps/quake2-data-3.20
new file mode 100644
index 000000000000..2967195f0614
--- /dev/null
+++ b/games-fps/quake2-data-3.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=iD Software's Quake 2 ... the data files
+EAPI=5
+HOMEPAGE=http://www.idsoftware.com/
+IUSE=videos
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=Q2EULA
+PROPERTIES=interactive
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/quake2/q2-3.20-x86-full-ctf.exe
+_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_=fd31d09fe4b1001a0193f0bc9a902b70
diff --git a/games-fps/quake2-data/Manifest b/games-fps/quake2-data/Manifest
deleted file mode 100644
index dc41788d0bb1..000000000000
--- a/games-fps/quake2-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST q2-3.20-x86-full-ctf.exe 19267584 BLAKE2B a388035f1694f83ecb9fbbaf48668c190179cd62fd6b013c80dee02edf2a7eb02d5b26a382cc3e4e078fd39b95f04ca82ee74407b19ca2696cc226845b62ff14 SHA512 056a56f218f3fd7a3c5270665990bb347ce3e6f4aa8afa3b65a5d291d3b0cd149e3b58ed0cd136bd3edecb3c080f790f9dac68c63d19f095818720f0537b5bad
-EBUILD quake2-data-3.20.ebuild 2461 BLAKE2B 21c854632681c34036f8e61d19fd657fc6a5231c247cee4321db474e7bb2c56ff38b14228cb288d1699015681343e0d33c8d275bc51c2fbe2c55f69b41cd6855 SHA512 1c1bb1b8b8de1e0e66c9dc8ab3c1ab64660956f0707431fa8463b4c1f42d526f481d2850dd6509d970b7ca3eb62a347ff3cbc870bab4229cc296d2785e300637
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-data/metadata.xml b/games-fps/quake2-data/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake2-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake2-data/quake2-data-3.20.ebuild b/games-fps/quake2-data/quake2-data-3.20.ebuild
deleted file mode 100644
index 0a8b671417b7..000000000000
--- a/games-fps/quake2-data/quake2-data-3.20.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker eutils cdrom games
-
-DESCRIPTION="iD Software's Quake 2 ... the data files"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://idsoftware/quake2/q2-${PV}-x86-full-ctf.exe"
-
-LICENSE="Q2EULA"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE="videos"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	games_pkg_setup
-	if has_version "games-fps/quake2-demodata[symlink]" ; then
-		eerror "The symlink for the demo data conflicts with the cdinstall data"
-		die "Unmerge games-fps/quake2-demodata to remove the conflict"
-	fi
-}
-
-src_unpack() {
-	export CDROM_NAME_SET=("Existing Install" "Ultimate Quake Edition" "Quake2 CD" "Quake4 Bonus DVD")
-	cdrom_get_cds baseq2:Install/patch:Install:Movies
-	# The .exe is just a self-extracting .zip
-	unpack_zip ${A}
-}
-
-src_install() {
-	dodoc DOCS/* 3.20_Changes.txt
-	newdoc ctf/readme.txt ctf-readme.txt
-	case ${CDROM_SET} in
-		0) dohtml -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ;;
-		1) dohtml -r "${CDROM_ROOT}"/Install/Docs/quake2_manual/* ;;
-		2) dohtml -r "${CDROM_ROOT}"/Install/DOCS/quake2_manual/* ;;
-		3) dodoc "${CDROM_ROOT}"/Docs/* ;;
-	esac
-
-	local baseq2_cdpath
-	case ${CDROM_SET} in
-		0) baseq2_cdpath=${CDROM_ROOT}/baseq2;;
-		1) baseq2_cdpath=${CDROM_ROOT}/Install/Data/baseq2;;
-		2) baseq2_cdpath=${CDROM_ROOT}/Install/Data/baseq2;;
-		3) baseq2_cdpath=${CDROM_ROOT}/setup/Data/baseq2;;
-	esac
-
-	dodir "${GAMES_DATADIR}"/quake2/baseq2
-
-	if use videos ; then
-		insinto "${GAMES_DATADIR}"/quake2/baseq2/video
-		doins "${baseq2_cdpath}"/video/*
-	fi
-
-	insinto "${GAMES_DATADIR}"/quake2/baseq2
-	doins "${baseq2_cdpath}"/pak0.pak
-	doins baseq2/*.pak baseq2/maps.lst
-	dodir "${GAMES_DATADIR}"/quake2/baseq2/players
-	cp -R "${baseq2_cdpath}"/players/* baseq2/players/* \
-		"${D}/${GAMES_DATADIR}"/quake2/baseq2/players/ || die
-
-	for mod in ctf rogue xatrix ; do
-		if [[ -d ${baseq2_cdpath}/../${mod} ]] ; then
-			if use videos && [[ -d ${baseq2_cdpath}/../${mod}/video ]] ; then
-				insinto "${GAMES_DATADIR}"/quake2/${mod}/video
-				doins "${baseq2_cdpath}"/../${mod}/video/* 2>/dev/null
-			fi
-			if [[ -n $(ls "${baseq2_cdpath}"/../${mod}/*.pak 2>/dev/null) ]] ; then
-				insinto "${GAMES_DATADIR}"/quake2/${mod}
-				doins "${baseq2_cdpath}"/../${mod}/*.pak
-			fi
-		fi
-	done
-
-	insinto "${GAMES_DATADIR}"/quake2/ctf
-	doins ctf/*.{cfg,ico,pak}
-
-	prepgamesdirs
-}
diff --git a/games-fps/quake2-demodata-3.14 b/games-fps/quake2-demodata-3.14
new file mode 100644
index 000000000000..de4f95e11857
--- /dev/null
+++ b/games-fps/quake2-demodata-3.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip !games-fps/quake2-data
+DESCRIPTION=Demo data for Quake 2
+EAPI=5
+HOMEPAGE=https://en.wikipedia.org/wiki/Quake_II
+IUSE=symlink
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=quake2-demodata
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/quake2/q2-314-demo-x86.exe
+_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_=214729a3ef4c229b66724ff28a6f54b7
diff --git a/games-fps/quake2-demodata/Manifest b/games-fps/quake2-demodata/Manifest
deleted file mode 100644
index 52965c85ea5e..000000000000
--- a/games-fps/quake2-demodata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST q2-314-demo-x86.exe 39015499 BLAKE2B 1259d8e2481e5667a1a458e356593b026619a16d8dff32b664143121481f61b5e29129aac6b1aee0c0f0f12eee0f254965355f265c6c66d0ba3acab6e1b5983d SHA512 9aa5123807a64a6e3e3b113b582efd353f176f093fd0aae6bd01d9cff397374c06948a7147f59748b3aa6f4251769e409fae838157edb66429c9d41381b3df86
-EBUILD quake2-demodata-3.14.ebuild 1312 BLAKE2B fde56c8e7c52375e09293e8014aad9cff9044fb5fa5f05cc4fc5baf75e33d7862035144f1019777dd62224dd3a10c59330bf92a5b920cc9fb3a9759638641f1e SHA512 66d0d393d270e6364a58ee26ac9e7e26404431248483248915d557492230f29f8f1ed2cf9141dd4e78c49f8d63a9e091fdf7e0fa8fbb5cd1d5030c02551d700c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-demodata/metadata.xml b/games-fps/quake2-demodata/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake2-demodata/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild b/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
deleted file mode 100644
index cd68c344cd8a..000000000000
--- a/games-fps/quake2-demodata/quake2-demodata-3.14.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit unpacker eutils versionator games
-
-MY_PV=$(delete_all_version_separators)
-MY_PN="quake2"
-FILE="q2-${MY_PV}-demo-x86.exe"
-
-DESCRIPTION="Demo data for Quake 2"
-HOMEPAGE="https://en.wikipedia.org/wiki/Quake_II"
-SRC_URI="mirror://idsoftware/${MY_PN}/${FILE}"
-
-# See license.txt - it's a bit different to Q2EULA in Portage
-LICENSE="quake2-demodata"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE="symlink"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	!games-fps/quake2-data" # games-fps/quake2-data already includes the demo data
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/${MY_PN}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${dir}"/demo
-	doins -r Install/Data/baseq2/{pak0.pak,players}
-
-	dodoc Install/Data/DOCS/*.txt
-
-	if use symlink ; then
-		# Make the demo the default, so that people can just run it,
-		# without having to mess with command-line options.
-		cd "${D}/${dir}" && ln -sfn demo baseq2
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is just the demo data. To play, install a client"
-	elog "such as games-fps/qudos"
-	echo
-
-	if use symlink ; then
-		elog "baseq2 has been symlinked to demo, for convenience, within:"
-		elog "${dir}"
-		echo
-	fi
-}
diff --git a/games-fps/quake2-icculus-0.16.1-r1 b/games-fps/quake2-icculus-0.16.1-r1
new file mode 100644
index 000000000000..01450b2e5872
--- /dev/null
+++ b/games-fps/quake2-icculus-0.16.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[sound,joystick?,video] ) X? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) X? ( x11-base/xorg-proto ) rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) ) xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
+DESCRIPTION=The icculus.org Linux port of iD's Quake 2 engine
+EAPI=5
+HOMEPAGE=http://icculus.org/quake2/
+IUSE=aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl[sound,joystick?,video] ) X? ( x11-libs/libXxf86dga x11-libs/libXxf86vm ) cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://icculus.org/quake2/files/quake2-r0.16.1.tar.gz qmax? ( http://icculus.org/quake2/files/maxpak.pak ) rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z ) xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )
+_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_=b62c0dd88de38ab8fc508d94030e5242
diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
deleted file mode 100644
index dda2f9248fa8..000000000000
--- a/games-fps/quake2-icculus/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX 0.16-rogue-armor.patch 240 BLAKE2B 5643b1af747e3b6d34d21f8ee830d6d5bec91e356e724dfb66e6840df3a594af7ebfe9a442979801fc3096b35b6485f9cd41db3295b154cdf096526779e34fca SHA512 591fccd0cbc1225982b6d95d4818a4d0ff409717de8799b1d49f424633169d8a8187206220c24b60a341337aec2e297dfd8517dd478223e7d557ee85f6ecc453
-AUX 0.16-rogue-nan.patch 170 BLAKE2B 76beecbd38d07bad65595a049aea6802f7575d65e1640cef2a05ce5ecef8031d333af2df56995bcf2b420034e663896d89dadc362959786a92eea0078d609c3c SHA512 3d9b3a95a85a6fa39f2c6f7ad5e49b313b723bfb0fa88392f8690df27c16a7d6ad7617043b6fd66dc87cbbac9b01b941b8cbc8ecf4e045b908e844832c80d26a
-AUX README-postinstall 3083 BLAKE2B 364510b4eb37b6623e8346c74743b27156f99938fc9726929500c4488fd9d8a54b45d762586bfb43996d27f8aab09b2cd2feda08cad2aba0be534f4b8ca303e0 SHA512 cc7441ce14117ea765a7df98b3de0370b251f444289fd8aaa03c97ea5b383d626088977bc30dfc7a30124dedce4796b5d6392dad7e3d203ee2257d71a9b49bfe
-AUX quake2-icculus-0.16.1-alsa.patch 4386 BLAKE2B f85c0332ee7ff5fec98dcc5762cf63733f8442e76864cbd844dc19426f14eb22b4d3fec7fea8592fc9fe95cb55193324cefb87076fefb254cb7773cd2423f567 SHA512 8bb9e4d6f551ebe3e6715e044453affd7edd749650791fca32b5286038e75a59685c7d47efce8ac7b9dff488e6c2952dfdc68807f3365d276afb4b7387ad5dbc
-AUX quake2-icculus-0.16.1-amd64.patch 534 BLAKE2B 8f3afa80b23784a6683762a94b651b5999a7570ae954c87e5bf963ea52bf1fbdb3150c22715b4d4711b31892e3d67ef01bdfbb3285338add10bcbba0aaa335c2 SHA512 03faf4b85aa176a267847196fb56204b6d02bde0ebef858a34edb3c87cb41e57636d9b6e5b3be44163e918cb4b3ff38299b2db9de90690179108ee77146b942d
-AUX quake2-icculus-0.16.1-gcc41.patch 292 BLAKE2B 393df8fbd236fb3eb509fa640c650144e734f15baf3b1f985ca0a0d81810e227e87b4a19ceb5db95067b40370ce7dab1e641f48a9ecd00d7f0bcaa3726f9bc56 SHA512 87193f69670e7cd6573bd4ff550202fda2702a5d7dfadb3af31f673b8910958ec3718e0d7ae558666c6a6921c43d543626dc8eaa0e3822345f33aecdbdf7ee50
-AUX quake2-icculus-0.16.1-gentoo-paths.patch 6419 BLAKE2B ed3fe4cd3f812b6dda63bd017eca74a57dafe0ae56a877a30e814c486b4378a04a7c0525f71a13804f653febec5b6ff855be5cea3b8c4a4ca9bccf0e2d441e4f SHA512 91a83f82b013245256db386a212c044bfbd637e1685e532d2ca75959e6870e65f3763f6d83c85db184d46a0ed77b5d4a53c4f7421b55b82a4709bdfc70d0f307
-AUX quake2-icculus-0.16.1-gnusource.patch 316 BLAKE2B 344afcbda64c0a52e06a91cbcfd4a53f9badf8c0d25ac384525e84eff164a1f103df9289d5a691b413e5e1a1a2749872841ad18ff4e3517465fb1c1cd729edce SHA512 0e1bed0bfd7ab31ad574a17534a49e89b44ef99308b90d9a30726f7d39ec4606514643e064968a5d9e53dd7a20394d5a27162fba06f37713ee3bc1e65f31b76b
-AUX quake2-icculus-0.16.1-ia64.patch 2399 BLAKE2B e4dcbc6528f0859ac791627f4a043c479e8a6024c1947196d540e11e53f9909f1151f26b8eaa272e371190f7287f323304ab7f5518704702aad64569278d4ee3 SHA512 fce5f699ecabe8ca9f215507172be537c8850fc91ed44224a588780bf76901d60486c220d5bf821b70fe9d2687f6ec9d966b78008de1f6cf4f1ac3644bb66844
-AUX quake2-icculus-0.16.1-ldflags.patch 1537 BLAKE2B d91b2a7f43f50ef615628e62951701ae4d920f2d8e9cc6f4d5e55368c00c80f2fbc9940df1bcc786b51e85e28fbb43e0c70d04225002a22f302d01a4775185dd SHA512 c4a1dc06b02c227e0cbb8e289b2eab864f5f599f0f92cb376d2a6be7d746774b89fddba21c003c91908a9a140fe639e1588dcff28cccc1a531a6eff8e8f4ccf0
-AUX quake2-icculus-0.16.1-no-asm-io.patch 513 BLAKE2B dbfb2134697e0fdedb47019595a740dfc9c56fa0cb7e21f40cf3a785b20a859d63eb81917cf95157866fd467cd8b0e4f4a8ffa1a871b35679d68c4d77d64bca5 SHA512 ad2d62ce9c69f10683bd5a0970339c82acdf9543b802a0ed070fb025efab6b3aad6e352cc29de5e3120449a3b679823feb920dc175f33b00d230cb9082be3f16
-AUX quake2-icculus-0.16.1-x11_mouse.patch 330 BLAKE2B 0b3da68e551dd76104c29acb9956393d29cd74462c38e9546575ce8951bbf05a14d2f01bd1246aaee842b59e46b25e90fd64e889a5e113dc325aaf7aa948b4e1 SHA512 4387615cab034dd37fb502e7f7411a9cf5ac9370ef474e123c1ea550d79fb06c838ac1de6e443d3e9aeea73ec905bd7464f57f9a561d4eca90852abace20eea0
-AUX quake2-icculus-0.16.1-x11_soft.patch 1128 BLAKE2B 0a0ffe6ced6a6b18f2a1f888d4f329f49b0ddd1ab8c31b20e37cbb6de9dbc703e681ca117aac0eb9e5c98b9b5e5e35b9c3fa6edc6f1925bbbfc7f8d2e21b8e8f SHA512 c8d479919fd4440041d1f2e3a020c45cfb6522d6ff675845bd646c0b736d6ce4b400bcdf99b7f4d456938e8e946e02e40ebab4d574779fb86cff49e4213abc1f
-AUX quake2.xpm 1234 BLAKE2B 7525cb6b2be194822bd57554c7de5e4fcc9f7db9363e3216acac8dd13d8bd17810ff19f18000027f4de112b464a13aaf37c6be5370261283abac7d0a9f6ab8c4 SHA512 e7ed561123c2919a514ba7e4bcd32214bb368764cb53ad314b2816abefa0368247c0a9d463d9e96217c3583aa30f0f79b80bb5f798f6af857f4a0b069ab57e80
-DIST maxpak.pak 3282742 BLAKE2B 3ad4dd5aade5747b100a24499bae0f0d7fd5cc610e4671c1eafb3fc9fe50cbb955bb1d0d0cbaa19b08be7c07499c6a488200f1d811fb2fbe98e190dd58b324b8 SHA512 49eef504190323add8bbe6fd007ee51a17dc843898a2199a44a0b214a14da90202070f9eb025503c58b64d6306832bdb6c0d04efe927ea651eb83b0517a59782
-DIST quake2-r0.16.1.tar.gz 1525384 BLAKE2B b95db08ed3799d2788a20d24f63ea3a84d7ff4b581ee5f01dc5d588a1d5af50d52586a04ca28d9942e953d028e140112737432e499edcebf999085a29c63fcfb SHA512 63e8fa10446698b1f1cbd20b4bbfeec75d7620cb6454bb90b853cd2a3d6cd9040041a164666a5e015c3a8289423127f9164b500f57793505f6e4671dec932cf2
-DIST roguesrc320.shar.Z 626769 BLAKE2B f6d79630ee41e834ad07907f886766fdc9fd99152c2a1964629d2c74de259b9a232f691e5e3c4ad26ff3239d127f06d20878422dd7c1b896591db7c732a41ef7 SHA512 330db4966b758b8e363eb8d699b30ce5ec7d9fa581936288e7267000d0815996388adebc0206a8903734cdc1c5658616b15518a2bf888ad9e6059f8155960141
-DIST xatrixsrc320.shar.Z 455917 BLAKE2B 646801fad3c7eaac4957a971f507b13fff0ea6ae0423cb7fe8e8276666c4f89165384e2e2148e828b692533f9f582b64db849efe8d858e51026b9fb847282101 SHA512 6723440d3cfdaf7f9b260d5777d9823937a4c3ee800c8c204e8a5c3d29f2b37f6bdc7c0786025a19d040b5692aa54b99b9db2dc121bc0ca2b53c8763b4ab4dfa
-EBUILD quake2-icculus-0.16.1-r1.ebuild 5274 BLAKE2B a5b340d6375dfa039ab42159c94867b7e2123d2381cad6fbc1ac9c53cb97bfcd45adbaa698fe162d2de1813f2a6f5c3856b57e1f65278a86693c00a752ebcba9 SHA512 d3e70d7c722c9ea0dcb288e0c32ab3976a79dedb987844c0f2fff951874dd9ae9c1c1e83d3b6f0a31c882c8d73c6f553da94e90416a2e83d2d320d7ca16c4184
-MISC metadata.xml 612 BLAKE2B 0e452fab96a1eaa0cdbb5113cd957576e968eef662103403cef968ae05b909a3d3bc25939dfbb4d36a191d18853e1af0d342ce37cbd6a30defc4fb5ac9e4285c SHA512 0c143ca3470f6b33b35d660e3ad55678356e7139cab94589d18947617988f63f8c69485167d9d8c3e21ef231b0521f993a5063df26ae3e5e5cf4c64bee30d45b
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch b/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
deleted file mode 100644
index 194f965a0501..000000000000
--- a/games-fps/quake2-icculus/files/0.16-rogue-armor.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/rogue/g_local.h.orig
-+++ src/rogue/g_local.h
-@@ -545,9 +545,6 @@
- extern	int	sm_meat_index;
- extern	int	snd_fry;
- 
--extern	int	jacket_armor_index;
--extern	int	combat_armor_index;
--extern	int	body_armor_index;
- 
- 
- // means of death
diff --git a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch b/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
deleted file mode 100644
index 0961fa68a985..000000000000
--- a/games-fps/quake2-icculus/files/0.16-rogue-nan.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- src/rogue/g_local.h.orig
-+++ src/rogue/g_local.h
-@@ -24,3 +24,3 @@
- #ifndef _WIN32
--#include <nan.h>
-+#include <bits/nan.h>
- #define min(a,b) ((a) < (b) ? (a) : (b))
diff --git a/games-fps/quake2-icculus/files/README-postinstall b/games-fps/quake2-icculus/files/README-postinstall
deleted file mode 100644
index 3e2245f3bb0a..000000000000
--- a/games-fps/quake2-icculus/files/README-postinstall
+++ /dev/null
@@ -1,79 +0,0 @@
-This was taken from the README file in the source distribution
-and cleaned up a bit. Read all of this, or at least skim it. Please?
-
-Note:
-1. If you install a new compile of quake2, you'll lose your savegames. I'm 
-sorry. Don't upgrade in the middle of a single-player game.
-
-===============================================================================
-
-To emerge the Quake2 data:
---------------------------
-1. emerge quake2-data
-
-That was easy huh ? :)  Note: this requires the Quake2 CD and/or the data files
-from an installed copy of the game (like for windows).
-
-===============================================================================
-
-To install the Quake2 demo data:
---------------------------------
-1. download ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe
-2. unzip -L q2-314-demo-x86.exe into a temp directory
-3. cp baseq2/pak0.pak to /usr/share/games/quake2-data/baseq2/pak0.pak
-
-===============================================================================
-
-To install the Quake2 gamedata from game CD:
---------------------------------------------
-(assuming the cdrom is mounted at /cdrom)
-
-1. cp /cdrom/Install/Data/baseq2/pak0.pak  /usr/share/games/quake2-data/baseq2/
-
-2. cp /cdrom/Install/Data/baseq2/video/    /usr/share/games/quake2-data/baseq2/
-   (optional)
-   
-3. Download ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full.exe
-   and extract the contents to a temporary directory (use unzip -L, as this 
-   is a standard zip file).
-
-4. cp <temp directory>/baseq2/pak1.pak /usr/share/games/quake2-data/baseq2/
-5. cp <temp directory>/baseq2/pak2.pak /usr/share/games/quake2-data/baseq2/
-6. cp <temp directory>/baseq2/players/ /usr/share/games/quake2-data/baseq2/
-
-7. if you really want to use the crakhor model, you can find the
-   skins/sounds on websites like http://www.mike-d.com/games/modskins.html
-   (optional)
-
-===============================================================================
-
-Capture The Flag:
------------
-To run Capture The Flag, you need to do the following:
-
-1. Download ftp://ftp.idsoftware.com/idstuff/quake2/q2-3.20-x86-full-ctf.exe
-2. unzip that file (using unzip -L) into a temp directory
-3. cp <temp directory>/ctf /usr/share/games/quake2-data/
-
-Execute quake2 with:
-
-quake2 +set game ctf +set dedicated 1
- -- or --
-q2ded +set game ctf
-===============================================================================
-
-Joystick Support:
------------------
-Joystick should function on all compatible SDL platforms using the sdlquake2
-binary as well as on linux using the linux kernel joystick API.
-
-Joystick obeys the same free-look/strafe rules as mouse.  You can set these in
-the options menu.
-
-There are four command line settings for joystick:
-1. j_invert_y [1],0 if set to zero pulling back on the joystick points down
-2. j_lr_axis [0] set the axis which controls left right movement
-3. j_ud_axis [1] set the axis which controls up down (in free-look) or 
-   forward back (freelock off)
-4. j_throttle [3] set the axis which controls the players forward backward 
-   throttle (if free-look is true)
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
deleted file mode 100644
index 185359373c4b..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- src/linux/snd_alsa.c.old
-+++ src/linux/snd_alsa.c
-@@ -22,13 +22,22 @@
- 	$Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34 mr_bones_ Exp $
- */
- 
--#define BUFFER_SIZE 4096
-+//    quake2-r0.16.1/src/linux/snd_alsa.c 2010-08-29 09:58:50
-+//    Alsa Redux Patch
-+#define BUFFER_SIZE 16384
- 
- #include <alsa/asoundlib.h>
- 
- #include "../client/client.h"
- #include "../client/snd_loc.h"
- 
-+#define AFSize 4 
-+static int  snd_inited=0;
-+static snd_pcm_t *playback_handle;
-+static int AlsaFrames;
-+static int AlsaPos;
-+
-+/*
- #define snd_buf BUFFER_SIZE
- 
- static int  snd_inited;
-@@ -43,17 +52,58 @@
- cvar_t *snddevice;
- 
- static int tryrates[] = { 44100, 22051, 11025, 8000 };
--
-+*/
- qboolean SNDDMA_Init (void)
- {
--  int i;
--  int err;
--  int buffersize;
--  int framesize;
--  int format;
-+  int confirm;
-+  int latency;
-+  Com_Printf("Setting up ALSA driver .....\n");
- 
-   if (snd_inited) { return 1; }
--  
-+  int s_khz=(Cvar_Get("s_khz", "22", CVAR_ARCHIVE))->value;
-+  if (s_khz <22 ){
-+    Com_Printf("Low Performance 11KHz.\n");
-+    Cvar_Set("s_mixahead","0.2");
-+    dma.speed=11025;
-+    AlsaFrames=2048;
-+    latency=200000;
-+    }else{
-+    Com_Printf("High Quality 48KHz.\n");     
-+        Cvar_Set("s_mixahead","0.1");      
-+     dma.speed=48000;
-+    AlsaFrames=4800;
-+    latency=110000;}
-+
-+  dma.channels = 2;
-+  dma.samplebits = 16;
-+  AlsaPos = 0;
-+  playback_handle = NULL;
-+      confirm =
-+snd_pcm_open(&playback_handle,"default",SND_PCM_STREAM_PLAYBACK,SND_PCM_NONBLOCK);
-+      if (confirm < 0) {
-+            Com_Printf("ALSA sound error: cannot open device \n"); 
-+            return 0;}
-+        confirm = snd_pcm_set_params(playback_handle,
-+                    SND_PCM_FORMAT_S16_LE,
-+                                      SND_PCM_ACCESS_RW_INTERLEAVED,
-+                                      dma.channels,
-+                                      dma.speed,
-+                                      1,//soft resample
-+                                      latency);
-+     if (confirm < 0){ 
-+                Com_Printf("Alsa error: %s\n", snd_strerror(confirm));
-+                return 0;}
-+    confirm = snd_pcm_prepare(playback_handle);
-+        if (confirm  < 0) {
-+        Com_Printf("...failed.\n");
-+         return 0;}
-+
-+  int rambuffer = (BUFFER_SIZE+AlsaFrames)*AFSize;
-+  dma.buffer=malloc(rambuffer);    
-+  dma.samplepos = 0;
-+  dma.samples = BUFFER_SIZE*dma.channels;
-+  dma.submission_chunk = 16;
-+  /*
-   sndbits = Cvar_Get("sndbits", "16", CVAR_ARCHIVE);
-   sndspeed = Cvar_Get("sndspeed", "0", CVAR_ARCHIVE);
-   sndchannels = Cvar_Get("sndchannels", "2", CVAR_ARCHIVE);
-@@ -159,7 +209,6 @@
-     return 0;
-   }
- 
--  /*
-     buffer_size = snd_pcm_hw_params_get_buffer_size(hw_params);
-     frame_size = (snd_pcm_format_physical_width(format)*dma.channels)/8;
-     
-@@ -172,7 +221,6 @@
-     }
-     
-     snd_buf = buffer_size*frame_size;
--  */
- 
-   //snd_buf = BUFFER_SIZE;
- 
-@@ -183,7 +231,7 @@
-   dma.samples = snd_buf / (dma.samplebits/8);
-   dma.submission_chunk = 1;
-   dma.buffer = (char *)buffer;
--
-+  */
-   snd_inited = 1;
-   return 1;
- }
-@@ -191,11 +239,25 @@
- int
- SNDDMA_GetDMAPos (void)
- {
--  if(snd_inited)
--    return dma.samplepos;
--  else
--    Com_Printf ("Sound not inizialized\n");
--  return 0;
-+    int timerpos;
-+    int send;
-+    int taken;
-+    timerpos = snd_pcm_avail(playback_handle);
-+    if (timerpos<0){// likely buffer underrun.
-+        timerpos = snd_pcm_prepare(playback_handle);
-+        timerpos=0;}
-+
-+    send=AlsaFrames-timerpos;
-+    if ( (send+AlsaPos)>BUFFER_SIZE )
-+    {    memcpy (dma.buffer+BUFFER_SIZE*AFSize,
-+                dma.buffer,AlsaFrames*AFSize);}
-+    taken = snd_pcm_writei(playback_handle, dma.buffer+AlsaPos*AFSize, send);    
-+    if (taken<0) {taken=0;}    
-+
-+    AlsaPos+=taken;
-+    if (BUFFER_SIZE<=AlsaPos){AlsaPos -= BUFFER_SIZE;}
-+    return AlsaPos*dma.channels; 
-+
- }
- 
- void
-@@ -205,8 +267,8 @@
-     snd_pcm_drop(playback_handle);
-     snd_pcm_close(playback_handle);
-     snd_inited = 0;
-+    free(dma.buffer);
-   }
--  free(dma.buffer);
-   dma.buffer = NULL;
- }
- 
-@@ -217,13 +279,6 @@
- void
- SNDDMA_Submit (void)
- {
--  int written;
--  
--  if ((written = snd_pcm_writei(playback_handle, dma.buffer, snd_buf)) < 0) {
--    snd_pcm_prepare(playback_handle);
--    Com_Printf("alsa: buffer underrun\n");
--  }
--  dma.samplepos += written/(dma.samplebits/8);
- }
- 
- 
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
deleted file mode 100644
index b3291827996c..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-amd64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The default video renderers (softx / soft) currently do not work 
-on amd64.  So for now we add a little hack which will select the 
-glx renderer by default.
-
-http://bugs.gentoo.org/show_bug.cgi?id=86552
-
---- src/linux/vid_so.c
-+++ src/linux/vid_so.c
-@@ -435,6 +440,9 @@ VID_Init
- */
- void VID_Init (void)
- {
-+#if defined __x86_64__
-+	vid_ref = Cvar_Get ("vid_ref", "glx", CVAR_ARCHIVE);
-+#endif
- 	/* Create the video variables so we know how to start the graphics drivers */
- 	// if DISPLAY is defined, try X
- 	if (getenv("DISPLAY"))
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
deleted file mode 100644
index 626cf5a1b64d..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gcc41.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/xatrix/g_local.h.old
-+++ src/xatrix/g_local.h
-@@ -446,11 +446,6 @@
- extern	int	sm_meat_index;
- extern	int	snd_fry;
- 
--extern	int	jacket_armor_index;
--extern	int	combat_armor_index;
--extern	int	body_armor_index;
--
--
- // means of death
- #define MOD_UNKNOWN			0
- #define MOD_BLASTER			1
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
deleted file mode 100644
index 61f0bb2286e5..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gentoo-paths.patch
+++ /dev/null
@@ -1,213 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -74,35 +74,46 @@ endif
- 
- CC=gcc
- 
-+ifndef OPT_CFLAGS
- ifeq ($(ARCH),axp)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-+OPT_CFLAGS=-ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
- 
- ifeq ($(ARCH),ppc)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \
-+OPT_CFLAGS=-O2 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
- 
- ifeq ($(ARCH),sparc)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-+OPT_CFLAGS=-ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
- 
- ifeq ($(ARCH),i386)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -falign-loops=2 \
-+OPT_CFLAGS=-O2 -ffast-math -funroll-loops -falign-loops=2 \
- 	-falign-jumps=2 -falign-functions=2 -fno-strict-aliasing
- # compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts.
--#RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \
-+#OPT_CFLAGS=-O6 -m486 -ffast-math -funroll-loops \
- #	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
- #	-malign-jumps=2 -malign-functions=2
- endif
- 
- ifeq ($(ARCH),x86_64)
- _LIB := 64
--RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops \
-+OPT_CFLAGS=-O2 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations -fno-strict-aliasing
- endif
-+endif
-+RELEASE_CFLAGS=$(BASE_CFLAGS) $(OPT_CFLAGS)
-+
-+ifeq ($(ADDCFLAGS),debug)
-+CFLAGS=$(DEBUG_CFLAGS) -DLINUX_VERSION=\"$(VERSION) Debug\"
-+endif
-+
-+ifeq ($(ADDCFLAGS),release)
-+CFLAGS=$(RELEASE_CFLAGS) -DLINUX_VERSION=\"$(VERSION)\"
-+endif
- 
- VERSION=3.21+r0.16
- 
-@@ -133,6 +136,13 @@ else
- NET_UDP=net_udp
- endif
- 
-+ifdef DEFAULT_BASEDIR
-+BASE_CFLAGS += -DDEFAULT_BASEDIR=\"$(DEFAULT_BASEDIR)\"
-+endif
-+ifdef DEFAULT_LIBDIR
-+BASE_CFLAGS += -DDEFAULT_LIBDIR=\"$(DEFAULT_LIBDIR)\"
-+endif
-+
- ifeq ($(strip $(BUILD_QMAX)),YES)
- 	BASE_CFLAGS+=-DQMAX
- endif
-@@ -406,7 +424,7 @@
- 		$(BUILD_DEBUG_DIR)/ctf \
- 		$(BUILD_DEBUG_DIR)/xatrix \
- 		$(BUILD_DEBUG_DIR)/rogue
--	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) CFLAGS="$(DEBUG_CFLAGS) -DLINUX_VERSION='\"$(VERSION) Debug\"'"
-+	$(MAKE) targets BUILDDIR=$(BUILD_DEBUG_DIR) ADDCFLAGS=debug
- 
- build_release:
- 	@-mkdir -p $(BUILD_RELEASE_DIR) \
-@@ -418,7 +436,7 @@
- 		$(BUILD_RELEASE_DIR)/ctf \
- 		$(BUILD_RELEASE_DIR)/xatrix \
- 		$(BUILD_RELEASE_DIR)/rogue
--	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) CFLAGS="$(RELEASE_CFLAGS) -DLINUX_VERSION='\"$(VERSION)\"'"
-+	$(MAKE) targets BUILDDIR=$(BUILD_RELEASE_DIR) ADDCFLAGS=release
- 
- targets: $(TARGETS)
- 
---- src/linux/qgl_linux.c
-+++ src/linux/qgl_linux.c
-@@ -3006,13 +3006,17 @@ qboolean QGL_Init( const char *dllname )
- //				dllname, dlerror());
- 
- 		// try basedir next
--		path = ri.Cvar_Get ("basedir", ".", CVAR_NOSET)->string;
-+		path = ri.Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET)->string;
- 		
- 		snprintf (fn, MAX_OSPATH, "%s/%s", path, dllname );
- 
- 		if ( ( glw_state.OpenGLLib = dlopen( fn, RTLD_LAZY ) ) == 0 ) {
--			ri.Con_Printf( PRINT_ALL, "%s\n", dlerror() );
--			return false;
-+			path = ri.Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET)->string;
-+			snprintf (fn, MAX_OSPATH, "%s/%s", path, dllname );
-+			if ( ( glw_state.OpenGLLib = dlopen( fn, RTLD_LAZY ) ) == 0 ) {
-+				ri.Con_Printf( PRINT_ALL, "%s\n", dlerror() );
-+				return false;
-+			}
- 		}
- 		Com_Printf ("Using %s for OpenGL...", fn); 
- 	} else {
---- src/linux/vid_so.c
-+++ src/linux/vid_so.c
-@@ -237,13 +237,17 @@ qboolean VID_LoadRefresh( char *name )
- 	//regain root
- 	seteuid(saved_euid);
- 
--	path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string;
-+	path = Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET)->string;
- 
- 	snprintf (fn, MAX_OSPATH, "%s/%s", path, name );
- 	
- 	if (stat(fn, &st) == -1) {
--		Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno));
--		return false;
-+		path = Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET)->string;
-+		snprintf (fn, MAX_OSPATH, "%s/%s", path, name );
-+		if (stat(fn, &st) == -1) {
-+			Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno));
-+			return false;
-+		}
- 	}
- 	
- 	// permission checking
-@@ -493,13 +497,19 @@ qboolean VID_CheckRefExists (const char 
- 	char	*path;
- 	struct stat st;
- 
--	path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string;
-+	path = Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET)->string;
- 	snprintf (fn, MAX_OSPATH, "%s/ref_%s.so", path, ref );
- 	
- 	if (stat(fn, &st) == 0)
- 		return true;
--	else
--		return false;
-+	else {
-+		path = Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET)->string;
-+		snprintf (fn, MAX_OSPATH, "%s/ref_%s.so", path, ref );
-+		if (stat(fn, &st) == 0)
-+			return true;
-+		else
-+			return false;
-+	}
- }
- 
- /*****************************************************************************/
---- src/qcommon/files.c
-+++ src/qcommon/files.c
-@@ -60,6 +60,7 @@ typedef struct pack_s
- 
- char	fs_gamedir[MAX_OSPATH];
- cvar_t	*fs_basedir;
-+cvar_t	*fs_libdir;
- cvar_t	*fs_cddir;
- cvar_t	*fs_gamedirvar;
- 
-@@ -681,6 +682,7 @@ void FS_SetGamedir (char *dir)
- 		if (fs_cddir->string[0])
- 			FS_AddGameDirectory (va("%s/%s", fs_cddir->string, dir) );
- 		FS_AddGameDirectory (va("%s/%s", fs_basedir->string, dir) );
-+		FS_AddGameDirectory (va("%s/%s", fs_libdir->string, dir) );
- 		FS_AddHomeAsGameDirectory(dir);
- 	}
- }
-@@ -898,7 +900,13 @@ void FS_InitFilesystem (void)
- 	// basedir <path>
- 	// allows the game to run from outside the data tree
- 	//
--	fs_basedir = Cvar_Get ("basedir", ".", CVAR_NOSET);
-+	fs_basedir = Cvar_Get ("basedir", DEFAULT_BASEDIR, CVAR_NOSET);
-+
-+	//
-+	// libdir <path>
-+	// allows the game to store binary files (not data) in a sep tree
-+	//
-+	fs_libdir = Cvar_Get ("libdir", DEFAULT_LIBDIR, CVAR_NOSET);
- 
- 	//
- 	// cddir <path>
-@@ -913,6 +921,7 @@ void FS_InitFilesystem (void)
- 	// add baseq2 to search path
- 	//
- 	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
-+	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_libdir->string) );
- 
- 	//
- 	// then add a '.quake2/baseq2' directory in home directory by default
---- src/qcommon/qcommon.h
-+++ src/qcommon/qcommon.h
-@@ -74,6 +74,13 @@ Foundation, Inc., 59 Temple Place - Suit
- 
- #endif
- 
-+#ifndef DEFAULT_BASEDIR
-+# define DEFAULT_BASEDIR "."
-+#endif
-+#ifndef DEFAULT_LIBDIR
-+# define DEFAULT_LIBDIR DEFAULT_BASEDIR
-+#endif
-+
- //============================================================================
- 
- typedef struct sizebuf_s
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
deleted file mode 100644
index ad1f37309c30..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-gnusource.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- quake2-r0.16.1/src/linux/q_shlinux.c
-+++ quake2-r0.16.1-modified/src/linux/q_shlinux.c
-@@ -17,6 +17,9 @@
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- */
-+#if !defined(_GNU_SOURCE)
-+	#define _GNU_SOURCE
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <errno.h>
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
deleted file mode 100644
index ae1aa2e4068c..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ia64.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- quake2-r0.16.1.orig/Makefile
-+++ quake2-r0.16.1/Makefile
-@@ -54,24 +54,26 @@ endif
- 
- 
- # this nice line comes from the linux kernel makefile
- ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
- 
- ifneq ($(ARCH),x86_64)
- ifneq ($(ARCH),i386)
- ifneq ($(ARCH),axp)
-+ifneq ($(ARCH),ia64)
- ifneq ($(ARCH),ppc)
- ifneq ($(ARCH),sparc)
- $(error arch $(ARCH) is currently not supported)
- endif
- endif
- endif
- endif
- endif
-+endif
- 
- CC=gcc
- 
- ifndef OPT_CFLAGS
- ifeq ($(ARCH),axp)
- OPT_CFLAGS=-ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
-@@ -283,16 +285,46 @@ ifeq ($(ARCH),axp)
-   $(warning Warning: SDL support not supported for $(ARCH))
-  endif
- 
-  ifeq ($(strip $(BUILD_SDLGL)),YES)
-   $(warning Warning: SDLGL support not supported for $(ARCH))
-  endif
- endif # ARCH axp
- 
-+ifeq ($(ARCH),ia64)
-+ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
-+  TARGETS += $(BUILDDIR)/sdlquake2
-+ endif
-+
-+ ifeq ($(strip $(BUILD_SVGA)),YES)
-+  TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_X11)),YES)
-+  TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_GLX)),YES)
-+  TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_FXGL)),YES)
-+  TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_SDL)),YES)
-+  TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_SDLGL)),YES)
-+  TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT)
-+ endif
-+endif # ARCH ia64
-+
- ifeq ($(ARCH),ppc)
-  ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
-   TARGETS += $(BUILDDIR)/sdlquake2
-  endif
-  
-  ifeq ($(strip $(BUILD_SVGA)),YES)
-   $(warning Warning: SVGAlib support not supported for $(ARCH))
-  endif
---- quake2-r0.16.1.orig/src/linux/sys_linux.c
-+++ quake2-r0.16.1/src/linux/sys_linux.c
-@@ -216,16 +216,18 @@ void *Sys_GetGameAPI (void *parms)
- 	char	*path;
- 	char	*str_p;
- #if defined __i386__
- 	const char *gamename = "gamei386.so";
- #elif defined __x86_64__
- 	const char *gamename = "gamex86_64.so";
- #elif defined __alpha__
- 	const char *gamename = "gameaxp.so";
-+#elif defined __ia64__
-+	const char *gamename = "gameia64.so";
- #elif defined __powerpc__
- 	const char *gamename = "gameppc.so";
- #elif defined __sparc__
- 	const char *gamename = "gamesparc.so";
- #else
- #error Unknown arch
- #endif
- 
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
deleted file mode 100644
index 978c9c9820ea..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-ldflags.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.old
-+++ Makefile
-@@ -169,18 +169,18 @@
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
- 
- ifeq ($(OSTYPE),FreeBSD)
--LDFLAGS=-lm
-+LDLIBS=-lm
- endif
- ifeq ($(OSTYPE),Linux)
--LDFLAGS=-lm -ldl
-+LDLIBS=-lm -ldl
- endif
- 
- ifeq ($(strip $(BUILD_ARTS)),YES)
--LDFLAGS+=$(shell artsc-config --libs)
-+LDLIBS+=$(shell artsc-config --libs)
- endif
- 
- ifeq ($(strip $(BUILD_ALSA)),YES)
--LDFLAGS+=-lasound
-+LDLIBS+=-lasound
- endif
- 
- 
-@@ -226,7 +226,7 @@
- SHLIBEXT=so
- 
- SHLIBCFLAGS=-fPIC
--SHLIBLDFLAGS=-shared
-+SHLIBLDFLAGS=$(LDFLAGS) -shared
- 
- DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
- DO_DED_CC=$(CC) $(CFLAGS) -DDEDICATED_ONLY -o $@ -c $<
-@@ -518,10 +518,10 @@
- endif
- 
- $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/sdlquake2 : $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS) $(SDLLDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_SDL_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS) $(SDLLDFLAGS)
- 
- $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
- 	$(DO_CC)
-@@ -710,7 +710,7 @@
-        $(BUILDDIR)/ded/cd_null.o
- 
- $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
- 	$(DO_DED_CC)
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
deleted file mode 100644
index d94925b83e4b..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-no-asm-io.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/193107
-
-asm/io.h does not exist with sanitized kernel headers, nor do these source
-files actually need the header, so punt it
-
---- src/linux/rw_in_aa.c
-+++ src/linux/rw_in_aa.c
-@@ -46,7 +46,6 @@
- #include <sys/mman.h>

- 

- #if defined (__linux__)

--#include <asm/io.h>

- #include <sys/vt.h>

- #endif

- 

---- src/linux/rw_aa.c
-+++ src/linux/rw_aa.c
-@@ -63,7 +63,6 @@
- #include <dlfcn.h>

- #if defined (__linux__)

- #include <sys/vt.h>

--#include <asm/io.h>

- #endif

- #include <aalib.h>

- 

diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
deleted file mode 100644
index 6dc6f0f1ddfb..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_mouse.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/linux/rw_x11.c.old
-+++ src/linux/rw_x11.c
-@@ -989,8 +989,8 @@
- 	} 
- 	else 
- 	  {
--	    mx -= ((int)event.xmotion.x + mwx)*2;
--	    my -= ((int)event.xmotion.y + mwy)*2;
-+	    mx += ((int)event.xmotion.x - mwx)*2;
-+	    my += ((int)event.xmotion.y - mwy)*2;
- 	    mwx = event.xmotion.x;
- 	    mwy = event.xmotion.y;
- 	    
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
deleted file mode 100644
index e23caf9db09f..000000000000
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-x11_soft.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-
-the x11 software renderer just needs some tweaks to get working
-
---- Makefile.old
-+++ Makefile
-@@ -358,7 +358,7 @@
-  endif
- 
-  ifeq ($(strip $(BUILD_X11)),YES)
--  $(warning Warning: Software X Renderer not supported for $(ARCH))
-+  TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
-  endif
- 
-  ifeq ($(strip $(BUILD_GLX)),YES)
---- src/linux/rw_x11.c.old
-+++ src/linux/rw_x11.c
-@@ -53,7 +53,7 @@
- #include <X11/Xatom.h>
- #include <X11/keysym.h>
- #include <X11/extensions/XShm.h>
--#include <X11/extensions/xf86dga.h>
-+#include <X11/extensions/Xxf86dga.h>
- #ifdef OPENGL
- #include <X11/extensions/xf86vmode.h>
- #endif
-@@ -151,7 +151,7 @@
- int config_notify_height;
- 						      
- typedef unsigned short PIXEL16;
--typedef unsigned long PIXEL24;
-+typedef unsigned int PIXEL24;
- #ifdef REDBLUE
- static PIXEL16 st2d_8to16table_s[2][256];
- static PIXEL24 st2d_8to24table_s[2][256];
---- src/ref_soft/r_poly.c.old
-+++ src/ref_soft/r_poly.c
-@@ -994,7 +994,7 @@
- 		scale = yscale * pout->zi;
- 		pout->v = (ycenter - scale * transformed[1]);
- 
--		pv += sizeof (vec5_t) / sizeof (pv);
-+		pv += sizeof (vec5_t) / sizeof (float);
- 	}
- 
- // draw it
diff --git a/games-fps/quake2-icculus/files/quake2.xpm b/games-fps/quake2-icculus/files/quake2.xpm
deleted file mode 100644
index bbbcbb8f064f..000000000000
--- a/games-fps/quake2-icculus/files/quake2.xpm
+++ /dev/null
@@ -1,37 +0,0 @@
-/* XPM */
-static char * quake2_xpm[] = {
-"32 32 2 1",
-" 	c None",
-".	c #000000",
-"                                ",
-"         ..          ..         ",
-"        ..            ..        ",
-"       ..              ..       ",
-"      ..                ..      ",
-"     ..                  ..     ",
-"     ..                  ..     ",
-"    ..                    ..    ",
-"    ..                    ..    ",
-"    ..                    ..    ",
-"    ..                    ..    ",
-"    ..                    ..    ",
-"    ..                    ..    ",
-"    ..                    ..    ",
-"    ...                  ...    ",
-"    ...     ........     ...    ",
-"     ...     ......     ...     ",
-"     ....    ..  ..    ....     ",
-"      ....   ..  ..   ....      ",
-"       ........  ........       ",
-"        ................        ",
-"         ..............         ",
-"           ..........           ",
-"             ......             ",
-"             ..  ..             ",
-"             ..  ..             ",
-"             ..  ..             ",
-"             ..  ..             ",
-"             ..  ..             ",
-"             ..  ..             ",
-"             ..  ..             ",
-"             ..  ..             "};
diff --git a/games-fps/quake2-icculus/metadata.xml b/games-fps/quake2-icculus/metadata.xml
deleted file mode 100644
index 62d0273c2558..000000000000
--- a/games-fps/quake2-icculus/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="demo">Install the demo files (quake2-demodata) and configure for use</flag>
-    <flag name="qmax">Build the pretty version (quake max)</flag>
-    <flag name="rogue">Build support for the 'Ground Zero' Mission Pack (rogue)</flag>
-    <flag name="xatrix">Build support for the 'The Reckoning' Mission Pack (xatrix)</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
deleted file mode 100644
index 38e4fb6d071a..000000000000
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.1-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-MY_P="quake2-r${PV}"
-DESCRIPTION="The icculus.org Linux port of iD's Quake 2 engine"
-HOMEPAGE="http://icculus.org/quake2/"
-SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
-	qmax? ( http://icculus.org/quake2/files/maxpak.pak )
-	rogue? ( mirror://idsoftware/quake2/source/roguesrc320.shar.Z )
-	xatrix? ( mirror://idsoftware/quake2/source/xatrixsrc320.shar.Z )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="aalib alsa cdinstall dedicated demo ipv6 joystick opengl qmax rogue sdl X xatrix"
-
-UIDEPEND="aalib? ( media-libs/aalib )
-	alsa? ( media-libs/alsa-lib )
-	opengl? ( virtual/opengl )
-	sdl? ( media-libs/libsdl[sound,joystick?,video] )
-	X? (
-		x11-libs/libXxf86dga
-		x11-libs/libXxf86vm
-	)"
-RDEPEND="${UIDEPEND}
-	cdinstall? ( games-fps/quake2-data )
-	demo? ( games-fps/quake2-demodata )"
-DEPEND="${UIDEPEND}
-	X? ( x11-base/xorg-proto )
-	rogue? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )
-	xatrix? ( || ( sys-freebsd/freebsd-ubin app-arch/sharutils ) )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	games_pkg_setup
-
-	if ! use qmax && $( use opengl || use sdl ) ; then
-		elog "The 'qmax' graphical improvements are recommended."
-		echo
-	fi
-}
-
-src_prepare() {
-	# Now we deal with the silly rogue / xatrix addons ... this is ugly :/
-	ln -s $(type -P echo) "${T}"/more
-	for g in rogue xatrix ; do
-		use ${g} || continue
-		mkdir -p src/${g}
-		pushd src/${g}
-		local shar=../../../${g}src320.shar
-		sed -i -e 's:^read ans:ans=yes :' ${shar} || die
-		echo ">>> Unpacking ${shar} to ${PWD}"
-		env PATH="${T}:${PATH}" unshar ${shar} || die
-		popd
-	done
-	sed -i -e 's:jpeg_mem_src:_&:' src/ref_candygl/gl_image.c || die
-
-	sed -i -e 's:BUILD_SOFTX:BUILD_X11:' Makefile || die
-	# -amd64.patch # make sure this is still needed in future versions
-	epatch \
-		"${FILESDIR}"/${P}-amd64.patch \
-		"${FILESDIR}"/${P}-gentoo-paths.patch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-no-asm-io.patch \
-		"${FILESDIR}"/${P}-gnusource.patch \
-		"${FILESDIR}"/${P}-x11_soft.patch \
-		"${FILESDIR}"/${P}-x11_mouse.patch \
-		"${FILESDIR}"/${P}-alsa.patch \
-		"${FILESDIR}"/${P}-ia64.patch
-
-	if use xatrix ; then
-		epatch "${FILESDIR}/${P}"-gcc41.patch
-	fi
-	if use rogue ; then
-		cd src
-		epatch \
-			"${FILESDIR}"/0.16-rogue-nan.patch \
-			"${FILESDIR}"/0.16-rogue-armor.patch
-	fi
-}
-
-yesno() {
-	for f in "$@" ; do
-		if ! use $f ; then
-			echo NO
-			return 1
-		fi
-	done
-	echo YES
-	return 0
-}
-
-src_compile() {
-	# xatrix fails to build
-	# rogue fails to build
-	local libsuffix
-	for BUILD_QMAX in YES NO ; do
-		! use qmax && [[ ${BUILD_QMAX} == "YES" ]] && continue
-		[[ ${BUILD_QMAX} == "YES" ]] \
-			&& libsuffix=-qmax \
-			|| libsuffix=
-		emake -j1 clean
-		emake -j1 build_release \
-			BUILD_SDLQUAKE2=$(yesno sdl) \
-			BUILD_SVGA=NO \
-			BUILD_X11=$(yesno X) \
-			BUILD_GLX=$(yesno opengl) \
-			BUILD_SDL=$(yesno sdl) \
-			BUILD_SDLGL=$(yesno sdl opengl) \
-			BUILD_CTFDLL=YES \
-			BUILD_XATRIX=$(yesno xatrix) \
-			BUILD_ROGUE=$(yesno rogue) \
-			BUILD_JOYSTICK=$(yesno joystick) \
-			BUILD_DEDICATED=$(yesno dedicated) \
-			BUILD_AA=$(yesno aalib) \
-			BUILD_QMAX=${BUILD_QMAX} \
-			HAVE_IPV6=$(yesno ipv6) \
-			BUILD_ARTS=NO \
-			BUILD_ALSA=$(yesno alsa) \
-			SDLDIR=/usr/lib \
-			DEFAULT_BASEDIR="${GAMES_DATADIR}/quake2" \
-			DEFAULT_LIBDIR="$(games_get_libdir)/${PN}${libsuffix}" \
-			OPT_CFLAGS="${CFLAGS}" \
-			CC="$(tc-getCC)"
-		# now we save the build dir ... except for the object files ...
-		rm release*/*/*.o
-		mv release* my-rel-${BUILD_QMAX}
-		cd my-rel-${BUILD_QMAX}
-		rm -rf ref_{gl,soft} ded game client ctf/*.o
-		mkdir baseq2
-		mv game*.so baseq2/
-		cd ..
-	done
-}
-
-src_install() {
-	local q2dir=$(games_get_libdir)/${PN}
-	local q2maxdir=$(games_get_libdir)/${PN}-qmax
-
-	dodoc readme.txt README TODO "${FILESDIR}"/README-postinstall
-
-	# regular q2 files
-	dodir "${q2dir}"
-	cp -rf my-rel-NO/* "${D}/${q2dir}"/
-	dogamesbin "${D}/${q2dir}"/quake2
-	rm "${D}/${q2dir}"/quake2
-	use dedicated \
-		&& dogamesbin "${D}/${q2dir}"/q2ded \
-		&& rm "${D}/${q2dir}"/q2ded
-	use sdl \
-		&& dogamesbin "${D}/${q2dir}"/sdlquake2 \
-		&& rm "${D}/${q2dir}"/sdlquake2
-
-	doicon "${FILESDIR}"/quake2.xpm
-	make_desktop_entry quake2 "Quake 2" quake2
-
-	# q2max files
-	if use qmax ; then
-		dodir "${q2maxdir}"
-		cp -rf my-rel-YES/* "${D}/${q2maxdir}"/ || die
-		newgamesbin "${D}/${q2maxdir}"/quake2 quake2-qmax
-		rm "${D}/${q2maxdir}"/quake2
-		use dedicated \
-			&& newgamesbin "${D}/${q2maxdir}"/q2ded q2ded-qmax \
-			&& rm "${D}/${q2maxdir}"/q2ded
-		use sdl \
-			&& newgamesbin "${D}/${q2maxdir}"/sdlquake2 sdlquake2-qmax \
-			&& rm "${D}/${q2maxdir}"/sdlquake2
-
-		insinto "${q2maxdir}"/baseq2
-		doins "${DISTDIR}"/maxpak.pak
-
-		make_desktop_entry quake2-qmax Quake2-qmax quake2
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "Go read README-postinstall in /usr/share/doc/${PF}"
-	elog "right now! It's important - This install is just the engine, you still need"
-	elog "the data paks. Go read."
-
-	if use demo && ! has_version "games-fps/quake2-demodata[symlink]" ; then
-		ewarn "To play the Quake 2 demo,"
-		ewarn "emerge games-fps/quake2-demodata with the 'symlink' USE flag."
-		echo
-	fi
-}
diff --git a/games-fps/quake2-textures-0_beta8 b/games-fps/quake2-textures-0_beta8
new file mode 100644
index 000000000000..2ae8122da3ab
--- /dev/null
+++ b/games-fps/quake2-textures-0_beta8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=High-resolution textures for Quake 2
+EAPI=5
+HOMEPAGE=http://jdolan.tastyspleen.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://jdolan.tastyspleen.net/pak8.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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6ff988b0f7fef663efa81cfe414b0dba
diff --git a/games-fps/quake2-textures/Manifest b/games-fps/quake2-textures/Manifest
deleted file mode 100644
index 0165b697f978..000000000000
--- a/games-fps/quake2-textures/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pak8.zip 15099933 BLAKE2B 297c56b3115462c627febbc5cbcba684a3c36e01f088fe975793c7980abbf274fe721668aa0d6b5a4d5ab6b893fd774be0dda73eb2585bbae05cc11b8fb48e1b SHA512 2d51e3e97796e1ad86894767374bb335f5da59852aacc2dead622c4e51f4b73258c5a852561afbc6c6df54149424e96b3d433179864f7d52af81d9445ada8337
-EBUILD quake2-textures-0_beta8.ebuild 782 BLAKE2B eb293dc21a0be2c1a731a460fcf970e06bb5ecf975be32cab385f4548b9852b548c96df277fae3f063e964ee4012a64c23dd7399e5b7c7a6888c2c284d4ffbd3 SHA512 3daf6ae686340dbfaee5d6920171c24b0986864cf3eb8e7e3c98d8c9b1a0e5ac0fc55895be23662b24b2d276dedd2624188446c0c69e9955fc864d1b1cdd4ead
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake2-textures/metadata.xml b/games-fps/quake2-textures/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake2-textures/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake2-textures/quake2-textures-0_beta8.ebuild b/games-fps/quake2-textures/quake2-textures-0_beta8.ebuild
deleted file mode 100644
index 7c3cf3832513..000000000000
--- a/games-fps/quake2-textures/quake2-textures-0_beta8.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator games
-
-MY_PV=$(get_version_component_range 2-2)
-MY_PV=${MY_PV/beta/}
-
-DESCRIPTION="High-resolution textures for Quake 2"
-HOMEPAGE="http://jdolan.tastyspleen.net/"
-SRC_URI="http://jdolan.tastyspleen.net/pak${MY_PV}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND=""
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/quake2
-
-src_install() {
-	insinto "${dir}"/baseq2
-	doins *.pak
-
-	dodoc README
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "Use a recent Quake 2 client to take advantage of"
-	elog "these textures, e.g. qudos or quake2-icculus."
-	echo
-}
diff --git a/games-fps/quake3-1.36-r1 b/games-fps/quake3-1.36-r1
new file mode 100644
index 000000000000..89bdeaa6b338
--- /dev/null
+++ b/games-fps/quake3-1.36-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) )
+DESCRIPTION=Quake III Arena - 3rd installment of the classic id 3D first-person shooter
+EAPI=5
+HOMEPAGE=https://ioquake3.org/
+IUSE=dedicated opengl teamarena +openal curl vorbis voice mumble
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena ) games-misc/games-envd
+SLOT=0
+SRC_URI=https://ioquake3.org/files/1.36/ioquake3-1.36.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=043aff3c4f0fa4f939150a2ae1a407cf
diff --git a/games-fps/quake3-9999 b/games-fps/quake3-9999
new file mode 100644
index 000000000000..577ee5f4778a
--- /dev/null
+++ b/games-fps/quake3-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Quake III Arena - 3rd installment of the classic id 3D first-person shooter
+EAPI=5
+HOMEPAGE=https://ioquake3.org/
+IUSE=dedicated opengl teamarena +openal curl vorbis voice mumble
+LICENSE=GPL-2
+RDEPEND=opengl? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) !dedicated? ( virtual/opengl media-libs/libsdl[sound,video,joystick,X,opengl] virtual/jpeg:0 openal? ( media-libs/openal ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voice? ( media-libs/speex ) curl? ( net-misc/curl ) ) opengl? ( voice? ( mumble? ( media-sound/mumble ) ) ) !dedicated? ( voice? ( mumble? ( media-sound/mumble ) ) ) games-fps/quake3-data teamarena? ( games-fps/quake3-teamarena ) games-misc/games-envd
+SLOT=0
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=952f84458b68c4f5e1fff99f5e3c6682
diff --git a/games-fps/quake3-alliance-3.3-r1 b/games-fps/quake3-alliance-3.3-r1
new file mode 100644
index 000000000000..dda282a8b2ca
--- /dev/null
+++ b/games-fps/quake3-alliance-3.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Alliance - fast paced, off-handed grapple mod
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/alliance/alliance30.zip http://www.superkeff.net/mods/mods/alliance/alliance30.zip mirror://quakeunity/modifications/alliance/alliance30-33.zip http://www.superkeff.net/mods/mods/alliance/alliance30-33.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b0d7356ba67d467ecad512796a91c07
diff --git a/games-fps/quake3-alliance/Manifest b/games-fps/quake3-alliance/Manifest
deleted file mode 100644
index e075888ac71b..000000000000
--- a/games-fps/quake3-alliance/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST alliance30-33.zip 1995207 BLAKE2B 7a04b2fe357ea88e004ec2dc0aa72d70221725ce3acbdedda301c8601c5e5623b77fb61fbc17e4830b9ce138f190a9983b5a1f46219389f70566c76f2e09ee9b SHA512 e5cebec74e5c61d983453217b0a26f3111a23b76f9e20a5840231d45ca7323105dca983ee33e2d185902a353b5b882ddc488888a62b7ee38a000371e3f5dde61
-DIST alliance30.zip 60476973 BLAKE2B d29bb3b26d1b5d6b3558a548c1a3347e6a9368c048760167bd0f7bf48ca16edddfcde7ce003c217c4007b2a72f0f45a74216c8934a4ab2c41258aebc6520f9b7 SHA512 c48a5d78a85d667e0fd1d6ed321f716f932195fb48a479bc5405df50a50a4cd67e7d35b5a61080255e56b16eaa19acd7f394ed8fce320716d1a6c3f1be41107d
-EBUILD quake3-alliance-3.3-r1.ebuild 631 BLAKE2B eed742c44ad13a6928acc9acc5ac87c29d11f8e2f57348e39fbff5dd945dd29b0401b345f253dc42d6508edb8a791a0e3062655704c9acca2a1033c2f8716cdc SHA512 73d1a5eee90304cdb96dc44a01d8eea237147a077827dfc2df4bc553ddb90da93b6da6a2cc916f2a0f96853a2c6d94e64f399a3f2d21fbdf6a58d9fbb94b153e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-alliance/metadata.xml b/games-fps/quake3-alliance/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-alliance/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild b/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
deleted file mode 100644
index 730bbf5f5b7f..000000000000
--- a/games-fps/quake3-alliance/quake3-alliance-3.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="fast paced, off-handed grapple mod"
-MOD_NAME="Alliance"
-MOD_DIR="alliance"
-
-inherit games games-mods
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://quakeunity/modifications/alliance/alliance30.zip
-	http://www.superkeff.net/mods/mods/alliance/alliance30.zip
-	mirror://quakeunity/modifications/alliance/alliance30-33.zip
-	http://www.superkeff.net/mods/mods/alliance/alliance30-33.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f *.exe
-}
diff --git a/games-fps/quake3-alternatefire-2.0-r1 b/games-fps/quake3-alternatefire-2.0-r1
new file mode 100644
index 000000000000..423ea36db92e
--- /dev/null
+++ b/games-fps/quake3-alternatefire-2.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Alternate Fire - adds unique new secondary attacks to weapons
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/alternatefire/alternatefire-2.0.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6f6d2da5cd790406218985b56fe6db9c
diff --git a/games-fps/quake3-alternatefire/Manifest b/games-fps/quake3-alternatefire/Manifest
deleted file mode 100644
index 1d2b7dba7b1c..000000000000
--- a/games-fps/quake3-alternatefire/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX server.cfg 3645 BLAKE2B 0653366f94bb7f00194f7dcd3afdd7826dc35bea50d897f185fc9b052d6bceef3420c80a701e6a9af8c90373ea94d46068bae3fd5e7f3870dc240d2dd5c5cd77 SHA512 a7b4d64adad075ba7ee7af3461ef36216fd374d852267ba712882549d44c137f7638ac100c31081528e6b384865cba6fcdeeccdb22bb0133bcac869e60c30e6f
-DIST alternatefire-2.0.zip 2015159 BLAKE2B 7e291c88d479dacf3bf7e7141faf10cd401ab660f2363818af0458a142484dd27e744a7a8fc9c99246a0938ca7e5cddbfa58cd7410189788d8daf4180eebf498 SHA512 178c5470037e711c58cb09854d7e607166253a6f613c29f23fbbcd46cdff8786dfd53770dfc9d518d75d9a3e42b0745bfaa742a09bad0493dbd335d1bb3fcbf2
-EBUILD quake3-alternatefire-2.0-r1.ebuild 450 BLAKE2B c8f5458b09d55559c6b40c2122243798b43c8f68d36e3f40c44a6475e107176da2c2704552fdcfc822397b4f1849db42d2a6f5b8e21292c89ce95ff86da371fe SHA512 6a1639946e6e0df8183844780bddc641a87cb9d9d980382f3f7c4b785cfdc3b36ad9a1e916adbbe6e74ec6de406c5c248692a7975685bc758f9976440f6405bd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-alternatefire/files/server.cfg b/games-fps/quake3-alternatefire/files/server.cfg
deleted file mode 100644
index 0ee5c8a202e3..000000000000
--- a/games-fps/quake3-alternatefire/files/server.cfg
+++ /dev/null
@@ -1,109 +0,0 @@
-// Sample .cfg file for the Alternate Fire mod

-// ==================================================================

-

-// It's set up for CTF, since that's my favorite game type :)

-// (besides, the lightning web is just awesome in CTF).

-

-// ---- General setup ----

-

-seta sv_pure 1

-seta sv_hostname "Gentoo - Alternate Fire"

-seta sv_maxclients 10

-seta sv_floodprotect 0

-seta g_motd "Welcome to AlternateFire"

-seta g_allowVote 1

-

-// Kick 'em after 3 minutes if they go inactive

-seta g_inactivity 180

-

-// Yes, they do need the z-alternatefire-0xx.pk3

-// Make sure it's in the right place ("alternatefire", not "baseq3")

-// (If you're running this on Linux, put it in ~/.q3a/alternatefire

-// or it won't upload)

-seta sv_allowDownload 1

-// Also, make sure you remove the old .pk3 when you upgrade!

-

-// ---- Bots ----

-

-seta bot_enable 1

-// This is per-team in team games

-seta bot_minplayers 4

-

-// ---- Game parameters ----

-

-// 0 - Free For All, 1 - Tournament, 

-// 3 - Team Deathmatch, 4 - Capture the Flag 

-seta g_gametype 4

-seta capturelimit 8

-seta timelimit 20

-seta g_friendlyFire 0

-

-// ---- Extra-special new stuff ----

-

-// Uncomment this if you want no falling damage

-//g_fallingDamage 0

-

-// Uncomment this if you want self damage to only damage armor

-// Set it to 0 to disable self damage altogether (default: 2)

-//g_selfDamage 1

-

-// Uncomment this if you like to play CTF the "old" way

-// (the player only has to touch his flag to return it)

-//g_returnFlag 0

-

-// Uncomment this if you want a mad, mad, mad game of

-// multi-flag CTF (everyone can have their own flag!)

-//g_multiFlag 1

-

-// Uncomment this if you want an offhand grapple

-// Your players will need to bind +button6 to something,

-// or set up their grapples in SETUP->CONTROLS->SHOOT

-// WARNING: The grappling hook IS NOT client-side predicted,

-// which means it's awful for anybody with a ping over 100

-//g_offhandGrapple 1

-

-// ---- Chat/Name Filter ----

-

-// ** PLEASE READ THE README BEFORE ENABLING THESE OPTIONS **

-

-// Uncomment this to force every client's chat filter on

-// They can override this in the GAME OPTIONS menu - which

-// means that setting this really just makes the chat filter

-// opt-out

-//g_forceChatFilter 1

-

-// Uncomment this to force every client's name filter and

-// kick players with dirty names

-//g_forceNameFilter 1

-

-// ** Be careful with the next two - the chat filter may

-//    act differently than you think.  Read the README. **

-

-// Use this to add words for chat filtering (separate words

-// with spaces, use an underscore ("_") in place of a space

-// if you need to filter phrases)

-//g_filteredWords

-

-// Use this to filter additional names - same format as above

-//g_filteredNames "bin_laden terrorist"

-

-// ---- Map rotation ----

-

-// An id/threewave CTF map rotation

-// Even if you don't use this rotation, I suggest using "d1"

-// as the command for the first map, since players can vote

-// to reset the map rotation.  That action will set nextmap

-// to "vstr d1".

-set d1 "map q3ctf1; set nextmap vstr d2"

-set d2 "map q3wctf2; set nextmap vstr d3"

-set d3 "map q3ctf4; set nextmap vstr d4"

-set d4 "map q3wctf1; set nextmap vstr d5"

-set d5 "map q3ctf2; set nextmap vstr d6"

-set d6 "map q3wctf3; set nextmap vstr d7"

-set d7 "map q3ctf3; set nextmap vstr d1"

-vstr d1

-

-// If you want to change the game type (and other things) per map, do stuff like this:

-//set d1 "set g_gametype 0; set fraglimit 20; map q3dm17; set nextmap vstr d2"

-//set d2 "set g_gametype 1; set fraglimit 15; set timelimit 10; map q3tourney3; set nextmap vstr d1"

-//vstr d1

diff --git a/games-fps/quake3-alternatefire/metadata.xml b/games-fps/quake3-alternatefire/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-alternatefire/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild b/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
deleted file mode 100644
index d0d7066df6a7..000000000000
--- a/games-fps/quake3-alternatefire/quake3-alternatefire-2.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="adds unique new secondary attacks to weapons"
-MOD_NAME="Alternate Fire"
-MOD_DIR="alternatefire"
-
-inherit games games-mods
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://quakeunity/modifications/alternatefire/alternatefire-${PV}.zip"
-
-LICENSE="freedist"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
diff --git a/games-fps/quake3-bfp-1.2-r1 b/games-fps/quake3-bfp-1.2-r1
new file mode 100644
index 000000000000..1fb10c89ea0f
--- /dev/null
+++ b/games-fps/quake3-bfp-1.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Bid For Power - Control Ki-powered superheros and battle in the air
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/bid-for-power
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/bidforpower/bidforpower1-2.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=82ce2b643d31291b67a12ab674e7af47
diff --git a/games-fps/quake3-bfp/Manifest b/games-fps/quake3-bfp/Manifest
deleted file mode 100644
index acbb9fe576e8..000000000000
--- a/games-fps/quake3-bfp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bidforpower1-2.zip 129645741 BLAKE2B 4ed67fc9470d3c1a74beceeaee95f6ab4fc64fe4630884b83418773d9e80bb54a44c9486c8b694f16621b49f21fde82fee7af5d052a7c66b15bd4fd3ce3e8822 SHA512 9559af36f6efa46e7d20e4a4dc1293ddf8e5bf310672eebdc3f04536e926c05ce699819adaba2c9a29794815a7b766ed9f70b4d83121196f675cb0d221e77b18
-EBUILD quake3-bfp-1.2-r1.ebuild 465 BLAKE2B b0c137d13e6ef823e2012c72d8043721a0e96b7ab717927a499744515fd8b7fd126742be67472e009ad222e96ed398025e08c4272a06af233110633a159837de SHA512 45e095332b91534c0cbf485acde94530caf32cf8789896e93ca59423e5bcedbc801c959ad4e037679c8b3c1354ca60d5daec67a2fea708d689df789354f3a93f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-bfp/metadata.xml b/games-fps/quake3-bfp/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-bfp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild b/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
deleted file mode 100644
index a16a448c5598..000000000000
--- a/games-fps/quake3-bfp/quake3-bfp-1.2-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Control Ki-powered superheros and battle in the air"
-MOD_NAME="Bid For Power"
-MOD_DIR="bfpq3"
-MOD_ICON="bfp.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/bid-for-power"
-SRC_URI="mirror://quakeunity/modifications/bidforpower/bidforpower${PV/./-}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
diff --git a/games-fps/quake3-bin-1.32c-r2 b/games-fps/quake3-bin-1.32c-r2
new file mode 100644
index 000000000000..274c68a5357a
--- /dev/null
+++ b/games-fps/quake3-bin-1.32c-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=3rd installment of the classic id 3D first-person shooter
+EAPI=5
+HOMEPAGE=http://www.idsoftware.com/
+IUSE=cdinstall dedicated teamarena
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Q3AEULA GPL-2
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) cdinstall? ( games-fps/quake3-data[cdinstall] teamarena? ( games-fps/quake3-teamarena ) ) dedicated? ( app-misc/screen ) !dedicated? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run mirror://idsoftware/quake3/quake3-1.32c.zip
+_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_=a0bc945e7234ec4dacfaa4b2c9811139
diff --git a/games-fps/quake3-bin/Manifest b/games-fps/quake3-bin/Manifest
deleted file mode 100644
index a1c828549e5a..000000000000
--- a/games-fps/quake3-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX q3ded.conf.d 193 BLAKE2B 4086b386dee78761016c70f1ac41abab18af899be3df072bddcfea39ce300cf2979c63b765b9050b7b3eb3206d3f9d38071e105db1b49527fcc24eca5f09ef4a SHA512 231ad60874f701efcd85010fbe41d6891db9c7e926d56c88993c5c9025c33884bfb11d83578858cb5b564d2596198cb90da123e67a53e219d08a69c3968e06ff
-AUX q3ded.rc 742 BLAKE2B 920ef23fe62051714850e39e36224fdd2bd7b22b00e77f40a2166582c55e24008286aed21a8acd2b7059940e59ddfac4e2b9b3dbba09c60d07f8bc1900a2c903 SHA512 930b278c0f9ea227b1d64a8167aee72d58ff4f564e46846d4028de8128e66651c47dd52eca12c21e34e3bdbe43a44ae3a6dde6993b556aaf933dad596e027396
-DIST linuxq3apoint-1.32b-3.x86.run 30923961 BLAKE2B 79585534d930a466af58cd34acaac7b9d95da2ad665525b7f7d9ad2e05f3efe5f94b7958b5adca8dd8f687b37d82323a76a701af4bd2cf6011df1e4cc59f4ca9 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78
-DIST quake3-1.32c.zip 3056760 BLAKE2B ad328cde18afba538236fac97d76081f69dd2c92c0c4068cb0ec2605ada8a8beb6668dd01d05724d0536db8e3e6668ac64958758510c3e3d9dd674fde8cdcabf SHA512 8bc68d4a1e015e5d5abb88bee1e52cb6375c005d707147869d16383bdbfd37f092a75e8fb3f8678120621433d98de40dcda9dbdbd255a92399caec2c545ff689
-EBUILD quake3-bin-1.32c-r2.ebuild 2999 BLAKE2B 042725801c1116ee1778782bf3f6bc75aa4dd57161789ae0f705effb8f780db3c994fdd989ae070fab59090b06a8b42d15df0665105b060d61608e8c492b98e8 SHA512 64fcd21454b0967b31bdd8481bba00f46429806b4f8a0010e75a8f9c4576d3fd6e5b4ffdee505ede74e4d0db75e402b2bbcebb34605beb1a803334b6ceb03dc1
-MISC metadata.xml 1151 BLAKE2B 1eeb20916d7e617f8171e4be5b19994699c4c154e6aab0aec07f99d6c927d380e350bc48c989de25a0b5e2e52543d35ac81cc8f5044e0c5c713c3d77df009ebc SHA512 3a76be6152f7b32374df36281551036dcf9a98531347b24250c83dd12ad7c267cb0271c8ad747f312e2cdec2a4ff1c8f66b9ee9898fc58f7b9c78092cbc99ecd
diff --git a/games-fps/quake3-bin/files/q3ded.conf.d b/games-fps/quake3-bin/files/q3ded.conf.d
deleted file mode 100644
index 5ecb89b6c445..000000000000
--- a/games-fps/quake3-bin/files/q3ded.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-q3_OPTS="+set com_hunkmegs 24 +set dedicated 1 +set net_port 27960 +map q3tourney2"
-
diff --git a/games-fps/quake3-bin/files/q3ded.rc b/games-fps/quake3-bin/files/q3ded.rc
deleted file mode 100644
index 1faaf0384e3b..000000000000
--- a/games-fps/quake3-bin/files/q3ded.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting Quake3 dedicated server"
-	screen -A -m -d -S q3ded-bin su - games -c "q3ded-bin ${q3_OPTS}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Quake3 dedicated server"
-	local pid=`screen -list | grep q3ded-bin | awk -F . '{print $1}' | sed -e s/.//`
-	if [[ -z "${pid}" ]] ; then
-		eend 1 "Lost screen session"
-	else
-		pid=`pstree -p ${pid} | sed -e 's:^.*q3ded-bin::'`
-		pid=${pid:1:${#pid}-2}
-		if [[ -z "${pid}" ]] ; then
-			eend 1 "Lost q3ded-bin session"
-		else
-			kill ${pid}
-			eend $? "Could not kill q3ded-bin"
-		fi
-	fi
-}
-
-status() {
-	screen -list | grep q3ded-bin
-}
diff --git a/games-fps/quake3-bin/metadata.xml b/games-fps/quake3-bin/metadata.xml
deleted file mode 100644
index 7af61d9d28bf..000000000000
--- a/games-fps/quake3-bin/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Quake III Arena is the third installment of the extremely popular and 
-successful Quake series by id software.  The game was released by id 
-software for both Windows and Linux.  The Linux version of the game was 
-maintained and sold by the now defunct Loki Entertainment.  The powerful 
-Quake III engine is the basis for many other commercial games, as id's 
-major source of revenue is licensing their game engines.  The engine 
-allows for user-contributed modifications to be made, allowing the game 
-to be extensible and expandable.  This game is commercial software, and 
-requires the data from a retail copy of the game to play.  If you're 
-interested in checking out the technology behind Quake III, then 
-"emerge quake3-demo" to get the playable demo.
-</longdescription>
-  <use>
-    <flag name="teamarena">Adds support for Team Arena expansion pack</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild b/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
deleted file mode 100644
index e8b0f6c18faf..000000000000
--- a/games-fps/quake3-bin/quake3-bin-1.32c-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://www.idsoftware.com/"
-SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.x86.run
-	mirror://idsoftware/quake3/quake3-1.32c.zip"
-
-LICENSE="Q3AEULA GPL-2" #gpl for init script bug #425942
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall dedicated teamarena"
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	cdinstall? (
-		games-fps/quake3-data[cdinstall]
-		teamarena? ( games-fps/quake3-teamarena )
-	)
-	dedicated? ( app-misc/screen )
-	!dedicated? (
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	)"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/quake3
-Ddir=${D}/${dir}
-
-QA_TEXTRELS="${dir:1}/pb/pbag.so
-	${dir:1}/pb/pbcl.so
-	${dir:1}/pb/pbsv.so"
-
-src_unpack() {
-	unpack_makeself linuxq3apoint-1.32b-3.x86.run
-	unpack quake3-1.32c.zip
-}
-
-src_install() {
-	dodir "${dir}"/{baseq3,missionpack}
-	if use cdinstall ; then
-		dosym "${GAMES_DATADIR}"/quake3/baseq3/pak0.pk3 "${dir}"/baseq3/pak0.pk3
-		use teamarena && dosym "${GAMES_DATADIR}"/quake3/missionpack/pak0.pk3 \
-			"${dir}"/missionpack/pak0.pk3
-	fi
-	for pk3 in baseq3/*.pk3 missionpack/*.pk3 ; do
-		dosym "${GAMES_DATADIR}"/quake3/${pk3} "${dir}"/${pk3}
-	done
-
-	insinto "${dir}"
-	doins -r Docs pb || die "ins docs/pb"
-
-	exeinto "${dir}"
-	doins quake3.xpm README* Q3A_EULA.txt
-	if ! use dedicated ; then
-		doexe "Quake III Arena 1.32c"/linux/quake3*.x86 || die "doexe"
-		games_make_wrapper ${PN} ./quake3.x86 "${dir}" "${dir}"
-		newicon quake3.xpm ${PN}.xpm
-		make_desktop_entry ${PN} "Quake III Arena (binary)"
-		if use teamarena ; then
-			games_make_wrapper ${PN}-teamarena \
-				"./quake3.x86 +set fs_game missionpack" "${dir}" "${dir}"
-			make_desktop_entry ${PN}-teamarena \
-				"Quake III Team Arena (binary)" quake3-bin
-		fi
-	fi
-	doexe "Quake III Arena 1.32c"/linux/q3ded || die "doexe q3ded"
-	games_make_wrapper quake3-ded ./q3ded "${dir}" "${dir}"
-	newinitd "${FILESDIR}"/q3ded.rc quake3-ded
-	newconfd "${FILESDIR}"/q3ded.conf.d quake3-ded
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "There are two possible security bugs in this package, both causing a"
-	ewarn "denial of service. One affects the game when running a server, the"
-	ewarn "other when running as a client."
-	ewarn "For more information, please see bug #82149."
-
-	if ! use dedicated; then
-		echo
-		elog "To start the game, run:"
-		elog " quake3-bin"
-	fi
-	echo
-	elog "To start a dedicated server, run"
-	elog "  /etc/init.d/quake3-ded start"
-	elog
-	elog "The dedicated server is started under the ${GAMES_USER_DED} user account."
-
-	# IA32 Emulation required for amd64
-	if use amd64 ; then
-		echo
-		ewarn "NOTE: IA32 Emulation must be compiled into your kernel for Quake3 to run."
-	fi
-}
diff --git a/games-fps/quake3-cpma-1.48 b/games-fps/quake3-cpma-1.48
new file mode 100644
index 000000000000..e915ee4ce1c9
--- /dev/null
+++ b/games-fps/quake3-cpma-1.48
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Challenge Pro Mode Arena - advanced FPS competition mod
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://packages.vstone.eu/quake3/install/cpma148-nomaps.zip http://packages.vstone.eu/quake3/install/cpma-mappack-full.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7921d7b9678a39a00af2509d49ebf4f9
diff --git a/games-fps/quake3-cpma/Manifest b/games-fps/quake3-cpma/Manifest
deleted file mode 100644
index b1743b56113e..000000000000
--- a/games-fps/quake3-cpma/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX server.cfg 2977 BLAKE2B 33b58ebd3f75dc0ccb08ee1c059b61a2b13c44ede5433dc133a3bc70aae700629c45b7e8926a8e78f719b8960d478ec58fbff6dda5ce2a0646dceef85867108b SHA512 bf380b227eb2c1fcb0365bf930d6c89410942ecc1dec42d1cff1017d9bf3a1164126cb4a22e94b2f3baa3874a520650702b2013fb9b41e7be91151d543106045
-DIST cpma-mappack-full.zip 122543145 BLAKE2B a5a3884612715d370d8455ff08a7edf4122df73994551ac3a5e11e3acb779a7eeaf1688d03db560fdb3750abc96350bb9f86364558df93b12a61ad9800beded7 SHA512 bbc1ddd378f76ece224403ac7e1aeb1de2fec2756f438be07fb8f018e5e8cc6679cbf574eac51ce75daa0ee53b8b095ce5b46dffbd120df5450039ce754b9b37
-DIST cpma148-nomaps.zip 8045352 BLAKE2B f73fac90fe4aa8f862ca71b930fd37ebbf076c4050c020952e54895b40814a1e0865ca7ddc3c55a1425603a91ece51fafcb10ff8e863524580e0a9147d044e05 SHA512 6908065a98922774f3b80924a7286fe9008dea0e6e5e7d808e07d9d474bebf30c3e4ca2cd2587c93903095213fbaaff4154d309fd0ca002e80e871c99631c120
-EBUILD quake3-cpma-1.48.ebuild 635 BLAKE2B cd43801cc2ba8fa6b864ae576f1feaa14e834d3db96298c50a7b7f28a2d875d7bc3f1f6e95c2b7109440256e516ec43e0281b988198332d2ce0dccb5e3ce2e44 SHA512 17457bec277ab1626e28f929719748e8ddb6e8e561c8d1a48b2827f55f3db3165447ce2abf19f792e4fa8f27223ad74d8790053481b9ca7901a222b1586893dd
-MISC metadata.xml 2140 BLAKE2B 2754a5009f48d11395932b039a46d789b4d29b4a3e9c47c650550a8c0bf5a934206d5b7231f6f4f15a8feaf965e4eb51a9b60c3bc9a9fc4cc257ef334dbd0398 SHA512 3ee4c8bb057183cc7aa852ce76fb793c9372ecfac8569eb9b8361e1c18d659f907424098733f3fe3ad24eb141ea97e354a6a8d813c0f5fb3e6f2de70bcefcebf
diff --git a/games-fps/quake3-cpma/files/server.cfg b/games-fps/quake3-cpma/files/server.cfg
deleted file mode 100644
index 352d1e8e69fd..000000000000
--- a/games-fps/quake3-cpma/files/server.cfg
+++ /dev/null
@@ -1,146 +0,0 @@
-// Server Information
-//=========================
-sets ".admin" ""
-sets ".email" ""
-sets ".www" ""
-sets ".location" ""
-sets ".irc" ""
-
-
-seta sv_pure 1
-seta server_ospauth 1
-seta sv_hostname "CPMA"
-seta sv_maxclients 13
-seta sv_privateclients 1
-seta admin_log "adm.log"
-seta logfile 3
-seta g_log "games.log"
-seta filter_file ""
-seta log_default 0
-seta log_stat 0
-seta viewcam_directory ""
-
-
-seta sv_maxping 0
-seta sv_minping 0
-seta server_maxrate 25000
-seta sv_minrate 0
-seta server_maxpacketsmax 100
-seta server_minpacketsmax 30
-seta server_timenudgemax 100
-seta server_timenudgemin -25
-seta sv_allowdownload 1
-seta sv_floodprotect 0
-seta server_customclient 15
-seta server_pure 1
-seta server_promode 0
-seta server_realping 1
-seta server_thrufloors 1
-seta pmove_fixed 1
-seta pmove_msec 8
-seta g_inactivity 600
-seta bot_enable 0
-
-
-// MOTD Text
-//=========================
-seta server_motd1 "This server is powered by Gentoo Linux"
-seta server_motd2 ""
-seta server_motd3 ""
-seta server_motd4 ""
-
-
-// Password Settings
-//=========================
-set g_password ""
-seta ref_password "none"
-seta rconpassword ""
-seta sv_privatePassword ""
-
-
-// Set GameType Clan Arena
-//=========================
-seta g_gametype 5
-seta scorelimit 5
-
-
-// Match Settings
-//=========================
-seta g_doWarmup 0
-seta g_warmup 5
-seta match_mutespecs 0
-seta match_roundtimer 5
-seta match_timeoutcount 0
-seta match_timeoutlength 60
-seta match_hurtself 0
-seta match_startrespawn 0
-seta server_fallingdamage 0
-seta server_healthdamageself 0
-seta server_healthdamageteam 0
-seta server_armordamageself 0
-seta server_armordamageteam 0
-seta server_startrespawn 0
-
-
-// Vote/Callvote Settings
-//=========================
-seta g_allowVote 1
-seta vote_limit 10
-seta vote_percent 80
-
-
-seta vote_allow_armordamage 0
-seta vote_allow_fallingdamage 0
-seta vote_allow_flood 0
-seta vote_allow_map 1
-seta vote_allow_kick 1
-seta vote_allow_mutespecs 1
-seta vote_allow_referee 1
-seta vote_allow_limit 1
-seta vote_allow_bfg 0
-seta vote_allow_pure 0
-seta vote_allow_promode 0
-seta vote_allow_maxpackets 0
-seta vote_allow_timenudge 0
-seta vote_allow_startrespawn 0
-seta vote_allow_arenatype 0
-seta vote_allow_items 0
-seta vote_allow_altgraphics 0
-seta vote_allow_exec 0
-seta vote_allow_fastrail 0
-seta vote_allow_hook 0
-seta vote_allow_instagib 1
-seta vote_allow_lgcooldown 0
-seta vote_allow_allcaptain 0
-seta vote_allow_armor 1
-seta vote_allow_armorsystem 0
-seta vote_allow_overtime 0
-seta vote_allow_pmove 0
-seta vote_allow_poweruprespawn 0
-seta vote_allow_scorelimit 1
-seta vote_allow_teamdamage 0
-seta vote_allow_timelimit 0
-seta vote_allow_vstr 1
-seta vote_allow_weaponrespawn 0
-
-
-// Map Settings
-//=========================
-seta map_queue 1
-seta map_rotate 0
-seta map_once 1
-seta map_random 1
-seta map_nocount 0
-seta map_halt 0
-
-
-seta item_disable 1023
-seta powerup_disable 255
-seta weapon_deaddrop 0
-seta weapon_have 127
-seta weapon_start 8
-
-
-// Load This Map by Default
-//=========================
-map q3tourney5
diff --git a/games-fps/quake3-cpma/metadata.xml b/games-fps/quake3-cpma/metadata.xml
deleted file mode 100644
index a5a834212f58..000000000000
--- a/games-fps/quake3-cpma/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-The Challenge Pro Mode (CPM) project was created by Richard 'Hoony' Sandlant in May 1999 
-(when the 'Q3test' was released) after he realised that Quake 3 Arena was going to have a 
-lot of "newbie-friendly" features and after John Carmack admitted a more challenging 
-version might be better for professional gamers (which is where the name "pro mode" came 
-from).
-
-The Challenge Pro Mode's goals were, first and foremost, to make a more exciting and 
-challenging game to play and we hoped that this would help advance Q3 into a professional 
-sport. Along the way we made a choice between making only small conservative changes to 
-Q3A, and making the changes that our design team recommended. We took the path of making 
-the changes that our design team felt were necessary.
-
-Our approach was to form an international project team and to separate "Design" from 
-"Programming". While the programming team might have input into the design process they 
-didn't make final design decisions - that was left to a team of experienced Quake players 
-who tested changes using a "tweaks" mod. The design team consisted of players with a mix 
-of competitive experience across Q1, Q2, Q3 and even UT.
-
-Before the design team began their work we asked the community to 'brainstorm' a list 
-(called the "candidates list") of all the possible changes they would like to see (some 
-were contradictory). We also asked noted commentators (pundits) in the community what they 
-thought might be best. The designers took note of all of these suggestions, and used a 
-long process of tweaking and testing to develop the Challenge Pro Mode design. The team 
-released two public betas of their work for feedback and input from the community.
-
-And that is pretty much how the project team has worked ever since. The result is a 
-gameplay design which we think is "finely tuned".
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild b/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
deleted file mode 100644
index 91092175ebe1..000000000000
--- a/games-fps/quake3-cpma/quake3-cpma-1.48.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="advanced FPS competition mod"
-MOD_NAME="Challenge Pro Mode Arena"
-MOD_DIR="cpma"
-
-inherit games games-mods
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="http://packages.vstone.eu/quake3/install/cpma${PV//.}-nomaps.zip
-	http://packages.vstone.eu/quake3/install/cpma-mappack-full.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	mv -f *.pk3 ${MOD_DIR} || die
-}
-
-pkg_postinst() {
-	games-mods_pkg_postinst
-	elog "To enable bots: +bot_enable 1"
-}
diff --git a/games-fps/quake3-data-1.32b b/games-fps/quake3-data-1.32b
new file mode 100644
index 000000000000..e12403b8e922
--- /dev/null
+++ b/games-fps/quake3-data-1.32b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Quake III Arena - data portion
+EAPI=5
+HOMEPAGE=http://icculus.org/quake3/
+IUSE=cdinstall
+KEYWORDS=~alpha ~amd64 ~x86 ~x86-fbsd
+LICENSE=Q3AEULA
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.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_=8f357e93cf472b179787f6862478396d
diff --git a/games-fps/quake3-data/Manifest b/games-fps/quake3-data/Manifest
deleted file mode 100644
index 0a9447256798..000000000000
--- a/games-fps/quake3-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST linuxq3apoint-1.32b-3.x86.run 30923961 BLAKE2B 79585534d930a466af58cd34acaac7b9d95da2ad665525b7f7d9ad2e05f3efe5f94b7958b5adca8dd8f687b37d82323a76a701af4bd2cf6011df1e4cc59f4ca9 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78
-EBUILD quake3-data-1.32b.ebuild 1167 BLAKE2B aa47c948c8623134d14d585c52d2ac6a49f42377dca0bf0a8e789ca4f29ea50dbacfcaa5a154a48f28366b8005392c6f81f9b187e975d4ef968c37d020db14e9 SHA512 57bede2c620392fa1407e768c63e0fa9f8733ecdc1a63612b8854d458e4cb40745e546391ac661c65fb6a40f16b9bec076972f84f7646f463e7de2199918a7c8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-data/metadata.xml b/games-fps/quake3-data/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-data/quake3-data-1.32b.ebuild b/games-fps/quake3-data/quake3-data-1.32b.ebuild
deleted file mode 100644
index bc98a7d7c2e5..000000000000
--- a/games-fps/quake3-data/quake3-data-1.32b.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CDROM_OPTIONAL="yes"
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Quake III Arena - data portion"
-HOMEPAGE="http://icculus.org/quake3/"
-SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
-
-LICENSE="Q3AEULA"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}
-dir=${GAMES_DATADIR}/quake3
-
-src_unpack() {
-	use cdinstall && cdrom_get_cds baseq3/pak0.pk3:Quake3/baseq3/pak0.pk3
-	unpack_makeself
-}
-
-src_install() {
-	ebegin "Copying files from linux client ..."
-	insinto "${GAMES_DATADIR}"/quake3/baseq3
-	doins baseq3/*.pk3
-	eend 0
-
-	if use cdinstall ; then
-		einfo "Copying files from CD ..."
-		newins "${CDROM_ABSMATCH}" pak0.pk3
-		eend 0
-	fi
-
-	find "${D}" -exec touch '{}' \;
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use cdinstall ; then
-		echo
-		elog "You need to copy pak0.pk3 from your Quake3 CD into:"
-		elog " ${dir}/baseq3."
-		elog "Or if you have a Windows installation of Q3 make a symlink to save space."
-		elog
-		elog "Or, re-emerge quake3-data with USE=cdinstall."
-		echo
-	fi
-}
diff --git a/games-fps/quake3-defrag-1.91.21 b/games-fps/quake3-defrag-1.91.21
new file mode 100644
index 000000000000..8a72b6e89680
--- /dev/null
+++ b/games-fps/quake3-defrag-1.91.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Defrag - Trickjumping challenges for Quake III
+EAPI=5
+HOMEPAGE=http://cggdev.org/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://q3defrag.org/files/defrag/defrag_1.91.21.zip http://www.german-defrag.de/files/defrag/defragcpmpak01.zip http://www.german-defrag.de/files/defrag/df-extras002.zip http://www.german-defrag.de/files/defrag/defragpak1.zip http://www.german-defrag.de/files/defrag/defragpak2.zip http://www.german-defrag.de/files/defrag/defragpak3.zip http://www.german-defrag.de/files/defrag/defragpak4.zip http://www.german-defrag.de/files/defrag/defragpak5.zip http://www.german-defrag.de/files/defrag/defragpak7.zip http://www.german-defrag.de/files/defrag/defragpak8.zip http://www.german-defrag.de/files/defrag/defragpak9.zip http://www.german-defrag.de/files/defrag/defragpak10.zip http://www.german-defrag.de/files/defrag/defragpak11.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d464f9ece12c8af3db5075bd59fe3aff
diff --git a/games-fps/quake3-defrag/Manifest b/games-fps/quake3-defrag/Manifest
deleted file mode 100644
index d29858433202..000000000000
--- a/games-fps/quake3-defrag/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-DIST defrag_1.91.21.zip 4035256 BLAKE2B 3713b9e642d7be0761c70a92cc08b57bc7d27193837f9dab06c5316feb68d5bbfd9952f20e3ebac4bfb89cad34a231fbb358719a9f2a8ff2ff9fbb5f2dd2d71a SHA512 bfc1614b0e2f2dd674369c9c162c412249e6c514f878eaf82a456c882e2081867d6a7260f62ce4a143c23ff28f4f3a5e75a152db788d66b7a0978225bf4417b8
-DIST defragcpmpak01.zip 8567363 BLAKE2B bb1f60ae471db3370f28f2ca856c690084897ec5c43f7ec3e0ce2c5af1647c212f75b965022b3886ddaa12dbd2b70d7a57ffa72497b55fd60f0a2575669a448b SHA512 2ad013e27886bd5547ac1555711c026b27131311d0261e36f50ee2cc715a21f2781fc57d90fb398b5b6b49eb2b9cdad212fd3da9828c4680dd3ad684d0348cf5
-DIST defragpak1.zip 3778055 BLAKE2B 4c8cfccfa1320f33a0340a296012b6cc1cf1b95ae449308e3fe881df768772a50f3270e8cb86a8ee3016085521dc7820c00002045fb7d9bd8fa2a2aab5ccc0d5 SHA512 9c42035db51d70f66d2526a67e5a83f1bbfb61a91b73c6f52308d4cc4c84d7322c3a6372392a87de531684c6c75b25955d17121166b0ba4f2e3e1f5b09b12cee
-DIST defragpak10.zip 7913269 BLAKE2B 50afd97f2640b58baa8e5538446156160df61e0796cd5202489f89fe4e3c1f4dec92dadf7f268392d966070832b9186049376b5e1f9d593b8b3cbcb461c740ac SHA512 112b27b5ccf9304971bf65b9099b0d20741b7ec9d3b946ef2483e11b509687c50d5d1bd2faabf0199af9f4b03325d3309d6911a8397c623595498f0288b5f9c7
-DIST defragpak11.zip 9959458 BLAKE2B 4563ca760f38ff14caf9720673652d095da3187e2dc260dc9fc230ddd7995b877c234720c8dc616d1f3054b3ba89694ae7d56420f9c18af1f48d0e318e19b2fe SHA512 df8d30dc1cc18c754f090d441b4a6d6550a78e3f4bcb50069f73c021fa3ccc2408782d961d97eebf8e4d21d542ee1217d18eae352559f55f175d5cd1e8fb3672
-DIST defragpak2.zip 2056082 BLAKE2B ab08fd153a538fc4fa1c5317d97b773ce52659ea2c63dff6e98f5e3780f8b22a53606d7fbf9b9103080ca4bf609f004bb46acbaf62cf8413b566827d80eeb99f SHA512 9f9715c35e2dc81ac95348fae0100930781d06d607be6ce552463c18dae2495e644034e9674ccebada4b532c901284fc357bb7ea190c84dc6a6d9a406366e2d6
-DIST defragpak3.zip 4699963 BLAKE2B b05c81e0ab188bb8f14458996033701a96d752d008cb1a46d755d539e31cd8f03ec4629356c16ddbb8f6c6ee7270750bff2d35d320e529c8eff5837592215c6c SHA512 5ca4e6da3083bc89c066a8af46f9d4fb368f9a6e3c96271d5b995b3e1be8efe9ea08e83988c0f153a86c9c03aed77cbe2d7aa0ac280e4dd99b6cf2aac5cdc939
-DIST defragpak4.zip 3711149 BLAKE2B 8553afb71f7c41d9baa40062d400c7231792635b6dca630d1d154beff977887a05f21a61f8c65f7d7b0cc33ff6195a4ab89b7c5ab7f9ad08e7ca2416fd9b565a SHA512 5b2807c565c5c535e07984d6006cf152f01384170be351e70aecf13633cc80ad9a3b83ef5dbe3271d1adbf2a25aeec844fca899e8c8c8c9b06ead608fa64f329
-DIST defragpak5.zip 6100341 BLAKE2B aa97db63b9989aed2c3880f28ae764141e630a49e44673cbe77ebd3988473e326cd631b7a79b04683cf84b5664d9a6ecb83eac5aab46f677f6955fed4c643760 SHA512 41da373058f8198c71c664ea52fe6ca0825af97a6b4c71f08e0cc4e29377c3f0300f951d2d2966634260be0ca9cd9adc9f686da408685172b6b61c3ef172502a
-DIST defragpak7.zip 10915548 BLAKE2B e7a78446bd6254c554771086e56fe113e08945e62440ee5a9df76fdfcefb367248a19903ba311dbd1b0f263b42bb296886ab9be27d4e2ac280fbf9686cc01be2 SHA512 73f9e11ee1beec35d268e60cf8051fbd99b68009c582c087448b966560b7f4cc7543fb3f210dddfde4ce00a7596a5450a7cb470c17b35bbec13965830f39e56f
-DIST defragpak8.zip 11972907 BLAKE2B 93a738411df34718c44b7ac366becaf86e0c9ac780d24335baa3486c699a94a279ad66a33e503bdb77ab2aa5033f9f7402aaf9ba7ae511d05f4e208833d0cbbf SHA512 f6dc7646b87f5a9ceface82f479064b49d2c6f785d9f0fc7228bc6b4e399d90cf72d6fdde71246fe5bc75da0385734cc76e6ac66d9760f9b85b90359d815b080
-DIST defragpak9.zip 8531944 BLAKE2B 821f7865409e9db75a5e2238c77bae033e96f63843b663c6d783f24d28e51bb95ec8c6229cebe2c866ac022f87d783165e06446fd955a2dc438f3f8190f8b539 SHA512 8c03a2a5d8553792bbd2557c8a19a66e7a2301d87c2e0f8e695700c26ff32a1d83ebfd47e18060fc9ca6d6acb5772566b659ce0567d36da99add65d5faabdaa0
-DIST df-extras002.zip 6538951 BLAKE2B f5ad82ee6d2c4d5703c9454164f37580d7caad8a0b10e52012b9b988b68b41032cd77e6803b58d3368ba6232a3986299283232414ca922494dbf811cea340594 SHA512 ec4fcc2f42f2c130babd5712a548eea836307b102d29d5cf4402924f4ffdbd8dd9d6872b6d2be0c277a19cf7babd4ea163733895902946d09df1a9e94372dd48
-EBUILD quake3-defrag-1.91.21.ebuild 1396 BLAKE2B 5777463733ea1c950b91d7fb45572f23c76418f51a0b0e68141c1fd455494e908556a5fae6cd5c14f7372d892f430547d115ff0680586f83e838858910079297 SHA512 4961f526e5f051b1d749d7749b5dcb25f1d8906ac17b73f00a1b7f537bbc76f4a115f1e3ddadf60242dcae00e66590cc8d5d01ab36ba796df928aa80c054dc28
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-defrag/metadata.xml b/games-fps/quake3-defrag/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-defrag/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild b/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
deleted file mode 100644
index aeac35425a75..000000000000
--- a/games-fps/quake3-defrag/quake3-defrag-1.91.21.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Trickjumping challenges for Quake III"
-MOD_NAME="Defrag"
-MOD_DIR="defrag"
-
-inherit games games-mods
-
-HOMEPAGE="http://cggdev.org/"
-SRC_URI="http://q3defrag.org/files/defrag/defrag_${PV}.zip
-	http://www.german-defrag.de/files/defrag/defragcpmpak01.zip
-	http://www.german-defrag.de/files/defrag/df-extras002.zip
-	http://www.german-defrag.de/files/defrag/defragpak1.zip
-	http://www.german-defrag.de/files/defrag/defragpak2.zip
-	http://www.german-defrag.de/files/defrag/defragpak3.zip
-	http://www.german-defrag.de/files/defrag/defragpak4.zip
-	http://www.german-defrag.de/files/defrag/defragpak5.zip
-	http://www.german-defrag.de/files/defrag/defragpak7.zip
-	http://www.german-defrag.de/files/defrag/defragpak8.zip
-	http://www.german-defrag.de/files/defrag/defragpak9.zip
-	http://www.german-defrag.de/files/defrag/defragpak10.zip
-	http://www.german-defrag.de/files/defrag/defragpak11.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	unpack defrag_${PV}.zip
-	cd ${MOD_DIR} || die
-	unpack defragpak{1,2,3,4,5,7,8,9,10,11}.zip
-	unpack defragcpmpak01.zip
-	unpack df-extras002.zip
-}
-
-src_prepare() {
-	cd ${MOD_DIR} || die
-	mv -f DeFRaG/* . || die
-	rm -rf DeFRaG || die
-	mv -f *.txt docs/ || die
-	rm -rf misc/{mirc-script,misc,tools} || die
-}
diff --git a/games-fps/quake3-demo-1.11-r1 b/games-fps/quake3-demo-1.11-r1
new file mode 100644
index 000000000000..d2084d6f4193
--- /dev/null
+++ b/games-fps/quake3-demo-1.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=the playable demo of Quake III Arena by Id Software
+EAPI=5
+HOMEPAGE=http://www.idsoftware.com/games/quake/quake3-arena/
+IUSE=dedicated
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Q3AEULA
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://idsoftware/quake3/linux/linuxq3ademo-1.11-6.x86.gz.sh mirror://3dgamers/quake3arena/linuxq3ademo-1.11-6.x86.gz.sh
+_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_=39f907c1aceb7d2895b6322b49310e27
diff --git a/games-fps/quake3-demo/Manifest b/games-fps/quake3-demo/Manifest
deleted file mode 100644
index 20429f3802ef..000000000000
--- a/games-fps/quake3-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST linuxq3ademo-1.11-6.x86.gz.sh 49289300 BLAKE2B 879402114754e7c3c2b9cb668827e8c5a70dc35f9f8801713074e40bf127b98145859a32d9d5984a4db81075b6837ba19149f9b0ee32c94207c823c83368d32b SHA512 aa74f8e1e8b5036fd68761e5f38cbc3d771e9bd0d5c3cc1f5d89d7eba8fd4fda8108dfd4f31d2b846114e4ec89f6aa15849b95232e0570181a104563ec0faeb5
-EBUILD quake3-demo-1.11-r1.ebuild 1455 BLAKE2B d736315bac79d4219691d82b969e47ffcee335d7cd7212eefa00acfaed12c6a2323101be16354a23af54abefd9148e831bb3390a4598e8da1482103c9e8c2e13 SHA512 4d5c7679d46c0684d360fde55f8c6d306a7c3325320e088fc55b07b9121e55ba25406d6772e0bb7df8241c2f767433e08a0783a692a750476760c31a539f979e
-MISC metadata.xml 332 BLAKE2B 0207451e30faf5cad4db18ee0f62ba08e6ca008a223413a2aad0186635619e565f14cedb2668a3b5c72c08eac4171edbf0b1c0256b58e40dea8e5d1d58b97af8 SHA512 0852d9f223e893d40f4376708c32ceb59b5df65c5cb345a3ba81700ec4198c6bb7396be42910aa3c406df40b8bc4d97d777624ced523cd8de56f4dd406a89d01
diff --git a/games-fps/quake3-demo/metadata.xml b/games-fps/quake3-demo/metadata.xml
deleted file mode 100644
index b8a2e88c3c6c..000000000000
--- a/games-fps/quake3-demo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="dedicated">install only as a dedicated game serer</flag>
-</use>
-</pkgmetadata>
diff --git a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild b/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
deleted file mode 100644
index 6d37eb990467..000000000000
--- a/games-fps/quake3-demo/quake3-demo-1.11-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="the playable demo of Quake III Arena by Id Software"
-HOMEPAGE="http://www.idsoftware.com/games/quake/quake3-arena/"
-SRC_URI="mirror://idsoftware/quake3/linux/linuxq3ademo-${PV}-6.x86.gz.sh
-	mirror://3dgamers/quake3arena/linuxq3ademo-${PV}-6.x86.gz.sh"
-
-LICENSE="Q3AEULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	dedicated? ( app-misc/screen )
-	!dedicated? (
-		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	)"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-QA_PREBUILT="${dir:1}/q3ded.x86
-	${dir:1}/q3demo.x86"
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r Help demoq3
-	doins README icon.*
-
-	exeinto "${dir}"
-	newexe bin/x86/glibc-2.0/q3ded q3ded.x86
-	games_make_wrapper q3ded ./q3ded.x86 "${dir}" "${dir}"
-	if ! use dedicated; then
-		newexe bin/x86/glibc-2.0/q3demo q3demo.x86
-		games_make_wrapper q3demo ./q3demo.x86 "${dir}" "${dir}"
-		make_desktop_entry q3demo "Quake III (Demo)"
-	fi
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use dedicated; then
-	elog "To play the game run:"
-	elog " q3demo"
-	fi
-	echo
-	elog "To start the gameserver, run:"
-	elog " q3ded"
-}
diff --git a/games-fps/quake3-excessiveplus-2.3 b/games-fps/quake3-excessiveplus-2.3
new file mode 100644
index 000000000000..78adab1f3104
--- /dev/null
+++ b/games-fps/quake3-excessiveplus-2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Excessive Plus - Makes the weapons much faster and stronger
+EAPI=5
+HOMEPAGE=https://www.excessiveplus.net
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://www.excessiveplus.net/files/release/xp-2.3.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4f25b95a0e941b0dde32e750fe858719
diff --git a/games-fps/quake3-excessiveplus/Manifest b/games-fps/quake3-excessiveplus/Manifest
deleted file mode 100644
index 8af1764d4705..000000000000
--- a/games-fps/quake3-excessiveplus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xp-2.3.zip 17266975 BLAKE2B e5cfaba73ac82316a3ba19b778b9c31da24dbffd0e76d2b14b6f3991285853a1f26d8473d78129d5bc4b77fac08b7b18da508dbd8ae610691487b9330b705d04 SHA512 80a8663c8d42139661ccd5333f9c543854ad82ae38f7838139c78413f7fa3e163c27a66aed4014e56ca756cabf2fd835179cba2336ada7158fdbde1e2841535b
-EBUILD quake3-excessiveplus-2.3.ebuild 518 BLAKE2B 762790669935b626ba0d3aadcbdf2182d1150a716362c954ec717fb7f793605ae12519377f68d31ae225874aa8b0f9b00255042d2d07f33452e36b1208d0997c SHA512 55ea13902ac4cc764761003fe728f53f321b425d0d8265070c3db411e96ba0e3f1671c7124da35d72795d434768fe8afbf4aa1c803751831426e8b288ef8ff67
-MISC metadata.xml 800 BLAKE2B bd7941cbdea7443be6aa914a839100fa264f45fa69f848fe1d5985ae6241f03cbf8ca8f236a4022c94d56df9edf9d1593c3618ee9081ee1064d3a7791c269595 SHA512 4320259a818af53b8d6034ec82e6a329113365e0ca7e0465897fc8cef064089154e37db00a92b8c1ffbc53307f9ea6033ec002923e0b53b29672f1ee531b085f
diff --git a/games-fps/quake3-excessiveplus/metadata.xml b/games-fps/quake3-excessiveplus/metadata.xml
deleted file mode 100644
index dd6f510a8e43..000000000000
--- a/games-fps/quake3-excessiveplus/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Excessive Plus is a Quake III Arena modification. It is a remake of the
-ingenious Mr. Pants' Excessive Overkill for Quake III Arena
-(www.planetquake.com/excessive/).
-
-Well, what's then the difference?
-Excessive Plus can either be used server-side only but also as a client-server
-mod which brings you tons of advantages. The whole mod is based on a scripting
-engine which can be used to create your very own settings. It is fully
-customizable with tons of options. Read the "docs/index.html" for more
-information.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild b/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
deleted file mode 100644
index ac2472d83781..000000000000
--- a/games-fps/quake3-excessiveplus/quake3-excessiveplus-2.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Makes the weapons much faster and stronger"
-MOD_NAME="Excessive Plus"
-MOD_DIR="excessiveplus"
-MOD_ICON="excessiveplus.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.excessiveplus.net"
-SRC_URI="https://www.excessiveplus.net/files/release/xp-${PV}.zip"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f *.bat
-	rm -rf ${MOD_DIR}/tools
-}
diff --git a/games-fps/quake3-lrctf-1.1 b/games-fps/quake3-lrctf-1.1
new file mode 100644
index 000000000000..8475624834ed
--- /dev/null
+++ b/games-fps/quake3-lrctf-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Loki's Revenge CTF - offhand grapple all-weapons capture the flag mod
+EAPI=5
+HOMEPAGE=http://www.lrctf.com/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=LRCTF
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://lrctf.com/release/LRCTF_Q3A_v1.1_full.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b7200e225096f67c83706b797a736c68
diff --git a/games-fps/quake3-lrctf/Manifest b/games-fps/quake3-lrctf/Manifest
deleted file mode 100644
index ad52188f82eb..000000000000
--- a/games-fps/quake3-lrctf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST LRCTF_Q3A_v1.1_full.zip 340050745 BLAKE2B 686d88d6f6ca527a85d0574c7b7277d96a0318fdaf7d85e429e9606bf083a72b860975a8daa94d485f8c086b1c61cf9e896085639cfce81daa06d6809d00d78e SHA512 0e397d8044427e0dfe1bc3dfd288b7b3988e9705018c5005c87feef68b065826a7117962c0172ebed48ba1bd63b67e4264c8282a8495d6074a0e26224f2ef533
-EBUILD quake3-lrctf-1.1.ebuild 406 BLAKE2B 253fce29fc0baea606c0eb69c7ad0dd3602e37e77dbb4c0c779d6210ea81ce6b2fb824b48fd531030e0d3c0a86115a890dcafb50c63f9a8cc3f3a3d5684deb0d SHA512 584fb48b061ffa8c27f08322d348b83ee10e5a5f8fdd289e6d221d62b97058edba1acdccda4622f4a5d6735f17e0d7b044614da51984a248478be72b28dfe7ee
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-lrctf/metadata.xml b/games-fps/quake3-lrctf/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-lrctf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild b/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
deleted file mode 100644
index 8ac9cdec512a..000000000000
--- a/games-fps/quake3-lrctf/quake3-lrctf-1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="offhand grapple all-weapons capture the flag mod"
-MOD_NAME="Loki's Revenge CTF"
-MOD_DIR="lrctf"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.lrctf.com/"
-SRC_URI="http://lrctf.com/release/LRCTF_Q3A_v${PV}_full.zip"
-
-LICENSE="LRCTF"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
diff --git a/games-fps/quake3-matrix-2.4_beta-r1 b/games-fps/quake3-matrix-2.4_beta-r1
new file mode 100644
index 000000000000..da67afb23f0c
--- /dev/null
+++ b/games-fps/quake3-matrix-2.4_beta-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Matrix - Matrix conversion mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/matrix-quake-3
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/matrix24.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=743e7f2892f5bac92aa2a4479bfa339e
diff --git a/games-fps/quake3-matrix/Manifest b/games-fps/quake3-matrix/Manifest
deleted file mode 100644
index 8e17bb51914f..000000000000
--- a/games-fps/quake3-matrix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST matrix24.zip 21191819 BLAKE2B 04f97bc7fd711b59069e4447f7003a528683939ec209962124cff8d97c5b7e17750b595fd89a17f76a7e00ce06b127cc93bdd343f04ac8a2fb5d20eef2d4a45b SHA512 f19b7d9d6b54eee23480a4217e6c47fdca184fcd7653a04a147ad6a2af6151420381adb340db37f445e3a23d8c0f045c760c7f10218d6c2622f9cb74acd792db
-EBUILD quake3-matrix-2.4_beta-r1.ebuild 465 BLAKE2B 9638505bf201d62e72a9b0c2bc3466dc685476585a284bdfaab29243552473201e7b14479f7cd77a74adf3fe0f9c547a38f97f411b56cf9ae7a17513715be679 SHA512 c75dfa4ebf49479c1185d04078543498ff7942eedf0cd7e89da62728925eecd06d000f91c5a24ecb0cd1a7912e54b024a4476b8c78b5930b89a4c838e6b4ec1a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-matrix/metadata.xml b/games-fps/quake3-matrix/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-matrix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild b/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
deleted file mode 100644
index 184a4a09b17b..000000000000
--- a/games-fps/quake3-matrix/quake3-matrix-2.4_beta-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Matrix conversion mod"
-MOD_NAME="Matrix"
-MOD_DIR="matrix"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/matrix-quake-3"
-SRC_URI="mirror://quakeunity/modifications/matrix24.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	mkdir ${MOD_DIR} || die
-	cd ${MOD_DIR} || die
-	unpack ${A}
-}
diff --git a/games-fps/quake3-nsco-1.93-r1 b/games-fps/quake3-nsco-1.93-r1
new file mode 100644
index 000000000000..cef6bf610636
--- /dev/null
+++ b/games-fps/quake3-nsco-1.93-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Navy Seals: Covert Operations - a US Navy Seals conversion mod
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/navyseals/nsco_beta19.zip mirror://quakeunity/modifications/navyseals/nsco_beta193upd.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0f5332657d6fbdacd8545a8cc28459b0
diff --git a/games-fps/quake3-nsco/Manifest b/games-fps/quake3-nsco/Manifest
deleted file mode 100644
index c2a3a4183980..000000000000
--- a/games-fps/quake3-nsco/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX server.cfg 3518 BLAKE2B e01da5f7dd888e2166206e0a0b9d4153d0bbcd7a10aef3e72ca0a2585bf81335e144149be74d5a7739cb357455e5f36fba063340e3344ce685c0385387deb38b SHA512 2e7719a5805e92b9dad5ed38f7865abc1c7cb31390fe5240edf1e5a421529d49eb5811b753ec60cb6bb9c8e6e3ce2053004225d661f5a671e3d84820230148cc
-DIST nsco_beta19.zip 314224296 BLAKE2B 65a1313889b8d9c9e8858f3d0372d41ba941a2ec31b5e5a62219b2284e99ba0fa9dd4e64c44e0e227f7537120f6a1378f8bfa1b3000cab79dec65a95a9894fbc SHA512 bf125ab25e841536686e0a4d7de98b62b35f1034e9120daf86a1c2536b189252f22ab0b4105337e311758103cce7a9e1f371d5ba4f859dacbf2d7b41e48952c5
-DIST nsco_beta193upd.zip 55808681 BLAKE2B abc518d483e4f652d18fbb6a96ad2486cda2af9c7df5194d6904ff4a29a4532baa607b4f05d969bc6aaf5d6a910fed96098726ba7373737ebb9d6eded2d8bb33 SHA512 8233a54b65ba29babab47056468fb112cac6a687db151d416dbabb754fe03006db4f0d0bb403e0e44f03d2b6e99428d67aed0fa27d4473331035dea5bc3563eb
-EBUILD quake3-nsco-1.93-r1.ebuild 567 BLAKE2B b9e4dc16e5d3badb0b380600563ce4468b16a168d3aa6466b8af7b7453017c172264f31312c1589510cd497210c266efb4c16e130eea37dda974b27bd7df258c SHA512 366db429bce4b8dd2706967c5f85821cb7af30e8d878b210647d86abd23ada1069bf8bd75737aa8cfb254e83967501badf8ee0f7c7bf942278a677891457f56e
-MISC metadata.xml 1006 BLAKE2B 1aae974ea3733be2e7ab2a9170d828753a2bae4427a793b1bcc4454c2bb4746abbe43996cd63ac88e82c0433300dad24db1327a69238b76d050cfe67476a21d8 SHA512 8937940f78ff4174f570be92d750fc19d7ac8035acd1523044c818244414a11e08a61a5b7ff0559b40b7b3ba7d8ac7bf5034e337f410bee5b211f49a3a50c6f7
diff --git a/games-fps/quake3-nsco/files/server.cfg b/games-fps/quake3-nsco/files/server.cfg
deleted file mode 100644
index 2a0eba41e0f6..000000000000
--- a/games-fps/quake3-nsco/files/server.cfg
+++ /dev/null
@@ -1,97 +0,0 @@
-// *NOTE* any line that starts with "//" is ignored by quake.

-// changed: 

-//	    10.03.02 by defcon-x/defcon-x@ns-co.net

-//          11.03.02 by defcon-x/defcon-x@ns-co.net - setted sv_floodprotect 0 as default value.

-//	    08.05.02 by defcon-x/defcon-x@ns-co.net - added new beta 1.1 cvars

-//          19.05.02 by defcon-x/defcon-x@ns-co.net - added new beta 1.1 cvars

-//	    29.06.02 by defcon-x/defcon-x@ns-co.net - added new beta 1.2 cvars

-//						      removed cvar mapcycle

-//						      added new ns-co master server

-//	    29.07.02 by defcon-x/defcon-x@ns-co.net - updated server.cfg for b1.3

-//	    29.08.02 by defcon-x/defcon-x@ns-co.net - updated server.cfg for b1.45

-

-//

-// please see the cvars.txt

-//

-

-//*** Administrator Info ***

-sets Admin "Gentoo Admin"

-sets Email "UnnamedAdmin@NoEmail"

-

-//*** Server Name and Daily Message ***

-set sv_hostname "Navy Seals : Covert Operations [BETA 1.45] powered by Gentoo Linux"

-set g_motd "www.ns-co.net, www.gentoo.org"

-     

-//*** Game Settings ***

-set sv_maxclients "18"      

-// set g_maxGameClients ""  

-set sv_privateClients "0"  

-set g_gametype "3"           

-set roundtime "4"      

-set teampointlimit "15" 

-

-// do not remove the following line, or set the cvar to 1

-set sv_floodprotect "0" // this should be set to "0" by default.

-// it's important for a proper XP usage

-

-set g_noPrimary "0" // prevent the usage of primarys

-set g_noSecondary "0" // * secondarys

-set g_noGrenades "0" // and grenades

-set g_allowMapVote "1" // allow the voting of maps

-set g_allowKickVote "1" // allow the kick voting of players

-

-// 1 enables friendly fire

-set g_friendlyFire "1"  

-

-// memory management

-// only use these settings if you want the best memory usage

-// on dedicated servers.

-seta com_soundMegs "0"

-seta com_zoneMegs "8"

-seta com_hunkMegs "38"

-

-set g_basexp "15"

-set g_inventoryupdatetime "5"

-set g_maxteamkill "3"		// 3 teamkills until a player gets kicked for TK

-set g_TeamKillRemoveTime "300" // remove one teamkill after not killing for 5 minutes

-set g_overridegoals "0"

-//*** Less Packets ***

-// set g_silentbullets "1"  // bullets are not SENT to the clients

-// set g_reallead "1" // real bullets instead of instat-hit ray-test weapons

-set g_teamlockcamera "0" // lock chasecamera so players can only spectate their teammates - for clangames very useful

-set g_minplayers "1" // starts the round as soon as X players are in each team - for clangames very useful

-

-//*** Passwords ***

-// set rconpassword "-----"        

-// set sv_privatePassword "-----" 

-// set g_password "-----"  

-  

-//*** Bot Setup ***

-set bot_enable "0"      

-set bot_minplayers "0" 

-set bot_maxplayers "0"

-

-//*** Server Settings ***

-set sv_pure "1"             

-set g_allowvote "1"         

-set sv_allowdownload "0"    

-set gamename "seals"

-set sv_maxRate "15000"      

-set g_log "seals.log"  

-

-set g_inactivity "90"    // kick after 90 seconds of inactivity on server

-set g_firstcountdown "30" // the first round has a countdown of 30 seconds

-

-//*** Master Servers ***

-set sv_master1 "ns-co.org"			// primary ns-co master

-set sv_master2 "master1.idsoftware.com"  

-set sv_master3 "master2.idsoftware.com"                        

-set sv_master4 "master3.idsoftware.com"                        

-set sv_master5 "master4.idsoftware.com"  

-                     

-

-//*** Mapcycle ***  

-set g_mapcycle "configs/mapcycle.cfg" // leave this as default

-

-//execute a map in the cycle

-map ns_ghetto

diff --git a/games-fps/quake3-nsco/metadata.xml b/games-fps/quake3-nsco/metadata.xml
deleted file mode 100644
index b7aeaff31a83..000000000000
--- a/games-fps/quake3-nsco/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-
-
-	<longdescription>
-		From http://www.ns-co.net:
-
-		Navy SEAL/s: Covert Operations is a scale realism total 
-		conversion for id Software's Q3/TA engine. NS:CO pits players
-		in realistic SEAL and Tango land covert operations in realistic
-		settings with scale weapons, munitions, and equipment.
-
-		NS:CO is a tactically sophisticated feature rich multi-player
-		game that emphasized teamwork and realistic SEAL SPECWAR
-		missions and tactics.
-
-		NS:CO is a total conversion featuring original game-design,
-		technology, all original code, stunning art, level design,
-		modeling and animation; wrapped in a rich game interface that
-		gives players new exciting control over game-play that is
-		unique, realistic and enormous fun. 
-	</longdescription>
-
-</pkgmetadata>
diff --git a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild b/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
deleted file mode 100644
index 0d80eb2dfe04..000000000000
--- a/games-fps/quake3-nsco/quake3-nsco-1.93-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="a US Navy Seals conversion mod"
-MOD_NAME="Navy Seals: Covert Operations"
-MOD_DIR="seals"
-
-inherit games games-mods
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://quakeunity/modifications/navyseals/nsco_beta19.zip
-	mirror://quakeunity/modifications/navyseals/nsco_beta193upd.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="strip mirror"
-
-src_prepare() {
-	rm -rf seals/launch* || die
-}
diff --git a/games-fps/quake3-osp-1.03a-r1 b/games-fps/quake3-osp-1.03a-r1
new file mode 100644
index 000000000000..1d924d0e6c85
--- /dev/null
+++ b/games-fps/quake3-osp-1.03a-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III OSP - a tournament mod
+EAPI=5
+HOMEPAGE=http://www.orangesmoothie.org/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://osp.dget.cc/orangesmoothie/downloads/osp-Quake3-1.03a_full.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ea56d9e992407b74e59b882116982a6a
diff --git a/games-fps/quake3-osp/Manifest b/games-fps/quake3-osp/Manifest
deleted file mode 100644
index f008fdfbaf5e..000000000000
--- a/games-fps/quake3-osp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX server.cfg 5532 BLAKE2B 1a6b6b474ad8bd9b56ba572c31e06fd41b900615a786fca017df97794dfe02b391a3b51cfac33d6ec2cd4c3f08ec2c79433cfd2b34092a54df8693eb789c95fc SHA512 31fd512e9a614950292a7d80b376ec6dbd673773ff973af96ac806360cccf5835d1985d978b078e3d68f632f8ecbb3dfb86d90aa27e2529e58c4682ac89e908e
-DIST osp-Quake3-1.03a_full.zip 55882759 BLAKE2B f5d0ff6c6b9a2ceef0c0269c8d20f12f8040b328612e6893ef12bedc15c9f92e4e9b3160a64f269535aa2f64ed010d2ea60050587fbe5a9787f717da8a6e8068 SHA512 9a9bc76ca2e582432e0f8ff6a3fe0bd2e0b0767a1f52bdea8debc7bc9053dc78951335da085b88e0f3690f1f7fda25a628cff9bace7f683f543c5eff90307e19
-EBUILD quake3-osp-1.03a-r1.ebuild 491 BLAKE2B fec264040a526cd53732da1562e11fb31f624b3db0550e10c8ad41c31b2cff700bdfea874d7cd390df19b75d10053f4a9a4974c367977e972717fb3dcff0e964 SHA512 c91bb86ab60d9f7341086dfb3c521f406787f1101c61c85965035e932d1f59edf31244a85c3ba60f3f259ea87cda57317eab164133c31337e39cb701ec021b7c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-osp/files/server.cfg b/games-fps/quake3-osp/files/server.cfg
deleted file mode 100644
index 887ff1e2784e..000000000000
--- a/games-fps/quake3-osp/files/server.cfg
+++ /dev/null
@@ -1,165 +0,0 @@
-/////////////////////////////////////////////

-//     OSP Server Configuration File       //

-/////////////////////////////////////////////

-

-

-//////////////////////

-// Gameplay Options //

-//////////////////////

-set capturelimit               "8"

-set dmflags                    "0"

-set fraglimit                  "0"

-set g_dowarmup                 "1"

-set g_forceRespawn             "10"

-set g_gametype                 "1"

-set g_teamautojoin             "0"

-set g_teamforcebalance         "0"

-set g_warmup                   "0"

-set match_carespawn            "0"

-set match_instagib             "0"

-set match_latejoin             "0"

-set match_minplayers           "2"

-set match_overtime             "0"

-set match_overtimecount        "0"

-set match_overtimelength       "5"

-set match_readypercent         "100"

-set match_roundtimer           "10"

-set match_timeoutcount         "3"

-set match_timeoutlength        "60"

-set match_winbyscore           "0"

-set roundlimit                 "5"

-set server_promode             "0"

-set team_allcaptain            "1"

-set team_maxplayers            "0"

-set team_nocontrols            "0"

-set team_noteamready           "0"

-set timelimit                  "10"

-

-//////////////////////

-//  Server Options  //

-//////////////////////

-set g_gravity                  "800"

-set g_inactivity               "0"

-set g_knockback                "1000"

-set g_maxGameClients           "0"

-set g_motd                     ""

-set g_needpass                 "0"

-set g_privatePassword          ""

-set g_smoothclients            "0"

-set g_speed                    "320"

-set match_maxsuicides          "0"

-set osp_gamename               "0"

-set player_always              ""

-set rconPassword               ""

-set ref_password               "none"

-set server_customclient        "15"

-set server_ospauth             "1"

-set server_record              "0"

-set server_motd1               "This server is Gentoo Linux powered"

-set server_motd2               ""

-set server_motd3               ""

-set server_motd4               ""

-set server_motd5               ""

-set server_motd6               ""

-set server_motd7               ""

-set server_motd8               ""

-set sv_allowDownload           "1"

-set sv_cheats                  "0"

-set sv_floodprotect            "0"

-set sv_hostname                "OSP 1v1"

-set sv_maxclients              "7"

-set sv_privateClients          "1"

-set sv_pure                    "1"

-

-//////////////////////

-//   File Options   //

-//////////////////////

-set g_log                      "games.log"

-set g_logSync                  "0"

-set admin_log                  "adm.log"

-set log_default                "0"

-set log_stat                   "0"

-set filter_file                "filters.txt"

-set map_file                   "cfg-maps\1v1maps.txt"

-set server_gfxspecific         "none"

-set player_file                "none"

-set server_motdfile            "none"

-set mode_customfilename        "none"

-set decal_directory            "decals"

-set viewcam_directory          "cfg-viewcam"

-

-//////////////////////

-//  Weapon Options  //

-//////////////////////

-set armor_q2style              "0"

-set gauntlet_damage            "50"

-set gauntlet_disable           "0"

-set g_friendlyFire             "1"

-set g_weaponrespawn            "5"

-set g_weaponteamrespawn        "30"

-set instagib_reload            "1500"

-set item_disable               "4"

-set match_cawarmupfire         "1"

-set match_dropitems            "0"

-set match_hurtself             "1"

-set mg_damage                  "7"

-set mg_damageTeamplay          "5"

-set railgun_damage             "100"

-set server_fastrail            "0"

-set server_lgcooldown          "0"

-set server_thrufloors          "0"

-set start_armor                "0"

-set start_bfg                  "0"

-set start_bullets              "100"

-set start_cells                "0"

-set start_grenades             "0"

-set start_health               "125"

-set start_lightning            "0"

-set start_rockets              "0"

-set start_shells               "0"

-set start_slugs                "0"

-set team_armordamage           "0"

-set warmup_armor               "100"

-set weapon_deaddrop            "1"

-set weapon_have                "1"

-set weapon_start               "257"

-

-//////////////////////

-//   Item Options   //

-//////////////////////

-set g_quadfactor               "0"

-set match_poweruprespawn       "60"

-set powerup_disable            "255"

-

-//////////////////////

-//  Voting Options  //

-//////////////////////

-set g_allowvote                "0"

-set mode_start                 "-1"

-set server_availmodes          "2"

-

-//////////////////////

-//  Other Options   //

-//////////////////////

-set bot_enable                 "0"

-set g_spectatorInactivity      "0"

-set map_autoload               "1"

-set map_queue                  "1"

-set map_halt                   "0"

-set map_nocount                "0"

-set map_once                   "1"

-set map_random                 "0"

-set map_rotate                 "0"

-set match_mutespecs            "1"

-set pmove_fixed                "0"

-set pmove_msec                 "8"

-set server_maxpacketsmax       "0"

-set server_maxpacketsmin       "0"

-set server_realping            "0"

-set server_timenudgemax        "0"

-set server_timenudgemin        "0"

-set sv_maxRate                 "0"

-set sv_maxPing                 "0"

-set sv_minPing                 "0"

-

-map "q3tourney4"

diff --git a/games-fps/quake3-osp/metadata.xml b/games-fps/quake3-osp/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-osp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild b/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
deleted file mode 100644
index f7620d7bea89..000000000000
--- a/games-fps/quake3-osp/quake3-osp-1.03a-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="a tournament mod"
-MOD_NAME="OSP"
-MOD_DIR="osp"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.orangesmoothie.org/"
-SRC_URI="http://osp.dget.cc/orangesmoothie/downloads/osp-Quake3-${PV}_full.zip"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	cd ${MOD_DIR} || die
-	rm -f VoodooStats-ReadMe.txt *.exe || die
-	rm -rf voodoo || die
-}
diff --git a/games-fps/quake3-ra3-1.76-r1 b/games-fps/quake3-ra3-1.76-r1
new file mode 100644
index 000000000000..9e27f1e8260c
--- /dev/null
+++ b/games-fps/quake3-ra3-1.76-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Rocket Arena 3 - a rocket dueling mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/rocket-arena-3
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/rocketarena3/ra3176.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=94149304d0e30a9c0b217b098c0ac769
diff --git a/games-fps/quake3-ra3/Manifest b/games-fps/quake3-ra3/Manifest
deleted file mode 100644
index 0aed79f0207f..000000000000
--- a/games-fps/quake3-ra3/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ra3176.zip 138018848 BLAKE2B 173d514e6033beeb46775e1e0122c0ea1ad6d0acf5268e8341200e95181f8dc3bbffde0dcc011cc665fe46e580f78930e35f3c4f51b8075e5ac275c4123441eb SHA512 64240dcb1460465eac5279162ed04b97f20bbf10437b1519b1da22c73368c9af0e57191b884fb2712cddd8e0086816a871ad0657dfdb73ab70940ec8f37daff9
-EBUILD quake3-ra3-1.76-r1.ebuild 451 BLAKE2B 4a05ce6c99049e9c66f98221735cba0ae8aa513122ceb81f94a0137e99c026997e354364390db3993d58abafa8f3b3be73c162083b4e8db9fc3fc472ce37e4ae SHA512 c85835ebf88b976f143b556881ff15678acea03d9fcd8267b56288325a985601602b44b79d39c01343ed7c7561d209ee887aa00b766f57b8a9a687a5fec72880
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-ra3/metadata.xml b/games-fps/quake3-ra3/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-ra3/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild b/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
deleted file mode 100644
index f7d8d6db4557..000000000000
--- a/games-fps/quake3-ra3/quake3-ra3-1.76-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="a rocket dueling mod"
-MOD_NAME="Rocket Arena 3"
-MOD_DIR="arena"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/rocket-arena-3"
-SRC_URI="mirror://quakeunity/modifications/rocketarena3/ra3${PV/.}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-QA_PREBUILT="${INS_DIR:1}/${MOD_DIR}/*so"
diff --git a/games-fps/quake3-reaction-3.2 b/games-fps/quake3-reaction-3.2
new file mode 100644
index 000000000000..cafcf97db736
--- /dev/null
+++ b/games-fps/quake3-reaction-3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Reaction - port of Action Quake 2 to Quake 3: Arena
+EAPI=5
+HOMEPAGE=http://www.rq3.com/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/reactionquake3/ReactionQuake3-v3.1-Full.zip mirror://quakeunity/modifications/reactionquake3/ReactionQuake3-v3.2-Update.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=253631e179c9ee56f8e4023a892a9175
diff --git a/games-fps/quake3-reaction/Manifest b/games-fps/quake3-reaction/Manifest
deleted file mode 100644
index ddc8c8b0ce72..000000000000
--- a/games-fps/quake3-reaction/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ReactionQuake3-v3.1-Full.zip 327488276 BLAKE2B 8a26d2c0841175fa9db95b5443d653d1b6b252e80c0c73418a46edb6b747b85e543dddbc0e034a954d87ae0b99a8341f8fcdfb7df01a21a13f0ad91d19cba509 SHA512 78d141a09d73daedcbaf2c3ec24a7c017592f556610011e8143ebc7c16e24f24bc8575b59ac43f46119beb0eb5d1744e6f21854e19fc5e8ee65a3f6124f2d5e4
-DIST ReactionQuake3-v3.2-Update.zip 182810088 BLAKE2B db5d28f71d3e894ad3b068f34ff63d89a16dc5c5b83698ebf0587b750b4575a62cc6845c50e7b0c560272ed7c6bcbcab338ea929a0a9e6eb42b3af22cc6c3ba5 SHA512 80d798d4153fe6072e297caad8999c95b3132ac8026f2b2b8c684a63be0cbb66d7c812bd68f9c8c28b297a93664b19962c1bae4741b3bba225099e6db87ae2d5
-EBUILD quake3-reaction-3.2.ebuild 536 BLAKE2B cf540d088915067f660d201816b9a9985ad408c955693d7b562abd203b5f820c634af4693745407518817115ea1010f4d20542c75b5f9182b1b890770f51e80d SHA512 fbdeb31441d455c9274642f27170e8129d2b132da8e4d63bc8026e5ecdd27cf86915548df78f148bc05c5db38c80e16cd9996229618d38b7ebed07f5b003f427
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-reaction/metadata.xml b/games-fps/quake3-reaction/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-reaction/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild b/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
deleted file mode 100644
index e5ca16d89d4f..000000000000
--- a/games-fps/quake3-reaction/quake3-reaction-3.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="port of Action Quake 2 to Quake 3: Arena"
-MOD_NAME="Reaction"
-MOD_DIR="rq3"
-MOD_ICON="reaction-4.ico"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.rq3.com/"
-SRC_URI="
-	mirror://quakeunity/modifications/reactionquake3/ReactionQuake3-v3.1-Full.zip
-	mirror://quakeunity/modifications/reactionquake3/ReactionQuake3-v3.2-Update.zip
-	"
-
-LICENSE="all-rights-reserved"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
diff --git a/games-fps/quake3-ruinhunters-1.0a-r1 b/games-fps/quake3-ruinhunters-1.0a-r1
new file mode 100644
index 000000000000..7a2b6166cbd4
--- /dev/null
+++ b/games-fps/quake3-ruinhunters-1.0a-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Ruin Hunters - Anime mod with cartoon actors and arcade-like gameplay
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10.zip mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bf8d8baf75f6b715ac0800e2c69d87ce
diff --git a/games-fps/quake3-ruinhunters/Manifest b/games-fps/quake3-ruinhunters/Manifest
deleted file mode 100644
index dfac90a16634..000000000000
--- a/games-fps/quake3-ruinhunters/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ruin_hunters_v10.zip 67679542 BLAKE2B a366ab8c3a10905f5d4b50fbc2b386c21a7da9cbdc37d88a0a8bf4cd4a27bf491f924f8e1ef25834377c9b5806692bccd5aeb03823d779e8ee4c27f7b0237526 SHA512 9eabab8460c2ddffeb7cc48eea272028a9623f9df3078c328599f83e2827e73e8578d7846d51026d426007d9579bb34ebe9321e27548fe245840063efbcb8d54
-DIST ruin_hunters_v10a_patch.zip 7186582 BLAKE2B b3e78c0ed15a93c525f285bf46340c8a2d7be16d3232ca6525f3880461365c716860f189675c4ec662944951acb4aa99aa88bffc6cec1dd8623be46599768668 SHA512 898e5fe7c16fdeb030b6fd1873171c9f37eedbcf55162963a1f2ea7ac281ad0021116f705964cfd20aa08a462270bddbb2a4a071331641eab11b8e3dc60abc45
-EBUILD quake3-ruinhunters-1.0a-r1.ebuild 552 BLAKE2B 56ec61e3d0c4dadddc5363d51236797e6897a2673f90627e7e71018bc534d4922e0350358c0f012b3e3781648ce64c0d0de0a5d3a270f4ec587cb8998fc72c96 SHA512 ef6cbc86ce4d031dd364b871e8ff5a95a099cfe5d9392896b55407eaeac53acbd26f22c77cc2b4f256b101cf6ca03a95f103e765cf43d5e85fa924ad10003842
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-ruinhunters/metadata.xml b/games-fps/quake3-ruinhunters/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-ruinhunters/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild b/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
deleted file mode 100644
index 4964206061fb..000000000000
--- a/games-fps/quake3-ruinhunters/quake3-ruinhunters-1.0a-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Anime mod with cartoon actors and arcade-like gameplay"
-MOD_NAME="Ruin Hunters"
-MOD_DIR="ruin"
-
-inherit games games-mods
-
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="
-	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10.zip
-	mirror://quakeunity/modifications/ruinhunters/ruin_hunters_v10a_patch.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f *.bat
-}
diff --git a/games-fps/quake3-teamarena-1.32b b/games-fps/quake3-teamarena-1.32b
new file mode 100644
index 000000000000..7567f38a5ae8
--- /dev/null
+++ b/games-fps/quake3-teamarena-1.32b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Quake III Team Arena - data portion
+EAPI=5
+HOMEPAGE=http://icculus.org/quake3/
+IUSE=cdinstall
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=Q3AEULA
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=|| ( games-fps/quake3 games-fps/quake3-bin ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/quake3/linux/linuxq3apoint-1.32b-3.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_=781022a5b6ca7f7a7aaab9ddb8c9faa3
diff --git a/games-fps/quake3-teamarena/Manifest b/games-fps/quake3-teamarena/Manifest
deleted file mode 100644
index d30bbd373680..000000000000
--- a/games-fps/quake3-teamarena/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST linuxq3apoint-1.32b-3.x86.run 30923961 BLAKE2B 79585534d930a466af58cd34acaac7b9d95da2ad665525b7f7d9ad2e05f3efe5f94b7958b5adca8dd8f687b37d82323a76a701af4bd2cf6011df1e4cc59f4ca9 SHA512 64cff7f8b689e6c801cd68b0f44406a60bd45f83b2544debb8bf1ef7480a1407184a67d2bdafe66e803c0c030b8df6766ce24e48c9e7c610ecf152ed326b7d78
-EBUILD quake3-teamarena-1.32b.ebuild 1256 BLAKE2B ceb31493ac1372af155e07ddb48f207a21d61ad53585f22e95e945b376ed863b8f6c4b47f6d366083de82dd89177c614afa714680a2813189a92aae39e67cd64 SHA512 b0db55d685e39ae75b9f95005251186f9a94c0923f6d3be186e34509bc86aadc060a449745112ff275feb0aed3e2cd1efd4b291fa4a5437b7de27d02d75da390
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-teamarena/metadata.xml b/games-fps/quake3-teamarena/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-teamarena/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild b/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
deleted file mode 100644
index 628004441da5..000000000000
--- a/games-fps/quake3-teamarena/quake3-teamarena-1.32b.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CDROM_OPTIONAL="yes"
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Quake III Team Arena - data portion"
-HOMEPAGE="http://icculus.org/quake3/"
-SRC_URI="mirror://idsoftware/quake3/linux/linuxq3apoint-${PV}-3.x86.run"
-
-LICENSE="Q3AEULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="|| (
-	games-fps/quake3
-	games-fps/quake3-bin )"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	use cdinstall && cdrom_get_cds Setup/missionpack/PAK0.PK3
-	unpack_makeself
-}
-
-src_install() {
-	einfo "Copying Team Arena files from linux client ..."
-	insinto "${GAMES_DATADIR}"/quake3/missionpack
-	doins missionpack/*.pk3
-
-	if use cdinstall ; then
-		einfo "Copying files from CD ..."
-		newins "${CDROM_ROOT}/Setup/missionpack/PAK0.PK3" pak0.pk3
-		eend 0
-	fi
-
-	find "${D}" -exec touch '{}' \;
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! use cdinstall ; then
-		elog "You need to copy PAK0.PK3 from your Team Arena CD into"
-		elog "${dir}/missionpack and name it pak0.pk3."
-		elog "Or if you have got a Window installation of Q3 make a symlink to save space."
-		elog
-		elog "Or, re-emerge quake3-teamarena with USE=cdinstall."
-		echo
-	fi
-}
diff --git a/games-fps/quake3-threewave-1.7-r1 b/games-fps/quake3-threewave-1.7-r1
new file mode 100644
index 000000000000..bff560a74635
--- /dev/null
+++ b/games-fps/quake3-threewave-1.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Quake III Threewave CTF - Threewave CTF
+EAPI=5
+HOMEPAGE=http://www.threewave.com/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-fps/quake3[dedicated] games-fps/quake3-bin[dedicated] ) ) opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) !dedicated? ( !opengl? ( || ( || ( games-fps/quake3[opengl] games-fps/quake3[-dedicated] ) || ( games-fps/quake3-bin[opengl] games-fps/quake3-bin[-dedicated] ) ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://quakeunity/modifications/threewavectf/threewave_16_full.zip mirror://quakeunity/modifications/threewavectf/threewave_17_update.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8d26f2ecca9c01713db94e3ff1328e7e
diff --git a/games-fps/quake3-threewave/Manifest b/games-fps/quake3-threewave/Manifest
deleted file mode 100644
index 4747e541c9cf..000000000000
--- a/games-fps/quake3-threewave/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST threewave_16_full.zip 187896825 BLAKE2B d1217e9b403254cf5226457129dc56bc3f07cb00f0c8a5a926c6b4241c778e17a1d41601684c98b268fcba598aa55e6d0aecec7a7d6628e16a8f2ea5caef2511 SHA512 06d7ce75453f79dc2621086cac816a5bb81cc3c1dcc96015c4f7e18f07144c2cca384d437edda51e431c11854977b5d6197a70be06e1660da9a0c3ab67dae6af
-DIST threewave_17_update.zip 6139861 BLAKE2B 20325e06bfa1bf6899e4de053c3e673d01381f24fb35ce3096d2738241ade30f56ba72317dd5dc5c73ec61d4731d54b036dde2b8b77c5ea4212bb7f2d4376246 SHA512 b2c98112d3c671fb08db154079cf2a085536dd121600301884779030722a18301e73a5d41321dff98508659feda689c8af08be1b05420527c395bb036a627962
-EBUILD quake3-threewave-1.7-r1.ebuild 527 BLAKE2B d13bcc6d742fa13f065c7f7a40f5bdaacc923956cf6facd08d7164e0e24611bb506833d4fcc3b38bc4647f4fa81fca097f66071f216e06439f96a89c808105f3 SHA512 adc06794df2d9cf38f96392494dfd1726d30ad9a7ea67f2f94aaa4b006a7fa574075166aa544e259ea0251fc807039443d948664048c3c0f7521875bb66e6eb8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake3-threewave/metadata.xml b/games-fps/quake3-threewave/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake3-threewave/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild b/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
deleted file mode 100644
index c5ea539aae0b..000000000000
--- a/games-fps/quake3-threewave/quake3-threewave-1.7-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Threewave CTF"
-MOD_NAME="Threewave CTF"
-MOD_DIR="threewave"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.threewave.com/"
-SRC_URI="mirror://quakeunity/modifications/threewavectf/threewave_16_full.zip
-	mirror://quakeunity/modifications/threewavectf/threewave_17_update.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	unpack threewave_{16_full,17_update}.zip
-}
diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest
deleted file mode 100644
index e6ee7ca4c809..000000000000
--- a/games-fps/quake3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX quake3-1.36-bots.patch 499 BLAKE2B d8f9f0df531519e2ca96584ab728a18929f5a27891ec6c5c24e34a705c458205f020e4fa509ec8e66571aad16e21f26fbc45a8e3abc44585469aa589fc191288 SHA512 75d0659a07902cd78153792353796e77ce1baf7545da370d88f37accca090bee9b94d7447bfa0d284fb98769c94ee434cf7baa6fe9f457018d00dd6431eecba0
-DIST ioquake3-1.36.tar.bz2 3503058 BLAKE2B f5688bc66f19eeeb0cc925208ac4f8a95905f4a2a9be6380f408d354d466020135e0944abc1344e81a9f67aeb714111af2d0f968c2c2eab6138f1a55b2db7191 SHA512 fdd8e0ab56966cdc614eff45ab478b87255cfb1b50ba10b3141bcfcc569fc620d281de93333d39119b2d7b43aac3900ecf826a0459fc89bb2f57e30ae2425645
-EBUILD quake3-1.36-r1.ebuild 3013 BLAKE2B 19680c247cc7fb09143118f8190ad387f800e3da789bbef509a8e632fa1dd1bd7fef763bc37fab62af99d6d7b6f22345c5c07f3ecc2a559c9a275a6c01d24b3e SHA512 b20cd53c7dacab10a6948ef1f88dd0c3218d6b156b3b81e4f33a6700abc22e7ee5bf6e4a751ab1bf70f93c3d1fe398600f14cfeb754389cf342ab29600b83179
-EBUILD quake3-9999.ebuild 3537 BLAKE2B a9e2d29981768255e2d532c66baa4e6fb13bf9040c4bd88c2f2d9c545d920165975c5120843bfc93f08cb62d16c473cc90b1ab76568cb426e9cf0d137ec811b2 SHA512 aebd3073b92f3d8878697cca0c7183f7f4f5eca8b9e111dbe80649648d2db951dfd2071247aaaf7912822643d5f6a4649cd5f3d0515989f5f2475bc821368ca9
-MISC metadata.xml 1286 BLAKE2B b6b6ec5139fe9f86f102a52bec57df55a0228ff70cb958cdd5af84c332ddd9e7b78f2e334874d70429f857dcd6e9eb8cd5e843d509b19438040d572b1a3218a8 SHA512 6a82390bc52e5995c1ff12e001cb6d54d70366b618c71107e0c79c5b03c9717b6e7426e221ac499126ea0ea870c75bdfe40418e04a2f3c4241ac5e0b99dd22b9
diff --git a/games-fps/quake3/files/quake3-1.36-bots.patch b/games-fps/quake3/files/quake3-1.36-bots.patch
deleted file mode 100644
index 31d2f2041c6f..000000000000
--- a/games-fps/quake3/files/quake3-1.36-bots.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- code/botlib/l_script.c.orig	2009-11-02 20:29:23.000000000 +0100
-+++ code/botlib/l_script.c	2009-11-02 22:21:40.000000000 +0100
-@@ -1118,7 +1118,7 @@
- {
- 	if (*string == '\"')
- 	{
--		strcpy(string, string+1);
-+		memmove(string, string+1, strlen(string));
- 	} //end if
- 	if (string[strlen(string)-1] == '\"')
- 	{
-@@ -1135,7 +1135,7 @@
- {
- 	if (*string == '\'')
- 	{
--		strcpy(string, string+1);
-+		memmove(string, string+1, strlen(string));
- 	} //end if
- 	if (string[strlen(string)-1] == '\'')
- 	{
diff --git a/games-fps/quake3/metadata.xml b/games-fps/quake3/metadata.xml
deleted file mode 100644
index c62fb568e143..000000000000
--- a/games-fps/quake3/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Quake III Arena is the third installment of the extremely popular and 
-successful Quake series by id software.  The game was released by id 
-software for both Windows and Linux.  The Linux version of the game was 
-maintained and sold by the now defunct Loki Entertainment.  The powerful 
-Quake III engine is the basis for many other commercial games, as id's 
-major source of revenue is licensing their game engines.  The engine 
-allows for user-contributed modifications to be made, allowing the game 
-to be extensible and expandable.  This game is commercial software, and 
-requires the data from a retail copy of the game to play.  If you're 
-interested in checking out the technology behind Quake III, then 
-"emerge quake3-demo" to get the playable demo.
-</longdescription>
-  <use>
-    <flag name="mumble">Adds player-location (positional audio) support to VoIP</flag>
-    <flag name="teamarena">Adds support for Team Arena expansion pack</flag>
-    <flag name="voice">Adds VoIP support</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/quake3/quake3-1.36-r1.ebuild b/games-fps/quake3/quake3-1.36-r1.ebuild
deleted file mode 100644
index d2ce233ab185..000000000000
--- a/games-fps/quake3/quake3-1.36-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs games
-
-MY_PN="ioquake3"
-MY_PV="${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="https://ioquake3.org/"
-SRC_URI="https://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-# "smp" is omitted, because currently it does not work.
-IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
-
-UIDEPEND="virtual/opengl
-	media-libs/libsdl[sound,video,joystick,X,opengl]
-	openal? ( media-libs/openal )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voice? ( media-libs/speex )
-	curl? ( net-misc/curl )"
-DEPEND="opengl? ( ${UIDEPEND} )
-	!dedicated? ( ${UIDEPEND} )"
-UIRDEPEND="voice? ( mumble? ( media-sound/mumble ) )"
-RDEPEND="${DEPEND}
-	opengl? ( ${UIRDEPEND} )
-	!dedicated? ( ${UIRDEPEND} )
-	games-fps/quake3-data
-	teamarena? ( games-fps/quake3-teamarena )"
-
-S="${WORKDIR}/${MY_P}"
-
-my_arch() {
-	case "${ARCH}" in
-		x86)    echo "i386" ;;
-		amd64)  echo "x86_64" ;;
-		*)      tc-arch-kernel ;;
-	esac
-}
-
-my_platform() {
-	usex kernel_linux linux freebsd
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-bots.patch
-	einfo "Fixing libspeex linking..."
-	sed -i -e 's/\(-lspeex\)/\1 -lspeexdsp/' Makefile || die
-}
-
-src_compile() {
-
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	# This is the easiest way to pass CPPFLAGS to the build system, which
-	# are otherwise ignored.
-	append-flags ${CPPFLAGS}
-
-	# OPTIMIZE is disabled in favor of CFLAGS.
-	#
-	# TODO: BUILD_CLIENT_SMP=$(buildit smp)
-	emake \
-		ARCH="$(my_arch)" \
-		V=1 \
-		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
-		BUILD_GAME_QVM=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_SERVER=$(buildit dedicated) \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		GENERATE_DEPENDENCIES=0 \
-		OPTIMIZE="" \
-		PLATFORM="$(my_platform)" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_LOCAL_HEADERS=0 \
-		USE_MUMBLE=$(buildit mumble) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice)
-}
-
-src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README TODO
-	if use voice ; then
-		dodoc voip-readme.txt
-	fi
-
-	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg
-		make_desktop_entry quake3 "Quake III Arena"
-	fi
-
-	cd build/release-$(my_platform)-$(my_arch) || die
-	local exe target
-	for exe in {ioquake3,ioquake3-smp,ioq3ded}.$(my_arch) ; do
-		if [[ -x ${exe} ]] ; then
-			target=${exe%.*}
-			newgamesbin ${exe} ${target}
-			dosym ${target} "${GAMES_BINDIR}/${target/io}"
-		fi
-	done
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	ewarn "The source version of Quake III Arena will not work with PunkBuster."
-	ewarn "If you need PB support, then use the games-fps/quake3-bin package."
-}
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
deleted file mode 100644
index a5273e1ac571..000000000000
--- a/games-fps/quake3/quake3-9999.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# quake3-9999          -> latest git
-# quake3-9999.REV      -> use git REV
-# quake3-VER_alphaREV  -> git snapshot REV for version VER
-# quake3-VER           -> normal quake release
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs games
-[[ "${PV}" == 9999* ]] && inherit git-r3
-
-MY_PN="ioquake3"
-MY_PV="${PV}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="https://ioquake3.org/"
-[[ "${PV}" != 9999* ]] && SRC_URI="https://ioquake3.org/files/${MY_PV}/${MY_P}.tar.bz2"
-EGIT_REPO_URI="https://github.com/ioquake/ioq3.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-# "smp" is omitted, because currently it does not work.
-IUSE="dedicated opengl teamarena +openal curl vorbis voice mumble"
-
-UIDEPEND="virtual/opengl
-	media-libs/libsdl[sound,video,joystick,X,opengl]
-	virtual/jpeg:0
-	openal? ( media-libs/openal )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	voice? ( media-libs/speex )
-	curl? ( net-misc/curl )"
-DEPEND="opengl? ( ${UIDEPEND} )
-	!dedicated? ( ${UIDEPEND} )"
-UIRDEPEND="voice? ( mumble? ( media-sound/mumble ) )"
-RDEPEND="${DEPEND}
-	opengl? ( ${UIRDEPEND} )
-	!dedicated? ( ${UIRDEPEND} )
-	games-fps/quake3-data
-	teamarena? ( games-fps/quake3-teamarena )"
-
-if [[ "${PV}" != 9999* ]] ; then
-	S="${WORKDIR}/${MY_P}"
-fi
-
-my_arch() {
-	case "${ARCH}" in
-		x86)    echo "i386" ;;
-		amd64)  echo "x86_64" ;;
-		*)      tc-arch-kernel ;;
-	esac
-}
-
-my_platform() {
-	usex kernel_linux linux freebsd
-}
-
-src_compile() {
-
-	buildit() { use $1 && echo 1 || echo 0 ; }
-
-	# This is the easiest way to pass CPPFLAGS to the build system, which
-	# are otherwise ignored.
-	append-flags ${CPPFLAGS}
-
-	# Workaround for used zlib macro, wrt bug #449510
-	append-flags -DOF=_Z_OF
-
-	# OPTIMIZE is disabled in favor of CFLAGS.
-	#
-	# TODO: BUILD_CLIENT_SMP=$(buildit smp)
-	emake \
-		ARCH="$(my_arch)" \
-		V=1 \
-		BUILD_CLIENT=$(( $(buildit opengl) | $(buildit !dedicated) )) \
-		BUILD_GAME_QVM=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_SERVER=$(buildit dedicated) \
-		DEFAULT_BASEDIR="${GAMES_DATADIR}/${PN}" \
-		FULLBINEXT="" \
-		GENERATE_DEPENDENCIES=0 \
-		OPTIMIZE="" \
-		PLATFORM="$(my_platform)" \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_INTERNAL_JPEG=0 \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_LOCAL_HEADERS=0 \
-		USE_MUMBLE=$(buildit mumble) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_VOIP=$(buildit voice)
-}
-
-src_install() {
-	dodoc BUGS ChangeLog id-readme.txt md4-readme.txt NOTTODO README.md TODO voip-readme.txt
-	if use voice ; then
-		dodoc voip-readme.txt
-	fi
-
-	if use opengl || ! use dedicated ; then
-		doicon misc/quake3.svg
-		make_desktop_entry quake3 "Quake III Arena"
-		#use smp && make_desktop_entry quake3-smp "Quake III Arena (SMP)"
-	fi
-
-	cd build/release-$(my_platform)-$(my_arch) || die
-	local exe
-	for exe in ioquake3 ioquake3-smp ioq3ded ; do
-		if [[ -x ${exe} ]] ; then
-			dogamesbin ${exe}
-			dosym ${exe} "${GAMES_BINDIR}/${exe/io}"
-		fi
-	done
-
-	# Install renderer libraries, wrt bug #449510
-	# this should be done through 'dogameslib', but
-	# for this some files need to be patched
-	exeinto "${GAMES_DATADIR}/${PN}"
-	doexe renderer*.so
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	ewarn "The source version of Quake III Arena will not work with PunkBuster."
-	ewarn "If you need PB support, then use the games-fps/quake3-bin package."
-}
diff --git a/games-fps/quake4-bin-1.4.2-r2 b/games-fps/quake4-bin-1.4.2-r2
new file mode 100644
index 000000000000..cf963303083b
--- /dev/null
+++ b/games-fps/quake4-bin-1.4.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Sequel to Quake 2, an id Software 3D first-person shooter
+EAPI=5
+HOMEPAGE=http://www.quake4game.com/
+IUSE=cdinstall dedicated l10n_cs l10n_fr l10n_it l10n_pl l10n_ru
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=QUAKE4
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) sys-libs/zlib[abi_x86_32(-)] dedicated? ( app-misc/screen ) !dedicated? ( || ( virtual/opengl[abi_x86_32(-)] x11-drivers/nvidia-drivers ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) cdinstall? ( games-fps/quake4-data ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://idsoftware/quake4/linux/quake4-linux-1.4.2.x86.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_=94127d03eb70d4a3dc1dcabc7170f71d
diff --git a/games-fps/quake4-bin/Manifest b/games-fps/quake4-bin/Manifest
deleted file mode 100644
index 02bd8299ed75..000000000000
--- a/games-fps/quake4-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quake4-linux-1.4.2.x86.run 287552973 BLAKE2B 93c507f17c91168108545e581baf3a7ab7e75a8c7b8a89772292191b87a81ccf6fbd331592e3442a1781df5b71f357c00bb955244a609c48c51d3d4b8c815c6c SHA512 a6a390a8f46c7e696fe865d0688c9a95eb0d9e32ad62ecb796dcc03618994ec065e8c74358518221cb6c8771d2414ed7e144c77a1a8ecd4ae9ce6406459c5f36
-EBUILD quake4-bin-1.4.2-r2.ebuild 3429 BLAKE2B 148a5141c9424fa9d3f6bdbd20e0782cf985eb8329154e2e5248e5f48065e799130daa59a75417a8a54783d9c5881e8237a6a2f17d5d83baad941d8a161b76d0 SHA512 20c98d4f1cb9226e333ab8d5194b35edef3560aa656eb7d45eac0a7cd6926bfc70877bf01b605f7d5e8e4053f19053d2875d5d362309d9563d4f1cf18af6f837
-MISC metadata.xml 1137 BLAKE2B e7787584e4ccd9af82c56f186188e21df5b5c13783685d3b65227e27ccf32e8a860ec065f7a4edb506e2dca604d88d43f5af0ba0e89ee9accc6233d3bfdd0891 SHA512 1ede51f4fcebc6a451ab4790e5d26fd07f464461d15b31c065eb02a77bdc114ba4ec35fb0ca380d980c416007e4671532b053477709fd7d28210b64423132d31
diff --git a/games-fps/quake4-bin/metadata.xml b/games-fps/quake4-bin/metadata.xml
deleted file mode 100644
index 068a2588cec4..000000000000
--- a/games-fps/quake4-bin/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-In a desparate war for Earth's survival against and unrelenting alient enemy,
-the only way to defeat them is to become one of them.
-
-Earth is under seige by the Strogg, a barbaric alien race moving through the
-universe consuming, recycling and annihilating any civilization in their path.
-In a deperate attempt to survive, an armada of Earth's finest warriors is sent
-to take the battle to the Strogg home planet.
-
-You are Matthow Kane, an elite member of Rhino Squad and Eath's valiant invasion
-force.  Fight alone, with your squad, or in hover tanks and mechanized walkers
-as you engage in a heroic mission the the heart of the Strogg war machine.
-
-Quake 4 is the fourth installment of the extremely popular and successful Quake
-series by id software.  This game is commercial software, and requires the data
-from a retail copy of the game to play.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/quake4-bin/quake4-bin-1.4.2-r2.ebuild b/games-fps/quake4-bin/quake4-bin-1.4.2-r2.ebuild
deleted file mode 100644
index 9fcbebba8bf3..000000000000
--- a/games-fps/quake4-bin/quake4-bin-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="Sequel to Quake 2, an id Software 3D first-person shooter"
-HOMEPAGE="http://www.quake4game.com/"
-SRC_URI="mirror://idsoftware/quake4/linux/quake4-linux-${PV}.x86.run"
-
-LICENSE="QUAKE4"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="cdinstall dedicated l10n_cs l10n_fr l10n_it l10n_pl l10n_ru"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	sys-libs/zlib[abi_x86_32(-)]
-	dedicated? ( app-misc/screen )
-	!dedicated? (
-		|| (
-			virtual/opengl[abi_x86_32(-)]
-			x11-drivers/nvidia-drivers
-		)
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
-	)
-	cdinstall? ( games-fps/quake4-data )"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/quake4
-Ddir=${D}/${dir}
-
-QA_TEXTRELS="${dir:1}/pb/pbag.so
-	${dir:1}/pb/pbags.so
-	${dir:1}/pb/pbcl.so
-	${dir:1}/pb/pbcls.so
-	${dir:1}/pb/pbsv.so
-	${dir:1}/libSDL-1.2.id.so.0"
-QA_EXECSTACK="${dir:1}/quake4.x86
-	${dir:1}/quake4smp.x86
-	${dir:1}/q4ded.x86
-	${dir:1}/libSDL-1.2.id.so.0"
-
-zpaklang() {
-	if ! use l10n_${1} ; then
-		einfo "Removing ${2} zpak files"
-		rm -f q4base/zpak_${2}*
-	fi
-}
-
-src_unpack() {
-	unpack_makeself ${A}
-
-	mv q4icon.bmp quake4.bmp || die
-
-	# Am including the Spanish files because Spanish is the default language
-	#zpaklang es spanish
-	zpaklang cs czech
-	zpaklang fr french
-	zpaklang it italian
-	zpaklang pl polish
-	zpaklang ru russian
-
-	# Rename the .off files, so they will be used
-	cd q4base
-	if [[ ! -z $(ls *.off 2> /dev/null) ]] ; then
-		local f
-		for f in *.off ; do
-			einfo "Renaming ${f}"
-			mv "${f}" "${f%.off}" || die "mv ${f}"
-		done
-	fi
-}
-
-src_install() {
-	insinto "${dir}"
-	doins CHANGES* License.txt sdl.patch.1.2.10 us/version.info
-	doins -r pb q4mp
-	dodoc README*
-
-	insinto "${dir}"/q4base
-	doins q4base/* us/q4base/* || die "doins q4base"
-	games_make_wrapper quake4-ded ./q4ded.x86 "${dir}" "${dir}"
-
-	exeinto "${dir}"
-	doexe openurl.sh bin/Linux/x86/q4ded.x86
-
-	if ! use dedicated ; then
-		doexe bin/Linux/x86/{quake4{,smp}.x86,*.id.so.?}
-		doicon quake4.bmp || die "doicon"
-		games_make_wrapper quake4 "./quake4.x86" "${dir}" "${dir}"
-		games_make_wrapper quake4-smp ./quake4smp.x86 "${dir}" "${dir}"
-		icon_path="quake4"
-		if [ -e "${FILESDIR}"/quake4.png ]
-		then
-			doicon "${FILESDIR}"/quake4.png || die "copying icon"
-		elif [ -e "${DISTDIR}"/quake4.png ]
-		then
-			doicon "${DISTDIR}"/quake4.png || die "copying icon"
-		else
-			icon_path=/usr/share/pixmaps/quake4.bmp
-		fi
-		make_desktop_entry quake4 "Quake IV" ${icon_path}
-		make_desktop_entry quake4-smp "Quake IV (SMP)" ${icon_path}
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use cdinstall ; then
-		elog "You need to copy pak001.pk4 through pak012.pk4, along with"
-		elog "zpak*.pk4 from either your installation media or your hard drive"
-		elog "to ${dir}/q4base before running the game."
-		echo
-	fi
-	if ! use dedicated ; then
-		elog "To play the game, run:  quake4"
-		elog
-		# The default language is Spanish!
-		elog "To reset the language from Spanish to English, run:"
-		elog " sed -i 's:spanish:english:' ~/.quake4/q4base/Quake4Config.cfg"
-		elog
-		elog "Saved games from previous Quake 4 versions might not be compatible."
-		echo
-	fi
-	elog "To start the dedicated server, run:  quake4-ded"
-}
diff --git a/games-fps/quake4-data-1.0.2147.12 b/games-fps/quake4-data-1.0.2147.12
new file mode 100644
index 000000000000..ef1056b15124
--- /dev/null
+++ b/games-fps/quake4-data-1.0.2147.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/bzip2 app-arch/tar
+DESCRIPTION=sequel to Quake 2, an id 3D first-person shooter
+EAPI=5
+HOMEPAGE=http://www.quake4game.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=QUAKE4
+PDEPEND=games-fps/quake4-bin
+PROPERTIES=interactive
+RDEPEND=games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6382ab7a5e7cca65b14b4388535b8474
diff --git a/games-fps/quake4-data/Manifest b/games-fps/quake4-data/Manifest
deleted file mode 100644
index 6a9f21e4f4c4..000000000000
--- a/games-fps/quake4-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD quake4-data-1.0.2147.12.ebuild 1361 BLAKE2B a0de8eaff617a7d141522bee966d0d99bc199f46acefcf1a9eed83eb867d4ca0ef08314799f1690f600ff1848ed03237cab8088e549b13881633b3494328eeee SHA512 cd704c1ee316a4388582743f5b04efd3114f65acd11692654f9657616b2ad380668c83f1e7b01ba70dfb9718f237750074ec10d9cc25e686b3365ef32f38563e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake4-data/metadata.xml b/games-fps/quake4-data/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/quake4-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild b/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
deleted file mode 100644
index a4675a6b575f..000000000000
--- a/games-fps/quake4-data/quake4-data-1.0.2147.12.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cdrom games
-
-DESCRIPTION="sequel to Quake 2, an id 3D first-person shooter"
-HOMEPAGE="http://www.quake4game.com/"
-SRC_URI=""
-
-LICENSE="QUAKE4"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="app-arch/bzip2
-	app-arch/tar"
-RDEPEND=""
-PDEPEND="games-fps/quake4-bin"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/quake4
-Ddir=${D}/${dir}
-
-src_install() {
-	cdrom_get_cds Setup/Data/q4base/pak012.pk4 \
-		Setup/Data/q4base/pak001.pk4 \
-		Setup/Data/q4base/pak004.pk4 \
-		Setup/Data/q4base/pak007.pk4
-	insinto "${dir}"/q4base
-	einfo "Copying files from Disk 1..."
-	doins "${CDROM_ROOT}"/Setup/Data/q4base/pak01{0,1,2}.pk4 \
-		"${CDROM_ROOT}"/Setup/Data/q4base/zpak*.pk4
-	cdrom_load_next_cd
-	einfo "Copying files from Disk 2..."
-	doins "${CDROM_ROOT}"/Setup/Data/q4base/pak00{1,2,3}.pk4
-	cdrom_load_next_cd
-	einfo "Copying files from Disk 3..."
-	doins "${CDROM_ROOT}"/Setup/Data/q4base/pak00{4,5,6}.pk4
-	cdrom_load_next_cd
-	einfo "Copying files from Disk 4..."
-	doins "${CDROM_ROOT}"/Setup/Data/q4base/pak00{7,8,9}.pk4
-
-	find "${Ddir}" -exec touch '{}' +
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "This is just the data portion of the game. You need to merge"
-	elog "games-fps/quake4-bin to play."
-	echo
-}
diff --git a/games-fps/quake4-demo-1.0-r2 b/games-fps/quake4-demo-1.0-r2
new file mode 100644
index 000000000000..2108e0bafecc
--- /dev/null
+++ b/games-fps/quake4-demo-1.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Sequel to Quake 2, an Id 3D first-person shooter
+EAPI=5
+HOMEPAGE=http://www.quake4game.com/
+IUSE=dedicated
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=QUAKE4
+RDEPEND=sys-libs/glibc sys-libs/libstdc++-v3:5 amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( || ( virtual/opengl[abi_x86_32(-)] x11-drivers/nvidia-drivers ) >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://idsoftware/quake4/demo/quake4-linux-1.0-demo.x86.run http://www.3ddownloads.com/Action/Quake%204/Demos/quake4-linux-1.0-demo.x86.run mirror://3dgamers/quake4/quake4-linux-1.0-demo.x86.run http://filebase.gmpf.de/quake4/quake4-linux-1.0-demo.x86.run http://www.holarse.de/mirror/quake4-linux-1.0-demo.x86.run http://sonic-lux.net/data/mirror/quake4/quake4-linux-1.0-demo.x86.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_=e710089ebe7d62a97fc515e672694616
diff --git a/games-fps/quake4-demo/Manifest b/games-fps/quake4-demo/Manifest
deleted file mode 100644
index e57e9828b5f2..000000000000
--- a/games-fps/quake4-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quake4-linux-1.0-demo.x86.run 337276597 BLAKE2B 1fa657287210e717486955c5b6190e52665c2c8eb4faf44b1a4ba851347e934436f1153c9df2c3296e3e981c7cf981dbcf5bdb042b6eab1d36214f6937839161 SHA512 c7fa64ca9f95ab61fd02f2d7d3a85c718a5dea9f60a89ba8b46e7500f090fe45bbe498775e41541e33a0bb3483b75da10529755bef3a97d3e362d1c173a02abe
-EBUILD quake4-demo-1.0-r2.ebuild 1897 BLAKE2B aa7a681e68bcf05f42f660cfff2916c0accb0a91db2b297bd57deba6b4e123d2679a554c14d7b6f8b561ae881dfeb925b9f8717ac7388cbfc4cdb02bc2e9739f SHA512 743e53e31e2c88114e7ee02b5869447e3a0930006b6673f191895e89dec2113c56ef85d7e44ec76cf3b42955055b2449b5194ddc5dda9d897ddf6452ed3d7acb
-MISC metadata.xml 1090 BLAKE2B 0cef05f0bb46b9e1ddc0a2c30a3441d98bba5e5f16563b52eefccf1a7bcb4d4c5f2528413ed2ca4680c8bfe9bcbadf3a76c6f6efe26e84d663cec985e2add058 SHA512 d1e6906e94fb8a42f605310a3a2e18fdc99f7557ac7605116c2fa328838f624ff70d7e7f716b1b841de78a5e35067f2f6866d8f36feaf6fd36f8b4c964bbbc0f
diff --git a/games-fps/quake4-demo/metadata.xml b/games-fps/quake4-demo/metadata.xml
deleted file mode 100644
index c4e94c39a17d..000000000000
--- a/games-fps/quake4-demo/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-In a desparate war for Earth's survival against and unrelenting alient enemy,
-the only way to defeat them is to become one of them.
-
-Earth is under seige by the Strogg, a barbaric alien race moving through the
-universe consuming, recycling and annihilating any civilization in their path.
-In a deperate attempt to survive, an armada of Earth's finest warriors is sent
-to take the battle to the Strogg home planet.
-
-You are Matthow Kane, an elite member of Rhino Squad and Eath's valiant invasion
-force.  Fight alone, with your squad, or in hover tanks and mechanized walkers
-as you engage in a heroic mission the the heart of the Strogg war machine.
-
-Quake 4 is the fourth installment of the extremely popular and successful Quake
-series by id software.  This is the demo version of the commercial game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/quake4-demo/quake4-demo-1.0-r2.ebuild b/games-fps/quake4-demo/quake4-demo-1.0-r2.ebuild
deleted file mode 100644
index a576d70253bb..000000000000
--- a/games-fps/quake4-demo/quake4-demo-1.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_P="quake4-linux-${PV}-demo"
-DESCRIPTION="Sequel to Quake 2, an Id 3D first-person shooter"
-HOMEPAGE="http://www.quake4game.com/"
-SRC_URI="mirror://idsoftware/quake4/demo/${MY_P}.x86.run
-	http://www.3ddownloads.com/Action/Quake%204/Demos/${MY_P}.x86.run
-	mirror://3dgamers/quake4/${MY_P}.x86.run
-	http://filebase.gmpf.de/quake4/${MY_P}.x86.run
-	http://www.holarse.de/mirror/${MY_P}.x86.run
-	http://sonic-lux.net/data/mirror/quake4/${MY_P}.x86.run"
-
-LICENSE="QUAKE4"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc
-	sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/glibc[multilib] sys-libs/libstdc++-v3:5[multilib] )
-	dedicated? ( app-misc/screen )
-	!dedicated? (
-		|| (
-			virtual/opengl[abi_x86_32(-)]
-			x11-drivers/nvidia-drivers
-		)
-		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-		>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-		>=media-libs/libsdl-1.2.15-r4[X,opengl,sound,abi_x86_32(-)]
-	)"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-QA_PREBUILT="${dir:1}/quake4.x86
-	${dir:1}/q4ded.x86"
-
-src_install() {
-	insinto "${dir}"
-	doins License.txt q4icon.bmp version.info
-	dodoc README
-
-	exeinto "${dir}"
-	doexe openurl.sh bin/Linux/x86/q4ded.x86
-	games_make_wrapper ${PN}-ded ./q4ded.x86 "${dir}" "${dir}"
-
-	insinto "${dir}"/q4base
-	doins q4base/*
-
-	if ! use dedicated ; then
-		doexe bin/Linux/x86/quake4.x86
-		games_make_wrapper ${PN} ./quake4.x86 "${dir}" "${dir}"
-		newicon q4icon.bmp ${PN}.bmp || die
-		make_desktop_entry ${PN} "Quake IV (Demo)" /usr/share/applications/${PN}.bmp
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	if ! use dedicated; then
-		elog "To play the game run:"
-		elog " quake4-demo"
-		echo
-	fi
-	elog "To start the gameserver, run:"
-	elog " quake4-demo-ded"
-}
diff --git a/games-fps/quakeforge-0.7.2-r1 b/games-fps/quakeforge-0.7.2-r1
new file mode 100644
index 000000000000..8f91011dea20
--- /dev/null
+++ b/games-fps/quakeforge-0.7.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl alsa? ( media-libs/alsa-lib ) dga? ( x11-libs/libXxf86dga ) flac? ( media-libs/flac ) ncurses? ( sys-libs/ncurses:0 ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl[video] ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wildmidi? ( media-sound/wildmidi ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib ) cdinstall? ( games-fps/quake1-data ) >=sys-devel/bison-2.6 sys-devel/flex 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=New 3d engine based off of id Softwares's Quake and QuakeWorld game engine
+EAPI=6
+HOMEPAGE=http://www.quakeforge.net/
+IUSE=alsa cdinstall debug dga fbcon flac ipv6 ncurses oss png sdl vorbis wildmidi X xdg xv zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsamplerate net-misc/curl virtual/opengl alsa? ( media-libs/alsa-lib ) dga? ( x11-libs/libXxf86dga ) flac? ( media-libs/flac ) ncurses? ( sys-libs/ncurses:0 ) png? ( media-libs/libpng:0 ) sdl? ( media-libs/libsdl[video] ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wildmidi? ( media-sound/wildmidi ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) zlib? ( sys-libs/zlib )
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=mirror://sourceforge/quake/quakeforge-0.7.2.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_=0cf5aab32b2bf670000205abdc89012d
diff --git a/games-fps/quakeforge/Manifest b/games-fps/quakeforge/Manifest
deleted file mode 100644
index ec595124a5ed..000000000000
--- a/games-fps/quakeforge/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX quakeforge-0.7.2-gentoo.patch 1365 BLAKE2B 486c303505940d78b982b92848b04532a77cf2a5896d1cb26b9cf4dc013dca03aea0686102e42a30f7c4038819859c69f01890f55632c0d5af1102cf91d23f86 SHA512 521ba870e7b04e98c4d5507f661b0bfe7f18dc3901b671aed8c03c7691466e4e67f382d0fe05545eabff3ae684b8ed39e6681b4179348682f9adeb3eab177d9d
-DIST quakeforge-0.7.2.tar.bz2 2887823 BLAKE2B 27526b0e5491cc9a052f70c387c46b0d5518c0d63264f799cac81e471a87b978c9edcf22f4a68db25b8c05b7b51371504459e8ba5de450719e92aae712940cc7 SHA512 d296e10b86466aee0a4be527a5fea7a44bae60ebef52ad86381744dc96e2bed2ad14d3b790b4514a5c59ac897662e91b80a9d49c822910930742a1d2b8a2ec55
-EBUILD quakeforge-0.7.2-r1.ebuild 3110 BLAKE2B e33ebe3b29114e0311f073fb311b9ac4bd783971b54af4cac2e48f49aa4887d64fb47ec42785e5bd03b371221f256667f06a4bafb7a6c8620c4add2fb9916a3c SHA512 c0031fac48ad0a1307264b2d077db618636fd247af4cc8efb2ae9e54bc6c99a6514cd15b4f8889286a4956cf56703111d1eda87d082dfc3b2c6213b8f1412716
-MISC metadata.xml 1685 BLAKE2B f2ee32565cd97551e6cd22200d0ce2332a014b774511b172dc1e2b486a27e417af441f1f944b8325bf23dc7363e46a01fa6b51237353f8964e98dd5836357cb3 SHA512 caf9d7549c8e5d801f8d626b8a4c2528735a13fa2c721f4b9d5c9ae74ae15ee55c22f165d3027fcfed8309d6bf1face5dea9ebbb1b8624d679658c6768d77bc0
diff --git a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch b/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
deleted file mode 100644
index 38fb0c187689..000000000000
--- a/games-fps/quakeforge/files/quakeforge-0.7.2-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/nq/source/Makefile.am	2012-11-18 16:57:56.658388682 +0100
-+++ b/nq/source/Makefile.am	2012-11-18 16:58:11.470268607 +0100
-@@ -138,7 +138,7 @@
- nq_x11_SOURCES= 	sys_unix.c
- nq_x11_LDADD=		$(nq_x11_libs) \
- 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
--			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS)
-+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) -ldl
- nq_x11_LDFLAGS= 	$(common_ldflags)
- nq_x11_DEPENDENCIES=	$(nq_x11_libs)
- 
---- a/qw/source/Makefile.am	2012-11-18 17:10:59.148172332 +0100
-+++ b/qw/source/Makefile.am	2012-11-18 17:11:55.866876762 +0100
-@@ -168,7 +168,7 @@
- qw_client_x11_SOURCES=	cl_sys_unix.c
- qw_client_x11_LDADD= $(qw_client_x11_libs) \
- 			$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
--			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS)
-+			$(X_EXTRA_LIBS) $(X_SHM_LIB) $(NET_LIBS) $(LIBCURL_LIBS) -ldl
- qw_client_x11_LDFLAGS=	$(common_ldflags)
- qw_client_x11_DEPENDENCIES= $(qw_client_x11_libs)
- 
---- a/tools/qwaq/Makefile.am	2012-11-18 17:15:16.024714317 +0100
-+++ b/tools/qwaq/Makefile.am	2012-11-18 17:15:41.955749660 +0100
-@@ -38,7 +38,7 @@
- qwaq_x11_SOURCES=qwaq.c qwaq-bi.c
- qwaq_x11_LDADD= $(qwaq_x11_libs) $(QWAQ_LIBS) \
- 				$(VIDMODE_LIBS) $(DGA_LIBS) $(X_LIBS) -lX11 \
--				$(X_EXTRA_LIBS) $(X_SHM_LIB)
-+				$(X_EXTRA_LIBS) $(X_SHM_LIB) -ldl
- qwaq_x11_LDFLAGS=
- qwaq_x11_DEPENDENCIES= $(qwaq_x11_libs) $(QWAQ_DEPS)
- 
diff --git a/games-fps/quakeforge/metadata.xml b/games-fps/quakeforge/metadata.xml
deleted file mode 100644
index bd3de0628e47..000000000000
--- a/games-fps/quakeforge/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-QuakeForge is a 3D graphics game engine based on id Software's legendary 
-Quake and QuakeWorld game engine. Our purpose? To improve the state of 
-the game by improving the engine and making it accessable to the largest 
-number of players we can.
-
-Arguably the single most important issue on the minds of players today 
-is the rampant cheating which is currently happening on many of the 
-larger servers. It's a serious problem and it really makes a good game 
-hard to find. We're working hard to fix these problems at the engine 
-level.
-
-But what good is that if you have to have a copy of our client and the 
-server has to run our server? There are other projects out there and 
-some of them have very unique qualities. QuakeForge is cooperating with 
-QSG, a group comprised of representatives from nearly every known Quake 
-source project to ensure that our clients and servers run with other 
-clients and servers just fine. We have all agreed to implement any 
-effective cheat prevention methods.
-
-Other things we're doing include merging the two code trees, adding 
-features, and improving the OpenGL renderer. And QuakeForge is still the 
-most portable source tree based on the id Software code.
-</longdescription>
-	<use>
-		<flag name="wildmidi">enable libWildMidi support</flag>
-		<flag name="xdg">enable XDG support</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">quake</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild b/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
deleted file mode 100644
index 37a670a5b276..000000000000
--- a/games-fps/quakeforge/quakeforge-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="New 3d engine based off of id Softwares's Quake and QuakeWorld game engine"
-HOMEPAGE="http://www.quakeforge.net/"
-SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdinstall debug dga fbcon flac ipv6 ncurses oss png sdl vorbis wildmidi X xdg xv zlib"
-RESTRICT="userpriv"
-
-RDEPEND="
-	media-libs/libsamplerate
-	net-misc/curl
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	dga? ( x11-libs/libXxf86dga )
-	flac? ( media-libs/flac )
-	ncurses? ( sys-libs/ncurses:0 )
-	png? ( media-libs/libpng:0 )
-	sdl? ( media-libs/libsdl[video] )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wildmidi? ( media-sound/wildmidi )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-	)
-	xv? (
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	cdinstall? ( games-fps/quake1-data )
-	>=sys-devel/bison-2.6
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	append-cflags -std=gnu89 # build with gcc5 (bug #570392)
-}
-
-src_configure() {
-	local debugopts
-	use debug \
-		&& debugopts="--enable-debug --disable-optimize --enable-profile" \
-		|| debugopts="--disable-debug --disable-profile"
-
-	local clients=${QF_CLIENTS}
-	use fbcon && clients="${clients},fbdev"
-	use sdl && clients="${clients},sdl"
-	use X && clients="${clients},x11"
-	[ "${clients:0:1}" == "," ] && clients=${clients:1}
-
-	local servers=${QF_SERVERS:-master,nq,qw,qtv}
-
-	local tools=${QF_TOOLS:-all}
-
-	econf \
-		--enable-dependency-tracking \
-		$(use_enable ncurses curses) \
-		$(use_enable vorbis) \
-		$(use_enable png) \
-		$(use_enable zlib) \
-		$(use_with ipv6) \
-		$(use_with fbcon fbdev) \
-		$(use_with X x) \
-		$(use_enable xv vidmode) \
-		$(use_enable dga) \
-		$(use_enable sdl) \
-		--disable-xmms \
-		$(use_enable alsa) \
-		$(use_enable flac) \
-		$(use_enable oss) \
-		$(use_enable xdg) \
-		$(use_enable wildmidi) \
-		--enable-sound \
-		--disable-optimize \
-		--disable-Werror \
-		--without-svga \
-		${debugopts} \
-		--with-global-cfg=/etc/quakeforge.conf \
-		--with-sharepath=/usr/share/quake1 \
-		--with-clients=${clients} \
-		--with-servers=${servers} \
-		--with-tools=${tools}
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc ChangeLog NEWS TODO
-}
-
-pkg_postinst() {
-	# same warning used in quake1 / quakeforge / nprquake-sdl
-	echo
-	elog "Before you can play, you must make sure"
-	elog "${PN} can find your Quake .pak files"
-	elog
-	elog "You have 2 choices to do this"
-	elog "1 Copy pak*.pak files to /usr/share/quake1/id1"
-	elog "2 Symlink pak*.pak files in /usr/share/quake1/id1"
-	elog
-	elog "Example:"
-	elog "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
-	elog "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak /usr/share/quake1/id1/pak0.pak"
-	elog
-	elog "You only need pak0.pak to play the demo version,"
-	elog "the others are needed for registered version"
-}
diff --git a/games-fps/qudos-0.40.1 b/games-fps/qudos-0.40.1
new file mode 100644
index 000000000000..44bad80dbf42
--- /dev/null
+++ b/games-fps/qudos-0.40.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm
+DESCRIPTION=Enhanced Quake 2 engine
+EAPI=5
+HOMEPAGE=https://github.com/ZwS/qudos
+IUSE=cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=opengl? ( virtual/opengl virtual/glu ) sdl? ( media-libs/libsdl[joystick?,opengl,sound,video] virtual/opengl virtual/glu ) virtual/jpeg:0 media-libs/libogg media-libs/libpng:0 media-libs/libvorbis sys-libs/zlib x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm cdinstall? ( games-fps/quake2-data ) demo? ( games-fps/quake2-demodata[symlink] ) textures? ( games-fps/quake2-textures ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/QuDos-0.40.1-src.tar.bz2 https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> QuDos-0.40.1.pk3
+_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_=7ea1e992cfd3eb9fe4d4cc114e8cd082
diff --git a/games-fps/qudos/Manifest b/games-fps/qudos/Manifest
deleted file mode 100644
index b544a3a1cf03..000000000000
--- a/games-fps/qudos/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX qudos-0.40.1-gnusource.patch 338 BLAKE2B 31b811ca4592ee82e15cc55ab0d5e9e054dc3456f421bada3be8c41993bb7e15ae40f1c53b8aa54e9600ac850c5c4336a67647863c4f6e2b6b473f49a40b8fac SHA512 6e6411e0d6a4c48a82f70cc83eb64eb8b86a15f0ffa552007cb5af6a8d0f718527f6acbcdb80393b45344e133f52ee366cf7923423afae25b3c6ab10829dae98
-AUX qudos-0.40.1-libpng15.patch 205 BLAKE2B 254b56d3933f6eaa5c818042b7875c978c8864b2db711e9fe820942aa3316f593eb9ccd20558ccc95083b6350075e6830fcddb1d694b4e27e7dab6727d91fa8f SHA512 4a2ccb3566f0d3126910b48c024fc5b9d40fe471ca73ce043bc8c8339d2a08f124b921e622bdee05ed007861f4b816941307184bfcbdb8281eca02733b289f70
-DIST QuDos-0.40.1-src.tar.bz2 2031636 BLAKE2B 4940f589cc6239e1489bb81f2e0c0afd6efb36930595c57131927b777913c904ada04883eb5f12f9aaf0ba06d687bf4be8b03f369dd9684fe21d7b1068240599 SHA512 97b9c6bac0d09c060ab33174604deb2781f0ebdc48b00bd0bc402523fb04cdf84edd8abc18507bba8c7e616f6d460a1de6debc96ec39bb5562b20a7f06eea734
-DIST QuDos-0.40.1.pk3 4210489 BLAKE2B 98e07682368e52f4c318e7b9ab98d01b0363986bfea54edff3b13f7f2f4cad20de0146eb498569d024d22200830b341b02f135bf50df4a317915429bb1437439 SHA512 19c3c6b3d17cbd9642320d8eb7a83d667afeafd0ee5eb818e9f07be71e2ab69182474c1f529ecbcfcfa59590bafedb0de3c70dfff10e4bc7a6e07a1546f27d4b
-EBUILD qudos-0.40.1.ebuild 4100 BLAKE2B a510073509090e1871fde9845ab019ddc9b3941ec5f433a8afb0ab16a206706406cf3bd26037b546f81270c4ae70736df9e50bbf40ca2a665ba3b594f873aeb0 SHA512 af3b10b7fc9ea21978a6f69a743a7ec62bd57ef3a85e12dcdfd51c0f783a2758d3b709045269a2503dac72adf3388037d06e8760b2c22b18f11f83bbd2fdb2a1
-MISC metadata.xml 665 BLAKE2B 1f84309c0351baa3d365661d5840a05358889318eb0d42c4e71a42962b730bfe87f3e4bdee7a3f79f130d4d727f33e98ae5399eaa0f0f2aea4594fd5ac648888 SHA512 c96f5c164edea2f535115ca1fdd9ff39755f2be2a3f8846eb91d22e6d12f6e0e589e6d7e97a69d0afc65464df62390117296a27bb7b4b2e8da79735b206e5966
diff --git a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch b/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
deleted file mode 100644
index dd2113b0c3bb..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-gnusource.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/unix/qsh_unix.c.orig	2011-10-22 17:46:37.665993357 -0500
-+++ src/unix/qsh_unix.c	2011-10-22 17:46:40.965972209 -0500
-@@ -17,6 +17,9 @@
-  * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  *
-  */
-+#if !defined(_GNU_SOURCE)
-+	#define _GNU_SOURCE
-+#endif
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
diff --git a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch b/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
deleted file mode 100644
index ecf9de9370e9..000000000000
--- a/games-fps/qudos/files/qudos-0.40.1-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ref_gl/gl_local.h
-+++ src/ref_gl/gl_local.h
-@@ -29,6 +29,7 @@
- #include <GL/glu.h>
- #include <GL/glext.h>
- 
-+#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
- #include <png.h>
- #include <jpeglib.h>
- 
diff --git a/games-fps/qudos/metadata.xml b/games-fps/qudos/metadata.xml
deleted file mode 100644
index 114138906332..000000000000
--- a/games-fps/qudos/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="demo">Install the demo files (quake2-demodata) and configure for use</flag>
-    <flag name="mods">Build support for the quake2 mission packs</flag>
-    <flag name="qmax">Build the pretty version (quake max)</flag>
-    <flag name="textures">Install the enhanced textures (quake2-textures)</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">ZwS/qudos</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-fps/qudos/qudos-0.40.1.ebuild b/games-fps/qudos/qudos-0.40.1.ebuild
deleted file mode 100644
index 27988248d7dd..000000000000
--- a/games-fps/qudos/qudos-0.40.1.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-FILE_STEM="QuDos-${PV}-src"
-PK3_FILE="QuDos-${PV}.pk3"
-MY_PN="quake2"
-
-DESCRIPTION="Enhanced Quake 2 engine"
-HOMEPAGE="https://github.com/ZwS/qudos"
-SRC_URI="mirror://gentoo/${FILE_STEM}.tar.bz2
-	https://github.com/ZwS/qudos/raw/master/quake2/baseq2/qudos.pk3 -> ${PK3_FILE}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall debug dedicated demo dga ipv6 joystick mods opengl qmax oss sdl textures"
-
-DEPEND="opengl? (
-		virtual/opengl
-		virtual/glu )
-	sdl? ( media-libs/libsdl[joystick?,opengl,sound,video]
-		virtual/opengl
-		virtual/glu )
-	virtual/jpeg:0
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libvorbis
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-RDEPEND="${DEPEND}
-	cdinstall? ( games-fps/quake2-data )
-	demo? ( games-fps/quake2-demodata[symlink] )
-	textures? ( games-fps/quake2-textures )"
-
-S=${WORKDIR}/${FILE_STEM}
-dir=${GAMES_DATADIR}/${MY_PN}
-
-default_client() {
-	if use opengl || use sdl || ! use dedicated ; then
-		# Build default client
-		return 0
-	fi
-	return 1
-}
-
-pkg_setup() {
-	games_pkg_setup
-
-	if ! use qmax && $( use opengl || use sdl ) ; then
-		elog "The 'qmax' graphical improvements are recommended."
-		echo
-	fi
-
-	if use debug ; then
-		ewarn "The 'debug' USE flag may cause compilation to fail with:"
-		ewarn
-		ewarn "src/qcommon/cmd.c:364: warning: dereferencing type-punned"
-		ewarn "pointer will break strict-aliasing rules."
-		echo
-	fi
-
-	# Determine the default sound driver, in order of preference
-	# snd_drv is not a local variable
-	snd_drv=""
-	[[ -z "${snd_drv}" ]] && use oss && snd_drv="oss"
-	[[ -z "${snd_drv}" ]] && use sdl && snd_drv="sdl"
-	# Default if nothing else chosen
-	[[ -z "${snd_drv}" ]] && snd_drv="oss"
-
-	if default_client ; then
-		elog "Selected the ${snd_drv} sound driver as the default."
-		echo
-	fi
-}
-
-src_unpack() {
-	unpack "${FILE_STEM}.tar.bz2"
-}
-
-src_prepare() {
-	rm docs/gnu.txt
-
-	# Change default sound driver and its location
-	sed -i \
-		-e "s:\"oss\":\"${snd_drv}\":" \
-		-e "s:\"\./snd:\"$(games_get_libdir)/${PN}/snd:" \
-		src/client/snd_dma.c || die
-
-	sed -i \
-		-e 's:jpeg_mem_src:qudos_jpeg_mem_src:g' \
-		src/ref_gl/gl_image.c || die
-
-	if has_version '>=sys-libs/zlib-1.2.5.1-r1' ; then
-		sed -i \
-			-e '1i#define OF(x) x' \
-			src/qcommon/unzip/ioapi.h || die
-	fi
-	sed -i -e '106,119 s/CFL/LED/' Makefile || die
-
-	epatch \
-		"${FILESDIR}"/${P}-libpng15.patch \
-		"${FILESDIR}"/${P}-gnusource.patch
-}
-
-src_compile() {
-	yesno() { usex $1 YES NO; }
-
-	local client="YES"
-	default_client || client="NO"
-
-	local type="release"
-	use debug && type="debug"
-
-	emake \
-		BUILD_QUAKE2="${client}" \
-		BUILD_DEDICATED=$(yesno dedicated) \
-		BUILD_GLX=$(yesno opengl) \
-		BUILD_SDLGL=$(yesno sdl) \
-		BUILD_ALSA_SND=NO \
-		BUILD_SDL_SND=$(yesno sdl) \
-		BUILD_OSS_SND=$(yesno oss) \
-		WITH_XMMS=NO \
-		WITH_DGA_MOUSE=$(yesno dga) \
-		WITH_JOYSTICK=$(yesno joystick) \
-		TYPE="${type}" \
-		DATADIR="${dir}" \
-		LOCALBASE=/usr \
-		LIBDIR="$(games_get_libdir)"/${PN} \
-		WITH_QMAX=$(yesno qmax) \
-		BUILD_3ZB2=$(yesno mods) \
-		BUILD_CTF=$(yesno mods) \
-		BUILD_JABOT=$(yesno mods) \
-		BUILD_ROGUE=$(yesno mods) \
-		BUILD_XATRIX=$(yesno mods) \
-		BUILD_ZAERO=$(yesno mods) \
-		WITH_BOTS=$(yesno mods) \
-		HAVE_IPV6=$(yesno ipv6) \
-		CC="$(tc-getCC)" \
-		WITH_X86_ASM=NO \
-		WITH_DATADIR=YES \
-		WITH_LIBDIR=YES \
-		BUILD_DEBUG_DIR=release \
-		BUILD_RELEASE_DIR=release
-}
-
-src_install() {
-	if default_client ; then
-		newgamesbin ${MY_PN}/QuDos ${PN}
-		# Change from gif to png in next version?
-		newicon docs/q2_orig/quake2.gif ${PN}.gif
-		make_desktop_entry ${PN} "QuDos" ${PN}.gif
-	fi
-
-	if use dedicated ; then
-		newgamesbin ${MY_PN}/QuDos-ded ${PN}-ded
-	fi
-
-	insinto "$(games_get_libdir)"/${PN}
-	doins -r ${MY_PN}/*
-	rm "${D}/$(games_get_libdir)"/${PN}/QuDos
-
-	insinto "$(games_get_libdir)"/${PN}/baseq2
-	newins "${DISTDIR}/${PK3_FILE}" qudos.pk3
-
-	dodoc $(find docs -name \*.txt) docs/q2_orig/README*
-
-	prepgamesdirs
-}
diff --git a/games-fps/red-blue-quake2-0.1 b/games-fps/red-blue-quake2-0.1
new file mode 100644
index 000000000000..4488c0397a92
--- /dev/null
+++ b/games-fps/red-blue-quake2-0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/libX11 app-arch/unzip
+DESCRIPTION=red-blue Quake II ! play quake2 w/3d glasses !
+EAPI=5
+HOMEPAGE=https://www.jfedor.org/red-blue-quake2/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://idsoftware/source/q2source-3.21.zip https://www.jfedor.org/red-blue-quake2/red-blue-quake2-0.1.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_=3092c647792987afc2b1734012a4776d
diff --git a/games-fps/red-blue-quake2/Manifest b/games-fps/red-blue-quake2/Manifest
deleted file mode 100644
index b5a457d5be80..000000000000
--- a/games-fps/red-blue-quake2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.1-gentoo.patch 1964 BLAKE2B 75d24546aa8792f0cc0888c5730882ec8939f0ea654a17dad0b3bb2b1921ee0c0928593c667daf87180e1d63634d5afa479c71e942c907a1787b3ecd47cdce41 SHA512 87b7d3a355a57940b1ce2be3e30ff5053aa83af2e53018f1ea00556dba67cbb1767729867eabf062faf1a08eb2ca601176dbccd6c9585160edb2e3477b22fa5a
-AUX red-blue-quake2-0.1-gcc41.patch 895 BLAKE2B eb246353c60602806a835a6ef375d45cb14b08bf51fdeab4eaea884ce1b94b03c7d017ee3c8295d1c2f8d80cf9c0c478423e7033dee515581c497459ee0501b6 SHA512 9cb57a27bc5e8e7123c40a55625f4e227d5c81e179de3119441d7447de7701c9f6e8fc76a24e1b6c21bb92eff142aed24ffed2da39cb5bf2f87eaf8600b210bc
-AUX red-blue-quake2-0.1-ldflags.patch 3382 BLAKE2B 04576aaef36280b2dc62ce22f50c6689ac5343c148760aef3ad68150a8560bdf5e31f671fa09bcdeb3716b547f0509b4e83c1a2b4a7f741ed2798b7c3a4e6327 SHA512 a49ab8462322740fcfef70c6bff16df9b164cfa0cace00bdf366e10db1d0fc13770d97f9aa8dcf1f92d1555d7d978ce7f947d58bc3d030fd2c1be0983e74470a
-DIST q2source-3.21.zip 1477764 BLAKE2B afdeeff318e23397d24f9ecc68f4015b03d58d3f7794dd23febc4e285a916b2cf8c93b872a62a33dc1a4b7c2fff34ad92781e0320296cc13d4721b8cd5bf345a SHA512 eb3fcf3327272b7472a044336be4d73111f5b9f50b4916609996ecb690555654990c1f86e63cd6e7d4a30844e66d3eca2e428e29a598bce52e953c326caf9752
-DIST red-blue-quake2-0.1.tar.gz 34874 BLAKE2B 6dc10e8307c4274961ee133af0721d5cb9e1605de4fb47c3256b4a54b91c5e7ea79622140bf5eda2cbce10075ba971c40547726cf45f99e81cadc20828663384 SHA512 4123fb1cceb788068c5cd525e3e03cce8a993ecdd0d86c3c154426689a7893b6d33cddeafbb53761a27473a050829545e7fc802f1236f4dc60161103ad259da5
-EBUILD red-blue-quake2-0.1.ebuild 1314 BLAKE2B 612a708a4f576beb4e121c55781ad5b47768fa27a0d9514b030650ace4a10fc1168e18387c059e13d46af76b3186205dfbb8163938c86791eca95987f3defa37 SHA512 22c42fa7611234616e2cc4f5f4d648e0cc0772033071aa27b78dacb54d804b5af42c6703747b8844078880f3bf7b10c23daeaf6ac9fce43963c58b52fa162fa0
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/red-blue-quake2/files/0.1-gentoo.patch b/games-fps/red-blue-quake2/files/0.1-gentoo.patch
deleted file mode 100644
index fd13df9bcb45..000000000000
--- a/games-fps/red-blue-quake2/files/0.1-gentoo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -ur Makefile.old Makefile
---- Makefile	2001-12-29 20:37:22.000000000 -0500
-+++ Makefile	2003-07-17 22:14:50.000000000 -0400
-@@ -54,7 +54,7 @@
- RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- else
--RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -g $(GENTOO_CFLAGS) -DGENTOO_DATADIR=\\\"$(GENTOO_DATADIR)\\\" -O6 -ffast-math -funroll-loops \
- 	-fomit-frame-pointer -fexpensive-optimizations
- endif
- 
-diff -ur sys_linux.c.old sys_linux.c
---- sys_linux.c.old	2001-12-22 18:45:58.000000000 -0500
-+++ sys_linux.c	2003-07-17 22:34:11.000000000 -0400
-@@ -220,7 +220,7 @@
- 	char	curpath[MAX_OSPATH];

- 	char	*path;

- #ifdef __i386__

--	const char *gamename = "gamei386.so";

-+	const char *gamename = "GENTOO_DIR/gamei386.so";

- #elif defined __alpha__

- 	const char *gamename = "gameaxp.so";

- #else

-@@ -250,6 +250,14 @@
- 		{

- 			Com_Printf ("LoadLibrary (%s)\n",name);

- 			break;

-+		} else {

-+			sprintf (name, "%s", gamename);

-+			game_library = dlopen (name, RTLD_LAZY );

-+			if (game_library)

-+			{

-+				Com_Printf ("LoadLibrary (%s)\n",name);

-+				break;

-+			}

- 		}

- 	}

- 

-diff -ur ../qcommon/files.c ../qcommon/files.c
---- ../qcommon/files.c	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/files.c	2003-07-17 22:34:29.000000000 -0400
-@@ -865,7 +865,7 @@
- 	//

- 	// start up with baseq2 by default

- 	//

--	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );

-+	FS_AddGameDirectory (va(BASEDIRNAME) );

- 

- 	// any set gamedirs will be freed up to here

- 	fs_base_searchpaths = fs_searchpaths;

-diff -ur ../qcommon/qcommon.h ../qcommon/qcommon.h
---- ../qcommon/qcommon.h	2001-12-22 16:32:26.000000000 -0500
-+++ ../qcommon/qcommon.h	2003-07-17 21:20:03.000000000 -0400
-@@ -25,7 +25,7 @@
- 

- #define	VERSION		3.21

- 

--#define	BASEDIRNAME	"baseq2"

-+#define	BASEDIRNAME	GENTOO_DATADIR

- 

- #ifdef WIN32

- 

diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
deleted file mode 100644
index 1f933d33537e..000000000000
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-gcc41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- ../game/g_local.h.old	2006-05-07 00:27:45.000000000 +0200
-+++ ../game/g_local.h	2006-05-07 00:28:06.000000000 +0200
-@@ -458,11 +458,6 @@
- extern	int	sm_meat_index;

- extern	int	snd_fry;

- 

--extern	int	jacket_armor_index;

--extern	int	combat_armor_index;

--extern	int	body_armor_index;

--

--

- // means of death

- #define MOD_UNKNOWN			0

- #define MOD_BLASTER			1

---- ../ctf/g_local.h.old	2006-05-07 00:36:21.000000000 +0200
-+++ ../ctf/g_local.h	2006-05-07 00:36:38.000000000 +0200
-@@ -466,11 +466,6 @@
- extern	int	sm_meat_index;

- extern	int	snd_fry;

- 

--extern	int	jacket_armor_index;

--extern	int	combat_armor_index;

--extern	int	body_armor_index;

--

--

- // means of death

- #define MOD_UNKNOWN			0

- #define MOD_BLASTER			1

-@@ -556,10 +556,6 @@
- 

- extern	cvar_t	*sv_maplist;

- 

--//ZOID

--extern	qboolean	is_quad;

--//ZOID

--

- #define world	(&g_edicts[0])

- 

- // item spawnflags

diff --git a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch b/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
deleted file mode 100644
index 58beb0f3cec5..000000000000
--- a/games-fps/red-blue-quake2/files/red-blue-quake2-0.1-ldflags.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- Makefile.old	2010-10-18 09:09:48.000000000 +0200
-+++ Makefile	2010-10-18 09:15:59.000000000 +0200
-@@ -59,7 +59,7 @@
- endif
- 
- DEBUG_CFLAGS=$(BASE_CFLAGS) -g
--LDFLAGS=-ldl -lm
-+LDLIBS=-ldl -lm
- SVGALDFLAGS=-lvga -lm
- XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga
- XCFLAGS=
-@@ -195,7 +195,7 @@
- endif
- 
- $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(QUAKE2_OBJS) $(QUAKE2_AS_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/client/cl_cin.o :     $(CLIENT_DIR)/cl_cin.c
- 	$(DO_CC)
-@@ -374,7 +374,7 @@
- 	$(BUILDDIR)/ded/cd_null.o
- 
- $(BUILDDIR)/q2ded : $(Q2DED_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(Q2DED_OBJS) $(LDLIBS)
- 
- $(BUILDDIR)/ded/cmd.o :        $(COMMON_DIR)/cmd.c
- 	$(DO_DED_CC)
-@@ -503,7 +503,7 @@
- 	$(BUILDDIR)/game/m_flash.o
- 
- $(BUILDDIR)/game$(ARCH).$(SHLIBEXT) : $(GAME_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
- 
- $(BUILDDIR)/game/g_ai.o :        $(GAME_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -682,7 +682,7 @@
- 	$(BUILDDIR)/ctf/q_shared.o
- 
- $(BUILDDIR)/ctf/game$(ARCH).$(SHLIBEXT) : $(CTF_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(CTF_OBJS)
- 
- $(BUILDDIR)/ctf/g_ai.o :       $(CTF_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -821,7 +821,7 @@
- 	$(BUILDDIR)/xatrix/q_shared.o
- 
- $(BUILDDIR)/xatrix/game$(ARCH).$(SHLIBEXT) : $(XATRIX_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(XATRIX_OBJS)
- 
- $(BUILDDIR)/xatrix/g_ai.o :        $(XATRIX_DIR)/g_ai.c
- 	$(DO_SHLIB_CC)
-@@ -1048,7 +1048,7 @@
- 	$(BUILDDIR)/rogue/q_shared.o
- 
- $(BUILDDIR)/rogue/game$(ARCH).$(SHLIBEXT) : $(ROGUE_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(ROGUE_OBJS)
- 
- $(BUILDDIR)/rogue/dm_ball.o :      $(ROGUE_DIR)/dm_ball.c
- 	$(DO_SHLIB_CC)
-@@ -1287,11 +1287,11 @@
- 	$(BUILDDIR)/ref_soft/rw_x11.o
- 
- $(BUILDDIR)/ref_soft.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_SVGA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -Xlinker -Map -Xlinker map.out -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_SVGA_OBJS) $(SVGALDFLAGS)
- 
- $(BUILDDIR)/ref_softx.$(SHLIBEXT) : $(REF_SOFT_OBJS) $(REF_SOFT_X11_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_SOFT_OBJS) \
- 		$(REF_SOFT_X11_OBJS) $(XLDFLAGS)
- 
- $(BUILDDIR)/ref_soft/r_aclip.o :      $(REF_SOFT_DIR)/r_aclip.c
-@@ -1431,10 +1431,10 @@
- 	$(BUILDDIR)/ref_gl/gl_glx.o
- 
- $(BUILDDIR)/ref_gl.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_FXMESA_OBJS) $(GLLDFLAGS)
- 
- $(BUILDDIR)/ref_glx.$(SHLIBEXT) : $(REF_GL_OBJS) $(REF_GL_GLX_OBJS)
--	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(REF_GL_OBJS) $(REF_GL_GLX_OBJS) $(GLXLDFLAGS)
- 
- $(BUILDDIR)/ref_gl/gl_draw.o :        $(REF_GL_DIR)/gl_draw.c
- 	$(DO_GL_SHLIB_CC)
diff --git a/games-fps/red-blue-quake2/metadata.xml b/games-fps/red-blue-quake2/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/red-blue-quake2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild b/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
deleted file mode 100644
index 96715daaab62..000000000000
--- a/games-fps/red-blue-quake2/red-blue-quake2-0.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="red-blue Quake II !  play quake2 w/3d glasses !"
-HOMEPAGE="https://www.jfedor.org/red-blue-quake2/"
-SRC_URI="mirror://idsoftware/source/q2source-3.21.zip
-	https://www.jfedor.org/red-blue-quake2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/quake2-3.21/linux
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-ldflags.patch
-	sed -i \
-		-e "s:GENTOO_DIR:$(games_get_libdir)/${PN}:" \
-		sys_linux.c || die
-	sed -i \
-		-e "s:/etc/quake2.conf:${GAMES_SYSCONFDIR}/${PN}.conf:" \
-		sys_linux.c vid_so.c || die
-	echo "$(games_get_libdir)"/${PN} > "${T}"/${PN}.conf || die
-}
-
-src_compile() {
-	mkdir -p releasei386-glibc/ref_soft
-	emake \
-		GENTOO_CFLAGS="${CFLAGS}" \
-		GENTOO_DATADIR="${GAMES_DATADIR}"/quake2/baseq2/ \
-		build_release
-}
-
-src_install() {
-	cd release*
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe gamei386.so ref_softx.so
-	exeinto "$(games_get_libdir)"/${PN}/ctf
-	doexe ctf/gamei386.so
-	newgamesbin quake2 red-blue-quake2
-
-	insinto "${GAMES_SYSCONFDIR}"
-	doins "${T}"/${PN}.conf
-
-	prepgamesdirs
-}
diff --git a/games-fps/redeclipse-1.6.0-r2 b/games-fps/redeclipse-1.6.0-r2
new file mode 100644
index 000000000000..628739118008
--- /dev/null
+++ b/games-fps/redeclipse-1.6.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!dedicated? ( media-libs/freetype:2 media-libs/libsdl:0[opengl] media-libs/sdl2-image:0[jpeg,png] media-libs/sdl2-mixer:0[mp3,vorbis] virtual/opengl x11-libs/libX11 ) >=net-libs/enet-1.3.9 sys-libs/zlib
+DESCRIPTION=First-person ego-shooter, built as a total conversion of Cube Engine 2
+EAPI=6
+HOMEPAGE=https://www.redeclipse.net
+IUSE=dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=HPND ZLIB CC-BY-SA-3.0
+RDEPEND=!dedicated? ( media-libs/freetype:2 media-libs/libsdl:0[opengl] media-libs/sdl2-image:0[jpeg,png] media-libs/sdl2-mixer:0[mp3,vorbis] virtual/opengl x11-libs/libX11 ) >=net-libs/enet-1.3.9 sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/red-eclipse/base/releases/download/v1.6.0/redeclipse_1.6.0_nix.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=6d0bb95010fb4ef031685244310c811b
diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest
deleted file mode 100644
index 8238f6d4a88e..000000000000
--- a/games-fps/redeclipse/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX redeclipse 400 BLAKE2B e2f26d4883194948f32a68e1c7ebe0967b41f8cd7678aa282d1647beeefdd44952af9588ece5f7dddd2e4b6ea2ef51faac614eb88f435e382518ca82c01838de SHA512 da4deee6f5ffbc54bfeb501b3a3b4377a0cd04a2dca4284e51113d5073c9f267fb7d1a2b7b59095a200eeff17abff66d60de9b28106259aa0b2ce5b726912768
-DIST redeclipse_1.6.0_nix.tar.bz2 898467399 BLAKE2B 85b4d02ea95cc44d902f6512ec5ce512583353107deb690ec24608d9b96fd4a6b7fd720250413a192cf7229b2f66294ddeb81230e5ace06abdcd4f6f3dc8d92f SHA512 e944aed8155b5e89e8df000516d4a019a63d38d7ad9c3982b2e111f8a20bc848a98e30c1b60f4fdaf006c2ff9e2cb04647c07778eb2562eaf7db733dbce11233
-EBUILD redeclipse-1.6.0-r2.ebuild 2014 BLAKE2B 57d781179e4f91ca1fa637251978af63deeecab6a09b959bfc001ae32f39fa26bf1aab184d53e9ca87e01de3c8738626602fd4f5c0e0c5f6003d6367af6fc897 SHA512 e460594124b265f6c1db43411488d7b8453127ca7cba35a132065f56c3b21055e8a8f0cc5b9d1e290b53cc41ab2697564b2b63c8e972045cd177b68f844270a6
-MISC metadata.xml 574 BLAKE2B 6a74f40eb547d6ebcc8ca987609c22ebf171cde9286351e2f459f8eb95e8545399dcce6107540c249bdfc0a431f3282a50ae8a1fbe6239cb1b372755dd638c36 SHA512 1f78ab3ec83d4c8887f2f15addf8935f0026a8494340b346ae4c694fd7bf753962830274c572036490d514b2683df8164f9943b6714cff8cebaba896d70d549d
diff --git a/games-fps/redeclipse/files/redeclipse b/games-fps/redeclipse/files/redeclipse
deleted file mode 100644
index 9f2c62fead05..000000000000
--- a/games-fps/redeclipse/files/redeclipse
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# It is necessary to run the binary from the root of the data directory
-# for the binary to properly locate its assets and load properly.
-# Upstream's original install procedure is doing the same thing.
-
-SERVER=/usr/bin/redeclipse_server_linux
-CLIENT=/usr/bin/redeclipse_linux
-cd /usr/share/redeclipse || exit 1
-[ "${0##*/}" = "redeclipse_server" ] && exec "${SERVER}" || exec "${CLIENT}"
diff --git a/games-fps/redeclipse/metadata.xml b/games-fps/redeclipse/metadata.xml
deleted file mode 100644
index 82f11922de55..000000000000
--- a/games-fps/redeclipse/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kitsunenokenja@protonmail.ch</email>
-		<name>Rob Levitsky</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="dedicated">Install only as a dedicated game server</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild b/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild
deleted file mode 100644
index a752c8763624..000000000000
--- a/games-fps/redeclipse/redeclipse-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop
-
-DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
-HOMEPAGE="https://www.redeclipse.net"
-SRC_URI="https://github.com/red-eclipse/base/releases/download/v${PV}/${PN}_${PV}_nix.tar.bz2"
-
-# According to doc/license.txt file
-LICENSE="HPND ZLIB CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-
-DEPEND="!dedicated? (
-		media-libs/freetype:2
-		media-libs/libsdl:0[opengl]
-		media-libs/sdl2-image:0[jpeg,png]
-		media-libs/sdl2-mixer:0[mp3,vorbis]
-		virtual/opengl
-		x11-libs/libX11
-	)
-	>=net-libs/enet-1.3.9
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e "s:@APPNAME@:${PN}:" \
-		src/install/nix/redeclipse.desktop.am \
-		> src/install/nix/redeclipse.desktop || die
-
-	if ! use dedicated; then
-		sed -e "s:@LIBEXECDIR@:/usr/libexec:g" \
-			-e "s:@DATADIR@:/usr/share:g" \
-			-e "s:@DOCDIR@:/usr/share/doc/${PF}:" \
-			-e "s:@CAPPNAME@:${PN^^}:g" \
-			-e "s:@APPNAME@:${PN}:g" \
-			doc/man/redeclipse.6.am \
-			> doc/man/redeclipse.6 || die
-	fi
-
-	sed -e "s:@LIBEXECDIR@:/usr/libexec:g" \
-		-e "s:@DATADIR@:/usr/share:g" \
-		-e "s:@DOCDIR@:/usr/share/doc/${PF}:" \
-		-e "s:@CAPPNAME@:${PN^^}:g" \
-		-e "s:@APPNAME@:${PN}:g" \
-		doc/man/redeclipse-server.6.am \
-		> doc/man/redeclipse-server.6 || die
-
-	default
-}
-
-src_compile() {
-	if ! use dedicated; then
-		emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src client server
-	else
-		emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src server
-	fi
-}
-
-src_install() {
-	insinto /usr/share/redeclipse
-	doins -r config data
-
-	dobin src/redeclipse_server_linux
-
-	if ! use dedicated; then
-		dobin src/redeclipse_linux
-		newicon "src/install/nix/${PN}_x128.png" "${PN}.png"
-		domenu "src/install/nix/${PN}.desktop"
-		doman doc/man/redeclipse.6
-	fi
-
-	doman doc/man/redeclipse-server.6
-	dodoc readme.txt doc/examples/servinit.cfg
-
-	dobin "${FILESDIR}/redeclipse"
-	dosym redeclipse /usr/bin/redeclipse_server
-}
diff --git a/games-fps/rott-1.1.2-r1 b/games-fps/rott-1.1.2-r1
new file mode 100644
index 000000000000..c07b08b33cf6
--- /dev/null
+++ b/games-fps/rott-1.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer app-arch/unzip
+DESCRIPTION=Rise of the Triad for Linux!
+EAPI=6
+HOMEPAGE=http://www.icculus.org/rott/
+IUSE=demo
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://www.icculus.org/rott/releases/rott-1.1.2.tar.gz demo? ( http://filesingularity.timedoctor.org/swdata.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0a8ccdb72ec2157c57465f1fceafe4ea
diff --git a/games-fps/rott/Manifest b/games-fps/rott/Manifest
deleted file mode 100644
index 470de2fc72d5..000000000000
--- a/games-fps/rott/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST rott-1.1.2.tar.gz 749079 BLAKE2B 1c18ef25b8bb97a7edf8c376bf0b6da3829ca0406100ee9f44652077c06414d826086e354850a551152901036673b91d686d4d2e816ba6bb29b8dcce68144c00 SHA512 809a9064fe31c63afccb9a6397ac2c9d4172cdd802b055697cf3b0090ee6a78c9e40b52a4a8df25196489d9a0259304c91e2f84f95413a293bc66192502cf200
-DIST swdata.zip 2889672 BLAKE2B 593f95cbfb4a285ab3b946372d618b6b5cf785aa4b2e5228ac8aaaf702ceb8e4cc000d606f5b3aea85af1b34a4fe45bdebc2f692ba3bfc9c1d3afc7c570ad8a0 SHA512 99373097356afa583021367b2e0ec6ec745941890e4f17f4e07206c66dd370dfa9e928bc0bd6ab9809d8c72646dcc609e3c19f688d2b89a886f215a153b6dd0d
-EBUILD rott-1.1.2-r1.ebuild 1088 BLAKE2B c6dd102f9aa2d38218f1da5e89db7318c7b4cd7fb6a23a834078fff7347badd5b786fb382dffa1e8d2eb43e196092537db68e14c7385eefaa814501741441827 SHA512 0ecd207fb8ec9ecb103611623bdc918e68a499fa58636bc2c9e5719351a4f9efb4ea843da0096fec8abc4d4492339a55210e1d3f4b3d324c152d27a5a446e182
-MISC metadata.xml 1095 BLAKE2B 4a41d9a0bc9962a6a824d7ecc4d0bb774aa2b7feb21829aae74db25874c7f050698a724d7fe3d19e63d2e6aaf1c98d4870ac4d51f14145df24eea9646b3be2a0 SHA512 6e2d291f04b343b366ad9b7e5c18ae7cce327dd27cfdb496247a0228d2cf160d8d42f803f21aed07181dc1395ad8db9431270abd174dfc3c3d46a951294a3325
diff --git a/games-fps/rott/metadata.xml b/games-fps/rott/metadata.xml
deleted file mode 100644
index 5bc2b194722d..000000000000
--- a/games-fps/rott/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-THE STORY
-
-You are part of an elite group of operatives called HUNT (High-risk 
-United Nations Taskforce), and you must stop a maniac cult leader from 
-killing millions of people. While scouting a remote island, you are 
-suddenly surrounded by enemy troops with guns blaring. In the distance 
-you see your boat--your only chance to escape--explode into matchsticks. 
-In front of you is a huge fortress monastery, and your only chance to 
-stop the madness. You are e quipped with awesome, high-tech weaponry 
-like heat-seeking missiles, split missiles, and the Flamewall cannon, 
-which leaves a trail of charred skeletons in its wake. You'll also find 
-magical instruments and weapons so incredible they defy description.
-</longdescription>
-  <use>
-    <flag name="demo">Install the shareware version</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/rott/rott-1.1.2-r1.ebuild b/games-fps/rott/rott-1.1.2-r1.ebuild
deleted file mode 100644
index 5eabd67d2f86..000000000000
--- a/games-fps/rott/rott-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Rise of the Triad for Linux!"
-HOMEPAGE="http://www.icculus.org/rott/"
-SRC_URI="http://www.icculus.org/rott/releases/${P}.tar.gz
-	demo? ( http://filesingularity.timedoctor.org/swdata.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="demo"
-
-RDEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}/rott
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CC =/d' \
-		Makefile || die "sed failed"
-	emake clean
-}
-
-src_compile() {
-	emake -j1 \
-		EXTRACFLAGS="${CFLAGS} -DDATADIR=\\\"/usr/share/${PN}/\\\"" \
-		SHAREWARE=$(usex demo "1" "0")
-}
-
-src_install() {
-	dobin rott
-	dodoc ../doc/*.txt ../README
-	doman ../doc/rott.6
-	if use demo ; then
-		cd "${WORKDIR}" || die
-		insinto /usr/share/${PN}
-		doins *.dmo huntbgin.* remote1.rts
-	fi
-}
-
-pkg_postinst() {
-	if ! use demo ; then
-		elog "To play the full version, just copy the"
-		elog "data files to /usr/share/${PN}/"
-	fi
-}
diff --git a/games-fps/rtcw-1.41b b/games-fps/rtcw-1.41b
new file mode 100644
index 000000000000..002a36b84a72
--- /dev/null
+++ b/games-fps/rtcw-1.41b
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Return to Castle Wolfenstein - Long awaited sequel to Wolfenstein 3D
+EAPI=5
+HOMEPAGE=http://games.activision.com/games/wolfenstein/
+IUSE=opengl dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=RTCW GPL-2
+RDEPEND=sys-libs/glibc sys-libs/lib-compat dedicated? ( app-misc/screen ) !dedicated? ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) opengl? ( x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://idsoftware/wolf/linux/wolf-linux-GOTY-maps.x86.run mirror://idsoftware/wolf/linux/wolf-linux-1.41b.x86.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_=f959ed9d4a098fc519309832652691a1
diff --git a/games-fps/rtcw/Manifest b/games-fps/rtcw/Manifest
deleted file mode 100644
index 07c3ea36bb88..000000000000
--- a/games-fps/rtcw/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX wolf-ded.rc 466 BLAKE2B 44e446448d1e21fed0e16808c6d7edaa67a237ccd992db6697a407ad88a20eb6b0fd0d8d22bd765e8cdaa165166a93d184acd6db34c0f7b06c7fe7de08fc3f08 SHA512 f949364731a608f397228db8f1b6753c6b307c32ded4330cfd19d76b1378317ab3f0b87f9db0435c255befd5cc5b1bcc37fa6af472b55f757e02b29f74a4645e
-DIST wolf-linux-1.41b.x86.run 73940068 BLAKE2B 252c2fe5028e8325481508fb2b1f944302895faf96f57f933092336899f10b29d4676f299072e852a4c57d20186bd14d0fe0aa780eba063f78881c4616d7f09c SHA512 8c018bcdeca5b14fe1b8c35f46031416978b27b57a38897fa5b1b0c26fbf3ab6f44c22582223ad98a695a793ba1444a2e092beee687e835a279a12121422e93f
-DIST wolf-linux-GOTY-maps.x86.run 51930759 BLAKE2B a675208035fd826b154c27cf9c77082bb0b69681725dfe9255e1a4cd2572ffc3db2b8998a7c7e04a4b423720d73d40317ff5ae07a121e979d5c707abf1cdd631 SHA512 85f334f75d538bb68c7507d36600b433b0ab0c92572c8e8c022eaeb8783fc72d56ff39ee0ee9eb3272ab09025bca56cca70b077b7e7b02a38cd556fb9f425dcc
-EBUILD rtcw-1.41b.ebuild 2771 BLAKE2B e00e1b7852e9ced1b4c5433520eba439cbd642c619f05f0f451a90678e7702b870b6644598dcf98d1bd31dcb7004ee88351cddca7d018059218870985aac3de6 SHA512 c9797beabed04ab34f4621f1a90d856a97bdb3c95fb9dc1d560159ab9dc754f35152fce972d93fb946c371ba9b9e2306642b87734482fde77fd21513771fafcf
-MISC metadata.xml 1048 BLAKE2B 25a54f490819a3e31dcdccbb907f95741721342654f362881021a8d4690aa2a97f5bd48568072286a67cd76fe382d1805f778af2bc9f60cbb8a38668262b14fd SHA512 9fe9d74cb94a07ba0b87c28ee050135e608ccae13e70aa8332e10adb5f2c11d7b86618c2c6a9824ccfe54425439f44827ebf85dbcf8add66178e538e81eb13a7
diff --git a/games-fps/rtcw/files/wolf-ded.rc b/games-fps/rtcw/files/wolf-ded.rc
deleted file mode 100644
index 3f7bf956c10a..000000000000
--- a/games-fps/rtcw/files/wolf-ded.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting RTCW dedicated server..."
-	screen -A -m -d -S rtcw su - dedicated -c GENTOO_DIR/startwolfded
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RTCW dedicated server..."
-	kill `screen -list | grep rtcw | awk -F . '{ print $1 }' | sed -e s/.//`
-	eend $?
-
-}
-
-status() {
-	screen -list | grep rtcwded
-}
diff --git a/games-fps/rtcw/metadata.xml b/games-fps/rtcw/metadata.xml
deleted file mode 100644
index 4c558817e05b..000000000000
--- a/games-fps/rtcw/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Return to Castle Wolfenstein is a first-person 3-D shooter based loosely on the original Wolfenstein series by id software.  The game takes place in Europe during World War II.  In the single player game, you play as a US military special operative sent behind enemy lines to stop the Nazi studies into the supernatural and the occult.  The multi-player game is a team-based, goal-oriented series of missions and allows you to play as either the Axis or the Allies.  There are several classes of characters you can play, each with their own special abilities and weapon choices.  The port to Linux was done by TTimo of id software and is an unsupported binary release.  This game is commercial software and requires data from the retail Windows version to play.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/rtcw/rtcw-1.41b.ebuild b/games-fps/rtcw/rtcw-1.41b.ebuild
deleted file mode 100644
index 2cd098cbd9cf..000000000000
--- a/games-fps/rtcw/rtcw-1.41b.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-DESCRIPTION="Return to Castle Wolfenstein - Long awaited sequel to Wolfenstein 3D"
-HOMEPAGE="http://games.activision.com/games/wolfenstein/"
-SRC_URI="mirror://idsoftware/wolf/linux/wolf-linux-GOTY-maps.x86.run
-	mirror://idsoftware/wolf/linux/wolf-linux-${PV}.x86.run"
-#	mirror://3dgamers/returnwolfenstein/wolf-linux-${PV}.x86.run
-
-LICENSE="RTCW GPL-2" # gpl for init script bug #425944
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl dedicated"
-RESTRICT="strip mirror"
-
-UIDEPEND="x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-RDEPEND="sys-libs/glibc
-	sys-libs/lib-compat
-	dedicated? ( app-misc/screen )
-	!dedicated? ( ${UIDEPEND} )
-	opengl? ( ${UIDEPEND} )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-QA_PREBUILT="${dir:1}/* ${dir:1}/pb/* ${dir:1}/main/*"
-
-src_install() {
-	insinto "${dir}"
-	doins -r main Docs pb
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/*.x86 openurl.sh
-
-	games_make_wrapper rtcwmp ./wolf.x86 "${dir}" "${dir}"
-	games_make_wrapper rtcwsp ./wolfsp.x86 "${dir}" "${dir}"
-	# work around buggy video driver (bug #326837)
-	sed -i \
-		-e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
-		"${D}/${GAMES_BINDIR}/rtcwsp" \
-		|| die
-
-	if use dedicated; then
-		games_make_wrapper wolf-ded ./wolfded.x86 "${dir}" "${dir}"
-		newinitd "${FILESDIR}"/wolf-ded.rc wolf-ded
-		sed -i \
-			-e "s:GENTOO_DIR:${dir}:" \
-			"${D}"/etc/init.d/wolf-ded \
-			|| die
-	fi
-
-	insinto ${dir}
-	doins WolfMP.xpm WolfSP.xpm QUICKSTART CHANGES RTCW-README-1.4.txt
-	doicon WolfMP.xpm WolfSP.xpm
-
-	prepgamesdirs
-	make_desktop_entry rtcwmp "Return to Castle Wolfenstein (MP)" WolfMP
-	make_desktop_entry rtcwsp "Return to Castle Wolfenstein (SP)" WolfSP
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "There are two possible security bugs in this package, both causing a"
-	ewarn "denial of service.  One affects the game when running a server, the"
-	ewarn "other when running as a client."
-	ewarn "For more information, see bug #82149."
-	echo
-	elog "You need to copy pak0.pk3, mp_pak0.pk3, mp_pak1.pk3, mp_pak2.pk3,"
-	elog "sp_pak1.pk3 and sp_pak2.pk3 from a Window installation into ${dir}/main/"
-	elog
-	elog "To play the game run:"
-	elog " rtcwsp (single-player)"
-	elog " rtcwmp (multi-player)"
-	elog
-	if use dedicated
-	then
-		elog "To start a dedicated server run:"
-		elog " /etc/init.d/wolf-ded start"
-		elog
-		elog "To run the dedicated server at boot, type:"
-		elog " rc-update add wolf-ded default"
-		elog
-		elog "The dedicated server is started under the ${GAMES_USER_DED} user account"
-		echo
-	fi
-}
diff --git a/games-fps/rtcwmp-demo-1.1-r2 b/games-fps/rtcwmp-demo-1.1-r2
new file mode 100644
index 000000000000..77e9c001f88c
--- /dev/null
+++ b/games-fps/rtcwmp-demo-1.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=Return to Castle Wolfenstein - Multi-player demo
+EAPI=6
+HOMEPAGE=http://games.activision.com/games/wolfenstein/
+IUSE=dedicated
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RTCW GPL-2
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) dedicated? ( app-misc/screen ) !dedicated? ( virtual/opengl x11-libs/libX11 x11-libs/libXext )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://idsoftware/wolf/linux/old/wolfmpdemo-linux-1.1-MP.x86.run mirror://3dgamers/returnwolfenstein/wolfmpdemo-linux-1.1-MP.x86.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
+_md5_=5318669bed5f2b9339dc5d8b0bc1bbca
diff --git a/games-fps/rtcwmp-demo/Manifest b/games-fps/rtcwmp-demo/Manifest
deleted file mode 100644
index 3a86c3c1618c..000000000000
--- a/games-fps/rtcwmp-demo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX rtcwmp-demo-ded.rc 488 BLAKE2B 35f8d58737ab3ac285ebc1c86acaf67fff3a4946ac77dcad058b6a606c9ce525497d196940d98146d21fc7e1fcae636dea5d530b585e55eea08d0af5fc1ba931 SHA512 e05da90a615a505fc921caf080e32895dcfd828ca584cbd9bdab3e927eb174c3c9c6cfbed3a5fe0bc3b93851eb2085b1dfc49073ce1858c7954ad1a0c8fa456a
-DIST wolfmpdemo-linux-1.1-MP.x86.run 69650634 BLAKE2B e1ee7e204622eb6dcc708db8a84d50fc1638a1412957111d6e4fb69dc0bd09ec2b53ac3f785d2120e35e4d87315c7d5687b59aa2b8d8671250c8611fac8433c9 SHA512 2e497ca8cb0552dfbc90bfd10544b44f0dca2b7dc74ad6428041fd9885926a03cfdae72d6e5ccbd61b0d0c5b051355c567a9101746838110ebeb0f3fdcaf3ad5
-EBUILD rtcwmp-demo-1.1-r2.ebuild 1709 BLAKE2B cd215756f62755a0457f6c3a41787eaf5e1bd51f23070f880884ec1a6f2ac1435468071eb58344e0c613aba6a45fcad9c94ee2741446c1d7dc9c243fbe5daa11 SHA512 c148774dc69368f518e6ca0c26c2d14b0ac040b38c0e8d4b1accadde4f2f461319a746e3b143539043a29edaebde11fe38a772f555bd709ef7ea11019dbffecb
-MISC metadata.xml 391 BLAKE2B ebfd12186a3d96402c2fc9c51e82f56986d6ecb5b6e6450b3802b62c24549758cba628b2f2d988f3e52a30f7ca9fd03acb1385280ec0791bf610e0e75baf14f1 SHA512 7c19f0975d4df1c3f116d4563400b9e9028d3f7c70c2fa4f1fa6612d1d76141e0f157eba97804640aed191a59715869f4ac325ab32818433cff6e99e74579257
diff --git a/games-fps/rtcwmp-demo/files/rtcwmp-demo-ded.rc b/games-fps/rtcwmp-demo/files/rtcwmp-demo-ded.rc
deleted file mode 100644
index 7d711d08acee..000000000000
--- a/games-fps/rtcwmp-demo/files/rtcwmp-demo-ded.rc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting RTCW demo dedicated server..."
-	screen -A -m -d -S rtcwdemo su - dedicated -c GENTOO_DIR/startrtcwded
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping RTCW demo dedicated server..."
-	kill `screen -list | grep rtcwdemo | awk -F . '{ print $1 }' | sed -e s/.//`
-	eend $?
-
-}
-
-status() {
-	screen -list | grep rtcwdemoded
-}
diff --git a/games-fps/rtcwmp-demo/metadata.xml b/games-fps/rtcwmp-demo/metadata.xml
deleted file mode 100644
index d1a52b2afdce..000000000000
--- a/games-fps/rtcwmp-demo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-The sequel to id Software's classic Wolfenstein 3-D.  This version of the demo is only for multi-player.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r2.ebuild b/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r2.ebuild
deleted file mode 100644
index a62dd413ecd7..000000000000
--- a/games-fps/rtcwmp-demo/rtcwmp-demo-1.1-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-MY_P="wolfmpdemo-linux-${PV}-MP.x86.run"
-
-DESCRIPTION="Return to Castle Wolfenstein - Multi-player demo"
-HOMEPAGE="http://games.activision.com/games/wolfenstein/"
-SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
-	mirror://3dgamers/returnwolfenstein/${MY_P}"
-
-LICENSE="RTCW GPL-2" # gpl for init script bug #425946
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="strip mirror"
-
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	dedicated? ( app-misc/screen )
-	!dedicated? (
-		virtual/opengl
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-
-QA_PREBUILT="/opt/${PN}/*
-	/opt/${PN}/demomain/*"
-
-S=${WORKDIR}
-
-dir="/opt/${PN}"
-
-src_install() {
-	insinto "${dir}"
-	doins -r demomain Docs
-	doins WolfMP.xpm
-	dodoc CHANGES QUICKSTART
-
-	exeinto "${dir}"
-	doexe bin/x86/wolfded.x86 openurl.sh
-	make_wrapper rtcwmp-demo-ded ./wolfded.x86 "${dir}" "${dir}"
-	newinitd "${FILESDIR}"/rtcwmp-demo-ded.rc rtcwmp-demo-ded
-	sed "s:GENTOO_DIR:${dir}:" "${ED}"/etc/init.d/rtcwmp-demo-ded || die
-
-	if ! use dedicated; then
-		doexe bin/x86/wolf.x86
-		make_wrapper rtcwmp-demo ./wolf.x86 "${dir}" "${dir}"
-		newicon WolfMP.xpm rtcwmp-demo.xpm
-		make_desktop_entry rtcwmp-demo "Return to Castle Wolfenstein (MP demo)" \
-			rtcwmp-demo.xpm
-	fi
-}
-
-pkg_postinst() {
-	elog "Install 'rtcwsp-demo' for single-player"
-	elog
-	if ! use dedicated; then
-		elog "Run 'rtcwmp-demo' for multi-player"
-		elog
-	fi
-	elog "Start a dedicated server with"
-	elog "'/etc/init.d/rtcwmp-demo-ded start'"
-	elog
-	elog "Start the server at boot with"
-	elog "'rc-update add rtcwmp-demo-ded default'"
-}
diff --git a/games-fps/rtcwsp-demo-1.1b-r2 b/games-fps/rtcwsp-demo-1.1b-r2
new file mode 100644
index 000000000000..3fdec8e946fc
--- /dev/null
+++ b/games-fps/rtcwsp-demo-1.1b-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst unpack
+DESCRIPTION=Return to Castle Wolfenstein - Single-player demo
+EAPI=6
+HOMEPAGE=http://games.activision.com/games/wolfenstein/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RTCW
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)]
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=mirror://idsoftware/wolf/linux/old/wolfspdemo-linux-1.1b.x86.run mirror://3dgamers/returnwolfenstein/wolfspdemo-linux-1.1b.x86.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
+_md5_=daeeb52c33097a3e18eabe31a3c8a722
diff --git a/games-fps/rtcwsp-demo/Manifest b/games-fps/rtcwsp-demo/Manifest
deleted file mode 100644
index 2f9755aa28d1..000000000000
--- a/games-fps/rtcwsp-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wolfspdemo-linux-1.1b.x86.run 117813349 BLAKE2B bb5ee4bddc7bc11a093a383bf750717ca435facc5cc314a3465bea4e04bfa186012088a7cd36156c49bbc43647e8603db10f3929aaad033084eb510b65534112 SHA512 3fc540c8721780747e14fe66d634c1347ab0cbc09eb795edfad0802663caa63393ac5a224792fd3e423e725b66cc2738877324c86a08698e0d7b6f2f804b7392
-EBUILD rtcwsp-demo-1.1b-r2.ebuild 1280 BLAKE2B 5793e4f3a8173cfd61a29044a7f987e3578480c272a884419cdb2b5dad05ca1db0d8b1c1bd31816d44ff44534dc12338ac9de795e9f88981d7040b46212a4da4 SHA512 8001a2b85c4eb0680a2b95b9cb466b61b4a8b686578858e961824eeb20f13f3292ab81643f39efced444297724e9bbd58de7bed6512a08a79e70ffbd878ca5d4
-MISC metadata.xml 392 BLAKE2B c1de2b6454879bfdf4efd4afc0f39bbbd7224e086534f414f453f2389fbc91afa33577cde57a6209163e259d4d8edbe7fa22d4b4d37452e8f5f8263a0fae215d SHA512 341a171b1ee0fd2bf16c24124366e027a008c274dea77866ab95c8103c675cd33684ecf295f2a4b2e2075e6770bdfcfbab944236865c43855e57337cb37a51b5
diff --git a/games-fps/rtcwsp-demo/metadata.xml b/games-fps/rtcwsp-demo/metadata.xml
deleted file mode 100644
index 5b9fbad7c313..000000000000
--- a/games-fps/rtcwsp-demo/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-The sequel to id Software's classic Wolfenstein 3-D.  This version of the demo
-is only for single-player.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r2.ebuild b/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r2.ebuild
deleted file mode 100644
index aac6233260ea..000000000000
--- a/games-fps/rtcwsp-demo/rtcwsp-demo-1.1b-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-MY_P="wolfspdemo-linux-${PV}.x86.run"
-
-DESCRIPTION="Return to Castle Wolfenstein - Single-player demo"
-HOMEPAGE="http://games.activision.com/games/wolfenstein/"
-SRC_URI="mirror://idsoftware/wolf/linux/old/${MY_P}
-	mirror://3dgamers/returnwolfenstein/${MY_P}"
-
-LICENSE="RTCW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip mirror"
-
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir="/opt/${PN}"
-#Ddir=${D}/${dir}
-
-src_install() {
-	insinto "${dir}"
-	doins -r demomain Docs
-
-	exeinto "${dir}"
-	doexe bin/x86/wolfsp.x86 openurl.sh || die "copying exe"
-
-	make_wrapper ${PN} ./wolfsp.x86 "${dir}" "${dir}"
-
-	# fix buffer overflow
-	sed -i -e '/^exec/i \
-export MESA_EXTENSION_MAX_YEAR=2003 \
-export __GL_ExtensionStringVersion=17700' "${ED}/usr/bin/${PN}"
-
-	doins WolfSP.xpm CHANGES
-	newicon WolfSP.xpm ${PN}.xpm
-
-	make_desktop_entry ${PN} "Return to Castle Wolfenstein (SP demo)" \
-		${PN}.xpm
-}
-
-pkg_postinst() {
-	elog "Install 'rtcwmp-demo' for multi-player"
-	elog
-	elog "Run '${PN}' for single-player"
-}
diff --git a/games-fps/sauerbraten-2013.02.03 b/games-fps/sauerbraten-2013.02.03
new file mode 100644
index 000000000000..f4e40826de82
--- /dev/null
+++ b/games-fps/sauerbraten-2013.02.03
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=sys-libs/zlib >=net-libs/enet-1.3.6:1.3 !dedicated? ( media-libs/libsdl[X,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg] virtual/opengl virtual/glu x11-libs/libX11 ) >=sys-apps/sed-4
+DESCRIPTION=Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)
+EAPI=5
+HOMEPAGE=http://sauerbraten.org/
+IUSE=debug dedicated server
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB freedist
+RDEPEND=sys-libs/zlib >=net-libs/enet-1.3.6:1.3 !dedicated? ( media-libs/libsdl[X,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png,jpeg] virtual/opengl virtual/glu x11-libs/libX11 ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_2013_02_03_collect_edition_linux.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=454db34f44c4fc929701ac79abaa4690
diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest
deleted file mode 100644
index 0119d453acde..000000000000
--- a/games-fps/sauerbraten/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX sauerbraten-2013.02.03-QA.patch 2037 BLAKE2B e9311a8bb64dcd67355767f57261fd5ef11955ce899dedfcb97cf863f7a9b35617169c24286d5ce3074c233a453364efb56477c6de48009bb8106a73c7e50daf SHA512 1725945f0373f03e5ae81b8e9eee4e2a9260d9362ad424e4198bb71af2e69055439268197f784d2acbd9e17ff977e8b1a7f5193d378a036488ff758d0ead4b5a
-AUX sauerbraten-2013.02.03-system-enet.patch 1880 BLAKE2B 57c35e0d15344fdb226f829460d1c15cb163a103911b4d63d544c786f8cb4fe10a0624749e0d3b6fce5a643d2c8285001a8a63f3c700441971a9597f11deb776 SHA512 b53e7db4e6b7ce012ee292a24cbf6e84e1c6bce01cde1a41985d0b471a68c1d2978f8272bc359a81beb317b5ab2ff88a13a1e73aaeb7f5c643e778ffe9861c7a
-AUX sauerbraten.conf 605 BLAKE2B 454045423be96b14debca64e6f65fc3c335f3428affae889727f9bd598b7d3c4084f2d50b48a26f8571f8774f79a99705479ed73b68058c527f7d44bf5ad8a18 SHA512 685b7358ad7267b1b19ac00f879a82205f346b32fda8cb460c4f8c50e9f20263c102b0fca62ab437dabe67ebbdd281f130f28f3b8ef2bcf064ae45fbd23cce67
-AUX sauerbraten.init 1951 BLAKE2B 48402bfcc32caf16491886c6ccb7395628b2c067a5126d59908fe676311bfc781b9aec89aceda8920cedbd3c2c5477e9b404c29a0f6f7c64fd29263432076d1c SHA512 9a96557cb2822f30693900b1dc9ecad9f1eab9e8a3d75432667bfba784ee86754649cf08ccab5f9cbff6be7ab584f3325b9c40c947005cdee425716a888d5c40
-DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 BLAKE2B b8a1c929dcf7a32bc289262fffcbcd4e7bbab3a9030c12bce7d086d63aaddee0c573c5d38f9ac845b3080aeac38d1b548aa9d243b462c3c682b158a379fe8cc2 SHA512 7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897
-EBUILD sauerbraten-2013.02.03.ebuild 3202 BLAKE2B 158a7d5d4a66582b57cbbbc0478154d5488e9f92d29e397093b1fc6ed17c20393014701335db7f9fed9b14d0cc4f4271625e673a63a4cb7ed6531d5b96d23e44 SHA512 f00b9644c6d3cc3867e315a37da362ee23af17ca0e499daffdc16b9aa9ce2a05bbcac77092c39e70567ea4a5a22faa62c25c6afb956e22f14fdbd6df46bda83e
-MISC metadata.xml 401 BLAKE2B 0447e0bdea4cbb8ea99d24ac4f854ff4aefd0e62c4fb1e349485a5ec8429239c95299f5f26736e5458525787d6ef54bda400441ac5b6de920a2ddf949d2cab20 SHA512 1087c8ed886c5066a8bd600cbc9878e6bf21c41f163939daf22c503ce1e9095aff13b8986959aadaaaaf04cd2f314bb664042829deb30196b88a8c2608ce8266
diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
deleted file mode 100644
index 21f1b13c7a2a..000000000000
--- a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-QA.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-applied on top of sauerbraten-2013.01.04-system-enet.patch
-
-respect LDFLAGS, CXXFLAGS and CPPFLAGS
---- sauerbraten/src/Makefile
-+++ sauerbraten/src/Makefile
-@@ -1,4 +1,4 @@
--CXXFLAGS= -O3 -fomit-frame-pointer
-+CXXFLAGS ?= -O3 -fomit-frame-pointer
- override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
- 
- PLATFORM= $(shell uname -s)
-@@ -139,11 +139,11 @@
- 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
- 
- %.h.gch: %.h
--	$(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@)
- 	$(MV) $(subst .h.gch,.tmp.h.gch,$@) $@
- 
- %-standalone.o: %.cpp
--	$(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@)
- 
- $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES)
- $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH))
-@@ -168,19 +168,19 @@
- install: all
- else
- client:	$(CLIENT_OBJS)
--	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
- 
- server:	$(SERVER_OBJS)
--	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
- 	
- master: $(MASTER_OBJS)
--	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
- 
- shared/cube2font.o: shared/cube2font.c
--	$(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags`
- 
- cube2font: shared/cube2font.o
--	$(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz
- 
- install: all
- 	cp sauer_client	../bin_unix/$(PLATFORM_PREFIX)_client
diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch b/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
deleted file mode 100644
index e87b280ba0c1..000000000000
--- a/games-fps/sauerbraten/files/sauerbraten-2013.02.03-system-enet.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- sauerbraten/src/Makefile
-+++ sauerbraten/src/Makefile
-@@ -4,7 +4,7 @@
- PLATFORM= $(shell uname -s)
- PLATFORM_PREFIX= native
- 
--INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include
-+INCLUDES= -Ishared -Iengine -Ifpsgame
- 
- STRIP=
- ifeq (,$(findstring -g,$(CXXFLAGS)))
-@@ -36,8 +36,8 @@
- endif
- CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
- else	
--CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
--CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
-+CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
-+CLIENT_LIBS= -lenet -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
- endif
- ifeq ($(PLATFORM),Linux)
- CLIENT_LIBS+= -lrt
-@@ -106,7 +106,7 @@
- MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
- else
- SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
--SERVER_LIBS= -Lenet/.libs -lenet -lz
-+SERVER_LIBS= -lenet -lz
- MASTER_LIBS= $(SERVER_LIBS)
- endif
- SERVER_OBJS= \
-@@ -135,15 +135,6 @@
- 
- all: client server
- 
--enet/Makefile:
--	cd enet; ./configure --enable-shared=no --enable-static=yes
--	
--libenet: enet/Makefile
--	$(MAKE)	-C enet/ all
--
--clean-enet: enet/Makefile
--	$(MAKE) -C enet/ clean
--
- clean:
- 	-$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master
- 
-@@ -176,13 +167,13 @@
- 
- install: all
- else
--client:	libenet $(CLIENT_OBJS)
-+client:	$(CLIENT_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS)
- 
--server:	libenet $(SERVER_OBJS)
-+server:	$(SERVER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS)  
- 	
--master: libenet $(MASTER_OBJS)
-+master: $(MASTER_OBJS)
- 	$(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS)  
- 
- shared/cube2font.o: shared/cube2font.c
diff --git a/games-fps/sauerbraten/files/sauerbraten.conf b/games-fps/sauerbraten/files/sauerbraten.conf
deleted file mode 100644
index 8d93bf62b788..000000000000
--- a/games-fps/sauerbraten/files/sauerbraten.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-# Config file for /etc/init.d/sauerbraten
-
-# Owner of Sauerbraten server processes (must be existing)
-USER="%GAMES_USER_DED%"
-GROUP="%GAMES_GROUP%"
-
-
-# Whether to run the dedicated server
-RUNSERVER="Yes"
-
-# Location of the dedicated server config directory
-SERVERCONFIG="%SYSCONFDIR%"
-
-# Additional command line arguments to the dedicated server
-SERVERARGS=""
-
-
-# Whether to run the master server
-RUNMASTER="No"
-
-# Location of the master server config directory
-MASTERCONFIG="%SYSCONFDIR%"
-
-# What port should the masterserver use
-MASTERPORT="28787"
-
-# What ip should the masterserver bind to
-MASTERIP=""
diff --git a/games-fps/sauerbraten/files/sauerbraten.init b/games-fps/sauerbraten/files/sauerbraten.init
deleted file mode 100644
index a5a7bb32966d..000000000000
--- a/games-fps/sauerbraten/files/sauerbraten.init
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	use net
-}
-
-start() {
-	[ $(echo ${RUNMASTER} | tr '[:upper:]' '[:lower:]') = "yes" ] && start_master
-	[ $(echo ${RUNSERVER} | tr '[:upper:]' '[:lower:]') = "yes" ] && start_server
-	true
-}
-
-start_server() {
-	ebegin "Starting Sauerbraten dedicated server"
-
-	# Make sure necessary parameters are set
-	SERVERCONFIG="${SERVERCONFIG:-%SYSCONFDIR%}"
-
-	if [ ! -d ${SERVERCONFIG} ]; then
-		einfo "No ${SERVERCONFIG} around. Creating new..."
-		mkdir ${SERVERCONFIG}
-		chown ${USER}:${GROUP} ${SERVERCONFIG}
-	fi
-
-	start-stop-daemon \
-		--quiet --start --user ${USER}:${GROUP} --chdir ${SERVERCONFIG} \
-		--make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid \
-		--background --exec %LIBEXECDIR%/sauer_server -- ${SERVERARGS}
-	eend $?
-}
-
-start_master() {
-	ebegin "Starting Sauerbraten master server"
-
-	# Make sure necessary parameters are set
-	MASTERCONFIG="${MASTERCONFIG:-%SYSCONFDIR%}"
-	[ -n "${MASTERIP}" ] && MASTERPORT="${MASTERPORT:-28787}"
-	MASTERARGS="${MASTERCONFIG}/ ${MASTERPORT} ${MASTERIP}"
-
-	if [ ! -d ${MASTERCONFIG} ]; then
-		einfo "No ${MASTERCONFIG} around. Creating new..."
-		mkdir ${MASTERCONFIG}
-		chown ${USER}:${GROUP} ${MASTERCONFIG}
-	fi
-
-	start-stop-daemon \
-		--quiet --start --user ${USER}:${GROUP} \
-		--make-pidfile --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid \
-		--background --exec %LIBEXECDIR%/sauer_master -- ${MASTERARGS}
-	eend $?
-}
-
-stop() {
-	[ $(echo ${RUNSERVER} | tr '[:upper:]' '[:lower:]') = "yes" ] && stop_server
-	[ $(echo ${RUNMASTER} | tr '[:upper:]' '[:lower:]') = "yes" ] && stop_master
-	true
-}
-
-stop_server() {
-	ebegin "Stopping Sauerbraten dedicated server"
-	start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/server.pid
-	eend $?
-}
-
-stop_master() {
-	ebegin "Stopping Sauerbraten master server"
-	start-stop-daemon --stop --retry 3 --pidfile %GAMES_STATEDIR%/run/sauerbraten/master.pid
-	eend $?
-}
-
-restart() {
-	svc_stop
-	svc_start
-}
diff --git a/games-fps/sauerbraten/metadata.xml b/games-fps/sauerbraten/metadata.xml
deleted file mode 100644
index ee6f39587e0e..000000000000
--- a/games-fps/sauerbraten/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="server">Compile server support</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">sauerbraten</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
deleted file mode 100644
index 4bb7c3603b58..000000000000
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games
-
-EDITION="collect_edition"
-DESCRIPTION="Sauerbraten is a FOSS game engine (Cube 2) with freeware game data (Sauerbraten)"
-HOMEPAGE="http://sauerbraten.org/"
-SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"
-
-LICENSE="ZLIB freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated server"
-
-RDEPEND="
-	sys-libs/zlib
-	>=net-libs/enet-1.3.6:1.3
-	!dedicated? (
-		media-libs/libsdl[X,opengl]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-image[png,jpeg]
-		virtual/opengl
-		virtual/glu
-		x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	ecvs_clean
-	rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp}
-
-	# Patch makefile to use system enet instead of bundled
-	# respect CXXFLAGS, LDFLAGS
-	epatch "${FILESDIR}"/${P}-{system-enet,QA}.patch
-
-	# Fix links so they point to the correct directory
-	sed -i -e 's:docs/::' README.html || die
-}
-
-src_compile() {
-	use debug && append-cppflags -D_DEBUG
-	emake -C src master $(usex dedicated "server" "$(usex server "server client" "client")")
-}
-
-src_install() {
-	local LIBEXECDIR="${GAMES_PREFIX}/lib"
-	local DATADIR="${GAMES_DATADIR}/${PN}"
-	local STATEDIR="${GAMES_STATEDIR}/${PN}"
-
-	if ! use dedicated ; then
-		# Install the game data
-		insinto "${DATADIR}"
-		doins -r data packages
-
-		# Install the client executable
-		exeinto "${LIBEXECDIR}"
-		doexe src/sauer_client
-
-		# Install the client wrapper
-		games_make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
-
-		# Create menu entry
-		newicon -s 256 data/cube.png ${PN}.png
-		make_desktop_entry "${PN}-client" "Cube 2: Sauerbraten"
-	fi
-
-	# Install the server config files
-	insinto "${STATEDIR}"
-	doins "server-init.cfg"
-
-	# Install the server executables
-	exeinto "${LIBEXECDIR}"
-	doexe src/sauer_master
-	use dedicated || use server && doexe src/sauer_server
-
-	games_make_wrapper "${PN}-server" \
-		"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
-	games_make_wrapper "${PN}-master" \
-		"${LIBEXECDIR}/sauer_master ${STATEDIR}"
-
-	# Install the server init script
-	keepdir "${GAMES_STATEDIR}/run/${PN}"
-	cp "${FILESDIR}"/${PN}.init "${T}" || die
-	sed -i \
-		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
-		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
-		-e "s:%GAMES_STATEDIR%:${GAMES_STATEDIR}:g" \
-		"${T}"/${PN}.init || die
-	newinitd "${T}"/${PN}.init ${PN}
-	cp "${FILESDIR}"/${PN}.conf "${T}" || die
-	sed -i \
-		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
-		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
-		-e "s:%GAMES_USER_DED%:${GAMES_USER_DED}:g" \
-		-e "s:%GAMES_GROUP%:${GAMES_GROUP}:g" \
-		"${T}"/${PN}.conf || die
-	newconfd "${T}"/${PN}.conf ${PN}
-
-	dodoc src/*.txt docs/dev/*.txt
-	dohtml -r README.html docs/*
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "If you plan to use map editor feature copy all map data from ${DATADIR}"
-	elog "to corresponding folder in your HOME/.${PN}"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-fps/serious-sam-tfe-1_beta3 b/games-fps/serious-sam-tfe-1_beta3
new file mode 100644
index 000000000000..5325a0a93c07
--- /dev/null
+++ b/games-fps/serious-sam-tfe-1_beta3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-util/loki_patch
+DESCRIPTION=Serious Sam: The First Encounter
+EAPI=5
+HOMEPAGE=http://www.croteam.com/ http://www.seriouszone.com/ http://icculus.org/betas/ssam/
+IUSE=alsa
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LOKI-EULA
+PROPERTIES=interactive
+RDEPEND=>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] alsa? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://icculus.org/betas/ssam/ssam-tfe-lnx-beta1a.run http://icculus.org/updates/ssam/ssamtfe-beta1b.sh.bin http://icculus.org/updates/ssam/ssamtfe-beta2.sh.bin http://icculus.org/updates/ssam/ssamtfe-beta3.sh.bin
+_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_=65f05e6629168fbabe24352ecedd0e01
diff --git a/games-fps/serious-sam-tfe/Manifest b/games-fps/serious-sam-tfe/Manifest
deleted file mode 100644
index 8e8afac7b1bc..000000000000
--- a/games-fps/serious-sam-tfe/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST ssam-tfe-lnx-beta1a.run 8802528 BLAKE2B 44704392f74d94236d550d178b40df8553292e4f835982eedcb9d11ec94600f71247168dda540b628cd2f2a1eb646d286662cce693cfeea1eb19ff80f25fa1bc SHA512 dfef0c34a6f96e296272a1e82a3ffeaa3fde4a7affc8290f6d1878e5c65855ec24ab57fe895b62795369acf11fdfbc93e47c8cfaf362d531fbccca9aadb8f0fc
-DIST ssamtfe-beta1b.sh.bin 1799399 BLAKE2B a32284317178ca56c0434c027366a607cfafdc231d040ce236ecf35f95e37244ef10dc858238db01d93f50a8df2694c071fce14435e2de289afeeb805a7cf09c SHA512 c7f416b2b21443c2092ebe8806757b59d19b286956f6c2ce74b77f9aaf4ec6a0ff3cd1db888bdb39cc8b427238c4a851c875bc9c9ec4733c82a557231391a346
-DIST ssamtfe-beta2.sh.bin 3083565 BLAKE2B 18938110be74e727fbd54f1e19caafb9bc234857b7c4c6e19daa7235141e688fe606d63992a8e4388a745f489aa7f56387778e0eed5db35d398168113238b883 SHA512 9e592d8c47d169738eb9b0c7c3ee4960fdf1f0427d53ed1d5918934ecd0fe0f81c34798de7410f971e36b7b11f7a569fdcb74136610bde0472d059c529c826c5
-DIST ssamtfe-beta3.sh.bin 3828409 BLAKE2B 1e6b14489f3e5bed922862f2c34d2e0b290fc39c47893c98a0b0a138c34977386d3ef94837fdb5d2cdea072895a330e9f09a40d729dfaa6eaaad03119d8d6428 SHA512 a3055cab0a5162358ae7696eac5613a344a3ab2a1369f3693e56647650f4d21ebc566ee99fb5f03885b4416aec830d93b00e838d9ebb8187924918b333b072a2
-EBUILD serious-sam-tfe-1_beta3.ebuild 3179 BLAKE2B 81e7a03584a13d07d86b8b6a23eff79ccc0288c4a0c0414d48f9a257908005044a366d892fad98b71777f5b9f3edcea60d57e6d47800b2d556c761f1c34a8ec1 SHA512 85a7f0571f2d7cf715a5902c88bec1de1095ae784c6ad2aef0a2080ab7eb73a374a18447ced56fb52f129e517fa9bc449f42a911f878fe651c42156444d877e9
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/games-fps/serious-sam-tfe/metadata.xml b/games-fps/serious-sam-tfe/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/games-fps/serious-sam-tfe/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild b/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild
deleted file mode 100644
index e42a75cfd668..000000000000
--- a/games-fps/serious-sam-tfe/serious-sam-tfe-1_beta3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit cdrom eutils games unpacker
-
-MY_PN="ssamtfe"
-
-DESCRIPTION="Serious Sam: The First Encounter"
-HOMEPAGE="http://www.croteam.com/
-	http://www.seriouszone.com/
-	http://icculus.org/betas/ssam/"
-SRC_URI="http://icculus.org/betas/ssam/ssam-tfe-lnx-beta1a.run
-	http://icculus.org/updates/ssam/${MY_PN}-beta1b.sh.bin
-	http://icculus.org/updates/ssam/${MY_PN}-beta2.sh.bin
-	http://icculus.org/updates/ssam/${MY_PN}-beta3.sh.bin"
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE="alsa"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	alsa? (
-		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-		>=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-	)
-"
-
-DEPEND="games-util/loki_patch"
-
-S=${WORKDIR}
-
-QA_TEXTRELS="
-opt/ssamtfe/Bin/libGame.so
-opt/ssamtfe/Bin/libEntities.so
-opt/ssamtfe/Bin/libamp11lib.so
-opt/ssamtfe/Bin/libShaders.so
-"
-
-QA_FLAGS_IGNORED="
-opt/ssamtfe/Bin/libEntities.so
-opt/ssamtfe/Bin/libGame.so
-opt/ssamtfe/Bin/libamp11lib.so
-opt/ssamtfe/Bin/libShaders.so
-opt/ssamtfe/Bin/ssam_lnxded
-opt/ssamtfe/Bin/ssam_lnxded.dynamic
-opt/ssamtfe/Bin/ssam_lnx.dynamic
-opt/ssamtfe/Bin/ssam_lnx
-"
-
-pkg_setup() {
-	games_pkg_setup
-
-	cdrom_get_cds "Install/1_00c.gro"
-}
-
-src_unpack() {
-	mkdir Mods Levels
-	unpack_makeself ssam-tfe-lnx-beta1a.run
-
-	# Copy files during unpack as the patches below apply to some of them
-	einfo "Copying from ${CDROM_ROOT}"
-	cp -r "${CDROM_ROOT}/Install"/* . || die "copy from CD failed"
-
-	nonfatal unpack ./SeriousSamPatch105_USA_linux.tar.bz2
-	unpack ./setupstuff.tar.gz
-	unpack ./bins.tar.bz2
-
-	# We need only runscript from bin/ directory
-	mv bin/${MY_PN} .
-	rm -r bin
-}
-
-src_prepare() {
-	# Apply the Icculus patches
-	local v
-	for v in 1b 2 3 ; do
-		echo "Unpacking version ${v}"
-		unpack_makeself "${MY_PN}-beta${v}.sh.bin"
-		loki_patch patch.dat . || die "loki patch ${v} failed"
-		rm patch.dat
-	done
-
-	# Remove unneeded files from Loki patches
-	rm -r bin
-
-	# Switch to dynamic executable - runs at sane speeds on modern hardware
-	sed -i -e 's;exec "./ssam_lnx";exec "./ssam_lnx.dynamic";' ${MY_PN} \
-		|| die "dynamic binary update failed"
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${MY_PN}
-
-	# Remove bundled libs
-	rm Bin/{libogg,libvorbis,libvorbisfile}.so
-
-	# Remove unneeded files
-	rm *.{bin,bz2,cab,exe,ex_,ini,gz,sh}
-	rm -r data setup* Players Temp
-
-	# Install icon
-	newicon ssam.xpm ${MY_PN}.xpm
-
-	# Install documentation
-	dodoc README*
-
-	# Install all other files
-	insinto "${dir}"
-	doins -r *
-
-	# Install executables and wrapper script
-	exeinto "${dir}"
-	doexe ${MY_PN}
-	exeinto "${dir}"/Bin
-	doexe Bin/ssam_lnx*
-
-	games_make_wrapper ${MY_PN} ./${MY_PN} "${dir}" "${dir}"
-	make_desktop_entry ${MY_PN} "Serious Sam - First Encounter" ${MY_PN}
-
-	# Ensure that file datestamps from the CD are sane
-	find "${D}/${dir}" -exec touch '{}' \;
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "The warning regarding 'XiG-SUNDRY-NONSTANDARD missing' is harmless"
-	echo
-}
diff --git a/games-fps/serious-sam-tse-1_beta1-r1 b/games-fps/serious-sam-tse-1_beta1-r1
new file mode 100644
index 000000000000..520dbb8bc15e
--- /dev/null
+++ b/games-fps/serious-sam-tse-1_beta1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prepare setup unpack
+DEPEND=>=app-arch/unshield-0.6
+DESCRIPTION=Serious Sam: The Second Encounter
+EAPI=6
+HOMEPAGE=http://www.croteam.com/ http://www.seriouszone.com/
+IUSE=alsa
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LOKI-EULA
+PROPERTIES=interactive
+RDEPEND=>=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] alsa? ( >=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] )
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://icculus.org/betas/ssam/ssamtse-beta1.sh.bin
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=75b4ff4010338c10a5ebd51089ef84a0
diff --git a/games-fps/serious-sam-tse/Manifest b/games-fps/serious-sam-tse/Manifest
deleted file mode 100644
index 8a4c991a0a41..000000000000
--- a/games-fps/serious-sam-tse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ssamtse-beta1.sh.bin 7952607 BLAKE2B 775c5f22b5c2d8418e69a6ac9d8e46f7f3d958108900ca0bc2135a889b4ee34d4d6528b2dfbe1de343fc8cd28af3f0d86cc764014875d8bb4d7a32ee55f361ea SHA512 43f07fbaef0bf8f90644a748931220331ed5f9179412e5a37daf0472aa98c5bb2455148c54254eae1af0b38ba8a3fde9c310cd8d488ea6b2806fa0f6fb1e1644
-EBUILD serious-sam-tse-1_beta1-r1.ebuild 4698 BLAKE2B 9632ec11724b4e81e05225cf680201f44513ab3725d7e6d70e21ba9a2fe8f245627c03a8a0ccacb6aec7e19df385980e1e47d86216791b641440a173bac153aa SHA512 f9d5b86d18d3cd1257ad087445a0bd45c088fd0376a367e89aa3c1236d3d7fe29929cfb4945dcf2dcfe126faf37635295263f688a185fdf514ef47b8a172c571
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/games-fps/serious-sam-tse/metadata.xml b/games-fps/serious-sam-tse/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/games-fps/serious-sam-tse/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild b/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild
deleted file mode 100644
index f2ebf0bb2038..000000000000
--- a/games-fps/serious-sam-tse/serious-sam-tse-1_beta1-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cdrom eutils versionator unpacker
-
-# MY_PV will be e.g. "beta1"
-MY_PN="ssamtse"
-MY_PV=$(get_version_component_range 2-2)
-
-DESCRIPTION="Serious Sam: The Second Encounter"
-HOMEPAGE="http://www.croteam.com/
-	http://www.seriouszone.com/"
-SRC_URI="http://icculus.org/betas/ssam/${MY_PN}-${MY_PV}.sh.bin"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE="alsa"
-
-DEPEND=">=app-arch/unshield-0.6"
-RDEPEND="
-	>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r5[X,joystick,opengl,video,abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	alsa? (
-		>=media-libs/libsdl-1.2.15-r5[alsa,sound,abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-	)
-"
-
-S=${WORKDIR}
-
-QA_TEXTRELS="
-opt/ssamtse/Bin/libEntitiesMP.so
-opt/ssamtse/Bin/libGameMP.so
-opt/ssamtse/Bin/libamp11lib.so
-opt/ssamtse/Bin/libShaders.so
-"
-
-QA_FLAGS_IGNORED="
-opt/ssamtse/Bin/libEntitiesMP.so
-opt/ssamtse/Bin/libGameMP.so
-opt/ssamtse/Bin/libamp11lib.so
-opt/ssamtse/Bin/libShaders.so
-opt/ssamtse/Bin/ssam_lnxded
-opt/ssamtse/Bin/ssam_lnxded.dynamic
-opt/ssamtse/Bin/ssam_lnx.dynamic
-opt/ssamtse/Bin/ssam_lnx
-"
-
-pkg_setup() {
-	cdrom_get_cds "Install/SE1_00.gro"
-}
-
-src_unpack() {
-	mkdir Levels Mods
-
-	unpack_makeself "${MY_PN}-${MY_PV}.sh.bin"
-	unpack ./setupstuff.tar.gz
-	unpack ./bins.tar.bz2
-}
-
-src_prepare() {
-	# Switch to dynamic executable - runs at sane speeds on modern hardware
-	sed -i -e 's;exec "./ssam_lnx";exec "./ssam_lnx.dynamic";' bin/${MY_PN} \
-		|| die "dynamic binary update failed"
-}
-
-src_install() {
-	local dir="/opt/${MY_PN}"
-
-	# Remove bundled libs
-	rm -f Bin/{libogg.so,libvorbis.so,libvorbisfile.so} || die "failed to remove bundled libs"
-
-	einfo "Copying from ${CDROM_ROOT}"
-	insinto "${dir}"
-	doins -r "${CDROM_ROOT}"/Install/* || die "doins CD failed"
-
-	# Correct paths of copied resource files
-	mv "${D}/${dir}"/Locales/eng/Controls/* "${D}/${dir}"/Controls/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Data/Var/* "${D}/${dir}"/Data/Var/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Demos/* "${D}/${dir}"/Demos/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Help/* "${D}/${dir}"/Help/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Mods/Warped/Scripts/Addons/WarpedTweak.des "${D}/${dir}"/Mods/Warped/Scripts/Addons/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Mods/Warped/Readme.html "${D}/${dir}"/Mods/Warped/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Mods/*.des "${D}/${dir}"/Mods/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Scripts/Addons/* "${D}/${dir}"/Scripts/Addons/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Scripts/CustomOptions/* "${D}/${dir}"/Scripts/CustomOptions/ || die "Failed to move file"
-	mv "${D}/${dir}"/Locales/eng/Scripts/NetSettings/* "${D}/${dir}"/Scripts/NetSettings/ || die "Failed to move file"
-	rm -rf "${D}/${dir}"/Locales || die "failed to removed Locales dir"
-
-	# The data CABs contain optional multiplayer maps in the "Levels" directory
-	einfo "Extracting additional levels"
-	unshield x "${D}/${dir}"/data1.cab >/dev/null || die "unshield data1.cab failed"
-	rm "${D}/${dir}"/data?.cab || die "Failed to remove cab"
-
-	# Correct paths of extracted levels
-	mv Levels/Levels/LevelsMP/* Levels/LevelsMP/ || die "Failed to move file"
-	rm -rf Levels/Levels || die "Failed to remove dir"
-	mv Levels/LevelsMP/Technology/* Levels/ || die "Failed to move file"
-	rmdir Levels/LevelsMP/Technology  || die "Failed to remove dir"
-	mv Levels/Mods/Warped/ Mods/ || die "Failed to move file"
-	rmdir Levels/Mods/ || die "Failed to remove dir"
-
-	doins -r Bin Data Levels Mods *.txt README* \
-		|| die "doins main failed"
-
-	# Install bins last to ensure they are marked executable
-	exeinto "${dir}"
-	doexe bin/${MY_PN}
-	exeinto "${dir}"/Bin
-	doexe Bin/{ssam_lnx*,*.so}
-
-	# Remove useless Windows files
-	rm -rf "${D}/${dir}/Bin"/{*.exe,*.dll,*.DLL,GameSpy} || die "Failed to remove windows cruft"
-	rm -f "${D}/${dir}"/{*.exe,*.ex_,*.bmp,*.inx,*.hdr,*.bin} || die "Failed to remove windows cruft"
-
-	dodoc README.linux
-
-	newicon ssam.xpm ${MY_PN}.xpm
-	make_wrapper ${MY_PN} ./${MY_PN} "${dir}" "${dir}"
-	make_desktop_entry ${MY_PN} "Serious Sam - Second Encounter" ${MY_PN}
-
-	# Ensure that file datestamps from the CD are sane
-	find "${D}/${dir}" -exec touch '{}' \; || die "touch failed"
-}
-
-pkg_postinst() {
-	elog "The warning regarding 'XiG-SUNDRY-NONSTANDARD missing' is harmless."
-	elog "Important information about the Linux port is at:"
-	elog "   http://files.seriouszone.com/download.php?fileid=616"
-	echo
-}
diff --git a/games-fps/soldieroffortune-1.06a-r1 b/games-fps/soldieroffortune-1.06a-r1
new file mode 100644
index 000000000000..ff1c828fe965
--- /dev/null
+++ b/games-fps/soldieroffortune-1.06a-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=games-util/loki_patch
+DESCRIPTION=First-person shooter based on the mercenary trade
+EAPI=5
+HOMEPAGE=http://www.lokigames.com/products/sof/
+KEYWORDS=~amd64 ~x86
+LICENSE=LOKI-EULA
+PROPERTIES=interactive
+RDEPEND=sys-libs/glibc amd64? ( sys-libs/glibc[multilib] ) virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://lokigames/sof/sof-1.06a-cdrom-x86.run
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	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_=67072d9e842a580585df909382e9b4f6
diff --git a/games-fps/soldieroffortune-demo-0.57-r1 b/games-fps/soldieroffortune-demo-0.57-r1
new file mode 100644
index 000000000000..527c35126649
--- /dev/null
+++ b/games-fps/soldieroffortune-demo-0.57-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-util/loki_patch
+DESCRIPTION=First-person shooter based on the mercenary trade
+EAPI=5
+HOMEPAGE=http://www.lokigames.com/products/sof/
+KEYWORDS=~amd64 ~x86
+LICENSE=LOKI-EULA
+RDEPEND=virtual/opengl[abi_x86_32(-)] media-libs/libsdl[X,opengl,sound,abi_x86_32(-)] x11-libs/libXrender[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] media-libs/smpeg[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://lokigames/loki_demos/sof-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_=42a8d005d14fd67e8bba0d2987d4635a
diff --git a/games-fps/soldieroffortune-demo/Manifest b/games-fps/soldieroffortune-demo/Manifest
deleted file mode 100644
index 5a72cd4fe63a..000000000000
--- a/games-fps/soldieroffortune-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sof-demo.run 92496052 BLAKE2B 6aded47641d13eb8438d5bf4f7d4df2b8e46dbb9a14c31d02ac8adade6b2ea1063bca0f8c0a712df3f078b413e655a5d8bd50f1ff7d7d01270e50387f3a70b9a SHA512 d285cffe5ed9017409737120d63f1bb14a4ae2f54a83bc2b4d838e82440f43fe430ea63b7765496121633e6fbf40053fe2c5bbda37e48e6da8b18aaa2ff540a6
-EBUILD soldieroffortune-demo-0.57-r1.ebuild 1684 BLAKE2B 753951e650603498822cbc235854fe5fd727df0e3905229da4515903e7fd0997740ccc4328cd40093e7f17f2692d555ff3fbb159d3c93966f8a35e6fc87be95f SHA512 3103f38c6ccb19bc47f5a0b5cf0d75cd587ba5cec16ba82b4b8e25ef87b506cb8d4ec6bc11af07bf21661175b61c08a0d19ca6c3546ac464a49bc185b496dc58
-MISC metadata.xml 766 BLAKE2B aacf0ceb3d8e12b603920615dd71be310538f5e3cd31dd31a9c30d889a2234805dea8d296958d1808abadaf28033ecb82da07bd50deaebfc4e7dd06f6a22e6a4 SHA512 6033ad956b8814ed58beb37af9f197abd0f9ea3c3e52ece7cca26c2f300035870952f4f9ed6e717c977b7224fc043e8836b1463e9c899dc5026006778e7c410a
diff --git a/games-fps/soldieroffortune-demo/metadata.xml b/games-fps/soldieroffortune-demo/metadata.xml
deleted file mode 100644
index 0ea4bdc912f5..000000000000
--- a/games-fps/soldieroffortune-demo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Soldier of Fortune is a first-person 3-D shooter based on the mercenary trade.  You play as John, an ex-military mercinary who still has plenty of good friends on the inside.  For a wad of bucks, you'll do the job -- no cares, no worries. Just get the gun, play for keeps, get paid, on to the next one -- that's your life. That's what you do. And you're good at it, one of the best even. But now is the time for your biggest challenge ever.  This is the demo version of the game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild b/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
deleted file mode 100644
index 91362dc07442..000000000000
--- a/games-fps/soldieroffortune-demo/soldieroffortune-demo-0.57-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_PN=${PN/soldieroffortune/sof}
-
-DESCRIPTION="First-person shooter based on the mercenary trade"
-HOMEPAGE="http://www.lokigames.com/products/sof/"
-SRC_URI="mirror://lokigames/loki_demos/${MY_PN}.run"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND="virtual/opengl[abi_x86_32(-)]
-	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
-	x11-libs/libXrender[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	media-libs/smpeg[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-QA_PREBUILT="${dir:1}/* ${dir:1}/base/*so"
-
-src_install() {
-	local demo="data/demos/sof_demo"
-	local exe="sof-bin.x86"
-
-	loki_patch patch.dat data/ || die
-
-	insinto "${dir}"
-	exeinto "${dir}"
-	doins -r "${demo}"/*
-	doexe "${demo}/${exe}"
-
-	# Replace bad library
-	dosym /usr/$(use amd64 && echo lib32 || echo lib)/libSDL.so "${dir}"/libSDL-1.1.so.0
-
-	games_make_wrapper ${PN} "./${exe}" "${dir}" "${dir}"
-
-	# fix buffer overflow
-	sed -i \
-		-e '/^exec/i \
-export MESA_EXTENSION_MAX_YEAR=2003 \
-export __GL_ExtensionStringVersion=17700' "${ED}"${GAMES_BINDIR}/${PN} || die
-
-	newicon "${demo}"/launch/box.png ${PN}.png
-	make_desktop_entry ${PN} "Soldier of Fortune (Demo)"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "This game requires OSS sound device /dev/dsp ; make sure the module"
-	ewarn "snd_pcm_oss is loaded and/or built into your kernel or there will be no sound"
-	elog
-	elog "Run '${PN}' to start the game"
-}
diff --git a/games-fps/soldieroffortune/Manifest b/games-fps/soldieroffortune/Manifest
deleted file mode 100644
index d62e537d805e..000000000000
--- a/games-fps/soldieroffortune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sof-1.06a-cdrom-x86.run 22928437 BLAKE2B f76f605af08a19b77548455c0101e03aca7cae69462914e47911da2fadd6d4f3b766e1069556ead0d06c757b179ae2e8105e76ea37852f17796b47b4712aec87 SHA512 91ef3953bd6b6630ab602f64d15a3056f85d90139b18aa3eb9a9a0a75db2ece61ef683ddf1d03b63f0dfc902d7a27914ae673398713941f281e96555d9645078
-EBUILD soldieroffortune-1.06a-r1.ebuild 2098 BLAKE2B 0e1be93ed8fbf27b6024cc3cdfb89bbbc69d2f1b5f0c6d9d91728e61b9e4c1d169be3530378c65b83b2136f4fab7a19bc278b527a95f41e0dac9f2ead89fbe23 SHA512 afe8941cdab0a3235f95e99a570f58944123c0b49cddc466ab857f0455c1bdf1b01e36d04ea83d51fcb3649cafc80d3312e2db07356066d26f910912843b7f06
-MISC metadata.xml 963 BLAKE2B 3e6d4e2bf56378a5b2db55c5ce7ac3505a2b14a75ef00b409aa37b31d79b190284bbedd1206f9df78922844d583d947dc064ed272444ea77941b8e48dc82dd94 SHA512 59c285b27116238b779238f0179124a2ef1eefca76ae20a84f65ea8850548228dd540ba90b856dafccdd489f911beabb7b2b0a1fa4630562c995f845421f4895
diff --git a/games-fps/soldieroffortune/metadata.xml b/games-fps/soldieroffortune/metadata.xml
deleted file mode 100644
index dc508d82ecaa..000000000000
--- a/games-fps/soldieroffortune/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Soldier of Fortune is a first-person 3-D shooter based on the mercenary trade.  You play as John, an ex-military mercinary who still has plenty of good friends on the inside.  For a wad of bucks, you'll do the job -- no cares, no worries. Just get the gun, play for keeps, get paid, on to the next one -- that's your life. That's what you do. And you're good at it, one of the best even. But now is the time for your biggest challenge ever.  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-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild b/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
deleted file mode 100644
index a9cfb2fbe14c..000000000000
--- a/games-fps/soldieroffortune/soldieroffortune-1.06a-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit check-reqs eutils unpacker cdrom games
-
-DESCRIPTION="First-person shooter based on the mercenary trade"
-HOMEPAGE="http://www.lokigames.com/products/sof/"
-SRC_URI="mirror://lokigames/sof/sof-${PV}-cdrom-x86.run"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-DEPEND="games-util/loki_patch"
-RDEPEND="sys-libs/glibc
-	amd64? ( sys-libs/glibc[multilib] )
-	virtual/opengl[abi_x86_32(-)]
-	media-libs/libsdl[X,opengl,sound,abi_x86_32(-)]
-	x11-libs/libXrender[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	media-libs/smpeg[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${ED}/${dir}
-unpackDir=${T}/unpack
-
-CHECKREQS_DISK_BUILD="1450M"
-CHECKREQS_DISK_USR="725M"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-src_unpack() {
-	cdrom_get_cds sof.xpm
-	unpack_makeself
-	mkdir ${unpackDir} || die
-	tar xzf "${CDROM_ROOT}"/paks.tar.gz -C "${unpackDir}" || die
-	tar xzf "${CDROM_ROOT}"/binaries.tar.gz -C "${unpackDir}" || die
-}
-
-src_install() {
-	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
-	doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/sof
-	insinto "${dir}"
-	doins -r "${unpackDir}"/*
-	doins "${CDROM_ROOT}"/{README,kver.pub,sof.xpm}
-
-	cd "${S}"
-	export _POSIX2_VERSION=199209
-	loki_patch --verify patch.dat
-	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 sof ./sof "${dir}" "${dir}"
-
-	# fix buffer overflow
-	sed -i -e '/^exec/i \
-export MESA_EXTENSION_MAX_YEAR=2003 \
-export __GL_ExtensionStringVersion=17700' \
-		"${ED}/${GAMES_BINDIR}/sof" || die
-
-	doicon "${CDROM_ROOT}"/sof.xpm
-	make_desktop_entry sof "Soldier of Fortune" sof
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the game run:"
-	elog " sof"
-}
diff --git a/games-fps/tenebrae-1.04-r1 b/games-fps/tenebrae-1.04-r1
new file mode 100644
index 000000000000..079446f398da
--- /dev/null
+++ b/games-fps/tenebrae-1.04-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=virtual/glu virtual/opengl media-libs/libpng:0 x11-libs/libXxf86dga x11-libs/libXxf86vm app-arch/unzip x11-base/xorg-proto
+DESCRIPTION=adds stencil shadows and per pixel lights to quake
+EAPI=6
+HOMEPAGE=http://tenebrae.sourceforge.net/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=virtual/glu virtual/opengl media-libs/libpng:0 x11-libs/libXxf86dga x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=mirror://sourceforge/tenebrae/tenebraedata.zip mirror://gentoo/tenebrae-1.04.tbz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=beed7e7093433efa5df654731a2e5391
diff --git a/games-fps/tenebrae/Manifest b/games-fps/tenebrae/Manifest
deleted file mode 100644
index fea075644218..000000000000
--- a/games-fps/tenebrae/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 1.04-glhax.patch 1086 BLAKE2B 10e1ac1e10070c23deada452c6b4d69fac860e8cedbf80d317cf0c28d5316e50c2f59c815dea8bf366e41c8181dc801e9f0c6dec4e32851fc3a9ab50b2740714 SHA512 6641a82ba17909aa3ab1d583595d45d0abb1ac34cb8997dc17d1bda736b6a07417276f6ec358b73c08f74d84ca9168e76ed224d2d5220ec773f4a2077dd09800
-AUX tenebrae-1.04-exec-stack.patch 658 BLAKE2B 0b6dc3dd385f3bb7d00748e7c32c3e2ec135359427b4766c27314056fc2cdcf657018be05c04d95b6ac53ccb86da8a56b8b59624e50df9d73a44bb2d7fcc0b29 SHA512 d3b6c712f79612265a31eaeccae3b9688bcfb7916be34e1b9dc6e698c33750f82b323fa51cb09768546c3cdf55bc80fadf0cbc46d4e478ca126ac4124fa06765
-AUX tenebrae-1.04-redef.patch 393 BLAKE2B 3ea2d06e37dc2a33a8766de606480b027f0d4d6334410d551cdf44d817424f72fccaa7d44e97d8ca1bf36e47aa515a2511a9b495d0494353715a086a0b706cba SHA512 57f63560f3cdf3f0070954109f753cad5ace8828d5f81dc87044a37ac2144594e6bca68d12de186077349c9f42ea17bacbf32a2481216be79569e27bfe1065a6
-DIST tenebrae-1.04.tbz2 625988 BLAKE2B f6eebd483c9dc7d4df3484e6dc55cde6d4d6166c029ff73133217d36c8064175e57bc1a3578f6119884f2d4d471cf717902b490c9a308ea38414c60d1d0a1909 SHA512 f74d1dcaf5b29fcc047f93e4c99c8b5264751c5687370ba4605cad76f85fe346e0e17a6546b8766acedabf23fed69d6894dda6499c854ef0736dddeddc89e18e
-DIST tenebraedata.zip 3989498 BLAKE2B 3f78240c0c3be4b265f4d8d1fc53f0ed331b01097afdb77c1146eef667330ae7ce8965a12a974ee23133a183e3dd92d39de320937cab2fcf10659d1d97f5162a SHA512 c69e8e18ab0c7d10b5e1c9ad3b396b0906302e6d75c0969d8c2b513df0a11b410de86736a67632378bf28d564c04c3e937f164cb3850742e183616ddc8ac4742
-EBUILD tenebrae-1.04-r1.ebuild 1503 BLAKE2B 85579ddab05c2ba454ee844b6753c2fa5e0b7c2073a62768d6f04d12d0ac6b103a6dfaa3b3c7d30fa3a3f016c00387b4c5d9e3e5bb566b5e6b3a0bb2e878fd91 SHA512 814ed0cdd765a5030392e3d0dd4928ed13e558901153c8d3bb0b70ad2147a58d6b7fae33d87c5e0d3ac67fa302c3f350b1e7603805eedcb5a9d9cd96fd9f21ac
-MISC metadata.xml 709 BLAKE2B 65e253236ac1af184022f0f648cc38781ec78bd5c8d75134bfb238fab26cc299d2f82beb5d31c90196c564ff3799260444430658128ddf2754c68b6a62bc0da7 SHA512 15881aa13e08c8803a638ff40c022871116ffdd6de8141b149433d09c98055163f0661aa299ad041215612fe2ea149a5e04e44dbb1afb1de18a53cadcd196107
diff --git a/games-fps/tenebrae/files/1.04-glhax.patch b/games-fps/tenebrae/files/1.04-glhax.patch
deleted file mode 100644
index a185d8e10c7d..000000000000
--- a/games-fps/tenebrae/files/1.04-glhax.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- tenebrae_0/glquake.h	2004-12-25 00:28:28.707288592 -0500
-+++ tenebrae_0/glquake.h	2004-12-25 00:27:35.000000000 -0500
-@@ -34,6 +34,7 @@
- #else
- #include <GL/gl.h>
- #include <GL/glu.h>
-+#include <GL/glext.h>
- #endif /* __APPLE__ ||�MACOSX */
- 
- /* use the correct dynamic function address binder */  
-@@ -420,8 +421,10 @@
- void GL_Bind (int texnum);
- 
- #ifndef _WIN32
-+#ifndef APIENTRY
- #define APIENTRY /* */
- #endif
-+#endif
- 
- #if !defined (__APPLE__) && !defined (MACOSX)
- 
-@@ -1134,8 +1137,10 @@
- // <AWE> There are some diffs with the function parameters. wgl stuff not present with MacOS X. -DC- and SDL 
- #if defined (__APPLE__) || defined (MACOSX) || defined(SDL) || defined (__glx__)
- 
-+#ifndef GL_APPLE_vertex_array_range
- typedef void (APIENTRY * PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC) (GLsizei length, const GLvoid *pointer);
- typedef void (APIENTRY * PFNGLVERTEXARRAYRANGEAPPLEPROC) (GLsizei size, const GLvoid *pointer);
-+#endif
- 
- extern PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC qglFlushVertexArrayRangeAPPLE;
- extern PFNGLVERTEXARRAYRANGEAPPLEPROC qglVertexArrayRangeAPPLE;
diff --git a/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch b/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch
deleted file mode 100644
index abc8bd4a2b87..000000000000
--- a/games-fps/tenebrae/files/tenebrae-1.04-exec-stack.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/math.s
-+++ b/math.s
-@@ -416,3 +416,6 @@
- 	call	C(BOPS_Error)
- 
- #endif	// id386
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/snd_mixa.s
-+++ b/snd_mixa.s
-@@ -216,3 +216,6 @@
- 
- #endif	// id386
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/sys_dosa.s
-+++ b/sys_dosa.s
-@@ -93,3 +93,6 @@
- 
- 	ret
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/worlda.s
-+++ b/worlda.s
-@@ -142,3 +142,6 @@
- 
- #endif	// id386
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-fps/tenebrae/files/tenebrae-1.04-redef.patch b/games-fps/tenebrae/files/tenebrae-1.04-redef.patch
deleted file mode 100644
index 8bd89aa18e6f..000000000000
--- a/games-fps/tenebrae/files/tenebrae-1.04-redef.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/sys_dosa.s	2017-09-06 16:41:31.875358788 -0500
-+++ b/sys_dosa.s	2017-09-06 16:41:35.947376646 -0500
-@@ -44,6 +44,8 @@
- 
- 	.text
- 
-+// Falls back to an empty stub on non-i386, in sys_linux.c
-+#if     id386
- .globl C(Sys_LowFPPrecision)
- C(Sys_LowFPPrecision):
- 	fldcw	single_cw
-@@ -55,6 +57,7 @@
- 	fldcw	full_cw
- 
- 	ret
-+#endif
- 
- .globl C(Sys_PushFPCW_SetHigh)
- C(Sys_PushFPCW_SetHigh):
diff --git a/games-fps/tenebrae/metadata.xml b/games-fps/tenebrae/metadata.xml
deleted file mode 100644
index 04edb8b61c7e..000000000000
--- a/games-fps/tenebrae/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-Tenebrae is a modification of the quake source that adds stencil shadows 
-and per pixel lights to quake. Stencil shadows allow for realistic 
-shadow effects on every object in the game world. Per pixel lighting 
-allows you to have fine surface details correctly lit. These are 
-essentially the same algorithms as used by the new Doom game.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">tenebrae</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild b/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
deleted file mode 100644
index 85a7552e4015..000000000000
--- a/games-fps/tenebrae/tenebrae-1.04-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#ECVS_SERVER="cvs.tenebrae.sourceforge.net:/cvsroot/tenebrae"
-#ECVS_MODULE="tenebrae_0"
-#inherit cvs
-inherit eutils
-
-DESCRIPTION="adds stencil shadows and per pixel lights to quake"
-HOMEPAGE="http://tenebrae.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tenebrae/tenebraedata.zip
-	mirror://gentoo/${P}.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	media-libs/libpng:0
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	x11-base/xorg-proto"
-
-S=${WORKDIR}
-
-src_unpack() {
-	if [[ -z ${ECVS_MODULE} ]] ; then
-		unpack ${A}
-	else
-		cvs_src_unpack
-	fi
-}
-
-src_prepare() {
-	cd tenebrae_0 || die "cd failed"
-
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:g' \
-		gl_warp.c || die
-
-	eapply "${FILESDIR}"/${PV}-glhax.patch
-	eapply "${FILESDIR}"/${P}-exec-stack.patch
-	eapply "${FILESDIR}"/${P}-redef.patch
-
-	default
-
-	cd linux || die "cd failed"
-	sed \
-		-e "/^LDFLAGS/s:=:+=:" \
-		-e "s:-mpentiumpro -O6:${CFLAGS}:" \
-		Makefile.i386linux > Makefile || die
-}
-
-src_compile() {
-	cd "${S}"/tenebrae_0/linux || die "cd failed"
-	emake MASTER_DIR="/usr/share/quake1" build_release
-}
-
-src_install() {
-	newbin tenebrae_0/linux/release*/bin/tenebrae.run tenebrae
-	insinto "/usr/share/quake1/tenebrae"
-	doins "${WORKDIR}"/tenebrae/*
-	dodoc tenebrae_0/linux/README "${WORKDIR}"/Tenebrae_Readme.txt
-}
diff --git a/games-fps/transfusion-bin-1.01-r1 b/games-fps/transfusion-bin-1.01-r1
new file mode 100644
index 000000000000..fe3b636fbd79
--- /dev/null
+++ b/games-fps/transfusion-bin-1.01-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/glibc app-arch/unzip
+DESCRIPTION=Blood remake
+EAPI=6
+HOMEPAGE=http://www.transfusion-game.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/glibc
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/blood/transfusion-1.0-linux.i386.zip mirror://sourceforge/blood/transfusion-patch-1.01-linux.i386.zip mirror://gentoo/transfusion.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c123632b9e1261ee42b51ac516b3f2de
diff --git a/games-fps/transfusion-bin/Manifest b/games-fps/transfusion-bin/Manifest
deleted file mode 100644
index a2001e9c6689..000000000000
--- a/games-fps/transfusion-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX transfusion 65 BLAKE2B efad05a6cdbe57c12a95d57deafd67f9c377db323fe12f24dd0a16c2ff6cfaf762d223e6eb735225239268c205c799129caef30dfc496b26cd39f0ef1743c222 SHA512 28e217bcbd11d287319ddf17fb90d2e3f2779c1db378ca1ab21c7ab07966b80f3d6d23f25bdc2e6acd7147ce32d1ee8b9ef97bc6a93605509959cae1e90f689f
-DIST transfusion-1.0-linux.i386.zip 40532193 BLAKE2B 9b12f8d6ed91a1c31935f21a3094e186439159401411f3e1291381832dc09dcbc265113ed6df056109394b2c59ee9b556a7e16ebde6b001acd63a8854a58ebbe SHA512 cd4372e09ac6e3e4f1e2fe99afb18b1c5981c56dac84edd4d440be8914322984a377d4622e2b45719fead86d1b1c7f3ab74580430eba8b69bbe01702c8dbcafb
-DIST transfusion-patch-1.01-linux.i386.zip 8790776 BLAKE2B b8faa46a259a2f13f876540860b01b269a31969516b48901cf1e54c372e7db91f416f86af80b9a131e4bf2cb17cffc93dd04b50c1450f361601b3a048b8d2729 SHA512 b5d6b446be580ab09a79bdb651436de242603a7f215e85ab61ecc45d02739ca285a9a0bfaaf95c08df77f79928a42a27cace76a1695300d80172e2f4e9a488cf
-DIST transfusion.png 2102 BLAKE2B 5d062ee459ab8f309b35d07abdb63c442f30b98bb2cce6e55b23336e9ddf36f099f1d554a5ea0a76a3a1b1484a6559cf085e5e3d8aa27972c04d52bee3b7a701 SHA512 902c630c5f0956678a905760674be7c8bd0a4d72e217ca8cddd56681d0b1161051602bd7bf6e24cc25b6d99cf7c0e5a9802f8230eec7c6a9831aecd700838363
-EBUILD transfusion-bin-1.01-r1.ebuild 1146 BLAKE2B bb8b06f9c7ef1e01b2df467e1f740117044f563aa705b53d85c5fb452912d7a7cefa7e0b9e5e691c0e32eb22d5a10eb7c27890aa9c3405fed2f3c586500488f2 SHA512 2a71f2d5f854f621f076f8da8abfe9f24b0485017622c4ca8c6258c06c62b58bcef40fbc89d9f483bbc9ed188aa7c01774df49b32baf692a14028baf909ff083
-MISC metadata.xml 328 BLAKE2B be547572a9876be9ff3065dc5203ad70a0907c88ed8eafb48338a582bb28c9d417931b4243d673caee83ec0665963707bc00609fcda74259fe6ba3173f0ec32b SHA512 85e11b06989c540831ee3981820d63507c3a233014e73cb577089d599019de54db3bd52f4304623a5b81ae8dfacd7a6b9f59098865da0aff418cc79a46009f8d
diff --git a/games-fps/transfusion-bin/files/transfusion b/games-fps/transfusion-bin/files/transfusion
deleted file mode 100644
index 316b16625997..000000000000
--- a/games-fps/transfusion-bin/files/transfusion
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR && exec ./transfusion-glx ${@} || exit 1
diff --git a/games-fps/transfusion-bin/metadata.xml b/games-fps/transfusion-bin/metadata.xml
deleted file mode 100644
index ca74fa8ae7a2..000000000000
--- a/games-fps/transfusion-bin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">blood</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild b/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
deleted file mode 100644
index a535a8e3f9c6..000000000000
--- a/games-fps/transfusion-bin/transfusion-bin-1.01-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_PN="${PN/-bin/}"
-DESCRIPTION="Blood remake"
-HOMEPAGE="http://www.transfusion-game.com/"
-SRC_URI="mirror://sourceforge/blood/${MY_PN}-1.0-linux.i386.zip
-	mirror://sourceforge/blood/${MY_PN}-patch-${PV}-linux.i386.zip
-	mirror://gentoo/${MY_PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="sys-libs/glibc"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}"
-
-dir="/opt/${MY_PN}"
-Ddir="${D}/${dir}"
-
-src_install() {
-	# install everything that looks anything like docs...
-	dodoc ${MY_PN}/doc/*.txt ${MY_PN}/*txt qw/*txt
-	HTML_DOCS="${MY_PN}/doc/*.html" einstalldocs
-
-	#...then mass copy everything to the install dir...
-	dodir "${dir}"
-	cp -R * "${Ddir}" || die
-
-	# ...and remove the docs since we don't need them installed twice.
-	rm -rf \
-		"${Ddir}"/${MY_PN}/doc \
-		"${Ddir}"/qw/*txt \
-		"${Ddir}"/${MY_PN}/*txt
-
-	doicon "${DISTDIR}"/${MY_PN}.png
-	make_wrapper ${MY_PN} ./${MY_PN}-glx "${dir}" "${dir}"
-	make_desktop_entry ${MY_PN} "Transfusion" ${MY_PN}
-}
diff --git a/games-fps/tribes2-25034 b/games-fps/tribes2-25034
new file mode 100644
index 000000000000..c4023b954d7b
--- /dev/null
+++ b/games-fps/tribes2-25034
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/glibc games-util/loki_patch
+DESCRIPTION=Tribes 2 - Team Combat on an Epic Scale
+EAPI=5
+HOMEPAGE=http://www.lokigames.com/products/tribes2/
+KEYWORDS=-amd64 ~x86
+LICENSE=LOKI-EULA
+PROPERTIES=interactive
+RDEPEND=sys-libs/glibc games-util/loki_patch virtual/opengl games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://www.libsdl.org/projects/tribes2/release/tribes2-25034-cdrom-x86.run mirror://3dgamers/tribes2/tribes2-25034-cdrom-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_=dfa29ee226650165e704480f0e524231
diff --git a/games-fps/tribes2/Manifest b/games-fps/tribes2/Manifest
deleted file mode 100644
index 5d06ddab1330..000000000000
--- a/games-fps/tribes2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tribes2-25034-cdrom-x86.run 95560158 BLAKE2B a4516fddde83a8623348557983b3b5592c24108805da521d1b24bee21c06f8300ca812db8533855b70d924c59cf2bf417a771daa417c7f9b79e39f34a3611f98 SHA512 a3d2800af06d8659193ed1da4b9042af0924e1a0ade8a410aec31d66591efa2d2773aa12b33f7234975efee083974a77434bb1c0124bd57bfcc3be4898c46ad8
-EBUILD tribes2-25034.ebuild 2122 BLAKE2B 56abbd3c628f94595c2eb2415b8fd344f446bc71398f144bf3c092f7896f223ac0512315b83c2faef56fb9f9b7f9915505bcf8cd6d72387e2eaea330801ad344 SHA512 acfc53599d9754d526975641040b6cb520ffd7e2435eb0637df4a319d35db1900d76f4bc6c103f4e2dfeae8e67488bc0944384fa605978f51c4932f253d564db
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/tribes2/metadata.xml b/games-fps/tribes2/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/tribes2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/tribes2/tribes2-25034.ebuild b/games-fps/tribes2/tribes2-25034.ebuild
deleted file mode 100644
index 817ede1c3913..000000000000
--- a/games-fps/tribes2/tribes2-25034.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Tribes 2 - Team Combat on an Epic Scale"
-HOMEPAGE="http://www.lokigames.com/products/tribes2/"
-SRC_URI="http://www.libsdl.org/projects/${PN}/release/${P}-cdrom-x86.run
-	mirror://3dgamers/${PN}/${P}-cdrom-x86.run"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-# This package is broken and doesn't patch right on AMD64.  I've not taken the
-# time to try to figure it out but this definitely needs to stay -amd64 until
-# someone does fix the patching.
-KEYWORDS="-amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-DEPEND="sys-libs/glibc
-	games-util/loki_patch"
-RDEPEND="${DEPEND}
-	virtual/opengl"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-	ewarn "The installed game takes about 507MB of space!"
-}
-
-src_unpack() {
-	cdrom_get_cds README.tribes2d
-	unpack_makeself
-}
-
-src_install() {
-	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
-	doexe "${CDROM_ROOT}"/bin/x86/glibc-2.1/{t2launch,tribes2,tribes2.dynamic,tribes2d,tribes2d-restart.sh,tribes2d.dynamic}
-
-	insinto "${dir}"
-	doins "${CDROM_ROOT}"/{README,README.tribes2d,Tribes2_Manual.pdf,console_start.cs,kver.pub} "${Ddir}"
-
-	# Video card profiles
-	# TODO: move this to src_unpack where it belongs.
-	tar xzf ${CDROM_ROOT}/profiles.tar.gz -C "${Ddir}" || die
-
-	# Base (Music, Textures, Maps, etc.)
-	doins -r ${CDROM_ROOT}/base ${CDROM_ROOT}/menu
-
-	cd "${S}"
-	loki_patch --verify patch.dat
-	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 '{}' +
-
-	newicon "${CDROM_ROOT}"/icon.xpm tribes2.xpm
-	games_make_wrapper t2launch ./t2launch "${dir}" "${dir}"
-	make_desktop_entry t2launch "Tribes 2" tribes2
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the game run:"
-	elog " t2launch"
-}
diff --git a/games-fps/turtlearena-0.6.1-r1 b/games-fps/turtlearena-0.6.1-r1
new file mode 100644
index 000000000000..334a45673fe3
--- /dev/null
+++ b/games-fps/turtlearena-0.6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=sys-libs/zlib[minizip] !dedicated? ( media-libs/freetype:2 media-libs/libsdl[X,sound,joystick,opengl,video] virtual/jpeg:0 virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) theora? ( media-libs/libtheora ) voice? ( media-libs/speex mumble? ( media-sound/mumble ) ) vorbis? ( media-libs/libvorbis ) ) app-arch/unzip virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A turtle featuring free and open source third-person action game (ioq3 engine)
+EAPI=6
+HOMEPAGE=http://ztm.x10host.com/ta/index.htm
+IUSE=+curl debug dedicated mumble openal server theora voice vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc
+RDEPEND=sys-libs/zlib[minizip] !dedicated? ( media-libs/freetype:2 media-libs/libsdl[X,sound,joystick,opengl,video] virtual/jpeg:0 virtual/opengl curl? ( net-misc/curl ) openal? ( media-libs/openal ) theora? ( media-libs/libtheora ) voice? ( media-libs/speex mumble? ( media-sound/mumble ) ) vorbis? ( media-libs/libvorbis ) )
+SLOT=0
+SRC_URI=https://turtlearena.googlecode.com/files/turtlearena-0.6.1-0-src.tar.bz2 https://turtlearena.googlecode.com/files/turtlearena-0.6.1-0.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_=6eaaba1a269e95c09d546a52adf842b2
diff --git a/games-fps/turtlearena/Manifest b/games-fps/turtlearena/Manifest
deleted file mode 100644
index 4faeedd9fd50..000000000000
--- a/games-fps/turtlearena/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX turtlearena-0.6.1-build.patch 6401 BLAKE2B e69fda1f38253fcc4ae3a541624dbe365a217a026c384abee27abaddb97cec1da37b57f004c14af744e0274a9fba91c4157aab5b42f772c9a09cc3c85bbb15df SHA512 c072ef951b86872a45ae6b5a8732921859605a30d00fe1c64e1c275b88d7f146f3f1435c34365907b926048d3391fbea2841228f0001dc4c249202c07aedcd4c
-AUX turtlearena-0.6.1-freetype.patch 451 BLAKE2B 33c2f46261d75149e2151bfd38a4c4f895579c374924c08ee0ae64ef27a6cf5274a00dd4aad6a3ee4ed3885f63ee0e1475fb45226f33eb43f4b591d63564099a SHA512 cc16c0a69b77627956254b000a4b42e77f57f7d073488c0dde3c0b155e01288aaba958fc16d932550200add0b5429afb10f15c3e23a22d874fe31014ebe090a1
-DIST turtlearena-0.6.1-0-src.tar.bz2 33355448 BLAKE2B 492eafd29e60a2528d11c91a6c48d8cad4a47718d7aa52c7241590b4e758cc65b76c5eea08b92f16db2eb8feff83d8484c9bd9b02015c1af575309cd92635014 SHA512 aa11f66a9ec584226267d34ecd637245a068c3c13ffc49fe0ff1ca16699b3eebf6435255ad68b953fbf02f25c807833830eb76497d53bcff977814e87b804edf
-DIST turtlearena-0.6.1-0.zip 73713016 BLAKE2B 346222691553122814d92ea42bac3f21e39de499d019c92813d8769690540da5257c52b673ac17440f2fb6819ded6221e19fb0cba67c9d7ad9539dbfc4eeb7b8 SHA512 83c96e572687bbdc6183393d21435806b1032295156c1905d82b300bcb6e00a34cd247731f6958e65f085c4c022fc52195313bc0f44edc7a726f04367483a378
-EBUILD turtlearena-0.6.1-r1.ebuild 3148 BLAKE2B 18a0caf0de43d38dd25d5ed62f77183c168c17f79ebcc37fb0dcfda042decab92b2a77013e0c4798ddcbd9fa003974f3fbec6ab3042c46d2738a7aece62aefa9 SHA512 b535dcd923c9e7dc7f03626157284dec5b636429d460f5d1b9e9da5b04db14424eccb28591400e316f1131886bd7baae1710daa8d74254c28324afe837bff068
-MISC metadata.xml 448 BLAKE2B 0dd50368438ba4e015bdd06cca3f02104a43e9c9cee7dd28e610a9cd8b57dda4c34e27bd77082f30265ac6d7d0b0ab17b4e93d6e012f041778aba2e047ed5147 SHA512 633c20ebfe668a103133f8f4ca5bcefeffcde149c325973534ad1b362d72b4396c2e4c60681e027eb3f56c1a6ebbb073acc0078e22808627b7f39c0788f80069
diff --git a/games-fps/turtlearena/files/turtlearena-0.6.1-build.patch b/games-fps/turtlearena/files/turtlearena-0.6.1-build.patch
deleted file mode 100644
index 0b6ad877b3f2..000000000000
--- a/games-fps/turtlearena/files/turtlearena-0.6.1-build.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Apr 27 20:53:37 UTC 2013
-
-* use PKG_CONFIG var (used in cross compiling scripts, does
-  cross compiling even work?)
-* consistently use pkg-config where possible, define proper fallbacks
-* unbundle the unzip.c properly and fix headers
-* make -m* flags depend on CROSS_COMPILING var
-
---- a/engine/Makefile
-+++ b/engine/Makefile
-@@ -346,27 +346,31 @@
- 
- bin_path=$(shell which $(1) 2> /dev/null)
- 
-+PKG_CONFIG ?= pkg-config
-+SDL_CONFIG ?= sdl-config
-+
- # We won't need this if we only build the server
- ifneq ($(BUILD_CLIENT),0)
--  # set PKG_CONFIG_PATH to influence this, e.g.
--  # PKG_CONFIG_PATH=/opt/cross/i386-mingw32msvc/lib/pkgconfig
--  ifneq ($(call bin_path, pkg-config),)
--    CURL_CFLAGS=$(shell pkg-config --silence-errors --cflags libcurl)
--    CURL_LIBS=$(shell pkg-config --silence-errors --libs libcurl)
--    OPENAL_CFLAGS=$(shell pkg-config --silence-errors --cflags openal)
--    OPENAL_LIBS=$(shell pkg-config --silence-errors --libs openal)
--    SDL_CFLAGS=$(shell pkg-config --silence-errors --cflags sdl|sed 's/-Dmain=SDL_main//')
--    SDL_LIBS=$(shell pkg-config --silence-errors --libs sdl)
--    FREETYPE_CFLAGS=$(shell pkg-config --silence-errors --cflags freetype2)
--  endif
--  # Use sdl-config if all else fails
--  ifeq ($(SDL_CFLAGS),)
--    ifneq ($(call bin_path, sdl-config),)
--      SDL_CFLAGS=$(shell sdl-config --cflags)
--      SDL_LIBS=$(shell sdl-config --libs)
--    endif
--  endif
--endif
-+    CURL_CFLAGS=$(shell $(PKG_CONFIG) --cflags libcurl 2>/dev/null)
-+    CURL_LIBS=$(shell $(PKG_CONFIG) --libs libcurl 2>/dev/null || echo "-lcurl")
-+    OPENAL_CFLAGS=$(shell $(PKG_CONFIG) --cflags openal 2>/dev/null || echo "-I/usr/include/AL")
-+    OPENAL_LIBS=$(shell $(PKG_CONFIG) --libs openal 2>/dev/null || echo "-lopenal")
-+    SDL_CFLAGS=$(shell $(PKG_CONFIG) --cflags sdl 2>/dev/null || $(SDL_CONFIG) --cflags 2>/dev/null || echo "-I/usr/include/SDL")
-+    SDL_LIBS=$(shell $(PKG_CONFIG) --libs sdl 2>/dev/null || $(SDL_CONFIG) --libs 2>/dev/null || echo "-lsdl")
-+    FREETYPE_CFLAGS=$(shell $(PKG_CONFIG) --cflags freetype2 2>/dev/null || echo "-I/usr/include/freetype2")
-+    FREETYPE_LIBS=$(shell $(PKG_CONFIG) --libs freetype2 2>/dev/null || echo "-lfreetype")
-+    OPENGL_LIBS=$(shell $(PKG_CONFIG) --libs gl 2>/dev/null || echo "-lGL")
-+    VORIBS_CFLAGS=$(shell $(PKG_CONFIG) --cflags vorbis vorbisfile 2>/dev/null)
-+    VORBIS_LIBS=$(shell $(PKG_CONFIG) --libs vorbis vorbisfile 2>/dev/null || echo "-lvorbis -lvorbisfile -logg")
-+    THEORA_CFLAGS=$(shell $(PKG_CONFIG) --cflags theora 2>/dev/null)
-+    THEORA_LIBS=$(shell $(PKG_CONFIG) --libs theora 2>/dev/null || echo "-ltheora")
-+    SPEEX_CFLAGS=$(shell $(PKG_CONFIG) --cflags speex speexdsp 2>/dev/null)
-+    SPEEX_LIBS=$(shell $(PKG_CONFIG) --libs speex speexdsp 2>/dev/null || echo "-lspeex")
-+endif
-+
-+# common deps
-+ZLIB_CFLAGS=$(shell $(PKG_CONFIG) --cflags zlib minizip 2>/dev/null || echo "-I/usr/include/minizip")
-+ZLIB_LIBS=$(shell $(PKG_CONFIG) --libs zlib minizip 2>/dev/null || echo "-lz -lminizip")
- 
- ifneq ($(BUILD_FINAL),1)
- 	# Add svn version info
-@@ -421,7 +425,7 @@
-   endif
- 
-   BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
--    -pipe -DUSE_ICON
-+    -DUSE_ICON
-   CLIENT_CFLAGS += $(SDL_CFLAGS)
- 
-   OPTIMIZEVM = -O3 -funroll-loops -fomit-frame-pointer
-@@ -470,25 +474,29 @@
-   LIBS=-ldl -lm
- 
-   CLIENT_LIBS=$(SDL_LIBS)
--  RENDERER_LIBS = $(SDL_LIBS) -lGL
-+  RENDERER_LIBS = $(SDL_LIBS) $(OPENGL_LIBS)
- 
-   ifeq ($(USE_OPENAL),1)
-     ifneq ($(USE_OPENAL_DLOPEN),1)
--      CLIENT_LIBS += -lopenal
--    endif
-+      CLIENT_CFLAGS += $(OPENAL_CFLAGS)
-+      CLIENT_LIBS += $(OPENAL_LIBS)
-+  endif
-   endif
- 
-   ifeq ($(USE_CURL),1)
-     ifneq ($(USE_CURL_DLOPEN),1)
--      CLIENT_LIBS += -lcurl
-+      CLIENT_CFLAGS += $(CURL_CFLAGS)
-+      CLIENT_LIBS += $(CURL_LIBS)
-     endif
-   endif
- 
-   ifeq ($(USE_CODEC_VORBIS),1)
--    CLIENT_LIBS += -lvorbisfile -lvorbis -logg
-+    CLIENT_CFLAGS += $(VORBIS_CFLAGS)
-+    CLIENT_LIBS += $(VORBIS_LIBS)
-   endif
-   ifeq ($(USE_CODEC_THEORA),1)
--    CLIENT_LIBS += -ltheora
-+    CLIENT_CFLAGS += $(THEORA_CFLAGS)
-+    CLIENT_LIBS += $(THEORA_LIBS)
-   endif
- 
-   ifeq ($(USE_MUMBLE),1)
-@@ -503,14 +511,18 @@
-     BASE_CFLAGS += $(FREETYPE_CFLAGS)
-   endif
- 
-+  # cross-compiling tweaks
-   ifeq ($(ARCH),i386)
--    # linux32 make ...
--    BASE_CFLAGS += -m32
--  else
--  ifeq ($(ARCH),ppc64)
--    BASE_CFLAGS += -m64
-+    ifeq ($(CROSS_COMPILING),1)
-+      BASE_CFLAGS += -m32
-+    endif
-   endif
-+  ifeq ($(ARCH),amd64)
-+    ifeq ($(CROSS_COMPILING),1)
-+      BASE_CFLAGS += -m64
-+    endif
-   endif
-+
- else # ifeq Linux
- 
- #############################################################################
-@@ -1155,7 +1167,8 @@
-   ifeq ($(USE_INTERNAL_SPEEX),1)
-     CLIENT_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include
-   else
--    CLIENT_LIBS += -lspeex -lspeexdsp
-+    CLIENT_CFLAGS += $(SPEEX_CFLAGS)
-+    CLIENT_LIBS += $(SPEEX_LIBS)
-   endif
- endif
- 
-@@ -1163,7 +1176,8 @@
-   BASE_CFLAGS += -DNO_GZIP
-   BASE_CFLAGS += -I$(ZDIR)
- else
--  LIBS += -lz
-+  BASE_CFLAGS += $(ZLIB_CFLAGS)
-+  LIBS += $(ZLIB_LIBS)
- endif
- 
- ifeq ($(USE_INTERNAL_JPEG),1)
-@@ -1177,7 +1191,8 @@
-   BASE_CFLAGS += -I$(FTDIR)/include \
- 					-DFT2_BUILD_LIBRARY
- else
--  RENDERER_LIBS += -lfreetype
-+  BASE_CFLAGS += $(FREETYPE_CFLAGS)
-+  RENDERER_LIBS += $(FREETYPE_LIBS)
- endif
- 
- ifeq ("$(CC)", $(findstring "$(CC)", "clang" "clang++"))
-@@ -1650,8 +1665,6 @@
-   $(B)/client/q_math.o \
-   $(B)/client/q_shared.o \
-   \
--  $(B)/client/unzip.o \
--  $(B)/client/ioapi.o \
-   $(B)/client/puff.o \
-   $(B)/client/vm.o \
-   $(B)/client/vm_interpreted.o \
-@@ -2076,8 +2089,6 @@
-   $(B)/ded/q_math.o \
-   $(B)/ded/q_shared.o \
-   \
--  $(B)/ded/unzip.o \
--  $(B)/ded/ioapi.o \
-   $(B)/ded/vm.o \
-   $(B)/ded/vm_interpreted.o \
-   \
---- a/engine/code/qcommon/files.c
-+++ b/engine/code/qcommon/files.c
-@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth
- 
- #include "q_shared.h"
- #include "qcommon.h"
--#include "unzip.h"
-+#include <minizip/unzip.h>
- 
- /*
- =============================================================================
---- a/engine/code/renderer/tr_public.h
-+++ b/engine/code/renderer/tr_public.h
-@@ -25,7 +25,7 @@
- #include "tr_types.h"
- 
- #ifdef IOQ3ZTM // PNG_SCREENSHOTS
--#include "../zlib/zlib.h"
-+#include <zlib.h>
- #endif
- 
- #define	REF_API_VERSION		8
diff --git a/games-fps/turtlearena/files/turtlearena-0.6.1-freetype.patch b/games-fps/turtlearena/files/turtlearena-0.6.1-freetype.patch
deleted file mode 100644
index 9ecd6df2bf57..000000000000
--- a/games-fps/turtlearena/files/turtlearena-0.6.1-freetype.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=479822#c3
-http://github.com/ioquake/ioq3/commit/ab4c602374caa0f520b3a0801d384a73e29e0bc7
-
---- a/engine/code/renderer/tr_font.c
-+++ b/engine/code/renderer/tr_font.c
-@@ -47,10 +47,10 @@
- #include "../qcommon/qcommon.h"
- 
- #include <ft2build.h>
-+#include FT_FREETYPE_H
- #include FT_ERRORS_H
- #include FT_SYSTEM_H
- #include FT_IMAGE_H
--#include FT_FREETYPE_H
- #include FT_OUTLINE_H
- 
- #define _FLOOR(x)  ((x) & -64)
diff --git a/games-fps/turtlearena/metadata.xml b/games-fps/turtlearena/metadata.xml
deleted file mode 100644
index 76847d643c80..000000000000
--- a/games-fps/turtlearena/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="mumble">Adds player-location (positional audio) support to VoIP</flag>
-		<flag name="server">Build server target</flag>
-		<flag name="voice">Adds VoIP support</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild b/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
deleted file mode 100644
index ee3525548a70..000000000000
--- a/games-fps/turtlearena/turtlearena-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils
-
-MY_P=${PN/-/}-${PV}
-
-DESCRIPTION="A turtle featuring free and open source third-person action game (ioq3 engine)"
-HOMEPAGE="http://ztm.x10host.com/ta/index.htm"
-SRC_URI="https://turtlearena.googlecode.com/files/${MY_P}-0-src.tar.bz2
-	https://turtlearena.googlecode.com/files/${MY_P}-0.zip"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 mplus-fonts lcc"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl debug dedicated mumble openal server theora voice vorbis"
-
-RDEPEND="
-	sys-libs/zlib[minizip]
-	!dedicated? (
-		media-libs/freetype:2
-		media-libs/libsdl[X,sound,joystick,opengl,video]
-		virtual/jpeg:0
-		virtual/opengl
-		curl? ( net-misc/curl )
-		openal? ( media-libs/openal )
-		theora? ( media-libs/libtheora )
-		voice? (
-			media-libs/speex
-			mumble? ( media-sound/mumble )
-		)
-		vorbis? ( media-libs/libvorbis )
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}-0-src
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-build.patch
-	eapply "${FILESDIR}"/${P}-freetype.patch
-
-	sed -i \
-		-e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \
-		engine/code/renderer/tr_image_jpg.c || die #479822
-
-	rm -r engine/code/{AL,libcurl,libogg,libspeex,libtheora,libvorbis,SDL12,zlib} \
-		engine/code/freetype* engine/code/jpeg-* \
-		engine/code/qcommon/unzip.{c,h} || die
-}
-
-src_compile() {
-	buildit() { use $1 && echo 1 || echo 0 ; }
-	nobuildit() { use $1 && echo 0 || echo 1 ; }
-
-	myarch=$(usex amd64 "x86_64" "x86")
-	emake -C engine \
-		Q="" \
-		ARCH=${myarch} \
-		CROSS_COMPILING=0 \
-		BUILD_GAME_QVM=0 \
-		BUILD_GAME_SO=0 \
-		BUILD_CLIENT=$(nobuildit dedicated) \
-		BUILD_SERVER=$(usex dedicated "1" "$(buildit server)") \
-		DEFAULT_BASEDIR="/usr/share/${PN}" \
-		GENERATE_DEPENDENCIES=0 \
-		OPTIMIZEVM="" \
-		OPTIMIZE="" \
-		DEBUG_CFLAGS="" \
-		USE_MUMBLE=$(buildit mumble) \
-		USE_VOIP=$(buildit voice) \
-		USE_INTERNAL_SPEEX=0 \
-		USE_INTERNAL_OGG=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_INTERNAL_JPEG=0 \
-		USE_INTERNAL_FREETYPE=0 \
-		USE_CODEC_VORBIS=$(buildit vorbis) \
-		USE_INTERNAL_VORBIS=0 \
-		USE_CODEC_THEORA=$(buildit theora) \
-		USE_OPENAL=$(buildit openal) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_CURL=$(buildit curl) \
-		USE_CURL_DLOPEN=0 \
-		USE_LOCAL_HEADERS=0 \
-		$(usex debug "debug" "release")
-}
-
-src_install() {
-	dodoc engine/{ChangeLog,BUGS,TODO}
-	use voice && dodoc engine/voip-readme.txt
-
-	if ! use dedicated ; then
-		newbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena.${myarch} turtlearena
-		newicon -s scalable engine/misc/quake3-tango.svg ${PN}.svg
-		newicon -s 256 engine/misc/quake3-tango.png ${PN}.png
-		make_desktop_entry ${PN}
-	fi
-
-	if use dedicated || use server ; then
-		newbin engine/build/$(usex debug "debug" "release")-linux-${myarch}/turtlearena-server.${myarch} turtlearena-server
-	fi
-
-	insinto "/usr/share/${PN}"
-	doins -r "${WORKDIR}"/${MY_P}-0/base
-}
-
-pkg_preinst() {
-	use dedicated || gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use dedicated || gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use dedicated || gnome2_icon_cache_update
-}
diff --git a/games-fps/unreal-226 b/games-fps/unreal-226
new file mode 100644
index 000000000000..695168b76308
--- /dev/null
+++ b/games-fps/unreal-226
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/lib-compat app-arch/unzip
+DESCRIPTION=Futuristic FPS (a hack that runs on top of Unreal Tournament)
+EAPI=5
+HOMEPAGE=http://www.unreal.com/ http://icculus.org/~chunky/ut/unreal/
+IUSE=X opengl
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RDEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.icculus.org/%7Echunky/ut/unreal/unreali-install.run ftp://ftp.lokigames.com/pub/patches/ut/ut-install-436.run ftp://ftp.lokigames.com/pub/patches/ut/IpDrv-436-Linux-08-20-02.zip
+_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_=d89e2d01a84ce9f97b8cec5e8d09b387
diff --git a/games-fps/unreal-tournament-451 b/games-fps/unreal-tournament-451
new file mode 100644
index 000000000000..c841742e1b72
--- /dev/null
+++ b/games-fps/unreal-tournament-451
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) !games-fps/unreal-tournament-goty
+DESCRIPTION=Futuristic FPS
+EAPI=5
+HOMEPAGE=http://www.oldunreal.com/
+IUSE=3dfx opengl
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RDEPEND=>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] opengl? ( virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.ut-files.com/Patches/ut-install-436.run http://www.ut-files.com/Patches/utpgpatch451.tar.bz2 -> UTPGPatch451.tar.bz2
+_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_=d967ca4976051268817eaeaf17bd35f7
diff --git a/games-fps/unreal-tournament-bonuspacks-436 b/games-fps/unreal-tournament-bonuspacks-436
new file mode 100644
index 000000000000..f2c0a0ccb6e0
--- /dev/null
+++ b/games-fps/unreal-tournament-bonuspacks-436
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=|| ( games-fps/unreal-tournament games-fps/unreal-tournament-goty ) app-arch/unzip games-util/umodpack
+DESCRIPTION=Futuristic FPS (bonus packs)
+EAPI=5
+HOMEPAGE=http://www.oldunreal.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=|| ( games-fps/unreal-tournament games-fps/unreal-tournament-goty ) games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.ut-files.com/Patches/utbonuspack4.zip -> UTBonusPack4.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_=d2693daf79df2e3c8587228e0edd129f
diff --git a/games-fps/unreal-tournament-bonuspacks/Manifest b/games-fps/unreal-tournament-bonuspacks/Manifest
deleted file mode 100644
index 685d43ddf105..000000000000
--- a/games-fps/unreal-tournament-bonuspacks/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST UTBonusPack4.zip 14916708 BLAKE2B da4b2db40e2a360fe90c8a67d58304639d072cbc9f857488b25b3710c84689ea753fb5e7d2a178e825515d687c0bf7821842056fa15110f902651acd42584cd1 SHA512 4abc29b108926aebce872a0c8257f97604265cdc837b2e46443ee8cf98adfcba69b6b7ab2bd2379723c11301ef2bf60298ab075a6befe5eeed6d8526f3f653b0
-EBUILD unreal-tournament-bonuspacks-436.ebuild 1135 BLAKE2B d86ddb0fad98b433f7167c088ff6c66b60985e358daaaa04d82f3164dc2bf05153ca4e7a04bc3e50fbe41581eeb323633bdb3da82ae90a49616fb3043e28e1c5 SHA512 8a85c38456b6298bb5d19a21247c1c15b3caf4b09bbf892612f688d2e7e48b3ef5c802386507300e6b78101d81178aece8610fc9df37e5aa3d3416038fa291b7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/unreal-tournament-bonuspacks/metadata.xml b/games-fps/unreal-tournament-bonuspacks/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/unreal-tournament-bonuspacks/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild b/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
deleted file mode 100644
index bbc8edb8a3fe..000000000000
--- a/games-fps/unreal-tournament-bonuspacks/unreal-tournament-bonuspacks-436.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="Futuristic FPS (bonus packs)"
-HOMEPAGE="http://www.oldunreal.com/"
-# UT has 4 official bonus packs ...
-# [UTBonusPack]  -> loki put into games-fps/unreal-tournament
-# [UTBonusPack2] -> loki put into games-fps/unreal-tournament
-# [UTiNoxxPack]  -> loki put into games-fps/unreal-tournament
-# [UTBonusPack4] -> none of this is in games-fps/unreal-tournament
-SRC_URI="http://www.ut-files.com/Patches/utbonuspack4.zip -> UTBonusPack4.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="|| (
-	games-fps/unreal-tournament
-	games-fps/unreal-tournament-goty )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	games-util/umodpack"
-
-S=${WORKDIR}
-
-src_install() {
-	# unpack the UTBonusPack4 umod
-	umod -v -b "$(pwd)" -x UTBonusPack4.umod || die
-
-	# move stuff around
-	rm UTBonusPack4.umod
-	mv system System
-	mv textures Textures
-
-	# install it all
-	local dir=${GAMES_PREFIX_OPT}/unreal-tournament
-	dodir "${dir}"
-	mv * "${D}/${dir}/"
-
-	prepgamesdirs
-}
diff --git a/games-fps/unreal-tournament-goty-451 b/games-fps/unreal-tournament-goty-451
new file mode 100644
index 000000000000..cb451056c358
--- /dev/null
+++ b/games-fps/unreal-tournament-goty-451
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Futuristic FPS (Game Of The Year edition)
+EAPI=5
+HOMEPAGE=http://www.oldunreal.com/
+IUSE=3dfx S3TC nls opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RDEPEND=opengl? ( virtual/opengl[abi_x86_32(-)] ) >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.ut-files.com/Patches/ut-install-436-GOTY.run http://www.ut-files.com/Patches/utpgpatch451.tar.bz2 -> UTPGPatch451.tar.bz2
+_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_=45057e462144412bcf28a3db7caecf58
diff --git a/games-fps/unreal-tournament-goty/Manifest b/games-fps/unreal-tournament-goty/Manifest
deleted file mode 100644
index 55dad12bc1d7..000000000000
--- a/games-fps/unreal-tournament-goty/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST UTPGPatch451.tar.bz2 3064473 BLAKE2B 43fd1573f714b59d7069b8fbd30bd822024971277dd863793a3f2c05d1a973904fd9ef6f22f8efcec0389cdb36ec6abb6c8f3eb5b700eba29aa6b5284d433cb4 SHA512 d11ecb3e60e8bba0288be0a4860acb563c277e75ce30a749de04673219d484b7a8c7e6207bc582872df33db684658dc1a15235b9d79ceb98fcd2ad1410982423
-DIST ut-install-436-GOTY.run 6340417 BLAKE2B 255fcfe95f0c23c52e9f2aec914f023db532b1e6fdaba39c17baaf34f58c7f44b815b10757083602fdd95ca61a7ebcb6167c6cef9cf9750323557c499d29ea37 SHA512 daa2da9f21f1b6e057e19d72d9c1b2446a250b30eb80b24d6a059a5d1eec24a9326d4e6af0401ba4ade3610fbf3a44c1fe44c26b7ae0eb4b7301a20f9574859c
-EBUILD unreal-tournament-goty-451.ebuild 5059 BLAKE2B bbf170479dce41e4f86d3c9c707f5b7980cf4054032d722df89495d7f9d9fe5c5d66380f2da8f4dbec650bf48eae0b73fcd51564695b56585aa4677c3e06dbab SHA512 bcb67d66e53d2244c24b6e0b1bc367115f0c6ac11ba941a6c7d7911f12ee1d1c4c8fe1f6d2e96988fbf0da52c8117d2c9f4660723a37f3511dc91eca793340e0
-MISC metadata.xml 1737 BLAKE2B 25f4868993c97b2f62e363095313763d0a16b2007b6606d42942c2e6caa8cc80db0d8aa576910ad7da0d74551e4cbbc591e6992418c8ae55c3a28713b0da0597 SHA512 68d571ba7b3af66b65d7e68db7598bd3aefb252892cc35fcb956de3e30175e83f79c866c5c04e6d4d19d7fa4f7533555fcc83e0bfac71fb26d0fb2b87c0e67dc
diff --git a/games-fps/unreal-tournament-goty/metadata.xml b/games-fps/unreal-tournament-goty/metadata.xml
deleted file mode 100644
index 5f8f103990d5..000000000000
--- a/games-fps/unreal-tournament-goty/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-In the single player mode, the player squares off 
-against computer controlled Bots in all the game modes 
-through a tournament ladder with increasing difficulty. 
-Thanks to Epic's unmatched AI coding wizardry, Unreal 
-Tournament's Bots are more life like than any 
-computer-controlled characters to date. They understand 
-each game's unique rules. They have a firm handle on all 
-the different weapons at their disposal and how best to 
-use them. They can swim, use elevators, climb stairs, 
-and put on Toxin suits if they have to. If they're on 
-the player's team, they can take orders to attack, 
-defend or freelance.
-
-Unreal Tournament's bread and butter is the online multiplayer 
-mode. Squaring off against other combatants from around the world, or on 
-the other end of a LAN connection, provides some of the most thrilling and 
-tense battles seen on a PC. Unreal Tournament's unparalleled networking 
-code makes it as easy to play the game against anyone, anytime. If the 
-host server has unique content -- like custom skins or maps -- UT 
-will automatically download and install that content in REAL TIME, as the 
-game is connecting. And thanks to Epic Games' amazing work on Unreal 
-Tournament's network play, you can be sure that even a 33.6K modem can get 
-a silky smooth connection to the server.
-</longdescription>
-  <use>
-    <flag name="S3TC">Add the extra fancy textures to UT ... only works on certain cards (nvidia/ati/s3)</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild b/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
deleted file mode 100644
index f61422fa334b..000000000000
--- a/games-fps/unreal-tournament-goty/unreal-tournament-goty-451.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Futuristic FPS (Game Of The Year edition)"
-HOMEPAGE="http://www.oldunreal.com/"
-SRC_URI="http://www.ut-files.com/Patches/ut-install-436-GOTY.run
-	http://www.ut-files.com/Patches/utpgpatch${PV}.tar.bz2 -> UTPGPatch${PV}.tar.bz2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="3dfx S3TC nls opengl"
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	opengl? ( virtual/opengl[abi_x86_32(-)] )
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cdrom_get_cds System/ Help/chaosut
-	unpack_makeself ut-install-436-GOTY.run
-	mkdir UTPG && cd UTPG
-	unpack UTPGPatch${PV}.tar.bz2
-	rm checkfiles.sh patch.md5
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN/-goty/}
-	local Ddir=${D}/${dir}
-	dodir "${dir}"
-
-	###########
-	### PRE ###
-	# System
-	if use 3dfx ; then
-		tar -zxf Glide.ini.tar.gz -C "${Ddir}" || die "install Glide ini"
-	else
-		tar -zxf OpenGL.ini.tar.gz -C "${Ddir}" || die "install OpenGL ini"
-	fi
-	tar -zxf data.tar.gz -C "${Ddir}" || die "extract System data"
-
-	# the most important things, ucc & ut :)
-	exeinto "${dir}"
-	doexe bin/x86/{ucc,ut} || die "install ucc/ut"
-	sed -i -e "s:\`FindPath \$0\`:${dir}:" "${ED}/${dir}"/ucc || die
-
-	# export some symlinks so ppl can run
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}"/ucc "${GAMES_BINDIR}"/ucc
-	dosym "${dir}"/ut "${GAMES_BINDIR}"/ut
-	### PRE ###
-	###########
-
-	###########
-	### CD1 ###
-	# Help, Logs, Music, Sounds, Textures, Web
-	cp -rf "${CDROM_ROOT}"/{Help,Logs,Music,Textures,Web} "${Ddir}"/ || die "copy Help, Logs, Music, Textures, Web CD1"
-	dodir "${dir}"/Sounds
-	if use nls ; then
-		cp -rf "${CDROM_ROOT}"/Sounds/* "${Ddir}"/Sounds/ || die "copy Sounds CD1"
-	else
-		cp -rf "${CDROM_ROOT}"/Sounds/*.uax "${Ddir}"/Sounds/ || die "copy Sounds CD1"
-	fi
-
-	# System
-	dodir "${dir}"/System
-	if use nls ; then
-		cp "${CDROM_ROOT}"/System/*.{est,frt,itt,int,u} "${Ddir}"/System/ || die "copy System data CD1"
-	else
-		cp "${CDROM_ROOT}"/System/*.{int,u} "${Ddir}"/System/ || die "copy System data CD1"
-	fi
-
-	# now we uncompress the maps
-	einfo "Uncompressing CD1 Maps ... this may take some time"
-	dodir "${dir}"/Maps
-	cd "${Ddir}"
-	export HOME=${T}
-	export UT_DATA_PATH="${Ddir}"/System
-	for f in `find "${CDROM_ROOT}"/Maps/ -name '*.uz' -printf '%f '` ; do
-		./ucc decompress "${CDROM_ROOT}"/Maps/${f} -nohomedir || die "uncompressing map CD1 ${f}"
-		mv System/${f:0:${#f}-3} Maps/ || die "copy map CD1 ${f}"
-	done
-	### CD1 ###
-	###########
-
-	### Have user switch cds if need be ###
-	cdrom_load_next_cd
-
-	###########
-	### CD2 ###
-	# Help, Sounds
-	cp -rf "${CDROM_ROOT}"/{Help,Sounds} "${Ddir}"/ || die "copy Help, Sounds CD2"
-
-	# S3TC Textures
-	if use S3TC ; then
-		cp -rf "${CDROM_ROOT}"/Textures "${Ddir}"/ || die "copy S3TC Textures CD2"
-	else
-		cp -rf "${CDROM_ROOT}"/Textures/{JezzTex,Jezztex2,SnowDog,chaostex{,2}}.utx "${Ddir}"/Textures/ || die "copy Textures CD2"
-	fi
-
-	# System
-	cp -rf "${CDROM_ROOT}"/System/*.{u,int} "${Ddir}"/System/ || die "copy System CD2"
-
-	# now we uncompress the maps
-	einfo "Uncompressing CD2 Maps ... this may take some time"
-	dodir "${dir}"/Maps
-	cd "${Ddir}"
-	export HOME=${T}
-	export UT_DATA_PATH="${Ddir}"/System
-	for f in `find "${CDROM_ROOT}"/maps/ -name '*.uz' -printf '%f '` ; do
-		./ucc decompress "${CDROM_ROOT}"/maps/${f} -nohomedir || die "uncompressing map CD2 ${f}"
-		mv System/${f:0:${#f}-3} Maps/ || die "copy map CD2 ${f}"
-	done
-	### CD2 ###
-	###########
-
-	###########
-	### END ###
-	cd "${S}"
-
-	# Textures
-	tar -zxf Credits.tar.gz -C "${Ddir}" || die "extract credits texture"
-	# NetGamesUSA.com
-	tar -zxf NetGamesUSA.com.tar.gz -C "${Ddir}"/ || die "extract NetGamesUSA.com"
-
-	# first apply any patch remaints loki has for us
-	cd setup.data
-	cp patch.dat{,.orig} || die "cp failed"
-	sed -e 's:sh uz-maps.sh:echo:' patch.dat.orig > patch.dat || die "sed failed"
-	./bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null
-	cd "${S}"
-
-	# finally, unleash the UTPG patch
-	cp -rf UTPG/* "${Ddir}"/ || die "cp failed"
-	# fix a small bug until next official release
-	sed -i -e "/^LoadClassMismatch/s:%s.%s:%s:" "${ED}/${dir}"/System/Core.int
-
-	# install a few random files
-	insinto "${dir}"
-	doins README icon.{bmp,xpm} || die "installing random files"
-
-	# 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 '{}' \;
-	### END ###
-	###########
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "You might want to install the bonus packs too."
-	elog "Many servers on the internet use them, and the"
-	elog "majority of players do too."
-	elog
-	elog "Just run: emerge unreal-tournament-bonuspacks"
-}
diff --git a/games-fps/unreal-tournament-strikeforce-1.81 b/games-fps/unreal-tournament-strikeforce-1.81
new file mode 100644
index 000000000000..7fc8ba51f6fa
--- /dev/null
+++ b/games-fps/unreal-tournament-strikeforce-1.81
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=A UT addon where you fight terrorists as part of an elite strikeforce
+EAPI=5
+HOMEPAGE=http://www.strike-force.com/
+KEYWORDS=~x86
+LICENSE=unreal-tournament-strikeforce
+RDEPEND=|| ( games-fps/unreal-tournament games-fps/unreal-tournament-goty ) games-misc/games-envd
+RESTRICT=bindist
+SLOT=0
+SRC_URI=mirror://gentoo/sf_180_server_files.tar.gz mirror://gentoo/unreal-tournament-strikeforce-1.81.tar.bz2 mirror://gentoo/sf180lnx.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_=56014cbc02d7cc0caeab661c62edab79
diff --git a/games-fps/unreal-tournament-strikeforce/Manifest b/games-fps/unreal-tournament-strikeforce/Manifest
deleted file mode 100644
index 3aa00178ebfd..000000000000
--- a/games-fps/unreal-tournament-strikeforce/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sf180lnx.zip 11965 BLAKE2B 535787a47c5e22866ca4dc02a92955bd152b3bafb136e4f7788ba1b3785da3bc13bc937951164094e5eb43932ad48ef6ded9c95c0d561c60f6dd9d92a4e83c8d SHA512 e64644f470f2506df05159c03f27f3e1df9dc5cf547a7e2415ee8005fadcc1124c02f4e932de7c92b2781511ed8d44f5b8a314a8c246d57da750e30e57fcdfad
-DIST sf_180_server_files.tar.gz 396772949 BLAKE2B b30b2ffc9d9a737df159e5e8efaef75f829edb155032e57d0ac5526d8cf2ef1e6de31f0fa503615edb8a2ce4dd53b8295132457e2ddef36f3a24a6a01f179916 SHA512 74850d42be59f9d974cf5f89bb85385ff204a0635e0f71315c59cae3fc0eb8032d69797aedc380427ad21e7cdda809a326587ccf3835f9abaaf14b92a3c0dabe
-DIST unreal-tournament-strikeforce-1.81.tar.bz2 42039142 BLAKE2B 660e760453b889df05fc4d75e8e7fe0ee701a9707a5cc458511566b0bec4b99b8c41604757a1e97fccaa05a2a014e3f704ac797536dea82692676764e18572ba SHA512 ec5a755e2771f879553970d565391268c152aa3fe14cefccfea8582108dd87687176712e548bd3457328e2bc9f831714a41fb4834abdad2b04d83db0b3fc64a2
-EBUILD unreal-tournament-strikeforce-1.81.ebuild 1170 BLAKE2B e319dbdfb027924d87cb3bbc27621c8cf0d8e81b0f3dd44200d63939343de8e66c7281b90e42c396b1ac185ec609658491f33bbc29f88fd22be084003965a32a SHA512 58b65b4c33cc9c60de34c9d5b7fdc88d8dcd0a28521b7e515a244e75c6822826eaadf15a73fca402c2cef7bdbda93f8e1dbfafc935df86c0b0281ab42acb2283
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/unreal-tournament-strikeforce/metadata.xml b/games-fps/unreal-tournament-strikeforce/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/unreal-tournament-strikeforce/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild b/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
deleted file mode 100644
index 34337e207484..000000000000
--- a/games-fps/unreal-tournament-strikeforce/unreal-tournament-strikeforce-1.81.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_PV=${PV/./}
-DESCRIPTION="A UT addon where you fight terrorists as part of an elite strikeforce"
-HOMEPAGE="http://www.strike-force.com/"
-#http://strikeforce.redconcepts.net:8888/sf_180_server_files.tar.gz
-SRC_URI="mirror://gentoo/sf_180_server_files.tar.gz
-	mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/sf180lnx.zip"
-#http://www.hut.fi/~kalyytik/sf/linux-sf.html
-
-LICENSE="unreal-tournament-strikeforce"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="bindist"
-
-RDEPEND="|| (
-		games-fps/unreal-tournament
-		games-fps/unreal-tournament-goty
-	)"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack sf_180_server_files.tar.gz
-	unpack ${P}.tar.bz2
-	unpack sf180lnx.zip
-	mv "README - sf orm mappack.txt" Strikeforce/SFDoc/ || die
-	rm -rf Help/OpenGL\ Alternate || die
-	rm System/*.{dll,lnk,exe} System/ServerAdds.zip || die
-	rm Strikeforce/SF_System/*.bat || die
-	find -type f -exec chmod a-x '{}' + || die
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/unreal-tournament
-	dodir "${dir}"
-	mv * "${D}/${dir}/" || die
-	prepgamesdirs
-}
diff --git a/games-fps/unreal-tournament/Manifest b/games-fps/unreal-tournament/Manifest
deleted file mode 100644
index 3fe2e03eef82..000000000000
--- a/games-fps/unreal-tournament/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST UTPGPatch451.tar.bz2 3064473 BLAKE2B 43fd1573f714b59d7069b8fbd30bd822024971277dd863793a3f2c05d1a973904fd9ef6f22f8efcec0389cdb36ec6abb6c8f3eb5b700eba29aa6b5284d433cb4 SHA512 d11ecb3e60e8bba0288be0a4860acb563c277e75ce30a749de04673219d484b7a8c7e6207bc582872df33db684658dc1a15235b9d79ceb98fcd2ad1410982423
-DIST ut-install-436.run 6225010 BLAKE2B 107a4991db59e1ff800bf2a1e002f0e56f5415b14a936ced149ace57c5359f10b75d0c2506e5fe40dfb2ca28b068cf225b35dda5fae0af84864df4edb560e05a SHA512 cfdeb9f345daef4b81acadfa24d711477ba208dffd50716087d034df2dc1eb0ac5bb03570f4f1701b3c4d46b8f954e6d23dde36fc20dafdc114e68730a1fc932
-EBUILD unreal-tournament-451.ebuild 3677 BLAKE2B dce626054b14a503f585366d9190d955c2c9f9c128c9f884b58516ce14dbd924697bdac516f4557d8995d37ed75737e08525d325fb1976e9a28f93459b85f35a SHA512 c359b3a8219463a984a534b0458ab27cb0f81ba4d27819c8a71f0bacea81b9b3bf566a718f7b0feefb8ab159b9f5a3b0e979e54bfb8158b2ae6ce6e1063a9cb8
-MISC metadata.xml 1596 BLAKE2B a6b8460fe469bfef5c7a56526d5387532de532da41eb57c06b20b6319bdf4c5c28596f86c151f27a8f9bcb76a7d74019371b8be2d26f0b7802c92bdd4f575953 SHA512 d9250b157b97a1f21aa905fae2ef62e2b06573e7cb168835ae904278e41e7103166d817a2ce266b8969b912c156685c1b6e6e0b976a7c933f6811e8b9ec20270
diff --git a/games-fps/unreal-tournament/metadata.xml b/games-fps/unreal-tournament/metadata.xml
deleted file mode 100644
index d6fc95339e12..000000000000
--- a/games-fps/unreal-tournament/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-In the single player mode, the player squares off 
-against computer controlled Bots in all the game modes 
-through a tournament ladder with increasing difficulty. 
-Thanks to Epic's unmatched AI coding wizardry, Unreal 
-Tournament's Bots are more life like than any 
-computer-controlled characters to date. They understand 
-each game's unique rules. They have a firm handle on all 
-the different weapons at their disposal and how best to 
-use them. They can swim, use elevators, climb stairs, 
-and put on Toxin suits if they have to. If they're on 
-the player's team, they can take orders to attack, 
-defend or freelance.
-
-Unreal Tournament's bread and butter is the online multiplayer 
-mode. Squaring off against other combatants from around the world, or on 
-the other end of a LAN connection, provides some of the most thrilling and 
-tense battles seen on a PC. Unreal Tournament's unparalleled networking 
-code makes it as easy to play the game against anyone, anytime. If the 
-host server has unique content -- like custom skins or maps -- UT 
-will automatically download and install that content in REAL TIME, as the 
-game is connecting. And thanks to Epic Games' amazing work on Unreal 
-Tournament's network play, you can be sure that even a 33.6K modem can get 
-a silky smooth connection to the server.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/unreal-tournament/unreal-tournament-451.ebuild b/games-fps/unreal-tournament/unreal-tournament-451.ebuild
deleted file mode 100644
index d5b0e7f88342..000000000000
--- a/games-fps/unreal-tournament/unreal-tournament-451.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Futuristic FPS"
-HOMEPAGE="http://www.oldunreal.com/"
-SRC_URI="http://www.ut-files.com/Patches/ut-install-436.run
-	http://www.ut-files.com/Patches/utpgpatch${PV}.tar.bz2 -> UTPGPatch${PV}.tar.bz2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="3dfx opengl"
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	opengl? ( virtual/opengl[abi_x86_32(-)] )
-"
-DEPEND="${RDEPEND}
-	!games-fps/unreal-tournament-goty
-"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cdrom_get_cds System/
-	unpack_makeself ut-install-436.run
-	mkdir UTPG && cd UTPG
-	unpack UTPGPatch${PV}.tar.bz2
-	rm checkfiles.sh patch.md5
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	local Ddir=${D}/${dir}
-	dodir "${dir}"
-
-	# Help, Logs, Music, Textures, Web
-	cp -rf "${CDROM_ROOT}"/{Help,Logs,Music,Textures,Web} "${Ddir}/" || die "copy Help, Logs, Music, Textures, Web"
-	tar -zxf Credits.tar.gz -C "${Ddir}" || die "extract credits texture"
-	# NetGamesUSA.com
-	tar -zxf NetGamesUSA.com.tar.gz -C "${Ddir}/" || die "extract NetGamesUSA.com"
-	# Sounds
-	dodir "${dir}"/Sounds
-	cp -rf "${CDROM_ROOT}"/Sounds/*.uax "${Ddir}"/Sounds/ || die "copy Sounds"
-
-	# System
-	if use 3dfx ; then
-		tar -zxf Glide.ini.tar.gz -C "${Ddir}" || die "install Glide ini"
-	else
-		tar -zxf OpenGL.ini.tar.gz -C "${Ddir}" || die "install OpenGL ini"
-	fi
-	tar -zxf data.tar.gz -C "${Ddir}" || die "extract System data"
-	cp "${CDROM_ROOT}"/System/*.u "${Ddir}"/System/ || die "copy System data"
-
-	# the most important things, ucc & ut :)
-	exeinto "${dir}"
-	doexe bin/x86/{ucc,ut} || die "install ucc/ut"
-	sed -i -e "s:\`FindPath \$0\`:${dir}:" "${ED}/${dir}"/ucc || die
-
-	# install a few random files
-	insinto "${dir}"
-	doins README icon.{bmp,xpm} || die "installing random files"
-
-	# install a menu item (closes bug #27542)
-	newicon icon.xpm ut.xpm
-	make_desktop_entry ut "Unreal Tournament" ut
-
-	# first apply any patch remaints loki has for us
-	cd setup.data
-	./bin/Linux/x86/loki_patch patch.dat "${Ddir}" >& /dev/null
-	cd "${S}"
-
-	# finally, unleash the UTPG patch
-	cp -rf UTPG/* "${Ddir}/"
-	# fix a small bug until next official release
-	sed -i -e "/^LoadClassMismatch/s:%s.%s:%s:" "${ED}/${dir}"/System/Core.int || die
-
-	# now we uncompress the maps (GOTY edition installs maps as .uz)
-	einfo "Uncompressing Maps ... this may take some time"
-	dodir "${dir}"/Maps
-	cd "${Ddir}"
-	export HOME=${T}
-	export UT_DATA_PATH=${Ddir}/System
-	for f in $(find "${CDROM_ROOT}"/Maps/ -name '*.uz' -printf '%f ') ; do
-		./ucc decompress "${CDROM_ROOT}"/Maps/"${f}" -nohomedir || die "uncompressing map ${f}"
-		mv "System/${f:0:${#f}-3}" Maps/ || die "copy map ${f}"
-	done
-	cp -rf "${CDROM_ROOT}"/Maps/*.unr "${Ddir}"/Maps/ # some cd's have uncompressed maps ??
-
-	# 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 '{}' +
-
-	# export some symlinks so ppl can run
-	dodir "${GAMES_BINDIR}"
-	dosym "${dir}/ut" "${GAMES_BINDIR}/ut"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "You might want to install the bonus packs too."
-	elog "Many servers on the internet use them, and the"
-	elog "majority of players do too."
-	elog
-	elog "Just run: emerge unreal-tournament-bonuspacks"
-	echo
-}
diff --git a/games-fps/unreal/Manifest b/games-fps/unreal/Manifest
deleted file mode 100644
index fe23ac1cea90..000000000000
--- a/games-fps/unreal/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX unreal 53 BLAKE2B da95fd3d009a468bed4eb4e26bfc182e92b7d63067df309ee7a69f5a132a46f74335b3ca3ca20dff0902a3a32ec38eb993b55496d0204912397afff41e16faae SHA512 0728ca1599fb289812c99d45801cf0566e9651ecefdd4fe10252e6bde3bc035e7cf1294e34056e35b851dcb0f3826907ffaea60b974f61ce75660d144d5955ce
-DIST IpDrv-436-Linux-08-20-02.zip 105435 BLAKE2B 3b0c960513f3bfdaa5394148978f1258b54cedec0722890fd1d89a81b7c809a9d837f6da0e147f1566ee253ed6fd0c7692d043e50ddd383d99245f7aec3df759 SHA512 5f10152b87cf702225fe50d213f3fbd4865cb2f190e0c2c87c996420c115e5f84de7748af635705b8a2ea789bfeaaab4b927364563a4b83f973dcb5af866ccd7
-DIST unreali-install.run 4118594 BLAKE2B 6c105e0901882b1a04cc7983eaeb60dbe50379579a177d3ccd78f1fafda9c1ed4ab603006f0dfc4faaad4f425ec3f242bd28c09bb91e4a1f07a2dd5ab702cf1a SHA512 9b918fec89de0bb273a2c351dbaccfe32eaaaf9c5ba012ddaf38c1e8617d7c6b8a08c9ac04135105bea89f4127f7f64f52c8d2c00a00e9418f4807fc1f3aff7b
-DIST ut-install-436.run 6225010 BLAKE2B 107a4991db59e1ff800bf2a1e002f0e56f5415b14a936ced149ace57c5359f10b75d0c2506e5fe40dfb2ca28b068cf225b35dda5fae0af84864df4edb560e05a SHA512 cfdeb9f345daef4b81acadfa24d711477ba208dffd50716087d034df2dc1eb0ac5bb03570f4f1701b3c4d46b8f954e6d23dde36fc20dafdc114e68730a1fc932
-EBUILD unreal-226.ebuild 2194 BLAKE2B 6863c259080438a133a86d81fc5e523bdf1123d77b4703420adabaf4803fb8fb9cc57409dfc1d92931e97fcf712f0fd499c617476fe3ff4c756d5a1e0ada82a0 SHA512 fc4dc6962c0b7779fc9dd0bb1dff2fa3e2f0a4d23b2c632a60e32a6e2a907a6e05fe887e4a1745f99385782152a10eeaf7ab852ed92e6bae38cf6b3bf6940125
-MISC metadata.xml 1029 BLAKE2B 66573c17f1f7598f72cf8fae650d16e05dcaeb082e99b7ecbc220bf765cafd2b4e45ead9f0c36d33989a6efedab7bf20e1b851e582de1f63b5733565e430893d SHA512 2a8b13fb3eb26a76f6f9bd0da9d186e05d10ad24112bc74d8b1494768e3360ea6059453e1fe1645df03f8f793f9a6ff695e5754117ecb90054279c960039de95
diff --git a/games-fps/unreal/files/unreal b/games-fps/unreal/files/unreal
deleted file mode 100644
index 7bbeb753fbe9..000000000000
--- a/games-fps/unreal/files/unreal
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./UnrealTournament "$@"
diff --git a/games-fps/unreal/metadata.xml b/games-fps/unreal/metadata.xml
deleted file mode 100644
index 6a1fcf4b013c..000000000000
--- a/games-fps/unreal/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-In Unreal, players take on the role of a criminal whose transfer ship 
-has crashed on the mysterious planet Gryphon, where a peaceful race 
-known as the Nali have been hunted and enslaved by bloodthirsty aliens 
-called Skaarj. To dominate Gryphon and mine its precious Tarydium, the 
-Skaarj command legions of other menacing species like the gigantic 
-Titans, the bio-engineered Brutes and the pack-hunting Krall. Unreal 
-combatants must survive in the midst of this inter-species warfare 
-armed with an array of deadly weapons. Players will visit ancient Nali 
-ruins, underground mines, cities in the sky, spacecraft wreckage and 
-even the mysterious Skaarj Mothership in this deadly hunt in which 
-every character is both predator and prey.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/unreal/unreal-226.ebuild b/games-fps/unreal/unreal-226.ebuild
deleted file mode 100644
index 81318a0aa9f4..000000000000
--- a/games-fps/unreal/unreal-226.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Futuristic FPS (a hack that runs on top of Unreal Tournament)"
-HOMEPAGE="http://www.unreal.com/ http://icculus.org/~chunky/ut/unreal/"
-SRC_URI="http://www.icculus.org/%7Echunky/ut/unreal/unreali-install.run
-	ftp://ftp.lokigames.com/pub/patches/ut/ut-install-436.run
-	ftp://ftp.lokigames.com/pub/patches/ut/IpDrv-436-Linux-08-20-02.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="X opengl"
-RESTRICT="mirror bindist"
-
-DEPEND="sys-libs/lib-compat
-	app-arch/unzip
-"
-RDEPEND="
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	opengl? ( virtual/opengl[abi_x86_32(-)] )
-"
-
-S=${WORKDIR}
-
-src_unpack() {
-	export CDROM_NAME_1="Unreal CD"
-	export CDROM_NAME_2="Unreal Tournament CD"
-	cdrom_get_cds System/Unreal.ini System/UnrealTournament.ini
-	unpack_makeself unreali-install.run
-	mkdir ut
-	cd ut
-	unpack_makeself ut-install-436.run
-	unpack IpDrv-436-Linux-08-20-02.zip
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/unreal
-	dodir "${dir}"
-
-	tar -zxf ut/data.tar.gz -C "${D}/${dir}"
-	tar -zxf ut/OpenGL.ini.tar.gz -C "${D}/${dir}"
-	tar -zxf System.tar.gz -C "${D}/${dir}"
-	insinto "${dir}"/System
-	doins ut/IpDrv.so
-
-	cp -rf "${CDROM_ROOT}"/{Maps,Music,Sounds} "${D}/${dir}/"
-	for f in "${D}/${dir}"/Maps/Dm*.unr ; do
-		mv "${f}" "${f/Dm/DM-}"
-	done
-	dosym Maps "${dir}"/maps
-
-	if has_version '<games-fps/unreal-tournament-451' \
-		|| has_version '<games-fps/unreal-tournament-goty-451' ; then
-		CDROM_ROOT="${GAMES_PREFIX_OPT}/unreal-tournament"
-	else
-		cdrom_load_next_cd
-	fi
-	insinto "${dir}"/Textures
-	doins "${CDROM_ROOT}"/Textures/*.utx
-	insinto "${dir}"/Sounds
-	doins "${CDROM_ROOT}"/Sounds/*.uax
-	insinto "${dir}"/System
-	doins "${CDROM_ROOT}"/System/*.u
-	insinto "${dir}"/Music
-	doins "${CDROM_ROOT}"/Music/*.umx
-
-	insinto "${dir}"
-	doins icon.* README*
-
-	exeinto "${dir}"
-	doexe bin/x86/unreal
-
-	games_make_wrapper unreal ./unreal "${dir}" "${dir}"
-
-	prepgamesdirs
-}
diff --git a/games-fps/urbanterror-4.3.4_p20180627 b/games-fps/urbanterror-4.3.4_p20180627
new file mode 100644
index 000000000000..08ee23e19457
--- /dev/null
+++ b/games-fps/urbanterror-4.3.4_p20180627
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm pretend
+DEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
+DESCRIPTION=Hollywood tactical shooter based on the ioquake3 engine
+EAPI=6
+HOMEPAGE=https://urbanterror.info https://github.com/mickael9/ioq3
+IUSE=+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=client? ( media-libs/libsdl2:=[X,sound,joystick,opengl,video] mumble? ( media-sound/mumble:= ) openal? ( media-libs/openal:= ) opus? ( media-libs/opusfile:= ) vorbis? ( media-libs/libvorbis:= ) ) curl? ( net-misc/curl ) ~games-fps/urbanterror-data-4.3.4 sys-libs/zlib:=[minizip] virtual/jpeg:0
+REQUIRED_USE=|| ( client server ) voip? ( opus )
+SLOT=0
+SRC_URI=https://github.com/mickael9/ioq3/archive/e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64.tar.gz -> urbanterror-4.3.4_p20180627.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79e7cf19aff009c8eb61bec007ad93e8
diff --git a/games-fps/urbanterror-data-4.3.4 b/games-fps/urbanterror-data-4.3.4
new file mode 100644
index 000000000000..688e1ac20db9
--- /dev/null
+++ b/games-fps/urbanterror-data-4.3.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare pretend setup
+DEPEND=app-arch/unzip
+DESCRIPTION=Data files for UrbanTerror
+EAPI=6
+HOMEPAGE=http://www.urbanterror.info
+KEYWORDS=~amd64 ~x86
+LICENSE=Q3AEULA-20000111 urbanterror-4.2-maps
+SLOT=0
+SRC_URI=https://up.barbatos.fr/urt/UrbanTerror43_full_2.zip -> urbanterror-data-4.3.0.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.0-to-4.3.1.zip -> urbanterror-data-4.3.0-to-4.3.1.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.1-to-4.3.2.zip -> urbanterror-data-4.3.1-to-4.3.2.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.2-to-4.3.3.zip -> urbanterror-data-4.3.2-to-4.3.3.zip https://up.barbatos.fr/urt/UrbanTerror-4.3.3-to-4.3.4.zip -> urbanterror-data-4.3.3-to-4.3.4.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=78966198a7d0177aac2105c55318c366
diff --git a/games-fps/urbanterror-data/Manifest b/games-fps/urbanterror-data/Manifest
deleted file mode 100644
index 908b7f561cfa..000000000000
--- a/games-fps/urbanterror-data/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST urbanterror-data-4.3.0-to-4.3.1.zip 7495315 BLAKE2B a4562c81169274e6f7685c9ca771c0e004ec40aa123d0757794e89c019bbd6e280f22e0929dc6917b0a43d9fe6e6ea90a4f190ce01ff2e6be087299a9bb64cab SHA512 f05564babadff73793778926411bc7914bfef4a5f7dfc1003c36e8a549c568ab520adcff8a38e7dd905238738d242aa865e7c6d7db36ed6d592b144e497ed823
-DIST urbanterror-data-4.3.0.zip 1490106979 BLAKE2B 2bee5e869b3929564cdba268765f6fda67ec1e4fb55209cac3f7b51b418bba287ba22112e5cd4db8ff2aae81ac836a31640760b1e4b24440054f2b2ee4d7e3c3 SHA512 2f54b59355f790a65b3dbd205e9e8b30d41856f5010a55e9e1436a6ec78e986ceecf78c8d84fac1060702c38a7df849f78a2832bdccb91ea46444877635b32ea
-DIST urbanterror-data-4.3.1-to-4.3.2.zip 15305498 BLAKE2B d3b21c893dc6f5ce2323ca383ff52c1f6711ba57ab752c30d8fbb76b5d72125427a14fc30127589c5612df34cfda869a0727a838006fd6fc566005a54b7e741d SHA512 cb24939fffef9310c6ca8496d0d4f3be8656685e749ff1d6589fd193990be67ac70494b61ef6a12dd1f6995a78d451b9f09098e03970e82e1e3153ec3f89792c
-DIST urbanterror-data-4.3.2-to-4.3.3.zip 10409736 BLAKE2B edc33e959cd16528ef732ae31335412c7c7741ccc5f106d2c0c6236f180cf9fd9b14a23b5e4a60d91aa9b8c4126fae5f110034216d5d2ae63ab784fc16532730 SHA512 f2100bf11b5dc0dac265f43fe6c8aa0a1e604728ce02b5b6ca770c9145d11bf02a7e2118ff818d1fdb2b9693ddb85eb012814f346337ef14c58c3a4f3e3abb90
-DIST urbanterror-data-4.3.3-to-4.3.4.zip 10421275 BLAKE2B 95ad6f395fef538fcb5e0413070fda7752759244d968649b0f59d2d9060cd79645a5485c554f2afc74028b7664dc907183ab99274db96826c00169ef5235c577 SHA512 05e14a1411a606fc7aeec3fa6393227af87afcf1ddd5ed5210c6612a9a1c15e0c4f9e14c40d43c078ac3fdbf519e9e8cb7d7a7983b7fceb39d11222d14ed39d6
-EBUILD urbanterror-data-4.3.4.ebuild 1653 BLAKE2B d20d9cc4c54cdf472141a3921a8c36cca785ff6634dcde49e6edbff5cb437a7122b19db6b46561f0df8c1bfc07a58fd12d6bf8fa5e2abf19638574e27ebdf6fb SHA512 e1583cdc80d7fb824234b85b0a12661cc5fe256c59547b89fb35e8742bc35dc6915457cd3b89df84ddbf375172994200aceffc4e4f8bc561baf8c448f2257a5b
-MISC metadata.xml 480 BLAKE2B 8a3fd7bc4b93959b7d499e9454896285f8bfa4e1abeccf08b3d419f278d51a1e708fbc261d69fd42964e2ac04b5c008a1b22d2f6ad3e275e762c9ace799bc8b7 SHA512 94c46a1dffab072012fbdda9831db4ed465561866d5f3c7ba01045ef6424780f690bfdf381dd32664f1237b65828fefa1199cae98c5fd23757ceda76142ef5a9
diff --git a/games-fps/urbanterror-data/metadata.xml b/games-fps/urbanterror-data/metadata.xml
deleted file mode 100644
index 866bc44b9828..000000000000
--- a/games-fps/urbanterror-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>holgersson@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild b/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
deleted file mode 100644
index 0fbf35551184..000000000000
--- a/games-fps/urbanterror-data/urbanterror-data-4.3.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit check-reqs eutils
-
-ENGINE_PV=${PV}
-
-MY_PN=UrbanTerror
-MY_PV=43_full
-
-DESCRIPTION="Data files for UrbanTerror"
-HOMEPAGE="http://www.urbanterror.info"
-
-# load the base image and save it as .0 file
-# use 43_full-2.zip as upstream fixed something back then
-SRC_URI="https://up.barbatos.fr/urt/${MY_PN}${MY_PV}_2.zip -> ${PN}-4.3.0.zip"
-
-# fetch updates recursively for |4.3.x-4.3.0|
-if [[ "${PV}" != "4.3.0" ]]; then
-	MY_CTR=0
-	while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-		SRC_URI="${SRC_URI} https://up.barbatos.fr/urt/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip -> ${PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 )).zip"
-		MY_CTR=$(( ${MY_CTR} + 1 ))
-	done
-fi
-unset MY_CTR
-
-LICENSE="Q3AEULA-20000111 urbanterror-4.2-maps"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${MY_PN}43"
-
-CHECKREQS_DISK_BUILD="3300M"
-CHECKREQS_DISK_USR="1400M"
-
-src_prepare() {
-	default
-
-	# apply updates we fetched before
-	# again recursively for |4.3.x - 4.3.0|
-	local MY_CTR
-	if [[ "${PV}" != "4.3.0" ]]; then
-		MY_CTR=0
-		while [[ "${MY_CTR}" -lt "${PV/4.3./}" ]]; do
-			cp -dfpr \
-				"${WORKDIR}"/${MY_PN}-4.3.${MY_CTR}-to-4.3.$(( ${MY_CTR} + 1 ))/* "${S}"
-			MY_CTR=$(( ${MY_CTR} + 1 ))
-		done
-	fi
-}
-
-src_install() {
-	insinto /usr/share/urbanterror/q3ut4
-	doins q3ut4/*.pk3
-	# These files are *essential* for startup
-	newins q3ut4/server_example.cfg server.cfg
-	newins q3ut4/autoexec_example.cfg autoexec.cfg
-
-	dodoc q3ut4/readme43.txt
-	docinto examples
-	dodoc q3ut4/{server_example.cfg,mapcycle_example.txt}
-}
diff --git a/games-fps/urbanterror/Manifest b/games-fps/urbanterror/Manifest
deleted file mode 100644
index d2cc4f1ff165..000000000000
--- a/games-fps/urbanterror/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX urbanterror-4.3-fix-build_system.patch 2774 BLAKE2B d750fab8dcf67e6ac37d6b9e44abf3c7961320bbd51093b198d31e470396dc415219b09ac910a7938a557b6af4d9df39bb7f35cf5e90bb56f97cd334b584db4c SHA512 90d06ee5bb77e13e34923f446c0e8e90fdef5628c6199a4f9508336aa0bb30c0ab273ac794a8eb483c2534e64bf81f76ef449ed90000314f227d39de572809f2
-AUX urbanterror-4.3.3_p20180218-fix-loop.patch 1442 BLAKE2B 045a018bb3476f94b471f62ccf3bacce2b68523de235698b47f2e98979f3a1284b826e9dc74f4fd225ba930057df6d9bed599872568330952fa4ffe0389e2563 SHA512 7a31cded5b99fda6f4c92f5d1ce9ef7606dc87f08a70efc3aea970e6a870e22aeb0a772f63a11d151cd227f68803e028b2f5adee381d8f65c523c585a474b53c
-DIST urbanterror-4.3.4_p20180627.tar.gz 10069715 BLAKE2B 179a952d51448af39636560e71c33dba8491fa195dd29d149f3d87d11ca2efff9a50041cdb585df9944361cfef8ac2b9efd2967cb6ffeeceb553fbc6aa17b218 SHA512 8eb314143fb336ff32d5b4a97075e54d5577570f1193c2220648ba7866373c8aa158015efebcb8325ade7964f4622baff8a30d89e889f64141d748bba28712ef
-EBUILD urbanterror-4.3.4_p20180627.ebuild 4525 BLAKE2B 66031a89f019f983363ad4d19f2cdaa6a28040234785ff2c873384bfa64070c51c037764f6158dd95d5c046e0b7c820afdf412119c99666bfc5ff64b348189cf SHA512 f67174fe11786d9dca773548c39fed04aa7ec2744d9f9887261253e52fdfa1ac2b03cb1dcc863db59819b87a2a3f055d2b0dd50bdccfc0dbe668df130ec3c52b
-MISC metadata.xml 1109 BLAKE2B 9e9f6a21667badafad0c007a2694a50ceaa467ce28fdc9b3f8838d58dd201f56b0b08c78d3285dfd53dd14db6c5ab26461cb400308abc920ce234048fdc48f8b SHA512 cb55a92c3c03065a17f71e5cfc8151a8c12acbc341389a14f96119960eb23c11613adaa8e9b552946d2db728121118a5130447c892d61a1a909b4dd8b94a5dcc
diff --git a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch b/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
deleted file mode 100644
index e0c4eb27f539..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3-fix-build_system.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Author: Nils Freydank <holgersson@posteo.de>
-Date:   Fri Nov 17 20:30:00 2017 +0100
-
-Respect CFLAGS, CPPFLAGS etc. This patch is inspired
-by hasufell’s patch.
-
-Edit 2018-03-19: Now with server support!
-
---- a/Makefile	2018-03-19 11:00:00.000000000 +0100
-+++ b/Makefile	2018-03-19 11:00:00.000000001 +0100
-@@ -223,7 +223,7 @@
- ifndef USE_ALTGAMMA
-   # Clearskies - X11-based gamma for Linux
-   USE_ALTGAMMA=1
--endif
-+  endif
- 
- ifndef USE_SKEETMOD
-   USE_SKEETMOD=0
-@@ -306,34 +306,33 @@
- CLIENT_EXTRA_FILES=
- 
- ifneq (,$(findstring "$(PLATFORM)", "linux" "gnu_kfreebsd" "kfreebsd-gnu" "gnu"))
--  BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \
--    -pipe -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-+  BASE_CFLAGS = -DUSE_ICON -DARCH_STRING=\\\"$(ARCH)\\\"
-   CLIENT_CFLAGS += $(SDL_CFLAGS)
- 
--  OPTIMIZEVM = -O3
--  OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+  OPTIMIZEVM =
-+  OPTIMIZE = $(OPTIMIZEVM)
- 
-   ifeq ($(ARCH),x86_64)
--    OPTIMIZEVM = -O3
--    OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+    OPTIMIZEVM =
-+    OPTIMIZE = $(OPTIMIZEVM)
-     HAVE_VM_COMPILED = true
-   else
-   ifeq ($(ARCH),x86)
--    OPTIMIZEVM = -O3 -march=i586
--    OPTIMIZE = $(OPTIMIZEVM) -ffast-math
-+    OPTIMIZEVM =
-+    OPTIMIZE = $(OPTIMIZEVM)
-     HAVE_VM_COMPILED=true
-   else
-   ifeq ($(ARCH),ppc)
--    BASE_CFLAGS += -maltivec
-+    BASE_CFLAGS +=
-     HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),ppc64)
--    BASE_CFLAGS += -maltivec
-+    BASE_CFLAGS +=
-     HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),sparc)
--    OPTIMIZE += -mtune=ultrasparc3 -mv8plus
--    OPTIMIZEVM += -mtune=ultrasparc3 -mv8plus
-+    OPTIMIZE +=
-+    OPTIMIZEVM +=
-     HAVE_VM_COMPILED=true
-   endif
-   ifeq ($(ARCH),armv7l)
-@@ -1130,12 +1129,12 @@
- 
- define DO_CC
- $(echo_cmd) "CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_REF_CC
- $(echo_cmd) "REF_CC $<"
--$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(SHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(CLIENT_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_REF_STR
-@@ -1148,7 +1147,7 @@
- 
- define DO_BOT_CC
- $(echo_cmd) "BOT_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) $(CFLAGS) $(CPPFLAGS) $(BOTCFLAGS) $(OPTIMIZE) -DBOTLIB -o $@ -c $<
- endef
- 
- ifeq ($(GENERATE_DEPENDENCIES),1)
-@@ -1162,7 +1161,7 @@
- 
- define DO_DED_CC
- $(echo_cmd) "DED_CC $<"
--$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
-+$(Q)$(CC) $(NOTSHLIBCFLAGS) -DDEDICATED $(CFLAGS) $(CPPFLAGS) $(SERVER_CFLAGS) $(OPTIMIZE) -o $@ -c $<
- endef
- 
- define DO_WINDRES
-
diff --git a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch b/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
deleted file mode 100644
index c34ebe84cedf..000000000000
--- a/games-fps/urbanterror/files/urbanterror-4.3.3_p20180218-fix-loop.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Nils Freydank <holgersson@posteo.de>
-Date:   Wed Mar 14 21:00:00 2017 +0100
-
-Imported patch written by Tom Murphy via github.com:
-
-https://github.com/ioquake/ioq3/pull/356
-
-diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c
-index 2c2b595cf..58f178ade 100644
---- a/code/sys/con_tty.c
-+++ b/code/sys/con_tty.c
-@@ -73,20 +73,6 @@ static int hist_current = -1, hist_count = 0;
- #define TTY_CONSOLE_PROMPT "]"
- #endif
- 
--/*
--==================
--CON_FlushIn
--
--Flush stdin, I suspect some terminals are sending a LOT of shit
--FIXME relevant?
--==================
--*/
--static void CON_FlushIn( void )
--{
--	char key;
--	while (read(STDIN_FILENO, &key, 1)!=-1);
--}
--
- /*
- ==================
- CON_Back
-@@ -441,7 +427,7 @@ char *CON_Input( void )
- 										TTY_con = *history;
- 										CON_Show();
- 									}
--									CON_FlushIn();
-+									tcflush(STDIN_FILENO, TCIFLUSH);
- 									return NULL;
- 									break;
- 								case 'B':
-@@ -455,7 +441,7 @@ char *CON_Input( void )
- 										Field_Clear(&TTY_con);
- 									}
- 									CON_Show();
--									CON_FlushIn();
-+									tcflush(STDIN_FILENO, TCIFLUSH);
- 									return NULL;
- 									break;
- 								case 'C':
-@@ -467,7 +453,7 @@ char *CON_Input( void )
- 					}
- 				}
- 				Com_DPrintf("droping ISCTL sequence: %d, TTY_erase: %d\n", key, TTY_erase);
--				CON_FlushIn();
-+				tcflush(STDIN_FILENO, TCIFLUSH);
- 				return NULL;
- 			}
- 			if (TTY_con.cursor >= sizeof(text) - 1)
diff --git a/games-fps/urbanterror/metadata.xml b/games-fps/urbanterror/metadata.xml
deleted file mode 100644
index 38fad51f813c..000000000000
--- a/games-fps/urbanterror/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>holgersson@posteo.de</email>
-		<name>Nils Freydank</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="altgamma">Alternative way for gamma setting with modesetting driver</flag>
-		<flag name="client">Build binary for client (includes code for non-dedicated server)</flag>
-		<flag name="mumble">Use Mumble for ingame VoIP (experimental)</flag>
-		<flag name="opus">Use opus as sound codec</flag>
-		<flag name="server">Build binary for dedicated server</flag>
-		<flag name="skeetshootmod">Build support for skeetshoot mod for specific maps</flag>
-		<flag name="voip">Use ioq3 ingame VoIP (experimental)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">Barbatos/ioq3-for-UrbanTerror-4</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild b/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
deleted file mode 100644
index 04d4459533ea..000000000000
--- a/games-fps/urbanterror/urbanterror-4.3.4_p20180627.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit desktop eapi7-ver flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine"
-HOMEPAGE="https://urbanterror.info https://github.com/mickael9/ioq3"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mickael9/ioq3.git"
-	EGIT_BRANCH="urt"
-else
-	COMMIT_ID="e8c941ec8b753b9ecb4f8c4fcec07e4fe3babc64"
-	SRC_URI="https://github.com/mickael9/ioq3/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/ioq3-${COMMIT_ID}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+altgamma +client +curl debug mumble openal +opus server +skeetshootmod voip vorbis"
-REQUIRED_USE="|| ( client server )
-		voip? ( opus )"
-
-DOCS=( ChangeLog README.md README.ioq3.md md4-readme.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3-fix-build_system.patch
-	"${FILESDIR}"/${PN}-4.3.3_p20180218-fix-loop.patch
-)
-
-RDEPEND="
-	client? (
-		media-libs/libsdl2:=[X,sound,joystick,opengl,video]
-		mumble? ( media-sound/mumble:= )
-		openal? ( media-libs/openal:= )
-		opus? ( media-libs/opusfile:= )
-		vorbis? ( media-libs/libvorbis:= )
-	)
-	curl? ( net-misc/curl )
-	~games-fps/urbanterror-data-4.3.4
-	sys-libs/zlib:=[minizip]
-	virtual/jpeg:0
-"
-
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use client; then
-		if ! use openal && ! use opus && ! use vorbis; then
-			ewarn
-			ewarn "No sound implementation selected. Enable 'openal', 'opus' or 'vorbis' USE flag to get sound!"
-		fi
-	fi
-}
-
-src_configure() {
-	default
-
-	tc-export CC
-}
-
-src_compile() {
-	# Workaround for used zlib macro, which got renamed in Gentoo
-	# wrt bug #449510
-	append-cppflags "-DOF=_Z_OF"
-
-	local myemakeargs=(
-		ARCH=$(usex amd64 "x86_64" "i686" )
-		DEFAULT_BASEDIR="/usr/share/urbanterror"
-		BUILD_CLIENT=$(usex "client" 1 0)
-		BUILD_SERVER=$(usex "server" 1 0)
-		BUILD_BASEGAME=1
-		BUILD_MISSIONPACK=0
-		BUILD_GAME_SO=0
-		BUILD_GAME_QVM=0
-		BUILD_STANDALONE=1
-		SERVERBIN="Quake3-UrT-Ded"
-		CLIENTBIN="Quake3-UrT"
-		USE_RENDERER_DLOPEN=0
-		USE_YACC=0
-		BASEGAME="q3ut4"
-		BASEGAME_CFLAGS="${CFLAGS}"
-		USE_OPENAL=$(usex "openal" 1 0)
-		USE_OPENAL_DLOPEN=$(usex "openal" 1 0)
-		USE_CURL=$(usex "curl" 1 0)
-		USE_CURL_DLOPEN=$(usex "curl" 1 0)
-		USE_CODEC_VORBIS=$(usex "vorbis" 1 0)
-		USE_CODEC_OPUS=$(usex "opus" 1 0)
-		USE_MUMBLE=$(usex "mumble" 1 0)
-		USE_SKEETMOD=$(usex "skeetshootmod" 1 0)
-		USE_VOIP=$(usex "mumble" 1 0)
-		USE_INTERNAL_LIBS=0
-		USE_LOCAL_HEADERS=0
-		USE_ALTGAMMA=$(usex "altgamma" 1 0)
-		$(usex "debug" "debug" "release")
-	)
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	local myarch=$(usex amd64 "x86_64" "i386")
-	local myreleasetype=$(usex debug "debug" "release")
-
-	if use client; then
-		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT.${myarch} ${PN}
-		# Shooter as defined in https://specifications.freedesktop.org/menu-spec/latest/apas02.html
-		make_desktop_entry ${PN} "UrbanTerror" ${PN}
-	fi
-
-	if use server && ! use client; then
-		# dedicated server only
-		newbin build/${myreleasetype}-linux-${myarch}/Quake3-UrT-Ded.${myarch} ${PN}-ded
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && xdg_desktop_database_update
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# ^this is a new installation, so:
-		if use openal; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta s_useopenal \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for openal to work."
-		fi
-
-		if use altgamma; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta r_altgamma \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg for altgamma to work."
-			elog "Be aware that altgamme works on a global scale, so external"
-			elog "applications like redshift can cause trouble. Disabling"
-			elog "these while playing is a usable workaround."
-		fi
-
-		if ! use altgamma; then
-			elog ""
-			elog "If you are using a modesetting graphics driver you might"
-			elog "consider setting USE=\"altgamma\"."
-			elog "For details take a look at:"
-			elog "https://bugs.freedesktop.org/show_bug.cgi?id=27222"
-		fi
-
-		if ! use client; then
-			elog ""
-			elog "You disabled client support. You won't be able to connect"
-			elog "to any servers and play. If you want to do so, enable"
-			elog "USE=\"client\"."
-		fi
-
-		if use skeetshootmod; then
-			elog ""
-			elog "You might need to set:"
-			elog "  seta sv_skeetshoot \"1\""
-			elog "in your ~/.q3a/q3ut4/q3config.cfg to use the skeetshoot mod."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	use client && xdg_desktop_database_update
-}
diff --git a/games-fps/ut2003-2225-r4 b/games-fps/ut2003-2225-r4
new file mode 100644
index 000000000000..77f2baa7b9f8
--- /dev/null
+++ b/games-fps/ut2003-2225-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup unpack
+DESCRIPTION=Sequel to the 1999 Game of the Year multi-player first-person shooter
+EAPI=5
+HOMEPAGE=http://www.unrealtournament2003.com/
+IUSE=dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+RDEPEND=games-fps/ut2003-data dedicated? ( games-server/ut2003-ded ) !dedicated? ( virtual/opengl[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar
+_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_=4dd2599c108058dc908112ce8825ade2
diff --git a/games-fps/ut2003-bonuspack-cm-1 b/games-fps/ut2003-bonuspack-cm-1
new file mode 100644
index 000000000000..0575fcc47219
--- /dev/null
+++ b/games-fps/ut2003-bonuspack-cm-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-fps/ut2003 app-arch/unzip
+DESCRIPTION=Community Bonus Pack for UT2003
+EAPI=5
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2003
+KEYWORDS=~x86
+LICENSE=ut2003
+RDEPEND=games-fps/ut2003 games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=1
+SRC_URI=https://ut.rushbase.net/beyondunreal/mods/cbp2003.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_=30bb1756e3768840371182dd82429c5e
diff --git a/games-fps/ut2003-bonuspack-cm/Manifest b/games-fps/ut2003-bonuspack-cm/Manifest
deleted file mode 100644
index f4483b3d052b..000000000000
--- a/games-fps/ut2003-bonuspack-cm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cbp2003.zip 149198671 BLAKE2B c5f7352b7fb1e0e6a18c99a6212cd5cb4e5e6144988534f91aed93bf33b031d437e86eebf239f0a49fa20b90ca0ded09e912a96b798bc855d527423f2a299ba7 SHA512 92e136c03f1385a28163718cc6ef1c36e46fbad14c74d0f266dfe3d9f4a5093e1bd02dde54e68f70539ba2c4ee163b1e886529f7e734059a85223ab6f853a474
-EBUILD ut2003-bonuspack-cm-1.ebuild 799 BLAKE2B 61040ee3113609c8eae4fa49fa2a9ccf0663d891e38783d7b0af9f2824b30e6dd6a4f77dc1a28b6201c248b654c6ba1c03ad86d76fa687c125de55caf7ef5157 SHA512 8bd64550a6a770e531aa42a7cf41933860ec363d3e278fdaf57d2969ecf4dda135b7ae81e8ab44b83094b4425e64a304f1ca83f4d47df31276d414b51f4e378b
-MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-bonuspack-cm/metadata.xml b/games-fps/ut2003-bonuspack-cm/metadata.xml
deleted file mode 100644
index e716a53e0747..000000000000
--- a/games-fps/ut2003-bonuspack-cm/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild b/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
deleted file mode 100644
index 56ad68474614..000000000000
--- a/games-fps/ut2003-bonuspack-cm/ut2003-bonuspack-cm-1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-IUSE=""
-DESCRIPTION="Community Bonus Pack for UT2003"
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2003"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cbp2003.zip"
-
-LICENSE="ut2003"
-SLOT="1"
-KEYWORDS="~x86"
-RESTRICT="mirror strip"
-
-RDEPEND="games-fps/ut2003"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unzip -qq "${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	for i in Animations Help Music Maps StaticMeshes Textures System
-	do
-		mkdir -p "${Ddir}"/${i} || die
-	done
-	games_umod_unpack CBP2003.ut2mod
-	rm "${Ddir}/Readme.txt" "${Ddir}/cbp installer logo1.bmp"
-	prepgamesdirs
-}
diff --git a/games-fps/ut2003-bonuspack-de-1 b/games-fps/ut2003-bonuspack-de-1
new file mode 100644
index 000000000000..d2b617c4c82a
--- /dev/null
+++ b/games-fps/ut2003-bonuspack-de-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-fps/ut2003 app-arch/unzip
+DESCRIPTION=Digital Extremes Bonus Pack for UT2003
+EAPI=5
+HOMEPAGE=https://www.moddb.com/games/unreal-tournament-2003
+KEYWORDS=~x86
+LICENSE=ut2003
+RDEPEND=games-fps/ut2003 games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=1
+SRC_URI=http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/debonus.ut2mod.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_=1280c87439e76a96c3f6b50e7f5cdb88
diff --git a/games-fps/ut2003-bonuspack-de/Manifest b/games-fps/ut2003-bonuspack-de/Manifest
deleted file mode 100644
index 03b7e7c3b808..000000000000
--- a/games-fps/ut2003-bonuspack-de/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST debonus.ut2mod.zip 74977458 BLAKE2B bd9c91524e1d3b3ac24434c7daedd886044884cbb36b919452e408b73de317cf43b1c18e3f843a0c272652dd40ae7ad2da007d87ea370da23e88ea599c1026ab SHA512 2c70d39eea1ea647d2fbee21dda5b00057b7feb1607a89d86982ac43e6063820aa70c633fbc21c768d1491fec909a06634e0e883aa771be2607b51ab193f0935
-EBUILD ut2003-bonuspack-de-1.ebuild 744 BLAKE2B c7995eef8b98f54ccee81554edcfa61c020ad715a800195c1000916d379b5bcd7807405f4eed87359f4dbd9760809833204fa96340f34d868d909d0c95c84fea SHA512 016eafeed87552d793a1048f07f7e78cbaa077ddfcfbd76c0e51da71b167546e72dabbbe50107b70f3c4d92fb6ce1bde575830549aa682e854830e494da77e84
-MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-bonuspack-de/metadata.xml b/games-fps/ut2003-bonuspack-de/metadata.xml
deleted file mode 100644
index e716a53e0747..000000000000
--- a/games-fps/ut2003-bonuspack-de/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
deleted file mode 100644
index e983511c3272..000000000000
--- a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P="debonus.ut2mod.zip"
-DESCRIPTION="Digital Extremes Bonus Pack for UT2003"
-HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
-SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="games-fps/ut2003"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unzip -qq "${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	mkdir -p "${Ddir}"/{System,Maps,StaticMeshes,Textures,Music,Help} || die
-	games_umod_unpack DEBonus.ut2mod
-	prepgamesdirs
-}
diff --git a/games-fps/ut2003-bonuspack-epic-1 b/games-fps/ut2003-bonuspack-epic-1
new file mode 100644
index 000000000000..0699b1fb43e7
--- /dev/null
+++ b/games-fps/ut2003-bonuspack-epic-1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Epic Bonus Pack for UT2003
+EAPI=5
+HOMEPAGE=https://www.moddb.com/games/unreal-tournament-2003
+KEYWORDS=~x86
+LICENSE=ut2003
+RDEPEND=games-fps/ut2003 games-misc/games-envd
+RESTRICT=strip
+SLOT=1
+SRC_URI=http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/UT2003-epicbonuspackone.exe
+_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_=57b8ff35c90a286f0cb316d8fd6656f1
diff --git a/games-fps/ut2003-bonuspack-epic/Manifest b/games-fps/ut2003-bonuspack-epic/Manifest
deleted file mode 100644
index 43f229037b16..000000000000
--- a/games-fps/ut2003-bonuspack-epic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX epic-installer 925 BLAKE2B 4d86c44875d58a01e4226fc746aba8d3fa44875554c4aa4ed150797a4d157915cf0335420a019f6b9d32689e1f34f774cfd8ee756996d890240ff558d5bf22a9 SHA512 0e49953e28c1be196c67d5d29a5f6ac0f636f1315a18bf883c35c8236b74f4a5aea45693fba013578592bb0601a9eaa734446cfd533af70db9a24371162c2524
-DIST UT2003-epicbonuspackone.exe 156913152 BLAKE2B ea420203dfd7f12a1f790d06875af34073fa30764a7184d6945e97063291100ef4377025afb86fab2038f7a824d60e2c93b991202465864de993456b10638f94 SHA512 26fa06637c6a99704d11b58f5fe54454f8018c6f07b06b6a9a2075d17b9a9fb7d7155298de5502cefa0f07995f4513ce9531863cef8c344996b5e6dd5fbd339d
-EBUILD ut2003-bonuspack-epic-1.ebuild 2504 BLAKE2B 014935b88571701eabfcd1a0ccabc2fa50fe34cd89674ceac244320529045ae9a0794b87a4ff25474f29ec28ca5f6935f9370bf8a19fa5dbd877bac64822376a SHA512 a761a8651258e62193151ff6d6919d975bc40fcf4663f290309c8322166f242f836d69ac1bcd387176f53b18cf202c263f2e82bd80eabf11140604a2b2d7c8c0
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2003-bonuspack-epic/files/epic-installer b/games-fps/ut2003-bonuspack-epic/files/epic-installer
deleted file mode 100644
index a8c35aa0c751..000000000000
--- a/games-fps/ut2003-bonuspack-epic/files/epic-installer
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-if [[ -d $HOME/.ut2003/System ]] ; then
-	cd "$HOME/.ut2003/System"
-	echo "Editing UT2003.ini in $PWD"
-	cat >> UT2003.ini <<EOT
-
-[Xinterface.Tab_AudioSettings]
-BonusPackInfo[1]=(PackageName="AnnouncerEvil.uax",Description="Evil")
-BonusPackInfo[2]=(PackageName="AnnouncerFemale.uax",Description="Female")
-BonusPackInfo[3]=(PackageName="AnnouncerSexy.uax",Description="Aroused")
-
-EOT
-
-	ed UT2003.ini >/dev/null 2>&1 <<EOT
-/\[xInterface.ExtendedConsole\]
-a
-MusicManagerClassName=OGGPlayer.UT2OGGMenu
-.
-wq
-EOT
-
-	ed UT2003.ini >/dev/null 2>&1 <<EOT
-$
-?EditPackages?
-a
-EditPackages=BonusPack
-EditPackages=SkaarjPack
-EditPackages=SkaarjPack_rc
-.
-wq
-EOT
-
-	ed UT2003.ini >/dev/null 2>&1 <<EOT
-$
-?ServerPackages?
-a
-ServerPackages=BonusPack
-ServerPackages=SkaarjPack
-ServerPackages=SkaarjPack_rc
-.
-wq
-EOT
-
-	echo "Editing User.ini in $PWD"
-	sed 's/^F11=.*$/F11=MusicMenu/g' < User.ini > User.ini~~
-	mv User.ini~~ User.ini
-fi
diff --git a/games-fps/ut2003-bonuspack-epic/metadata.xml b/games-fps/ut2003-bonuspack-epic/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2003-bonuspack-epic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild b/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
deleted file mode 100644
index 00d2d8927eef..000000000000
--- a/games-fps/ut2003-bonuspack-epic/ut2003-bonuspack-epic-1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="Epic Bonus Pack for UT2003"
-HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
-SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/UT2003-epicbonuspackone.exe"
-
-LICENSE="ut2003"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="games-fps/ut2003"
-
-S=${WORKDIR}/UT2003-BonusPack
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unzip -qq "${DISTDIR}"/${A} || die
-	# This is done since the files are the same
-	rm -f "${S}"/Textures/LastManStanding.utx || die
-}
-
-src_install() {
-	insinto "${dir}"/Help
-	newins "${S}"/Help/BonusPackReadme.txt EpicBonusPack.README
-
-	exeinto "${dir}"
-	doexe "${FILESDIR}"/epic-installer
-	dodir "${dir}"/System
-
-	cp -r "${S}"/{Maps,Sounds,StaticMeshes,Textures} "${Ddir}" || die
-	cp "${S}"/System/{*.{det,est,frt,int,itt,kot,tmt,u},User.ini} "${Ddir}"/System || die
-	cp -v "${S}"/System/Manifest.ini "${Ddir}"/System/Manifest.ini.epic || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "You will need to run:"
-	elog "emerge --config =${CATEGORY}/${PF}"
-	elog "to make the necessary changes to the system .ini files."
-	elog
-	elog "Each user whom has already played the game will need to run:"
-	elog " ${dir}/epic-installer"
-	echo
-	elog "to update their configuration files in their home directory."
-	echo
-}
-
-pkg_config() {
-	cd ${dir}/System || die
-	cp Manifest.ini Manifest.ini.pre-epic || die
-	cp ${dir}/System/Manifest.ini.epic Manifest.ini || die
-
-	cp Default.ini Default.ini.pre-epic || die
-	cat >> Default.ini <<EOT
-
-[Xinterface.Tab_AudioSettings]
-BonusPackInfo[1]=(PackageName="AnnouncerEvil.uax",Description="Evil")
-BonusPackInfo[2]=(PackageName="AnnouncerFemale.uax",Description="Female")
-BonusPackInfo[3]=(PackageName="AnnouncerSexy.uax",Description="Aroused")
-
-EOT
-
-	ed Default.ini >/dev/null 2>&1 <<EOT
-/\[xInterface.ExtendedConsole\]
-a
-MusicManagerClassName=OGGPlayer.UT2OGGMenu
-.
-w
-q
-EOT
-
-	ed Default.ini >/dev/null 2>&1 <<EOT
-$
-?EditPackages?
-a
-EditPackages=BonusPack
-EditPackages=SkaarjPack
-EditPackages=SkaarjPack_rc
-.
-w
-q
-EOT
-
-	ed Default.ini >/dev/null 2>&1 <<EOT
-$
-?ServerPackages?
-a
-ServerPackages=BonusPack
-ServerPackages=SkaarjPack
-ServerPackages=SkaarjPack_rc
-.
-w
-q
-EOT
-
-	cp DefUser.ini DefUser.ini.pre-epic || die
-	sed -i 's/^F11=.*$/F11=MusicMenu/g' DefUser.ini || die
-	chown games:games ${dir}/System/*.ini || die
-}
diff --git a/games-fps/ut2003-data-2107 b/games-fps/ut2003-data-2107
new file mode 100644
index 000000000000..825e5d894ac2
--- /dev/null
+++ b/games-fps/ut2003-data-2107
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip games-util/uz2unpack
+DESCRIPTION=Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter
+EAPI=5
+HOMEPAGE=http://www.unrealtournament2003.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+PROPERTIES=interactive
+RDEPEND=games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
+_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_=41fea78d1a305b47e6af75e5cf5ce9d7
diff --git a/games-fps/ut2003-data/Manifest b/games-fps/ut2003-data/Manifest
deleted file mode 100644
index d8c5cfffde7e..000000000000
--- a/games-fps/ut2003-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST UT2003CrashFix.zip 2764 BLAKE2B 697c35a02f447d0d436fc32bebdeafbca55ef644d951e92085c33f7597108625770b76e027f31287cd2ac66607692ff8c908f6971f936a134d58d0effc2586fc SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444
-EBUILD ut2003-data-2107.ebuild 4035 BLAKE2B 74da1f7c3dd392d9d9c7bc4a7123cdb7a0aec4c36aaa9582146f5db4deb20171149475d4434193f089d1bc2888831d401a7749a3e5027f27a0f96a912918116e SHA512 7ccaba13a464a8f17242f564dbed14e6f2345275e8798e5e2779e4167bde30dec7d25df8df0aaf3e471504048aff3aec7f1a8cda3b9e8225c83d2160d6829c9a
-MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-data/metadata.xml b/games-fps/ut2003-data/metadata.xml
deleted file mode 100644
index e716a53e0747..000000000000
--- a/games-fps/ut2003-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/ut2003-data/ut2003-data-2107.ebuild b/games-fps/ut2003-data/ut2003-data-2107.ebuild
deleted file mode 100644
index 933dc8498d89..000000000000
--- a/games-fps/ut2003-data/ut2003-data-2107.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 multi-player first-person shooter"
-HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND=""
-DEPEND="app-arch/unzip
-	games-util/uz2unpack"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-	ewarn "The installed game takes about 2.7GB of space!"
-}
-
-src_unpack() {
-	cdrom_get_cds System/Packages.md5 StaticMeshes/AWHardware.usx.uz2 \
-		Extras/MayaPLE/Maya4PersonalLearningEditionEpic.exe
-	unzip "${DISTDIR}"/UT2003CrashFix.zip || die
-}
-
-src_install() {
-	insinto "${dir}"
-	# Disk 1
-	einfo "Copying files from Disk 1..."
-	doins -r "${CDROM_ROOT}"/{Animations,ForceFeedback,KarmaData,Maps,Sounds,Textures,Web}
-	insinto "${dir}"/System
-	doins -r "${CDROM_ROOT}"/System/{editorres,*.{bmp,dat,det,est,frt,ini,int,itt,md5,u,upl,url}}
-	insinto "${dir}"/Benchmark/Stuff
-	doins -r "${CDROM_ROOT}"/Benchmark/Stuff/*
-	cdrom_load_next_cd
-
-	# Disk 2
-	insinto "${dir}"
-	einfo "Copying files from Disk 2..."
-	doins -r "${CDROM_ROOT}"/{Music,Sounds,StaticMeshes,Textures}
-	cdrom_load_next_cd
-
-	# Disk 3
-	einfo "Copying files from Disk 3..."
-	doins -r "${CDROM_ROOT}"/Sounds
-
-	# TODO: move this to src_unpack, where it belongs
-	unpack_makeself "${CDROM_ROOT}"/linux_installer.sh || die
-	tar xf "${S}"/ut2003lnxbins.tar || die
-
-	# create empty files in Benchmark
-	for j in {CSVs,Logs,Results} ; do
-		mkdir -p "${Ddir}"/Benchmark/${j} || die
-		touch "${Ddir}"/Benchmark/${j}/DO_NOT_DELETE.ME || die
-	done
-
-	# Cleaning up our installation
-	rm "${Ddir}"/System/{Build,Def{ault,User},Manifest,UT2003,User}.ini || die
-	rm -f "${Ddir}"/System/{Core,Engine,Setup,UnrealGame,Window,XGame,XInterface,XWeapons}.{det,est,frt,int,itt,u} || die
-	rm -rf "${Ddir}"/Web/ServerAdmin || die
-	rm -f "${Ddir}"/System/{Editor,Fire,IpDrv,UnrealEd,Vehicles,XEffects,XPickups,XWebAdmin}.u || die
-	rm -f "${Ddir}"/System/{UWeb,XAdmin}.{int,u} || die
-	rm -f "${Ddir}"/System/GamePlay.{det,itt,u} || die
-	rm -f "${Ddir}"/System/XMaps.{det,est} "${Ddir}"/System/Xweapons.itt || die
-	rm -f "${Ddir}"/System/Manifest.int "${Ddir}"/System/Packages.md5 || die
-
-	# install extra help files
-	insinto "${dir}"/Help
-	doins "${S}"/Help/Unreal.bmp
-
-	# install Default and DefUser ini files
-	insinto "${dir}"/System
-	doins "${S}"/System/Def{ault,User}.ini
-
-	# install eula
-	insinto "${dir}"
-	doins "${S}"/eula/License.int
-
-	# copying extra/updater
-	doins -r "${S}"/{extras,updater}
-	rm -f "${Ddir}"/updater/update || die
-
-	# copy libraries
-	exeinto "${dir}"/System
-	doexe "${S}"/System/libSDL-1.2.so.0 || die
-
-	# uncompressing files
-	einfo "Uncompressing files... this may take a while..."
-	for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do
-		games_ut_unpack "${Ddir}"/${j} || die "uncompressing files"
-	done
-
-	# installing documentation/icon
-	dodoc "${S}"/README.linux || die "dodoc README.linux"
-	newicon "${S}"/Unreal.xpm ut2003.xpm || die "copying icon"
-	doins "${S}"/README.linux "${S}"/Unreal.xpm || die "copying readme/icon"
-	# copy ut2003/ucc
-	exeinto "${dir}"
-	doexe "${S}"/bin/ut2003 "${S}"/ucc || die "copying ut2003/ucc"
-
-	# Here we apply DrSiN's crash patch
-	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System
-
-	ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
-$
-?Engine.GameInfo?
-a
-AccessControlClass=crashfix.iaccesscontrolini
-.
-w
-q
-EOT
-
-	# Here we apply fix for bug #54726
-	sed -i -e "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
-		"${Ddir}"/System/Default.ini || 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 '{}' + || die
-
-	prepgamesdirs
-}
diff --git a/games-fps/ut2003-demo-2206-r3 b/games-fps/ut2003-demo-2206-r3
new file mode 100644
index 000000000000..f4b9f9ba1c4b
--- /dev/null
+++ b/games-fps/ut2003-demo-2206-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Demo for the sequel to the 1999 multi-player first-person shooter
+EAPI=5
+HOMEPAGE=http://www.ut2003.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ut2003-demo
+RDEPEND=sys-devel/bc virtual/libstdc++:3.3 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=http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-2206.sh.bin http://download.factoryunreal.com/mirror/UT2003CrashFix.zip https://dev.gentoo.org/~wolf31o2/sources/ut2003-demo/ut2003-demo-misc.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=08e87ed02db549ad455172c0b896f12d
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
deleted file mode 100644
index c90565989ede..000000000000
--- a/games-fps/ut2003-demo/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX benchmark 1180 BLAKE2B d1b909ae5aba80656f777ec53250c004e5b9ceaf9c330ebda057ac2109545daba5c711c85dfe6241292cbd7b0e3325df0c7900b95e6c3b742082ab97404f6b5f SHA512 4da05b170e3b8a983d264c83e094a8084a9a9b9b58c6f7fce30ea7273f625f8e6c03794a519cdaab5cfba64fb4b5047ab73eb3190c6a076a5fde4eb0399c1785
-AUX results.sh 2107 BLAKE2B 97c8a2f835608d99fd2d0382d43088835743dc8f0cd1693a15efa06604e7f370671d0876aff0ec3a0fa4f2b7dc502503cd1fa824850261d39f38dcd7c0ba29b4 SHA512 749ccf70249d848605437da43f99f0fc881ee58edc85535d6ee0bf2bf57c5642a985979d5bc048a64363f711af35cafcd53d438974a13e62f705551ba6ec3d51
-AUX ut2003-demo 692 BLAKE2B c9eef6a5ee06c4c9619ca29c7cdafab5763a3cb63a8b060ac4c2da94935a63aff3276d6045eed24b6152df19bc0aab84db8e5264b6abea8a62289ac7d95280be SHA512 50b927c70865ca808cd060fc1a3e1bc7549f85acdeb18e90343108823db858e3580db5e584cad2e41358e205e4b5375c4deba6990aff4227a9b7e5333dcf51a8
-DIST UT2003CrashFix.zip 2764 BLAKE2B 697c35a02f447d0d436fc32bebdeafbca55ef644d951e92085c33f7597108625770b76e027f31287cd2ac66607692ff8c908f6971f936a134d58d0effc2586fc SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444
-DIST ut2003-demo-misc.tar.bz2 31851 BLAKE2B 585fe83e142fecdce330ae6116d2c3ef94c870e9bfadb8d7e32185bf0880464bf162330da1f0960feef0d6f3eda7ba591565291d7b25f70f9834d4fbb5a41c58 SHA512 9a1e154aac7a8ccd043135e2a617a19203f6942e8e152d06ec8ed1e6877118cfb3ddbeab7ec2617670e26f13c0e394b8b8dbc747688b8b0b244a8c404f33d7f0
-DIST ut2003demo-lnx-2206.sh.bin 137253079 BLAKE2B 9048a6f82e6302c84481989c4ce176fb969eb5c7a86e9d5a8b28060b0e2d139de786b8edbd5080cbf5d49ca9c6114d3f750ed8ad9bcdff6e69841933830538ea SHA512 8018d58999010c17198185838e42f7cbda0f55476f1e6065b4b2957db3652fe9c1af39ba65451565f54d41507413f4e0b1edf2678c9cc7c221f2ca278ec655be
-EBUILD ut2003-demo-2206-r3.ebuild 3553 BLAKE2B f171933b013e60d8420f14a58ed6296e532ad076e3f43929e70a6e3be6282620161986f6a7eeec5cdd90d1d781993de70155d6d8db83c618c2478809809644b6 SHA512 c35fa9c2b8ff0f6b9a8c6e2ebf6e74402ab444f992cc60afe8b2769de094fc307330db721d9a6220a5928ce526046eb2c3caa8ab133600d180b4c5cdac05e244
-MISC metadata.xml 602 BLAKE2B 860e51d942ba4cb4200404571230e2f9b7962a050c57e3c7ae336fa909e183a248c191f4dd0718a564945f5cb02592d578f774e1c50db208639ac02470980799 SHA512 2c956bf66965f83b68bb0c04d79d479ae76af9b7781bca93a1ff7898f02838ee0c1cc72290943be9902dee38096f2b119f95f21e5bed781e8c04f331a60adac2
diff --git a/games-fps/ut2003-demo/files/benchmark b/games-fps/ut2003-demo/files/benchmark
deleted file mode 100644
index 2047897da9ab..000000000000
--- a/games-fps/ut2003-demo/files/benchmark
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-# Originally from linuxforen.de
-# Modified by phoen][x <phoenix@gentoo.org>, Sep/19/2002
-# Modifications, enhancements or bugs? Mail me.
-
-# Tweaks by Daniel Robbins <drobbins@gentoo.org> 25 Feb 2003
-
-STUFF=GAMES_PREFIX_OPT/ut2003-demo/Benchmark/Stuff
-MYPATH=${HOME}/.ut2003/Benchmark
-TEMPLOG=${MYPATH}/benchmark.log
-LOG=${MYPATH}/bench.log
-
-[ -d ${MYPATH} ] || mkdir -p ${MYPATH}
-
-rm -f ${TEMPLOG} ${LOG}
-touch ${TEMPLOG} ${LOG}
-
-date > $LOG
-
-echo ">> Starting benchmark"
-cd GAMES_PREFIX_OPT//ut2003-demo/System
-for BENCH in GAMES_PREFIX_OPT//ut2003-demo/Benchmark/*-*.sh
-do
-	echo "Running ${BENCH} with MinDetail" 
-	${BENCH} -ini=${STUFF}/MinDetail.ini -userini=${STUFF}/MinDetailUser.ini &> /dev/null
-	echo -n "${BENCH} / MinDetail / " >> ${LOG}
-	cat ${TEMPLOG} | tail -n1 >> ${LOG}
-
-	echo "Running ${BENCH} with MaxDetail" 
-	${BENCH} -ini=${STUFF}/MaxDetail.ini -userini=${STUFF}/MaxDetailUser.ini &> /dev/null
-	echo -n "${BENCH} / MaxDetail / " >> ${LOG}
-	cat ${TEMPLOG} | tail -n1 >> ${LOG}
-done
-
-echo ">> Benchmark complete"
-GAMES_PREFIX_OPT/ut2003-demo/Benchmark/results.sh
-echo ">> Use 'ut2003-demo --results' to show these results again (without benchmarking)"
diff --git a/games-fps/ut2003-demo/files/results.sh b/games-fps/ut2003-demo/files/results.sh
deleted file mode 100644
index a74cf909c9ad..000000000000
--- a/games-fps/ut2003-demo/files/results.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-# Written by phoen][x <phoenix@gentoo.org>, Sep/21/2002
-# Modifications, enhancements or bugs?  Contact games@gentoo.org
-
-[[ -z "${1}" ]] \
-	&& FILE="${HOME}/.ut2003/Benchmark/bench.log" \
-	|| FILE="${1}"
-
-CURLINE=0
-
-BM_MIN_SCORE=0
-BM_MIN_COUNT=0
-BM_MAX_SCORE=0
-BM_MAX_COUNT=0
-
-FB_MIN_SCORE=0
-FB_MIN_COUNT=0
-FB_MAX_SCORE=0
-FB_MAX_COUNT=0
-
-while read LINE ; do
-	CURLINE=`expr $CURLINE + 1`
-	if [[ ${CURLINE} -eq 1 ]] ; then
-		echo ">> Results of the UT2003-demo benchmark"
-		echo ">> Created on ${LINE}"
-		continue
-	fi
-
-	set -- ${LINE}
-	TYPE=$(echo $(basename ${1}) | cut -d- -f1)
-	DETAIL=${3}
-	SCORE=${14}
-
-	case ${TYPE} in
-	"botmatch")
-		case ${DETAIL} in 
-		"MinDetail")
-			BM_MIN_SCORE=`echo ${BM_MIN_SCORE} + ${SCORE} | bc`
-			BM_MIN_COUNT=`expr ${BM_MIN_COUNT} + 1`
-			;;
-		"MaxDetail")
-			BM_MAX_SCORE=`echo ${BM_MAX_SCORE} + ${SCORE} | bc`
-			BM_MAX_COUNT=`expr ${BM_MAX_COUNT} + 1`
-			;;
-		esac
-		;;
-	"flyby")
-		case ${DETAIL} in 
-		"MinDetail")
-			FB_MIN_SCORE=`echo ${FB_MIN_SCORE} + ${SCORE} | bc`
-			FB_MIN_COUNT=`expr ${FB_MIN_COUNT} + 1`
-			;;
-		"MaxDetail")
-			FB_MAX_SCORE=`echo ${FB_MAX_SCORE} + ${SCORE} | bc`
-			FB_MAX_COUNT=`expr ${FB_MAX_COUNT} + 1`
-			;;
-		esac
-		;;
-	esac
-done < ${FILE}
-
-BM_MIN_AVG=`echo "scale=6; ${BM_MIN_SCORE} / ${BM_MIN_COUNT}" | bc`
-BM_MAX_AVG=`echo "scale=6; ${BM_MAX_SCORE} / ${BM_MAX_COUNT}" | bc`
-BM_ALL_AVG=`echo "scale=6; (${BM_MIN_SCORE} + ${BM_MAX_SCORE}) / (${BM_MIN_COUNT} + ${BM_MAX_COUNT})" | bc`
-
-FB_MIN_AVG=`echo "scale=6; ${FB_MIN_SCORE} / ${FB_MIN_COUNT}" | bc`
-FB_MAX_AVG=`echo "scale=6; ${FB_MAX_SCORE} / ${FB_MAX_COUNT}" | bc`
-FB_ALL_AVG=`echo "scale=6; (${FB_MIN_SCORE} + ${FB_MAX_SCORE}) / (${FB_MIN_COUNT} + ${FB_MAX_COUNT})" | bc`
-
-echo "
->> Score for Botmatch
-MinDetail: ${BM_MIN_AVG} (${BM_MIN_COUNT} tests)
-MaxDetail: ${BM_MAX_AVG} (${BM_MAX_COUNT} tests)
-Average  : ${BM_ALL_AVG} (`expr ${BM_MIN_COUNT} + ${BM_MAX_COUNT}` tests)
-
->> Score for FlyBy
-MinDetail: ${FB_MIN_AVG} (${FB_MIN_COUNT} tests)
-MaxDetail: ${FB_MAX_AVG} (${FB_MAX_COUNT} tests)
-Average  : ${FB_ALL_AVG} (`expr ${FB_MIN_COUNT} + ${FB_MAX_COUNT}` tests)"
diff --git a/games-fps/ut2003-demo/files/ut2003-demo b/games-fps/ut2003-demo/files/ut2003-demo
deleted file mode 100644
index 56d7e10e6a73..000000000000
--- a/games-fps/ut2003-demo/files/ut2003-demo
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# Written by phoen][x <phoenix@gentoo.org>, Sep/19/2002
-# Modifications, enhancements or bugs? Mail me.
-
-INSTALL="GAMES_PREFIX_OPT//ut2003-demo"
-
-case ${1} in
-    "--results")
-	pushd ${INSTALL}/Benchmark &> /dev/null
-	./results.sh
-	popd &> /dev/null
-	;;
-    "--bench")
-	pushd ${INSTALL}/Benchmark &> /dev/null
-	./benchmark
-	popd &> /dev/null
-	;;
-    "--help")
-	echo "Usage:"
-	echo " ut2003-demo [--bench] || [--results]"
-	echo " Optional parameters, only one at a time."
-	echo "  --bench   : starts ut2003-demo in benchmark mode"
-	echo "  --results : outputs the results of your last benchmark"
-	;;
-    *)
-	pushd ${INSTALL} &> /dev/null
-	./ut2003_demo
-	popd &> /dev/null
-	;;
-esac
diff --git a/games-fps/ut2003-demo/metadata.xml b/games-fps/ut2003-demo/metadata.xml
deleted file mode 100644
index a7cd2290aab2..000000000000
--- a/games-fps/ut2003-demo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is a playable demo of the full commercial version.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
deleted file mode 100644
index 2300c78fa96d..000000000000
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils unpacker games
-
-DESCRIPTION="Demo for the sequel to the 1999 multi-player first-person shooter"
-HOMEPAGE="http://www.ut2003.com/"
-SRC_URI="http://unreal.epicgames.com/linux/ut2003/ut2003demo-lnx-${PV}.sh.bin
-	http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
-	https://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-misc.tar.bz2"
-
-LICENSE="ut2003-demo"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	sys-devel/bc
-	virtual/libstdc++:3.3
-	virtual/opengl[abi_x86_32(-)]
-	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}/*.so ${dir:1}/*-bin ${dir:1}/System/libSDL-1.2.so.0"
-
-src_unpack() {
-	unpack_makeself "${DISTDIR}"/ut2003demo-lnx-${PV}.sh.bin || die
-	unzip "${DISTDIR}"/UT2003CrashFix.zip || die
-	cd "${S}"
-	unpack ./setupstuff.tar.gz || die
-	unpack ./ut2003lnx_demo.tar.bz2 || die
-	unpack ${PN}-misc.tar.bz2 || die
-}
-
-src_install() {
-	einfo "This will take a while ... go get a pizza or something"
-	dodir "${dir}"
-
-	local i
-	for i in Animations Benchmark Help KarmaData Maps Music Sounds \
-	StaticMeshes System Textures Web extras
-	do
-		dodir "${dir}"/${i}
-		cp -pPR "${S}"/${i}/* "${Ddir}"/${i}
-	done
-
-	# Fix the benchmark configurations to use SDL rather than the Windows driver
-	local f
-	for f in MaxDetail.ini MinDetail.ini
-	do
-		sed -i \
-			-e 's/RenderDevice=D3DDrv.D3DRenderDevice/\;RenderDevice=D3DDrv.D3DRenderDevice/' \
-			-e 's/ViewportManager=WinDrv.WindowsClient/\;ViewportManager=WinDrv.WindowsClient/' \
-			-e 's/\;RenderDevice=OpenGLDrv.OpenGLRenderDevice/RenderDevice=OpenGLDrv.OpenGLRenderDevice/' \
-			-e 's/\;ViewportManager=SDLDrv.SDLClient/ViewportManager=SDLDrv.SDLClient/' \
-			"${Ddir}"/Benchmark/Stuff/${f} || die
-	done
-
-	# Have the benchmarks run the nifty wrapper script rather than
-	# ../System/ut2003-bin directly
-	for f in "${Ddir}"/Benchmark/*-*.sh ; do
-		sed -i \
-			-e 's:\.\./System/ut2003-bin:../ut2003_demo:' "${f}" || die
-	done
-
-	# Wrapper and benchmark-scripts
-	dogamesbin "${FILESDIR}"/ut2003-demo
-	exeinto "${dir}"/Benchmark
-	doexe "${FILESDIR}/"{benchmark,results.sh}
-	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-		"${ED}/${GAMES_BINDIR}/${PN}" "${ED}/${dir}"/Benchmark/benchmark || die
-
-	# Here we apply DrSiN's crash patch
-	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System || die
-
-ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
-$
-?Engine.GameInfo?
-a
-AccessControlClass=crashfix.iaccesscontrolini
-.
-w
-q
-EOT
-
-	exeinto "${dir}"
-	insinto "${dir}"
-	doins DemoLicense.int README.linux
-	doexe ucc ut2003_demo
-	newicon Unreal.xpm ut2003-demo.xpm
-	make_desktop_entry ut2003-demo "Unreal Tournament 2003 (Demo)" ${PN}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "You can run benchmarks by typing 'ut2003-demo --bench' (MinDetail seems"
-	elog "to not be working for some unknown reason :/)"
-	echo
-	elog "Read ${dir}/README.linux for instructions on how to run a"
-	elog "dedicated server."
-	echo
-	ewarn "If you are not installing for the first time and you plan on running"
-	ewarn "a server, you will probably need to edit your"
-	ewarn "~/.ut2003demo/System/UT2003.ini file and add a line that says"
-	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
-	ewarn "[Engine.GameInfo] section to close a security issue."
-	echo
-	elog "To play the demo run:"
-	elog " ut2003-demo"
-	echo
-}
diff --git a/games-fps/ut2003/Manifest b/games-fps/ut2003/Manifest
deleted file mode 100644
index c4bba0f77386..000000000000
--- a/games-fps/ut2003/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ut2003lnx_patch2225.tar.tar 10039316 BLAKE2B a15398eb2b66606f3e7b1382b01fda6b5d38982bc3fe7065184232eb18a8c85792147187951e810ecb6af738b5f5a15a2e56832d7e91fb21ab8956d699817f76 SHA512 3c44b6254b2b778bf2aca826c710f51db4ec0687c21f1c98e1070f3a9ad7e1a809e741a5b94e20a44c56c60a8b1e4a049788ff5f2a4d581c4eedf3dbbc0da86d
-EBUILD ut2003-2225-r4.ebuild 2643 BLAKE2B dfa82e2155fe0b58c4081ae39be0806d28d0a14a31fd4bb95aba99614929019787a6afce327b0d1a7de7b3a0bfeea2c178475e4ca26bbb8c8f270841d0f07b5a SHA512 103316444d7a041f3f6d042c4741853fe6de5d28f37f56755615b057ca8d57102ecb9d6e7f5fda597b2772cd59c63c1c2bd1d3b7f1d89cd7f9744d7c249455e3
-MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003/metadata.xml b/games-fps/ut2003/metadata.xml
deleted file mode 100644
index e716a53e0747..000000000000
--- a/games-fps/ut2003/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This game is commercial software and requires data from the original retail discs to play.  If you're interested in checking out the technology behind Unreal Tournament 2003, you can "emerge ut2003-demo" to get the playable demo.
-</longdescription>
-</pkgmetadata>
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
deleted file mode 100644
index 9c9c1483ac4e..000000000000
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Sequel to the 1999 Game of the Year multi-player first-person shooter"
-HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-RESTRICT="strip"
-
-RDEPEND="
-	games-fps/ut2003-data
-	dedicated? ( games-server/ut2003-ded )
-	!dedicated? ( virtual/opengl[abi_x86_32(-)] )
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-dir="${GAMES_PREFIX_OPT}/${PN}"
-Ddir="${D}/${dir}"
-
-src_unpack() {
-	unpack ut2003lnx_patch${PV}.tar.tar
-}
-
-src_install() {
-	insinto "${dir}"
-
-	games_make_wrapper ut2003 ./ut2003 "${dir}" "${dir}"
-	make_desktop_entry ut2003 "Unreal Tournament 2003" ut2003
-
-	# TODO: change this to use doexe/doins
-	# this brings our install up to the newest version
-	cp -r "${S}"/ut2003-lnx-2225/* "${Ddir}" || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# here is where we check for the existence of a cdkey...
-	# if we don't find one, we ask the user for it
-	if [[ -f "${dir}"/System/cdkey ]] ; then
-		elog "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can (re)enter your cdkey."
-	fi
-	elog
-	elog "To play the game run:"
-	elog " ut2003"
-	ewarn
-	ewarn "If you are not installing for the first time and you plan on running"
-	ewarn "a server, you will probably need to edit your"
-	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
-	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
-	ewarn "[Engine.GameInfo] section to close a security issue."
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here."
-	ewarn "  Make sure you type it in correctly."
-	eerror "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXX-XXXX-XXXX-XXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [[ "${CDKEY1}" == "" ]] ; then
-			echo "You entered a blank CD key.  Try again."
-		else
-			if [[ "${CDKEY1}" == "${CDKEY2}" ]] ; then
-				echo "${CDKEY1}" | tr a-z A-Z > ${dir}/System/cdkey
-				einfo "Thank you!"
-				chown games:games "${dir}"/System/cdkey
-				break
-			else
-				eerror "Your CD key entries do not match.  Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/ut2004-3369.3-r1 b/games-fps/ut2004-3369.3-r1
new file mode 100644
index 000000000000..fe4fd8a2a7d8
--- /dev/null
+++ b/games-fps/ut2004-3369.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-arch/p7zip
+DESCRIPTION=Editor's Choice Edition plus Mega Pack for the well-known first-person shooter
+EAPI=5
+HOMEPAGE=http://www.unrealtournament2004.com/
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+RDEPEND=sys-libs/glibc games-fps/ut2004-data games-fps/ut2004-bonuspack-ece games-fps/ut2004-bonuspack-mega dedicated? ( !games-server/ut2004-ded ) opengl? ( =virtual/libstdc++-3.3 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp media-libs/libsdl media-libs/openal ) !dedicated? ( !opengl? ( =virtual/libstdc++-3.3 virtual/opengl x11-libs/libXext x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp media-libs/libsdl media-libs/openal ) ) games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://treefort.icculus.org/ut2004/ut2004-lnxpatch3369-2.tar.bz2 http://storage.guntoo.de/downs/downloads/Patch/ut2004-v3369-3-linux-dedicated.7z mirror://gentoo/ut2004-v3369-3-linux-dedicated.7z
+_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_=667853a7c364952dda1928f85b3f4607
diff --git a/games-fps/ut2004-action-1 b/games-fps/ut2004-action-1
new file mode 100644
index 000000000000..2491f0ec0657
--- /dev/null
+++ b/games-fps/ut2004-action-1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Action - Action movie mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/action-unreal-tournament/addons/action-unreal-tournament-r1
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://ut.rushbase.net/beyondunreal/mods/aut-r1-msuc.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3ca8a19469a1b24de768ac6d8c06a6bb
diff --git a/games-fps/ut2004-action/Manifest b/games-fps/ut2004-action/Manifest
deleted file mode 100644
index 5a30410ccc89..000000000000
--- a/games-fps/ut2004-action/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aut-r1-msuc.zip 323878282 BLAKE2B 509036928b33697926d81e920cb9ca3496549d1024f33912d8de48d5328cd4a20cf5412b4c3ebf4d3e0f3dbba347d486c3d2ed4a14185e817e7aad4b560312ee SHA512 50aafff330839c9b8fe8be2e6a98d9532f8429e2a8f258a9a6dabd39f555a9ce11f9178592575996ebce2629ff5c7f3046777bc1605f21c2bbefb80e11ca4f65
-EBUILD ut2004-action-1.ebuild 536 BLAKE2B f9a8b6470101b6f78a4c92286177717a8b741dd0b5bd05f60ce320773417cdf7af19c447399764de869b6c5e9cf2dcc2e9bbb554f97dbd28f39160705cbcb059 SHA512 a1024f140abc613ffbf31feb2958be91aaddbc62b4013e920226c4ecf36bd2b31e043c6bc1c359454e7c9092447220795c7a07699f686fff2843b458479b0f40
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-action/metadata.xml b/games-fps/ut2004-action/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-action/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-action/ut2004-action-1.ebuild b/games-fps/ut2004-action/ut2004-action-1.ebuild
deleted file mode 100644
index d4dca4341dda..000000000000
--- a/games-fps/ut2004-action/ut2004-action-1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Action movie mod"
-MOD_NAME="Action"
-MOD_DIR="action"
-MOD_ICON="aut.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/action-unreal-tournament/addons/action-unreal-tournament-r1"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/aut-r1-msuc.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	mkdir ${MOD_DIR} || die
-	cd ${MOD_DIR} || die
-	unpack ${A}
-}
diff --git a/games-fps/ut2004-airbuccaneers-1.6-r2 b/games-fps/ut2004-airbuccaneers-1.6-r2
new file mode 100644
index 000000000000..d2a67394aaf5
--- /dev/null
+++ b/games-fps/ut2004-airbuccaneers-1.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Air Buccaneers - Pirate-style conversion with flying wooden ships
+EAPI=5
+HOMEPAGE=http://www.ludocraft.com/entertainment/airbuccaneers-mod/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://bin.ludocraft.com/files/airbuccaneers_mod_1_6_zipinstall_with_info.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c6cc9762b260352b9deb2710c938279e
diff --git a/games-fps/ut2004-airbuccaneers/Manifest b/games-fps/ut2004-airbuccaneers/Manifest
deleted file mode 100644
index 33e3528d76b1..000000000000
--- a/games-fps/ut2004-airbuccaneers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST airbuccaneers_mod_1_6_zipinstall_with_info.zip 255641963 BLAKE2B 24ac4e58a1a075430f92fcef1f8223e4d64d5fcb65af2bd3df0a4dde975422beacc45c7baa41683bb74365b448cbf59d1e26f6d80d7ef5edd73f320d6732fe3f SHA512 6c91919538b1d74157bf5586b66effcd3aabd397dc698384673425a53227c68b1ec0c4a07c342e399136673dc106b11727103ca6a06dff117d93b73645bd981b
-EBUILD ut2004-airbuccaneers-1.6-r2.ebuild 505 BLAKE2B be1705acc1cb5bddc28007c1d4441e383ab16bfec1e0b3e3440ebc96ae34571e73bc05bcf375f88a4afd2b92a82dab34300fb1a9eca683c539045e439139db09 SHA512 bee4df2d19965b8c9e80cc1b788e0f08daa67554b06de6e001d5806b0f31a841df93cc830032909f792bec44300a02091ea5764cc91e314ea0559131d6792ccc
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-airbuccaneers/metadata.xml b/games-fps/ut2004-airbuccaneers/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-airbuccaneers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild b/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
deleted file mode 100644
index e8d587664787..000000000000
--- a/games-fps/ut2004-airbuccaneers/ut2004-airbuccaneers-1.6-r2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Pirate-style conversion with flying wooden ships"
-MOD_NAME="Air Buccaneers"
-MOD_DIR="AirBuccaneers"
-MOD_ICON="Help/abuicon.ico"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.ludocraft.com/entertainment/airbuccaneers-mod/"
-SRC_URI="http://bin.ludocraft.com/files/airbuccaneers_mod_1_6_zipinstall_with_info.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
diff --git a/games-fps/ut2004-bonuspack-cbp1-1-r2 b/games-fps/ut2004-bonuspack-cbp1-1-r2
new file mode 100644
index 000000000000..edc951f00e52
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-cbp1-1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Community Bonus Pack Vol 1 - UT2003 Community Bonus Pack for UT2004
+EAPI=5
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b9c3684a510499e072e3e4214d28b2c2
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
deleted file mode 100644
index d79404a5906a..000000000000
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cbp1.zip 144163647 BLAKE2B ff32fbf431475ae2c24920574e5d158c4242fca2359bf1817131e189c0cd25e52d17de3232acb0b118d7f689ee67821cf6707a2e416e1a9b3f2b5f2e8fbcca86 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd
-EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 473 BLAKE2B 78ba7ef84beeebf910ed6a9116a4a99ac79443ef85bbbce36a37f07b3f8422bbe0c4c17c4266a19966190639fe9df8ae832c77d59edea19379af0cc36fd855dc SHA512 448eb5ef971f6256c7b95735f6bc5af52300c69f72999b93bd594cd7f77b44e072bc663a498bf75f9756a809113bab76a130315af4c26eaf393bf37b46fec362
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp1/metadata.xml b/games-fps/ut2004-bonuspack-cbp1/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-bonuspack-cbp1/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
deleted file mode 100644
index 3a2c9a8576d8..000000000000
--- a/games-fps/ut2004-bonuspack-cbp1/ut2004-bonuspack-cbp1-1-r2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="UT2003 Community Bonus Pack for UT2004"
-MOD_NAME="Community Bonus Pack Vol 1"
-
-inherit games games-mods
-
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="http://downloads.unrealadmin.org/UT2004/BonusPack/cbp1.zip
-	http://files.volved.com/qsr/ut2004_map_packs/cbp1.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/games-fps/ut2004-bonuspack-cbp2-1-r2 b/games-fps/ut2004-bonuspack-cbp2-1-r2
new file mode 100644
index 000000000000..6259df99572b
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-cbp2-1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Community Bonus Pack 2 Vol 1 and 2 - Community Bonus Pack 2 Vol 1 and 2
+EAPI=5
+HOMEPAGE=https://liandri.beyondunreal.com/Unreal_Tournament_2004
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-fps/ut2004-bonuspack-cbp1 games-fps/ut2004-bonuspack-mega games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.zip https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f828a6dc6c45c41603c9d735203f674b
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
deleted file mode 100644
index 6b55c624b5b1..000000000000
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cbp2-volume1_zip.zip 203766207 BLAKE2B 7f7d19f4a1a1caaf388eccecadb8123a103d4aafbb95f2b344e106b881507f9bac0ffdda48435be7c2303b8bd70545d3d74ca7971f97a989bfa955d3155d956c SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213
-DIST cbp2-volume2_zip.zip 200444127 BLAKE2B 21d61d09af54e86047d46cc8d136cd6ba746098c4d0a53ade1e8e5c4143b543f0a90eb0dbca2cb00e29754f916dc84e7040a5d64f582bedd2a0107bb4c182291 SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4
-EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 857 BLAKE2B c6fda00042d988e77915e9afd736f03f7072296bb0bfe5cf4c0c9cd49d81b7fbaa84f0ea39270012e709ae9985c335b93cf772a9994bb4fb1762a5d6e8df5633 SHA512 b5fa77133c8420a01782124d22570585251c6cee7877648c4e209c1f0c2b432dd09052c5f15956524080ac6f520590a8aa0a67b02b9797d6fbb8e3ec0db08d13
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/metadata.xml b/games-fps/ut2004-bonuspack-cbp2/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-bonuspack-cbp2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
deleted file mode 100644
index d1d4cee91dde..000000000000
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Community Bonus Pack 2 Vol 1 and 2"
-MOD_NAME="Community Bonus Pack 2 Vol 1 and 2"
-
-inherit games games-mods
-
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.zip
-	https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-fps/ut2004-bonuspack-cbp1
-	games-fps/ut2004-bonuspack-mega"
-
-src_prepare() {
-	# Provided by ut2004-bonuspack-cbp1
-	rm Music/Soeren.ogg
-	# Provided by ut2004-bonuspack-mega
-	rm Textures/Ty_RocketTextures.utx
-
-	cd Help
-	# Useless orphan file
-	rm Note.txt
-	mv GERROIDREADME.txt DOM-CBP2-Gerroid.txt
-	mv Readme.txt CBP2-Readme.txt
-}
diff --git a/games-fps/ut2004-bonuspack-ece-1-r3 b/games-fps/ut2004-bonuspack-ece-1-r3
new file mode 100644
index 000000000000..889e57a90b1d
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-ece-1-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Editor's Choice Edition - Editor's Choice Edition bonus pack
+EAPI=5
+HOMEPAGE=http://www.unrealtournament2004.com/
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2 http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=749a3135aba12254b0b61098ab7aa2d9
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
deleted file mode 100644
index 39652d72e6e5..000000000000
--- a/games-fps/ut2004-bonuspack-ece/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST UT2004-ONSBonusMapPack.zip 11018471 BLAKE2B bc915d6942c321df4031b02eaa25f83793b3fa1f2bb916c5d413c5569a3f887b6517fc4dceb8cb914e22be62f58512e727a41d5efbc6066113be12a9da9621d0 SHA512 8193375b89cd6fbc8b00de195797099c128fcf5cb73757bbc57d3c5350c497a878eaf0200f2e0711bf062e25c5d170e05b055c63f85b908b18dcc89572d71fd2
-DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-ece-1-r3.ebuild 1754 BLAKE2B c9e1b4c1f06416739670ef7d2af8a3ab5c57d5fa970a4f103f3fa5c4e570a5a85687c268c63d5cf679ba40bfc2036ffc7ba77d66b203eab17f5e69514d6d9278 SHA512 4136dd65c99555dd1bb859e79d4000db11d22e47f7d0846fff15b696a7e282b840dac973352815e85c4c14a4ca43d3cbae0e1eddc21f842cb25d67d960329fa6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-ece/metadata.xml b/games-fps/ut2004-bonuspack-ece/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-bonuspack-ece/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
deleted file mode 100644
index e5ebe2ab3b90..000000000000
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Editor's Choice Edition bonus pack"
-MOD_NAME="Editor's Choice Edition"
-
-inherit games games-mods
-
-MY_P="ut2004megapack-linux.tar.bz2"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}
-	http://unrealmassdestruction.com/downloads/ut2k4/essentials/UT2004-ONSBonusMapPack.zip"
-
-LICENSE="ut2003"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_unpack() {
-	unpack ${MY_P}
-	cd UT2004MegaPack/Maps || die
-	unpack UT2004-ONSBonusMapPack.zip # bug #278002
-}
-
-src_prepare() {
-	mv -f UT2004MegaPack/* . || die
-	rmdir UT2004MegaPack || die
-
-	rm -r Music Speech || die
-
-	# Remove megapack files which are not in ece
-	rm Animations/ONSNewTank-A.ukx || die
-	rm Help/ReadMePatch.int.txt || die
-	# Help/{DebuggerLogo.bmp,InstallerLogo.bmp,Unreal.ico,UnrealEd.ico}
-	# are not in megapack.
-	# Keep new Help/UT2004Logo.bmp
-	# Manual dir does not exist in megapack
-	rm Maps/{AS*,CTF*,DM*} || die
-	rm Sounds/A_Announcer_BP2.uax || die
-	rm StaticMeshes/{JumpShipObjects.usx,Ty_RocketSMeshes.usx} || die
-	rm System/{A*,b*,B*,CacheRecords.ucl} || die
-	rm System/{*.det,*.est,*.frt,*.itt,*.kot} || die
-	rm System/{CTF*,D*,Editor*,G*,I*,L*,Onslaught.*,*.md5} || die
-	rm System/{u*,U*,V*,X*,Core.u,Engine.u,F*,*.ucl,Sk*} || die
-	rm Textures/{J*,j*,T*} || die
-	rm -r Web || die
-
-	# The file lists of ut2004-3369-r1 and -r2 are identical
-	# Remove files owned by ut2004-3369-r2
-	rm Help/UT2004Logo.bmp || die
-	# The 2 Manifest files have not changed
-	rm System/{Manifest.in{i,t},OnslaughtFull.int} || die
-	rm System/{Core.int,Engine.int,Setup.int,Window.int} || die
-	rm System/{OnslaughtFull.u,OnslaughtBP.u} || die
-}
diff --git a/games-fps/ut2004-bonuspack-mega-1-r2 b/games-fps/ut2004-bonuspack-mega-1-r2
new file mode 100644
index 000000000000..a7498dc97557
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-mega-1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Megapack - Megapack bonus pack
+EAPI=5
+HOMEPAGE=http://www.unrealtournament2004.com/
+IUSE=dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1849e071749d572e6e3ba0166f8435d3
diff --git a/games-fps/ut2004-bonuspack-mega/Manifest b/games-fps/ut2004-bonuspack-mega/Manifest
deleted file mode 100644
index f525e2204f0a..000000000000
--- a/games-fps/ut2004-bonuspack-mega/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-mega-1-r2.ebuild 1156 BLAKE2B bac0ef4f8854377b0b6989d1150a814ad7d60a00701c493c502140bd1ed8ebe6156f1ff0878c346016922b6f823abe13ffb0ae760c065c49d4595f7cec8854bf SHA512 6aeb92058fe6a534f1ab5c688f4c8e3c14baa166dad5356944fe4cb39e29e4bedd4792799e040eacad9dffae4d6e7c5919452fbaa0b5c6cbc91a72c6030861d5
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-mega/metadata.xml b/games-fps/ut2004-bonuspack-mega/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-bonuspack-mega/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
deleted file mode 100644
index 807f91c6bf04..000000000000
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Megapack bonus pack"
-MOD_NAME="Megapack"
-
-inherit games games-mods
-
-MY_P="ut2004megapack-linux.tar.bz2"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}"
-
-LICENSE="ut2003"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	mv -f UT2004MegaPack/* . || die
-	rmdir UT2004MegaPack
-
-	# Remove files in Megapack which are already installed
-	rm -r Animations Speech Web
-
-	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp}
-	mv Help/BonusPackReadme.txt Help/MegapackReadme.txt
-
-	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-
-	# System
-	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}*
-	rm System/{ucc,ut2004}-bin
-	rm System/{ucc,ut2004}-bin-linux-amd64
-	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-}
diff --git a/games-fps/ut2004-cor-1.01-r1 b/games-fps/ut2004-cor-1.01-r1
new file mode 100644
index 000000000000..46884aebf408
--- /dev/null
+++ b/games-fps/ut2004-cor-1.01-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Counter Organic Revolution - Shape-shifting robot teamplay mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/counter-organic-revolution
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://ut.rushbase.net/beyondunreal/mods/cor_beta_v1.0.zip https://ut.rushbase.net/beyondunreal/mods/cor_patch_b1_to_b101.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7c1ea5c2528bdc4062679329aeadd6ee
diff --git a/games-fps/ut2004-cor/Manifest b/games-fps/ut2004-cor/Manifest
deleted file mode 100644
index 67aaf112f834..000000000000
--- a/games-fps/ut2004-cor/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cor_beta_v1.0.zip 278979612 BLAKE2B 39cc74b36bb8b752d6390c320077f5c6fa43de835fa490cad7156a57e2c5406f6ba2f15d8991a4bcb5605e5c722d221a093c11df1d47455568a804ab3d34df0d SHA512 04a8db1b31478785052d162e2007eb336d1d99c76f96098163c71616d3951e4e3c7b95c1b29a05e9acf2e0554c5bd20e5e2df10b93325b0e2cabf3a5a60640a6
-DIST cor_patch_b1_to_b101.zip 20386490 BLAKE2B 03091a14d15d749e33d92e5fa98a46b5a4d0c3fef83ab84869da490cff8395bef7bfabe42903271cb91324ad3931461d9f3080a267c0c2ea0c03faf692991471 SHA512 7b7243727a0e4570545f9d3f93a141b61da5e4cbe458894602925733396b3f9037c7a9a21a1ee9c9638181b4c321a9030a29837e1e808826a70bb52f54e2d6a6
-EBUILD ut2004-cor-1.01-r1.ebuild 560 BLAKE2B c9d72ca7375d8e7498b4f98c287d61a389e571601d7c8023dfa487e430ed8ec7578c20208c63d367739d70eaaa455b334a282f88e92712fc9b76f851793175b1 SHA512 e6cf39b4239ec7553385cab526bc92c8444488e410bb6966ada0148a5598d1bc4bc63b45cc4b938f56cd8856b39e9e7c389036d3427ed7ca9040c0485dc27167
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-cor/metadata.xml b/games-fps/ut2004-cor/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-cor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild b/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
deleted file mode 100644
index 3cde6540eb44..000000000000
--- a/games-fps/ut2004-cor/ut2004-cor-1.01-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Shape-shifting robot teamplay mod"
-MOD_NAME="Counter Organic Revolution"
-MOD_DIR="COR"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/counter-organic-revolution"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/cor_beta_v1.0.zip
-	https://ut.rushbase.net/beyondunreal/mods/cor_patch_b1_to_b101.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f ${MOD_DIR}/*.bat || die
-}
diff --git a/games-fps/ut2004-crossfire-1.95 b/games-fps/ut2004-crossfire-1.95
new file mode 100644
index 000000000000..c180222b7b57
--- /dev/null
+++ b/games-fps/ut2004-crossfire-1.95
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Crossfire - Special Forces vs Terrorists
+EAPI=5
+HOMEPAGE=http://to-crossfire.tnc-clan.de/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=free-noncomm
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=ftp://files.tnc-clan.de/TOCrossfire/client/TOCrossfire_beta_1.95_full.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=04b49aa7636a85d6795d58ea2d56743c
diff --git a/games-fps/ut2004-crossfire/Manifest b/games-fps/ut2004-crossfire/Manifest
deleted file mode 100644
index 76897d013e26..000000000000
--- a/games-fps/ut2004-crossfire/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TOCrossfire_beta_1.95_full.zip 1243833907 BLAKE2B ec6ce5ecec8357ed0a3b90eb7c64b25f372a37224454840bb2f55f0080d0f722fa4cd436d3299f11670627e7da1c46ad92ea6459cdbe734ed7d075117403b9e0 SHA512 a02c8221f7687e4a2276f6da9f9fc480b0c8aaf3f98517134614079699a0ecda088e781d5d0251b7da8588493afa394acc5eed99f40034d3555feeef6e175bbe
-EBUILD ut2004-crossfire-1.95.ebuild 699 BLAKE2B bca60fc8d3f2b8a938d72f6ca1d8ec7d4235fbca317d1ca138380ace55037c95443c874edcf46b24c1455990c1607cba9d646aabac4f8322ddddf30a0221204f SHA512 b1912616eb0e3feec1db88dc4d7a7b72d9dfcab6d91c9e880c7fa090f4eec6faa360e449f8d761edecc296c213ed0d034ede98493e256ff1d1b9fb4535081806
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-crossfire/metadata.xml b/games-fps/ut2004-crossfire/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-crossfire/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild b/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
deleted file mode 100644
index 52d8a5e9ed13..000000000000
--- a/games-fps/ut2004-crossfire/ut2004-crossfire-1.95.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_NAME="Crossfire"
-MOD_DESC="Special Forces vs Terrorists"
-MOD_DIR="TOCrossfire"
-MOD_ICON="Help/icons/TOC_TERROR2.png"
-
-inherit games games-mods
-
-HOMEPAGE="http://to-crossfire.tnc-clan.de/"
-SRC_URI="ftp://files.tnc-clan.de/TOCrossfire/client/TOCrossfire_beta_${PV}_full.zip"
-
-# See Help/EULA.txt
-LICENSE="free-noncomm"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_unpack() {
-	unpack ${A}
-	unpack ./TOCinstall.tgz
-}
-
-src_prepare() {
-	rm -f *.{exe,reg,sh,tgz,txt} || die
-	rm -rf TOCInstaller.app stuff || die
-	cd ${MOD_DIR} || die
-	rm -f *.{bat,exe} Help/*.{exe,zip} || die
-}
diff --git a/games-fps/ut2004-data-3186-r4 b/games-fps/ut2004-data-3186-r4
new file mode 100644
index 000000000000..f552570d63a0
--- /dev/null
+++ b/games-fps/ut2004-data-3186-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-util/uz2unpack >=app-arch/unshield-0.5-r1
+DESCRIPTION=Unreal Tournament 2004 - This is the data portion of UT2004
+EAPI=5
+HOMEPAGE=http://www.unrealtournament2004.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+PDEPEND=games-fps/ut2004
+PROPERTIES=interactive
+RDEPEND=games-misc/games-envd
+SLOT=0
+_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_=2d5b0504a4fb75a5ff3a76225798499d
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
deleted file mode 100644
index ec4b009b4825..000000000000
--- a/games-fps/ut2004-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD ut2004-data-3186-r4.ebuild 12493 BLAKE2B 5a1aaf249c8e678108e2ce9d1600959498c2b2a08401d842d431a8ed2119a7ede486b402da582d2e4cca72f0e1eceb03034672c0b6132a14d7340a22f0ffee6d SHA512 68b5d2a24c5818235edc984c60de39a3a9b17bab304d1ecb601eab6db170f119c9a300756900700cde88c1e17ed103879d2db8982dfa2ec3ae0d83ea3e9a069e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-data/metadata.xml b/games-fps/ut2004-data/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
deleted file mode 100644
index 7c761a8f9873..000000000000
--- a/games-fps/ut2004-data/ut2004-data-3186-r4.ebuild
+++ /dev/null
@@ -1,377 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker cdrom portability games
-
-DESCRIPTION="Unreal Tournament 2004 - This is the data portion of UT2004"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI=""
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="games-util/uz2unpack
-	>=app-arch/unshield-0.5-r1"
-PDEPEND="games-fps/ut2004"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
-
-check_dvd() {
-	# The following is a nasty mess to determine if we are installing from
-	# a DVD or from multiple CDs. Anyone feel free to submit patches to this
-	# to bugs.gentoo.org as I know it is a very ugly hack.
-
-	USE_DVD=
-	USE_ECE_DVD=
-	USE_MIDWAY_DVD=
-	USE_GERMAN_MIDWAY_DVD=
-
-	local point foo fs mnts=()
-	while read point foo fs foo ; do
-		[[ ${fs} =~ (9660|udf) ]] && mnts+=( "${point//\040/ }" )
-	done < <(get_mounts)
-
-	local r
-	for r in "${CD_ROOT}" "${CD_ROOT_1}" "${mnts[@]}" ; do
-		if [[ -n ${r} ]] ; then
-			einfo "Searching ${r}"
-			if [[ -f ${r}/AutoRunData/Unreal.ico ]] \
-				&& [[ -f ${r}/Disk5/data6.cab ]] ; then
-				USE_MIDWAY_DVD=1
-				USE_DVD=1
-			elif [[ -f ${r}/autorund/unreal.ico ]] \
-				&& [[ -f ${r}/disk7/data8.cab ]] ; then
-				USE_MIDWAY_DVD=1
-				USE_GERMAN_MIDWAY_DVD=1
-				USE_DVD=1
-			else
-				[[ -d ${r}/CD1 ]] && USE_DVD=1
-				[[ -d ${r}/CD7 ]] && USE_ECE_DVD=1
-			fi
-		fi
-	done
-}
-
-grabdirs() {
-	local d
-	for d in {Music,Sounds,Speech,StaticMeshes,Textures} ; do
-		local srcdir=${CDROM_ROOT}/${1}/${d}
-		# Is flexible to handle CD_ROOT vs CD_ROOT_1 mixups
-		[[ -d ${srcdir} ]] || srcdir=${CDROM_ROOT}/${d}
-		if [[ -d ${srcdir} ]] ; then
-			insinto "${dir}"
-			doins -r "${srcdir}"
-		fi
-	done
-}
-
-pkg_setup() {
-	games_pkg_setup
-
-	ewarn "This is a huge package. If you do not have at least 7GB of free"
-	ewarn "disk space in ${PORTAGE_TMPDIR} and also in ${GAMES_PREFIX_OPT}"
-	ewarn "then you should abort this installation now and free up some space."
-}
-
-src_unpack() {
-	check_dvd
-
-	if [[ ${USE_DVD} -eq 1 ]] ; then
-		if [[ ${USE_MIDWAY_DVD} -eq 1 ]] ; then
-			# Is 1 DVD, either UT2004-only or Anthology
-			if [[ ${USE_GERMAN_MIDWAY_DVD} -eq 1 ]] ; then
-				cdrom_get_cds autorund/unreal.ico
-			else
-				cdrom_get_cds AutoRunData/Unreal.ico
-			fi
-		else
-			DISK1="CD1"
-			DISK2="CD2"
-			DISK3="CD3"
-			DISK4="CD4"
-			DISK5="CD5"
-			DISK6="CD6"
-			if [[ ${USE_ECE_DVD} -eq 1 ]] ; then
-				# Editor's Choice Edition DVD
-				cdrom_get_cds \
-					${DISK1}/System/UT2004.ini \
-					${DISK2}/Textures/2K4Fonts.utx.uz2 \
-					${DISK3}/Textures/ONSDeadVehicles-TX.utx.uz2 \
-					${DISK4}/Textures/XGameShaders2004.utx.uz2 \
-					${DISK5}/Speech/ons.xml \
-					${DISK6}/Sounds/TauntPack.det_uax.uz2
-			else
-				# Original DVD
-				cdrom_get_cds \
-					${DISK1}/System/UT2004.ini \
-					${DISK2}/Textures/2K4Fonts.utx.uz2 \
-					${DISK3}/Textures/ONSDeadVehicles-TX.utx.uz2 \
-					${DISK4}/StaticMeshes/AlienTech.usx.uz2 \
-					${DISK5}/Speech/ons.xml \
-					${DISK6}/Sounds/TauntPack.det_uax.uz2
-			fi
-		fi
-	else
-		# 6 CDs
-		cdrom_get_cds \
-			System/UT2004.ini \
-			Textures/2K4Fonts.utx.uz2 \
-			Textures/ONSDeadVehicles-TX.utx.uz2 \
-			StaticMeshes/AlienTech.usx.uz2 \
-			Speech/ons.xml \
-			Sounds/TauntPack.det_uax.uz2
-	fi
-
-	if [[ ${USE_MIDWAY_DVD} -ne 1 ]] ; then
-		unpack_makeself "${CDROM_ROOT}"/linux-installer.sh
-		use x86 && unpack ./linux-x86.tar
-		use amd64 && unpack ./linux-amd64.tar
-	fi
-}
-
-src_install() {
-	local j
-
-	if [[ ${USE_MIDWAY_DVD} -eq 1 ]] ; then
-		einfo "Copying files from UT2004 Midway DVD."
-
-		if [[ -f ${CDROM_ROOT}/Manual/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
-			doins "${CDROM_ROOT}"/Manual/Manual.pdf
-		elif [[ -f ${CDROM_ROOT}/Manual.pdf ]] ; then
-			insinto "${dir}"/Manual
-			doins "${CDROM_ROOT}"/Manual.pdf
-		fi
-
-		# Symlinks for unshield. data1&2.cab are both in Disk1.
-		# unshield needs data1.hdr
-		# The Midway Anthology DVD contains up to data9.cab
-		local cabfile
-		for cabfile in "${CDROM_ROOT}"/[dD]isk*/data*.{cab,hdr} ; do
-			ln -sfn "${cabfile}" .
-		done
-
-		# The big extraction
-		einfo "Extracting from CAB files - this will take several minutes..."
-		unshield x data1.cab || die
-
-		if [[ -d 4_UT2004_Animations ]] ; then
-			# Delete the other games on the Anthology DVD
-			rm -rf {1,2,3}_Unreal* 4_UT2004_EXE Launcher_* OCXFiles
-			# Rename directories to be same as Midway UT2004-only DVD,
-			# i.e. rename "4_UT2004_Animations" to "Animations".
-			for j in 4_UT2004_* ; do
-				mv -f ${j} ${j/4_UT2004_} || die
-			done
-		fi
-
-		# The "logging" subdirectory is created by unshield.
-		rm -rf logging
-		rm -f *.{cab,hdr}
-
-		for j in Animations Benchmark ForceFeedback Help KarmaData \
-			Manual Maps Music Sounds Speech StaticMeshes \
-			System Textures Web ; do
-
-			# UT2004-only DVD has "All_*" dirs, and Anthology DVD has "*_All"
-			if [[ -d All_${j} ]] ; then
-				if [[ -d ${j} ]] ; then
-					cp -rf All_${j}/* ${j}/ || die
-				else
-					mv -f All_${j} ${j} || die
-				fi
-			fi
-			if [[ -d ${j}_All ]] ; then
-				if [[ -d ${j} ]] ; then
-					cp -rf ${j}_All/* ${j}/ || die
-				else
-					mv -f ${j}_All ${j} || die
-				fi
-			fi
-
-			if [[ -d English_${j} ]] ; then
-				if [[ -d ${j} ]] ; then
-					cp -rf English_${j}/* ${j}/ || die
-				else
-					mv -f English_${j} ${j} || die
-				fi
-			fi
-			if [[ -d ${j}_English ]] ; then
-				if [[ -d ${j} ]] ; then
-					cp -rf ${j}_English/* ${j}/ || die
-				else
-					mv -f ${j}_English ${j} || die
-				fi
-			fi
-
-			# Ensure that the directory exists
-			mkdir -p ${j}
-		done
-
-		# Rearrange directories
-		if [[ -d English_Sounds_Speech_System_Help ]] ; then
-			# http://utforums.epicgames.com/showthread.php?t=558146
-			for j in Sounds Speech System Help ; do
-				cp -rf English_Sounds_Speech_System_Help/${j}/* ${j}/ || die
-			done
-		fi
-
-		if [[ ! -d Benchmark/Stuff ]] ; then
-			mkdir -p Benchmark/Stuff || die
-			cp -f BenchmarkStuff/timedemo.txt Benchmark/Stuff || die
-		fi
-
-		if [[ ! -d System/editorres ]] ; then
-			mkdir -p System/editorres || die
-			cp -rf Systemeditorres/* System/editorres || die
-		fi
-
-		if [[ ! -d Web/images ]] ; then
-			mkdir -p Web/{images,ServerAdmin,Src} || die
-			cp -rf Webimages/* Web/images || die
-			cp -rf WebServerAdmin/* Web/ServerAdmin || die
-			cp -rf WebSrc/* Web/Src || die
-		fi
-
-		# Other languages
-		for j in Help_* Sounds_* System_* ; do
-			[[ ! -d ${j} ]] && continue
-			mv -n ${j}/* ${j/_*}/ || die
-		done
-
-		# Remove unnecessary directories
-		rm -rf Benchmark{CSVs,Logs,Results,Stuff}
-		rm -rf Systemeditorres Web{images,ServerAdmin,Src}
-		rm -rf Help_* Sounds_* Speech_* System_*
-		rm -rf \<* \[* _* All_* English_* *_All *_English
-
-		# These files are replaced later, for all installations
-		rm -f $(find . -type f -name 'DO_NOT_DELETE.ME')
-
-		# Install icon
-		if [[ -f ut2004.xpm ]] ; then
-			doicon ut2004.xpm
-		elif [[ -f Help/Unreal.ico ]] ; then
-			newicon Help/Unreal.ico ut2004.ico
-		elif [[ -f ${CDROM_ROOT}/AutoRunData/Unreal.ico ]] ; then
-			newicon "${CDROM_ROOT}"/AutoRunData/Unreal.ico ut2004.ico
-		elif [[ -f Help/Unreal.bmp ]] ; then
-			newicon Help/Unreal.bmp ut2004.bmp
-		fi
-
-		# The big install
-		einfo "Installing UT2004 directories..."
-		insinto "${dir}"
-		doins -r *
-	else
-		# Disk 1
-		einfo "Copying files from Disk 1..."
-		insinto "${dir}"
-		doins -r "${CDROM_ROOT}"/${DISK1}/{Animations,ForceFeedback,Help,KarmaData,Maps,Sounds,Web}
-		insinto "${dir}"/System
-		doins -r "${CDROM_ROOT}"/${DISK1}/System/{editorres,*.{bat,bmp,dat,det,est,frt,ini,int,itt,kot,md5,smt,tmt,u,ucl,upl,url}}
-		insinto "${dir}"/Manual
-		doins "${CDROM_ROOT}"/${DISK1}/Manual/Manual.pdf
-		insinto "${dir}"/Benchmark/Stuff
-		doins -r "${CDROM_ROOT}"/${DISK1}/Benchmark/Stuff/*
-		cdrom_load_next_cd
-
-		local diskno
-		for diskno in {2..5} ; do
-			einfo "Copying files from Disk ${diskno}..."
-			local varname="DISK${diskno}"
-			grabdirs ${!varname}
-			cdrom_load_next_cd
-		done
-
-		# Disk 6
-		einfo "Copying files from Disk 6..."
-		grabdirs "${DISK6}"
-
-		# Install extra help files
-		insinto "${dir}"/Help
-		doins README.linux Unreal.bmp UT2004_EULA.txt ut2004.xpm
-
-		doicon ut2004.xpm
-
-		# Uncompress files
-		einfo "Uncompressing files... this *will* take a while..."
-		for j in Animations Maps Sounds StaticMeshes Textures ; do
-			fperms -R u+w "${dir}/${j}" || die
-			games_ut_unpack "${Ddir}"/${j}
-		done
-	fi
-
-	# Create empty files in Benchmark
-	for j in {CSVs,Logs,Results} ;do
-		keepdir "${dir}"/Benchmark/${j}
-	done
-
-	make_wrapper ut2004 ./ut2004-bin "${dir}"/System "${dir}"/System "${dir}"
-
-	# Remove unneccessary files
-	rm -f "${Ddir}"/*.{bat,exe,EXE,int}
-	rm -f "${Ddir}"/Help/{.DS_Store,SAPI-EULA.txt}
-	rm -f "${Ddir}"/Manual/*.exe
-	rm -rf "${Ddir}"/Speech/Redist
-	rm -f "${Ddir}"/System/*.{bat,dll,exe,tar}
-	rm -f "${Ddir}"/System/{{License,Manifest}.smt,{ucc,StdOut}.log}
-	rm -f "${Ddir}"/System/{User,UT2004}.ini
-
-	# Remove file collisions with ut2004-3369-r4
-	rm -f "${Ddir}"/Animations/ONSNewTank-A.ukx
-	rm -f "${Ddir}"/Help/UT2004Logo.bmp
-	rm -f "${Ddir}"/System/{ALAudio.kot,AS-{Convoy,FallenCity,Glacier}.kot,AS-{Convoy,FallenCity,Glacier,Junkyard,Mothership,RobotFactory}.int,bonuspack.{det,est,frt},BonusPack.{int,itt,u},BR-Serenity.int}
-	rm -f "${Ddir}"/System/CTF-{AbsoluteZero,BridgeOfFate,DE-ElecFields,DoubleDammage,January,LostFaith}.int
-	rm -f "${Ddir}"/System/DM-{1on1-Albatross,1on1-Desolation,1on1-Mixer,Corrugation,IronDeity,JunkYard}.int
-	rm -f "${Ddir}"/System/{DOM-Atlantis.int,OnslaughtBP.{kot,u,ucl},OnslaughtFull.int}
-	rm -f "${Ddir}"/System/{Build.ini,CacheRecords.ucl,Core.{est,frt,kot,int,itt,u},CTF-January.kot,D3DDrv.kot,DM-1on1-Squader.kot}
-	rm -f "${Ddir}"/System/{Editor,Engine,Gameplay,GamePlay,UnrealGame,UT2k4Assault,XInterface,XPickups,xVoting,XVoting,XWeapons,XWebAdmin}.{det,est,frt,int,itt,u}
-	rm -f "${Ddir}"/System/{Fire.u,IpDrv.u,License.int,ONS-ArcticStronghold.kot}
-	rm -f "${Ddir}"/System/{OnslaughtFull,onslaughtfull,UT2k4AssaultFull}.{det,est,frt,itt,u}
-	rm -f "${Ddir}"/System/{GUI2K4,Onslaught,skaarjpack,SkaarjPack,XGame}.{det,est,frt,int,itt,kot,u}
-	rm -f "${Ddir}"/System/{Setup,Window}.{det,est,frt,int,itt,kot}
-	rm -f "${Ddir}"/System/XPlayers.{det,est,frt,int,itt}
-	rm -f "${Ddir}"/System/{UnrealEd.u,UTClassic.u,UTV2004c.u,UTV2004s.u,UWeb.u,Vehicles.kot,Vehicles.u,Xweapons.itt,UT2K4AssaultFull.int,UTV2004.kot,UTV2004s.kot}
-	rm -f "${Ddir}"/System/{XAdmin.kot,XAdmin.u,XMaps.det,XMaps.est}
-	rm -f "${Ddir}"/Textures/jwfasterfiles.utx
-	rm -f "${Ddir}"/Web/ServerAdmin/{admins_home.htm,current_bots.htm,ut2003.css,current_bots_species_group.inc}
-	rm -f "${Ddir}"/Web/ServerAdmin/ClassicUT/current_bots.htm
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{adminsframe.htm,admins_home.htm,admins_menu.htm,current_bots.htm,currentframe.htm,current_menu.htm}
-	rm -f "${Ddir}"/Web/ServerAdmin/UnrealAdminPage/{defaultsframe.htm,defaults_menu.htm,footer.inc,mainmenu.htm,mainmenu_itemd.inc,rootframe.htm,UnrealAdminPage.css}
-	rm -f "${Ddir}"/Web/ServerAdmin/UT2K3Stats/{admins_home.htm,current_bots.htm,ut2003stats.css}
-
-	# Remove file collisions with ut2004-bonuspack-ece
-	rm -f "${Ddir}"/Animations/{MechaSkaarjAnims,MetalGuardAnim,NecrisAnim,ONSBPAnimations}.ukx
-	rm -f "${Ddir}"/Help/BonusPackReadme.txt
-	rm -f "${Ddir}"/Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm -f "${Ddir}"/Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm -f "${Ddir}"/StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-	rm -f "${Ddir}"/System/{ONS-Adara.int,ONS-IslandHop.int,ONS-Tricky.int,ONS-Urban.int,OnslaughtBP.int,xaplayersl3.upl}
-	rm -f "${Ddir}"/Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S}.utx
-	rm -f "${Ddir}"/Textures/{HourAdaraTexor,ONSBPTextures,ONSBP_DestroyedVehicles,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-
-	# Remove file collisions with ut2004-bonuspack-mega
-	rm -f "${Ddir}"/Help/MegapackReadme.txt
-	rm -f "${Ddir}"/Maps/{AS-BP2-Acatana,AS-BP2-Jumpship,AS-BP2-Outback,AS-BP2-SubRosa,AS-BP2-Thrust}.ut2
-	rm -f "${Ddir}"/Maps/{CTF-BP2-Concentrate,CTF-BP2-Pistola,DM-BP2-Calandras,DM-BP2-GoopGod}.ut2
-	rm -f "${Ddir}"/Music/APubWithNoBeer.ogg
-	rm -f "${Ddir}"/Sounds/A_Announcer_BP2.uax
-	rm -f "${Ddir}"/StaticMeshes/{JumpShipObjects,Ty_RocketSMeshes}.usx
-	rm -f "${Ddir}"/System/{AssaultBP.u,Manifest.in{i,t},Packages.md5}
-	rm -f "${Ddir}"/Textures/{JumpShipTextures,T_Epic2k4BP2,Ty_RocketTextures}.utx
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "This is only the data portion of the game. To play UT2004,"
-	elog "you still need to install games-fps/ut2004."
-}
diff --git a/games-fps/ut2004-deathball-2.4w b/games-fps/ut2004-deathball-2.4w
new file mode 100644
index 000000000000..d4cc751d3bdb
--- /dev/null
+++ b/games-fps/ut2004-deathball-2.4w
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Deathball - Fast-paced first person sport mod
+EAPI=5
+HOMEPAGE=http://www.deathball.net/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://www.deathball.net/downloads/deathball24w.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5d6c0197adb74cf91567011de187d420
diff --git a/games-fps/ut2004-deathball/Manifest b/games-fps/ut2004-deathball/Manifest
deleted file mode 100644
index 7b209e2d629b..000000000000
--- a/games-fps/ut2004-deathball/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST deathball24w.zip 79276308 BLAKE2B 4e060e5f4f3dc8df7ee22b1c703531e5e1f97842aaf01fef9b87ef00895525f81cb1560cabdf5946fc8b7120c458557816857fba6e24f253da858133039d92b1 SHA512 b310c38dcc5889fc3f56861fe8d05e53c4b399b33e318614bfeb86b899051c8870b23bc39a82eda7eb7d469d7d2d32c361df922bcba18f01d03aa66239b133bc
-EBUILD ut2004-deathball-2.4w.ebuild 528 BLAKE2B 1e455b5cb36b8546c5dc79dbc56cb9cd849474c01197d7c46822198688e84ac0917953048f8e009943c7955dec66e7e01d237147e720bbb74bc0aed55e767854 SHA512 f2f455aeb238441e1387d12f275b5b5bca24118cc698946fb7888796b75acd42d1e4b4128f34719d2e444a03048fac3f025a8027c68478eb940ed9a05e07d0fe
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-deathball/metadata.xml b/games-fps/ut2004-deathball/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-deathball/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild b/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
deleted file mode 100644
index bd51db1c6c89..000000000000
--- a/games-fps/ut2004-deathball/ut2004-deathball-2.4w.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Fast-paced first person sport mod"
-MOD_NAME="Deathball"
-MOD_DIR="deathball"
-MOD_ICON="dbicon.ico"
-
-inherit games games-mods
-
-HOMEPAGE="http://www.deathball.net/"
-SRC_URI="http://www.deathball.net/downloads/deathball${PV/.}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	cd ${MOD_DIR} || die
-	mv -f ../*.txt . || die
-	rm -f *.bat *.cmd *.db Help/*.db || die
-}
diff --git a/games-fps/ut2004-demo-3334 b/games-fps/ut2004-demo-3334
new file mode 100644
index 000000000000..249e9ee9b5df
--- /dev/null
+++ b/games-fps/ut2004-demo-3334
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Demo for the critically-acclaimed first-person shooter
+EAPI=5
+HOMEPAGE=http://www.unrealtournament.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ut2003-demo
+RDEPEND=virtual/libstdc++:3.3 x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/ut2004-lnx-demo3334.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_=c15c31e344aaf6bafb95565e084377bf
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
deleted file mode 100644
index 08be85fa9a4f..000000000000
--- a/games-fps/ut2004-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ut2004-lnx-demo3334.run 288950743 BLAKE2B 82a45af7de4735cbcb1b8b4b5303d28d96e3e4888e12b60b920db096ed07b4c5d902eda258276c95865316206ddfd5828174397a8e921118e33f63be01e71861 SHA512 4cdd61901f4c082d1e02caf301a24f1e18e89f4efc9fbce0e4496178916b6c14245131b62f27deb17f1763cd4b8bf68ee60cc7af5ece5fa2b39d1bf349361da0
-EBUILD ut2004-demo-3334.ebuild 1865 BLAKE2B 2654f4494e232e40d44622e1cd997f327b4c152a67ddb17ce54efd3f7be5de290eb6ebf63c79dae7b817d3ed19075c4384079559590ad64607f763f42d232988 SHA512 859a82c7cb969396640f35824cd0fe3a7ad6c0a172e1ce68a60230e57599b174838c773a71f756374ffdf551617945999744f7e4f4ec7bb06ea5529b492dfded
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-demo/metadata.xml b/games-fps/ut2004-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild b/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
deleted file mode 100644
index 53cca08e3d83..000000000000
--- a/games-fps/ut2004-demo/ut2004-demo-3334.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_P="ut2004-lnx-demo${PV}.run"
-DESCRIPTION="Demo for the critically-acclaimed first-person shooter"
-HOMEPAGE="http://www.unrealtournament.com/"
-SRC_URI="mirror://gentoo/${MY_P}"
-
-LICENSE="ut2003-demo"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	virtual/libstdc++:3.3
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-QA_PREBUILT="${dir:1}/System/*"
-
-src_unpack() {
-	unpack_makeself
-	unpack ./setupstuff.tar.gz
-}
-
-src_install() {
-	dodir "${dir}"
-
-	tar xjf ut2004demo.tar.bz2 -C "${Ddir}" || die
-
-	if use x86
-	then
-		tar xjf linux-x86.tar.bz2 || die
-	fi
-	if use amd64
-	then
-		tar xjf linux-amd64.tar.bz2 || die
-	fi
-
-	insinto "${dir}"
-	doins README.linux ut2004.xpm
-	newicon ut2004.xpm ut2004-demo.xpm
-
-	exeinto "${dir}"
-	doexe bin/ut2004-demo
-
-	exeinto "${dir}"/System
-	doexe System/{libSDL-1.2.so.0,openal.so,ucc-bin,ut2004-bin}
-
-	games_make_wrapper ut2004-demo ./ut2004-demo "${dir}" "${dir}"
-	make_desktop_entry ut2004-demo "Unreal Tournament 2004 (Demo)" ut2004-demo
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "For Text To Speech:"
-	elog "   1) emerge festival speechd"
-	elog "   2) Edit your ~/.ut2004demo/System/UT2004.ini file."
-	elog "      In the [SDLDrv.SDLClient] section, add:"
-	elog "         TextToSpeechFile=/dev/speech"
-	elog "   3) Start speechd."
-	elog "   4) Start the game.  Be sure to go into the Audio"
-	elog "      options and enable Text To Speech."
-	echo
-	elog "To test, pull down the console (~) and type:"
-	elog "   TTS this is a test."
-	echo
-	elog "You should hear something that sounds like 'This is a test.'"
-	echo
-}
diff --git a/games-fps/ut2004-fragops-2.20 b/games-fps/ut2004-fragops-2.20
new file mode 100644
index 000000000000..4ef654dd8f20
--- /dev/null
+++ b/games-fps/ut2004-fragops-2.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Frag Ops - realism mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/fragops
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://ut.rushbase.net/beyondunreal/mods/fragops_v220_fulllmw.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6e49f21012842d9471d173361bcba31d
diff --git a/games-fps/ut2004-fragops/Manifest b/games-fps/ut2004-fragops/Manifest
deleted file mode 100644
index 852dd3fe5045..000000000000
--- a/games-fps/ut2004-fragops/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fragops_v220_fulllmw.zip 554114758 BLAKE2B a3cfb94b64e6bb114077a0c802bbafe7d374c943c9524fd52a5982ab46c7c5e2c9d72622ea79ad0058c15ee3aa5e27fe0bb5a74e9c88847f8477cf7890a1fdce SHA512 f2a0b1a8e035e038a5241053c30761f725003aba8c45c862348ab8a8895c2db056bab45e2a1791080dcf54234923d736bd7d7361bb38bb2b67ebf5e077fc83e5
-EBUILD ut2004-fragops-2.20.ebuild 478 BLAKE2B b34bd14552676b701491e74344a9bbc6d7484aaf8088ab79c50df7a089e6b3a8095b6c2cba60298ca60f28d3fcca1328b3e4bd38efbb11e0ae66540ff3fdb365 SHA512 f06e65496e4f76f3468149c9c17c7d5b60b1e968a8302d2aa40cce86f93bcd85fb89a50bfa257ba4e6144e95a36d845ba25cbefe81224e9b3fad6db52e1ec5c9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-fragops/metadata.xml b/games-fps/ut2004-fragops/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-fragops/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild b/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
deleted file mode 100644
index c20d529387f3..000000000000
--- a/games-fps/ut2004-fragops/ut2004-fragops-2.20.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="realism mod"
-MOD_NAME="Frag Ops"
-MOD_DIR="FragOps"
-MOD_ICON="Help/FragOps.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/fragops"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/fragops_v220_fulllmw.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f *.TXT ${MOD_DIR}/*.bat || die
-}
diff --git a/games-fps/ut2004-hamsterbash-1 b/games-fps/ut2004-hamsterbash-1
new file mode 100644
index 000000000000..a17732a73ad2
--- /dev/null
+++ b/games-fps/ut2004-hamsterbash-1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Hamster Bash - Cute and violent hamster cage rampage mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/hamsterbash
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=fetch
+SLOT=0
+SRC_URI=HamsterBashFinal.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e422c2e99fb25b52a3cd1d5007fefcc9
diff --git a/games-fps/ut2004-hamsterbash/Manifest b/games-fps/ut2004-hamsterbash/Manifest
deleted file mode 100644
index 3e1811f310ff..000000000000
--- a/games-fps/ut2004-hamsterbash/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HamsterBashFinal.zip 98608028 BLAKE2B f80aabf16768adfa511efd72d762e50fdf45e98286306dab861d1989405d32712d03631d53b3f959c033e4e9c491b3ff16825fb00f33f75bfbe697d1f22be65b SHA512 641a642ce08d5188045f9d015a92f0846ac22c65b7b047bb0096f216d7cb9d0a8074e5e11b01fc187b56fbdf2d5cbc0e5cd56c2eb3f40f744fbeadf291e08573
-EBUILD ut2004-hamsterbash-1.ebuild 601 BLAKE2B 9d6b099dde214bb8d3fec6ee40a930384cb81909cdf62f1ec62cc4357d3df398f0f26822dc008f6e6094f5367ae4e16339e7ab7b824543e5cefe0fcc50992c46 SHA512 4682c645342549fc30c6bfd85fcd6be72ebb48342e9a2fc10d4e65f71b1b4adf796dee9bdb077e2bc54647c42c4760baa6ef4c656dc69ad86c13ab261d610c87
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-hamsterbash/metadata.xml b/games-fps/ut2004-hamsterbash/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-hamsterbash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild b/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
deleted file mode 100644
index deff807a29dd..000000000000
--- a/games-fps/ut2004-hamsterbash/ut2004-hamsterbash-1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Cute and violent hamster cage rampage mod"
-MOD_NAME="Hamster Bash"
-MOD_DIR="hamsterbash"
-
-inherit unpacker games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/hamsterbash"
-SRC_URI="HamsterBashFinal.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "${HOMEPAGE}"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	mv -f HamsterBash ${MOD_DIR} || die
-	rm -rf System
-}
diff --git a/games-fps/ut2004-muralis-1.15 b/games-fps/ut2004-muralis-1.15
new file mode 100644
index 000000000000..d79686035e09
--- /dev/null
+++ b/games-fps/ut2004-muralis-1.15
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Muralis - third-person hand-to-hand single/multiplayer mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/muralis
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://ut.rushbase.net/beyondunreal/mods/muralis-v1.15-zip.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=25f0e773d2d0a5113c32a0788c2c68c4
diff --git a/games-fps/ut2004-muralis/Manifest b/games-fps/ut2004-muralis/Manifest
deleted file mode 100644
index d17b08ef7865..000000000000
--- a/games-fps/ut2004-muralis/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST muralis-v1.15-zip.zip 62575050 BLAKE2B e168053472e63507667707295b3bfee261f802017cdd82e3b35b33855747fa19b75c4861f991b7678861cf8bfe84ea00ce697d979cd19c297c05c06b1c87d910 SHA512 b50477e3ef221241a430f95a390e34d5ffee3ea460e62bafa30b534d6499ef1a616d8ca35f77179e8f7a50b5e69f82441cb9779d38e71388c2868add45822330
-EBUILD ut2004-muralis-1.15.ebuild 489 BLAKE2B 2e483fe134a76c22546c53209786eaca5db34733ac57cafeb963aff512b4a34a73c92b4fd2874a1e18c31b2d81308f45e5c0888443902ecbe34e415f175d82f9 SHA512 14476b7cf20ba34492a1084388a63d8010bb78dabc84ea087e35cd418334510aa0d459c7ef611497744d90cd662d714f45d938a089d9cf25cc181ed8d142f845
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-muralis/metadata.xml b/games-fps/ut2004-muralis/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-muralis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild b/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
deleted file mode 100644
index 70fe77742c3c..000000000000
--- a/games-fps/ut2004-muralis/ut2004-muralis-1.15.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="third-person hand-to-hand single/multiplayer mod"
-MOD_NAME="Muralis"
-MOD_DIR="muralis"
-
-inherit unpacker games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/muralis"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/muralis-v${PV}-zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	mv -f Muralis ${MOD_DIR} || die
-}
diff --git a/games-fps/ut2004-strikeforce-4.1 b/games-fps/ut2004-strikeforce-4.1
new file mode 100644
index 000000000000..5c1cfaca2d64
--- /dev/null
+++ b/games-fps/ut2004-strikeforce-4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Strike Force - a terrorist vs. strike force mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/strike-force-2004
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://ut.rushbase.net/beyondunreal/mods/strikeforce-ce-v4.1.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dad35897abac4779f8618aeca334de16
diff --git a/games-fps/ut2004-strikeforce/Manifest b/games-fps/ut2004-strikeforce/Manifest
deleted file mode 100644
index f1630ab367c5..000000000000
--- a/games-fps/ut2004-strikeforce/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST strikeforce-ce-v4.1.zip 452020366 BLAKE2B de157150409c0be828241c06eab56cd75af777dd52eecf0c0aefa47970a693606428cef84d1c6e6f85730f6e95b1c165cb56cf2801ca926888d308ff0309b68b SHA512 758de1fa2a39b822114b7f224668acdbeffba6d62cc1b1a31104fcac4f84b6859cfa9a024d4d682682cf4f52de7118c1cbaa080a4887c6d882c0c7fb78ef3b49
-EBUILD ut2004-strikeforce-4.1.ebuild 477 BLAKE2B 96d6bcd20032d56429dbfaa05b3753faa2b84eea34f38cb049e223baf4d1c04aed25087b7a4e828ac665b583c3ef4676d3c9073af7d0fdb332426626b893e3b9 SHA512 415ff6790b094c038548a7d2425ec6ddfc1f5cc63c26c2f5e9771926fb5b9feb2e37522909c8d8c8ef26df03c568a0e8bdee8b116d6fdbf994ee0b45c2304c34
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-strikeforce/metadata.xml b/games-fps/ut2004-strikeforce/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-strikeforce/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild b/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
deleted file mode 100644
index d29a723f4f68..000000000000
--- a/games-fps/ut2004-strikeforce/ut2004-strikeforce-4.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="a terrorist vs. strike force mod"
-MOD_NAME="Strike Force"
-MOD_DIR="StrikeForce"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/strike-force-2004"
-SRC_URI="https://ut.rushbase.net/beyondunreal/mods/strikeforce-ce-v${PV}.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-
-src_prepare() {
-	rm -f ${MOD_DIR}/*.exe
-}
diff --git a/games-fps/ut2004-troopers-6.0 b/games-fps/ut2004-troopers-6.0
new file mode 100644
index 000000000000..65adea5e15d3
--- /dev/null
+++ b/games-fps/ut2004-troopers-6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 Troopers - Star Wars mod
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/troopers-dawn-of-destiny/
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=fetch
+SLOT=0
+SRC_URI=troopersversion60zip.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8296f6a17e2359a430782d745c532aa1
diff --git a/games-fps/ut2004-troopers/Manifest b/games-fps/ut2004-troopers/Manifest
deleted file mode 100644
index cddb251a3d33..000000000000
--- a/games-fps/ut2004-troopers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST troopersversion60zip.zip 447383148 BLAKE2B 4eed868b0a8631529f0e09227d45db4f0a89ff7088cec2c03c263323aa9385f204561b278a9e6c408db6d972e773e2c3d3cbc7dff64ba0cd04fc603ce541d297 SHA512 2eec66a55b0733f2f5ee65e8a4deb329a50bcd47aa6fdcb7252a88c01e4e8db563b568d3176233a51711240e7b4dfebe0d8a8712d624915a872e8bfeb321cda4
-EBUILD ut2004-troopers-6.0.ebuild 585 BLAKE2B eb699a6086fa94879053b6c8d052e8ac79c6f8f1af72b4dbfac05e065254155ef33cd5f42a281fb9d95ce224f6f370e80d56663dc66fb367c9ab30433c91688d SHA512 dce38c80bbd43f75b412af28d701a12c681e19773af1412509831926ad519dc3f55af0b48f804e679f1b06a39aaea3d97efb21eebb0de8360b6ffa0bba5083e5
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-troopers/metadata.xml b/games-fps/ut2004-troopers/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-troopers/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild b/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
deleted file mode 100644
index f3a202a6c7b3..000000000000
--- a/games-fps/ut2004-troopers/ut2004-troopers-6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MOD_DESC="Star Wars mod"
-MOD_NAME="Troopers"
-MOD_DIR="Troopers"
-MOD_ICON="Help/Troopers.ico"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/troopers-dawn-of-destiny/"
-SRC_URI="troopersversion${PV/.}zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch"
-
-pkg_nofetch() {
-	elog "Please download ${SRC_URI} from:"
-	elog "${HOMEPAGE}"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	rm -f ${MOD_DIR}/*.{bat,sh}
-}
diff --git a/games-fps/ut2004-unwheel-0_beta5 b/games-fps/ut2004-unwheel-0_beta5
new file mode 100644
index 000000000000..712123df835e
--- /dev/null
+++ b/games-fps/ut2004-unwheel-0_beta5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=UT2004 UnWheel - multiplayer driving mod focusing on fun driving
+EAPI=5
+HOMEPAGE=https://www.moddb.com/mods/unwheel
+IUSE=dedicated opengl dedicated opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GameFront
+RDEPEND=games-misc/games-envd dedicated? ( || ( games-server/ut2004-ded games-fps/ut2004[dedicated] ) ) opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) !dedicated? ( !opengl? ( || ( games-fps/ut2004[opengl] games-fps/ut2004[-dedicated] ) ) )
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=unwheel_r5.zip unwheelcbpvol1.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	games-mods	717d443e8308768de4178537c370a7ab	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=efe2a5d59c74a1e624b0e2da1b6ffc0b
diff --git a/games-fps/ut2004-unwheel/Manifest b/games-fps/ut2004-unwheel/Manifest
deleted file mode 100644
index 7c366041cb15..000000000000
--- a/games-fps/ut2004-unwheel/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST unwheel_r5.zip 596390232 BLAKE2B 583b89cd10962e09084f66d85ba437cc336fc3818a9af1cab30d553dc213efa23f88692d555842dbf5c5a7fc27fe607066695163503131d4cadff548d1bb5f91 SHA512 4cf319b1e20c9faa5e248e3a39a015b9a37d6defe4a8f31d634931a426dec957a1330d559d45333fda9a2451f9f3a0f7161d94c101d46950f6921fcfc0d87ee3
-DIST unwheelcbpvol1.zip 138178365 BLAKE2B 25f3f61803c63e7cf6f5e4dd7da29ff9c3d90481677416bcb10cc3fae26db5aa6b0065fe945e46b632852b6e9853a7263f97bfc6de2a2a8b13067d1e917d12b4 SHA512 0cb1c3a64d8cd4448ebdfde175a25afa253336102831fa8a2abc113064cca4a0afbe90e806b4c1d1fa898142496070349566e2bcf5aad42ba12dec2c947e6fcc
-EBUILD ut2004-unwheel-0_beta5.ebuild 684 BLAKE2B bbde5642bc4d9a656dd1ddc265c16647c26bc30775a7553cf0cd14f2020c9e6da882a1ac27aeb68da9f350b43bb7ab1ee7672e11a8423a36e3f9779f1f6e9068 SHA512 0255c0782601f5200b31ae93a1d77ec466c28821be69550ae8b57b23c48ce414cb3aa1757deb2c4b138e3bad17f11b86d8598e9da0753b5751a46bdf97305f08
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-unwheel/metadata.xml b/games-fps/ut2004-unwheel/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004-unwheel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild b/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
deleted file mode 100644
index 934b1d4547dd..000000000000
--- a/games-fps/ut2004-unwheel/ut2004-unwheel-0_beta5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="multiplayer driving mod focusing on fun driving"
-MOD_NAME="UnWheel"
-MOD_DIR="unwheel"
-
-inherit games games-mods
-
-HOMEPAGE="https://www.moddb.com/mods/unwheel"
-SRC_URI="unwheel_r5.zip
-	unwheelcbpvol1.zip"
-
-LICENSE="GameFront"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="fetch bindist"
-
-pkg_nofetch() {
-	elog "Please download the following files:"
-	elog "http://www.filefront.com/5110896"
-	elog "http://www.filefront.com/13792114"
-	elog "and move them to ${DISTDIR}"
-}
-
-src_unpack() {
-	mkdir ${MOD_DIR} || die
-	cd ${MOD_DIR} || die
-	unpack ${A}
-}
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
deleted file mode 100644
index dc7dd6fa984d..000000000000
--- a/games-fps/ut2004/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
-DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-3369.3-r1.ebuild 3947 BLAKE2B d5737cd41897625b609361390af6fe310f9548b3d7778c8dfe8334798ecd3897b157910bbe1ca92497f80d986c155d99e078a266179e7143b296a84428977a95 SHA512 6b4f7f517e6cf35faa699478e505f65d050f9f3cb68546b96af563f18e8baec3e5ce3e7d494de794f76c62bc37feaa91666ef8f803521a7c726b6cded2461e70
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004/metadata.xml b/games-fps/ut2004/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-fps/ut2004/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-fps/ut2004/ut2004-3369.3-r1.ebuild b/games-fps/ut2004/ut2004-3369.3-r1.ebuild
deleted file mode 100644
index 7ea5df936e1b..000000000000
--- a/games-fps/ut2004/ut2004-3369.3-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib games
-
-MY_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Editor's Choice Edition plus Mega Pack for the well-known first-person shooter"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="
-	http://treefort.icculus.org/${PN}/${MY_P}
-	http://storage.guntoo.de/downs/downloads/Patch/ut2004-v${PV/./-}-linux-dedicated.7z
-	mirror://gentoo/ut2004-v${PV/./-}-linux-dedicated.7z"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated opengl"
-RESTRICT="mirror strip"
-
-UIDEPEND="=virtual/libstdc++-3.3
-	virtual/opengl
-	x11-libs/libXext
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	media-libs/libsdl
-	media-libs/openal"
-RDEPEND="sys-libs/glibc
-	games-fps/ut2004-data
-	games-fps/ut2004-bonuspack-ece
-	games-fps/ut2004-bonuspack-mega
-	dedicated? ( !games-server/ut2004-ded )
-	opengl? ( ${UIDEPEND} )
-	!dedicated? ( !opengl? ( ${UIDEPEND} ) )"
-DEPEND="app-arch/p7zip"
-
-S=${WORKDIR}/UT2004-Patch
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-# The executable pages are required #114733
-QA_PREBUILT="${dir:1}/System/ut2004-bin
-	${dir:1}/System/ucc-bin"
-
-src_prepare() {
-	cd "${S}"/System
-
-	# These files are owned by ut2004-bonuspack-mega
-	rm -f Manifest.in{i,t} Packages.md5 ucc-bin* || die
-
-	if use amd64 ; then
-		mv -f ut2004-bin-linux-amd64 ut2004-bin || die
-	else
-		rm -f ut2004-bin-linux-amd64 || die
-	fi
-
-	cd "${WORKDIR}"/ut2004-ucc-bin-09192008
-	if use amd64 ; then
-		mv -f ucc-bin-linux-amd64 "${S}"/System/ucc-bin || die
-	else
-		mv -f ucc-bin "${S}"/System/ || die
-	fi
-
-	if use dedicated && ! use opengl ; then
-		rm -f "${S}"/System/ut2004-bin || die
-	fi
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/System/ucc-bin
-
-	if use opengl || ! use dedicated ; then
-		fperms +x "${dir}"/System/ut2004-bin
-
-		dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so
-		dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0
-
-		games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
-		make_desktop_entry ut2004 "Unreal Tournament 2004"
-	fi
-
-	if use dedicated ; then
-		games_make_wrapper ut2004-ded "./ucc-bin server" "${dir}"/System
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# Here is where we check for the existence of a cdkey...
-	# If we don't find one, we ask the user for it
-	if [[ -f ${dir}/System/cdkey ]] ; then
-		einfo "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can [re]enter your cdkey."
-	fi
-	elog "Starting with 3369, the game supports render-to-texture. To enable"
-	elog "it, you will need the Nvidia drivers of at least version 7676 and"
-	elog "you should edit the following:"
-	elog 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
-	elog 'section of your UT2004.ini or Default.ini and set "bPlayerShadows=True"'
-	elog 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
-	elog 'your User.ini or DefUser.ini.'
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here so"
-	ewarn "make sure you type it in correctly."
-	ewarn "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [[ -z ${CDKEY1} ]] || [[ -z ${CDKEY2} ]] ; then
-			echo "You entered a blank CD key. Try again."
-		else
-			if [[ ${CDKEY1} == ${CDKEY2} ]] ; then
-				echo "${CDKEY1}" | tr [:lower:] [:upper:] > "${dir}"/System/cdkey
-				einfo "Thank you!"
-				break
-			else
-				eerror "Your CD key entries do not match. Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/wolfgl-0.93-r2 b/games-fps/wolfgl-0.93-r2
new file mode 100644
index 000000000000..fb8c5aed8496
--- /dev/null
+++ b/games-fps/wolfgl-0.93-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=virtual/opengl app-arch/unzip x11-base/xorg-proto
+DESCRIPTION=Wolfenstein and Spear of Destiny port using OpenGL
+EAPI=6
+HOMEPAGE=http://wolfgl.sourceforge.net/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl
+SLOT=0
+SRC_URI=mirror://gentoo/wolfgl-0.93.tbz2 mirror://sourceforge/wolfgl/wolfdata.zip mirror://sourceforge/wolfgl/sdmdata.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ee158baa655752be3846fae71f50cde8
diff --git a/games-fps/wolfgl/Manifest b/games-fps/wolfgl/Manifest
deleted file mode 100644
index ab3156b98e53..000000000000
--- a/games-fps/wolfgl/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 0.93-gcc.patch 5604 BLAKE2B 56f6bae7ee24f69bf628bbb81fbc664673b233675ac2bffa358a31a21161b0e00507c2c8bacf0b6c3dd65e42413c3904d8bfd8afeddeabbcc8890d0aa86e00a2 SHA512 5de8a4fb661b8b1ca4c7abbc56f2dd676333157ccf459297fd455e15132b5e5356d3ea8dde418c0848cb521dac5ad9ac017252829eae5936a2d6abf4fcfdf841
-AUX 0.93-gcc4.patch 2095 BLAKE2B 792a92d13add55505d0268cfa6764b46e5b7d7370e6cbb157624d4db9025ed6ac3a646a92bb6f4dd37de324d167bf1ebbf9936704e6ea3713d853e282ad2c361 SHA512 7b7452a22f4bdf4dedc1ba2ed46f8c629a0f0596d8c518f49f28ba01a346b5e6d388f80c265eb16d17ca3fd7b9b9fa4c15580e8b89968a11c2e8614ffafb191e
-AUX 0.93-sample-rate.patch 344 BLAKE2B a0f7fd0673a2be1d24b27a340f3465e654352f65438bec8e58a953086d10c97d466c14432d9a8612c7fdbd5e6a8edead08a5a8cf36bd41490b09dbc3e21cc3ce SHA512 63a7d2b18bde6f3b443aa6cb32bc6f9be0c094836231e97495e0f8d553a4c38166036a2233af37bde6f2b2198d81d4e27f3a10393d9a4ae74a802c2881e20bbc
-AUX 0.93-sprite.patch 2318 BLAKE2B 1fd1deb499b6c3ee513064dbba5573b3cae31c50f2bda4ba0cebc6e09f216e7debc82aac0d5367ab4518c9a682671f8abb9eba5a3932ea8505101372993681e9 SHA512 8904f5470e84b416cdfdd7acabc89122885600f759a938cd81b1d96fe067c8c82378400e5ddf225eb774b24c5ac18e6e7b8f6d27681c3462130f2122b2f53c3a
-AUX wolfgl-0.93-as-needed.patch 397 BLAKE2B f51e7d40ead7ae01ba2f362ccd33107128841bc61d751529cfc697dc316c350a795670e3ec205f3bf27a8dc0324921e27248345bd5fc4d7d3fb507e9fa178851 SHA512 cdcd1aa914a6fe48e3477b24f051fb36d255542031abb2d2f46a9bb0da081b0093d1efb1b35b55cbfeec1ef6e989102e45bfb6f14246923263e102b2f0920bae
-DIST sdmdata.zip 557147 BLAKE2B a70a821941175aecfd3edd7746ed54e13181863ddb25bfcc77bf354b1366541b71462739543a1ba9aa548a754b8a88db60eff0cf5d8313097f6d41cb62892b3a SHA512 cf6eae7027acbe6e3da6985639eb36def04254790f6449f5353ffe5edd13a73c01b0a35ef9873f2e97d09ec59e632337c5b3a1a26185befdf4dfa5a161267076
-DIST wolfdata.zip 564771 BLAKE2B 0c1343cae6fbcb695930899fd2ba9e5798af47f4bec984fa15cdca85c9d96e5dd9ed6e5ff2b7bc489251e5be6342ed94a8cb7c626f39564a8599d5d3fe5eb6d2 SHA512 2b14c477e54d14fc543e146fa699f55dabb003bd3bac1e89422a49391cf8f29b5db6967b09c08a82c612f73fe71d624902c180d81481ad42f011f51448652a43
-DIST wolfgl-0.93.tbz2 146132 BLAKE2B b9dbf442be01a516c5cbf1146892d610df881109ca163ec7c1c79bd9ea1c328d8e9401ba5615e1be9c2df5df3940b83fdbe36154c4f0429b617dc6208b6ccf78 SHA512 834dda2eb4e099d70fad52e40760886208c5ca60e687024f1fe51088b94c8cdea7c058d326daa61966946bb70feeee97d0b7fb7c284e98fdec0eb8c503de7e30
-EBUILD wolfgl-0.93-r2.ebuild 1410 BLAKE2B fe736a982fb871c177ab9fcc27a19af1144bd1dbe91e1e5fbd0853adb9ea81850c7d5d812f16bac78a110c1285aa4fe84db2fff6f98fdf468cd4e3a0270d9fe5 SHA512 ec96d3f9c8a716c359314e179727c0512b55e12c706d3ddc3d35348fcf00e8f43f11da17f7500d3551eac18ee6978b42e398df6398cebeccda5ed713b876ec86
-MISC metadata.xml 451 BLAKE2B 0b88acdbf3a154c982180c671b1e5ee23fdac3b2c36650e7b425cffb752dbe209d8beb010047fdd5a8e654740c49453c5b6eb556d68bc9b7b1ffa583e83b1286 SHA512 2623437ddb8f1ebc5290d5076894cf2059df12f31a22043de4cb3246648076f7ba6dc923fde07812038a2405836d57d4f9171f5c80fcfc498ae452616128a8e8
diff --git a/games-fps/wolfgl/files/0.93-gcc.patch b/games-fps/wolfgl/files/0.93-gcc.patch
deleted file mode 100644
index a22923393678..000000000000
--- a/games-fps/wolfgl/files/0.93-gcc.patch
+++ /dev/null
@@ -1,209 +0,0 @@
-diff -abur a/common/console.c b/common/console.c
---- a/common/console.c	2000-09-27 16:19:44.000000000 +0200
-+++ b/common/console.c	2003-09-11 19:59:46.037562040 +0200
-@@ -3,6 +3,14 @@
- #include "id_us.h"
- #include "console.h"
- 
-+#ifdef _LINUX
-+#include <string.h>
-+#endif
-+
-+#ifdef _LINUX
-+#include <string.h>
-+#endif
-+
- static char con_lines[32][45];	// buffer
- static int con_active;			// console is visible
- static int con_current;			// current line
-diff -abur a/common/id_in.h b/common/id_in.h
---- a/common/id_in.h	2000-09-27 16:04:26.000000000 +0200
-+++ b/common/id_in.h	2003-09-11 19:32:14.368653880 +0200
-@@ -178,6 +178,7 @@
- 
- void IN_Startup();
- void IN_Shutdown();
-+void IN_KeyEvent(unsigned char key);
- void IN_Default(wbool gotit, ControlType in);
- void IN_ClearKeysDown();
- void IN_ReadControl(int player, ControlInfo *info);
-diff -abur a/common/id_vh.c b/common/id_vh.c
---- a/common/id_vh.c	2000-09-26 17:39:36.000000000 +0200
-+++ b/common/id_vh.c	2003-09-11 19:24:57.183116184 +0200
-@@ -230,3 +230,4 @@
- 
- }
- */
-\ No newline at end of file
-+
-diff -abur a/common/opengl.c b/common/opengl.c
---- a/common/opengl.c	2000-09-27 16:04:26.000000000 +0200
-+++ b/common/opengl.c	2003-09-11 19:22:35.622636648 +0200
-@@ -1,5 +1,10 @@
- #include <stdio.h>
- #include <stdlib.h>
-+
-+#ifdef _LINUX
-+#include <string.h>
-+#endif
-+
- #include "system.h"
- #include "opengl.h"
- #include "wl_def.h"
-diff -abur a/common/wl_act2.c b/common/wl_act2.c
---- a/common/wl_act2.c	2000-09-27 16:04:26.000000000 +0200
-+++ b/common/wl_act2.c	2003-09-11 19:19:45.511497472 +0200
-@@ -1,5 +1,9 @@
- // WL_ACT2.C
- 
-+#ifdef _LINUX
-+#include <stdlib.h>
-+#endif
-+
- #include "wl_def.h"
- 
- //=============================================================================
-diff -abur a/common/wl_agent.c b/common/wl_agent.c
---- a/common/wl_agent.c	2003-09-11 20:04:40.738760648 +0200
-+++ b/common/wl_agent.c	2003-09-11 19:57:06.860760592 +0200
-@@ -3,6 +3,10 @@
- #include <string.h>
- #include "wl_def.h"
- 
-+#ifdef _LINUX
-+#include <stdlib.h>
-+#endif
-+
- //=============================================================================
- //						 LOCAL CONSTANTS
- //=============================================================================
-diff -abur a/common/wl_draw.c b/common/wl_draw.c
---- a/common/wl_draw.c	2003-09-11 20:04:40.739760496 +0200
-+++ b/common/wl_draw.c	2003-09-11 19:20:33.512200256 +0200
-@@ -2,6 +2,11 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+
-+#ifdef _LINUX
-+#include <string.h>
-+#endif
-+
- #include "system.h"
- #include "opengl.h"
- #include "wl_def.h"
-diff -abur a/common/wl_menu.c b/common/wl_menu.c
---- a/common/wl_menu.c	2000-09-27 16:04:27.000000000 +0200
-+++ b/common/wl_menu.c	2003-09-11 20:07:38.892677136 +0200
-@@ -5,6 +5,10 @@
- //
- ////////////////////////////////////////////////////////////////////
- 
-+#ifdef _LINUX
-+#include "../linux/input.h"
-+#endif
-+
- #include <string.h>
- #include "opengl.h"
- #include "wl_def.h"
-diff -abur a/common/wl_menu.h b/common/wl_menu.h
---- a/common/wl_menu.h	2000-09-26 17:38:31.000000000 +0200
-+++ b/common/wl_menu.h	2003-09-11 18:31:41.593919584 +0200
-@@ -233,3 +233,4 @@
- void NonShareware();
- /*int GetYorN(int x,int y,int pic);
- */
-\ No newline at end of file
-+
-diff -abur a/common/wl_play.c b/common/wl_play.c
---- a/common/wl_play.c	2000-09-27 16:04:27.000000000 +0200
-+++ b/common/wl_play.c	2003-09-11 19:40:31.293109880 +0200
-@@ -1,6 +1,11 @@
- // WL_PLAY.C
- 
- #include <memory.h>
-+
-+#ifdef _LINUX
-+#include "../linux/input.h"
-+#endif
-+
- #include "wl_def.h"
- #include "system.h"
- 
-diff -abur a/common/wl_state.c b/common/wl_state.c
---- a/common/wl_state.c	2000-09-27 16:04:27.000000000 +0200
-+++ b/common/wl_state.c	2003-09-11 19:23:26.895841936 +0200
-@@ -2,6 +2,10 @@
- 
- #include "wl_def.h"
- 
-+#ifdef _LINUX
-+#include <stdlib.h>
-+#endif
-+
- //=============================================================================
- //						 GLOBAL VARIABLES
- //=============================================================================
-diff -abur a/common/wl_text.c b/common/wl_text.c
---- a/common/wl_text.c	2000-09-26 17:40:23.000000000 +0200
-+++ b/common/wl_text.c	2003-09-11 19:19:00.110399488 +0200
-@@ -4,6 +4,10 @@
- #include "wl_def.h"
- #include "system.h"
- 
-+#ifdef _LINUX
-+#include <string.h>
-+#endif
-+
- #ifndef SPEAR
- 
- void FreeMusic(); // WL_MENU.C
-diff -abur a/linux/sound.c b/linux/sound.c
---- a/linux/sound.c	2000-09-26 17:57:48.000000000 +0200
-+++ b/linux/sound.c	2003-09-11 19:55:16.702507192 +0200
-@@ -9,6 +9,8 @@
- #include <stdlib.h>
- 
- #include <sys/time.h>
-+#include <string.h>
-+#include <errno.h>
- 
- #include <fcntl.h>
- #include <unistd.h>
-diff -abur a/linux/sound.h b/linux/sound.h
---- a/linux/sound.h	2000-09-26 17:57:48.000000000 +0200
-+++ b/linux/sound.h	2003-09-11 19:44:03.663824624 +0200
-@@ -1,5 +1,8 @@
- void S_LoadSound(int id, void* data, long length);
- void S_PlaySound(int id, int pan);
-+void S_UpdateSound();
-+void S_InitSound();
-+void S_ShutDownSound();
- 
- extern int DigitalDevice;
- 
-diff -abur a/linux/system.c b/linux/system.c
---- a/linux/system.c	2000-09-26 17:57:48.000000000 +0200
-+++ b/linux/system.c	2003-09-11 19:42:14.955350824 +0200
-@@ -1,9 +1,12 @@
- #include <stdio.h>
-+#include <string.h>
-+#include <unistd.h>
- #include <sys/time.h>
- #include <X11/keysym.h>
- #include <GL/gl.h>
- #include <GL/glx.h>
- #include "wl_def.h"
-+#include "sound.h"
- 
- int screen_width, screen_height;
- Display *dpy;
-@@ -117,7 +120,7 @@
-    visinfo = glXChooseVisual( dpy, scrnum, attrib );
-    if (!visinfo) {
-       printf("Error: couldn't get an RGB, Double-buffered visual\n");
--      exit(1);
-+      _exit(1);
-    }
- 
-    /* window attributes */
diff --git a/games-fps/wolfgl/files/0.93-gcc4.patch b/games-fps/wolfgl/files/0.93-gcc4.patch
deleted file mode 100644
index 5dcccd76049b..000000000000
--- a/games-fps/wolfgl/files/0.93-gcc4.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -ur wolfgl-0.93-orig/common/id_ca.c wolfgl-0.93/common/id_ca.c
---- wolfgl-0.93-orig/common/id_ca.c	2006-01-28 16:59:10.000000000 -0500
-+++ wolfgl-0.93/common/id_ca.c	2006-01-28 17:04:26.000000000 -0500
-@@ -252,6 +252,7 @@
- {
- 	unsigned short ch,chhigh,count,offset;
- 	unsigned short *copyptr, *inptr, *outptr;
-+	unsigned char *uc_inptr;
- 
- 	length/=2;
- 
-@@ -268,13 +269,17 @@
- 			if (!count)
- 			{
- 				// have to insert a word containing the tag byte
--				ch |= *((unsigned char*)inptr)++;
-+				uc_inptr = (unsigned char*)inptr;
-+				ch |= *(uc_inptr)++;
-+				inptr = (unsigned short *)uc_inptr;
- 				*outptr++ = ch;
- 				length--;
- 			}
- 			else
- 			{
--				offset = *((unsigned char*)inptr)++;
-+				uc_inptr = (unsigned char*)inptr;
-+				offset = *(uc_inptr)++;
-+				inptr = (unsigned short *)uc_inptr;
- 				copyptr = outptr - offset;
- 				length -= count;
- 				while (count--)
-@@ -287,7 +292,9 @@
- 			if (!count)
- 			{
- 				// have to insert a word containing the tag byte
--				ch |= *((unsigned char*)inptr)++;
-+				uc_inptr = (unsigned char*)inptr;
-+				ch |= *(uc_inptr)++;
-+				inptr = (unsigned short *)uc_inptr;
- 				*outptr++ = ch;
- 				length --;
- 			}
-@@ -806,7 +813,7 @@
- 
- 	for (i=0;i<NUMCHUNKS;i++)
- 		if (grsegs[i])
--			MM_SetPurge (&(memptr)grsegs[i],3);
-+			MM_SetPurge ((memptr)&grsegs[i],3);
- 	ca_levelbit<<=1;
- 	ca_levelnum++;
- }
-@@ -862,7 +869,7 @@
- 
- 	for (i = 0; i < NUMCHUNKS; i++)
- 		if (grsegs[i])
--			MM_SetPurge (&(memptr)grsegs[i],3);
-+			MM_SetPurge ((memptr)&grsegs[i],3);
- }
- 
- //===========================================================================
-diff -ur wolfgl-0.93-orig/common/wl_game.c wolfgl-0.93/common/wl_game.c
---- wolfgl-0.93-orig/common/wl_game.c	2006-01-28 16:59:10.000000000 -0500
-+++ wolfgl-0.93/common/wl_game.c	2006-01-28 17:07:08.000000000 -0500
-@@ -545,13 +545,13 @@
- 			{
- 				// solid wall
- 				tilemap[x][y] = tile;
--				(unsigned short)actorat[x][y] = tile;
-+				actorat[x][y] = tile;
- 			}
- 			else
- 			{
- 				// area floor
- 				tilemap[x][y] = 0;
--				(unsigned short)actorat[x][y] = 0;
-+				actorat[x][y] = 0;
- 			}
- 		}
- 
-
diff --git a/games-fps/wolfgl/files/0.93-sample-rate.patch b/games-fps/wolfgl/files/0.93-sample-rate.patch
deleted file mode 100644
index 6e7156a1c716..000000000000
--- a/games-fps/wolfgl/files/0.93-sample-rate.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/linux/sound.c	2003-09-11 20:28:32.032170976 +0200
-+++ b/linux/sound.c	2003-09-11 20:28:45.111182664 +0200
-@@ -64,7 +64,7 @@
- #define BUFMUL                  4
- #define MIXBUFFERSIZE		(SAMPLECOUNT*BUFMUL)
- 
--#define SAMPLERATE		11025	// Hz
-+#define SAMPLERATE		8000	// Hz
- #define SAMPLESIZE		2   	// 16bit
- 
- // The actual output device.
diff --git a/games-fps/wolfgl/files/0.93-sprite.patch b/games-fps/wolfgl/files/0.93-sprite.patch
deleted file mode 100644
index 135eb8e26eed..000000000000
--- a/games-fps/wolfgl/files/0.93-sprite.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/common/wl_agent.c	2003-09-11 20:39:02.674298800 +0200
-+++ b/common/wl_agent.c	2003-09-11 20:42:17.229721880 +0200
-@@ -919,32 +919,31 @@
- 	viewdist = 0x7fffffffl;
- 	closest = NULL;
- 
--//	while (1)
-+	while (1)
- 	{
- 		oldclosest = closest;
- 
- 		for (check=ob->next ; check ; check=check->next)
- 			if ((check->flags & FL_SHOOTABLE)
--				//&&
-+				&&
- //				(check->flags & FL_VISABLE) &&
--//				(abs(check->viewx - centerx) < shootdelta)
-+				(abs(check->viewx - centerx) < shootdelta)
- 			)
--//			{
-+			{
- 		if (CheckLine(check))
--//				if (check->transx < viewdist)
-+				if (check->transx < viewdist)
- 				{
--//					viewdist = check->transx;
-+					viewdist = check->transx;
- 					closest = check;
--			break;
- 				}
--//			}
-+			}
- 
- 		if (closest == oldclosest)
- 			return; // no more targets, all missed
- 
- 		// trace a line from player to enemey
--//		if (CheckLine(closest))
--//			break;
-+		if (CheckLine(closest))
-+			break;
- 	}
- 
- 	// hit something
---- a/common/wl_draw.c	2003-09-11 20:43:26.473195272 +0200
-+++ b/common/wl_draw.c	2003-09-11 20:46:57.859059736 +0200
-@@ -877,7 +877,7 @@
- 		tilespot = &tilemap[0][0]+spotloc;
- 
- 		// could be in any of the nine surrounding tiles
--		if ((*visspot) ||
-+		if (1 || (*visspot) ||
- 			(*(visspot-1) && !*(tilespot-1)) ||
- 			(*(visspot+1) && !*(tilespot+1)) ||
- 			(*(visspot-65) && !*(tilespot-65)) ||
-@@ -980,6 +980,8 @@
- 
- 	for (obj = player->next; obj; obj = obj->next)
- 	{
-+		int sprite;
-+
- 		if (!areabyplayer[obj->areanumber])
- 			continue;
- 		if (!gamestates[obj->state].shapenum)
-@@ -989,10 +991,14 @@
- 		glTranslated((float)obj->x/(1<<16), (float)obj->y/(1<<16), 0);
- 		glRotated(-player->angle, 0,0,1);
- 
--		if (texture_index[PMSpriteStart+gamestates[obj->state].shapenum] == 0)
--			CreateSprite(PMSpriteStart+gamestates[obj->state].shapenum);
-+                sprite = gamestates[obj->state].shapenum;
-+                if (gamestates[obj->state].rotate)
-+                        sprite += CalcRotate(obj);
-+
-+                if (texture_index[PMSpriteStart+sprite] == 0)
-+                        CreateSprite(PMSpriteStart+sprite);
- 		else
--			glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+gamestates[obj->state].shapenum]);
-+			glBindTexture(GL_TEXTURE_2D, texture_index[PMSpriteStart+sprite]);
- 
- 		glBegin(GL_QUADS);
- 		glTexCoord2f(0,0);
diff --git a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch b/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch
deleted file mode 100644
index f9da771e1d79..000000000000
--- a/games-fps/wolfgl/files/wolfgl-0.93-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/linux/Makefile    2009-02-06 14:27:11.000000000 +0100
-+++ b/linux/Makefile    2009-02-06 14:27:40.000000000 +0100
-@@ -19,7 +19,7 @@
- 	@echo 'Do not call this file directly' 
- 
- wolfgl: $(LINUX_OBJS) $(COMMON_OBJS)
--	$(CC) $(LINK_FLAGS) $(COMMON_OBJS) $(LINUX_OBJS) -o $(OUTDIR)/wolfgl
-+	$(CC) $(LDFLAGS) $(COMMON_OBJS) $(LINUX_OBJS) $(LINK_FLAGS) -o $(OUTDIR)/wolfgl
- 
- # common directory
- 
diff --git a/games-fps/wolfgl/metadata.xml b/games-fps/wolfgl/metadata.xml
deleted file mode 100644
index 92093a34cff1..000000000000
--- a/games-fps/wolfgl/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">wolfgl</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild b/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
deleted file mode 100644
index a76843aa4066..000000000000
--- a/games-fps/wolfgl/wolfgl-0.93-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-#ECVS_SERVER="wolfgl.cvs.sourceforge.net:/cvsroot/wolfgl"
-#ECVS_MODULE="wolfgl"
-#inherit cvs
-
-inherit eutils
-
-DESCRIPTION="Wolfenstein and Spear of Destiny port using OpenGL"
-HOMEPAGE="http://wolfgl.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tbz2
-	mirror://sourceforge/wolfgl/wolfdata.zip
-	mirror://sourceforge/wolfgl/sdmdata.zip"
-#	mirror://sourceforge/wolfgl/wolfglx-wl6-${PV}.zip
-#	mirror://sourceforge/wolfgl/wolfglx-sod-${PV}.zip
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-gcc.patch
-	"${FILESDIR}"/${PV}-sample-rate.patch
-	"${FILESDIR}"/${PV}-sprite.patch
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${PV}-gcc4.patch
-)
-
-src_compile() {
-	emake -j1 CFLAGS="${CFLAGS}" DATADIR="/usr/share/${PN}" || die "emake failed"
-}
-
-src_install() {
-	newbin linux/SDM/wolfgl wolfgl-sdm
-	newbin linux/SOD/wolfgl wolfgl-sod
-	newbin linux/WL1/wolfgl wolfgl-wl1
-	newbin linux/WL6/wolfgl wolfgl-wl6
-
-	insinto /usr/share/${PN}
-	doins "${WORKDIR}"/*.{sdm,wl1}
-}
-
-pkg_postinst() {
-	elog "This installed the shareware data files for"
-	elog "Wolfenstein 3D and Spear Of Destiny."
-	elog "If you wish to play the full versions just"
-	elog "copy the data files to /usr/share/${PN}/"
-}
diff --git a/games-fps/worldofpadman-1.6-r1 b/games-fps/worldofpadman-1.6-r1
new file mode 100644
index 000000000000..8ca4d3995374
--- /dev/null
+++ b/games-fps/worldofpadman-1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=sys-libs/zlib !dedicated? ( >=media-libs/speex-1.2.0 media-libs/speexdsp virtual/jpeg:0 media-libs/libsdl[opengl,video,X] virtual/opengl virtual/glu openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora media-libs/libogg ) ) app-arch/unzip
+DESCRIPTION=A cartoon style multiplayer first-person shooter
+EAPI=6
+HOMEPAGE=https://worldofpadman.net/
+IUSE=+curl dedicated maps +openal +theora +vorbis
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 worldofpadman
+RDEPEND=sys-libs/zlib !dedicated? ( >=media-libs/speex-1.2.0 media-libs/speexdsp virtual/jpeg:0 media-libs/libsdl[opengl,video,X] virtual/opengl virtual/glu openal? ( media-libs/openal ) curl? ( net-misc/curl ) vorbis? ( media-libs/libvorbis ) theora? ( media-libs/libtheora media-libs/libogg ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/worldofpadman/wop-1.5-unified.zip mirror://sourceforge/worldofpadman/wop-1.5.x-to-1.6-patch-unified.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=3e228d968719510d8a45ea5c01290ca2
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
deleted file mode 100644
index a1240f9f2fd1..000000000000
--- a/games-fps/worldofpadman/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX worldofpadman-1.6-gentoo.patch 2106 BLAKE2B ae27668e8e3e570b5a5beff3fbaefc4fb44c41d3d0686c90437256df66f994eeb66337ec4444d6190cd5398d8f044067fce6234b952082d2ea44a8195c3ceedb SHA512 9c5a3e85a2e67cfca2e066b9f92103020e005988a000029439f0678249041bc3675718beca0addf1bb360180af72d7e1acfa1136e289784d39abaea44096db2d
-DIST wop-1.5-unified.zip 947290087 BLAKE2B 5fb87cde661882fc095376012d9aca134d6399b4cedd4f3c78b739dd19e126360070278045d74c3318306e17490338111b8621e1c543b46e6bbecfbcd3658675 SHA512 fea0207efadf15afab7001227e27126aef4a673bd478dccb513c3011d0811074b2788083862f07e2f02f1a80ccb57a45ff64de8de155d8f8f7f1ab53ecf2402b
-DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 BLAKE2B a0f9feb04a15ec04dd64dbacdf5a158738d625651b2293bc8b3740067e849f33cdd144bce6afd11914524d89fe4bcfd48dbcbc455e51017b1216439e9bae484a SHA512 a45018bd79e9e23c57bcaf692fa14c323671103558caad6acb794c2990cc5fe9cc8bdbe6a6c8254c4560d81eb59f5e3b9a6800a61b21a15870c4439f7179d936
-EBUILD worldofpadman-1.6-r1.ebuild 2074 BLAKE2B 7b4eb271e0ed208b9bbbb052a7021260940960ee0f20e3e51a116db387b70f463c7a7eada7a40c1c0034aea04ff40ef3d17dd7ee8bdd92bbb7b56b2c3709862c SHA512 637675f347fc2494759bf18eefa3b5250e5abf251bfbc2f6df57320175280e32a74034dc4ebe32bb39b7bf6cd7ed44a39af69dfe87bb0223a36ee919434656d2
-MISC metadata.xml 421 BLAKE2B 0c13dc1221c5aa3f8ba78de2614ec62e48177ab0433652ec97ce454883b4a12ffe767ef6786f7f0ea5a75a2a67e868a01e771d7eb575c7ab8eeb4689ad5a8cdf SHA512 2716235255bd6e00d84c6f11f784850959fd50a6542fd98d9c7815d0c7a6f5a201807b02f1cd7d1ace59f1f19f40cb97aa01b9d649bb198678ac60f84d81eb1e
diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
deleted file mode 100644
index d55e43ffcf52..000000000000
--- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/Makefile.old	2012-04-26 21:40:25.277417417 +0200
-+++ b/Makefile	2012-04-26 21:43:34.300835150 +0200
-@@ -344,11 +344,11 @@
-   endif
-   
-   ifeq ($(USE_CIN_THEORA),1)
--    CLIENT_LDFLAGS += -ltheora
-+    CLIENT_LIBS += -ltheora
-   endif
-   
-   ifeq ($(USE_CODEC_MP3),1)
--    CLIENT_LDFLAGS += -lmad
-+    CLIENT_LIBS += -lmad
-   endif
- 
-   ifeq ($(USE_CURL),1)
-@@ -380,12 +380,12 @@
-   
-   ifeq ($(USE_CIN_THEORA),1)
-     BASE_CFLAGS += -DUSE_CIN_THEORA
--    CLIENT_LDFLAGS += -ltheora
-+    CLIENT_LIBS += -ltheora
-   endif
-   
-   ifeq ($(USE_CODEC_MP3),1)
-     BASE_CFLAGS += -DUSE_CODEC_MP3
--    CLIENT_LDFLAGS += -lmad
-+    CLIENT_LIBS += -lmad
-   endif
- else # ifeq Linux
- 
-@@ -435,12 +435,12 @@
-   
-    ifeq ($(USE_CIN_THEORA),1)
-     BASE_CFLAGS += -DUSE_CIN_THEORA
--    CLIENT_LDFLAGS += -ltheora
-+    CLIENT_LIBS += -ltheora
-   endif
-   
-   ifeq ($(USE_CODEC_MP3),1)
-     BASE_CFLAGS += -DUSE_CODEC_MP3
--    CLIENT_LDFLAGS += -lmad
-+    CLIENT_LIBS += -lmad
-   endif
- 
-   BASE_CFLAGS += -D_THREAD_SAFE=1
-@@ -565,7 +565,7 @@
-   endif
- 
-   ifeq ($(USE_CODEC_MP3),1)
--    CLIENT_LDFLAGS += -lmad
-+    CLIENT_LIBS += -lmad
-   endif
- 
-   ifeq ($(ARCH),x86)
-@@ -662,11 +662,11 @@
-   endif
-   
-   ifeq ($(USE_CIN_THEORA),1)
--    CLIENT_LDFLAGS += -ltheora
-+    CLIENT_LIBS += -ltheora
-   endif
-   
-   ifeq ($(USE_CODEC_MP3),1)
--    CLIENT_LDFLAGS += -lmad
-+    CLIENT_LIBS += -lmad
-   endif
- 
-   # cross-compiling tweaks
-@@ -732,11 +732,11 @@
-   endif
-   
-   ifeq ($(USE_CIN_THEORA),1)
--    CLIENT_LDFLAGS += -ltheora
-+    CLIENT_LIBS += -ltheora
-   endif
-   
-   ifeq ($(USE_CODEC_MP3),1)
--    CLIENT_LDFLAGS += -lmad
-+    CLIENT_LIBS += -lmad
-   endif
- 
-   ifeq ($(USE_CURL),1) 
-@@ -1780,7 +1780,7 @@
- 
- $(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)
- 	$(echo_cmd) "LD $@"
-- 	$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
-+	$(Q)$(CC) $(CLIENT_CFLAGS) $(CFLAGS) $(CLIENT_LDFLAGS) $(LDFLAGS) $(THREAD_LDFLAGS) \
- 		-o $@ $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) \
-  		$(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(RENDERER_LIBS) $(LIBS)
- endif
diff --git a/games-fps/worldofpadman/metadata.xml b/games-fps/worldofpadman/metadata.xml
deleted file mode 100644
index 3450a58db130..000000000000
--- a/games-fps/worldofpadman/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="maps">Install extra maps (PadPack)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">worldofpadman</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild b/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
deleted file mode 100644
index 523ca7b597b2..000000000000
--- a/games-fps/worldofpadman/worldofpadman-1.6-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A cartoon style multiplayer first-person shooter"
-HOMEPAGE="https://worldofpadman.net/"
-SRC_URI="mirror://sourceforge/${PN}/wop-1.5-unified.zip
-	mirror://sourceforge/${PN}/wop-1.5.x-to-1.6-patch-unified.zip"
-
-LICENSE="GPL-2 worldofpadman"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+curl dedicated maps +openal +theora +vorbis"
-
-RDEPEND="sys-libs/zlib
-	!dedicated? (
-		>=media-libs/speex-1.2.0
-		media-libs/speexdsp
-		virtual/jpeg:0
-		media-libs/libsdl[opengl,video,X]
-		virtual/opengl
-		virtual/glu
-		openal? ( media-libs/openal )
-		curl? ( net-misc/curl )
-		vorbis? ( media-libs/libvorbis )
-		theora? (
-			media-libs/libtheora
-			media-libs/libogg
-		)
-	)
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/${P}_svn2178-src"
-
-src_unpack() {
-	unpack ${A}
-	unzip XTRAS/"editing files"/${P}-src.zip
-}
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	sed -i \
-		-e 's:JPEG_LIB_VERSION < 80:JPEG_LIB_VERSION < 62:' \
-		code/renderer/tr_image_jpg.c || die #479652
-}
-
-src_compile() {
-	local arch
-
-	if use amd64 ; then
-		arch=x86_64
-	elif use x86 ; then
-		arch=i386
-	fi
-
-	emake \
-		V=1 \
-		ARCH=${arch} \
-		BUILD_CLIENT=$(use dedicated && echo 0) \
-		DEFAULT_BASEDIR=/usr/share/${PN} \
-		OPTIMIZE= \
-		USE_CURL=$(usex curl 1 0) \
-		USE_CURL_DLOPEN=0 \
-		USE_OPENAL=$(usex openal 1 0) \
-		USE_OPENAL_DLOPEN=0 \
-		USE_CODEC_VORBIS=$(usex vorbis 1 0) \
-		USE_CIN_THEORA=$(usex theora 1 0) \
-		USE_RENDERER_DLOPEN=0 \
-		USE_INTERNAL_ZLIB=0 \
-		USE_INTERNAL_JPEG=0 \
-		USE_INTERNAL_SPEEX=0
-}
-
-src_install() {
-	newbin build/release-*/wopded.* ${PN}-ded
-	if ! use dedicated ; then
-		newbin build/release-*/wop.* ${PN}
-		newicon misc/quake3.png ${PN}.png
-		make_desktop_entry ${PN} "World of Padman"
-	fi
-	insinto /usr/share/${PN}
-	doins -r ../wop
-
-	dodoc id-readme.txt \
-		IOQ3-README \
-		voip-readme.txt \
-		../XTRAS/changelog.txt \
-		../XTRAS/sounds_readme.txt
-	HTML_DOCS="../XTRAS/readme ../XTRAS/readme.html" einstalldocs
-}
diff --git a/games-fps/xonotic-0.8.2 b/games-fps/xonotic-0.8.2
new file mode 100644
index 000000000000..f8ac52847b37
--- /dev/null
+++ b/games-fps/xonotic-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare pretend setup
+DEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/libpng:0 net-misc/curl ~dev-libs/d0_blind_id-1.0 !dedicated? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/libmodplug x11-libs/libX11 x11-libs/libXau x11-libs/libXpm x11-libs/libXext x11-libs/libXdmcp x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) ode? ( dev-games/ode[double-precision] ) sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] ) ) !dedicated? ( x11-base/xorg-proto )
+DESCRIPTION=Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine
+EAPI=6
+HOMEPAGE=http://www.xonotic.org/
+IUSE=alsa debug dedicated doc ode sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib virtual/jpeg:0 media-libs/libpng:0 net-misc/curl ~dev-libs/d0_blind_id-1.0 !dedicated? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis media-libs/libmodplug x11-libs/libX11 x11-libs/libXau x11-libs/libXpm x11-libs/libXext x11-libs/libXdmcp x11-libs/libXxf86dga x11-libs/libXxf86vm virtual/opengl media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) ode? ( dev-games/ode[double-precision] ) sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] ) )
+SLOT=0
+SRC_URI=http://dl.xonotic.org/xonotic-0.8.2.zip
+_eclasses_=check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=07e311ba364cacb31f65fb6bc28b923e
diff --git a/games-fps/xonotic/Manifest b/games-fps/xonotic/Manifest
deleted file mode 100644
index 5021861e3bcb..000000000000
--- a/games-fps/xonotic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xonotic-0.8.2.zip 991045679 BLAKE2B 3005473da954492bb7387f9e0e13c2415e638877fa8b83e14872f3b04ed0fc21b82e18f51aa6c68e8bf02d09d4a73f290cbcaebdfa8c0a12ceb6582309baee8a SHA512 0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5
-EBUILD xonotic-0.8.2.ebuild 2315 BLAKE2B 5f54f8c0de24a305b9035761dd4cf1aac7f785558c6c5e79d7897ce2a85390372fce5942966e08960d376fa14466769050bf9034465ec1f903f95c36d1809c57 SHA512 ef80a84c48a1fa55373e99519eec4e7da391a0ad54865b7733a9ebb5a047bee85b1e573849ef4dd8e446fc9136506b52bd1e20c229f2535240c453dcc4b4d50f
-MISC metadata.xml 351 BLAKE2B a5005814468014cf93d7f807b7f1c5d9252aecf20584267cdef61547d109727230f14c3f21297e202c4876e0534fac7d5ab86022c3741d582115c04b1bcf18f9 SHA512 14665ca256c368cbf80a08aaff18c005a25a4197eae82b559e934fbe6a3b17ef6f1fbd323621e38af5725f3e61ff750c72bb8fe650fb76eeed818070d411e3f6
diff --git a/games-fps/xonotic/metadata.xml b/games-fps/xonotic/metadata.xml
deleted file mode 100644
index 2b46931205d2..000000000000
--- a/games-fps/xonotic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="ode">Enable support for physics engine from <pkg>dev-games/ode</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/games-fps/xonotic/xonotic-0.8.2.ebuild b/games-fps/xonotic/xonotic-0.8.2.ebuild
deleted file mode 100644
index 32b2eab5bb41..000000000000
--- a/games-fps/xonotic/xonotic-0.8.2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils check-reqs toolchain-funcs
-
-MY_PN="${PN^}"
-DESCRIPTION="Fork of Nexuiz, Deathmatch FPS based on DarkPlaces, an advanced Quake 1 engine"
-HOMEPAGE="http://www.xonotic.org/"
-SRC_URI="http://dl.xonotic.org/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug dedicated doc ode sdl"
-
-UIRDEPEND="
-	media-libs/libogg
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libmodplug
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXpm
-	x11-libs/libXext
-	x11-libs/libXdmcp
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-	virtual/opengl
-	media-libs/freetype:2
-	alsa? ( media-libs/alsa-lib )
-	ode? ( dev-games/ode[double-precision] )
-	sdl? ( media-libs/libsdl2[X,sound,joystick,opengl,video,alsa?] )"
-UIDEPEND="
-	x11-base/xorg-proto"
-RDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0
-	media-libs/libpng:0
-	net-misc/curl
-	~dev-libs/d0_blind_id-1.0
-	!dedicated? ( ${UIRDEPEND} )"
-DEPEND="${RDEPEND}
-	!dedicated? ( ${UIDEPEND} )"
-
-CHECKREQS_DISK_BUILD="1200M"
-CHECKREQS_DISK_USR="950M"
-
-S="${WORKDIR}/${MY_PN}"
-
-pkg_pretend() {
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	check-reqs_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/^EXE_/s:darkplaces:${PN}:" \
-		-e "s:-O3:${CFLAGS}:" \
-		-e "/-lm/s:$: ${LDFLAGS}:" \
-		-e '/^STRIP/s/strip/true/' \
-		source/darkplaces/makefile.inc || die
-
-	if ! use alsa; then
-		sed -i \
-			-e "/DEFAULT_SNDAPI/s:ALSA:OSS:" \
-			source/darkplaces/makefile || die
-	fi
-}
-
-src_compile() {
-	local t="$(usex debug debug release)"
-	local i
-
-	tc-export CC CXX LD AR RANLIB
-
-	# use a for-loop wrt bug 473352
-	for i in sv-${t} $(usex !dedicated "cl-${t} $(usex sdl "sdl-${t}" "")" "") ; do
-		emake \
-			-C source/darkplaces \
-			DP_LINK_ODE=$(usex ode shared no) \
-			DP_FS_BASEDIR="/usr/share/${PN}" \
-			${i}
-	done
-}
-
-src_install() {
-	if ! use dedicated; then
-		dobin source/darkplaces/${PN}-glx
-		newicon misc/logos/${PN}_icon.svg ${PN}.svg
-		make_desktop_entry ${PN}-glx "${MY_PN} (GLX)"
-
-		if use sdl; then
-			dobin source/darkplaces/${PN}-sdl
-			make_desktop_entry ${PN}-sdl "${MY_PN} (SDL)"
-		fi
-	fi
-	dobin source/darkplaces/${PN}-dedicated
-
-	dodoc Docs/*.txt
-	use doc && dohtml -r Docs
-
-	insinto "/usr/share/${PN}"
-	doins -r key_0.d0pk server data
-}
diff --git a/games-fps/yamagi-quake2-7.10 b/games-fps/yamagi-quake2-7.10
new file mode 100644
index 000000000000..3b99547bc48f
--- /dev/null
+++ b/games-fps/yamagi-quake2-7.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib:0= client? ( media-libs/libsdl2[opengl,video] virtual/opengl ogg? ( media-libs/libogg media-libs/libvorbis ) openal? ( media-libs/openal ) !openal? ( media-libs/libsdl2[sound] ) )
+DESCRIPTION=Quake 2 engine focused on single player
+EAPI=6
+HOMEPAGE=https://www.yamagi.org/quake2/
+IUSE=+client ctf dedicated ogg openal rogue xatrix
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib:0= client? ( media-libs/libsdl2[opengl,video] virtual/opengl ogg? ( media-libs/libogg media-libs/libvorbis ) openal? ( media-libs/openal ) !openal? ( media-libs/libsdl2[sound] ) )
+REQUIRED_USE=|| ( client dedicated )
+SLOT=0
+SRC_URI=https://deponie.yamagi.org/quake2/quake2-7.10.tar.xz ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-1.05.tar.xz ) rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-2.04.tar.xz ) xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-2.05.tar.xz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ec694d27def610d5bae3e19661d3daa7
diff --git a/games-fps/yamagi-quake2-7.20 b/games-fps/yamagi-quake2-7.20
new file mode 100644
index 000000000000..2e1a19481484
--- /dev/null
+++ b/games-fps/yamagi-quake2-7.20
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=sys-libs/zlib:0= client? ( media-libs/libsdl2[opengl,video] virtual/opengl ogg? ( media-libs/libogg media-libs/libvorbis ) openal? ( media-libs/openal ) !openal? ( media-libs/libsdl2[sound] ) )
+DESCRIPTION=Quake 2 engine focused on single player
+EAPI=6
+HOMEPAGE=https://www.yamagi.org/quake2/
+IUSE=+client ctf dedicated ogg openal rogue xatrix
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib:0= client? ( media-libs/libsdl2[opengl,video] virtual/opengl ogg? ( media-libs/libogg media-libs/libvorbis ) openal? ( media-libs/openal ) !openal? ( media-libs/libsdl2[sound] ) )
+REQUIRED_USE=|| ( client dedicated )
+SLOT=0
+SRC_URI=https://deponie.yamagi.org/quake2/quake2-7.20.tar.xz ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-1.05.tar.xz ) rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-2.04.tar.xz ) xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-2.05.tar.xz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c4e4d07dbc61e77468c11ab7c2e5443c
diff --git a/games-fps/yamagi-quake2/Manifest b/games-fps/yamagi-quake2/Manifest
deleted file mode 100644
index ea0bfa2f217c..000000000000
--- a/games-fps/yamagi-quake2/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX yamagi-quake2-addon-respect-flags.patch 823 BLAKE2B 348115f8a35d61e9dc4a1121bb98cfe1c2d6925fc7fc3bb7965d1f10d8bc4958f222982892216ee312ec245c3e505c9e9b8c20c65539f24145af4355959a4542 SHA512 c570ea602d3d5fedc6defae5c6b8d99f079ea5562b9c864f896a97c01ca504dbbb669e9a43eb5757abca884ad39c7a2f685c3fb915d32bd8dd5ff22f6934a4fd
-AUX yamagi-quake2-respect-flags.patch 1209 BLAKE2B 757b7f1757a752871525ed397f53db8992292dde7a68fb22030ded806e64f4853ac1c2e75304afb2f88f1f2d36edc99758dee4fa6cbfe353fa5004aabb65b982 SHA512 abaa7041640556d1b7272fec820a987e02b4a7d466765a637ddc0ce39c38eafe95e46f91e5bdcf74030df2dff7674e96c8a49ca48b99400f74b85551e0d9a5c3
-AUX yamagi-quake2-zlib.patch 592 BLAKE2B 836093baf5f0a7554d07e8305dfb9fe83ece7069562d7c0d7941c241ba8442d02819234e5a4f89031e9d9b82ad5bdb85cdfd507bab5f3f1f9a53cec9ed948527 SHA512 cc0e0ee7807a4aa0edc540ccde8ee37f4550a34ee24efadb876d0defc08fb06d4d3be7c94e5ebf45247798b4d7d3b98184b0c93a6511fc7369f8ae1c5b4aa2d1
-DIST quake2-7.10.tar.xz 1792748 BLAKE2B 853d6db1eec46ce40952fd413a259653275081599a940941fc883921b310f436be62b80a1d911a0d8f95a33e540e60bd6db2377370cc443cbaa9c3eec6ae055f SHA512 46247c3e2c8e6dcb056dfc7785dd63bf4f896719894a1c5467f2eb313cc3d8a892fda9bafc2ca760a9ac96f6b8e23485a8740b03e118cf9a524f68657183fbb9
-DIST quake2-7.20.tar.xz 1852212 BLAKE2B 87a19be70680866b8b697ea4632239d33fe196dc648553d4a113025d9dc7996a27db2ec0178b28c04ad77854400d9f159bd800681a2bdf5a0121ef764e163ecb SHA512 466c21777e07da6aaec29cf9d3c9246a23d2157398a7e5ff1ad006f0fa7fd89e379b109936780361f03722f896ac34a188d12fc0a51cb543079e07aa6c9240df
-DIST quake2-ctf-1.05.tar.xz 134872 BLAKE2B eb987004b1c1b1743ec532b6bea96a257957377cbdb0571d6c6e7b2dae6c1b7abc154233d4f9d3af6fb546d7810e5c041b8e9293de2e409a7cace88aa455f526 SHA512 9eb951f4a9d7abc5f9a2ca53d886f68b745c1efdf3fea14db2e071b8d1592d33579c5fa56326aa583269a4810e16a7eda8dcd8930e36782cb4fcb8578c44951b
-DIST quake2-rogue-2.04.tar.xz 240436 BLAKE2B e7c3660378fe40b3f514b6e1de8714e3d3550baa244897b98bb81f362fa2b0aa57e3abceb5a38ea77cfec7621e2fcfab342a45bf9b66ccd0e44cc70292888fc2 SHA512 546deb74175c60ed7e5600a3d4b1c983fc0b1fae5922ebdb8fc3cdc5584931a0a5e34914ec2cd4ef9815323ba82cb56d427986d5c91dc040d6b68baff68ca5a8
-DIST quake2-xatrix-2.05.tar.xz 189888 BLAKE2B 9d884af6033d529ce8cca7a70a36608e45db47dab74ab0d88c04f4d928425cf22901b1299a69330bfa83810034c9f1eff2d9618b222db68564d81d569f0596cd SHA512 f7e14bb870eaf4515405f5f1162057669351a334993410101973b75e52d6d576c35c91112911f961ad122ebe664b294649e94e88a2f62b79f51e28d02f50487a
-EBUILD yamagi-quake2-7.10.ebuild 3007 BLAKE2B 5084aa0d925ad93d3f8e27b27b8548625469ba3dfc611583657150c04541b50d3cc71a2b8f2c7ad6816771ddf0a8ada67285e17d030263178a6216db930b79ef SHA512 ecf02bc816b1913d75a4c8b8c8cd01c042f762c825252d4f797cbbe71152db376524f50a0611844cacee7b10dcc385119b5c31960f39008ec77b1997bf35fb27
-EBUILD yamagi-quake2-7.20.ebuild 3403 BLAKE2B b62a57e2a7c11093718dee95ec19bf9a386bd6555ac1c1f960b1088157ecba2f58ba8a79ac97220b2d6cfb0dc5ddbca896f2909199f99f64ee7216bb189ce37e SHA512 7047e2a0c6232396d03a6d7ab538885a0b01b89d653e0072874ac02c4d48ecd2c55a6065e05b2647379f723ca1bf64237dc74a898f6b0a1c2aff9a36135dcb3b
-MISC metadata.xml 731 BLAKE2B 42af3854a50b6c7ef6a715af0a6d20c574a9e8ac8011f3ad3cc0d28af9834a32df3ba8b1e546b7017e634e323a4823610d6ffec111b29f4341b2a4f7bb4e7f96 SHA512 faa5df8f6af6efa7e90e17909ae8659d9b9273ad7ff6684845fde8849ad4eee4a933cd04dfd2b5578d661277da331a58076d87a8a4dde45b8f4afa7e408e4095
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
deleted file mode 100644
index d767f04d4b09..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-addon-respect-flags.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/Makefile	2017-05-25 12:45:51.000000000 +0300
-+++ b/Makefile	2018-01-14 17:38:34.540167879 +0300
-@@ -64,11 +64,11 @@
- #
- # -MMD to generate header dependencies.
- ifeq ($(OSTYPE), Darwin)
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -fwrapv -arch i386 -arch x86_64
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -fwrapv -arch i386 -arch x86_64
- else
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -MMD -fwrapv
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -MMD -fwrapv
- endif
- 
- # ----------
-@@ -80,9 +80,9 @@
- 
- # Base LDFLAGS.
- ifeq ($(OSTYPE), Darwin)
--LDFLAGS := -shared -arch i386 -arch x86_64 
-+LDFLAGS += -shared -arch i386 -arch x86_64 
- else
--LDFLAGS := -shared
-+LDFLAGS += -shared
- endif
- 
- # ----------
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch
deleted file mode 100644
index 76ac4b60f503..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-respect-flags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile	2017-12-08 12:22:59.000000000 +0300
-+++ b/Makefile	2018-01-14 15:42:56.804047742 +0300
-@@ -165,12 +165,12 @@
- # -MMD to generate header dependencies. (They cannot be
- #  generated if building universal binaries on OSX)
- ifeq ($(YQ2_OSTYPE), Darwin)
--CFLAGS := -O2 -fno-strict-aliasing -fomit-frame-pointer \
--		  -Wall -pipe -g -fwrapv
-+CFLAGS += -fno-strict-aliasing -fomit-frame-pointer \
-+		  -Wall -fwrapv
- CFLAGS += $(OSX_ARCH)
- else
--CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \
--		  -Wall -pipe -g -ggdb -MMD -fwrapv
-+CFLAGS += -std=gnu99 -fno-strict-aliasing \
-+		  -Wall -MMD -fwrapv
- endif
- 
- # ----------
-@@ -263,15 +263,15 @@
- 
- # Base LDFLAGS.
- ifeq ($(YQ2_OSTYPE),Linux)
--LDFLAGS := -L/usr/lib -lm -ldl -rdynamic
-+LDFLAGS += -lm -ldl -rdynamic
- else ifeq ($(YQ2_OSTYPE),FreeBSD)
--LDFLAGS := -L/usr/local/lib -lm
-+LDFLAGS += -lm
- else ifeq ($(YQ2_OSTYPE),OpenBSD)
--LDFLAGS := -L/usr/local/lib -lm
-+LDFLAGS += -lm
- else ifeq ($(YQ2_OSTYPE),Windows)
--LDFLAGS := -L/usr/lib -lws2_32 -lwinmm -static-libgcc
-+LDFLAGS += -lws2_32 -lwinmm -static-libgcc
- else ifeq ($(YQ2_OSTYPE), Darwin)
--LDFLAGS := $(OSX_ARCH) -lm
-+LDFLAGS += $(OSX_ARCH) -lm
- endif
- 
- CFLAGS += -fvisibility=hidden
diff --git a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch b/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
deleted file mode 100644
index 1de79c986907..000000000000
--- a/games-fps/yamagi-quake2/files/yamagi-quake2-zlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://bugs.gentoo.org/383179
-
-Upstream removed OF macro definition:
-https://github.com/yquake2/yquake2/commit/716d72a295c9247b3c88ccd180bb7a517ed99e13
-
---- a/src/common/unzip/ioapi.h	2018-03-10 20:24:21.000000000 +0300
-+++ b/src/common/unzip/ioapi.h	2018-04-10 00:34:08.688675097 +0300
-@@ -120,6 +120,9 @@
- #define ZLIB_FILEFUNC_MODE_EXISTING (4)
- #define ZLIB_FILEFUNC_MODE_CREATE   (8)
- 
-+#ifdef _Z_OF
-+#define OF _Z_OF
-+#endif
- 
- #ifndef ZCALLBACK
-  #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
diff --git a/games-fps/yamagi-quake2/metadata.xml b/games-fps/yamagi-quake2/metadata.xml
deleted file mode 100644
index c573477de061..000000000000
--- a/games-fps/yamagi-quake2/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexander@tsoy.me</email>
-		<name>Alexander Tsoy</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">yquake2/yquake2</remote-id>
-	</upstream>
-	<use>
-		<flag name="client">Build client</flag>
-		<flag name="ctf">Build support for the 'Capture The Flag' addon</flag>
-		<flag name="rogue">Build support for the 'Ground Zero' Mission Pack</flag>
-		<flag name="xatrix">Build support for the 'The Reckoning' Mission Pack</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
deleted file mode 100644
index 09f38aad41cf..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.10.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
-	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
-	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
-	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal rogue xatrix"
-REQUIRED_USE="|| ( client dedicated )"
-
-RDEPEND="sys-libs/zlib:0=
-	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=( "${FILESDIR}"/${PN}-respect-flags.patch )
-DOCS=( CHANGELOG CONTRIBUTE README.md )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		DLOPEN_OPENAL=no \
-		WITH_CDA=no \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_ZIP=yes \
-		WITH_OGG=$(usex ogg) \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	use client && targets+=( client ref_gl1 ref_gl3 )
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		local addon_name
-		case ${addon} in
-			ctf)    addon_name="CTF" ;;
-			rogue)  addon_name="Ground Zero" ;;
-			xatrix) addon_name="The Reckoning" ;;
-		esac
-
-		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
diff --git a/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild b/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
deleted file mode 100644
index 779346e191f7..000000000000
--- a/games-fps/yamagi-quake2/yamagi-quake2-7.20.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-CTF_V=1.05
-ROGUE_V=2.04
-XATRIX_V=2.05
-
-DESCRIPTION="Quake 2 engine focused on single player"
-HOMEPAGE="https://www.yamagi.org/quake2/"
-SRC_URI="https://deponie.yamagi.org/quake2/quake2-${PV}.tar.xz
-	ctf? ( https://deponie.yamagi.org/quake2/quake2-ctf-${CTF_V}.tar.xz )
-	rogue? ( https://deponie.yamagi.org/quake2/quake2-rogue-${ROGUE_V}.tar.xz )
-	xatrix? ( https://deponie.yamagi.org/quake2/quake2-xatrix-${XATRIX_V}.tar.xz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client ctf dedicated ogg openal rogue xatrix"
-REQUIRED_USE="|| ( client dedicated )"
-
-RDEPEND="sys-libs/zlib:0=
-	client? (
-		media-libs/libsdl2[opengl,video]
-		virtual/opengl
-		ogg? (
-			media-libs/libogg
-			media-libs/libvorbis
-		)
-		openal? ( media-libs/openal )
-		!openal? ( media-libs/libsdl2[sound] )
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/quake2-${PV}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-respect-flags.patch
-	"${FILESDIR}"/${PN}-zlib.patch
-)
-DOCS=( CHANGELOG CONTRIBUTE README.md )
-
-mymake() {
-	emake \
-		VERBOSE=1 \
-		DLOPEN_OPENAL=no \
-		WITH_CDA=no \
-		WITH_SYSTEMWIDE=yes \
-		WITH_SYSTEMDIR="${EPREFIX}"/usr/share/games/quake2 \
-		WITH_ZIP=yes \
-		WITH_OGG=$(usex ogg) \
-		WITH_OPENAL=$(usex openal) \
-		"$@"
-}
-
-src_prepare() {
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		pushd "${WORKDIR}"/quake2-${addon}-* >/dev/null || die
-		eapply -l -- "${FILESDIR}"/${PN}-addon-respect-flags.patch
-		popd >/dev/null || die
-	done
-
-	default
-}
-
-src_compile() {
-	local targets=( game )
-	use client && targets+=( client ref_gl1 ref_gl3 )
-	use dedicated && targets+=( server )
-
-	mymake config
-	mymake "${targets[@]}"
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-		emake -C "${WORKDIR}"/quake2-${addon}-* VERBOSE=1
-	done
-}
-
-src_install() {
-	insinto /usr/lib/yamagi-quake2
-	# Yamagi Quake II expects all binaries to be in the same directory
-	# See stuff/packaging.md for more info
-	exeinto /usr/lib/yamagi-quake2
-	doins -r release/.
-
-	if use client; then
-		doexe release/quake2
-		dosym ../lib/yamagi-quake2/quake2 /usr/bin/yquake2
-
-		newicon stuff/icon/Quake2.svg "yamagi-quake2.svg"
-		make_desktop_entry "yquake2" "Yamagi Quake II"
-	fi
-
-	if use dedicated; then
-		doexe release/q2ded
-		dosym ../lib/yamagi-quake2/q2ded /usr/bin/yq2ded
-	fi
-
-	insinto /usr/lib/yamagi-quake2/baseq2
-	doins stuff/yq2.cfg
-
-	local addon
-	for addon in ctf rogue xatrix; do
-		use ${addon} || continue
-
-		insinto /usr/lib/yamagi-quake2/${addon}
-		doins "${WORKDIR}"/quake2-${addon}-*/release/game.so
-
-		local addon_name
-		case ${addon} in
-			ctf)    addon_name="CTF" ;;
-			rogue)  addon_name="Ground Zero" ;;
-			xatrix) addon_name="The Reckoning" ;;
-		esac
-
-		make_wrapper "yquake2-${addon}" "yquake2 +set game ${addon}"
-		make_desktop_entry "yquake2-${addon}" "Yamagi Quake II: ${addon_name}"
-	done
-
-	einstalldocs
-	if use client; then
-		docinto examples
-		dodoc stuff/cdripper.sh
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "In order to play, you must at least install:"
-		elog "games-fps/quake2-data or games-fps/quake2-demodata or copy game"
-		elog "data files to ~/.yq2/ or ${EPREFIX}/usr/share/games/quake2/ manually."
-		elog "Read ${EPREFIX}/usr/share/doc/${PF}/README.md* for more information."
-		elog
-	fi
-}
diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 26ca77a3e1a7..2296607cf337 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/childsplay-0.90.2-r1 b/games-kids/childsplay-0.90.2-r1
new file mode 100644
index 000000000000..2dd8b9a1c8c6
--- /dev/null
+++ b/games-kids/childsplay-0.90.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg
+DESCRIPTION=A suite of educational games for young children
+EAPI=5
+HOMEPAGE=http://childsplay.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libogg games-misc/games-envd
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/childsplay/childsplay-0.90.2.tgz mirror://sourceforge/childsplay/childsplay_plugins-0.90.tgz mirror://sourceforge/childsplay/childsplay_plugins_lfc-0.90.tgz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fca0498da10bbfefe527dc59f71ac51b
diff --git a/games-kids/childsplay/Manifest b/games-kids/childsplay/Manifest
deleted file mode 100644
index 86962f605752..000000000000
--- a/games-kids/childsplay/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX childsplay 99 BLAKE2B 3b936c64c19529eadd49f1117477bc70bfa3c478b2dc548f6bb60e7caeaf1f8dbdf50c3dd896db14799069eac24175001514fa7e37607f45846a66ec4ed656f8 SHA512 7bdd05a0e957ce09a00443d84332bbeb62016b1df4cc88e693f0714ce9ceae4b5acd4447745c98e75063d5010b27dfb8bbf1f93bf5c3c729ced5edbd4afdfef0
-AUX childsplay-0.90.2-gentoo.patch 895 BLAKE2B dd8ea9ee59ddd57cf0172197247491f91f7b8ad7e7ca0c066ac9b40599aaf8dbad2a692e507fc0c436b9ff2993ed4d6003f3fe9078a616ce02b62b2fde2e9cff SHA512 77fe4151574e0b84218fa973b5f72631b378fb24892ff35902ebc88c9f7bd54129813cb2453551034f58b96bddd79c55c00a074184acf267962c2a737f4392cf
-DIST childsplay-0.90.2.tgz 2330022 BLAKE2B 83370489c52bd62ae46aee6f2d01d5ff42c17887105c5e4b1ba2c9f95c8869b8e315447fe60f6f325d6d6479c7ebf2c82832ffadf4414419976ed1507ed0a889 SHA512 0cc59f893f43f47fec18a6ba04e3d5b4c4b41e6c387fcd64859a65a0660b4d1c8803cd092932fc9d24a4d4b9784d6cc62cc2efc4e841ca62a205f17aec8dec68
-DIST childsplay_plugins-0.90.tgz 4528735 BLAKE2B 1aacd311138c97a868cacca723941ec582ef049831ce1ddb10f2e524f1109ceb81cf4bd34d16f2c857c4ce42ac49f7f5cb9d785e229e11f540476544093e6cb1 SHA512 f1c47c544da364bde6023cf8450d96423d214749f800d783661b6fb16f73c8bbc899ee7f997f36e11b43aff7655332c29445f865ff22dd475ad4ce4a0557e763
-DIST childsplay_plugins_lfc-0.90.tgz 6159653 BLAKE2B eb117a526f6c2caf43578dc0027d8d3b2849529d132ffc55b92d59efbfc12681f31961c265b3f6ab592a17db1a05987458b265bdf68054cef16386b71d2e28a1 SHA512 4fa8f59aae64520de03fd6527dbe7339f320ef377deca19fe91cf5591b364d853cfb9d73b8469417178fcf4bc074d6ed39a1704a20cb5a82657722862c749313
-EBUILD childsplay-0.90.2-r1.ebuild 3914 BLAKE2B 1deb5b73b35c56ed2d07719db6f1aff61760aa2a8660629c68ecbf0ae23e99fc0137c427c1ffb059e669ab3919a8c9bb124759c6c01bb5bc228cb15d73b164d8 SHA512 35e0bde061f8103da30fd1112ad3132fb07f9022a35cc015c9f1f970b1dbd47c5c4186441aece5e5f1e9045af6136b3ca26f93415c134884350018c876a99543
-MISC metadata.xml 516 BLAKE2B 785e9855bda1d0268ce6328d5e01cee50332941fc73203bcb7e85678225df29ad48bc1db13c5ccddb1e6fa1bdf25418a5dc2e840eb220c6b1995cd31ddb73c2d SHA512 145c6baf1c8115b4fbf694360c48e53ab31c32ec2cc2d3b2f9bb159377f4629b827014833155f17468cb5fccc98a8bef1ef8bc6fd64dab39d1d8fdf2b16e9275
diff --git a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild b/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
deleted file mode 100644
index 3c535ad41d94..000000000000
--- a/games-kids/childsplay/childsplay-0.90.2-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="A suite of educational games for young children"
-HOMEPAGE="http://childsplay.sourceforge.net/"
-PLUGINS_VERSION="0.90"
-PLUGINS_LFC_VERSION="0.90"
-SRC_URI="mirror://sourceforge/childsplay/${P}.tgz
-	mirror://sourceforge/childsplay/${PN}_plugins-${PLUGINS_VERSION}.tgz
-	mirror://sourceforge/childsplay/${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	media-libs/libogg"
-RDEPEND="${DEPEND}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	games_pkg_setup
-}
-
-src_prepare() {
-	local DIR
-
-	# Copy the plugins into the main package.
-	mv ../${PN}_plugins-${PLUGINS_VERSION}/Data/AlphabetSounds Data || die
-	mv ../${PN}_plugins-${PLUGINS_VERSION}/add-score.py . || die
-	for DIR in ${PN}_plugins-${PLUGINS_VERSION} ${PN}_plugins_lfc-${PLUGINS_LFC_VERSION}; do
-		mv ../${DIR}/Data/*.icon.png Data/icons || die
-		cp -r ../${DIR}/lib/* lib || die
-		mv ../${DIR}/assetml/${PN}/* assetml/${PN} || die
-		rm -rf ../${DIR}
-	done
-	gunzip man/childsplay.6.gz
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	python_fix_shebang .
-}
-
-src_install() {
-	local fn
-
-	# The following variables are based on Childsplay's INSTALL.sh
-	_LOCALEDIR=/usr/share/locale
-	_ASSETMLDIR=/usr/share/assetml
-	_SCOREDIR=${GAMES_STATEDIR}
-	_SCOREFILE=${_SCOREDIR}/childsplay.score
-	_CPDIR=$(games_get_libdir)/childsplay
-	_SHAREDIR=${GAMES_DATADIR}/childsplay
-	_LIBDIR=${_CPDIR}/lib
-	_MODULESDIR=${_LIBDIR}
-	_SHARELIBDATADIR=${_SHAREDIR}/lib
-	_SHAREDATADIR=${_SHAREDIR}/Data
-	_RCDIR=${_SHARELIBDATADIR}/ConfigData
-	_HOME_DIR_NAME=.childsplay
-	_CHILDSPLAYRC=childsplayrc
-
-	dodir \
-		"${_CPDIR}" \
-		"${_LIBDIR}" \
-		"${_SHAREDIR}" \
-		"${_SHARELIBDATADIR}" \
-		"${_SCOREDIR}" \
-		"${_LOCALEDIR}" \
-		"${_ASSETMLDIR}"
-
-	# create BASEPATH.py
-	cat >BASEPATH.py <<EOF
-## Automated file--please do not edit
-LOCALEDIR="${_LOCALEDIR}"
-ASSETMLDIR="${_ASSETMLDIR}"
-SCOREDIR="${_SCOREDIR}"
-SCOREFILE="${_SCOREFILE}"
-CPDIR="${_CPDIR}"
-SHAREDIR="${_SHAREDIR}"
-LIBDIR="${_LIBDIR}"
-MODULESDIR="${_MODULESDIR}"
-SHARELIBDATADIR="${_SHARELIBDATADIR}"
-SHAREDATADIR="${_SHAREDATADIR}"
-RCDIR="${_RCDIR}"
-HOME_DIR_NAME="${_HOME_DIR_NAME}"
-CHILDSPLAYRC="${_CHILDSPLAYRC}"
-EOF
-
-	# copy software and data
-	cp -r *.py "${D}/${_CPDIR}" || die "cp failed"
-	cp -r Data "${D}/${_SHAREDIR}" || die "cp failed"
-	rm "${D}/${_SHAREDIR}/Data/childsplay.score"  # this copy won't be used
-
-	for fn in $(ls lib); do
-		if [[ -d lib/${fn} ]] ; then
-			cp -r lib/${fn} "${D}/${_SHARELIBDATADIR}" || die
-		else
-			cp lib/${fn} "${D}/${_LIBDIR}" || die
-		fi
-	done
-
-	if [[ ${LINGUAS+set} ]]; then
-		for lang in $LINGUAS; do
-			[[ -d locale/$lang ]] && cp -r locale/$lang "${D}/${_LOCALEDIR}"
-		done
-	else
-		cp -r locale/* "${D}/${_LOCALEDIR}" || die
-	fi
-	cp -r assetml/* "${D}/${_ASSETMLDIR}" || die
-
-	# initialize the score file
-	cp Data/childsplay.score "${D}/${_SCOREFILE}" || die
-	SCORE_GAMES="Packid,Numbers,Soundmemory,Fallingletters,Findsound,Findsound2,Billiard"
-	${PYTHON} add-score.py "${D}/${_SCOREDIR}" $SCORE_GAMES
-
-	# translate for the letters game
-	${PYTHON} letters-trans.py "${D}/${_ASSETMLDIR}" << EOF
-Q
-EOF
-
-	doman man/childsplay.6
-	dodoc doc/README* doc/Changelog doc/copyright
-
-	# Make a launcher.
-	dogamesbin "${FILESDIR}"/childsplay
-	sed -i \
-		-e "s:GENTOO_DIR:${_CPDIR}:" \
-		-e "s:python:${PYTHON}:" \
-		"${D}${GAMES_BINDIR}"/childsplay \
-		|| die "sed failed"
-
-	python_optimize "${D}${_CPDIR}"
-
-	newicon assetml/childsplay/childsplay-images/chpl-icon-48.png ${PN}.png
-	make_desktop_entry childsplay Childsplay
-
-	prepgamesdirs
-	fperms g+w "${_SCOREFILE}"
-}
diff --git a/games-kids/childsplay/files/childsplay b/games-kids/childsplay/files/childsplay
deleted file mode 100644
index eccf016836d0..000000000000
--- a/games-kids/childsplay/files/childsplay
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-[ -z "${LANGUAGE}" ] && LANGUAGE=en
-export LANGUAGE
-python GENTOO_DIR/childsplay.py "$@"
diff --git a/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch b/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch
deleted file mode 100644
index 742e3e02ee3c..000000000000
--- a/games-kids/childsplay/files/childsplay-0.90.2-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- letters-trans.py.old	2010-04-26 12:13:12.000000000 +0200
-+++ letters-trans.py	2010-04-26 12:13:49.000000000 +0200
-@@ -39,7 +39,7 @@
- import os,fnmatch,operator,sys,locale
- from CPConstants import ASSETMLROOT
- 
--if os.environ['USER'] != 'root':
-+if os.environ['LOGNAME'] != 'root':
-     print "\nOnly root can use this script, sorry.\n"
-     sys.exit(1)
- 
-@@ -69,7 +69,8 @@
-     sys.exit(0)
-         
- # get description names from memory assetml, these are the words used by letters.py
--parser = pyassetml.AssetmlParser('childsplay/memory-136x136/memory-136x136.assetml')
-+assetmlfile = os.path.join(cwd,'memory-136x136.assetml')
-+parser = pyassetml.AssetmlParser(assetmlfile)
- loc = parser.get_locale()# get current locale setting, only the first two chars !!
- wlist_org = parser.find_names((('file','.'),('description',"en")))
- wlist = parser.find_names((('file','.'),('description',loc)))
diff --git a/games-kids/childsplay/metadata.xml b/games-kids/childsplay/metadata.xml
deleted file mode 100644
index 56a899baf102..000000000000
--- a/games-kids/childsplay/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Childsplay is a suite of educational games for young children, like gcompris,
-but without the overkill of c/c++ and the gnome environ.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">childsplay</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-kids/gcompris-15.10-r1 b/games-kids/gcompris-15.10-r1
new file mode 100644
index 000000000000..2b69300de42c
--- /dev/null
+++ b/games-kids/gcompris-15.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-db/sqlite:3 dev-libs/libxml2 dev-libs/popt dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/libintl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/texi2html dev-perl/XML-Parser gnome-base/gnome-common sys-apps/texinfo sys-devel/gettext 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=full featured educational application for children from 2 to 10
+EAPI=6
+HOMEPAGE=http://gcompris.net/
+IUSE=gstreamer python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=x11-libs/gtk+:2 gnome-base/librsvg[gtk(+)] gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-alsa:0.10 media-plugins/gst-plugins-ogg:0.10 media-plugins/gst-plugins-vorbis:0.10 ) !gstreamer? ( media-libs/sdl-mixer media-libs/libsdl:0 ) dev-db/sqlite:3 dev-libs/libxml2 dev-libs/popt dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/libintl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-gfx/tuxpaint sci-electronics/gnucap
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://gcompris.net/download/gcompris-15.10.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9fa68d659683d60fc44dd84bcdb3772e
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
deleted file mode 100644
index c8a06f4e783d..000000000000
--- a/games-kids/gcompris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gcompris-15.10-build.patch 2824 BLAKE2B e0d0974e06f344f7d53f37cd88b2e9200e963ede7cf128b6194527358883808a58d80478c2d9a878a7eed0ec594fa2fd87c72f0c3025d275aa5bb445c7d11457 SHA512 521eb3f79424b7b7678984d9175cd4c20ec15c541ac52f012fba426163c284a6c6ccae622f05ef4ef7da0d5bcf16ddfc8cc9b5ad2d48aeca9a7f7a112209929d
-DIST gcompris-15.10.tar.bz2 279959562 BLAKE2B f8c9287a881a98bacf9b057e518597552a2f84f8bb9143684c1f7ba8f7803589c44b383c17af5b21715f4c71c78456540c5334cea4247380d28abd161b5ae756 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc
-EBUILD gcompris-15.10-r1.ebuild 1991 BLAKE2B e026f977e1dc8d1fdfff89b0921c7581606216ccfd38157985fae43bfd82a5cee6d4429cf01a8254cbae39a51aabb78109cd5953c6b9cc787a3680504c9492ff SHA512 23980183bd8d221af17d61de9ab4471abbd1a64d5f157cb21aef94357d880919c7534f3a97a8565897a9a1019f880ff34d598a3a5398d0ca9c01119cdce49a69
-MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-kids/gcompris/files/gcompris-15.10-build.patch b/games-kids/gcompris/files/gcompris-15.10-build.patch
deleted file mode 100644
index 077d1f6baf1a..000000000000
--- a/games-kids/gcompris/files/gcompris-15.10-build.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- gcompris-13.11.orig/Makefile.am
-+++ gcompris-13.11/Makefile.am
-@@ -7,7 +7,7 @@
- # endif
- 
- 
--icondir=$(datadir)/pixmaps
-+icondir=/usr/share/pixmaps
- icon_DATA = gcompris.png gcompris-edit.png
- 
- if BUILD_MINGW32
-@@ -15,7 +15,7 @@
- Applications_in_files =
- Applications_DATA =
- else
--Applicationsdir = $(datadir)/applications/
-+Applicationsdir = /usr/share/applications/
- Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
- Applications_DATA = gcompris.desktop gcompris-edit.desktop
- endif
---- gcompris-13.11.orig/configure.ac
-+++ gcompris-13.11/configure.ac
-@@ -57,7 +57,8 @@
-   gtk+-2.0 >= $GTK_REQUIRED \
-   librsvg-2.0 >= $LIBRSVG_REQUIRED \
-   libxml-2.0 >= $LIBXML_REQUIRED \
--  gthread-2.0 )
-+  gthread-2.0 \
-+  gmodule-2.0 )
- 
- AC_SUBST(GCOMPRIS_CFLAGS)
- AC_SUBST(GCOMPRIS_LIBS)
-@@ -204,10 +205,8 @@
-           USE_DEBUG="$enableval", USE_DEBUG="no")
- if test "x$USE_DEBUG" == "xyes" ; then
-     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
--else
--    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
- fi
-+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
- 
- dnl disable activation code
- AC_ARG_ENABLE(disable-activation-code,
-@@ -336,21 +335,21 @@
-   fi
- else
-   dnl Set PACKAGE_LOCALE_DIR in config.h.
--  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
- 
-   dnl Set PACKAGE_DATA_DIR
-   PACKAGE_DATA_DIR="boards"
-   AC_SUBST(PACKAGE_DATA_DIR)
--  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
- 
-   dnl Plugin Directory
-   my_libdir=`eval echo "${libdir}"`
--  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
-+  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
-   plugindir=$libdir/gcompris
-   AC_SUBST(plugindir)
- 
-   dnl Python plugin Directory
--  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
-+  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
-   AC_SUBST(PYTHON_PLUGIN_DIR)
- 
-   dnl System GCompris config directory
---- gcompris-13.11.orig/src/gcompris/gcompris.c
-+++ gcompris-13.11/src/gcompris/gcompris.c
-@@ -1322,7 +1322,7 @@
-     properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
-     properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
- 							NULL);
--    properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
-+    properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
-     properties->menu_dir = g_strdup(properties->package_data_dir);
-     g_free(pkg_data_dir);
-     g_free(pkg_clib_dir);
diff --git a/games-kids/gcompris/gcompris-15.10-r1.ebuild b/games-kids/gcompris/gcompris-15.10-r1.ebuild
deleted file mode 100644
index 6d417a86f543..000000000000
--- a/games-kids/gcompris/gcompris-15.10-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="http://gcompris.net/"
-SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gstreamer"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/librsvg[gtk(+)]
-	gstreamer? (
-		media-libs/gstreamer:0.10
-		media-libs/gst-plugins-good:0.10
-		media-plugins/gst-plugins-alsa:0.10
-		media-plugins/gst-plugins-ogg:0.10
-		media-plugins/gst-plugins-vorbis:0.10 )
-	!gstreamer? (
-		media-libs/sdl-mixer
-		media-libs/libsdl:0 )
-	dev-db/sqlite:3
-	dev-libs/libxml2
-	dev-libs/popt
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	virtual/libintl
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/texi2html
-	dev-perl/XML-Parser
-	gnome-base/gnome-common
-	sys-apps/texinfo
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-gfx/tuxpaint
-	sci-electronics/gnucap"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Drop DEPRECATED flags, bug #387817
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		src/gcompris/Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	eautoreconf
-
-	sed -i \
-		-e 's#^itlocaledir =.*$#itlocaledir = @localedir@#' \
-		po/Makefile.in.in || die
-
-	# Fix desktop files
-	sed -i \
-		-e '/Encoding/d' \
-		gcompris.desktop.in \
-		gcompris-edit.desktop.in || die
-}
-
-src_configure() {
-	GNUCHESS="/usr/bin/gcompris-gnuchess" \
-	econf \
-		--datarootdir="/usr/share" \
-		--datadir="/usr/share" \
-		--localedir=/usr/share/locale \
-		--infodir=/usr/share/info \
-		--with-python="${PYTHON}" \
-		$(use_enable !gstreamer sdlmixer) \
-		--enable-sqlite \
-		--enable-py-build-only
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/games-kids/gcompris/metadata.xml b/games-kids/gcompris/metadata.xml
deleted file mode 100644
index c040f7c7d3e0..000000000000
--- a/games-kids/gcompris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/games-kids/gmult-8.0-r1 b/games-kids/gmult-8.0-r1
new file mode 100644
index 000000000000..d02bf11fe860
--- /dev/null
+++ b/games-kids/gmult-8.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst postrm preinst
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Multiplication Puzzle emulates the multiplication game found in Emacs
+EAPI=6
+HOMEPAGE=http://www.mterry.name/gmult/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3 virtual/libintl
+SLOT=0
+SRC_URI=https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=70ea4d905aa8415919fa727c0dae44b9
diff --git a/games-kids/gmult/Manifest b/games-kids/gmult/Manifest
deleted file mode 100644
index 12596d91aac2..000000000000
--- a/games-kids/gmult/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gmult-8.0.tar.bz2 222981 BLAKE2B 0b70c05844f0b0db7fec77e334406dab557898240b05d2990b10e2ef398a26a2d4ad65086c635798abb66a8daefe591e908d7374840ff0886a16908e98f21564 SHA512 40c29a998d50491de8c14f7e71ad298fb69e0dc6f1f04b1f9bf35f9f72010eb085a9bc7a9efa1f3c339ea44fdeb9eec4d4f82017442c57ebc28f992bc703252f
-EBUILD gmult-8.0-r1.ebuild 741 BLAKE2B 67904c4b2287b22bb38d4f5591d7e84ba88039efc16f9b66c622b403064077b529992b41b98c28aca9f00609ebcc41aa63acfb42b26782eb8f34faabb2918157 SHA512 16ddb76af4c569196b98e6fa4e072ed0b3476b36cf986a3d408c8394c1dc4ebbebd0c58a4e7ad700ba831c85dc4c0b99b1c25b5634f0ae41bf4bcc28aa38703b
-MISC metadata.xml 326 BLAKE2B f9162abedf00b10abf4c94c73c47af36166cfcad2758e142e7bb8c12f42b59c9cc2b1565585fe59bab2c608c5f42e9d21548c1f1e4006946a9dbf287ed11e57c SHA512 f1271501c503fe7d64e69cd7729804fa3b4c0817e2cedd3b3696b919c5c67ae57917a66a326dc7501c5ced7d2e8e8c3cf40eec1a2545cb00a9226bca9ea3a5e8
diff --git a/games-kids/gmult/gmult-8.0-r1.ebuild b/games-kids/gmult/gmult-8.0-r1.ebuild
deleted file mode 100644
index b72258066123..000000000000
--- a/games-kids/gmult/gmult-8.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic
-
-DESCRIPTION="Multiplication Puzzle emulates the multiplication game found in Emacs"
-HOMEPAGE="http://www.mterry.name/gmult/"
-SRC_URI="https://launchpad.net/gmult/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:3
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	append-libs -lm
-	econf # \
-		#--bindir="${GAMES_BINDIR}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-kids/gmult/metadata.xml b/games-kids/gmult/metadata.xml
deleted file mode 100644
index f00ab510568e..000000000000
--- a/games-kids/gmult/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">gmult</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-kids/lletters-0.1.95-r3 b/games-kids/lletters-0.1.95-r3
new file mode 100644
index 000000000000..8f3d58cc2f79
--- /dev/null
+++ b/games-kids/lletters-0.1.95-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Game that helps young kids learn their letters and numbers
+EAPI=6
+HOMEPAGE=http://lln.sourceforge.net
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/l/lletters/lletters_0.1.95+gtk2.orig.tar.gz mirror://debian/pool/main/l/lletters/lletters_0.1.95+gtk2-3.diff.gz mirror://sourceforge/lln/lletters-media-0.1.9a.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_=316b47361b5eb0afb68436012ee37d53
diff --git a/games-kids/lletters/Manifest b/games-kids/lletters/Manifest
deleted file mode 100644
index 6c0b4ccbaa79..000000000000
--- a/games-kids/lletters/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX lletters-0.1.95-build-2.patch 2433 BLAKE2B a69d1d3b60dbb13028241544e7b8a7c59ddf30c3910803d0c595cf97cd09b7a46091849151b436a80419fab486dcd2bfa79056e8b5f4f95cb77b1f78af4cdea4 SHA512 1eb775c132b936f205fa7606b7a3d0e05df873aab573c09e17a2c0aee922ee5fbaf46a619674509735f259bc22295ac761919ae3537d9551ab7ac1b1eb5bcf26
-AUX lletters-0.1.95-make-382.patch 798 BLAKE2B 59a265776338d806bd7f72c647254a598b50b5d5ee78cf45481c69b5afc5f86bddc41538c4e3b71e10becbf3aa725c35a4d6a1717a681936bf597473e75eae38 SHA512 f4bc71bb6b2ad619851c7bc8ff44ca1404f14c0b98ae1bc1ab8e5c0bcb286a49409f927f8d0355de7fd189223906e7243155ae1be6cab160381fc143ee843b33
-AUX lletters-0.1.95-underlink.patch 475 BLAKE2B e48275417517f6a7ce0a3a0e0b9455bbec2440e2cef46ac922ec584658ce006e8ca25bd5a269350fe62fbd98f7e7edd52f9717aa62377daf521f0fe4d710b7f2 SHA512 ecaf18f8e7d897bbeeb1dff48bf4e9174d9f87af1186f122196e1109ed09e577492be7cbc5e74edc41dbae82123a485052151f2046a607a1be068b206fc7b0fd
-DIST lletters-media-0.1.9a.tar.gz 1966275 BLAKE2B 2bf4fb788c26ca6219d60aad208a0b5eae0829d7357765beeafd055545aa336c74c8f5edb4e9caed327ec7969d9780e2bd231c56099ae87f5b396119a163c1ed SHA512 0eb7f12c0ddeae4f9634c4c6a81ae496bc9a93e3863e1f993790e4a3589efb7163387ba28a43c18427a03362f7ddd8a5e0bca6eabcc904015c1711b95186dca0
-DIST lletters_0.1.95+gtk2-3.diff.gz 457812 BLAKE2B f155b63773c57595f660afa88b4f92bf5c270b66c12cc5bc173384941eeab2112f433b37add06a1a0e18e5e7dc78f13d92b42bfd2edf64ad8832e5a085e6a1c9 SHA512 d4daf92741e4fd8a249de9fe0b22ad6108687c00c194ccbee103c51de70392707319ecef00a7e55dd6878789a23fb5d9a365c468bf55c1326e899f4224b11e77
-DIST lletters_0.1.95+gtk2.orig.tar.gz 180896 BLAKE2B f3709f061f5f199d85f23767af015b5e1f94f8684d683f60e53a22b039fb307b0cdec12e4b76888eaef9bc763d85d991d253333a1b3e0c269cc7ca8ed2ba3533 SHA512 40720f44511895fd780e4147b923ccc49a4068c10219c17bee2a54595721b87ba0ec99062e45e9b6477bd38bc3eccf0dbe830784776c37213d6c3b06f1105845
-EBUILD lletters-0.1.95-r3.ebuild 1082 BLAKE2B f36429fdf2b62bc5cc6e8be057112aab3ab73ca582139fcbb03ff7706b4fb9cc60ba1fe87846c4cb12f82719d07a85012cd036123dac68a4ff778eb5348f237e SHA512 a64079f14ab5e2f3a50f51495ee61c4f347f3c7130f07dd314c71d6154450bfcf6bf818ef804781f4c5e8b6c83ec51af4e5be416ba32b6bda261279b1933cb90
-MISC metadata.xml 326 BLAKE2B e77269c1fa3495bebb1528cb544a93198a3cbc38b566de760c0935220cffdad805507010d69bde1fa62747ed4f61a0a352e6686814a207cd2e1f74335131651c SHA512 c235545ff08cbf0d011c27006f03f919f4bb3a3e1dabb136f87278ef55cf55d1b31cb9050a3712394cf5a925c21f7c2884b30e8cf0cf595621d674cb2ac42094
diff --git a/games-kids/lletters/files/lletters-0.1.95-build-2.patch b/games-kids/lletters/files/lletters-0.1.95-build-2.patch
deleted file mode 100644
index 41e10517faf9..000000000000
--- a/games-kids/lletters/files/lletters-0.1.95-build-2.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ur lletters-0.1.95.orig/libqdwav/Makefile.in lletters-0.1.95/libqdwav/Makefile.in
---- lletters-0.1.95.orig/libqdwav/Makefile.in	2008-04-09 19:23:13.000000000 +0300
-+++ lletters-0.1.95/libqdwav/Makefile.in	2008-04-09 19:48:08.000000000 +0300
-@@ -225,7 +225,6 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- noinst_LIBRARIES = libqdwav.a
--AM_CFLAGS = -O2
- libqdwav_a_SOURCES = wav_read.c wav_write.c
- noinst_HEADERS = wav_lib.h
- all: all-am
-diff -ur lletters-0.1.95.orig/libqdwav/wav_read.c lletters-0.1.95/libqdwav/wav_read.c
---- lletters-0.1.95.orig/libqdwav/wav_read.c	2000-02-21 09:53:08.000000000 +0200
-+++ lletters-0.1.95/libqdwav/wav_read.c	2008-04-09 19:51:23.000000000 +0300
-@@ -1,5 +1,6 @@
- /* operations for verifying and reading wav files. */
- 
-+#include <string.h> /* for strs */
- #include <stdio.h>
- #include <fcntl.h>
- #include <sys/stat.h>
-diff -ur lletters-0.1.95.orig/libqdwav/wav_write.c lletters-0.1.95/libqdwav/wav_write.c
---- lletters-0.1.95.orig/libqdwav/wav_write.c	2008-04-09 19:23:13.000000000 +0300
-+++ lletters-0.1.95/libqdwav/wav_write.c	2008-04-09 19:51:28.000000000 +0300
-@@ -1,3 +1,4 @@
-+#include <string.h> /* for strs */
- #include <stdio.h>
- #include <fcntl.h>
- #include <signal.h>
-diff -ur lletters-0.1.95.orig/list.c lletters-0.1.95/list.c
---- lletters-0.1.95.orig/list.c	2000-02-23 06:54:57.000000000 +0200
-+++ lletters-0.1.95/list.c	2008-04-09 19:51:35.000000000 +0300
-@@ -1,3 +1,4 @@
-+#include <string.h> /* for strs */
- #include "lletters.h"
- 
- /* prototype std lib functions */
-diff -ur lletters-0.1.95.orig/po/Makefile.in.in lletters-0.1.95/po/Makefile.in.in
---- lletters-0.1.95.orig/po/Makefile.in.in	2008-04-09 19:23:13.000000000 +0300
-+++ lletters-0.1.95/po/Makefile.in.in	2008-04-09 19:48:08.000000000 +0300
-@@ -111,9 +111,9 @@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -122,6 +122,7 @@
- 	    *.gmo) destdir=$(gnulocaledir);; \
- 	    *)     destdir=$(localedir);; \
- 	  esac; \
-+	  destdir="$(DESTDIR)$$destdir"; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
diff --git a/games-kids/lletters/files/lletters-0.1.95-make-382.patch b/games-kids/lletters/files/lletters-0.1.95-make-382.patch
deleted file mode 100644
index 103c26a1a342..000000000000
--- a/games-kids/lletters/files/lletters-0.1.95-make-382.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/340599
-
---- a/intl/Makefile.in
-+++ b/intl/Makefile.in
-@@ -202,12 +202,12 @@
- # The dependency for intlh.inst is different in gettext and all other
- # packages.  Because we cannot you GNU make features we have to solve
- # the problem while rewriting Makefile.in.
--@GT_YES@intlh.inst: intlh.inst.in ../config.status
--@GT_YES@	cd .. \
--@GT_YES@	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
--@GT_YES@	  $(SHELL) ./config.status
--@GT_NO@.PHONY: intlh.inst
--@GT_NO@intlh.inst:
-+intlh.inst: intlh.inst.in ../config.status
-+	cd .. \
-+	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-+	  $(SHELL) ./config.status
-+.PHONY: intlh.inst
-+intlh.inst:
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/games-kids/lletters/files/lletters-0.1.95-underlink.patch b/games-kids/lletters/files/lletters-0.1.95-underlink.patch
deleted file mode 100644
index 1d6401379c5d..000000000000
--- a/games-kids/lletters/files/lletters-0.1.95-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2011-05-24 10:47:30.276355207 +0200
-+++ b/Makefile.in	2011-05-24 10:47:53.316795932 +0200
-@@ -265,7 +265,7 @@
- 
- @SOUND_FALSE@lletters_SOURCES = $(lln_CORE)
- @SOUND_TRUE@lletters_SOURCES = $(lln_CORE) wav_play.c $(sound_CORE) 
--@SOUND_TRUE@lletters_LDADD = libqdwav/libqdwav.a -lgdk_pixbuf-2.0 -lglib-2.0 -lgtk-x11-2.0
-+@SOUND_TRUE@lletters_LDADD = libqdwav/libqdwav.a @GTK_LIBS@
- 
- #lletters_LDADD = #@GTK_LIBS@
- @SOUND_FALSE@SUBDIRS = intl	po images lang
diff --git a/games-kids/lletters/lletters-0.1.95-r3.ebuild b/games-kids/lletters/lletters-0.1.95-r3.ebuild
deleted file mode 100644
index e411ba9f847a..000000000000
--- a/games-kids/lletters/lletters-0.1.95-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-PATCH_LEVEL=3
-
-DESCRIPTION="Game that helps young kids learn their letters and numbers"
-HOMEPAGE="http://lln.sourceforge.net"
-SRC_URI="mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2.orig.tar.gz
-	mirror://debian/pool/main/l/${PN}/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff.gz
-	mirror://sourceforge/lln/${PN}-media-0.1.9a.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${WORKDIR}"/${PN}_${PV}+gtk2-${PATCH_LEVEL}.diff
-	"${FILESDIR}"/${P}-build-2.patch
-	"${FILESDIR}"/${P}-underlink.patch
-	"${FILESDIR}"/${P}-make-382.patch
-)
-
-src_prepare() {
-	default
-
-	cp -r "${WORKDIR}"/{images,sounds} . || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install () {
-	default
-	newdoc debian/changelog ChangeLog.debian
-	doicon debian/${PN}.xpm
-	make_desktop_entry ${PN} "Linux Letters and Numbers" ${PN}
-}
diff --git a/games-kids/lletters/metadata.xml b/games-kids/lletters/metadata.xml
deleted file mode 100644
index 8496a3e8f1cc..000000000000
--- a/games-kids/lletters/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lln</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-kids/memonix-1.6-r1 b/games-kids/memonix-1.6-r1
new file mode 100644
index 000000000000..ca2ea608f4dc
--- /dev/null
+++ b/games-kids/memonix-1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Brain teasers, puzzle and memory games for kid's in one pack
+EAPI=6
+HOMEPAGE=http://www.viewizard.com/memonix/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl:0[sound,opengl,video,X] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://www.viewizard.com/download/memonix_1.6_src.tar.bz2
+_eclasses_=cmake-utils	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_=2c853ed4be13daa5ea431f53519dfe1e
diff --git a/games-kids/memonix/Manifest b/games-kids/memonix/Manifest
deleted file mode 100644
index cdb6b91a8a35..000000000000
--- a/games-kids/memonix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST memonix_1.6_src.tar.bz2 6949315 BLAKE2B 7af09f7a83acbfe76b1e78c431056d99cc64abff52cae7092dcabf6fa561b367c8ee99d89c17981675c1e933d3ad892c0fb7f055f820489e64a197fd1aac352e SHA512 212def9c30cd878103d4ac8b7f57c5fcaeffa74ee7ece18a993c69304de94a2ce9eea24a70af394477532ac9a0887b595e220e106239cac5e6aec5a75d1a8ff1
-EBUILD memonix-1.6-r1.ebuild 832 BLAKE2B e44e7fa837659eae1a98363acd757f7b1c3c8751645019712a0b2af3e4f43a475ec8faa0cde5f50ad3dad1bec7ca95a4d114030e7a0ac604d8d36bbe1a09d8d1 SHA512 e18d5c876a278f1de8c0b5c46dd21a4605640886c42f5a43dd98a25a243b3394fd04995394afa41f46f4dcea2c0473076f5c5a7a7c0f493656a8333b583fa422
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-kids/memonix/memonix-1.6-r1.ebuild b/games-kids/memonix/memonix-1.6-r1.ebuild
deleted file mode 100644
index 72187823716e..000000000000
--- a/games-kids/memonix/memonix-1.6-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils
-
-DESCRIPTION="Brain teasers, puzzle and memory games for kid's in one pack"
-HOMEPAGE="http://www.viewizard.com/memonix/"
-SRC_URI="http://www.viewizard.com/download/${PN}_${PV}_src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl:0[sound,opengl,video,X]
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[vorbis]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/MemonixSourceCode"
-
-src_install() {
-	exeinto /usr/"$(get_libdir)"
-	doexe ../${P}_build/Memonix
-
-	insinto "/usr/share/${PN}"
-	doins ../gamedata.vfs
-
-	make_wrapper ${PN} /usr/"$(get_libdir)"/Memonix /usr/share/${PN}
-
-	newicon ../icon48.png ${PN}.png
-	make_desktop_entry ${PN}
-
-	dodoc ReadMe.txt
-}
diff --git a/games-kids/memonix/metadata.xml b/games-kids/memonix/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-kids/memonix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-kids/metadata.xml b/games-kids/metadata.xml
deleted file mode 100644
index 8836465ca306..000000000000
--- a/games-kids/metadata.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-kids category contains games designed for children.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-kids enthält Spiele für Kinder.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-kids contiene juegos diseñados para niños.
-	</longdescription>
-	<longdescription lang="ja">
-		games-kidsカテゴリーには子供向けのゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-kids categorie bevat spellen die gemaakt zijn voor kinderen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-kids chứa các trò chơi thiết kế cho thiếu nhi.
-	</longdescription>
-	<longdescription lang="sk">
-		Kategória games-kids obsahuje hry navrhnuté pre menšie deti.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-kids contiene giochi per bambini.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-kids contém jogos para crianças.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-kids zawiera gry dla dzieci.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-kids/pytraffic-2.5.4-r2 b/games-kids/pytraffic-2.5.4-r2
new file mode 100644
index 000000000000..37877ffa2e87
--- /dev/null
+++ b/games-kids/pytraffic-2.5.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer >=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=Python version of the board game Rush Hour
+EAPI=6
+HOMEPAGE=http://freecode.com/projects/pytraffic
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl:0[sound] media-libs/sdl-mixer dev-python/pygtk 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://alpha.uhasselt.be/Research/Algebra/Members/pytraffic/pytraffic-2.5.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=47fe76fc3e6d29bc6e0561491e43db09
diff --git a/games-kids/pytraffic/Manifest b/games-kids/pytraffic/Manifest
deleted file mode 100644
index 5021b399935b..000000000000
--- a/games-kids/pytraffic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pytraffic 84 BLAKE2B 5e89b42368a312b59271dd2d97cb26c90507f29d5f447656a8a049d5616a4dd493c93af3ab0bd88b1482f53dbbe27ca0ac6cdcd48c433a4c1871834649f23bfd SHA512 af94d6fc6402e57b78461e65e8eca0ebdd789540a1b8113ed844bfd8bcc4aeff18683c5b254f20b05427d172ac50be06be9d6f8459cf51396a8b8fdd7cb332d9
-DIST pytraffic-2.5.4.tar.gz 2474006 BLAKE2B 4a2570d52aeac340812c7d1f251b6185fc8039ec06e4178d21a5f490b10bc82961fea0423dd3a3a4ec41271037f9a343fcf770d92fe071c4e929159bbbb2373b SHA512 c34a9b783e7de998b8ebc39c2ed2bf1b9a40b090c498773297da455b182aaa5f2047fb541bb11a91e11abdeffee9f02b04a37861135c5fa946fccabfc21b44c1
-EBUILD pytraffic-2.5.4-r2.ebuild 1714 BLAKE2B 1609d09a298a4c5098ab5c43b96d8ac6451b8b1816d58f922e5c8a56794fc543d47244d36728e96afc06fe4b49274b9d876654d24d86f856083c161c6ec9cb78 SHA512 da9a301719b8f9c41acbe4cc8e5a69123330a164a8c2d1ec7d51e948d0152969af8450950ef4954c3d4039785254d6c9026e0c2c7271f22315ead96a75e01ae9
-MISC metadata.xml 329 BLAKE2B 1a6d27d8cbd0cb64761f22fdfec0dde92a2309d8af353b6ee74c6e2c41273ae0a033674ea34019a76d3deb7938908236624520d6c1caaedeefe978d36f679e4c SHA512 9dc7087d6e8f9238e014a01f75ac366608fb881eb8d905412a590c7fe52d931d624a2c07164c861511e27152ca1a7b9e095db30b64cc7733cfd2e7e20abc6c60
diff --git a/games-kids/pytraffic/files/pytraffic b/games-kids/pytraffic/files/pytraffic
deleted file mode 100644
index 30ab25196ce7..000000000000
--- a/games-kids/pytraffic/files/pytraffic
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env python
-
-import os
-os.chdir("@GAMES_DATADIR@")
-import pytraffic.Main
-
diff --git a/games-kids/pytraffic/metadata.xml b/games-kids/pytraffic/metadata.xml
deleted file mode 100644
index 9814659ba9cc..000000000000
--- a/games-kids/pytraffic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">pytraffic</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-kids/pytraffic/pytraffic-2.5.4-r2.ebuild b/games-kids/pytraffic/pytraffic-2.5.4-r2.ebuild
deleted file mode 100644
index c3d2b8f0a0c8..000000000000
--- a/games-kids/pytraffic/pytraffic-2.5.4-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils gnome2-utils python-utils-r1 python-r1 distutils-r1
-
-DESCRIPTION="Python version of the board game Rush Hour"
-HOMEPAGE="http://freecode.com/projects/pytraffic"
-SRC_URI="http://alpha.uhasselt.be/Research/Algebra/Members/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl:0[sound]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}
-	dev-python/pygtk"
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# FHS compliance
-	sed -i \
-		-e 's#return os.path.join(exec_dir,path)#return os.path.join(os.getcwd(),path)#' \
-		Misc.py || die
-
-	sed \
-		-e "s#@GAMES_DATADIR@#/usr/share/${PN}#" \
-		"${FILESDIR}"/${PN} > "${T}"/${PN} || die
-}
-
-python_install() {
-	# install modules manually, build system broken
-	python_moduleinto ${PN}
-	python_domodule "${BUILD_DIR}"/lib/.
-
-	# allow to import the stuff as module
-	touch "${D}$(python_get_sitedir)"/${PN}/__init__.py || die
-
-	# install python wrapper script to handle multiple ABI properly
-	python_scriptinto /usr/bin
-	python_doscript "${T}"/${PN}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/${PN}
-	doins -r doc config.db extra_themes icons libglade music sound_test themes ttraffic.levels
-
-	doicon -s 64 icons/64x64/${PN}.png
-	make_desktop_entry ${PN} PyTraffic
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-kids/tuxmath-2.0.3-r1 b/games-kids/tuxmath-2.0.3-r1
new file mode 100644
index 000000000000..49990bcd943a
--- /dev/null
+++ b/games-kids/tuxmath-2.0.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=dev-games/t4k-common[svg?] dev-libs/libxml2:2 media-libs/libsdl:0[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] media-libs/sdl-net media-libs/sdl-pango nls? ( virtual/libintl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=Educational arcade game where you have to solve maths problems
+EAPI=6
+HOMEPAGE=http://tux4kids.alioth.debian.org/tuxmath/
+IUSE=nls svg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 OFL-1.1
+RDEPEND=dev-games/t4k-common[svg?] dev-libs/libxml2:2 media-libs/libsdl:0[video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] media-libs/sdl-net media-libs/sdl-pango nls? ( virtual/libintl ) svg? ( gnome-base/librsvg:2 x11-libs/cairo )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/t/tuxmath/tuxmath_2.0.3.orig.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_=13d7d159efd4e202f151cc3b1a27560c
diff --git a/games-kids/tuxmath/Manifest b/games-kids/tuxmath/Manifest
deleted file mode 100644
index b6aade9e1937..000000000000
--- a/games-kids/tuxmath/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tuxmath_2.0.3.orig.tar.gz 10396696 BLAKE2B bd060178e1acf62a36da380b9212e72549fde8f6e680d6ca3a4bbee3a0db163ae96a2df2a26d03bad96bf9fc297a6de5c6b0135b4be98ebacc325e1aff5ffbdf SHA512 dd7af90f3b1bd637f2f1639a3877d1a9950c95e60b1a71633998e2b0a654bb8015c4bf83540a9af092fe054d468035d0de5f3ddc7d54b17c3235f794a6108fbe
-EBUILD tuxmath-2.0.3-r1.ebuild 1267 BLAKE2B f3019ba58a18dc8b719a671e41049b1248bcb95d829ef5c223515429675a6b8993f99a496d491c230541bceb17657c461a4f791111865c19bdb40a7ec225242a SHA512 e3da9218c8faf5659eb31c4d5886e8bf9d82e677d8d1977a51fa11b058dd67a8b7bab7c01ee361be5975f1c61d2a92a3e9e7f6f6327cdb649c3f410cdde197e7
-MISC metadata.xml 330 BLAKE2B 9bce1114f26de1cdca452e5fe280ecda8bd5ed968cf7cfd15338252d748c91ecbf7cde6270e84ff9bee4e7904bd3ab6aa874fcc40d3e748828936eae5a162376 SHA512 6119196d06b8bdee2062eda1fcca6735e17325bbc19991a1c021c864f6d962e44eda75fc016b2995056c452431659b7d1e158723d115ae58e699bbeb50e5fa1b
diff --git a/games-kids/tuxmath/metadata.xml b/games-kids/tuxmath/metadata.xml
deleted file mode 100644
index b916dfd60180..000000000000
--- a/games-kids/tuxmath/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">tuxmath</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild b/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
deleted file mode 100644
index 56c09b87901e..000000000000
--- a/games-kids/tuxmath/tuxmath-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-MY_PN="${PN}_w_fonts"
-DESCRIPTION="Educational arcade game where you have to solve maths problems"
-HOMEPAGE="http://tux4kids.alioth.debian.org/tuxmath/"
-SRC_URI="mirror://debian/pool/main/t/${PN}/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls svg"
-
-RDEPEND="dev-games/t4k-common[svg?]
-	dev-libs/libxml2:2
-	media-libs/libsdl:0[video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]
-	media-libs/sdl-net
-	media-libs/sdl-pango
-	nls? ( virtual/libintl )
-	svg? (
-		gnome-base/librsvg:2
-		x11-libs/cairo
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	default
-
-	sed -i -e '/\bdoc\b/d' Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_enable nls) \
-		$(usex svg "" "--without-rsvg")
-}
-
-src_install() {
-	default
-	doicon -s scalable data/images/icons/${PN}.svg
-	make_desktop_entry ${PN} "TuxMath"
-	dodoc doc/{README,TODO,changelog}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-kids/tuxmathscrabble-0.8.1-r1 b/games-kids/tuxmathscrabble-0.8.1-r1
new file mode 100644
index 000000000000..12f29186daab
--- /dev/null
+++ b/games-kids/tuxmathscrabble-0.8.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip
+DESCRIPTION=math-version of the popular board game for children 4-10
+EAPI=6
+HOMEPAGE=http://www.asymptopia.org/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/asymptopia/tuxmathscrabble/archive/0.8.1.tar.gz -> tuxmathscrabble-0.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2760645928d64bd3b0ff0c05e062dfa2
diff --git a/games-kids/tuxmathscrabble/Manifest b/games-kids/tuxmathscrabble/Manifest
deleted file mode 100644
index 7eb47af153d7..000000000000
--- a/games-kids/tuxmathscrabble/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tuxmathscrabble-0.8.1-gentoo.patch 2770 BLAKE2B 8d5134f7cb2285728545352bc79d240c1a5e5dcbc268fd72a3b9c7ef798997756f70387f34144ff82feed2f82f089b7035c68eb7e70fc99f0886241ac7e79be8 SHA512 11633dbaae261d007638fc7f6dd2e934654fa699d5f08d6fd01552c62de2b7e52e95ecd737920b62cbf3d289f5b8da0eeef2416a0f45d1d54a9aca4432684c4d
-DIST tuxmathscrabble-0.8.1.tar.gz 9376820 BLAKE2B 40746d4e9b9ee81b09e563a522f6d1ae839a4729b7b38c9a96758553766b2597360c7391d42f09c8de494871ce086883f47186a17e9ee4b61c8a0afdc0f07b11 SHA512 70a48b078af170c4008beca495576afc6e0dd72239b2b57543a98642ee9e8d13a2ae48aa5afab77015c8c56cd9a2d80865645504a620b2e2b798ed40f653533c
-EBUILD tuxmathscrabble-0.8.1-r1.ebuild 1314 BLAKE2B c890aacaf3678c71f18d1c189222486eb5c1b0ffc5436bc911f3fc2823c5003dc6d4ca6cfbdeb9ebd08f4a80a3347798f39e6f82de73779969353700cbf9464d SHA512 82134dc3fc4cafccbf9812871016971a518b1ee5f002ff3faa67fde4d7dfea596121f2a2555dc3adfbb76818b6bc1e0aba484a5a2b62b485cc1c49e59af10171
-MISC metadata.xml 344 BLAKE2B 0a845bf521bec0b1539b3397218a41a64e7d5bbd91796bfbde2cba1fcb22f2d4e50831f52a1f0ccd8b4fcf39f358668b95eee64d635c685efe69635ae2e18453 SHA512 28b2c2b0b4de1a63524eeda1048d8bf7149bfb7eec23a39e22503143c9d68f449d7e40ec60f5529ce882670875961197ccdb5d8cf49d5c099f3392877a77d64d
diff --git a/games-kids/tuxmathscrabble/files/tuxmathscrabble-0.8.1-gentoo.patch b/games-kids/tuxmathscrabble/files/tuxmathscrabble-0.8.1-gentoo.patch
deleted file mode 100644
index 0e104f2f586f..000000000000
--- a/games-kids/tuxmathscrabble/files/tuxmathscrabble-0.8.1-gentoo.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/TuxMathScrabble/tms.py	2015-02-02 22:19:30.894373011 +0100
-+++ b/TuxMathScrabble/tms.py	2015-02-02 22:20:19.530320947 +0100
-@@ -1258,7 +1258,7 @@
- 		if not os.path.exists(infname):
- 			
- 			master_fname=os.path.join(self.env.fontdir,'.tms_config_master')
--			candidate=os.path.join('/','usr','share','games','tuxmathscrabble','.tms_config_master')
-+			candidate=os.path.join('@GENTOO_DATADIR@','.tms_config_master')
- 			if os.path.exists(candidate):
- 				master_fname=candidate
- 			
---- a/.tms_config_master	2015-02-02 22:21:59.655216399 +0100
-+++ b/.tms_config_master	2015-02-02 22:25:33.754003432 +0100
-@@ -380,66 +380,66 @@
- 		'wtype':'wx.SpinCtrl',
- 	},
- 	'FONT_APPNAME':{
--		'default_path':'./Font',
-+		'default_path':'@GENTOO_DATADIR@/Font',
- 		'default_value':'mickey.ttf',
- 		'descr':'',
- 		'dtype':'wx.String',
--		'path':'./Font',
-+		'path':'@GENTOO_DATADIR@/Font',
- 		'showme':-1,
- 		'tooltip':'Font to be used for application name overlay.',
- 		'value':'mickey.ttf',
- 		'wtype':'wx.FileDialog',
- 	},
- 	'FONT_BFONT':{
--		'default_path':'./Font',
-+		'default_path':'@GENTOO_DATADIR@/Font',
- 		'default_value':'Bluehigh.ttf',
- 		'descr':'',
- 		'dtype':'wx.String',
--		'path':'./Font',
-+		'path':'@GENTOO_DATADIR@/Font',
- 		'showme':0,
- 		'tooltip':'Button Font',
- 		'value':'Bluehigh.ttf',
- 		'wtype':'wx.FileDialog',
- 	},
- 	'FONT_CFONT':{
--		'default_path':'./Font',
-+		'default_path':'@GENTOO_DATADIR@/Font',
- 		'default_value':'arialbd.ttf',
- 		'descr':'',
- 		'dtype':'wx.String',
--		'path':'./Font',
-+		'path':'@GENTOO_DATADIR@/Font',
- 		'showme':0,
- 		'tooltip':'Character font used for tile characters',
- 		'value':'arialbd.ttf',
- 		'wtype':'wx.FileDialog',
- 	},
- 	'FONT_HUD':{
--		'default_path':'./Font',
-+		'default_path':'@GENTOO_DATADIR@/Font',
- 		'default_value':'aqua_pfont.ttf',
- 		'descr':'',
- 		'dtype':'wx.String',
--		'path':'./Font',
-+		'path':'@GENTOO_DATADIR@/Font',
- 		'showme':0,
- 		'tooltip':'The default font to be used for other overlay information (credits, etc).',
- 		'value':'aqua_pfont.ttf',
- 		'wtype':'wx.FileDialog',
- 	},
- 	'FONT_OVERLAY':{
--		'default_path':'./Font',
-+		'default_path':'@GENTOO_DATADIR@/Font',
- 		'default_value':'arial.ttf',
- 		'descr':'',
- 		'dtype':'wx.String',
--		'path':'./Font',
-+		'path':'@GENTOO_DATADIR@/Font',
- 		'showme':0,
- 		'tooltip':'The default font to be used for other overlay information (credits, etc).',
- 		'value':'arial.ttf',
- 		'wtype':'wx.FileDialog',
- 	},
- 	'FONT_PFONT':{
--		'default_path':'./Font',
-+		'default_path':'@GENTOO_DATADIR@/Font',
- 		'default_value':'Bluehigh.ttf',
- 		'descr':'',
- 		'dtype':'wx.String',
--		'path':'./Font',
-+		'path':'@GENTOO_DATADIR@/Font',
- 		'showme':0,
- 		'tooltip':'Point value font (ie lower right corner of tiles)',
- 		'value':'Bluehigh.ttf',
diff --git a/games-kids/tuxmathscrabble/metadata.xml b/games-kids/tuxmathscrabble/metadata.xml
deleted file mode 100644
index bc7656e3fc1e..000000000000
--- a/games-kids/tuxmathscrabble/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">asymptopia/tuxmathscrabble</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild b/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
deleted file mode 100644
index 53a209e1052b..000000000000
--- a/games-kids/tuxmathscrabble/tuxmathscrabble-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 multilib
-
-MY_PN=TuxMathScrabble
-DESCRIPTION="math-version of the popular board game for children 4-10"
-HOMEPAGE="http://www.asymptopia.org/"
-SRC_URI="https://github.com/asymptopia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-CDEPEND="${PYTHON_DEPS}
-	dev-python/wxpython[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	app-arch/unzip"
-RDEPEND="${CDEPEND}
-	dev-python/pygame[${PYTHON_USEDEP}]"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	rm -f $(find . -name '*.pyc')
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${MY_PN}:" \
-		${MY_PN}/tms.py \
-		.tms_config_master \
-		|| die "sed failed"
-	sed -i \
-		-e "s:python2.7-32:python:g" \
-		${PN}.py || die "2nd sed failed"
-	python_fix_shebang .
-}
-
-src_install() {
-	newbin ${PN}.py ${PN}
-
-	insinto $(python_get_sitedir)
-	doins -r ${MY_PN}
-
-	insinto /usr/share/${MY_PN}
-	doins -r .tms_config_master Font
-
-	python_optimize
-
-	newicon tms.ico ${PN}.ico
-	make_desktop_entry ${PN} ${PN} /usr/share/pixmaps/${PN}.ico
-
-	dodoc CHANGES README
-}
diff --git a/games-kids/tuxtype-1.8.1-r1 b/games-kids/tuxtype-1.8.1-r1
new file mode 100644
index 000000000000..5e34c7184386
--- /dev/null
+++ b/games-kids/tuxtype-1.8.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf svg? ( gnome-base/librsvg )
+DESCRIPTION=Typing tutorial with lots of eye-candy
+EAPI=6
+HOMEPAGE=https://alioth.debian.org/projects/tux4kids
+IUSE=svg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 OFL-1.1
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf svg? ( gnome-base/librsvg )
+SLOT=0
+SRC_URI=https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-1.8.1.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_=22012bb6c393eaed1fed533de32defb7
diff --git a/games-kids/tuxtype/Manifest b/games-kids/tuxtype/Manifest
deleted file mode 100644
index ef8524e2ece4..000000000000
--- a/games-kids/tuxtype/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tuxtype_w_fonts-1.8.1.tar.gz 11528002 BLAKE2B 45cf547f94665913746c6f3fbcd25554cd4adeda1b6cbcc7cbffc1afec3c161f590ad9d21fa53c8e141978916a2d943cfa626cf412f805aeaf7d327284b11615 SHA512 2c360807295f8d9f3d18f36b64c49e39fac78d81570c7a554244a01ee76627c90579e580b609ea7994378f5bbff916142e293ad94306b7b38d132fdc1c53734f
-EBUILD tuxtype-1.8.1-r1.ebuild 1059 BLAKE2B 5ae170cdbcad66fa1a2e2710555a0ab453b3de73058658700c3722041e7fc469de8498ed2bf78c9762308efca637279c626c527a0a3d07202bdd022d5b18f85c SHA512 0022ad58f51ed9eb84968c6b690c73b4cce22e61a72ef9a458fc79fe9c31474f6987af156957722d7f7fc37d9df0f277100cd4511bc91ef0278452b890a875e8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-kids/tuxtype/metadata.xml b/games-kids/tuxtype/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-kids/tuxtype/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild b/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
deleted file mode 100644
index ecb8f47f7717..000000000000
--- a/games-kids/tuxtype/tuxtype-1.8.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils user
-
-DESCRIPTION="Typing tutorial with lots of eye-candy"
-HOMEPAGE="https://alioth.debian.org/projects/tux4kids"
-SRC_URI="https://alioth.debian.org/frs/download.php/3270/tuxtype_w_fonts-${PV}.tar.gz"
-
-LICENSE="GPL-2 OFL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="svg"
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-pango
-	media-libs/sdl-ttf
-	svg? ( gnome-base/librsvg )"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/tuxtype_w_fonts-${PV}
-
-pkg_setup(){
-	enewgroup gamestat 36
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		$(use_with svg rsvg)
-}
-
-src_install() {
-	default
-	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL,ABOUT-NLS}*
-	doicon ${PN}.ico
-	make_desktop_entry ${PN} TuxTyping /usr/share/pixmaps/${PN}.ico
-	keepdir /etc/${PN} /var/games/${PN}/words
-
-	fowners root:gamestat /var/games/${PN} /usr/bin/${PN}
-	fperms 660 /var/games/${PN}
-	fperms 2755 /usr/bin/${PN}
-}
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 3d47ddb98923..26378bf387ce 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/OilWar-1.2.1-r2 b/games-misc/OilWar-1.2.1-r2
new file mode 100644
index 000000000000..69ecb5075c29
--- /dev/null
+++ b/games-misc/OilWar-1.2.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer >=sys-apps/sed-4
+DESCRIPTION=Evil army is attacking your country and tries to steal your oil
+EAPI=6
+HOMEPAGE=http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/RTS/OilWar-15354.shtml
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[png] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://gentoo/OilWar-1.2.1.tar.gz mirror://gentoo/OilWar.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5cc81f8c6f1a79819d23f7535dbf4ea5
diff --git a/games-misc/OilWar/Manifest b/games-misc/OilWar/Manifest
deleted file mode 100644
index c7dee6f042e9..000000000000
--- a/games-misc/OilWar/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST OilWar-1.2.1.tar.gz 515013 BLAKE2B 44c7950168e9ba9d7cc0c068ca0abeba4249bbab43d89663bcf2e752e10e680a7ea8a09eb2c983ce5948e65e0609cd9de920997eddf45702e54109819c019137 SHA512 303581caf1cb59a4623b136595e0c1af6f682ae4c059a8848b481b42dee622083d436edb86ca9073edcf4c573f8a73b284dddea89cb8013943ef4ec81b3e17a1
-DIST OilWar.png 2961 BLAKE2B c7270884148e8712b93c44de532a902e807a58507ba5fd509ad020556d90d9a54d24a3243ced7c1de3d41635654397747cbd79d93e82ad6fa231c7eb9c0fb14e SHA512 75bd4c18791593f0bb81b51d87f6f033e2ebebe6de3653276b14e852d3625f01a61fb34257eb3d15ebf265908563f2820793b84196138b39c9329839e8fefe2d
-EBUILD OilWar-1.2.1-r2.ebuild 1151 BLAKE2B 6305f09b29baca9f586e1a442caec98792a5a09e702a2ea2adb367ae1611e9a4f3b7f9309fc0c29bfb769fd0ab26c1c688c67ad0d0a0a42e3c40a2e380c67c6f SHA512 fdf072c461e7fc59b418d5db568204b3cf3fd916785734d67e0eda7a038b84c1271a6ba58029c5b50dd1abee49d1833a18d135579c09f056d394c71b07771a15
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/OilWar/OilWar-1.2.1-r2.ebuild b/games-misc/OilWar/OilWar-1.2.1-r2.ebuild
deleted file mode 100644
index 4b1a9829d608..000000000000
--- a/games-misc/OilWar/OilWar-1.2.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils user
-
-DESCRIPTION="Evil army is attacking your country and tries to steal your oil"
-HOMEPAGE="http://linux.softpedia.com/get/GAMES-ENTERTAINMENT/RTS/OilWar-15354.shtml"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-pkg_setup(){
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CXXCOMPILE/s:$(CPPFLAGS):$(SDL_CFLAGS):' \
-		-e '/install-data-am:/s:\\::' \
-		-e '/install-data-local$/d' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf --enable-sound
-}
-
-src_install() {
-	default
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry oilwar ${PN}
-
-	fowners root:gamestat /usr/bin/oilwar /var/games/oilwar.scores
-	fperms 664 /var/games/oilwar.scores
-	fperms 2755 /usr/bin/oilwar
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-misc/OilWar/metadata.xml b/games-misc/OilWar/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/OilWar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/asr-manpages-1.3_rc6 b/games-misc/asr-manpages-1.3_rc6
new file mode 100644
index 000000000000..e6b30c6d1e3a
--- /dev/null
+++ b/games-misc/asr-manpages-1.3_rc6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=set of humorous manual pages developed on alt.sysadmin.recovery
+EAPI=5
+HOMEPAGE=https://www.debian.org
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86
+LICENSE=freedist
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/asr-manpages/asr-manpages_1.3.orig.tar.gz mirror://debian/pool/main/a/asr-manpages/asr-manpages_1.3-6.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d290a6ea157156b4e6666003d593f32a
diff --git a/games-misc/asr-manpages/Manifest b/games-misc/asr-manpages/Manifest
deleted file mode 100644
index c82600a0ec1d..000000000000
--- a/games-misc/asr-manpages/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST asr-manpages_1.3-6.diff.gz 3558 BLAKE2B 33435145176e65acad4a7f25ad84457a6fb6b60fbe1914d0b629b7776a26122bfd12898dec5e152a95fbf02a74d647ba18bcee76034c4458c7784a9bdb9fb99f SHA512 3b9d75b36c8417e5fdef7e4f3f17321bb482dc9c0cb6ce936a6ca8e2acf5254a39281925763f125898d1888dac4de457094e0b3fdcb5fd6eac5e4c6ce803b6aa
-DIST asr-manpages_1.3.orig.tar.gz 14711 BLAKE2B 5e2d369145f407bee9c96d292a53e13eba3db4fd6011b0db81cf356714410a788eafaa8963b66f7e373f81ff98a46b402fb92b0694f6603a1899cc2ec79498d4 SHA512 abfc6a9306c128802f0d85faeb27981199e1348d22f9d0afd8f95f59c9c9b0c5eb2c0f028ea0cb10be1fe497146223c93ae787ff90160a9e0809a1965de826af
-EBUILD asr-manpages-1.3_rc6.ebuild 679 BLAKE2B d8cc45a6bc3405ce5baeeed571e17a5fcc6321b081c455b0ddb962933c631f3ab4209573a42f5e7f7c96d1d6d0928b791e994fdd25641dd86927da8ac0d8dbf2 SHA512 3e60d4dc8a47e70667ecdb8555f332b40ea1b1e00e6179567350193d0d63c4fb7eee3020b4ba2951e4b7239cf0a5a40b032cb8c68a15593bfd0544d00a2e64a3
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild b/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
deleted file mode 100644
index 26d8645edc16..000000000000
--- a/games-misc/asr-manpages/asr-manpages-1.3_rc6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_R="6"
-MY_P="${PN}_${PV/_rc6/}"
-DESCRIPTION="set of humorous manual pages developed on alt.sysadmin.recovery"
-HOMEPAGE="https://www.debian.org"
-SRC_URI="mirror://debian/pool/main/a/asr-manpages/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/a/asr-manpages/${MY_P}-${MY_R}.diff.gz"
-
-LICENSE="freedist" #465704
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S=${WORKDIR}/${MY_P/_/-}.orig
-
-src_prepare() {
-	epatch ../"${MY_P}-${MY_R}.diff"
-	rm -rf debian
-}
-
-src_install() {
-	doman *
-}
diff --git a/games-misc/asr-manpages/metadata.xml b/games-misc/asr-manpages/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/asr-manpages/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/ballerburg-1.2.0 b/games-misc/ballerburg-1.2.0
new file mode 100644
index 000000000000..da054afd56ac
--- /dev/null
+++ b/games-misc/ballerburg-1.2.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libsdl sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Linux port of the classical Atari ST game Ballerburg
+EAPI=6
+HOMEPAGE=http://baller.tuxfamily.org/
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=media-libs/libsdl
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/baller/ballerburg-1.2.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ebf8b24419f7610132b97b06df254a62
diff --git a/games-misc/ballerburg/Manifest b/games-misc/ballerburg/Manifest
deleted file mode 100644
index 30d72dea8165..000000000000
--- a/games-misc/ballerburg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ballerburg-1.2.0.tar.gz 99910 BLAKE2B cbc88ec39135847f9a339b37ae52a151880aafe4ef52659fe0a7c57f3a50b67d4cbb9d46226bf85871a9b7b9321aaad1b38c81d89ed159d07769f7a8be3ce9c3 SHA512 d9a911e811871604650df0224633c5338570ed5eee9a2f3eecb35bc012388b9296878b62b2459965c0766dd7e7cded9a23168f39346a2300aac9e9fe4f478760
-EBUILD ballerburg-1.2.0.ebuild 396 BLAKE2B e2d0a386f3a0567a275fc0be7f4d673068740783b8433da7c615d6c5fb54eb750415b1799daab374e06dd23bbac71c2e7e2cea792eeff26aff1fb12b41eb84ad SHA512 9d89b09cfe79e04fe40734ae8cd601287007648a2f9ec5d6ee0ab179383754793aad9c2bdcf8687adafd0783e5600b91daa8abeea5a81c48df8fa34aae60490f
-MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/games-misc/ballerburg/ballerburg-1.2.0.ebuild b/games-misc/ballerburg/ballerburg-1.2.0.ebuild
deleted file mode 100644
index 3b9c55031ab1..000000000000
--- a/games-misc/ballerburg/ballerburg-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Linux port of the classical Atari ST game Ballerburg"
-HOMEPAGE="http://baller.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/baller/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="media-libs/libsdl"
-RDEPEND="${DEPEND}"
diff --git a/games-misc/ballerburg/metadata.xml b/games-misc/ballerburg/metadata.xml
deleted file mode 100644
index 80a71f597854..000000000000
--- a/games-misc/ballerburg/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/games-misc/bsd-games-2.17-r5 b/games-misc/bsd-games-2.17-r5
new file mode 100644
index 000000000000..6c135cc4431b
--- /dev/null
+++ b/games-misc/bsd-games-2.17-r5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=!games-misc/wtf !app-misc/banner !games-puzzle/hangman sys-libs/ncurses:0 sys-apps/miscfiles sys-devel/flex sys-devel/bison virtual/pkgconfig
+DESCRIPTION=collection of games from NetBSD
+EAPI=5
+HOMEPAGE=http://www.advogato.org/proj/bsd-games/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=BSD
+RDEPEND=!games-misc/wtf !app-misc/banner !games-puzzle/hangman sys-libs/ncurses:0 sys-apps/miscfiles games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://metalab.unc.edu/pub/Linux/games/bsd-games-2.17.tar.gz mirror://debian/pool/main/b/bsdgames/bsdgames_2.17-22.debian.tar.xz
+_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_=8084151834c5f22f7b88c3f4d9a8ee09
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
deleted file mode 100644
index 907aa79ca930..000000000000
--- a/games-misc/bsd-games/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX bsd-games-2.17-64bitutmp.patch 681 BLAKE2B 2ef7ad184787ecab40e3082992bfb562be4477dfe331f2ab68e93f619f9cf5b1ee33b8d4f2b342c44f8a22d19c51b341557670c9bebb5fe827f6fbfd601b99c1 SHA512 ba5a261950bd0f5f5b6aae0ee961a84f06bc6b68504c859db387d9c32875cb4f849c555c56c52f66b00af85d44d9a2324a2d1cccc6811acf6f980cefe9508258
-AUX bsd-games-2.17-bg.patch 732 BLAKE2B 84e76aa2d3e6eeb34b92140adb2cfb1ca6ad1ad23a1261225277d3cc439e98d70ba4e93af5d44e080c71bb4c62c906b68a872191c09aedb93345949b9db512a9 SHA512 006ce0aa632c1ff671bc98584307fcfabed62e81a4680271fcbbaebf93e0f6f7c89cb1fbe311ffa472facd02991c456ced6b198c02753958b1178aa9ef16d8ba
-AUX bsd-games-2.17-gcc4.patch 893 BLAKE2B 54eb6b43592d83dd40c8e00e82438e3cbd818f2fc61cd121f0e9a3c555e57505668946bc6033f799791da96484ec834379ca657640b8541c4ba5b394fcc87070 SHA512 fca57d3887f202b973bf5c03eb0d9a8e62a0ef8f746ccec0cb6e3ad2494bdf1208a1a8833bd3b762281289802b8c58d90cab62fe2642915acaf1ff87233329c5
-AUX bsd-games-2.17-headers.patch 268 BLAKE2B e3b1761e4373e2ed22c3a4b1d31e30f5af8ecd16de8c33bee0f02aa988f5e8dad78395d786a55214ef9f714864723f71ea3913bb832b3fd322bbcc0f8ab01040 SHA512 cc7c62109e835b31db0dfbb84de35fcb962bebee04b901c727b7ff087c194bfb12e4edac6b7e2f3ca0e414bd486c18962e8f5ad1f33a997e2782f58b9b62469f
-AUX config.params-gentoo 1204 BLAKE2B 638b52df3c92928a78a0e0833c2bc84a76906144b36d5a6b3523f4de24452aeeab355268afadb9d32933e5c0c19ab4145062bf3968a9d440af1a659a403b32c4 SHA512 b6734409235caec3deb531bbcdb37527b3090c41b803ccc11895ea403543722437f84bdfa044c6aa70b306384ce94a40979a347e6031bc1d937841c7222d6618
-DIST bsd-games-2.17.tar.gz 2563311 BLAKE2B 9dfff4e70929e14a422c536c661cd95c5f1ac81d9112494525b9ef13d7a39b66bd59b6a264e614cfb29784fdb63364f56b12b4d284b125b5b3c12e92def07fb0 SHA512 cb2ee60474f164d42e3d47700270bbeeda3c8279d64da409c9cc05e36437ef95b92d0a85543298e97604635fcf3e068f3a5cc812e90b5c61fb8d146cf35bc38f
-DIST bsdgames_2.17-22.debian.tar.xz 32268 BLAKE2B 2485abc1d80b8319c7eb68e2747c0a4166d18079047eca67c1de549cd011f75a767b6fe69021cb4ce09aaf029823a097e6ac658efcab5e19e976a89ed798d06f SHA512 902d86557dd3813c31333fe18437d8046ae100814c9c1b340ab1f8266c817545f21e000702b1ca93babb9d632896ea5bada1e146436abfa7916b469681fceed5
-EBUILD bsd-games-2.17-r5.ebuild 4333 BLAKE2B c5b3a50469f62a5af317ca720b43787117a3d675d8170bb91cb4a43dbc9fd928359bfb62c1f86819522ed245fd2f96377deee74e0891c17538259afe4bc61123 SHA512 cd1ef22f06ffa4b454022ac65ce1b0cad748ae6dd07c5bc100eb2eb2ba8af92af5adcf76be7545c2bfc568bbd1f776c80ce4800784a6a22a04728a8b0b505e9d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild b/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
deleted file mode 100644
index cefeb7976f5b..000000000000
--- a/games-misc/bsd-games/bsd-games-2.17-r5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DEB_PATCH_VER=22
-DESCRIPTION="collection of games from NetBSD"
-HOMEPAGE="http://www.advogato.org/proj/bsd-games/"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/games/${P}.tar.gz
-	mirror://debian/pool/main/b/bsdgames/bsdgames_${PV}-${DEB_PATCH_VER}.debian.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!games-misc/wtf
-	!app-misc/banner
-	!games-puzzle/hangman
-	sys-libs/ncurses:0
-	sys-apps/miscfiles"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	virtual/pkgconfig"
-
-# Set GAMES_TO_BUILD variable to whatever you want
-GAMES_TO_BUILD=${GAMES_TO_BUILD:=adventure arithmetic atc
-backgammon banner battlestar bcd boggle caesar canfield countmail cribbage
-dab dm factor fish gomoku hack hangman hunt mille monop morse
-number phantasia pig pom ppt primes quiz rain random robots sail snake
-tetris trek wargames worm worms wtf}
-
-src_prepare() {
-	local d="${WORKDIR}"/debian/patches
-	EPATCH_SOURCE="${d}" epatch $(<"${d}"/series)
-
-	# Used by gentoo config.params. See bug 531200
-	export GAMES_BINDIR GAMES_DATADIR GAMES_STATEDIR
-
-	epatch \
-		"${FILESDIR}"/${P}-64bitutmp.patch \
-		"${FILESDIR}"/${P}-headers.patch \
-		"${FILESDIR}"/${P}-bg.patch \
-		"${FILESDIR}"/${P}-gcc4.patch
-
-	# Use pkg-config to query Libs: from ncurses.pc (for eg. -ltinfo) wrt #459652
-	sed -i \
-		-e "/ncurses_lib/s:-lncurses:'$($(tc-getPKG_CONFIG) --libs-only-l ncurses)':" \
-		configure || die
-
-	sed -i \
-		-e "s:/usr/games:${GAMES_BINDIR}:" \
-		wargames/wargames || die
-
-	sed -i \
-		-e '/^CC :=/d' \
-		-e '/^CXX :=/d' \
-		-e '/^CFLAGS/s/OPTIMIZE/CFLAGS/' \
-		-e '/^CXXFLAGS/s/OPTIMIZE/CXXFLAGS/' \
-		-e '/^LDFLAGS/s/LDFLAGS := /LDFLAGS := \$(LDFLAGS) /' \
-		Makeconfig.in || die
-
-	cp "${FILESDIR}"/config.params-gentoo config.params || die
-	echo bsd_games_cfg_usrlibdir=\"$(games_get_libdir)\" >> ./config.params || die
-	echo bsd_games_cfg_build_dirs=\"${GAMES_TO_BUILD}\" >> ./config.params || die
-	echo bsd_games_cfg_docdir=\"/usr/share/doc/${PF}\" >> ./config.params || die
-}
-
-src_test() {
-	addwrite /dev/full
-	emake -j1 check
-}
-
-build_game() {
-	has ${1} ${GAMES_TO_BUILD}
-}
-
-do_statefile() {
-	touch "${D}/${GAMES_STATEDIR}/${1}" || die
-	chmod ug+rw "${D}/${GAMES_STATEDIR}/${1}" || die
-}
-
-src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_STATEDIR}" /usr/share/man/man{1,6}
-	emake -j1 DESTDIR="${D}" install
-
-	dodoc AUTHORS BUGS ChangeLog ChangeLog.0 \
-		README PACKAGING SECURITY THANKS TODO YEAR2000
-
-	# set some binaries to run as games group (+S)
-	build_game atc && fperms g+s "${GAMES_BINDIR}"/atc
-	build_game battlestar && fperms g+s "${GAMES_BINDIR}"/battlestar
-	build_game canfield && fperms g+s "${GAMES_BINDIR}"/canfield
-	build_game cribbage && fperms g+s "${GAMES_BINDIR}"/cribbage
-	build_game phantasia && fperms g+s "${GAMES_BINDIR}"/phantasia
-	build_game robots && fperms g+s "${GAMES_BINDIR}"/robots
-	build_game sail && fperms g+s "${GAMES_BINDIR}"/sail
-	build_game snake && fperms g+s "${GAMES_BINDIR}"/snake
-	build_game tetris && fperms g+s "${GAMES_BINDIR}"/tetris-bsd
-
-	# state files
-	build_game atc && do_statefile atc_score
-	build_game battlestar && do_statefile battlestar.log
-	build_game canfield && do_statefile cfscores
-	build_game cribbage && do_statefile criblog
-	build_game hack && keepdir "${GAMES_STATEDIR}"/hack
-	build_game robots && do_statefile robots_roll
-	build_game sail && do_statefile saillog
-	build_game snake && do_statefile snake.log && do_statefile snakerawscores
-	build_game tetris && do_statefile tetris-bsd.scores
-
-	# extra docs
-	build_game atc && { docinto atc ; dodoc atc/BUGS; }
-	build_game boggle && { docinto boggle ; dodoc boggle/README; }
-	build_game hack && { docinto hack ; dodoc hack/{OWNER,Original_READ_ME,READ_ME,help}; }
-	build_game hunt && { docinto hunt ; dodoc hunt/README; }
-	build_game phantasia && { docinto phantasia ; dodoc phantasia/{OWNER,README}; }
-
-	# Since factor is usually not installed, and primes.6 is a symlink to
-	# factor.6, make sure that primes.6 is ok ...
-	if build_game primes && [[ ! $(build_game factor) ]] ; then
-		rm -f "${D}"/usr/share/man/man6/{factor,primes}.6
-		newman factor/factor.6 primes.6
-	fi
-
-	prepgamesdirs
-
-	# state dirs
-	chmod -R ug+rw "${D}/${GAMES_STATEDIR}"/* || die
-}
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch b/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
deleted file mode 100644
index 3be1b3de074b..000000000000
--- a/games-misc/bsd-games/files/bsd-games-2.17-64bitutmp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-About utmpentry.c:
-
-the utmpx structure defines the ut_tv member a little differently on 
-64bit hosts so that a 32bit and 64bit structure can be shared.  So the 
-ut_tv is a custom 32bit structure rather than the native 64bit timeval 
-structure.  Work around is to assign the submembers instead.
-
-http://bugs.gentoo.org/show_bug.cgi?id=102667
-
---- bsd-games/dm/utmpentry.c
-+++ bsd-games/dm/utmpentry.c
-@@ -291,7 +291,8 @@
- 	e->line[sizeof(e->line) - 1] = '\0';
- 	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
- 	e->name[sizeof(e->host) - 1] = '\0';
--	e->tv = up->ut_tv;
-+	e->tv.tv_sec = up->ut_tv.tv_sec;
-+	e->tv.tv_usec = up->ut_tv.tv_usec;
- 	adjust_size(e);
- }
- #endif
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch b/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
deleted file mode 100644
index 07dc520b77e4..000000000000
--- a/games-misc/bsd-games/files/bsd-games-2.17-bg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- backgammon/common_source/fancy.c.old	2007-05-16 20:16:46.000000000 +0200
-+++ backgammon/common_source/fancy.c	2007-05-16 20:19:00.000000000 +0200
-@@ -58,7 +58,7 @@
- int     lUP;			/* length of UP */
- int     CO;			/* number of columns */
- int     LI;			/* number of lines */
--int    *linect;			/* array of lengths of lines on screen (the
-+static int linect[25];		/* array of lengths of lines on screen (the
- 				 * actual screen is not stored) */
- 
-  /* two letter codes */
-@@ -728,10 +728,5 @@
- 		lND = strlen(ND);
- 	if (LI < 24 || CO < 72 || !(CL && UP && ND))
- 		return (0);
--	linect = (int *) calloc(LI + 1, sizeof(int));
--	if (linect == NULL) {
--		write(2, "\r\nOut of memory!\r\n", 18);
--		getout(0);
--	}
- 	return (1);
- }
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch b/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
deleted file mode 100644
index 7de07effc25d..000000000000
--- a/games-misc/bsd-games/files/bsd-games-2.17-gcc4.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- trek/getpar.h.orig	2005-08-14 19:45:29.000000000 -0400
-+++ trek/getpar.h	2005-08-14 19:46:33.000000000 -0400
-@@ -31,6 +31,9 @@
-  *	@(#)getpar.h	8.1 (Berkeley) 5/31/93
-  */
- 
-+#ifndef __GETPAR_H_
-+#define __GETPAR_H_
-+
- typedef void (*cmdfun)(int);
- struct cvntab		/* used for getcodpar() parameter list */
- {
-@@ -51,3 +54,5 @@
- int testnl(void);
- void skiptonl(int);
- int readdelim(int);
-+
-+#endif /*__GETPAR_H_*/
---- trek/trek.h.orig	2005-08-14 19:45:37.000000000 -0400
-+++ trek/trek.h	2005-08-14 19:48:17.000000000 -0400
-@@ -31,6 +31,13 @@
-  *	@(#)trek.h	8.1 (Berkeley) 5/31/93
-  */
- 
-+/* For struct cvntab definition, which is now required for
-+ * Skitab and Lentab below.  gcc 4.0 and later will emit
-+ * "array type has incomplete element type" errors otherwise.
-+ * -- Jason Bucata (jbucata@tulsaconnect.com), 12-AUG-2005
-+ */
-+#include "getpar.h"
-+
- /*
- **  Global Declarations
- **
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch b/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
deleted file mode 100644
index 953a5d35765a..000000000000
--- a/games-misc/bsd-games/files/bsd-games-2.17-headers.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/128348
-
---- include/stdio.h
-+++ include/stdio.h
-@@ -35,5 +35,11 @@
- #include_next <stdio.h>
- 
- #ifndef HAVE_fgetln
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- extern char *fgetln(FILE *stream, size_t *len);
-+#ifdef __cplusplus
-+}
-+#endif
- #endif
diff --git a/games-misc/bsd-games/files/config.params-gentoo b/games-misc/bsd-games/files/config.params-gentoo
deleted file mode 100644
index 9d246d1865e9..000000000000
--- a/games-misc/bsd-games/files/config.params-gentoo
+++ /dev/null
@@ -1,39 +0,0 @@
-
-# This file is read by configure for the Gentoo ebuild 
-
-# Don't run configure interactively.
-bsd_games_cfg_non_interactive=y
-
-bsd_games_cfg_install_prefix=${D}
-
-# For gentoo, 
-#   banner used to be in util-linux.  Gentoo might have an ebuild
-#   fortune is "app-games/fortune-mod"
-#   factor is in "sys-apps/sh-utils"
-#   dm is not installed by debian, I don't know why
-bsd_games_cfg_no_build_dirs="dm banner fortune factor"
-
-# Gentoo's games eclass want everything in these places
-bsd_games_cfg_gamesdir=${GAMES_BINDIR}
-bsd_games_cfg_sbindir=${GAMES_BINDIR}
-bsd_games_cfg_sharedir=${GAMES_DATADIR}/${PN}
-bsd_games_cfg_varlibdir=${GAMES_STATEDIR}
-
-# We'll control all the permissions during install (via games eclass) 
-bsd_games_cfg_do_chown=n
-
-# .so or symlink??? (Debian perfers symlinks for manpages)
-bsd_games_cfg_use_dot_so=symlinks
-
-# Gentoo'll handle manpage compressing.
-bsd_games_cfg_gzip_manpages=n
-
-# sys-apps/less is in system (even though more is in /bin)
-bsd_games_cfg_pager=/usr/bin/less
-
-# sys-apps/miscfiles might have too many words for boggle
-bsd_games_cfg_dictionary_src=/usr/share/dict/words
-
-# Acronym file for "wft"
-bsd_games_cfg_wtf_acronymfile=${GAMES_DATADIR}/${PN}/acronyms
-
diff --git a/games-misc/bsd-games/metadata.xml b/games-misc/bsd-games/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/bsd-games/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/bsod-0.1-r1 b/games-misc/bsod-0.1-r1
new file mode 100644
index 000000000000..60a189fe86d9
--- /dev/null
+++ b/games-misc/bsod-0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=This program will let you experience the authentic Microsoft Windows experience
+EAPI=6
+HOMEPAGE=http://www.vanheusden.com/bsod/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://www.vanheusden.com/bsod/bsod-0.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d5405dccc23856681db7d085c1936e0b
diff --git a/games-misc/bsod/Manifest b/games-misc/bsod/Manifest
deleted file mode 100644
index e26dee1ec69b..000000000000
--- a/games-misc/bsod/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bsod-0.1-Makefile.patch 464 BLAKE2B ff9a1653fbbdde19337b5bfc1ba19467917acd9107ca62ed42def5cfb1262092b46e1e5de70f105ae3fc9d5a7199449f677651a909f81f7b7dd4c7fe84e986c7 SHA512 f5cb0912a1b851a7f6bd7d4cf861b11a1832a47674d67632343474f5a7c6e5dbde7c2a1f4e217e2df293c8ea9c780d7de6aa14fa6ce5d07a2b5704d57edbe2a3
-DIST bsod-0.1.tgz 10128 BLAKE2B e0869bd21beb38f369bb010b5a7d73bd3182a8531c9460cb279cedb498ce37830f39f97a30dfad567a14b12be5d50743a097720e3665306f2bef43085d339be9 SHA512 2b3087ee495c83f41c2c582dc1c391ce5b73600244b6183abbcd36a3f88caf16987250d4ad23eb3a556b014669ddd84947e6cddeb8d4c89e12c9bacc545299c8
-EBUILD bsod-0.1-r1.ebuild 600 BLAKE2B cc30ff1ccfccff1d84f95a664a766daaae3e84b5c3704013e116fc010c6c95aa86acf83e563630a30c69bca68369f70211741922f1268d8660c4df4b63a7a582 SHA512 82bb7e45283cc0466c7d917b2b780117a9253fcb9105e10a29dea63541bae8d6f9be14b0e4299db9896ed7ceeffda5cf2c6944d6ffe995fb133aa54db72ac978
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/bsod/bsod-0.1-r1.ebuild b/games-misc/bsod/bsod-0.1-r1.ebuild
deleted file mode 100644
index 3c9c455788c7..000000000000
--- a/games-misc/bsod/bsod-0.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="This program will let you experience the authentic Microsoft Windows experience"
-HOMEPAGE="http://www.vanheusden.com/bsod/"
-SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
-)
-
-src_prepare() {
-	default
-	tc-export PKG_CONFIG
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc Changes
-}
diff --git a/games-misc/bsod/files/bsod-0.1-Makefile.patch b/games-misc/bsod/files/bsod-0.1-Makefile.patch
deleted file mode 100644
index b7699c80403b..000000000000
--- a/games-misc/bsod/files/bsod-0.1-Makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,15 +1,15 @@
- VERSION=0.1
- 
- DEBUG=-g -pedantic #-pg #-fprofile-arcs
--LDFLAGS=-lncurses $(DEBUG)
--CFLAGS+=-O2 -Wall -DVERSION=\"$(VERSION)\" $(DEBUG)
-+LDLIBS=$(shell ${PKG_CONFIG} --libs ncurses)
-+CFLAGS+=-Wall -DVERSION=\"$(VERSION)\"
- 
- OBJS=bsod.o
- 
- all: bsod
- 
- bsod: $(OBJS)
--	$(CC) -Wall $(OBJS) $(LDFLAGS) -o bsod
-+	$(CC) $(LDFLAGS) $(CFLAGS) $(OBJS) $(LDLIBS) -o bsod
- 
- install: bsod
- 	cp bsod $(DESTDIR)/usr/local/bin
diff --git a/games-misc/bsod/metadata.xml b/games-misc/bsod/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/bsod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/c++robots-0-r1 b/games-misc/c++robots-0-r1
new file mode 100644
index 000000000000..58206c058415
--- /dev/null
+++ b/games-misc/c++robots-0-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=ongoing 'King of the Hill' (KotH) tournament
+EAPI=6
+HOMEPAGE=http://www.gamerz.net/c++robots/
+IUSE=static
+KEYWORDS=~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.gamerz.net/c++robots/c++robots.tar.gz
+_md5_=300b67b7237c0389c54759fac99728bc
diff --git a/games-misc/c++robots/Manifest b/games-misc/c++robots/Manifest
deleted file mode 100644
index 5395a1f7d8ea..000000000000
--- a/games-misc/c++robots/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX proper-coding.patch 1081 BLAKE2B 4c7c3b77e2079a90ac195918e50e2408bb81632f930e9ef547cf09c234db2514db0651247ef6e271a58102400c7054dcbb1f141aea12a80f07805ce06a8c2762 SHA512 cb9fa8f26a9e4a0820d8810f6133d0cd9e0903bc7c01ad8ba07da2f5e40117e574406fa0b89b57c60a7ad535f8fcf1fc6f89f72d84fc524d8d8ddbe8a760305e
-DIST c++robots.tar.gz 10896 BLAKE2B 8ca61cccd2b08992ece77cedb98e86642d00b797b1d34cf7039d7e3788e91ac5b20426766284bc7e4bca1625fd96a649110cac3b3afea8afd17e9dc0ff23898b SHA512 410a08c920f8e54abe74b085d67607bcc381e768c0127cf98eabab894a106d5d1466a1cac4146924b53c29ccffddd5eb77c9383c42b6fe6e48c7e89691e691f3
-EBUILD c++robots-0-r1.ebuild 614 BLAKE2B a1cede661ecdd0bde0ea388030f15b5e0b2eaf2c4460eb547abb6e13be3da85874436c443830a4728ff0b518486e0a192b0998a58b2bdd12fadc474b06629a1b SHA512 6ef1085c4fc7aed24eab7a521369becbb774e07a475618c13bd8eb57bf71cf824081c0ab87775410864c5f7873190a0adf4fa15648e63f8a336c6d2ad89351c0
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/c++robots/c++robots-0-r1.ebuild b/games-misc/c++robots/c++robots-0-r1.ebuild
deleted file mode 100644
index bb398f5ac30a..000000000000
--- a/games-misc/c++robots/c++robots-0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="ongoing 'King of the Hill' (KotH) tournament"
-HOMEPAGE="http://www.gamerz.net/c++robots/"
-SRC_URI="http://www.gamerz.net/c++robots/c++robots.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="static"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}/proper-coding.patch"
-)
-
-src_compile() {
-	local myldflags="${LDFLAGS}"
-	use static && myldflags="${myldflags} -static"
-	emake CFLAGS="${CFLAGS}" LDFLAGS="${myldflags}"
-}
-
-src_install() {
-	dobin combat cylon target tracker
-	dodoc README
-}
diff --git a/games-misc/c++robots/files/proper-coding.patch b/games-misc/c++robots/files/proper-coding.patch
deleted file mode 100644
index 93b87c1c1da5..000000000000
--- a/games-misc/c++robots/files/proper-coding.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- c++robots.orig/Makefile
-+++ c++robots/Makefile
-@@ -1,38 +1,37 @@
- CFLAGS=-g
-+LDFLAGS=
- PROGRAMS=combat 
- ROBOTS=cylon tracker target
- 
--CC=g++ -g
--
- all: $(PROGRAMS) $(ROBOTS)
- 
- clean:
- 	rm -f $(PROGRAMS) $(ROBOTS) *.o core
- 
- combat:	combat.o 
--	$(CC) $(CFLAGS) -o $@ combat.o -lm
-+	$(CXX) -o $@ $(LDFLAGS) combat.o -lm
- 
- combat.o:	combat.c 
--	$(CC) $(CFLAGS) -c combat.c
-+	$(CXX) $(CXXFLAGS) -c combat.c
- 
- robots.o: robots.C robots.h
--	g++ -c robots.C
-+	$(CXX) $(CXXFLAGS) -c robots.C
- 
- cylon: cylon.o robots.o
--	g++ -static -o $@ cylon.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) cylon.o robots.o 
- 
- cylon.o: cylon.c robots.h
--	g++ -c cylon.c
-+	$(CXX) $(CXXFLAGS) -c cylon.c
- 
- tracker: tracker.o robots.o
--	g++ -static -o $@ tracker.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) tracker.o robots.o 
- 
- tracker.o: tracker.c robots.h
--	g++ -c tracker.c
-+	$(CXX) $(CXXFLAGS) -c tracker.c
- 
- target: target.o robots.o
--	g++ -static -o $@ target.o robots.o 
-+	$(CXX) -o $@ $(LDFLAGS) target.o robots.o 
- 
- target.o: target.c robots.h
--	g++ -c target.c
-+	$(CXX) $(CXXFLAGS) -c target.c
- 
diff --git a/games-misc/c++robots/metadata.xml b/games-misc/c++robots/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/c++robots/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/cowsay-3.03-r2 b/games-misc/cowsay-3.03-r2
new file mode 100644
index 000000000000..86fe95cfc065
--- /dev/null
+++ b/games-misc/cowsay-3.03-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=configurable talking ASCII cow (and other characters)
+EAPI=5
+HOMEPAGE=http://www.nog.net/~tony/warez/cowsay.shtml
+KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5
+SLOT=0
+SRC_URI=http://www.nog.net/~tony/warez/cowsay-3.03.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_=5554973c598b421490905e2d6e035aba
diff --git a/games-misc/cowsay/Manifest b/games-misc/cowsay/Manifest
deleted file mode 100644
index 3a62a018a3a9..000000000000
--- a/games-misc/cowsay/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cowsay-3.03-mech.patch 490 BLAKE2B 28c4f7060f8be6e77bb1d1a598875ed28b0d3dabd3b0f84ae4f197c159d7f554cf35600e082d58684ee244a1d76e620c7c5505f9e054e5e2853edceab3bfea72 SHA512 abaa76dee0c896100bab79a68c25720bb8449af77990ced74d89d271e22fd8fa5cb1b4586ef79e4c12a21d7091164d8c19a1162e78636874864a3fafa3a8df1d
-AUX cowsay-3.03-tongue.patch 358 BLAKE2B 35dbba5ebd96a4d20b59ebdb8fba86d3169f6bdfad86d8e7dcd5f4f4e02bcbd54ae8f114a3ef5cac18de355e45a1c5a9b5306a5230676638732698048fea68ab SHA512 bce27566383debd01f00c40e867dff9d405304f70e72de9ca4c2611c6242da9919c5a74b6ac3d0632ad7c928ef578f8bb78d125ed6141a0adf3f7498731f8e6f
-AUX cowsay-3.03-utf8.patch 454 BLAKE2B 2274a604daf96638b11d7cedd1fae7ac3178d138e7c1110007cfff4aa19ca061099dac7423545688388d741f66fba9fcfff6f9a8983501b5eabfefaeaf75f005 SHA512 4519c799311b5e31b3299fc66285ad0f9bfd2148dbfb34411437d37cda37d7cea8e823c8f99b0a0ef3652bb839f09d05fd5c5c727db4b091c6ed86d335ed6ece
-DIST cowsay-3.03.tar.gz 15189 BLAKE2B de22c870c23612d1861d7de5e610a072833f1627897b11bb9a642464032051a35f6a146125a75c511e7b65df3f885cb7558988d0a535e093dcb3765969aef4d1 SHA512 8e91d0c929c2e0743106c08643029a943d0684343ff44ad8ff172636a8f47fd25ee8bc4d108ccfe308c756d2871b956cceef0c406800615ed0dc1e1e24648219
-EBUILD cowsay-3.03-r2.ebuild 1138 BLAKE2B 9229e8cf41710fe88dec162cfce7f63bc1dcb611f5682b0231dc55ae0533a4b0cd472d6c39487e08adfd639cebced1bb6d237a6e9edd9fad67bf2acd0572308a SHA512 a0a5ea45d203d9f9659f1b7c6b5cca6b5680dc8d8aba18448cded9f62e88bc053069da46ff2f9f4d7e0955c148415423f4bd4774532f25cda975a1441fe56a37
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/cowsay/cowsay-3.03-r2.ebuild b/games-misc/cowsay/cowsay-3.03-r2.ebuild
deleted file mode 100644
index 88e195c614d6..000000000000
--- a/games-misc/cowsay/cowsay-3.03-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="configurable talking ASCII cow (and other characters)"
-HOMEPAGE="http://www.nog.net/~tony/warez/cowsay.shtml"
-SRC_URI="http://www.nog.net/~tony/warez/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc64 ~x86 ~x86-fbsd ~x64-solaris"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5"
-
-src_prepare() {
-	sed	-i \
-		-e "1 c\#!${EPREFIX}/usr/bin/perl"\
-		-e 's/\$version/\$VERSION/g'\
-		-e "s:%PREFIX%/share/cows:${EPREFIX}/usr/share/${P}/cows:" \
-		-e '/getopts/ i\$Getopt::Std::STANDARD_HELP_VERSION=1;' cowsay \
-			|| die "sed cowsay failed"
-	sed -i \
-		-e "s|%PREFIX%/share/cows|${EPREFIX}/usr/share/${P}/cows|" cowsay.1 \
-			|| die "sed cowsay.1 failed"
-	epatch \
-		"${FILESDIR}/${P}"-tongue.patch \
-		"${FILESDIR}/${P}"-mech.patch \
-		"${FILESDIR}/${P}"-utf8.patch
-}
-
-src_install() {
-	dobin cowsay
-	doman cowsay.1
-	dosym cowsay /usr/bin/cowthink
-	dosym cowsay.1 /usr/share/man/man1/cowthink.1
-	dodir /usr/share/${P}/cows
-	cp -r cows "${ED}"/usr/share/${P}/ || die "cp failed"
-}
diff --git a/games-misc/cowsay/files/cowsay-3.03-mech.patch b/games-misc/cowsay/files/cowsay-3.03-mech.patch
deleted file mode 100644
index 10478ed6651d..000000000000
--- a/games-misc/cowsay/files/cowsay-3.03-mech.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- cows/mech-and-cow	2009-06-21 03:09:36.000000000 +0300
-+++ cows/mech-and-cow.cow	2010-08-22 01:04:02.670000262 +0300
-@@ -1,3 +1,5 @@
-+$the_cow = <<EOC;
-+${thouts}
-                                    ,-----.
-                                    |     |
-                                 ,--|     |-.
-@@ -14,8 +16,4 @@
-    (__)\       )\/\             /'    /   |   `i
-        ||----w |           ___,;`----'.___L_,-'`\__
-        ||     ||          i_____;----\.____i""\____\
--
--
--
--
--
-+EOC
diff --git a/games-misc/cowsay/files/cowsay-3.03-tongue.patch b/games-misc/cowsay/files/cowsay-3.03-tongue.patch
deleted file mode 100644
index 517e96709c23..000000000000
--- a/games-misc/cowsay/files/cowsay-3.03-tongue.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cows/head-in.cow.old	2007-05-09 20:28:08.000000000 +0200
-+++ cows/head-in.cow	2007-05-09 20:29:32.000000000 +0200
-@@ -7,6 +7,6 @@
-     ^__^         /
-     ($eyes)\\_______/  _________
-     (__)\\       )=(  ____|_ \\_____
--   $tongue   ||----w |  \\ \\     \\_____ |
-+     $tongue ||----w |  \\ \\     \\_____ |
-         ||     ||   ||           ||
- EOC
diff --git a/games-misc/cowsay/files/cowsay-3.03-utf8.patch b/games-misc/cowsay/files/cowsay-3.03-utf8.patch
deleted file mode 100644
index 6aed9c149e3d..000000000000
--- a/games-misc/cowsay/files/cowsay-3.03-utf8.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur cowsay-3.03.orig//cowsay cowsay-3.03/cowsay
---- cowsay-3.03.orig//cowsay	2011-04-21 16:36:03.581377699 +0200
-+++ cowsay-3.03/cowsay	2011-04-21 16:37:07.968430100 +0200
-@@ -12,6 +12,13 @@
- use Getopt::Std;
- use Cwd;
- 
-+if (${^UTF8LOCALE}) {
-+    binmode STDIN, ':utf8';
-+    binmode STDOUT, ':utf8';
-+    require Encode;
-+    eval { $_ = Encode::decode_utf8($_,1) } for @ARGV;
-+}
-+
- $VERSION = "3.03";
- $progname = basename($0);
- $eyes = "oo";
diff --git a/games-misc/cowsay/metadata.xml b/games-misc/cowsay/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/cowsay/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/doge-3.5.0 b/games-misc/doge-3.5.0
new file mode 100644
index 000000000000..7ae84dbddf37
--- /dev/null
+++ b/games-misc/doge-3.5.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=wow very terminal doge
+EAPI=5
+HOMEPAGE=https://github.com/thiderman/doge https://pypi.org/project/doge/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=sys-process/procps python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/d/doge/doge-3.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e6595106a1e49d1feadb0792492626f2
diff --git a/games-misc/doge/Manifest b/games-misc/doge/Manifest
deleted file mode 100644
index 46f80f3a97e0..000000000000
--- a/games-misc/doge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST doge-3.5.0.tar.gz 16145 BLAKE2B dea9ca7009580a795644413eccc5b0a823b802655bb62464110f8060d35099e91a2b302b62fcfd93cfe0d547031800c9ba1f68aae2dd4933b20bfbb65869de12 SHA512 8e8f27077261626b27d0ce36c827b399345f2e96f157bfdf1b5437c75cf40b285533631ce5ec847b4b99bf87037faf85fb4aa4ab93604f54fbdfba03aa8e5609
-EBUILD doge-3.5.0.ebuild 453 BLAKE2B 6d1e783ade6388f5227e919401240cff23fdf7070abc2957a814876882fadf8d6e23ca537721ca72a4452de4d413ca0cb38340ac6997825beba9c80cc617e9e6 SHA512 057e27433ed5766409dc850c64abadc41b27e9956e02153f339c1af13577197e2f5887916d0e98ac6c26cb47967501781a8daea1cfc1a9e36dfda48a07772298
-MISC metadata.xml 616 BLAKE2B 539b521de48cb625640e097ae7d2227fd2e51a9fd1b89d6944848992548fb2ff737deaa3756d90641c9b3fe7ae96dc6b1d8868f5d62bfe2ee03241e25c0864f9 SHA512 c8afe8bdf5ae29c517f38f451aa3d28ec3ba7934115eacfa4f4e72f34d1e88c336c2feb023a0f52c2c16df025728fba98839ec077159d0ac86b8b3e7f7c645bd
diff --git a/games-misc/doge/doge-3.5.0.ebuild b/games-misc/doge/doge-3.5.0.ebuild
deleted file mode 100644
index 00b013bd7dbc..000000000000
--- a/games-misc/doge/doge-3.5.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="wow very terminal doge"
-HOMEPAGE="https://github.com/thiderman/doge https://pypi.org/project/doge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	sys-process/procps
-"
diff --git a/games-misc/doge/metadata.xml b/games-misc/doge/metadata.xml
deleted file mode 100644
index 25ef9061b600..000000000000
--- a/games-misc/doge/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>vikraman@gentoo.org</email>
-		<name>Vikraman Choudhury</name>
-	</maintainer>
-	<longdescription lang="en">
-		doge is a simple motd script based on the slightly stupid but very funny doge meme. It prints random grammatically incorrect statements that are sometimes based on things from your computer.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">doge</remote-id>
-		<remote-id type="github">thiderman/doge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/exult-sound-0-r2 b/games-misc/exult-sound-0-r2
new file mode 100644
index 000000000000..98d9fa4c1291
--- /dev/null
+++ b/games-misc/exult-sound-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=!<games-engines/exult-9999
+DESCRIPTION=Sound data for games-engines/exult
+EAPI=6
+HOMEPAGE=http://exult.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/exult/exult_audio.zip
+_md5_=8abead476498aa96f8a9563a1258e0f0
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
deleted file mode 100644
index 0aee99e43ffd..000000000000
--- a/games-misc/exult-sound/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST exult_audio.zip 48439905 BLAKE2B ad8a230d9ba92cef94b22b669644a10ae6fcfe92c4dbfc5c3f89535534b4bddfe7d9b69dbf05220033df92b6d172e83340e6571920f42b5e63e66a5417ffa8f4 SHA512 70374a079935b063f41a37aeb90315d55abb584e5542f7fa12c707318db6365e989a5848bba9045a2c2cca1ccd902cc1d31fec8c95511a986de7a75d322d0919
-EBUILD exult-sound-0-r2.ebuild 584 BLAKE2B d33043a392754ce5ed10b7279d06f674da8c1b93492dc96b22dbbc5012f9e154920f6b58bdba23a6157f09dc8633412d4d1a9bebed6ad1427456dd2b358a21d6 SHA512 af667060e9ae88c76d2381555562e7bbe0035683fb4c2a33bbf705f3731838336446c6ab3463f7ac8a9f71c6dbfd9ee7b0fe58f24cc8487897f0ec2cc5e53b1f
-MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
diff --git a/games-misc/exult-sound/exult-sound-0-r2.ebuild b/games-misc/exult-sound/exult-sound-0-r2.ebuild
deleted file mode 100644
index a1cb960fdc53..000000000000
--- a/games-misc/exult-sound/exult-sound-0-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sound data for games-engines/exult"
-HOMEPAGE="http://exult.sourceforge.net/"
-SRC_URI="mirror://sourceforge/exult/exult_audio.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="!<games-engines/exult-9999"
-
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/exult/music
-	doins music/*.ogg
-	insinto /usr/share/exult/
-	doins *.flx
-	newdoc music/readme.txt music-readme.txt
-	dodoc README_audiopack.txt readme_{jmsfx,jmsisfx,sqsfxbg,sqsfxsi}.txt
-}
diff --git a/games-misc/exult-sound/metadata.xml b/games-misc/exult-sound/metadata.xml
deleted file mode 100644
index c1a873a06ee8..000000000000
--- a/games-misc/exult-sound/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">exult</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-1.99.1-r2 b/games-misc/fortune-mod-1.99.1-r2
new file mode 100644
index 000000000000..446e773dc382
--- /dev/null
+++ b/games-misc/fortune-mod-1.99.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-text/recode
+DESCRIPTION=The notorious fortune program
+EAPI=5
+HOMEPAGE=http://www.redellipse.net/code/fortune
+IUSE=offensive elibc_glibc
+KEYWORDS=alpha amd64 arm ~arm64 hppa m68k ~mips ppc64 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=app-text/recode
+SLOT=0
+SRC_URI=http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=def593985c5fc342c6dcff94a8be4ae8
diff --git a/games-misc/fortune-mod-all-1 b/games-misc/fortune-mod-all-1
new file mode 100644
index 000000000000..ace6c1d98903
--- /dev/null
+++ b/games-misc/fortune-mod-all-1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for all fortune-mod packages
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/
+IUSE=l10n_cs l10n_de l10n_it l10n_sk offensive
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=metapackage
+RDEPEND=games-misc/fortune-mod l10n_cs? ( games-misc/fortune-mod-cs ) l10n_de? ( games-misc/fortune-mod-at-linux games-misc/fortune-mod-norbert-tretkowski games-misc/fortune-mod-thomas-ogrisegg games-misc/fortune-mod-fvl games-misc/fortune-mod-rss ) l10n_it? ( games-misc/fortune-mod-it ) l10n_sk? ( games-misc/fortune-mod-debilneho ) games-misc/fortune-mod-bofh-excuses games-misc/fortune-mod-calvin games-misc/fortune-mod-chucknorris games-misc/fortune-mod-dubya games-misc/fortune-mod-familyguy games-misc/fortune-mod-firefly games-misc/fortune-mod-futurama games-misc/fortune-mod-gentoo-dev games-misc/fortune-mod-gentoo-forums games-misc/fortune-mod-hitchhiker games-misc/fortune-mod-homer games-misc/fortune-mod-humorixfortunes games-misc/fortune-mod-kernelcookies games-misc/fortune-mod-osfortune games-misc/fortune-mod-powerpuff games-misc/fortune-mod-pqf games-misc/fortune-mod-simpsons-chalkboard offensive? ( games-misc/fortune-mod-slackware[offensive] ) games-misc/fortune-mod-smac games-misc/fortune-mod-sp-fortunes games-misc/fortune-mod-starwars games-misc/fortune-mod-strangelove games-misc/fortune-mod-tao games-misc/fortune-mod-zx-error
+SLOT=0
+_md5_=505088392971ed981359b80c58ab618d
diff --git a/games-misc/fortune-mod-all/Manifest b/games-misc/fortune-mod-all/Manifest
deleted file mode 100644
index c007ea1e90f1..000000000000
--- a/games-misc/fortune-mod-all/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD fortune-mod-all-1.ebuild 1630 BLAKE2B 35464b9f379fbd01029891183cd2dc7979f7bc28c25135742fb5f6c42d11a476436fdddf92743fe798f4758eaabad63cdd33ab5cd04151c967ddace8c8e5dda9 SHA512 fc0dd134431fd6c1391d875a46ae3a25220de199585a7fded0c0a16d8d6d9e6611822671afcba4030556862bb73dafe51675bd6ef3d47c734061007303241225
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild b/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
deleted file mode 100644
index 1f57df817302..000000000000
--- a/games-misc/fortune-mod-all/fortune-mod-all-1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Meta package for all fortune-mod packages"
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="l10n_cs l10n_de l10n_it l10n_sk offensive"
-
-RDEPEND="games-misc/fortune-mod
-	l10n_cs? ( games-misc/fortune-mod-cs )
-	l10n_de? (
-		games-misc/fortune-mod-at-linux
-		games-misc/fortune-mod-norbert-tretkowski
-		games-misc/fortune-mod-thomas-ogrisegg
-		games-misc/fortune-mod-fvl
-		games-misc/fortune-mod-rss
-	)
-	l10n_it? ( games-misc/fortune-mod-it )
-	l10n_sk? ( games-misc/fortune-mod-debilneho )
-	games-misc/fortune-mod-bofh-excuses
-	games-misc/fortune-mod-calvin
-	games-misc/fortune-mod-chucknorris
-	games-misc/fortune-mod-dubya
-	games-misc/fortune-mod-familyguy
-	games-misc/fortune-mod-firefly
-	games-misc/fortune-mod-futurama
-	games-misc/fortune-mod-gentoo-dev
-	games-misc/fortune-mod-gentoo-forums
-	games-misc/fortune-mod-hitchhiker
-	games-misc/fortune-mod-homer
-	games-misc/fortune-mod-humorixfortunes
-	games-misc/fortune-mod-kernelcookies
-	games-misc/fortune-mod-osfortune
-	games-misc/fortune-mod-powerpuff
-	games-misc/fortune-mod-pqf
-	games-misc/fortune-mod-simpsons-chalkboard
-	offensive? ( games-misc/fortune-mod-slackware[offensive] )
-	games-misc/fortune-mod-smac
-	games-misc/fortune-mod-sp-fortunes
-	games-misc/fortune-mod-starwars
-	games-misc/fortune-mod-strangelove
-	games-misc/fortune-mod-tao
-	games-misc/fortune-mod-zx-error"
diff --git a/games-misc/fortune-mod-all/metadata.xml b/games-misc/fortune-mod-all/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-all/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-at-linux-20030120 b/games-misc/fortune-mod-at-linux-20030120
new file mode 100644
index 000000000000..2ca1690f471d
--- /dev/null
+++ b/games-misc/fortune-mod-at-linux-20030120
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=games-misc/fortune-mod unicode? ( virtual/libiconv )
+DESCRIPTION=Quotes from at.linux
+EAPI=5
+HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
+IUSE=unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-at.linux-20030120.tar.gz
+_md5_=b012ccc34f1b83a83ef183e5da3976ea
diff --git a/games-misc/fortune-mod-at-linux/Manifest b/games-misc/fortune-mod-at-linux/Manifest
deleted file mode 100644
index db87e9c26da0..000000000000
--- a/games-misc/fortune-mod-at-linux/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-at.linux-20030120.tar.gz 81012 BLAKE2B 551b1169acdd863040389d79f5143e0a294293f856fefcadd0fa3b89ccde7c91c15117af9f730ef54476e1acf3933959f13dd83f879cce8b7123dedc056502ce SHA512 804b785194db2f4727e3196d46b317d6b644bd4d05a4f3286617a2b2e3dff2c9a7c9fb88a0f2a6556d66fd0f975fee8564df236085a7864172c6a6b63c33bec4
-EBUILD fortune-mod-at-linux-20030120.ebuild 850 BLAKE2B 9c837b78ad2d64a54f00ce17de6d8ea85c4d377e8d3e94a0d0f19d0f9fb405bc389c276ea603f21b42c1a0657ad9213d1333ec1b51a5a370f280ce069c63fe70 SHA512 266bf649124466368965e8bf4dce7438dc18654a787a07ddac4e1f8a1e28f7d49a1d44e11cc1e74f5d32a03c2d2772dcbf7426ad4e1695efef31f0e64848e6e2
-MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild b/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
deleted file mode 100644
index d293cc3b1cd9..000000000000
--- a/games-misc/fortune-mod-at-linux/fortune-mod-at-linux-20030120.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P="fortune-mod-at.linux-${PV}"
-DESCRIPTION="Quotes from at.linux"
-HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="unicode"
-
-RDEPEND="games-misc/fortune-mod"
-DEPEND="${RDEPEND}
-	unicode? ( virtual/libiconv )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	# bug #322111
-	if use unicode ; then
-		iconv --from-code=ISO-8859-1 --to-code=UTF-8 at.linux > at.linux-utf8
-		mv at.linux-utf8 at.linux
-		strfile -s at.linux
-	fi
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins at.linux at.linux.dat
-}
diff --git a/games-misc/fortune-mod-at-linux/metadata.xml b/games-misc/fortune-mod-at-linux/metadata.xml
deleted file mode 100644
index f0c5667bf97e..000000000000
--- a/games-misc/fortune-mod-at-linux/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-bofh-excuses-1.2 b/games-misc/fortune-mod-bofh-excuses-1.2
new file mode 100644
index 000000000000..0df6fc216048
--- /dev/null
+++ b/games-misc/fortune-mod-bofh-excuses-1.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Excuses from Bastard Operator from Hell
+EAPI=5
+HOMEPAGE=http://www.stlim.net/staticpages/index.php?page=20020814005536450
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.stlim.net/downloads/fortune-bofh-excuses-1.2.tar.gz
+_md5_=dfe34df701f189ded4ffcf750f1e15e1
diff --git a/games-misc/fortune-mod-bofh-excuses/Manifest b/games-misc/fortune-mod-bofh-excuses/Manifest
deleted file mode 100644
index f24b1d78d4d6..000000000000
--- a/games-misc/fortune-mod-bofh-excuses/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-bofh-excuses-1.2.tar.gz 12753 BLAKE2B a16b5e575b1a2fccdbdc85a0ad092d3cd7ed1f3a39bd6bffa2eb5ced6f33fb0d0eb72440f06c8924f1b731551588da72e5f53982d5ef6404e35d61edd1a4717b SHA512 71e9f664a1ceaf20455bc2c49e5efe0a953d188cbcd11e5a536fee73a01623659fbcc379baa4d8b7ac4a6970402c085a508f0e37b7fe182869c7ca9ffc2fce99
-EBUILD fortune-mod-bofh-excuses-1.2.ebuild 645 BLAKE2B 0480612bcedf202ae77e8564447b5c9b45860a74ee903f0ec1ede73a74f8154da32f69fe09b5cf1f346b91b21cb9b94e92cf0479453e6564fff98fa6a14c36b1 SHA512 a15cc0ece853b950ba987e25812d73a83d49f798c0bc75041cf1c39c8d0792dad092cd8876bf43ed68490941f9182a9a15bfafa2a5a274116c3610b3b330ea72
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild b/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
deleted file mode 100644
index cf86bccc2cc7..000000000000
--- a/games-misc/fortune-mod-bofh-excuses/fortune-mod-bofh-excuses-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Excuses from Bastard Operator from Hell"
-HOMEPAGE="http://www.stlim.net/staticpages/index.php?page=20020814005536450"
-SRC_URI="http://www.stlim.net/downloads/fortune-bofh-excuses-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${PN/mod-/}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins bofh-excuses.dat bofh-excuses
-}
diff --git a/games-misc/fortune-mod-bofh-excuses/metadata.xml b/games-misc/fortune-mod-bofh-excuses/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-bofh-excuses/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-calvin-0.1.1 b/games-misc/fortune-mod-calvin-0.1.1
new file mode 100644
index 000000000000..def2794d1c82
--- /dev/null
+++ b/games-misc/fortune-mod-calvin-0.1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Calvin and Hobbes Comic Books
+EAPI=5
+HOMEPAGE=http://www.netmeister.org/misc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.netmeister.org/apps/fortune-mod-calvin-0.1.1.tar.gz
+_md5_=a04d556c4b2742eca3b2deb3c453d871
diff --git a/games-misc/fortune-mod-calvin/Manifest b/games-misc/fortune-mod-calvin/Manifest
deleted file mode 100644
index 7ca8a26ae4cb..000000000000
--- a/games-misc/fortune-mod-calvin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-calvin-0.1.1.tar.gz 6787 BLAKE2B 73814edf08c7fdd0603980e353f9e2fe79cf135c642650e3e6f08662a036057238f51276ae7fe0f41070ed26ac47d434e87c77a81384fda8a28873dc61b82098 SHA512 047e9694aca702b93661ac252ca8599d6b3778116907fce93ad2b9eca79e9af497b9f2dc188223d19eff8109691cbf66248cea259786c5504446eee3cd3b8245
-EBUILD fortune-mod-calvin-0.1.1.ebuild 559 BLAKE2B 5a54bad686ca9b66efe3c2474bee6d1eb40449c9d7af3788f76bf46f32b5324146a2126237d8eb1a6bca483b5c7e721f6c1f8f449f33111574caaec45974ecbf SHA512 53028ebc2d8a3b103571da01dd1b0fbf7836197a7c1a16ad394e2106d39c972bcee883aaed7cbc60ce49ae3d30f1e34ae531bf0ec715adee4e2a41e0d50d6273
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild b/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
deleted file mode 100644
index 81bdbf5f1b08..000000000000
--- a/games-misc/fortune-mod-calvin/fortune-mod-calvin-0.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from Calvin and Hobbes Comic Books"
-HOMEPAGE="http://www.netmeister.org/misc.html"
-SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	insinto /usr/share/fortune
-	doins calvin calvin.dat
-}
diff --git a/games-misc/fortune-mod-calvin/metadata.xml b/games-misc/fortune-mod-calvin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-calvin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-chucknorris-0.1 b/games-misc/fortune-mod-chucknorris-0.1
new file mode 100644
index 000000000000..41801c597423
--- /dev/null
+++ b/games-misc/fortune-mod-chucknorris-0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Chuck Norris Facts
+EAPI=5
+HOMEPAGE=https://www.k-lug.org/~kessler/projects.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=https://www.k-lug.org/~kessler/chucknorris.tar.gz
+_md5_=5445ece6621ac2c61d1c66e5586d395a
diff --git a/games-misc/fortune-mod-chucknorris/Manifest b/games-misc/fortune-mod-chucknorris/Manifest
deleted file mode 100644
index adf314f38180..000000000000
--- a/games-misc/fortune-mod-chucknorris/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST chucknorris.tar.gz 23035 BLAKE2B d42b510978321b0857a1e6ff50b80576e5f6af52f9014330a765c78a39b274cfecbe2367811fc31e506b1d0e4f3b65c416ff3c06c6a2d7bf20e302ea41f46417 SHA512 efcee2c1ce5ee747cbdf3cfb0b52958ca76309cbf509627b602cbc56403e67396c879ea46c084b3d82788404829e48990a534eda9e8f3640d39dc894318ca7c2
-EBUILD fortune-mod-chucknorris-0.1.ebuild 586 BLAKE2B 4f828872f95ef20dafdfd2eb246bd53b3de43a85e2c24d9fb1e14859a8fb7cbb632fcdb656b3cbfb03f826580c8fe36e2b017904e3a896a4c49f8376c52f2787 SHA512 cd0f447aaa01c3b67c51a01bb7773c7925bf7a802a18e37ea29a710db27f7cce381ac81d7e8e005b010f07c8045012c445aaf9744dfa860e62db72efe304b27a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild b/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
deleted file mode 100644
index 1fe74466ec32..000000000000
--- a/games-misc/fortune-mod-chucknorris/fortune-mod-chucknorris-0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Chuck Norris Facts"
-HOMEPAGE="https://www.k-lug.org/~kessler/projects.html"
-SRC_URI="https://www.k-lug.org/~kessler/chucknorris.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${PN/mod-/}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins chucknorris chucknorris.dat
-}
diff --git a/games-misc/fortune-mod-chucknorris/metadata.xml b/games-misc/fortune-mod-chucknorris/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-chucknorris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-cs-1.6.9 b/games-misc/fortune-mod-cs-1.6.9
new file mode 100644
index 000000000000..e19f720f330f
--- /dev/null
+++ b/games-misc/fortune-mod-cs-1.6.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=games-misc/fortune-mod unicode? ( virtual/libiconv )
+DESCRIPTION=Database of the Czech and Slovak cookies for the fortune(6) program
+EAPI=5
+HOMEPAGE=http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/
+IUSE=unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/fortune-cs-1.6.9.tar.bz2
+_md5_=64cbe16d3ea64c6c3408825a6efc94e2
diff --git a/games-misc/fortune-mod-cs/Manifest b/games-misc/fortune-mod-cs/Manifest
deleted file mode 100644
index 8af1a6348c40..000000000000
--- a/games-misc/fortune-mod-cs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-cs-1.6.9.tar.bz2 390766 BLAKE2B 1f84174bab1274e8c26a10ec5eb4921f0d3199b4bc39b88b4ed3b83ed9fa5e2b1b478348501ade17f9899f6f7490748ad736e2f2c6bea4de08055f73ce7257a7 SHA512 4df546eb450edc1de6bb80f788e29fa4aad6050008c28ed12c4afd630533416f3367c09b43ae098329160a19bebfb28ec56ebb730358689d260709a27317b20c
-EBUILD fortune-mod-cs-1.6.9.ebuild 1017 BLAKE2B a50f2c8a19e28b7582f132241ce44fe882f1db8934ebb1d3c81bae020a7050571b35c078617fd25a1848f5a54b377d09a8c8bf789b64b9d15bd75d90a48e3682 SHA512 0a5f77440ffe87a6a9c6186d3091eb3608fcb1acb1ae8d32444a5104c63360ff95e193492d50a70db5cc9db839d957f097a2cf61a6ca64f9d2efd44dee864a2a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild b/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
deleted file mode 100644
index 3bd074a1fdbc..000000000000
--- a/games-misc/fortune-mod-cs/fortune-mod-cs-1.6.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Database of the Czech and Slovak cookies for the fortune(6) program"
-HOMEPAGE="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/"
-SRC_URI="http://ftp.fi.muni.cz/pub/linux/people/zdenek_pytela/${P/-mod/}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="unicode"
-
-RDEPEND="games-misc/fortune-mod"
-DEPEND="${RDEPEND}
-	unicode? ( virtual/libiconv )"
-
-S=${WORKDIR}/${P/-mod/}
-
-src_prepare() {
-	rm -f LICENSE install.sh fortune-cs.* *xpm
-}
-
-src_compile() {
-	local f
-	for f in [[:lower:]]* ; do
-		if use unicode ; then
-			iconv --from-code iso-8859-2 --to-code utf8 -o${f}.utf8 ${f}
-			mv ${f}.utf8 ${f}
-		fi
-		strfile -s ${f} || die "strfile ${f} failed"
-	done
-}
-
-src_install() {
-	insinto /usr/share/fortune/cs
-	doins [[:lower:]]*
-	dodoc [[:upper:]]*
-}
diff --git a/games-misc/fortune-mod-cs/metadata.xml b/games-misc/fortune-mod-cs/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-cs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-debilneho-0.1 b/games-misc/fortune-mod-debilneho-0.1
new file mode 100644
index 000000000000..b0aa4f9fbf0f
--- /dev/null
+++ b/games-misc/fortune-mod-debilneho-0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotation's by several people (mostly from Slovakia)
+EAPI=5
+HOMEPAGE=http://megac.info
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://megac.info/fortune-debilneho.tar.bz2
+_md5_=e40ab65ac4a1c26067cdc67b68974f3e
diff --git a/games-misc/fortune-mod-debilneho/Manifest b/games-misc/fortune-mod-debilneho/Manifest
deleted file mode 100644
index 78cddfb53db5..000000000000
--- a/games-misc/fortune-mod-debilneho/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-debilneho.tar.bz2 16982 BLAKE2B 1c4a7d8f42809cd4dd3bb8a3417dd8c5004831cf4ad38d0466bbccef5cabbd516146555f27abdc5dfbd2df7b66427a7dd56bd44c81b9fa4e4a1f46978787578d SHA512 88ff97a50f512d4e0f52c93546939d1ef168e86d6e92996e6b3674ce5ef03581d20cdcea497869975c0b77a2a1936b142903c248f7c5cab69fd322f207801696
-EBUILD fortune-mod-debilneho-0.1.ebuild 598 BLAKE2B 592971203caa47b66eb94beecd3b6387136ba5b903347782e15292e24e3e963ae8aebe730cd883abb3cb0038d4f4eeddcf17f0bb109327d4755655b6ba961ec2 SHA512 ca9a9ea6b2574e1104a66c230142b1614517179cf3560ea9cddba8a7d95386a8a8bd9f48ecd11c8e362e3bc27a628a4dd46fa3ccafe154ee5181a0e47e19ff53
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild b/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
deleted file mode 100644
index 840d7fddf6f8..000000000000
--- a/games-misc/fortune-mod-debilneho/fortune-mod-debilneho-0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN=${PN/mod-/}
-DESCRIPTION="Quotation's by several people (mostly from Slovakia)"
-HOMEPAGE="http://megac.info"
-SRC_URI="http://megac.info/fortune-debilneho.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_PN}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins debilneho debilneho.dat
-}
diff --git a/games-misc/fortune-mod-debilneho/metadata.xml b/games-misc/fortune-mod-debilneho/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-debilneho/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-discworld-0.1 b/games-misc/fortune-mod-discworld-0.1
new file mode 100644
index 000000000000..11e823ac61a8
--- /dev/null
+++ b/games-misc/fortune-mod-discworld-0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Discworld novels
+EAPI=5
+HOMEPAGE=http://www.splitbrain.org/projects/fortunes/discworld
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.splitbrain.org/_media/projects/fortunes/fortune-discworld.tgz
+_md5_=6a6315f41ad4f30c1322633a3bdba1db
diff --git a/games-misc/fortune-mod-discworld/Manifest b/games-misc/fortune-mod-discworld/Manifest
deleted file mode 100644
index 1e4d6a6cb145..000000000000
--- a/games-misc/fortune-mod-discworld/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-discworld.tgz 81396 BLAKE2B ab0feaff9ebbc547bd3accdb0efd6b5f49bae732d8f8fd40495eadb35db98d39155cb7cf6046eb2c64ecd3510b8750075ff7b7bd1c0e3b72e05b351c7ae30c9a SHA512 62a8995cc197557942e69cb4a31ef05de7b37130194753333715f476f0da9db455482dfe31803018e4d2febaf7ecf3a5785f616203354388dbc7bc9cfbb8ab95
-EBUILD fortune-mod-discworld-0.1.ebuild 583 BLAKE2B 4d7bc5ea4f53ffbd54a4e1435a387544fb0f92cd537da47208b040bb00b88ea53a896e813d15bd380c4a32829dc815699c887554d676106dfea1744871390f9d SHA512 28acb3a931a294c09b47deac1226cf6717d427621dc2ee481bb2069ef286e741756f37aa48faafdc211ae783f5a23381fcb43f03cd1e678cb8e9706452c76599
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-discworld/fortune-mod-discworld-0.1.ebuild b/games-misc/fortune-mod-discworld/fortune-mod-discworld-0.1.ebuild
deleted file mode 100644
index 72dcbd40d69c..000000000000
--- a/games-misc/fortune-mod-discworld/fortune-mod-discworld-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=${PN/-mod/}
-DESCRIPTION="Quotes from Discworld novels"
-HOMEPAGE="http://www.splitbrain.org/projects/fortunes/discworld"
-SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins discworld discworld.dat
-}
diff --git a/games-misc/fortune-mod-discworld/metadata.xml b/games-misc/fortune-mod-discworld/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-discworld/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-dubya-20050118 b/games-misc/fortune-mod-dubya-20050118
new file mode 100644
index 000000000000..d33249271dcc
--- /dev/null
+++ b/games-misc/fortune-mod-dubya-20050118
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from George W. Bush
+EAPI=5
+HOMEPAGE=http://dubya.seiler.us/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://seiler.us/wiki/images/8/8c/Dubya-20050118.tar.gz
+_md5_=5b06b090ef26140e006d3760cb8ab028
diff --git a/games-misc/fortune-mod-dubya/Manifest b/games-misc/fortune-mod-dubya/Manifest
deleted file mode 100644
index f3971f960e25..000000000000
--- a/games-misc/fortune-mod-dubya/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Dubya-20050118.tar.gz 27385 BLAKE2B dbad7409be78d4c741e32d49075d37f59439cbd04d0772d54788a9a7085779bb0cba969576806f7d842eac3ef13ea82d851380f831da9349f39b5b3fcada927b SHA512 19609f79bc12cf74aeef51f3e16a689790ad6ab316924d5726c22e2b1cc7f5007bcaee494da7485d2c34b94ebc071cf62aa042b6156f5f957e55a5e85d1ad5b9
-EBUILD fortune-mod-dubya-20050118.ebuild 574 BLAKE2B 3857139d45692ac84963668d21913d9d068547e7f4fac912bb95c6336a0fbb95b264bfa34ab5dd8ec47a57f403785f5fded27da109052d3ec0cea8f898612d94 SHA512 93a142be209d30fc4901ea0ee7dd9cd538cf43e37def48bec8ec48930c51d728985c8b31356b43aa56a911a509f6a367cfff32ac456912dad110a9ae52299a26
-MISC metadata.xml 491 BLAKE2B 7791b77c9946d4693be96e4bf897b6953b7318860abdd00f89d50f8a9bbc421259f91dec60e2dc3f609d05fc860525b7aaf1db49ef1308c3ab4804d8e4f15938 SHA512 ad3d2f216c33b6a56fad27364da03f4ab552613e79c424c0794dd49c4d950d9a50679798101938a1e3f55dee8dfc5eaff29b96b80660a70ff2eed3ebc8d6b30b
diff --git a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild b/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
deleted file mode 100644
index 12cf878940fc..000000000000
--- a/games-misc/fortune-mod-dubya/fortune-mod-dubya-20050118.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from George W. Bush"
-HOMEPAGE="http://dubya.seiler.us/"
-SRC_URI="http://seiler.us/wiki/images/8/8c/Dubya-${PV}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${PN/fortune-mod-/}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins dubya dubya.dat
-}
diff --git a/games-misc/fortune-mod-dubya/metadata.xml b/games-misc/fortune-mod-dubya/metadata.xml
deleted file mode 100644
index edfe6175c4eb..000000000000
--- a/games-misc/fortune-mod-dubya/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-	dubya is a module for fortune-mod, and contains many quotes from George W.
-	Bush.  The great majority, if not all, of these quotes were originally
-	gathered in the fantastic George W. Bush Desk Calendar.
-</longdescription>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-dune-2.0.1 b/games-misc/fortune-mod-dune-2.0.1
new file mode 100644
index 000000000000..83d8a4842db6
--- /dev/null
+++ b/games-misc/fortune-mod-dune-2.0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Frank Herbert's Dune Chronicles
+EAPI=5
+HOMEPAGE=http://dune.s31.pl/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=free-noncomm
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://dune.s31.pl/fortune-mod-dune-quotes.2.0.1.tar.gz
+_md5_=fc69e7efffc380968b44a751f83a3150
diff --git a/games-misc/fortune-mod-dune/Manifest b/games-misc/fortune-mod-dune/Manifest
deleted file mode 100644
index 5623d177f7b3..000000000000
--- a/games-misc/fortune-mod-dune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-dune-quotes.2.0.1.tar.gz 66579 BLAKE2B 144114b48c872b6c71eb9a82ee4b09aeeb651a28e2df5502008ecd6e99a314f3474e54171db75b503856e2183a4eb64cb4c32b9ac6be6df1d4861f422b1770f2 SHA512 fa40ba975f8a3dd53cc5af7803fd18bc849bd7ea996c03031c3800b3dc42b33dfa540ad1826a0dc94c2284ada9ed6c1b411e314b11a94bad427e080af52b23e9
-EBUILD fortune-mod-dune-2.0.1.ebuild 564 BLAKE2B 3153f49547cc9792fb09772763a513de4a360083a0eabe4331c024bb3d9e86f108f43ed7036da6fbee418e71db6ac26f78c94216e7242a3d3c1b7564043dd943 SHA512 2fbebb510b82943be45ea2b1744aa380d6e74511bb1d46cc74e2a333a0acc7bcf654cbfd6db46f968030d4bc00c6bc585f8c083762ecbef6f4a9501971e3924b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild b/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
deleted file mode 100644
index 3d7d957c6414..000000000000
--- a/games-misc/fortune-mod-dune/fortune-mod-dune-2.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=${PN}-quotes.${PV}
-DESCRIPTION="Quotes from Frank Herbert's Dune Chronicles"
-HOMEPAGE="http://dune.s31.pl/"
-SRC_URI="http://dune.s31.pl/${MY_P}.tar.gz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins *
-}
diff --git a/games-misc/fortune-mod-dune/metadata.xml b/games-misc/fortune-mod-dune/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-dune/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-familyguy-0.2 b/games-misc/fortune-mod-familyguy-0.2
new file mode 100644
index 000000000000..3e4a8dc4aee0
--- /dev/null
+++ b/games-misc/fortune-mod-familyguy-0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from the TV-Series -Family Guy-
+EAPI=5
+HOMEPAGE=http://jon.oberheide.org/familyguy/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://jon.oberheide.org/familyguy/fortune-mod-familyguy-0.2.tar.gz
+_md5_=c0d8d905d37ee0131a0d4415e13bb26b
diff --git a/games-misc/fortune-mod-familyguy/Manifest b/games-misc/fortune-mod-familyguy/Manifest
deleted file mode 100644
index c3af34f34a39..000000000000
--- a/games-misc/fortune-mod-familyguy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-familyguy-0.2.tar.gz 65992 BLAKE2B 88a7f10c855dbaf8054efcd671e2be3e7a7ff126f4d23ecad0dc23489586ae6319c32808502de66f10f1a0514d79b972bddd2c97b592336c342e77190b7ef668 SHA512 81c3be499b5709588e4da6f5d53cb774d8310f8ee9e626b704009357b9d0572f052b94d48b19671a7592f9c3e46def9f1b9e01275a2d896f101ef5d7b294ed68
-EBUILD fortune-mod-familyguy-0.2.ebuild 566 BLAKE2B 462c52e87a43bb4af1b1baadba4032d0ba9dd4d7199ca750a646a1e9360977e8ba2f7b40429bd69f2f78263ba996a9ebb1eb9cdd8378cdae89354bdad4905394 SHA512 472a9630c3080f92d8b647dfedd93f1d91c0f107e69e0d2478c4e934832c4d41ac0851eb3fb06d3b6d9677081bf62ddbd853f9e8c9eae366de37bde6ba103f9d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild b/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
deleted file mode 100644
index 7fecb0118719..000000000000
--- a/games-misc/fortune-mod-familyguy/fortune-mod-familyguy-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from the TV-Series -Family Guy-"
-HOMEPAGE="http://jon.oberheide.org/familyguy/"
-SRC_URI="http://jon.oberheide.org/familyguy/${P}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	insinto /usr/share/fortune
-	doins familyguy familyguy.dat
-}
diff --git a/games-misc/fortune-mod-familyguy/metadata.xml b/games-misc/fortune-mod-familyguy/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-familyguy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-firefly-2.1.1 b/games-misc/fortune-mod-firefly-2.1.1
new file mode 100644
index 000000000000..94261a00af1b
--- /dev/null
+++ b/games-misc/fortune-mod-firefly-2.1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from FireFly
+EAPI=5
+HOMEPAGE=http://www.daughtersoftiresias.org/progs/firefly/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.daughtersoftiresias.org/progs/firefly/fortune-firefly-2.1.1.tar.bz2
+_md5_=25690ac5fceb48046449943527ec9b69
diff --git a/games-misc/fortune-mod-firefly/Manifest b/games-misc/fortune-mod-firefly/Manifest
deleted file mode 100644
index 4cabafb68456..000000000000
--- a/games-misc/fortune-mod-firefly/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-firefly-2.1.1.tar.bz2 36649 BLAKE2B 1ad5519cd12f24cf00782d2dee7b62e99653752f795cb226d31f4c4dfe5ac1736be324425ef9b1082eeb3b53fe687bf448ad3e8cc99cc8f114d8ba6dd57a13a7 SHA512 17d659a215598915228a494337f2a49878d2f238e2fc709559bc3dfdf58ff15ae5bf35a2051bd3abdf6dc3608bbbba6b5619737e0cb94a0aa8905fd05e4abca0
-EBUILD fortune-mod-firefly-2.1.1.ebuild 591 BLAKE2B 065e2297ddace789761099dc764621094be0b0d2400ac2e1720b068e7b0a434f4cb875ead4a62a22b56a36328d302bebf2d171bda2ada7152e77f5019951df6c SHA512 6dcb9bb65372832996ed335daff7cf6157105ae792d7452336bf3eeca7764f74b73112e940e5e4f32abf5f0f4b02b73936481ecd5807cd0f4cfe3ae7dc6d0c98
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild b/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
deleted file mode 100644
index b2bd89e8c2cc..000000000000
--- a/games-misc/fortune-mod-firefly/fortune-mod-firefly-2.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from FireFly"
-HOMEPAGE="http://www.daughtersoftiresias.org/progs/firefly/"
-SRC_URI="http://www.daughtersoftiresias.org/progs/firefly/${P/mod-}.tar.bz2"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins firefly firefly.dat
-}
diff --git a/games-misc/fortune-mod-firefly/metadata.xml b/games-misc/fortune-mod-firefly/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-firefly/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-flashrider-1.10 b/games-misc/fortune-mod-flashrider-1.10
new file mode 100644
index 000000000000..38fac6dc9776
--- /dev/null
+++ b/games-misc/fortune-mod-flashrider-1.10
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=games-misc/fortune-mod
+DESCRIPTION=Quotes from Prolinux articles and comments
+EAPI=5
+HOMEPAGE=http://downloads.nanolx.org/index.php?dir=fortunes-flashrider
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://downloads.nanolx.org/fortunes-flashrider/fortunes-flashrider_1.10.tar.bz2
+_md5_=610924eb8c836b813ebfa2429b7399e9
diff --git a/games-misc/fortune-mod-flashrider/Manifest b/games-misc/fortune-mod-flashrider/Manifest
deleted file mode 100644
index a5db9f9bc21f..000000000000
--- a/games-misc/fortune-mod-flashrider/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortunes-flashrider_1.10.tar.bz2 126771 BLAKE2B 1dda83d5dc30d1a99c9602acaf51b04d34c41ef875e0974e1624ecfe7ad63f0e8ea4ed6853b1f5f78669274a55da91088e6c2a925cc0c1589ef79185cf3f1269 SHA512 3fdf4f19d474cd5560ec234a290a9d6a3108148a8125b93817c4e0513f884a95449588f27775cb7ba321521d19d540bd459d1bd14648206216f9beac5fe6764e
-EBUILD fortune-mod-flashrider-1.10.ebuild 748 BLAKE2B 7229e4063c4c46e3502074545b222b4ea7e6e04c9c6011d6412146f52673e540366a41101b68886e9865bdcd5e2e929f25a0325064c036a9b2cce7e07790f594 SHA512 be9914e24ca9127d3f75ecab43caf7932f5066f081948ae251fc213c3aef7e6b073ce4cd4c62c830a9c878b919477770861230b5629b1e595c1c12324e94a629
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild b/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
deleted file mode 100644
index d4ff0f261e4b..000000000000
--- a/games-misc/fortune-mod-flashrider/fortune-mod-flashrider-1.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="${PN/-mod/s}"
-MY_P="${MY_PN}_${PV}"
-
-DESCRIPTION="Quotes from Prolinux articles and comments"
-HOMEPAGE="http://downloads.nanolx.org/index.php?dir=fortunes-flashrider"
-SRC_URI="http://downloads.nanolx.org/fortunes-flashrider/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare()
-{
-	sed -e 's#INSTALLDIR = .*#INSTALLDIR = /share/fortune#' -i Makefile
-}
-
-src_install() {
-	emake install PREFIX="${EPREFIX}"/usr DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/games-misc/fortune-mod-flashrider/metadata.xml b/games-misc/fortune-mod-flashrider/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-misc/fortune-mod-flashrider/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-futurama-0.2 b/games-misc/fortune-mod-futurama-0.2
new file mode 100644
index 000000000000..77d4ddf9c8a9
--- /dev/null
+++ b/games-misc/fortune-mod-futurama-0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from the TV-Series -Futurama-
+EAPI=5
+HOMEPAGE=http://www.netmeister.org/misc.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.netmeister.org/apps/fortune-mod-futurama-0.2.tar.gz
+_md5_=73aa1922f6d2df52ef83b6342f43f8f5
diff --git a/games-misc/fortune-mod-futurama/Manifest b/games-misc/fortune-mod-futurama/Manifest
deleted file mode 100644
index b718cdd9a656..000000000000
--- a/games-misc/fortune-mod-futurama/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-futurama-0.2.tar.gz 19349 BLAKE2B 959c689d8707122067ac731945def933d24ee5da0defe7c810f794ae48a7efbdd9ebe15be2920d188a870207069dfa8fe72eaaca247979ad5ebe23a7f7f8d289 SHA512 a6780f46c361c31d523c8a39a47dd5d752a7cdb86d26f26bcfe89e5ee367c81af00ad4b538be5a40827a3b212214565afe5b438cb965fe87e05d9574c9483a01
-EBUILD fortune-mod-futurama-0.2.ebuild 558 BLAKE2B 69e1c0cb5dae498c46065b8fc99be329d624cd78c4bdd070fc939237a7b2bbf621fe9c2084ca53528e0a8551a5f0df9206c0d0ba7a02d9ec6a45a33c4e2c951f SHA512 6c52ae8916bcb852f0987d9a126368ea02db4b088a06b20d287a1b151c5c0a533ec55123e394f4bc478c88a2d91c5cde1b1c63b1880dacbb67cbe04bb3935973
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild b/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
deleted file mode 100644
index 85e30d680ded..000000000000
--- a/games-misc/fortune-mod-futurama/fortune-mod-futurama-0.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from the TV-Series -Futurama-"
-HOMEPAGE="http://www.netmeister.org/misc.html"
-SRC_URI="http://www.netmeister.org/apps/${P}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	insinto /usr/share/fortune
-	doins futurama futurama.dat
-}
diff --git a/games-misc/fortune-mod-futurama/metadata.xml b/games-misc/fortune-mod-futurama/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-futurama/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-fvl-20030120 b/games-misc/fortune-mod-fvl-20030120
new file mode 100644
index 000000000000..cf43debd571f
--- /dev/null
+++ b/games-misc/fortune-mod-fvl-20030120
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Felix von Leitner (fefe)
+EAPI=5
+HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-fvl-20030120.tar.gz
+_md5_=8e690d04bc3061db97a9655b28f00331
diff --git a/games-misc/fortune-mod-fvl/Manifest b/games-misc/fortune-mod-fvl/Manifest
deleted file mode 100644
index c2dfda7e208c..000000000000
--- a/games-misc/fortune-mod-fvl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-fvl-20030120.tar.gz 66081 BLAKE2B 78e1fb2887464cf7050dad309f47329ed6eaba1bf153c9d7d9758f9050f2dd77421dcf1a0e58279389811a3cd145b1f6bb3479b9501ee32378482f59098a2117 SHA512 43213abb2772f560d65f8e552a9c384f2163650cb2fa29a9203a05a0c3b36dff6645afb181e317d5e9258cf0597607bb185a8c852289a2f3cf015c6e4f946bf3
-EBUILD fortune-mod-fvl-20030120.ebuild 556 BLAKE2B e39eaf5aee720d8fecdbb02d09c421206b20af922bf1672a3f7928bedee17a314fece18e3e176ab76e4e3e2039d9fe35eb9cfa07a6ebd9e256e4f26f7b63f28d SHA512 4d124919cd519c4b3a3821661a615a9f06e8f6d748a64afc29ac5d2c9e0154222c1fe47f1c81de10aa078bbb478122b662a0c6be439ded8afa08b6c2539d5eb4
-MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild b/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
deleted file mode 100644
index e0226482ae03..000000000000
--- a/games-misc/fortune-mod-fvl/fortune-mod-fvl-20030120.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from Felix von Leitner (fefe)"
-HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	insinto /usr/share/fortune
-	doins fvl fvl.dat
-}
diff --git a/games-misc/fortune-mod-fvl/metadata.xml b/games-misc/fortune-mod-fvl/metadata.xml
deleted file mode 100644
index f0c5667bf97e..000000000000
--- a/games-misc/fortune-mod-fvl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-gentoo-dev-20090306 b/games-misc/fortune-mod-gentoo-dev-20090306
new file mode 100644
index 000000000000..a2e3e88c1d92
--- /dev/null
+++ b/games-misc/fortune-mod-gentoo-dev-20090306
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl games-misc/fortune-mod
+DESCRIPTION=Fortune database of #gentoo-dev quotes
+EAPI=5
+HOMEPAGE=https://www.gentoo.org/
+IUSE=offensive
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://gentoo/fortune-gentoo-dev-20090306.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/fortune-gentoo-dev-20090306.tar.bz2
+_md5_=7777db947a0555efa12bda09b1ff4426
diff --git a/games-misc/fortune-mod-gentoo-dev/Manifest b/games-misc/fortune-mod-gentoo-dev/Manifest
deleted file mode 100644
index e3b6fb9f2d78..000000000000
--- a/games-misc/fortune-mod-gentoo-dev/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-gentoo-dev-20090306.tar.bz2 50355 BLAKE2B 1acc5d799b310ce9b655baa2aa33547ea9b20cd940dcc8c13b40fb2b5e930351bc67c4353ac559234e20211a82daf7a51b3454374ea81991514eeb99a7bbf789 SHA512 2a6014d1dc95cae8a50c8f502f8271a9b7bf349cb49076ac3e76f3da55f0e509caf27ee04827b1b42add1b42ae07824173495bb0dbed5421693508fff9f36acc
-EBUILD fortune-mod-gentoo-dev-20090306.ebuild 734 BLAKE2B c0245cc7bdbae2d6548607974a15cafec97b7e224acba0855108f91dd01ae57a8ff5e85f87e2b274a04841f59aef2af1b6d5a14976a9c1c344a9693258d6490b SHA512 c0bf4e64981d86e1b0e9490d2acceb0c96aea31d9dd17b76fd1962f7df038a96b14f30e9ecebc4af18f3b0afe34aea76df170d2b4e4cee657ebb1472720555be
-MISC metadata.xml 451 BLAKE2B 87b7029266a22969d56280db14ca629ee2bb89442cb4852984ebdb33a5d60d276cb51059fa7c91585cfd14b70ab6662da68431177cf3aed8dcd2166dfa079072 SHA512 4dc5894c615627a06c494146c3263a66ac6cd1bf577bf7f9d81b2c5988ccf439ca78812146b9840a24e13b1fd9666b1bff994b7c86e73faa1d0b0f321169deef
diff --git a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild b/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
deleted file mode 100644
index bd6c0817d271..000000000000
--- a/games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Fortune database of #gentoo-dev quotes"
-HOMEPAGE="https://www.gentoo.org/"
-MY_PN="fortune-gentoo-dev"
-MY_P="${MY_PN}-${PV}"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-		 https://dev.gentoo.org/~robbat2/distfiles/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd"
-IUSE="offensive"
-
-RDEPEND="games-misc/fortune-mod"
-# Perl is used to build stuff only
-# and strfile belongs to fortune-mod
-DEPEND="dev-lang/perl
-		${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	default
-	use offensive || rm -f "${D}"/usr/share/fortune/off/*
-}
diff --git a/games-misc/fortune-mod-gentoo-dev/metadata.xml b/games-misc/fortune-mod-gentoo-dev/metadata.xml
deleted file mode 100644
index e8ff60b96dac..000000000000
--- a/games-misc/fortune-mod-gentoo-dev/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-	<name>Robin H. Johnson</name>
-	<description>Maintainer. Also, please submit snippets for the fortunes to
-		me.</description>
-</maintainer>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-gentoo-forums-20041207 b/games-misc/fortune-mod-gentoo-forums-20041207
new file mode 100644
index 000000000000..da740b2ab129
--- /dev/null
+++ b/games-misc/fortune-mod-gentoo-forums-20041207
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=games-misc/fortune-mod
+DESCRIPTION=Fortune database of quotes from forums.gentoo.org
+EAPI=5
+HOMEPAGE=https://forums.gentoo.org/
+IUSE=offensive
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://gentoo/gentoo-forums-20041207.gz offensive? ( mirror://gentoo/gentoo-forums-offensive-20041207.gz )
+_md5_=d9627e126ca9c446f17d7ee23da5975e
diff --git a/games-misc/fortune-mod-gentoo-forums/Manifest b/games-misc/fortune-mod-gentoo-forums/Manifest
deleted file mode 100644
index e54c53a3f778..000000000000
--- a/games-misc/fortune-mod-gentoo-forums/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gentoo-forums-20041207.gz 8809 BLAKE2B 1586eaae8b9af3e5e230daca8a7993c268a03a511fa5a4b93013efbb0538612131c589bcf50a613b8f132499cee4154c8b0a65844ec06f0eecabc025a5036c6c SHA512 55f1da4dd6c37778ebb46de5436a8f69475cd9a25a5bd01a325cbd825cae4bc6ecaeda94d6b38104fb71a4baa56577f12390884aac545c5d891895aa7ee1738a
-DIST gentoo-forums-offensive-20041207.gz 1510 BLAKE2B 827b1b6bf17c31296734972648be202b0b78b146f4c31d4ab8b31c0a56f59008670e958ce77061b385d3c67bceec3bd19acd52be21db06f5fcb75a2454ad7d92 SHA512 244b4e7f5c5feaa217298f79d2f157999c71d89824f25d89d7a234ec72950bef93a4c0fa23ce1fb385c5c6788c62f09d6b17f454e70cba0052870f4267522dbb
-EBUILD fortune-mod-gentoo-forums-20041207.ebuild 836 BLAKE2B 0f940fd70ac821a2a84d80a2d5badd75fb38c1bb00a3b5532e879a00077f0bd04af6fee156e2dc3c13c7a4b0a760af58a716f81957ad98b51f2c00e2a4a05e4f SHA512 c466d2f9bb8f545c014b6f69f23bbbe3a3f8c3513b6619c66c2c1ab0bd36ae3f686d4841f2286ece2a349b8902be6bb90f9d7c08326be57b7b68d2c60c60f704
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild b/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
deleted file mode 100644
index 520e000380dc..000000000000
--- a/games-misc/fortune-mod-gentoo-forums/fortune-mod-gentoo-forums-20041207.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Fortune database of quotes from forums.gentoo.org"
-HOMEPAGE="https://forums.gentoo.org/"
-SRC_URI="mirror://gentoo/gentoo-forums-${PV}.gz
-	offensive? ( mirror://gentoo/gentoo-forums-offensive-${PV}.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="offensive"
-
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_compile() {
-	mv gentoo-forums-${PV} gentoo-forums || die
-	use offensive && cat gentoo-forums-offensive-${PV} >> gentoo-forums
-	strfile gentoo-forums || die
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins gentoo-forums gentoo-forums.dat
-}
diff --git a/games-misc/fortune-mod-gentoo-forums/metadata.xml b/games-misc/fortune-mod-gentoo-forums/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-gentoo-forums/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-hitchhiker-0.1 b/games-misc/fortune-mod-hitchhiker-0.1
new file mode 100644
index 000000000000..1e8ddbdb5163
--- /dev/null
+++ b/games-misc/fortune-mod-hitchhiker-0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Hitchhikers Guide to the Galaxy
+EAPI=5
+HOMEPAGE=http://www.splitbrain.org/projects/fortunes/hg2g
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.splitbrain.org/_media/projects/fortunes/fortune-hitchhiker.tgz
+_md5_=14e02c138168b41f593a4bde34e39e62
diff --git a/games-misc/fortune-mod-hitchhiker/Manifest b/games-misc/fortune-mod-hitchhiker/Manifest
deleted file mode 100644
index 30fda1f6d36b..000000000000
--- a/games-misc/fortune-mod-hitchhiker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-hitchhiker.tgz 11560 BLAKE2B 95561be94c39b0f83ec2a4864c34c8dac743a94288318a2ad1147e4ec78dc2eff1d1521386a489238be71d7ab6ac40b3883d168c11290915d79e20ae3dad4c28 SHA512 a4f4a99c33764e6d4ec823a57f9d2d40168ddf3cb9506e85fb0f6f10b11673abd76d02e9af8a95926ba758a28fbbe895a427b40c36bd31bc43252c4e6dd610b0
-EBUILD fortune-mod-hitchhiker-0.1.ebuild 657 BLAKE2B 73a170ab442050248517bd788b934285a32c9a195165ef32d0caced198afb098ded41de5977aa1fc868a13105255cf4d4e603d99536ff26bbd9598ef8b6f9813 SHA512 c16bf6e9ccf416b6578c1be88f4f4b1f4e4577d5e883829b65ba04459442a2c83a17367008174ece2c8409b221b74374724a94ce6268afb3def66c9baceb433a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild b/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
deleted file mode 100644
index f4d00afaa2f4..000000000000
--- a/games-misc/fortune-mod-hitchhiker/fortune-mod-hitchhiker-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=${PN/-mod/}
-DESCRIPTION="Quotes from Hitchhikers Guide to the Galaxy"
-HOMEPAGE="http://www.splitbrain.org/projects/fortunes/hg2g"
-SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins hitchhiker hitchhiker.dat
-}
diff --git a/games-misc/fortune-mod-hitchhiker/metadata.xml b/games-misc/fortune-mod-hitchhiker/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-hitchhiker/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-homer-0.1 b/games-misc/fortune-mod-homer-0.1
new file mode 100644
index 000000000000..d435664c3aea
--- /dev/null
+++ b/games-misc/fortune-mod-homer-0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Homer Simpson
+EAPI=5
+HOMEPAGE=http://www.cs.indiana.edu/~crcarter/homer/homer.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.cs.indiana.edu/~crcarter/homer/homer-quotes.tar.gz
+_md5_=5cc6978b0f96b7068f1b146bd97917f8
diff --git a/games-misc/fortune-mod-homer/Manifest b/games-misc/fortune-mod-homer/Manifest
deleted file mode 100644
index 4ca7de3df323..000000000000
--- a/games-misc/fortune-mod-homer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST homer-quotes.tar.gz 23142 BLAKE2B e5f9c14bf9eeb3bc88609fa72a71b5dd656c90074ba0e2fd8f3bbbe43068263d725f3bad2e5f4d5a92c3e6dbe17e97e65a0000a6b6a41fb18d532cfe2ea602b1 SHA512 babe8ce488f08bfba77dbed8e6ef28afb50952b48540c62c3b9211ff7504e3d0da0ea05a116f096aed3dbbd732afaf1ad60bb88772305dc43ecb0c2f721a7e33
-EBUILD fortune-mod-homer-0.1.ebuild 601 BLAKE2B 1b8c08e381553ed0c1c6bd4a5c8b0ea3a6cae96c3f916fdc06597276c292b52847a3a9d06f5115255a900716b64ae638cf9f3d59d3939021a88a6668a850deec SHA512 1df5b84c8e610ee9d1e505e0b3f811ac9526138d83d738dcef6b09fd040cfafbc429d2ce927702808ee8e7745f17f16c2d0bb2ee6fbbd963a30ee31c70019b68
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild b/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
deleted file mode 100644
index 796c033304f4..000000000000
--- a/games-misc/fortune-mod-homer/fortune-mod-homer-0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from Homer Simpson"
-HOMEPAGE="http://www.cs.indiana.edu/~crcarter/homer/homer.html"
-SRC_URI="http://www.cs.indiana.edu/~crcarter/homer/homer-quotes.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${PN/mod-/}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins homer homer.dat
-}
diff --git a/games-misc/fortune-mod-homer/metadata.xml b/games-misc/fortune-mod-homer/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-homer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-humorixfortunes-1.4-r1 b/games-misc/fortune-mod-humorixfortunes-1.4-r1
new file mode 100644
index 000000000000..4cd2ad529968
--- /dev/null
+++ b/games-misc/fortune-mod-humorixfortunes-1.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Extra fortune cookies for fortune
+EAPI=5
+HOMEPAGE=http://i-want-a-website.com/about-linux/downloads.shtml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=freedist fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://humorix.org/downloads/humorixfortunes-1.4.tar.gz
+_md5_=9f403c0403b89ee990b9471f7e2e94f5
diff --git a/games-misc/fortune-mod-humorixfortunes/Manifest b/games-misc/fortune-mod-humorixfortunes/Manifest
deleted file mode 100644
index 6d156c76f99d..000000000000
--- a/games-misc/fortune-mod-humorixfortunes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST humorixfortunes-1.4.tar.gz 97053 BLAKE2B a86746f5a810c1db6b310227f1855b88d6b8f6359b01973933ace6cc8d4af03a4c4349638ce399f7327800812f2e83464fe2652c7790dd33c3163be0646ab252 SHA512 beac030bb3d7bbfa9286c41cd7a40fce2166fcb058443af0be7ab3f8897220ed4ed1e259fd642554f4b38554351e1bfc2e5eb660a4612cdc23269dbf40163c7c
-EBUILD fortune-mod-humorixfortunes-1.4-r1.ebuild 682 BLAKE2B f3340d0f21b9edca8452a5bb7ace9890b92c4b7cc002bf7d5f8e2ae4c4f8875f31da6671c37e45854e8689a078286dad2c0740c1a99a599a999f01907137e4e4 SHA512 1aa85d5f0c41e6e987c8247c50e36f0dee7db7f12267aab56fd03b884452af2bc363fe991ec1a64bc069ccdd8681a3168614c5e2f63fbb4b2fd96d22a3486f3b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild b/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
deleted file mode 100644
index a08ef0fdf47a..000000000000
--- a/games-misc/fortune-mod-humorixfortunes/fortune-mod-humorixfortunes-1.4-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=${P/fortune-mod-/}
-DESCRIPTION="Extra fortune cookies for fortune"
-HOMEPAGE="http://i-want-a-website.com/about-linux/downloads.shtml"
-SRC_URI="http://humorix.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="freedist fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins humorix-misc humorix-misc.dat
-	doins humorix-stories humorix-stories.dat
-}
diff --git a/games-misc/fortune-mod-humorixfortunes/metadata.xml b/games-misc/fortune-mod-humorixfortunes/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-humorixfortunes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-it-1.99 b/games-misc/fortune-mod-it-1.99
new file mode 100644
index 000000000000..c2124c871318
--- /dev/null
+++ b/games-misc/fortune-mod-it-1.99
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=games-misc/fortune-mod
+DESCRIPTION=Database of the Italian cookies for the fortune program
+EAPI=5
+HOMEPAGE=http://www.fortune-it.net/
+IUSE=offensive
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=freedist
+SLOT=0
+SRC_URI=http://www.fortune-it.net/download/fortune-it-1.99.tar.gz
+_md5_=cb675e9d63a7dc6842d66ddaf2fd3141
diff --git a/games-misc/fortune-mod-it/Manifest b/games-misc/fortune-mod-it/Manifest
deleted file mode 100644
index 9f4381856720..000000000000
--- a/games-misc/fortune-mod-it/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-it-1.99.tar.gz 739886 BLAKE2B 8f4624f079682defbb34d04de4e3de8140ddeb9765936798f9480ac0a65efcaa67580c9cf201cf811008d97dbf40eb29a2454840e6014f6c0c07758eaded10c3 SHA512 b4b119f5def51a31ee25c5df3e47a0b9aa45341ecb1f7048233aa1d5c1d4fc8127b9eaa29c028a9df5ad71d9868d4006e7d3a1bef776b34d337a5bca47bd5d53
-EBUILD fortune-mod-it-1.99.ebuild 783 BLAKE2B 536cd6a1c27a79a6e63f76f7d21c8cb03581c408dd295aa4c5b31a95f74971cdee8ed35555af2548dd0c82ea495f685f1bb307382bdb017b943be7e017d3a66c SHA512 56a4191cb37a95d2b7ec60ccc3af2645c1dbf72dbd5d55b0a4646fb24d62a15fc7c60622c4479240e0b802d4fd18b5fa6114f1e48a72c2c7510f4cd0ff37dcbf
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild b/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
deleted file mode 100644
index 74fdee6a079a..000000000000
--- a/games-misc/fortune-mod-it/fortune-mod-it-1.99.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Database of the Italian cookies for the fortune program"
-HOMEPAGE="http://www.fortune-it.net/"
-SRC_URI="http://www.fortune-it.net/download/fortune-it-${PVR}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="offensive"
-
-DEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/fortune-it-${PVR}
-
-src_prepare() {
-	use offensive || rm -f testi/*-o
-}
-
-src_compile() {
-	local f
-	for f in testi/* ; do
-		strfile -s ${f} || die "strfile ${f} failed"
-	done
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins testi/*
-	dodoc README
-}
diff --git a/games-misc/fortune-mod-it/metadata.xml b/games-misc/fortune-mod-it/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-it/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-kernelcookies-9 b/games-misc/fortune-mod-kernelcookies-9
new file mode 100644
index 000000000000..b0448372cbc7
--- /dev/null
+++ b/games-misc/fortune-mod-kernelcookies-9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=games-misc/fortune-mod
+DESCRIPTION=A collection of funny lines from the Linux kernel
+EAPI=5
+HOMEPAGE=http://www.schwarzvogel.de/software-misc.shtml
+IUSE=offensive
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.schwarzvogel.de/pkgs/kernelcookies-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_=d200536e18c1aff1ed437e8f29359758
diff --git a/games-misc/fortune-mod-kernelcookies/Manifest b/games-misc/fortune-mod-kernelcookies/Manifest
deleted file mode 100644
index 0ab1c1010fdd..000000000000
--- a/games-misc/fortune-mod-kernelcookies/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 9-offensive.patch 4789 BLAKE2B 2778f35d39fd213e215ec679ecabdd145168c35c3a41df0d02a0600f3b2d8e551020cf7ce88f7e4bbe266858593f65642a670935b44b2716acdc2af60e338c74 SHA512 6bf0ae401b55b6e83523ad0b930ff06627499c9b45ba98687843b7d96ffea24dfe92799a581f37ed7d33efb951ab07157467f6034ad8aab9ee86df865005846c
-DIST kernelcookies-9.tar.gz 8966 BLAKE2B c6d503d0c01fe86ac2b59240ba2a1639210b7aef6fb167d8467c4fcad0283880ff00c59e34e811c7bbde3b0bf7e7bb89536e8c3d439b514fb180db2d326847cc SHA512 3d2601ad787928ef852af7d5833c5d32a7c7e364913d451e889eb883d4da450a989c0ff450aef4c07e3700ef3a87f535948d07789c7d2819305a6f36cded7aa3
-EBUILD fortune-mod-kernelcookies-9.ebuild 841 BLAKE2B efaf45273867cf8e9abc97b8d571710b7e3330083cc5a5753bf5e3a33f2b9dbe25d91bfa84a92fe9ba7e3994c40276d53a9651b63ef4c609741c0096404edac4 SHA512 171a425261d869b2b4d40e38299ce9bad0e3876c24670732affe98b8ce6729166ff6ac7ac27d89086074d647c73df6554112cb5c600c07897b45e2743366e153
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch b/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
deleted file mode 100644
index 0ba0ee128907..000000000000
--- a/games-misc/fortune-mod-kernelcookies/files/9-offensive.patch
+++ /dev/null
@@ -1,140 +0,0 @@
---- kernelcookies
-+++ kernelcookies
-@@ -1,42 +1,3 @@
--/* Only Sun can take such nice parts and fuck up the programming interface
-- * like this.  Good job guys...
-- */
--        linux-2.6.6/drivers/net/sunhme.c
--%
--/* This card is _fucking_ hot... */
--        linux-2.6.6/drivers/net/sunhme.c
--%
--If you don't see why, please stay the fuck away from my code.
--        Rusty, in linux-2.6.6/Documentation/DocBook/kernel-locking.tmpl        
--%
--/* Fuck, we are miserable poor guys... */
--        linux-2.6.6/net/xfrm/xfrm_algo.c
--%
--/* Ugly, ugly fucker. */
--        linux-2.6.6/include/linux/netfilter_ipv4/ipt_limit.h
--%
--/* XXX: where the fuck is ->f_vfsmnt? */
--        linux-2.6.6/fs/intermezzo/vfs.c
--%
--        if(ct<0)
--                ct=2;        /* Shit happens.. */
--        linux-2.6.6/drivers/net/wan/z85230.c
--%
--/* Remember: "Different name, same old buggy as shit hardware." */
--        linux-2.6.6/drivers/net/sunhme.c
--%
--/* This is total bullshit: */
--        linux-2.6.6/drivers/video/sis/init301.c
--%
--/* The HME is the biggest piece of shit I have ever seen. */
--        linux-2.6.6/drivers/scsi/esp.h
--%
--/* Sun, you just can't beat me, you just can't.  Stop trying,
-- * give up.  I'm serious, I am going to kick the living shit
-- * out of you, game over, lights out.
-- */
--         linux-2.6.6/arch/sparc/lib/checksum.S
--%
- printk("WE HAVE A BUG HERE!!! stk=0x%p\n", stk);
-         linux-2.6.6/drivers/block/cciss_scsi.c
- %
-@@ -49,18 +10,9 @@
- printk("GSCD: magic ...\n");
-         linux-2.6.6/drivers/cdrom/gscd.c
- %
--printk(" (Read error)");        /* Bitch about the problem. */
--        linux-2.6.6/drivers/cdrom/mcd.c
--%
- printk(" Speed now 1x");        /* Pull my finger! */
-         linux-2.6.6/drivers/cdrom/mcd.c
- %
--printk("%s: confused, missing data\n", drive->name);
--        linux-2.6.6/drivers/ide/ide-cd.c
--%
--printk(KERN_ERR "ide: huh? queue was plugged!\n");
--        linux-2.6.6/drivers/ide/ide-io.c:
--%
- printk ("%s: This looks like a LART board to me.\n",module_name);
-         linux-2.6.6/drivers/mtd/devices/lart.c
- %
-@@ -380,21 +332,6 @@
- printk(KERN_WARNING "Multi-volume CD somehow got mounted.\n");
-         linux-2.2.16/fs/isofs/inode.c
- %
--/* Fuck me gently with a chainsaw... */
--        linux-2.0.38/arch/sparc/kernel/ptrace.c
--%
--/* Binary compatibility is good American knowhow fuckin' up. */
--        linux-2.2.16/arch/sparc/kernel/sunos_ioctl.c
--%
--/* Am I fucking pedantic or what? */
--        linux-2.2.16/drivers/scsi/qlogicpti.h
--%
--/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */
-- *
-- * Wirzenius wrote this portably, Torvalds fucked it up :-)
-- */
--        linux-2.2.16/lib/vsprintf.c
--%
- printk("Penguin %d is stuck in the bottle.\n", i);
-         linux-2.0.38/arch/sparc/kernel/smp.c
- %
-@@ -416,9 +353,6 @@
- panic("Cannot initialize video hardware\n");
-         linux-2.0.38/arch/m68k/atari/atafb.c
- %
--printk("ufs_read_super: fucking Sun blows me\n");
--        linux-2.0.38/fs/ufs/ufs_super.c
--%
- printk("autofs: Out of inode numbers -- what the heck did you do??\n"); 
-         linux-2.0.38/fs/autofs/root.c
- %
-@@ -444,23 +378,11 @@
- # Okay, what on Earth is this one supposed to be used for?
-         linux-2.4.0/drivers/char/cp437.uni
- %
--/* Fuck.  The f-word is here so you can grep for it :-)  */
--        linux-2.4.3/include/asm-mips/mmu_context.h
--%
- /* Thanks to Rob `CmdrTaco' Malda for not influencing this code in any
-  * way.
-  */
-         linux-2.4.3/net/core/netfilter.c
- %
--/* James M doesn't say fuck enough. */
--        linux-2.4.3/net/core/netfilter.c
--%
--/* So there I am, in the middle of my `netfilter-is-wonderful'
--   talk in Sydney, and someone asks `What happens if you try
--   to enlarge a 64k packet here?'.  I think I said something
--   eloquent like `fuck'. */
--        linux-2.4.3/net/ipv4/netfilter/ip_nat_ftp.c
--%
- panic ("No CPUs found.  System halted.\n");
-         linux-2.4.3/arch/parisc/kernel/setup.c
- %
-@@ -492,19 +414,6 @@
- printk("CPU[%d]: Giving pardon to imprisoned penguins\n", smp_processor_id());
-         linux-2.4.8/arch/sparc64/kernel/smp.c
- %
--/* Welcome to Sun Microsystems, can I take your order please? */
--/* Would you like fries with that? */
--/* Anything else? */
--/* Fifty-two cents is your change, have a nice day. */
--/* Would you like to try our SMCC Delux? */
--/* We have a special on GNU/Viking hardware bugs today. */
--/* Will that be all? */
--/* Don't forget your vik_1137125_wa.  Have a nice day. */
--/* We're consolidating our STB products, it's your lucky day. */
--/* Come back next week when we are "Sun Microelectronics". */
--/* Remember: "Different name, same old buggy as shit hardware." */
--	linux-2.6.6/drivers/net/sunhme.c
--%
- printk (KERN_INFO "NM256: Congratulations. You're not running Eunice.\n");
- 	linux-2.6.19/sound/oss/nm256_audio.c
- %
diff --git a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild b/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
deleted file mode 100644
index 9b2012861b22..000000000000
--- a/games-misc/fortune-mod-kernelcookies/fortune-mod-kernelcookies-9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A collection of funny lines from the Linux kernel"
-HOMEPAGE="http://www.schwarzvogel.de/software-misc.shtml"
-SRC_URI="http://www.schwarzvogel.de/pkgs/kernelcookies-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="offensive"
-
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/kernelcookies-${PV}
-
-src_prepare() {
-	# bug #64985
-	if ! use offensive ; then
-		rm -f *.dat
-		epatch "${FILESDIR}"/${PV}-offensive.patch
-		strfile -s kernelcookies || die
-	fi
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins kernelcookies.dat kernelcookies
-}
diff --git a/games-misc/fortune-mod-kernelcookies/metadata.xml b/games-misc/fortune-mod-kernelcookies/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-kernelcookies/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-mormon-1.1.0 b/games-misc/fortune-mod-mormon-1.1.0
new file mode 100644
index 000000000000..3b4933eb1ff5
--- /dev/null
+++ b/games-misc/fortune-mod-mormon-1.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Fortune modules from the LDS scriptures (KJV Bible, Book of Mormon, D&C, PGP)
+EAPI=5
+HOMEPAGE=http://scriptures.nephi.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=games-misc/fortune-mod games-misc/fortune-mod-scriptures
+SLOT=0
+SRC_URI=mirror://sourceforge/mormon/fortune-mod-mormon-1.1.0.tar.bz2
+_md5_=f2cc6538dd3d9b6ce0773d0e79d37418
diff --git a/games-misc/fortune-mod-mormon/Manifest b/games-misc/fortune-mod-mormon/Manifest
deleted file mode 100644
index 5c621fd4bd33..000000000000
--- a/games-misc/fortune-mod-mormon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-mormon-1.1.0.tar.bz2 4750745 BLAKE2B 82fb85e6b78368e2c4541a8af5de7e5e1b4f01b222095fa662395b7f4bf0e3fa041cf3039ba265b572c4242a4531f5902805a8d3aa329170efb043a94df4d602 SHA512 4684e63b1eb2b1fdb2fbe7241f971c9401777a8364333394db0929aca2ee57456ba30bd601df8d2a8077ad41c1aa71737e20806b79e8541d5dd942092be02d4f
-EBUILD fortune-mod-mormon-1.1.0.ebuild 760 BLAKE2B 42f2fb7456c3151cfe050521638e1cedcea73328f8d5e4384214c1549fcae7bd93f9d2a2d87cffbc24b0d414ed4b8610bc85e42ca5ae7826e835ece85abf70e2 SHA512 b243af9a242b6846b407d0e7109faad19448bea47a34783f4b6da394085a511e5ed3f5118f525ffc05ed8a3a08d3dbbddbb60cb283f8ea1509d19e6d5512d204
-MISC metadata.xml 434 BLAKE2B 0585865a2419c0913cfac7f40e0f233e289b436f3dd2943c477547dd66f7f777a5302abc144aef28935cd6f9b6c6e3c6209f3d124cbedf1830a11fbed20611b7 SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21
diff --git a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild b/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
deleted file mode 100644
index 12e97acd49c5..000000000000
--- a/games-misc/fortune-mod-mormon/fortune-mod-mormon-1.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Fortune modules from the LDS scriptures (KJV Bible, Book of Mormon, D&C, PGP)"
-HOMEPAGE="http://scriptures.nephi.org/"
-SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	games-misc/fortune-mod
-	games-misc/fortune-mod-scriptures
-"
-
-src_install() {
-	dodoc ChangeLog README
-	insinto /usr/share/fortune
-	doins mods/dc mods/dc.dat mods/mormon mods/mormon.dat mods/pgp || die
-	doins mods/scriptures.dat mods/scriptures mods/aof.dat mods/aof || die
-}
diff --git a/games-misc/fortune-mod-mormon/metadata.xml b/games-misc/fortune-mod-mormon/metadata.xml
deleted file mode 100644
index 804de50b9c56..000000000000
--- a/games-misc/fortune-mod-mormon/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
-		<name>Theology</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mormon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-norbert-tretkowski-20030120 b/games-misc/fortune-mod-norbert-tretkowski-20030120
new file mode 100644
index 000000000000..3aa3245bd82e
--- /dev/null
+++ b/games-misc/fortune-mod-norbert-tretkowski-20030120
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Norbert Tretkowski
+EAPI=5
+HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-norbert.tretkowski-20030120.tar.gz
+_md5_=429325cb87c3c572b7bcb5f0f3c0e925
diff --git a/games-misc/fortune-mod-norbert-tretkowski/Manifest b/games-misc/fortune-mod-norbert-tretkowski/Manifest
deleted file mode 100644
index 648b3ad3f33d..000000000000
--- a/games-misc/fortune-mod-norbert-tretkowski/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-norbert.tretkowski-20030120.tar.gz 11501 BLAKE2B 4d5662d1dff0795dace05e1ae2780e6c4b76233eef69febf3770b0fb91cbdd307d5a38930e7ab1711db2d4059b26f6029966bf63e828de3c4496396889bf157d SHA512 df4b846581d6dea55226d6e58235a288def209536f43766fa8b56a07e3a5affbb68e8138e2e01711878480550df322ed6999ef35a41330a58a2f516abc5db13e
-EBUILD fortune-mod-norbert-tretkowski-20030120.ebuild 647 BLAKE2B 3c2896b0bbdc8d4a6e10a3f7b05c25375d56c77568d1b4c3c41ffb9e81cdc82b84de8fe6c37ef22a588352e6693da70e14a2876dfbf9fa1c8594d389d6a77fbf SHA512 5a1cd2a929126608634a198a56ac844d6b8036dfddf0207ad6086a5a1dd97314854adf376384d908c75c8433414cda3ad2467511e285300fb50e26dcf7b3bfc3
-MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild b/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
deleted file mode 100644
index c6d784c5450f..000000000000
--- a/games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=fortune-mod-norbert.tretkowski-${PV}
-DESCRIPTION="Quotes from Norbert Tretkowski"
-HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins norbert.tretkowski norbert.tretkowski.dat
-}
diff --git a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml b/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
deleted file mode 100644
index f0c5667bf97e..000000000000
--- a/games-misc/fortune-mod-norbert-tretkowski/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-osfortune-1 b/games-misc/fortune-mod-osfortune-1
new file mode 100644
index 000000000000..2a6b498c7c36
--- /dev/null
+++ b/games-misc/fortune-mod-osfortune-1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=games-misc/fortune-mod
+DESCRIPTION=Open sources fortune file
+EAPI=5
+HOMEPAGE=http://www.dibona.com/opensources/index.shtml
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-1
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.dibona.com/opensources/osfortune.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_=62c06039f30ca092f60eddd82b414fd2
diff --git a/games-misc/fortune-mod-osfortune/Manifest b/games-misc/fortune-mod-osfortune/Manifest
deleted file mode 100644
index bc50b0eddb3e..000000000000
--- a/games-misc/fortune-mod-osfortune/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX spelling.patch 6416 BLAKE2B 2cfd9616407a3d66b8fd2529ef93db60e27701f31609f8954a1c6e45af4188b577570f75b4fbaecf0be2eb2c2ed60f45d7be4ca06f6697dbb43f0f02b780cab0 SHA512 657c015bf53105a12981308ecae9fadd9e76892d1f1010e84c48b391b2d37e180d60a0e959f5ce30969ba98fa3733e63fad5a6079950dc93fc48a45c24dede6b
-DIST osfortune.tar.gz 3097 BLAKE2B 2c6dff9c81762b36f37df682d9f13f1b4c49ec52128f2bce206895ece64af4a2bb31f8e548cca928f674541eebc23cb4f76a7d5db9150740d4a480c91318179e SHA512 e78f40bbbbe94bc70984f01bc4be9c44a15716d60a526797606a6f38fab3533a0cf428a473e479479a7db2c391e44515294519b24cdd3bda33d82c9081919d3e
-EBUILD fortune-mod-osfortune-1.ebuild 696 BLAKE2B 797dee9fb785f324d795247df649218070acd5235458f62568f33838e2d45b83dcc58ec65db86180eb740fbeb1411a56ee6da36f4771f0fc7dd24bd86001096d SHA512 c8da3ebcac5f4e90d912dbe218f9b3f99ff360253aa6ae3f4f9fedca9840bf6af1b64136a975c4802402504bd1fbdc6169dbf22e884ec200764f18e6d40bd390
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-osfortune/files/spelling.patch b/games-misc/fortune-mod-osfortune/files/spelling.patch
deleted file mode 100644
index 2871ec2c00e3..000000000000
--- a/games-misc/fortune-mod-osfortune/files/spelling.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- osfortune.orig	2004-08-18 07:40:54.000000000 -0400
-+++ osfortune	2004-08-19 07:14:41.008409016 -0400
-@@ -15,7 +15,7 @@
- 
-   -- Bruce Perens, on the future of Open Source software. (Open Sources, 1999 O'Reilly and Associates)
- %
--"The reason for the success of this somewhat communist-sounding strategy, while the failure of communism itself is visible around the world, is that the economics of information are fundamentaly different from those of other products."
-+"The reason for the success of this somewhat communist-sounding strategy, while the failure of communism itself is visible around the world, is that the economics of information are fundamentally different from those of other products."
- 
-   -- Bruce Perens, on Open Source software. (Open Sources, 1999 O'Reilly and Associates)
- %
-@@ -29,7 +29,7 @@
- %
- "I'm not saying that they were knowingly dishonest, perhaps they were simply stupid. "
- 
--  -- Linus Torvalds, commenting on those who really thought Microkernels were wise. (Open Sources, 1999 O'Reilly and Associates)
-+  -- Linus Torvalds, commenting on those who really thought microkernels were wise. (Open Sources, 1999 O'Reilly and Associates)
- %
- "The idea of abstracting away the one thing that must be blindingly fast, the kernel, is inherently counter productive." 
- 
-@@ -37,11 +37,11 @@
- %
- "So right now the only vendor that does such a stupid thing is Microsoft."
- 
--  -- Linus Torvalds on bad file system interface design. (Open Sources , 1999 O'Reilly and Associates.)
-+  -- Linus Torvalds on bad file system interface design. (Open Sources, 1999 O'Reilly and Associates)
- %
- "Eric also holds a black belt in Tae Kwon Do and shoots pistols for relaxation,  His favorite gun is the classic 1911-pattern .45 semiautomatic"
- 
--  -- Chris DiBona on neo-renassaince Homo Heileinias Eric S. Raymond. (Open Sources, 1999 O'Reilly and Associates)
-+  -- Chris DiBona on neo-renaissance Homo Heileinias Eric S. Raymond. (Open Sources, 1999 O'Reilly and Associates)
- %
- "The world is beating a path to our door"
- 
-@@ -59,19 +59,19 @@
- 
-   -- Chris DiBona from the introduction. (Open Sources, 1999 O'Reilly and Associates)
- %
--"The funny thing is if you actually read those papers, you find that, while the researchers were applying thier optomizational tricks on a microkernel, in fact those same tricks could be applied to traditional kernels to accelerate thier execution."
-+"The funny thing is if you actually read those papers, you find that, while the researchers were applying their optimizational tricks on a microkernel, in fact those same tricks could be applied to traditional kernels to accelerate their execution."
- 
-   -- Linus Torvalds on Microkernels (Open Sources, 1999 O'Reilly and Associates)
- %
--"Computers and autmation have become so ingrained and essentaial to day-to-day business that a sensible business should not rely on a single vendor to provide essential services........Thus is is always in a customers' interests to demand that the software they deploy be based on non-proprietary platforms."
-+"Computers and automation have become so ingrained and essential to day-to-day business that a sensible business should not rely on a single vendor to provide essential services...Thus it is always in customers' interests to demand that the software they deploy be based on non-proprietary platforms."
- 
-   -- Brian Behlendorf on OSS (Open Sources, 1999 O'Reilly and Associates)
- %
--"Nature abhors a Vacuum"
-+"Nature abhors a vacuum"
- 
-   -- Brian Behlendorf on OSS (Open Sources, 1999 O'Reilly and Associates)
- %
--"While not obviously a business-friendly licensem there are certain aspects of the GNU license which are attractive, believe it or not, for commercial purposes."
-+"While not obviously a business-friendly license, there are certain aspects of the GNU license which are attractive, believe it or not, for commercial purposes."
- 
-   -- Brian Behlendorf on OSS (Open Sources, 1999 O'Reilly and Associates)
- %
-@@ -83,19 +83,19 @@
- 
-   -- Scott Bradner (Open Sources, 1999 O'Reilly and Associates)
- %
--"The basic publication series for te IETF is the RFC series. RPF once stood for 'Request for Comments,' but since documents published as RFCs have generally gone through an extensive review process before publication, RFC is now best known understood to mean 'RFC' "
-+"The basic publication series for the IETF is the RFC series. RFC once stood for 'Request for Comments,' but since documents published as RFCs have generally gone through an extensive review process before publication, RFC is now best known understood to mean 'RFC' "
-  
-   -- Scott Bradner (Open Sources, 1999 O'Reilly and Associates)
- %
--"The IETF motto is 'rouch consesus and running code'"
-+"The IETF motto is 'rough consensus and running code'"
-   
-   -- Scott Bradner (Open Sources, 1999 O'Reilly and Associates)
- %
--"Open Standars, Open Documents, and Open Source"
-+"Open Standards, Open Documents, and Open Source"
- 
-   -- Scott Bradner (Open Sources, 1999 O'Reilly and Associates)
- %
--"So here's a picture of reality: (picture of circle with lots of sqiggles in it) As we all know, reality is a mess."
-+"So here's a picture of reality: (picture of circle with lots of squiggles in it) As we all know, reality is a mess."
- 
-   -- Larry Wall (Open Sources, 1999 O'Reilly and Associates)
- %
-@@ -119,7 +119,7 @@
- 
-   -- Larry Wall (Open Sources, 1999 O'Reilly and Associates)
- %
--"Of course, in Perl culture, almost nothis is prohibited. My feeling is that the rest of the world already has plenty of perfectly good prohibitions, so why invent more?"
-+"Of course, in Perl culture, almost nothing is prohibited. My feeling is that the rest of the world already has plenty of perfectly good prohibitions, so why invent more?"
- 
-   -- Larry Wall (Open Sources, 1999 O'Reilly and Associates)
- %
-@@ -129,7 +129,7 @@
- 
-   -- Larry Wall (Open Sources, 1999 O'Reilly and Associates)
- %
--"In a way they were right the basics of operating systems, and by extension the Linux kernel, were well understood by the early 70s; anything after that has been to some degree an exercise in self-gratification."
-+"In a way they were right - the basics of operating systems, and by extension the Linux kernel, were well understood by the early 70s; anything after that has been to some degree an exercise in self-gratification."
- 
-   -- Linus Torvalds (Open Sources, 1999 O'Reilly and Associates)
- %
diff --git a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild b/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
deleted file mode 100644
index 8581471bc8af..000000000000
--- a/games-misc/fortune-mod-osfortune/fortune-mod-osfortune-1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="Open sources fortune file"
-HOMEPAGE="http://www.dibona.com/opensources/index.shtml"
-SRC_URI="http://www.dibona.com/opensources/osfortune.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/spelling.patch
-	strfile osfortune || die
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins osfortune osfortune.dat
-}
diff --git a/games-misc/fortune-mod-osfortune/metadata.xml b/games-misc/fortune-mod-osfortune/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-osfortune/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-powerpuff-0.3 b/games-misc/fortune-mod-powerpuff-0.3
new file mode 100644
index 000000000000..eb351022ecca
--- /dev/null
+++ b/games-misc/fortune-mod-powerpuff-0.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes taken from the Power Puff Girls series from Cartoon Network
+EAPI=5
+HOMEPAGE=http://eol.init1.nl/content/view/43/54/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://eelco.is.a.rootboy.net/fortunecookies/powerpuff-0.3.tar.gz
+_md5_=9a96b0bba394e9ca1f16589b24d16c9a
diff --git a/games-misc/fortune-mod-powerpuff/Manifest b/games-misc/fortune-mod-powerpuff/Manifest
deleted file mode 100644
index e834528d57dd..000000000000
--- a/games-misc/fortune-mod-powerpuff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST powerpuff-0.3.tar.gz 17155 BLAKE2B 59a08ab1b3ee4089683ef4a4bdb0ceaee7213d58bfda59ef493d8f27ade3fae8c73f36c05ebc539ab4ec81821734739e7b7c5707a1f3744c0514c46aaab50378 SHA512 89cf14ce07217bcff57fe5eff5b13b6df53b76ff866887032730610ac23184b4bc7d9f00572f31581347ed3827f3906b5dd885324d0e8066a5e0c8a098e53ebd
-EBUILD fortune-mod-powerpuff-0.3.ebuild 661 BLAKE2B 312e2633cf032874d0d22c0016f6ab69f0108d449e879b1050aae19c4e731fe37d4871b3a64eff810915268f3c1e4e786b2480632eb9e3fc7471b91c9c76b946 SHA512 ffdc91ac9e7863c972b3051cc7daee39982a2e4b385e5e60e964b91be71cbcc584114aed41c9a8a261b42683bbf3064e1de8a58aeec8d0d003f40755efe82574
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild b/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
deleted file mode 100644
index 83680b342344..000000000000
--- a/games-misc/fortune-mod-powerpuff/fortune-mod-powerpuff-0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN=powerpuff
-DESCRIPTION="Quotes taken from the Power Puff Girls series from Cartoon Network"
-HOMEPAGE="http://eol.init1.nl/content/view/43/54/"
-SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins powerpuff powerpuff.dat
-}
diff --git a/games-misc/fortune-mod-powerpuff/metadata.xml b/games-misc/fortune-mod-powerpuff/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-powerpuff/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-pqf-6.0 b/games-misc/fortune-mod-pqf-6.0
new file mode 100644
index 000000000000..28edefee7b0b
--- /dev/null
+++ b/games-misc/fortune-mod-pqf-6.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=games-misc/fortune-mod
+DESCRIPTION=Fortune database of Terry Pratchett's Discworld related quotes
+EAPI=5
+HOMEPAGE=http://www.lspace.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.ie.lspace.org/ftp-lspace/words/pqf/pqf-6.0
+_md5_=ba545c05dc1f0789b839c27bd1276f97
diff --git a/games-misc/fortune-mod-pqf/Manifest b/games-misc/fortune-mod-pqf/Manifest
deleted file mode 100644
index 51ecf2f12c22..000000000000
--- a/games-misc/fortune-mod-pqf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pqf-6.0 146363 BLAKE2B 61122f9710f010eb709064bba259d009dd5ee8f8e182827dbd08b93f0c284d0ca6d77c295df9380ae8046830eb014e502ff6fc8c6cb5bb22009ef0e749cd3839 SHA512 c38be09c945c20454cd0ca4d1a4dce18b40bae1ed2c71d093c7d9e4fb2de444425d50a35c7dad5535ed38b5ea52c6c9e8f6035221c08e0485145fc169cb9186e
-EBUILD fortune-mod-pqf-6.0.ebuild 764 BLAKE2B 10f90df2b8a04984819cd5e3623307a6ab75b9208d119dedafe04637d3ce23d046fc380ca8d92f0e87056bf8efed0eb8fb8370da93e2aba9b75f7c0e7098700b SHA512 e39f6520b7766fcf335761f24d04f49a121f35ab6db17927b4b6cfdf584192e7b26351dc34fa0ea482587e243899bf6fc572f8cb2891e5051906aa418ebac4dd
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild b/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
deleted file mode 100644
index 6784e068849c..000000000000
--- a/games-misc/fortune-mod-pqf/fortune-mod-pqf-6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Fortune database of Terry Pratchett's Discworld related quotes"
-HOMEPAGE="http://www.lspace.org/"
-SRC_URI="http://www.ie.lspace.org/ftp-lspace/words/pqf/pqf-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="games-misc/fortune-mod"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_prepare() {
-	cp "${DISTDIR}"/${A} "${S}"/pqf-${PV}
-}
-
-src_compile() {
-	uniq "pqf-${PV}" | sed 's/^$/\%/g' > pqf
-	echo "%" >> pqf
-	strfile -r pqf || die
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins pqf pqf.dat
-}
diff --git a/games-misc/fortune-mod-pqf/metadata.xml b/games-misc/fortune-mod-pqf/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-pqf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-rss-20030120 b/games-misc/fortune-mod-rss-20030120
new file mode 100644
index 000000000000..7aa4838d7072
--- /dev/null
+++ b/games-misc/fortune-mod-rss-20030120
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Fortune database of Robin S. Socha quotes
+EAPI=5
+HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-rss-20030120.tar.gz
+_md5_=5576afa58a56e18bb071979ccd5610db
diff --git a/games-misc/fortune-mod-rss/Manifest b/games-misc/fortune-mod-rss/Manifest
deleted file mode 100644
index 4910cfdcf0d4..000000000000
--- a/games-misc/fortune-mod-rss/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-rss-20030120.tar.gz 27294 BLAKE2B 2738ed6a001e2a66b12e72789cff8ad1de114d93567ec5af03cbe4d5eb1fca74236c2c64b1eff35c02188844ffd965b8704e69035d9500e3f8276840ed04027f SHA512 65e3c6afe338bab19fece7111d37eb32270a374b0e62babecb4954bb7209054a6f18886ae67f502f29d148d2ce5a60d3ef401233d91caf765a0ade0d3f5478b4
-EBUILD fortune-mod-rss-20030120.ebuild 561 BLAKE2B 60808d0d3fb58687c647c5ebcf583a14ac12824d3c9a32bde101b7c133aff37d4e43df3e6a7d15ce6ea7e5b09b870f4d2bee1b1991bc06a0f945e91835b1c783 SHA512 088eb9d9662183efe15de42160f5d387481f50d585acbd948b26b881ad48232e68fa872f95d2cf0fe052c6c4013a47371748ca2329ab9c552b40b2d4590f2605
-MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild b/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
deleted file mode 100644
index 0385a3bb3d0d..000000000000
--- a/games-misc/fortune-mod-rss/fortune-mod-rss-20030120.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Fortune database of Robin S. Socha quotes"
-HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fortune-mod-fvl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	insinto /usr/share/fortune
-	doins rss rss.dat
-}
diff --git a/games-misc/fortune-mod-rss/metadata.xml b/games-misc/fortune-mod-rss/metadata.xml
deleted file mode 100644
index f0c5667bf97e..000000000000
--- a/games-misc/fortune-mod-rss/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-scriptures-1.1.0 b/games-misc/fortune-mod-scriptures-1.1.0
new file mode 100644
index 000000000000..d738c78d0e69
--- /dev/null
+++ b/games-misc/fortune-mod-scriptures-1.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Fortune modules from the King James Bible scriptures
+EAPI=5
+HOMEPAGE=http://scriptures.nephi.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://sourceforge/mormon/fortune-mod-scriptures-1.1.0.tar.bz2
+_md5_=0b87bd06c2e9d43dd7ca99c515f39617
diff --git a/games-misc/fortune-mod-scriptures/Manifest b/games-misc/fortune-mod-scriptures/Manifest
deleted file mode 100644
index c599d5bd9166..000000000000
--- a/games-misc/fortune-mod-scriptures/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-scriptures-1.1.0.tar.bz2 2621853 BLAKE2B ac1ff1f4e5fea8e46d065a421c11303bc640fc01d4712c26b47655360a1e816fb451ee8447b6875f384afcafb76ff0ab0978769a7cda205ab66c58a67439d504 SHA512 dc9c98c3f7924c9a1775955a8d1f972035cea27a7505bf51aac9c1ffa323e1447287ec50472f3caca16f31f1a2d2cdc1a17b5b311eb8e5a9746124b19a1d4c67
-EBUILD fortune-mod-scriptures-1.1.0.ebuild 568 BLAKE2B e8045705da107941f61054706aebf232c78ba5848068bd77e1eaa88b3d54ef8a36205eff3cefe6a1a756b46d612bb9a4c8d001eb65b451ab88ec73279c67552a SHA512 cbd7e35302acb9924c880445968cc72f9cac0a9f483cd8eb885bb423c4e2cea9383f2d14244d52415c96b8c07bc04671478ddbd457084f672e22fe0a615666e3
-MISC metadata.xml 434 BLAKE2B 0585865a2419c0913cfac7f40e0f233e289b436f3dd2943c477547dd66f7f777a5302abc144aef28935cd6f9b6c6e3c6209f3d124cbedf1830a11fbed20611b7 SHA512 4ac23fd0a13784c1c142bad8d7d0d32ddd8923bde4925fe1154d1622e667ed57f36dade59d3efce4a58d5db3ef17d1aa6cafbf151e840b9aef6ec22dd64c6a21
diff --git a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild b/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
deleted file mode 100644
index 91b61e840cd7..000000000000
--- a/games-misc/fortune-mod-scriptures/fortune-mod-scriptures-1.1.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Fortune modules from the King James Bible scriptures"
-HOMEPAGE="http://scriptures.nephi.org/"
-SRC_URI="mirror://sourceforge/mormon/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	dodoc README ChangeLog
-	insinto /usr/share/fortune
-	doins mods/*
-}
diff --git a/games-misc/fortune-mod-scriptures/metadata.xml b/games-misc/fortune-mod-scriptures/metadata.xml
deleted file mode 100644
index 804de50b9c56..000000000000
--- a/games-misc/fortune-mod-scriptures/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>theology@gentoo.org</email>
-		<name>Theology</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mormon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-simpsons-chalkboard-0.1 b/games-misc/fortune-mod-simpsons-chalkboard-0.1
new file mode 100644
index 000000000000..2fc499b6de40
--- /dev/null
+++ b/games-misc/fortune-mod-simpsons-chalkboard-0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Bart Simpson's Chalkboard, shown at the opening of Simpsons episode
+EAPI=5
+HOMEPAGE=http://www.splitbrain.org/projects/fortunes/simpsons
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.splitbrain.org/_media/projects/fortunes/fortune-simpsons-chalkboard.tgz
+_md5_=a05c1e64e0c849287773f40901d95c3c
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/Manifest b/games-misc/fortune-mod-simpsons-chalkboard/Manifest
deleted file mode 100644
index 12b7f77da036..000000000000
--- a/games-misc/fortune-mod-simpsons-chalkboard/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-simpsons-chalkboard.tgz 5803 BLAKE2B d2b659439b650f7d697ce3d1c9ba230bd0f3ccd2e66193fa09c92fd3d914cee71adae0e850771ddbfff1f99dc4eeeb4db7a6328c47bb9337d35f26e8c919e2d1 SHA512 0ce3e8fea577f018d933c64aa3aaeac859ebbb9d0faba28f6c1f5f330781109ad43f4e317281d75b95f87cdb6476e6393219eff5f7ee5201219ff7e007452255
-EBUILD fortune-mod-simpsons-chalkboard-0.1.ebuild 699 BLAKE2B 4d953f034459bdd6ef09119b43bc53e8170ff9069a69e59ac647fc376d091a230f69da826d6ca5f37c7a8f041b6a36aaf0deccb84f4162f85e231ee11a6d4fd8 SHA512 6b81406bd314fb9578431a7fbbb08db6da86680866099af49f5b0aac5d10d7fa5bcce4190fb8a08f3a6e3d078ee431b81799485c70fe62aa73fb51f8f22d3b55
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild b/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
deleted file mode 100644
index 4caa36ce0144..000000000000
--- a/games-misc/fortune-mod-simpsons-chalkboard/fortune-mod-simpsons-chalkboard-0.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${PN/-mod/}
-
-DESCRIPTION="Quotes from Bart Simpson's Chalkboard, shown at the opening of Simpsons episode"
-HOMEPAGE="http://www.splitbrain.org/projects/fortunes/simpsons"
-SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins chalkboard chalkboard.dat
-}
diff --git a/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml b/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-simpsons-chalkboard/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-slackware-1.15 b/games-misc/fortune-mod-slackware-1.15
new file mode 100644
index 000000000000..61e1f658a05a
--- /dev/null
+++ b/games-misc/fortune-mod-slackware-1.15
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=This fortune mod is a collection of quotes seen on AOLS (Slackware)
+EAPI=5
+HOMEPAGE=http://fauxascii.com/linux/mod_quotes.html
+IUSE=offensive
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://fauxascii.com/linux/data/slack-fortunes-all-1.15.tgz
+_md5_=1ca7c358ac9a31d4b0806bae13818a63
diff --git a/games-misc/fortune-mod-slackware/Manifest b/games-misc/fortune-mod-slackware/Manifest
deleted file mode 100644
index 304b05b3a8bc..000000000000
--- a/games-misc/fortune-mod-slackware/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST slack-fortunes-all-1.15.tgz 122880 BLAKE2B 9c77d81f117f72ce9bc7b87db1f59e071274f6e4d9fe62e5e2053faedc347e8d4def852b34d59e5e8a6de68ab2e3a66ed6b70bae64f31224c116eb0e236df8e0 SHA512 18c756b2d81d1e2f0f031c3f799c872b5e73ccd70b6df976644fcd657bd181d794b1a977a49554fe806aa595046c10f33ebea1dc70fccf5e58b8df15f3db7c3e
-EBUILD fortune-mod-slackware-1.15.ebuild 1130 BLAKE2B 4b514b446a29b2cf19e4cf5b8f77b0db9a00545a3e956f6784326261d7669cac1de23c8cc35750c0d9257bd717a56bbb1f27c8fb03f93c8b4296bd88cf0a568e SHA512 b48f967636667420cc6330499af3531996f59372dabafb40df9e3fcbc01c75ca567cd5b83dd52bbaa0d402fab466b585daf56d64c0e95d614039774c795633a6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild b/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
deleted file mode 100644
index 0d4bbd6e9174..000000000000
--- a/games-misc/fortune-mod-slackware/fortune-mod-slackware-1.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# this ebuild now uses the offensive flag since AOLS
-# is not exactly 'G' rated :)
-
-MY_PN=slack-fortunes-all
-DESCRIPTION="This fortune mod is a collection of quotes seen on AOLS (Slackware)"
-HOMEPAGE="http://fauxascii.com/linux/mod_quotes.html"
-SRC_URI="http://fauxascii.com/linux/data/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="offensive"
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if ! use offensive ; then
-		elog "These fortunes have offensive content. Enable offensive USE Flag"
-		elog "ex: USE=\"offensive\" emerge ${PN}"
-		elog " or add to package.use file: games-misc/fortune-mod-slackware offensive"
-		die "Setting the offensive use flag is required for this package"
-	fi
-}
-
-src_prepare() {
-	# get rid of md5 checks and extraneous files and backups
-	rm -f index.* *.md5 *~
-}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins *
-}
diff --git a/games-misc/fortune-mod-slackware/metadata.xml b/games-misc/fortune-mod-slackware/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-slackware/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-smac-0.1 b/games-misc/fortune-mod-smac-0.1
new file mode 100644
index 000000000000..5a8af1a66b07
--- /dev/null
+++ b/games-misc/fortune-mod-smac-0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from the Alpha Centauri: Alien Crossfire tech tree
+EAPI=5
+HOMEPAGE=http://progsoc.org/~curious/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://progsoc.org/~curious/files/fortune-mod-smac-0.1.tar.gz
+_md5_=e68736dcd45f377b588edfb9d26d1605
diff --git a/games-misc/fortune-mod-smac/Manifest b/games-misc/fortune-mod-smac/Manifest
deleted file mode 100644
index 419d28a2b2df..000000000000
--- a/games-misc/fortune-mod-smac/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-smac-0.1.tar.gz 22205 BLAKE2B 383cd7bd752295ab26f8b49d9ac8e35b3bb4b317cdf9b36493adf867de66bf33e5b4c4727af53f8bc4997b445668430154390bb912c42329a5b6fa68e43a392a SHA512 cd837bc96e02f46b310ca264439e6e3753975e0613f05b41faf95fc2d9067f42b62a5af448586befd22e0b1c5e30754a4ae4bd34569c9bda434311ce82ac6697
-EBUILD fortune-mod-smac-0.1.ebuild 567 BLAKE2B b786ebf22f5c1d40fb94242f9ec51b82a7299510ab206840b460bff538f47be58ced94121319ac098612b667d72d43e858436de2003bb0b85aab15304136944f SHA512 f9155e7ea4c571073af1be785fc33554469f3392eec1550a007212f356b23c6da84096c65a51841b4ae4fc5a7a2ef981008e8c0d5f06eed6021a1c1bffc0612a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild b/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
deleted file mode 100644
index daaaae3a3b7f..000000000000
--- a/games-misc/fortune-mod-smac/fortune-mod-smac-0.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from the Alpha Centauri: Alien Crossfire tech tree"
-HOMEPAGE="http://progsoc.org/~curious/"
-SRC_URI="http://progsoc.org/~curious/files/${P}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-src_install() {
-	insinto /usr/share/fortune
-	doins smac smac.dat
-}
diff --git a/games-misc/fortune-mod-smac/metadata.xml b/games-misc/fortune-mod-smac/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-smac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-sp-fortunes-0.2 b/games-misc/fortune-mod-sp-fortunes-0.2
new file mode 100644
index 000000000000..e77e56a18909
--- /dev/null
+++ b/games-misc/fortune-mod-sp-fortunes-0.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=South Park Fortunes
+EAPI=5
+HOMEPAGE=http://eol.init1.nl/content/view/44/54/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://eelco.is.a.rootboy.net/fortunecookies/SP-0.2.tar.gz
+_md5_=b06d522430f15383e8cf7308081828ac
diff --git a/games-misc/fortune-mod-sp-fortunes/Manifest b/games-misc/fortune-mod-sp-fortunes/Manifest
deleted file mode 100644
index 7f035545fa7b..000000000000
--- a/games-misc/fortune-mod-sp-fortunes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SP-0.2.tar.gz 11093 BLAKE2B d54196a7e567a8fd7c5476e4c55f77cab46325e4ec524103267677337cfdf94357d75cd9094227f445d2c971b506add8c9eabe5781b73a79c366cef02bb773c0 SHA512 846c469cc46e05a8314c92b609af3d049fe7e90c7b6c5aeb0c43c1ee12b8c8a3eab22be4aca3c79f64de53cff3d75152feb268f0e6ea80eaf8028f51827bd1d7
-EBUILD fortune-mod-sp-fortunes-0.2.ebuild 646 BLAKE2B c28342512ac8518f338692ab670d02833fd6300e09b3deec47d86046dd64028c3c681f5273d0b106a9ed6d6d7b9c1c77c0c38bed88dd37b003084aa06e133976 SHA512 27d75d0d1439e2bbfac2097c4189b23d8e0c59579b55bed6ea66bff85f6d5c84cf6167e14dd4c8c3a4bdd4a71f97b4cd2a0e37daa4147a582736c28fc7670e50
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild b/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
deleted file mode 100644
index cfd0effe2e22..000000000000
--- a/games-misc/fortune-mod-sp-fortunes/fortune-mod-sp-fortunes-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=${P/fortune-mod-sp-fortunes/SP}
-MY_PN=${PN/fortune-mod-sp-fortunes/SP}
-DESCRIPTION="South Park Fortunes"
-HOMEPAGE="http://eol.init1.nl/content/view/44/54/"
-SRC_URI="http://eelco.is.a.rootboy.net/fortunecookies/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins SP SP.dat
-}
diff --git a/games-misc/fortune-mod-sp-fortunes/metadata.xml b/games-misc/fortune-mod-sp-fortunes/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-sp-fortunes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-starwars-0.1 b/games-misc/fortune-mod-starwars-0.1
new file mode 100644
index 000000000000..2b1e9be285b7
--- /dev/null
+++ b/games-misc/fortune-mod-starwars-0.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from StarWars, The Empire Strikes Back, and Return of the Jedi
+EAPI=5
+HOMEPAGE=http://www.splitbrain.org/projects/fortunes/starwars
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.splitbrain.org/_media/projects/fortunes/fortune-starwars.tgz
+_md5_=f9d717d225cccbdee8cf632617fbc423
diff --git a/games-misc/fortune-mod-starwars/Manifest b/games-misc/fortune-mod-starwars/Manifest
deleted file mode 100644
index 8d556d9e58da..000000000000
--- a/games-misc/fortune-mod-starwars/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-starwars.tgz 5547 BLAKE2B 3f1800239bef03fc0adba4bbfc8d1f3a82f39c7240114b2aab40e3d411b30fa05d0fc3dffb1779be0e0b045303ebe47f78e545b96a6bb66201baa105c1593c0a SHA512 7c829f367b71a56f442045e63ece9b5bf774447de2535e41d6d43ace4c88a0c6e907546bcdef388110998d069b77c24bde39a97a86c89a2693bb089e65b89627
-EBUILD fortune-mod-starwars-0.1.ebuild 683 BLAKE2B 117a5b05412ecca178bd828e4fbf012bcb093ce00827977de396b48b70181bc3b30a2a04a0a34d47816ff6dc7a4beb7c1a8f5038d59ee48ddede9f8d83a96fb9 SHA512 716a802624bede8afa636c1b5015b93a807e47419651aab4acf58b026b5d3e3ca5e85a6d0d818aff5f845bab2dc50c74cec3268220fcd74ce6ca9c3ca3ad0ea3
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild b/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
deleted file mode 100644
index c0718dca798a..000000000000
--- a/games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=${PN/-mod/}
-DESCRIPTION="Quotes from StarWars, The Empire Strikes Back, and Return of the Jedi"
-HOMEPAGE="http://www.splitbrain.org/projects/fortunes/starwars"
-SRC_URI="http://www.splitbrain.org/_media/projects/fortunes/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins starwars starwars.dat
-}
diff --git a/games-misc/fortune-mod-starwars/metadata.xml b/games-misc/fortune-mod-starwars/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-starwars/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-strangelove-20041203 b/games-misc/fortune-mod-strangelove-20041203
new file mode 100644
index 000000000000..d35743cc79c8
--- /dev/null
+++ b/games-misc/fortune-mod-strangelove-20041203
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Dr. Strangelove
+EAPI=5
+HOMEPAGE=http://seiler.us/wiki/index.php/Strangelove
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=fairuse
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://seiler.us/wiki/images/4/48/Strangelove_20041203.tar.gz
+_md5_=be83ac3bf6f3df8776334506aa8f46be
diff --git a/games-misc/fortune-mod-strangelove/Manifest b/games-misc/fortune-mod-strangelove/Manifest
deleted file mode 100644
index 212ee2bf1c7a..000000000000
--- a/games-misc/fortune-mod-strangelove/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Strangelove_20041203.tar.gz 2103 BLAKE2B 3abc932f46e684a15f53648e8217ccc8f93fc32c9a7af8eaba73609b3189011068334dbf8d76ff8657677b8e1ab2e0f3784c7b24129e391d7db5af0c6e1a70a2 SHA512 c2e561a7556b50c6a281e3dbeb442034e61342ff1ec9d9d3ff9428b86b67d58ed378f9dd9cf7401bac70e5015a2eb2ae06e681fed323f502f6eba7ff648a5d08
-EBUILD fortune-mod-strangelove-20041203.ebuild 613 BLAKE2B 79242e732578803ad04bdb6aeffb42506aa7c11da09b7152ae678775c9521259c65b1e35652b1a164ab442814ad51624954e5c09003724286ca8c182d1c51067 SHA512 39e5ae6e659447177d0d8c497b3ca52b770e26e9802785419b6e8ad7f2605625d3cf80ec3822122c646986306fbdb2308829107263a794792a1c70e2fff5d38e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild b/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
deleted file mode 100644
index 303bf3cc50b5..000000000000
--- a/games-misc/fortune-mod-strangelove/fortune-mod-strangelove-20041203.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Quotes from Dr. Strangelove"
-HOMEPAGE="http://seiler.us/wiki/index.php/Strangelove"
-SRC_URI="http://seiler.us/wiki/images/4/48/Strangelove_${PV}.tar.gz"
-
-LICENSE="fairuse"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${PN/fortune-mod-/}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins strangelove strangelove.dat
-}
diff --git a/games-misc/fortune-mod-strangelove/metadata.xml b/games-misc/fortune-mod-strangelove/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-strangelove/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-tao-1 b/games-misc/fortune-mod-tao-1
new file mode 100644
index 000000000000..cbcdc0172512
--- /dev/null
+++ b/games-misc/fortune-mod-tao-1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=set of fortunes based on the Tao-Teh-Ching
+EAPI=5
+HOMEPAGE=http://fortunes.quotationsbook.com/fortunes/collection/67/TAO
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-1
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://gentoo/fortune-tao.tar.gz
+_md5_=cbca534858d33e0194265552420327e3
diff --git a/games-misc/fortune-mod-tao/Manifest b/games-misc/fortune-mod-tao/Manifest
deleted file mode 100644
index d64e12d4099e..000000000000
--- a/games-misc/fortune-mod-tao/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-tao.tar.gz 15381 BLAKE2B f1ee9c670ad2b849717a2a2c5158dfaf59b94ba7d9d501152b90aef7d63923d2fcaa2c6264d9d4ec8d11cad0d6116042bcb9c60fd4696d97a833a9b5b4a8443b SHA512 ec8d8b679962e9a1af4fb74600d7d7d348efcda0fd9c4f08db881835f8e1665688f77a77b0eb8231274ab5ecc93443f5348976100031d5b0c4b6245f647db0e0
-EBUILD fortune-mod-tao-1.ebuild 608 BLAKE2B 40c85ab417b259f952576fcbe5e1a88c1213827916067022308dab1e00af5aefc58034ff5aa51e88918deb9994845b6e3512dd2832059e05f1679ceeaad3a3fb SHA512 126c620d635b7e9c9af4d5e93afe3a8c30aad2d2f4bb161efdef33fb0aac8704dc48825e6e64be02d290a5be09fe8e558ac3073cc178fa01cbaea3ea4a655d5a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild b/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
deleted file mode 100644
index 1e5df9bb24c6..000000000000
--- a/games-misc/fortune-mod-tao/fortune-mod-tao-1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_PN=${PN/mod-/}
-DESCRIPTION="set of fortunes based on the Tao-Teh-Ching"
-HOMEPAGE="http://fortunes.quotationsbook.com/fortunes/collection/67/TAO"
-SRC_URI="mirror://gentoo/${MY_PN}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_PN}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins tao tao.dat
-}
diff --git a/games-misc/fortune-mod-tao/metadata.xml b/games-misc/fortune-mod-tao/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-tao/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-taow-1.0 b/games-misc/fortune-mod-taow-1.0
new file mode 100644
index 000000000000..dc2c456cddea
--- /dev/null
+++ b/games-misc/fortune-mod-taow-1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=The Art of War Fortune Mod
+EAPI=5
+HOMEPAGE=http://www.de-brauwer.be/wiki/wikka.php?wakka=TheArtOfWar
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://www.de-brauwer.be/wastebasket/fortunes-taow-1.0.tar.gz
+_md5_=56375c988c48db1667381c181a7e3be7
diff --git a/games-misc/fortune-mod-taow/Manifest b/games-misc/fortune-mod-taow/Manifest
deleted file mode 100644
index 6dbfe48fd7dc..000000000000
--- a/games-misc/fortune-mod-taow/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortunes-taow-1.0.tar.gz 67835 BLAKE2B 6cf3fc38931204e4b5c71cd0573c3cb854db1ad8b85318a7cd9a606bac66bcb9ceb8570b930f1cdf246ff63f373170578bebaed2f01bd3c03425dcdc784cc3ec SHA512 da1577b36c121028ba2568e4e5a2da96848d70361a3803e93960b357790026a56fb545f42119d013845f6003ffb9f8421de2a1152b189ef93d3a290474259405
-EBUILD fortune-mod-taow-1.0.ebuild 552 BLAKE2B 98af36133747b5624454d47a3fedebf391e20d49c85688215eaaaf732a53890b3626cddbb506493eda50982344d3d6fc82d2ab18cd9995ce822391627a60cd9d SHA512 06cec28fcaa134de9bd3702baea629b3ca49127db49cc4c61b115e56ff879b701a527a30db6f4ed80d01ae4fba38ca82ded6d2c0a313897bb045edfc217f2fdb
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild b/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
deleted file mode 100644
index f9333894ec3b..000000000000
--- a/games-misc/fortune-mod-taow/fortune-mod-taow-1.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=fortunes-taow-${PV}
-DESCRIPTION="The Art of War Fortune Mod"
-HOMEPAGE="http://www.de-brauwer.be/wiki/wikka.php?wakka=TheArtOfWar"
-SRC_URI="http://www.de-brauwer.be/wastebasket/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins taow taow.dat
-}
diff --git a/games-misc/fortune-mod-taow/metadata.xml b/games-misc/fortune-mod-taow/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-taow/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-thomas-ogrisegg-20030120 b/games-misc/fortune-mod-thomas-ogrisegg-20030120
new file mode 100644
index 000000000000..6231b3933830
--- /dev/null
+++ b/games-misc/fortune-mod-thomas-ogrisegg-20030120
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Quotes from Thomas Ogrisegg
+EAPI=5
+HOMEPAGE=http://fortune-mod-fvl.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=mirror://sourceforge/fortune-mod-fvl/fortune-mod-thomas.ogrisegg-20030120.tar.gz
+_md5_=a5cd99813fbccb01d447c013b6fa769e
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/Manifest b/games-misc/fortune-mod-thomas-ogrisegg/Manifest
deleted file mode 100644
index b5e427dc751b..000000000000
--- a/games-misc/fortune-mod-thomas-ogrisegg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-thomas.ogrisegg-20030120.tar.gz 15662 BLAKE2B 58c2bbc1b7c432fad02b201d277eb5608151756efce4126eb20f62f30397bb74577d3dacafab3c5abfa136a61d2ac1d596fd20daf7dc7117eeabd29259244f82 SHA512 e1888b117074ae44eeb34ba499f03793d33cbcf5c2af20eec4171078485d37c06a3ccbcb80a620ea4a8e564840fe832d310ddaa8bc5a5164c8d2f870db0791b0
-EBUILD fortune-mod-thomas-ogrisegg-20030120.ebuild 635 BLAKE2B e59bf3fca272bbf1d7d8ad988703ddb89a288937a50f248982c07382ba1150dc4317f31b6146c16c19128593f38284cebcf6ae14ece2f5a87fb8844e8d1fb62b SHA512 15486d4352b51f51bb5dad7f152b929f4fe7329670bc2a99f6a71d787ea3a336a330756634030626914005a3164ca96806d7318624a344cf15a80a83a6ec9507
-MISC metadata.xml 338 BLAKE2B a447f8b77fda70cb6cd7c8b1ccc2265317607a851a134dcdd4a1718c338ced40e91935ad337228890f10df94cab00ac484257b585762b735f8463ef8707b6ece SHA512 eafdde3a9e9cc33fd4dba816289aaf3dd0527f139ddc5cf76eddc13736d7f32277ceb23d86762d7ae8167f05942eb985756da89576dd87be69c7642469d2aa3f
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild b/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
deleted file mode 100644
index dfd7b0a14886..000000000000
--- a/games-misc/fortune-mod-thomas-ogrisegg/fortune-mod-thomas-ogrisegg-20030120.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P=fortune-mod-thomas.ogrisegg-${PV}
-DESCRIPTION="Quotes from Thomas Ogrisegg"
-HOMEPAGE="http://fortune-mod-fvl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fortune-mod-fvl/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins thomas.ogrisegg thomas.ogrisegg.dat
-}
diff --git a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml b/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
deleted file mode 100644
index f0c5667bf97e..000000000000
--- a/games-misc/fortune-mod-thomas-ogrisegg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fortune-mod-fvl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-woody-allen-it-0.1 b/games-misc/fortune-mod-woody-allen-it-0.1
new file mode 100644
index 000000000000..77ce35ce6bca
--- /dev/null
+++ b/games-misc/fortune-mod-woody-allen-it-0.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Fortune database for Woody Allen quotes (in Italian)
+EAPI=5
+HOMEPAGE=http://somemixedstuff.blogspot.com/2007/04/set-of-fortunes-of-woody-allen-quotes.html
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://utenti.lycos.it/gutter/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.tgz
+_md5_=d5ca7cfbe17c64640109482c1138c6c2
diff --git a/games-misc/fortune-mod-woody-allen-it/Manifest b/games-misc/fortune-mod-woody-allen-it/Manifest
deleted file mode 100644
index bb333c1a43c5..000000000000
--- a/games-misc/fortune-mod-woody-allen-it/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortune-mod-woody-allen-it-0.1.tgz 14246 BLAKE2B e84797ae8128f9c1b20f9a321dcb9e4de584b765d399f6299ffe6a5facd391a8fdac87fb43109f82680d6873e2223b2f25b36cb8057da972c5ba9479c8b226c0 SHA512 9008be8c09671bc0e7715a18e6816a454d2f1aa6ca88aee6f596690888fb6fde1289629d3d2336df9de5fef04318ab9e86089b131f655e827905b1a1de57d8ea
-EBUILD fortune-mod-woody-allen-it-0.1.ebuild 574 BLAKE2B 83e83d9572be5a87fe1220a2173b7693e5462f9a8fd20e61ae10e107973f680d14ef72fe910b7ba661115fcdb71ec2b19ffd0e5c7561ca2563ae39e07a0fb031 SHA512 691fb75c96d57e58f0198fca672775e72a3d16df5a5788d32e1479651bb00cc5710d714f6eec457324c29208b3f62cb33cf9f7d5c6e3ae8ca1d398cd93a1af05
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild b/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
deleted file mode 100644
index 20a8b6ce27e2..000000000000
--- a/games-misc/fortune-mod-woody-allen-it/fortune-mod-woody-allen-it-0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Fortune database for Woody Allen quotes (in Italian)"
-HOMEPAGE="http://somemixedstuff.blogspot.com/2007/04/set-of-fortunes-of-woody-allen-quotes.html"
-SRC_URI="http://utenti.lycos.it/gutter/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	insinto /usr/share/fortune
-	doins ${PN} ${PN}.dat
-}
diff --git a/games-misc/fortune-mod-woody-allen-it/metadata.xml b/games-misc/fortune-mod-woody-allen-it/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-woody-allen-it/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod-zx-error-1.0 b/games-misc/fortune-mod-zx-error-1.0
new file mode 100644
index 000000000000..5eac909ecc4a
--- /dev/null
+++ b/games-misc/fortune-mod-zx-error-1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Sinclair ZX Spectrum BASIC error Fortunes
+EAPI=5
+HOMEPAGE=http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error.html
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=games-misc/fortune-mod
+SLOT=0
+SRC_URI=http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error/fortunes-zx-error-1.0.tar.gz
+_md5_=65609ba722d8b01ebcff83a610997f72
diff --git a/games-misc/fortune-mod-zx-error/Manifest b/games-misc/fortune-mod-zx-error/Manifest
deleted file mode 100644
index 4ea04b993e24..000000000000
--- a/games-misc/fortune-mod-zx-error/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fortunes-zx-error-1.0.tar.gz 1209 BLAKE2B c8197c765161204fd67e0070aaf0973fbd5d437aa03b1c74383e78119a3ce8f3f16b7fd2dc1192c4c4b28a56125ca5b190a1b727e5c1f0a470172f38fc75f807 SHA512 6412826dfafdcd79eeb2f8100c6e7a7419526af080e98af91243a786b1fc6089ef652eb0d8267eb94564dd932fcd1b5f903a4da76760f23b370e57fbc5c72f9d
-EBUILD fortune-mod-zx-error-1.0.ebuild 728 BLAKE2B 48d416c0cf83c0dbdd2ac9c1030dbda50b3d26465fbd856587133dc524e615d7b8cbb7e732fb8d43f7cf9c0d5450dbd50d8ac72e49ba58fbb9e08fe9f47aaf66 SHA512 d5955579b983c2b8043472d23316e6d2c974c1b780f6a02e398ae970e5def807a2725290d9e462a8037f7f92ddddbda4425a776c08194aeb2408900224a91db8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild b/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
deleted file mode 100644
index c996c5add34a..000000000000
--- a/games-misc/fortune-mod-zx-error/fortune-mod-zx-error-1.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-MY_P="fortunes-zx-error-${PV}"
-DESCRIPTION="Sinclair ZX Spectrum BASIC error Fortunes"
-HOMEPAGE="http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error.html"
-SRC_URI="http://korpus.juls.savba.sk/~garabik/software/fortunes-zx-error/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="games-misc/fortune-mod"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	insinto /usr/share/fortune
-	newins zx/error zx-error
-	newins zx/error.dat zx-error.dat
-	dodoc README
-}
diff --git a/games-misc/fortune-mod-zx-error/metadata.xml b/games-misc/fortune-mod-zx-error/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod-zx-error/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/fortune-mod/Manifest b/games-misc/fortune-mod/Manifest
deleted file mode 100644
index 503792d0e07f..000000000000
--- a/games-misc/fortune-mod/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 01_all_fortune_all-fix.patch 783 BLAKE2B 6624a194f63177a3dd414f7c0612d14343f1663867eee04456d8c7fa6b374c7bd1da48495c5c4e8820aedc93c247357574c7a73b71249970f5bea9feac18ff07 SHA512 52211ad8a5f29bc65314fff58e151a7890f0f5d1d6e613b67e693f0bf4ece09219febdb9291ff006901d48b6c50dab0f5507201d412760ddc5d7857c74e11e86
-AUX fortune-mod-1.99.1-gentoo.patch 2699 BLAKE2B aea72dffd92071d416d8bb239f26f26a59aa2920d5bb25cae36267cd8a12362f6463bf43592c9b5065d218d413bc0d5c5d1ad361f52fd6f8260eef4f447b5204 SHA512 83ad811f73216db89eaea52a1a55b63e6f12f8580fd3e360b7adc6e80066c0d6d79191e6c2fbe3e2b78cf446bdb0500562cd9fe8cf00375af76034861b2ab54c
-DIST fortune-mod-1.99.1.tar.gz 1812089 BLAKE2B a5df4a5a518021073ee95ac7e110ac75b961feb1b4dfcc3a40165ea98859f93e6d002ee4906d3f03a40762503ae475b61399a2bd4144609fa4d9815a1a85fa84 SHA512 4c06ea37532dd59f0251d7c49538bee703852c60a3247aba7c516f4f0d4b8ab15b9d7495d004a6423acd74c4dd7532e3dbe1679d6904ab373b617a3386205cde
-EBUILD fortune-mod-1.99.1-r2.ebuild 1721 BLAKE2B 9b29121f9b0a2c73388fe59bd5c4c2c69ed6bbca62b6c5b3a8c12d96b134057e1c5e2be65dcbddcc52be6e00e1c9ca16e1a3acf392b64fe22eca6732a12b3e72 SHA512 52b572cc853851ec820c8e12c361b187f93e0a68b783111b8cf3fea229afd786b51831ca77491c8aa75905c489ea9c62a0dc927544d875da0d1e9c896a4e4814
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch b/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
deleted file mode 100644
index b4175ac81bfc..000000000000
--- a/games-misc/fortune-mod/files/01_all_fortune_all-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fortune/fortune.c.old	2006-03-11 15:33:14.000000000 +0100
-+++ fortune/fortune.c	2006-03-11 15:43:16.000000000 +0100
-@@ -974,7 +974,7 @@
- 	  if (!ret)
- 	    ret=add_file(percent, fullpathname, NULL, &File_list,
- 			 &File_tail, NULL);
--	  if ( (!ret && fullpathname != locpathname) || strcmp(sp, "all") == 0 )
-+	  if (!ret && strncmp(fullpathname, locpathname, sizeof(fullpathname)))
- 	    ret=add_file(percent, locpathname, NULL, &File_list,
- 		         &File_tail, NULL);
- 	  
-@@ -985,7 +985,8 @@
- 	  }
- 	  if (!ret)
- 	    return FALSE;
--	  
-+	  if (strncmp(fullpathname, locpathname, sizeof(fullpathname)) && strcmp(sp, "all") == 0)
-+	    add_file(percent, locpathname, NULL, &File_list, &File_tail, NULL);
- 	}
- 	else
- 	  if (!add_file(percent, fullpathname, NULL, &File_list,
diff --git a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch b/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
deleted file mode 100644
index d9b27fb350e5..000000000000
--- a/games-misc/fortune-mod/files/fortune-mod-1.99.1-gentoo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- fortune-mod-1.99.1/datfiles/Makefile
-+++ fortune-mod-1.99.1/datfiles/Makefile
-@@ -58,7 +58,7 @@
- 	if [ $(WEB) = 1 ] ; then cd html && $(MAKE) install ; fi
- 	for i in $(COOKIES) ; do \
- 		install -m 0644 $$i $$i.dat $(COOKIEDIR) || exit $? ; \
--		cp -d $$i.u8 $(COOKIEDIR) ; \
-+		cp -P $$i.u8 $(COOKIEDIR) ; \
- 		done
- 
- clean:
---- fortune-mod-1.99.1/datfiles/off/Makefile
-+++ fortune-mod-1.99.1/datfiles/off/Makefile
-@@ -38,7 +38,7 @@
- 	install -m 0755 -d $(OCOOKIEDIR)
- 	for i in $(OCOOKIES) ; \
- 	    do install -m 0644 $$i $$i.dat $(OCOOKIEDIR) || exit $$? ; \
--	    cp -d $$i.u8 $(OCOOKIEDIR) ; \
-+	    cp -P $$i.u8 $(OCOOKIEDIR) ; \
- 	done
- 
- clean:
---- fortune-mod-1.99.1/Makefile
-+++ fortune-mod-1.99.1/Makefile
-@@ -65,8 +65,7 @@
- RECODELIBS=-lrecode
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
--LDFLAGS=-s
-+CFLAGS += $(DEFINES) -fsigned-char
- 
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'
---- fortune-mod-1.99.1/fortune/fortune.c
-+++ fortune-mod-1.99.1/fortune/fortune.c
-@@ -97,7 +97,7 @@
- #endif /* killing warnings */
- 
- #define		PROGRAM_NAME		"fortune-mod"
--#define		PROGRAM_VERSION		"9708"
-+#define		PROGRAM_VERSION		"1.99.1"
- 
- #ifdef HAVE_STDBOOL_H
- #include <stdbool.h>
-@@ -256,6 +256,7 @@
- 
- int add_dir(register FILEDESC *);
- 
-+const char *program_name;
- char *program_version(void)
- {
-     static char buf[BUFSIZ];
-@@ -1675,14 +1675,17 @@
-     char *ctype, *crequest;
-     getargs(ac, av);
- 
-+    program_name = (char *const) av[0];
-     outer = recode_new_outer(true);
-     request = recode_new_request (outer);
- 
-     setlocale(LC_ALL,"");
-     ctype = nl_langinfo(CODESET);
--    if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
--        ctype="ISO-8859-1";
--	
-+    if (!ctype || !*ctype)
-+    	ctype="C"; /* revert to C if no valid envvars! */
-+    else
-+    	if(strcmp(ctype,"ANSI_X3.4-1968") == 0)
-+    		ctype="ISO-8859-1";
-     crequest = malloc(strlen(ctype) + 7 + 1);
-     sprintf(crequest, "UTF-8..%s", ctype);
-     recode_scan_request (request, crequest);
---- fortune-mod-1.99.1/util/rot.c
-+++ fortune-mod-1.99.1/util/rot.c
-@@ -5,10 +5,11 @@
- 
- #include <stdio.h>
- #include <ctype.h>
-+#include <stdlib.h>
- 
- int main(void)
- {
--    char a, b;
-+    short int a, b;
- 
-     while ((a = getchar()) != EOF)
-     {
---- fortune-mod-1.99.1/util/unstr.c
-+++ fortune-mod-1.99.1/util/unstr.c
-@@ -96,6 +96,7 @@
- #include	<string.h>
- #include	<unistd.h>
- 
-+#include	<stdlib.h>
- #ifndef MAXPATHLEN
- #define	MAXPATHLEN	1024
- #endif /* MAXPATHLEN */
diff --git a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild b/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
deleted file mode 100644
index b37cea4d9a5f..000000000000
--- a/games-misc/fortune-mod/fortune-mod-1.99.1-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The notorious fortune program"
-HOMEPAGE="http://www.redellipse.net/code/fortune"
-SRC_URI="http://www.redellipse.net/code/downloads/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa m68k ~mips ppc64 sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="offensive elibc_glibc"
-
-DEPEND="app-text/recode"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/01_all_fortune_all-fix.patch
-
-	sed -i \
-		-e 's:/games::' \
-		-e 's:/fortunes:/fortune:' \
-		-e '/^FORTDIR=/s:=.*:=$(prefix)/usr/bin:' \
-		-e '/^all:/s:$: fortune/fortune.man:' \
-		-e "/^OFFENSIVE=/s:=.*:=`use offensive && echo 1 || echo 0`:" \
-		Makefile || die "sed Makefile failed"
-
-	if ! use elibc_glibc ; then
-		[[ ${CHOST} == *-*bsd* ]] && local reglibs="-lcompat"
-		[[ ${CHOST} == *-darwin* ]] && local reglibs="-lc"
-		has_version "app-text/recode[nls]" && reglibs="${reglibs} -lintl"
-		sed -i \
-			-e "/^REGEXLIBS=/s:=.*:= ${reglibs}:" \
-			Makefile \
-			|| die "sed REGEXLIBS failed"
-	fi
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's:u_int:uint:g' util/strfile.h || die "sed strfile.h failed"
-	fi
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/-DBSD_REGEX/-DPOSIX_REGEX/' Makefile || die "sed Makefile failed"
-	fi
-}
-
-src_compile() {
-	local myrex=
-	[[ ${CHOST} == *-interix* ]] && myrex="REGEXDEFS=-DNO_REGEX"
-	emake prefix="${EPREFIX}" CC="$(tc-getCC)" $myrex
-}
-
-src_install() {
-	emake prefix="${ED}" install
-	dodoc ChangeLog INDEX Notes Offensive README TODO cookie-files
-}
diff --git a/games-misc/fortune-mod/metadata.xml b/games-misc/fortune-mod/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/fortune-mod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/funny-manpages-1.3_rc5-r1 b/games-misc/funny-manpages-1.3_rc5-r1
new file mode 100644
index 000000000000..e95bce674a14
--- /dev/null
+++ b/games-misc/funny-manpages-1.3_rc5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=funny manpages collected from various sources
+EAPI=5
+HOMEPAGE=https://www.debian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86
+LICENSE=freedist
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=mirror://debian/pool/main/f/funny-manpages/funny-manpages_1.3.orig.tar.gz mirror://debian/pool/main/f/funny-manpages/funny-manpages_1.3-5.diff.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ebca50d827ed7de730f97ffe9da4342
diff --git a/games-misc/funny-manpages-2.3 b/games-misc/funny-manpages-2.3
new file mode 100644
index 000000000000..43f068c6bab7
--- /dev/null
+++ b/games-misc/funny-manpages-2.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=funny manpages collected from various sources
+EAPI=6
+HOMEPAGE=https://www.debian.org/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86
+LICENSE=freedist
+RDEPEND=virtual/man
+SLOT=0
+SRC_URI=mirror://debian/pool/main/f/funny-manpages/funny-manpages_2.3.orig.tar.gz
+_md5_=4c1d2e6e98597a92efbb8a9a1c9eb7cb
diff --git a/games-misc/funny-manpages/Manifest b/games-misc/funny-manpages/Manifest
deleted file mode 100644
index f6fc1f64af29..000000000000
--- a/games-misc/funny-manpages/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST funny-manpages_1.3-5.diff.gz 2639 BLAKE2B 2234a963be3292e33fadeb12213b11a6a9b81157f60c505df3e9d097cc99cb90a5b180bc1b64636d423a04d44a67fdd2ea8478ac83ce984f6a799896e2251036 SHA512 69110989da9071321a8d8e9ea4f09bd7635704caeaccbdbf7fb2fb1abd540632f19d63d15de3232fabbc35e76dfe2eefb64ce84b6f4606d8dbe581e15f83d24c
-DIST funny-manpages_1.3.orig.tar.gz 22691 BLAKE2B 2b54879992a3c9254e39b175adb060cbcf0ad65597454659fe66bb694ba5be70e97a3e7356ec79d6cd42cfc64f1b5adffd8328edc200a79987687a1227328bc8 SHA512 83c753540d9a9829017246f4a9de22ba09965fa5b8af8276f55ef141129876ca3e641b367ebc31ca99301f37a56132c07eee1ebc9616c954a2e84387fe62383d
-DIST funny-manpages_2.3.orig.tar.gz 23949 BLAKE2B 27f3dc4f548b6012c6830d303980c6871c0079cd123b706bdda75cdc49c90e66171a096b24ef3ba448f3d8e0c6a48f316b8c2783cfa6cc0087ef755311bb5ac3 SHA512 7920e9a62972f8ea0649b50d0b108936a6e0a5d5b68baccadded4999d0219af3f4685349dd881aded9e762e0d1f00575f382d155db0969f7e51a4a1963f0519e
-EBUILD funny-manpages-1.3_rc5-r1.ebuild 751 BLAKE2B ba210658cde7d2697809b84bad128a02d0306277ec8941032b26576a00e329d22afe1d0824929e101107681b97a324163c4581fd9cd6336433a9acdc21a8c7dd SHA512 fc365f93fa65cf12d2aab9ec903900997a60a1e606be42dcea2e7cf8eb5183a503eb93109210b12db33c87d8b02f682d528212e00b22707ccd61f8b2c11ff953
-EBUILD funny-manpages-2.3.ebuild 842 BLAKE2B 1233759f3d045eb8671e4ccb63231f078d05a9ae6e1fe5de030d41c0c4d264ee126f8d4958a53b8ec4ac176a2b80784c73d4c06828cf2cfe25a13ec7738e6a69 SHA512 d072d567fd05eb42f451b23fb7161f298a78767caaa1c3e08b1e9c14e9292f9b3c93ef499a994b95574a0e4315c27a818d35348f0200a270ff58d05971728272
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild b/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
deleted file mode 100644
index 922db36737b4..000000000000
--- a/games-misc/funny-manpages/funny-manpages-1.3_rc5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-MY_R=${PV:0-1}
-MY_P=${PN}_${PV/_rc?/}
-DESCRIPTION="funny manpages collected from various sources"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/f/funny-manpages/${MY_P}-${MY_R}.diff.gz"
-
-LICENSE="freedist" #465704
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S=${WORKDIR}/${MY_P/_/-}.orig
-
-src_prepare() {
-	epatch ../${MY_P}-${MY_R}.diff
-
-	for f in *.[0-57-9]fun ; do
-		mv ${f} ${f/.?fun/.6fun} || die "renaming ${f} failed"
-	done
-}
-
-src_install() {
-	doman *.6fun
-}
diff --git a/games-misc/funny-manpages/funny-manpages-2.3.ebuild b/games-misc/funny-manpages/funny-manpages-2.3.ebuild
deleted file mode 100644
index 2ab4b79b95e9..000000000000
--- a/games-misc/funny-manpages/funny-manpages-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_R="${PV:0-1}"
-MY_P="${PN}_${PV/_p?/}"
-DESCRIPTION="funny manpages collected from various sources"
-HOMEPAGE="https://www.debian.org/"
-SRC_URI="mirror://debian/pool/main/f/funny-manpages/${MY_P}.orig.tar.gz"
-
-if [[ "${PV}" = *_p* ]] ; then
-	SRC_URI+=" mirror://debian/pool/main/f/funny-manpages/${MY_P}-${MY_R}.diff.gz"
-fi
-
-LICENSE="freedist" #465704
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-S="${WORKDIR}/${PN}/man"
-
-src_prepare() {
-	if [[ "${PV}" = *_p* ]] ; then
-		eapply "${WORKDIR}"/${MY_P}-${MY_R}.diff
-	fi
-
-	eapply_user
-
-	for f in *.[0-57-9]fun ; do
-		mv ${f} ${f/.?fun/.6fun} || die "renaming ${f} failed"
-	done
-}
-
-src_install() {
-	doman *.6fun
-}
diff --git a/games-misc/funny-manpages/metadata.xml b/games-misc/funny-manpages/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/funny-manpages/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/gBhed-0.17-r1 b/games-misc/gBhed-0.17-r1
new file mode 100644
index 000000000000..17e0b29fed94
--- /dev/null
+++ b/games-misc/gBhed-0.17-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=gtk? ( x11-libs/gtk+:2 )
+DESCRIPTION=An Al Bhed translator
+EAPI=6
+HOMEPAGE=http://liquidchile.net/software/gbhed/
+IUSE=gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gtk? ( x11-libs/gtk+:2 )
+SLOT=0
+SRC_URI=http://liquidchile.net/software/gbhed/gBhed-0.17.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_=64932fdc84bb70669875e6a6490047db
diff --git a/games-misc/gBhed/Manifest b/games-misc/gBhed/Manifest
deleted file mode 100644
index de154e81c4af..000000000000
--- a/games-misc/gBhed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gBhed-0.17.tar.gz 460425 BLAKE2B f3f0d7ee11aed7efdf4c69b22c45b1f36f44cdbea7b0c497d16eacf7d43dfcdd65d5351bcd3e4c20eae184cddcbea62c093f5448bb94ce9cc256e4be8192c6b0 SHA512 036dcdef2de70ebc0774e9907c7697d28369d71fdb763e9034efe9ab2385ac482d2f301e7291a1b4787338080943260cd22715067d10d5f8c8d3690db2f0cc27
-EBUILD gBhed-0.17-r1.ebuild 873 BLAKE2B 6fff2444d86587a2dcd4a9b1e28971852cbe19c791e4443afa197a544849b68da4d00adcc889114e18256b5d1f6624124e34ed65c91a2e8b7e57a1b87cbb269f SHA512 83c7f629936e8d067b920e31736162e89c2c62c51fe42b4e5b8d0e529784c4a70c7dd332ee0d074ecdb59f03efbcf8ec46c08437dbe620a3a2d8734f8443351f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/gBhed/gBhed-0.17-r1.ebuild b/games-misc/gBhed/gBhed-0.17-r1.ebuild
deleted file mode 100644
index 4386d6edb2f1..000000000000
--- a/games-misc/gBhed/gBhed-0.17-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="An Al Bhed translator"
-HOMEPAGE="http://liquidchile.net/software/gbhed/"
-SRC_URI="http://liquidchile.net/software/gbhed/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-DEPEND="gtk? ( x11-libs/gtk+:2 )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	default
-
-	sed -i 's/19/32/' src/gui/translation_fork.c || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/usr/share/${PN} \
-		$(use_enable gtk gbhed)
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-	doman doc/abtranslate.1
-
-	if use gtk ; then
-		insinto /usr/share/${PN}/pixmaps
-		doins pixmaps/*.{jpg,png,xpm}
-		newicon pixmaps/gbhed48.png ${PN}.png
-		make_desktop_entry gbhed ${PN}
-		doman doc/gbhed.1
-	fi
-}
diff --git a/games-misc/gBhed/metadata.xml b/games-misc/gBhed/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/gBhed/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/games-envd-0 b/games-misc/games-envd-0
new file mode 100644
index 000000000000..bbddc7efbb4e
--- /dev/null
+++ b/games-misc/games-envd-0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Environment file for gentoo games
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Games
+KEYWORDS=alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+_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_=de62fb34ea1fc00cf396868c629e9301
diff --git a/games-misc/games-envd/Manifest b/games-misc/games-envd/Manifest
deleted file mode 100644
index c3563f83a01e..000000000000
--- a/games-misc/games-envd/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD games-envd-0.ebuild 1319 BLAKE2B 595aacf33f8dae1e8a8ef5618e9227976ecc01921a84d1250be2901ef766ffcd5d38a6b4b411e2a300c0f905e9685eb3890fd52005fd44608619ba4b76925c7f SHA512 9cf66e5252ed3e35e37b747c5bd541f162c5f8a5f45b2afd555e34077156cf87979ea3c268bfeb96ff07e5ecee6711cb796bbe3ff4b8911f3f277d480645b1b5
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-misc/games-envd/games-envd-0.ebuild b/games-misc/games-envd/games-envd-0.ebuild
deleted file mode 100644
index c9b1f79c699f..000000000000
--- a/games-misc/games-envd/games-envd-0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib games
-
-DESCRIPTION="Environment file for gentoo games"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Games"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa m68k ~mips ppc64 s390 sh x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	games_pkg_setup
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		if [[ -e "${EROOT%/}/etc/env.d/${GAMES_ENVD}" ]] ; then
-			einfo "removing ${EROOT%/}/etc/env.d/${GAMES_ENVD}"
-			rm "${EROOT%/}/etc/env.d/${GAMES_ENVD}" || die
-		fi
-	fi
-}
-
-src_prepare() {
-	local d libdirs
-
-	for d in $(get_all_libdirs) ; do
-		libdirs="${libdirs}:${GAMES_PREFIX}/${d}"
-	done
-
-	cat <<-EOF > ${GAMES_ENVD} || die
-	# if you don't want these added for non-games users
-	# see https://bugs.gentoo.org/show_bug.cgi?id=408615
-	LDPATH="${libdirs:1}"
-	PATH="${GAMES_BINDIR}"
-	EOF
-}
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	doenvd ${GAMES_ENVD}
-	gamesowners "${ED%/}"/etc/env.d/${GAMES_ENVD}
-	gamesperms "${ED%/}"/etc/env.d/${GAMES_ENVD}
-}
-
-pkg_preinst() { :; }
-
-pkg_postinst() { :; }
diff --git a/games-misc/games-envd/metadata.xml b/games-misc/games-envd/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-misc/games-envd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-misc/gtklife-5.1-r1 b/games-misc/gtklife-5.1-r1
new file mode 100644
index 000000000000..dca0dd3298b0
--- /dev/null
+++ b/games-misc/gtklife-5.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
+DESCRIPTION=A Conway's Life simulator for Unix
+EAPI=6
+HOMEPAGE=http://ironphoenix.org/tril/gtklife/
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=http://ironphoenix.org/tril/gtklife/gtklife-5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9a010d0d4962e3353c8f88f527a14b1f
diff --git a/games-misc/gtklife/Manifest b/games-misc/gtklife/Manifest
deleted file mode 100644
index 2c76d527d6e8..000000000000
--- a/games-misc/gtklife/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gtklife-5.1-link.patch 578 BLAKE2B 27c3ca447d6c46551c1d3966921f88ca3f0b89a5371cfa07cf875805439de3fc0604de048c8c54a1020e80ff1e8949bcaa9bf45a550e5617c00f3840902c3f99 SHA512 2bcfff0164f13dd236edd3d2b88c37aebd79bf6344b7f0108a51b652cf291ea67d9ef4a4b0ccb11bd97a867617b4fb45b0b4668e8014e5c53ebcb345e1937a97
-DIST gtklife-5.1.tar.gz 809542 BLAKE2B 379f2f69c9fdc55dbc48d62b7659dacf9070c561a6765e9f3b6656e11542d94e2b4214708fd92aae4a560cd5a8d93d5c3cc4f119c7fb95dd561b487090897f19 SHA512 b80a2f0fc41583c2905e84e00baf689870c22262a55af25dfc2fe9e914d214f9c01b6800125e68516b63067005d25338ee7edf0c63ee37327479411693840025
-EBUILD gtklife-5.1-r1.ebuild 781 BLAKE2B 55a5f362fa7b2b6fc386018df9475f5cff04d311c9bfd182437bcc71fb168f48a32ee67c4b68bf17424c07dd72002cda38e0aa13d05b2dc603df78d25e60af99 SHA512 30087cc2ca2b2133a52bbfa0592df47a16ceebdeb6380720f6c50c33209648515c441dba70cc6c22f850affff4f3a06fb7857425c360c0e600d664e41a7862b4
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/gtklife/files/gtklife-5.1-link.patch b/games-misc/gtklife/files/gtklife-5.1-link.patch
deleted file mode 100644
index 0971a5d73cc8..000000000000
--- a/games-misc/gtklife/files/gtklife-5.1-link.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/Makefile.in	2014-07-24 21:25:09.072431615 +0200
-+++ b/Makefile.in	2014-07-24 21:26:34.898037740 +0200
-@@ -22,7 +22,7 @@
- # Preprocessor and linking flags
- 
- CPPFLAGS:=$(CPPFLAGS) $(GTK_CFLAGS) -DVERSION=\"$(VERSION)\" -DDATADIR=\"$(pkgdatadir)\" -DDOCDIR=\"$(docdir)\"
--LDFLAGS:=$(LDFLAGS) $(GTK_LIBS)
-+LDLIBS:=$(GTK_LIBS) -lX11
- 
- # Object files
- 
-@@ -51,7 +51,7 @@
- 	$(INSTALL_DATA) doc/* $(docdir)
- 
- gtklife: $(OBJS)
--	$(CC) -o gtklife $(OBJS) $(LDFLAGS)
-+	$(CC) -o gtklife $(OBJS) $(LDFLAGS) $(LDLIBS)
- 
- create_lookup: $(CL_OBJS)
- 	$(CC) -o create_lookup $(CL_OBJS)
diff --git a/games-misc/gtklife/gtklife-5.1-r1.ebuild b/games-misc/gtklife/gtklife-5.1-r1.ebuild
deleted file mode 100644
index bca795466a9a..000000000000
--- a/games-misc/gtklife/gtklife-5.1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A Conway's Life simulator for Unix"
-HOMEPAGE="http://ironphoenix.org/tril/gtklife/"
-SRC_URI="http://ironphoenix.org/tril/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-link.patch
-)
-
-src_configure() {
-	econf \
-		--with-gtk2 \
-		--with-docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/share/${PN}
-	doins -r graphics patterns
-
-	newicon icon_48x48.png ${PN}.png
-	make_desktop_entry ${PN} GtkLife
-
-	dodoc -r doc/*
-	dodoc AUTHORS README NEWS
-}
diff --git a/games-misc/gtklife/metadata.xml b/games-misc/gtklife/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/gtklife/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/katawa-shoujo-1.3.1-r1 b/games-misc/katawa-shoujo-1.3.1-r1
new file mode 100644
index 000000000000..cf5d2fd6be7f
--- /dev/null
+++ b/games-misc/katawa-shoujo-1.3.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Bishoujo-style visual novel by Four Leaf Studios
+EAPI=6
+HOMEPAGE=https://www.katawa-shoujo.com
+IUSE=doc +system-renpy
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-NC-ND-3.0 !system-renpy? ( MIT PSF-2 LGPL-2.1 || ( FTL GPL-2+ ) IJG libpng ZLIB BZIP2 )
+RDEPEND=system-renpy? ( games-engines/renpy:6.99 )
+REQUIRED_USE=!system-renpy? ( || ( amd64 x86 ) )
+RESTRICT=!system-renpy? ( strip )
+SLOT=0
+SRC_URI=https://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> katawa-shoujo-1.3.1.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.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_=9f0a453709668ea5a59728a8597b92dd
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
deleted file mode 100644
index 800e2e19acd9..000000000000
--- a/games-misc/katawa-shoujo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST katawa-shoujo-1.3.1.tar.bz2 496188604 BLAKE2B a27fbc84ac0594790ad5b77e6c7e49c19c2b4716b1e5e516171b593211f1d5f2ca1bddc3e0ebb92420b7529b4b2fdff7b0732bb61b5aa2acdaf45e33dd713497 SHA512 d5f1b49c60b70b272dd5d62c1d49cb9e3c17e3f77339fc593db2122f1c140005bc23ecb7ad9b0d93c0701c77f9bcfcd5c1c67db1cbe3034a3be42a4309387809
-DIST katawa-shoujo-256.png 59803 BLAKE2B 2acf08b55ae3e776ac260b552fd6a04b17a3246534702fbf39bdfcd49348778c1703d0ad135bca7933a82de3d983b9c19c255ed72006b7ca2c73acc157f6e9cb SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e
-DIST katawa-shoujo-48.png 3621 BLAKE2B 1f9ad61bcbd90218d6b11269e7c93a5b2816eee0640f191027e656978dc968a673a3ff02deee0d960a188c2893dde95a45134a847c58c627e1fd7ff2e5b28da1 SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef
-EBUILD katawa-shoujo-1.3.1-r1.ebuild 2070 BLAKE2B c87f54f99987c01f2e46b0a16fff0a097e35c754eb82cfd5c6bd966e65e24938029b9de694b2214727afe4119f56408db43cd5fcb2d0d1af67cb6617ac5eb772 SHA512 443e69ba7fca1375ae57420dd9b2c0f9579064018e424e83808e0eb75124ff557eebadb29ee9eab6a8f96d60021d3ce8a683b081129e1d1d77cb63b4184f03e7
-MISC metadata.xml 1219 BLAKE2B 6e95455f55b87eef6d4d079ff28a6d29f336db425386a81d9067c02ae9b2bc6be5168be0999cfe6a9572be5d1560eb918db37d5dca4e537746133ff8be3f1574 SHA512 3482903b61840dabd8e30941699c2e1319f7d0a384bded5bead56def041b6592e69a0a3a9210c361c875082362dbe3c6c80356e0e12cbe7ecff3ea4eabc8ea30
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
deleted file mode 100644
index aa8f03ef61cc..000000000000
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="Bishoujo-style visual novel by Four Leaf Studios"
-HOMEPAGE="https://www.katawa-shoujo.com"
-SRC_URI="https://dl.katawa-shoujo.com/gold_1.3.1/%5B4ls%5D_katawa_shoujo_1.3.1-%5Blinux-x86%5D%5B18161880%5D.tar.bz2 -> ${P}.tar.bz2
-	https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png
-	https://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png"
-
-# bundled renpy includes licenses of all libraries
-LICENSE="
-	CC-BY-NC-ND-3.0
-	!system-renpy? ( MIT PSF-2 LGPL-2.1 || ( FTL GPL-2+ ) IJG libpng ZLIB BZIP2 )
-"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc +system-renpy"
-REQUIRED_USE="!system-renpy? ( || ( amd64 x86 ) )"
-
-RDEPEND="system-renpy? ( games-engines/renpy:6.99 )"
-DEPEND=""
-
-# Binaries are built extremely weirdly, resulting in errors like:
-# BFD: Not enough room for program headers, try linking with -N
-#
-# Technically, we could make this unconditional because there are no other
-# binaries, but it's still good practice.
-RESTRICT="!system-renpy? ( strip )"
-
-QA_PREBUILT="/opt/${PN}/lib/*"
-
-S="${WORKDIR}/Katawa Shoujo-${PV}-linux"
-
-src_install() {
-	if use system-renpy; then
-		insinto "/usr/share/${PN}"
-		doins -r game/.
-		make_wrapper ${PN} "renpy '/usr/share/${PN}'"
-	else
-		insinto "/opt/${PN}"
-		doins -r game localizations renpy "Katawa Shoujo."{py,sh}
-
-		local host="${CTARGET:-${CHOST}}"
-		local arch="${host%%-*}"
-
-		cd lib
-		insinto "/opt/${PN}/lib"
-		doins -r linux-${arch} pythonlib2.7
-		cd ..
-
-		fperms +x "/opt/${PN}/lib/linux-${arch}/"{python,"Katawa Shoujo"} \
-			"/opt/${PN}/Katawa Shoujo."{py,sh}
-
-		make_wrapper ${PN} "./Katawa\ Shoujo.sh" "/opt/${PN}"
-	fi
-
-	local i
-	for i in 48 256; do
-		newicon -s ${i} "${DISTDIR}"/${PN}-${i}.png ${PN}.png
-	done
-
-	make_desktop_entry ${PN} "Katawa Shoujo"
-
-	if use doc; then
-		dodoc "Game Manual.pdf"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-misc/katawa-shoujo/metadata.xml b/games-misc/katawa-shoujo/metadata.xml
deleted file mode 100644
index 7e45f8f26dae..000000000000
--- a/games-misc/katawa-shoujo/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="system-renpy">Use <pkg>games-engines/renpy</pkg> instead of the bundled one (experimental)</flag>
-	</use>
-	<longdescription>
-		Katawa Shoujo is a bishoujo-style visual novel set in the fictional
-		Yamaku High School for disabled children, located somewhere in modern
-		Japan. Hisao Nakai, a normal boy living a normal life, has his life
-		turned upside down when a congenital heart defect forces him to move to
-		a new school after a long hospitalization. Despite his difficulties,
-		Hisao is able to find friends—and perhaps love, if he plays his cards
-		right. There are five main paths corresponding to the 5 main female
-		characters, each path following the storyline pertaining to that
-		character.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-misc/little-inferno-20130509 b/games-misc/little-inferno-20130509
new file mode 100644
index 000000000000..d69848e3ad3a
--- /dev/null
+++ b/games-misc/little-inferno-20130509
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Throw your toys into your fire, and play with them as they burn
+EAPI=5
+HOMEPAGE=http://tomorrowcorporation.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Gameplay-Group-EULA
+RDEPEND=>=net-misc/curl-7.37.0-r1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] !bundled-libs? ( >=media-libs/libogg-1.3.1[abi_x86_32(-)] >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)] >=media-libs/openal-1.15.1-r1[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=bindist fetch bundled-libs? ( splitdebug )
+SLOT=0
+SRC_URI=LittleInferno-20130509.sh
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8c20f1ad3f3b1e373e303234fe70229
diff --git a/games-misc/little-inferno/Manifest b/games-misc/little-inferno/Manifest
deleted file mode 100644
index 7e36af69ab9d..000000000000
--- a/games-misc/little-inferno/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST LittleInferno-20130509.sh 194304242 BLAKE2B 993d387c31cca0a92b7c1cf06581f60dfc31ba001250cfac00036204143350764d5ab023d6cc432e477219ac9cb24223fae21a422ecb501e58f499ae38469aac SHA512 19e2e616b1b1a6e7f8974ba12756c4b54c1daa99c99056891c56f7ed578f20a15143d683960efbb69f3d680243dd219051fc0bdac60ab74dcddc1c69df7d00dd
-EBUILD little-inferno-20130509.ebuild 1604 BLAKE2B 6693c55878933622cdc93be1f6954239cc40b7f9fc809e86e3ce51f2ac288282298a5dee749098ece5fa251b5cb966a2d02e312a51e1eb250bf4c37ceb1d691a SHA512 c9f2bf4c3953d10876b1cb8936e22e4b7614f10979d2955604b14d166af4defb66355f2fd2829f0c3c271678bb4e787cfbf2868805bc1b1f4a82007eba6b0725
-MISC metadata.xml 326 BLAKE2B 20c0a3a6cbb19e457c09b386a837b4202cf279231a681f3da7d604f3bffcfe6761f849ce82bc0169cc498d9bab565ff75216f4b749068e6663f5acbace935f7b SHA512 87eee3f514c290aba519dad7fdb335424ebd7ed7bb1cfa8650d293136ad2a6efdb44eff2c1c48973e9a587f282a2114866d9e4d66adb857b61a085d5635ecfd2
diff --git a/games-misc/little-inferno/little-inferno-20130509.ebuild b/games-misc/little-inferno/little-inferno-20130509.ebuild
deleted file mode 100644
index 8461d5670943..000000000000
--- a/games-misc/little-inferno/little-inferno-20130509.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils unpacker games
-
-DESCRIPTION="Throw your toys into your fire, and play with them as they burn"
-HOMEPAGE="http://tomorrowcorporation.com/"
-SRC_URI="LittleInferno-${PV}.sh"
-
-LICENSE="Gameplay-Group-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/LittleInferno.bin.x86
-	${MYGAMEDIR#/}/lib/*"
-
-RDEPEND="
-	>=net-misc/curl-7.37.0-r1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	!bundled-libs? (
-		>=media-libs/libogg-1.3.1[abi_x86_32(-)]
-		>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)]
-		>=media-libs/openal-1.15.1-r1[abi_x86_32(-)] )"
-DEPEND="app-arch/xz-utils"
-
-src_unpack() {
-	unpack_makeself ${A}
-
-	mkdir ${P} || die
-	cd ${P} || die
-
-	local i
-	for i in instarchive_{,linux_}all ; do
-		mv ../"${i}" ../"${i}".tar.xz || die
-		unpack ./../"${i}".tar.xz
-	done
-}
-
-src_prepare() {
-	if use !bundled-libs ; then
-		rm -rv lib || die
-	fi
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	doicon -s 128 LittleInferno.png
-	make_desktop_entry ${PN} "Little Inferno" LittleInferno
-	games_make_wrapper ${PN} "./LittleInferno.bin.x86" "${MYGAMEDIR}" "${MYGAMEDIR}/lib"
-
-	fperms +x "${MYGAMEDIR}"/LittleInferno.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-misc/little-inferno/metadata.xml b/games-misc/little-inferno/metadata.xml
deleted file mode 100644
index befc8c80e0b1..000000000000
--- a/games-misc/little-inferno/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">Use bundled libraries.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-misc/lolcat-90.8.8 b/games-misc/lolcat-90.8.8
new file mode 100644
index 000000000000..719faa861154
--- /dev/null
+++ b/games-misc/lolcat-90.8.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby23] >=dev-ruby/paint-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby24] >=dev-ruby/paint-2.0.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Rainbows and unicorns!
+EAPI=6
+HOMEPAGE=https://github.com/busyloop/lolcat
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby23] >=dev-ruby/paint-2.0.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/trollop-2.1.2:2[ruby_targets_ruby24] >=dev-ruby/paint-2.0.0[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/lolcat-90.8.8.gem
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=3fe942566cbfc4996f2ac97ee091eb31
diff --git a/games-misc/lolcat/Manifest b/games-misc/lolcat/Manifest
deleted file mode 100644
index 82b765d6b782..000000000000
--- a/games-misc/lolcat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lolcat-90.8.8.gem 56832 BLAKE2B 51bcd05f5bd277ae372b224d3ec8c0a041007ea70dc12261388655a6de8172017d88a1c58f58135181dfbfbc1ec63ab762a28db477618d1e80cf31d328885211 SHA512 2517a2e903c52d16c9773a32fae000917741a0b323abc19cdf4cad68f9ba873f059cda5790819e0d2cb057239dca9ac39a191f9e05417a91ef99f2232e8af3dd
-EBUILD lolcat-90.8.8.ebuild 497 BLAKE2B deab7176034f8797dba1b53999e2bc8dc20fb2d14b785911503aafb1c9fb01be8e3c29a80a5edf38c1a45a1963ebb732e4604f62e40dfadd6043ed52062c7406 SHA512 a602dd47fd778d3800d61f41035dcf73351938e38841f739fb0ec02a884c94b2c902be6c0290b77877dc7a48ab449efa8cc5d919c0201494fc123bf65858ea83
-MISC metadata.xml 333 BLAKE2B 60f1ec9612c78ba00c9aae4a45ac899651cff451a36ffdfbb317dc1260fd405759fb57c1baff5d9c190fbf3633b2042a1b77c400c063517ba1e437c1a89fda5e SHA512 e31a8b91268a15fad0b382f647e6209b8545163818bab90f16ae7aa43ed0edd46b83a3e94828c3657af65269d17321828f375db5f9ca7402cd8bc6bd8186a3ef
diff --git a/games-misc/lolcat/lolcat-90.8.8.ebuild b/games-misc/lolcat/lolcat-90.8.8.ebuild
deleted file mode 100644
index 3e785fac1320..000000000000
--- a/games-misc/lolcat/lolcat-90.8.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_GEMSPEC="lolcat.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rainbows and unicorns!"
-HOMEPAGE="https://github.com/busyloop/lolcat"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-ruby_add_rdepend "
-	>=dev-ruby/trollop-2.1.2:2
-	>=dev-ruby/paint-2.0.0"
diff --git a/games-misc/lolcat/metadata.xml b/games-misc/lolcat/metadata.xml
deleted file mode 100644
index 8e30ace24808..000000000000
--- a/games-misc/lolcat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">busyloop/lolcat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/lucidlife-0.9.2-r1 b/games-misc/lucidlife-0.9.2-r1
new file mode 100644
index 000000000000..848597df78ab
--- /dev/null
+++ b/games-misc/lucidlife-0.9.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-util/intltool sys-devel/gettext 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 Conway's Life simulator written in GTK+2 - fork from Gtklife
+EAPI=6
+HOMEPAGE=http://gtk-apps.org/content/show.php/LucidLife?content=130867
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://gentoo/lucidlife-0.9.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_=ea842951a57fd9353b484e0d68016f6e
diff --git a/games-misc/lucidlife/Manifest b/games-misc/lucidlife/Manifest
deleted file mode 100644
index f6af08908833..000000000000
--- a/games-misc/lucidlife/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX lucidlife-0.9.2-gnome-vfs.patch 1549 BLAKE2B 5960dd039064aaa1d1878b596d847fa939316b6d1b75b68b6060c681a8af65d6a5e4b6cec02fe6e9d72c55b6de488785070ffdb65b15ee63f57dca544edfe5d8 SHA512 57048afec7111940aed0388f17bd4bac9a6e7046d09c07067f0414267a2877cda5d0d04d8ab2a46caea1e6680b7b26a407780c3e77b3d3dc6b2d939364585426
-AUX lucidlife-0.9.2-underlink.patch 317 BLAKE2B 407129ced5f5b9fbe22c6b450c6834fb0f2ce7e59f4d34970826cbbaee1e4b470088995943b8fbc2cf0bd0febcf7f9056e16b178fad4dcd0b7f4901158036134 SHA512 ee33861f9d3f79e1d662ce5ce5c1d1a47aba87b9a45dd04c93ede13ed6d85c0a7365b0f1cca2e7fcf65960985f295ccb12197fcd44679b6196ae1cba11643592
-DIST lucidlife-0.9.2.tar.gz 1506448 BLAKE2B 8e391a60d9cade2c57dece9397f55b945a9b5e182d81f2cceec2e93deea11f50ee250e1b19ecc1a6e88ed437bba98beef4cc098505406d2dce6164de5d07404a SHA512 5184d6a5a2d48b38b2a72edbab6ca4f251547e5c54234792d3821482d39e5fbb2b96ab171544dc3e6843f9976c1dc40935eb3537dcf06c1cb0c717260bd04b01
-EBUILD lucidlife-0.9.2-r1.ebuild 830 BLAKE2B 3642f5d965a9d9da1bb02409e81a3e4d233539e397d88a17316f12dedf2765f5614a662df69239b8a3520918c7806169a5562acc773c5f73ed4e69b2ea358b58 SHA512 692bfa894ff1348544e9204b24c1cfb5be246f76f602bef0b6c827508588d6d05321220b0283d2e9b38c3f71f43e0f3dcc2ddaa3666568cb554ae8456a1240c1
-MISC metadata.xml 345 BLAKE2B 3eae0996b5df53c65b61ec7e2061c3d3d475e61cead9295f94e58c345bcd1b569c3c820bd8452bf94e74363cdd10b6d9c1e5b92eed8951db6d9ad06497215c8e SHA512 2efea20f36611448fa9cfb3f6137f0b78b74c5515c5dbf482e02b47c0cea22fd0e7f6da9d29a31b1a85ba827269cf7a71f5786d3ff487f48850a4c756196bc89
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
deleted file mode 100644
index 49918b62146a..000000000000
--- a/games-misc/lucidlife/files/lucidlife-0.9.2-gnome-vfs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- lucidlife-0.9.2/configure.ac
-+++ lucidlife-0.9.2/configure.ac
-@@ -23,7 +23,7 @@
- AC_SUBST(CFLAGS)
- AC_SUBST(LDFLAGS)
- 
--GNOME_MODULES="[gtk+-2.0 >= 2.6.0 gnome-vfs-2.0 >= 2.0.0]"
-+GNOME_MODULES="[gtk+-2.0 >= 2.6.0]"
- PKG_CHECK_MODULES(GNOME, $GNOME_MODULES)
- AC_SUBST(GNOME_CFLAGS)
- AC_SUBST(GNOME_LIBS)
---- lucidlife-0.9.2/src/lucidlife.c
-+++ lucidlife-0.9.2/src/lucidlife.c
-@@ -35,8 +35,6 @@
- 
- #include <gtk/gtk.h>
- #include <glib.h>
--#include <libgnomevfs/gnome-vfs-init.h>
--#include <libgnomevfs/gnome-vfs-utils.h>
- 
- #include <libintl.h>
- #define _(String) gettext (String)
-@@ -418,7 +416,6 @@
- 	state_from_config();
- 	load_recent_files_list();
- 
--	gnome_vfs_init();
- 	gtk_init(&argc, &argv);
- 	init_gui();
- 
-@@ -445,8 +442,6 @@
- 
- 	main_loop();
- 
--	gnome_vfs_shutdown();
--
- 	return 0;
- }
- 
-@@ -1635,7 +1630,7 @@
- 
- void activate_url(GtkAboutDialog *about, const gchar *url, gpointer data)
- {
--	gnome_vfs_url_show (url);
-+	gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL );
- }
- 
- /*** Bound Function Helpers ***/
-@@ -1859,7 +1856,7 @@
- 	char*  url;
- 
- 	url = dsprintf("file://%s/%s", DOCDIR, filename);
--	gnome_vfs_url_show(url);
-+	gtk_show_uri (NULL, url, GDK_CURRENT_TIME, NULL );
- 	free(url);
- }
- 
---- lucidlife-0.9.2/lucidlife.desktop.in
-+++ lucidlife-0.9.2/lucidlife.desktop.in
-@@ -2,8 +2,7 @@
- Name=LucidLife
- Comment=A user-friendly version of Conway's game of life
- Exec=lucidlife
--Icon=lucidlife.png
-+Icon=lucidlife
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Game;
--Encoding=UTF-8
-+Categories=GNOME;GTK;Game;
diff --git a/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch b/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
deleted file mode 100644
index 77bd7092b812..000000000000
--- a/games-misc/lucidlife/files/lucidlife-0.9.2-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am	2011-06-17 17:31:54.078600741 +0200
-+++ b/src/Makefile.am	2011-06-17 17:32:05.491299944 +0200
-@@ -2,7 +2,7 @@
-            -DDATADIR=\""$(datadir)/lucidlife"\" \
-            -DDOCDIR=\""$(datadir)/doc/lucidlife"\"
- 
--LIBS = $(GNOME_LIBS)
-+LIBS = $(GNOME_LIBS) -lX11
- 
- bin_PROGRAMS = lucidlife
- 
diff --git a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild b/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
deleted file mode 100644
index 33faf6200942..000000000000
--- a/games-misc/lucidlife/lucidlife-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="A Conway's Life simulator written in GTK+2 - fork from Gtklife"
-HOMEPAGE="http://gtk-apps.org/content/show.php/LucidLife?content=130867"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gnome-vfs.patch
-	"${FILESDIR}"/${P}-underlink.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	intltoolize --force --copy --automake || die
-}
-
-src_install() {
-	emake install \
-		desktopdir=/usr/share/applications \
-		pixmapdir=/usr/share/pixmaps \
-		DESTDIR="${D}"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/games-misc/lucidlife/metadata.xml b/games-misc/lucidlife/metadata.xml
deleted file mode 100644
index abfb35545a8e..000000000000
--- a/games-misc/lucidlife/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/metadata.xml b/games-misc/metadata.xml
deleted file mode 100644
index df9216675ec7..000000000000
--- a/games-misc/metadata.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-misc category contains miscellaneous games which do not fit into other games- categories.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-misc enthält verschiedenste Spiele die sich nicht in andere Kategorien einordnen lassen.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-misc contiene juegos que no encajan en ninguna de las otras categorías games-.
-	</longdescription>
-	<longdescription lang="ja">
-		games-miscカテゴリーには他のgame-カテゴリーに分類されない多種多様なゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-misc categorie bevat spellen die niet in een van de andere categorieen ingedeeld konden worden.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-misc chứa các trò chơi linh tinh không thích hợp với các nhóm games- khác.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-misc contiene giochi che non ricadono in altre categorie games-.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-misc contém jogos que não se encaixam em nenhuma das outras categorias games-.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-misc zawiera gry, które nie pasowały do pozostałych kategorii.
-	</longdescription>
-</catmetadata>
diff --git a/games-misc/nyancat-1.5.1 b/games-misc/nyancat-1.5.1
new file mode 100644
index 000000000000..bf934cd7dc92
--- /dev/null
+++ b/games-misc/nyancat-1.5.1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Nyan Cat Telnet Server
+EAPI=6
+HOMEPAGE=https://github.com/klange/nyancat
+KEYWORDS=~amd64 ~x86
+LICENSE=UoI-NCSA
+SLOT=0
+SRC_URI=https://github.com/klange/nyancat/archive/1.5.1.tar.gz -> nyancat-1.5.1.tar.gz
+_md5_=ed2cbe409a52237809d9f4f5d619ace2
diff --git a/games-misc/nyancat/Manifest b/games-misc/nyancat/Manifest
deleted file mode 100644
index ba4afcfd6fa2..000000000000
--- a/games-misc/nyancat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nyancat-1.5.1.tar.gz 15124 BLAKE2B 31786fc61b8988bd89c398a711f4eec299995f80b86eed674b10dd7fe30219ea32fefc2b32d8b952ead9fa83b131f0a41dfcabc0b23e88bd424097f54f6c5dd3 SHA512 0a45bd0b1a9b9f85650a986c7f9f8120441f6b0bd346281fb44a5470382484738e660dffe17b95088332c50b6aed3feb4b2f949f15f37dd9c1b1885f345e157d
-EBUILD nyancat-1.5.1.ebuild 447 BLAKE2B c9b42f266dccddc1a3c798b77a4a3e13f7db5022178db3b591c4658d964bff1104b8a1179f666ccaa6a340476abffe78a7e04c462ded9e8f3cb93428a7188817 SHA512 73ea95222930083ea5c8fd04599e9482883b9e3cd450c17390b5bf3d6fda4ea34cbdaad53d24f7dc64aae22271f1b6e675ea533da4b442dfa138b02f88449df4
-MISC metadata.xml 332 BLAKE2B 92b138477f6822f831a4f027ff627befca39076e0890a8231fd76138ef20fa51bb08a77df26e7d1e8601083bd8ddd8f490f922e98fb0116cfe2381063e8acb5e SHA512 fe9cf0cf1505d199791e8ce6dad5b872952d767ace796962d3d6e61d93482f7d5ec9fe671d52ad24b1ead7c92eed601dc03a921029bea6069b152be74ee730da
diff --git a/games-misc/nyancat/metadata.xml b/games-misc/nyancat/metadata.xml
deleted file mode 100644
index 5168fe7714b8..000000000000
--- a/games-misc/nyancat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">klange/nyancat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/nyancat/nyancat-1.5.1.ebuild b/games-misc/nyancat/nyancat-1.5.1.ebuild
deleted file mode 100644
index 68300e1ed278..000000000000
--- a/games-misc/nyancat/nyancat-1.5.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Nyan Cat Telnet Server"
-HOMEPAGE="https://github.com/klange/nyancat"
-SRC_URI="https://github.com/klange/nyancat/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS} ${CFLAGS}"
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc README.md
-}
diff --git a/games-misc/opengfx-0.5.4-r1 b/games-misc/opengfx-0.5.4-r1
new file mode 100644
index 000000000000..b78034dd8fae
--- /dev/null
+++ b/games-misc/opengfx-0.5.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=games-util/nml-0.4.0 games-util/grfcodec
+DESCRIPTION=OpenGFX data files for OpenTTD
+EAPI=6
+HOMEPAGE=http://bundles.openttdcoop.org/opengfx/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://bundles.openttdcoop.org/opengfx/releases/0.5.4/opengfx-0.5.4-source.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0d1e671fe84b732690540a8efe52e7f4
diff --git a/games-misc/opengfx/Manifest b/games-misc/opengfx/Manifest
deleted file mode 100644
index e1f1b4bfb8c9..000000000000
--- a/games-misc/opengfx/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX opengfx-0.5.4-Makefile.patch 1349 BLAKE2B 25fc35e4d11055ee2d69847f857bd542fbc8bb662d18bf3a03e639517e0a7a8ed9748829d339ce76d8c6457baf2dc51e3d40106f9f959b864629e0db8a01e339 SHA512 f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9
-DIST opengfx-0.5.4-source.tar.xz 9638204 BLAKE2B bff7e5f7f72b62584c280ce2af2ad53df40027a7075ea5858a53f45a71be07db480cf61a603fc8e5df69b8c7d73284bf92e430a3fe130ae34ad1a921d8603925 SHA512 42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1
-EBUILD opengfx-0.5.4-r1.ebuild 841 BLAKE2B 44791a0c997e533d882600c0fdc551b7190f9208d5220a9637872c47215ca98e19a28c8e10892f8ded7701f1c2e710a3ffc694e74917d5d45c987b649a7d00ec SHA512 83f4faf5bf14dd7c7d3ffc11b9666a5dcb976f6abd2634869ad01c31b21f4ba33cf9699f5233dd4d735feb5941de1bd727858bab4ec9548bd56184013c3d9299
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch b/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch
deleted file mode 100644
index 169df96684ce..000000000000
--- a/games-misc/opengfx/files/opengfx-0.5.4-Makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- opengfx-0.5.3-source/Makefile
-+++ opengfx-0.5.3-source/Makefile
-@@ -99,8 +99,8 @@
- AWK            ?= awk
- GREP           ?= grep
- PYTHON         ?= python
--UNIX2DOS       ?= $(shell which unix2dos)
--UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "")
-+UNIX2DOS       ?= $(shell which unix2dos 2>/dev/null)
-+UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "")
- 
- # Graphics processing
- GIMP           ?= gimp
-@@ -196,7 +196,7 @@
- endif
- 
- # Days of commit since 2000-1-1 00-00
--REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days")
-+REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)")
- 
- # Filename addition, if we're not building the default branch
- REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi)
-@@ -719,7 +719,7 @@
- 	$(_E)
- endif
- 	$(_E) "Release:"
--	$(_E) "bananas:     Upload bundle to BaNaNaS
-+	$(_E) "bananas:     Upload bundle to BaNaNaS"
- 	$(_E)
- 	$(_E) "Valid command line variables are:"
- 	$(_E) "Helper programmes:"
diff --git a/games-misc/opengfx/metadata.xml b/games-misc/opengfx/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/opengfx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/opengfx/opengfx-0.5.4-r1.ebuild b/games-misc/opengfx/opengfx-0.5.4-r1.ebuild
deleted file mode 100644
index 72fd656ad797..000000000000
--- a/games-misc/opengfx/opengfx-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="OpenGFX data files for OpenTTD"
-HOMEPAGE="http://bundles.openttdcoop.org/opengfx/"
-SRC_URI="http://bundles.openttdcoop.org/opengfx/releases/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-RESTRICT="test" # nml version affects the checksums that the test uses (bug #451444)
-
-DEPEND=">=games-util/nml-0.4.0
-	games-util/grfcodec"
-RDEPEND=""
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}/${P}-Makefile.patch"
-)
-
-src_compile() {
-	emake GIMP=""  help  # print out the env to make bug reports better
-	emake GIMP="" _V="" bundle_tar
-}
-
-src_install() {
-	insinto "/usr/share/games/openttd/data/"
-	doins *.grf opengfx.obg
-	dodoc docs/{changelog.txt,readme.txt}
-}
diff --git a/games-misc/openmsx-0.3.1-r2 b/games-misc/openmsx-0.3.1-r2
new file mode 100644
index 000000000000..01c700c88892
--- /dev/null
+++ b/games-misc/openmsx-0.3.1-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 )
+DESCRIPTION=An ambiguously named music replacement set for OpenTTD
+EAPI=6
+HOMEPAGE=http://bundles.openttdcoop.org/openmsx/
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://bundles.openttdcoop.org/openmsx/releases/0.3.1/openmsx-0.3.1-source.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7c807d0a865d173b042dd0413493cd29
diff --git a/games-misc/openmsx/Manifest b/games-misc/openmsx/Manifest
deleted file mode 100644
index ecee51fdadac..000000000000
--- a/games-misc/openmsx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openmsx-0.3.1-source.tar.gz 152798 BLAKE2B 8c6d757b708bf5af9312318d13bf99b7326ed3cf82d158c4e639e04eab5c722d76976820a6a8913cef93246225578fcbd598afde11f09cdadc47d626d977d947 SHA512 e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e
-EBUILD openmsx-0.3.1-r2.ebuild 723 BLAKE2B 477661738ea9e2f9c4d86749f2731877816901598594ccbca84f3e10c973c4f17ed8a5725bc26b2645f5cdf460d83307f06cefb0721b20a6b632f4e00814e02c SHA512 aeeb6215c283bac40f92cb013ce58d9a87b6ed995668ded089a8908ef257ea8958748165ce91a6de109c4580205970f259851d43a979240f2f7234570c88750a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/openmsx/metadata.xml b/games-misc/openmsx/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/openmsx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/openmsx/openmsx-0.3.1-r2.ebuild b/games-misc/openmsx/openmsx-0.3.1-r2.ebuild
deleted file mode 100644
index 5d0b5b452449..000000000000
--- a/games-misc/openmsx/openmsx-0.3.1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-DESCRIPTION="An ambiguously named music replacement set for OpenTTD"
-HOMEPAGE="http://bundles.openttdcoop.org/openmsx/"
-SRC_URI="http://bundles.openttdcoop.org/openmsx/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-
-S=${WORKDIR}/${P}-source
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_compile() {
-	emake _V= bundle || die
-}
-
-src_install() {
-	insinto "/usr/share/games/openttd/gm/${P}"
-	doins ${P}/{*.mid,openmsx.obm} || die
-	dodoc ${P}/{changelog.txt,readme.txt} || die
-}
diff --git a/games-misc/opensfx-0.2.3-r1 b/games-misc/opensfx-0.2.3-r1
new file mode 100644
index 000000000000..d5a01b1c8076
--- /dev/null
+++ b/games-misc/opensfx-0.2.3-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DEPEND=games-util/catcodec
+DESCRIPTION=OpenSFX data files for OpenTTD
+EAPI=6
+HOMEPAGE=http://bundles.openttdcoop.org/opensfx/
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=CC-Sampling-Plus-1.0
+SLOT=0
+SRC_URI=http://bundles.openttdcoop.org/opensfx/releases/opensfx-0.2.3-source.tar.gz
+_md5_=0a0ba19e6cdab698d5ba9e74eddd74a0
diff --git a/games-misc/opensfx/Manifest b/games-misc/opensfx/Manifest
deleted file mode 100644
index 1d3e015fb089..000000000000
--- a/games-misc/opensfx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST opensfx-0.2.3-source.tar.gz 11364270 BLAKE2B 34c0bca941c0c20d96ed6d0f27633195ab03ac41973ea020c53b79836ca2dc65223b9f8239673077754f1dcccd138c5c0cb629212b4ea676475bb1ac8800ad47 SHA512 7575c8febcbcabe8f9042a1a197ba76b9020e335663bf70b0aaebafe4b0758f82ff7acc624b1dfdc12d38e346f139454b78ea29e18a8bb8bd2afd3d6a209669c
-EBUILD opensfx-0.2.3-r1.ebuild 570 BLAKE2B a3487bd0e6a098989c239fc830290554b38eb8c6ad9e293cbfdbe4f17630be391e7a67775debdb9bef8a570523914cadd286878af37ead24e743a4600f9814e6 SHA512 5979b73fca908a83893a7db7dc02135770d706a991af335e7f4876d93b2ae6cbd00eacd948ed91d20104557e8b896f75c090c6389cb9bd8318a602cddf8c5302
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/opensfx/metadata.xml b/games-misc/opensfx/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/opensfx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/opensfx/opensfx-0.2.3-r1.ebuild b/games-misc/opensfx/opensfx-0.2.3-r1.ebuild
deleted file mode 100644
index dcbe11b16d70..000000000000
--- a/games-misc/opensfx/opensfx-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenSFX data files for OpenTTD"
-HOMEPAGE="http://bundles.openttdcoop.org/opensfx/"
-SRC_URI="http://bundles.openttdcoop.org/${PN}/releases/${P}-source.tar.gz"
-
-LICENSE="CC-Sampling-Plus-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="games-util/catcodec"
-RDEPEND=""
-
-S=${WORKDIR}/${P}-source
-
-src_install() {
-	insinto "/usr/share/games/openttd/data/"
-	doins opensfx.cat opensfx.obs
-	dodoc docs/{changelog.txt,readme.ptxt}
-}
diff --git a/games-misc/papers-please-1.1.65 b/games-misc/papers-please-1.1.65
new file mode 100644
index 000000000000..0c96b9dd6627
--- /dev/null
+++ b/games-misc/papers-please-1.1.65
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DESCRIPTION=A Dystopian Document Thriller
+EAPI=5
+HOMEPAGE=http://papersplea.se
+KEYWORDS=~amd64 ~x86
+LICENSE=PAPERS-PLEASE
+RDEPEND=amd64? ( >=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/libXxf86vm-1.1.3[abi_x86_32] >=x11-libs/libdrm-2.4.46[abi_x86_32] >=x11-libs/libxcb-1.9.1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) x86? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXxf86vm x11-libs/libdrm x11-libs/libxcb virtual/opengl ) games-misc/games-envd
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=papers-please_1.1.65_i386.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_=911f7b789decd9e7894649b3ed858712
diff --git a/games-misc/papers-please/Manifest b/games-misc/papers-please/Manifest
deleted file mode 100644
index 791f22a1af9d..000000000000
--- a/games-misc/papers-please/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST papers-please_1.1.65_i386.tar.gz 31566799 BLAKE2B 1e7aee7839f5e014d5eba60b5c77381a79c7532610e6daee1a36b22484a59b07e8e6b7bce3fc28720472268b78857894744ef6750dcee37e637003b2bc14a502 SHA512 093990a61c1b61d2999e6484335f4deddfecd3d66b7a5e29555c3170e890f6049f7d42a83529dcd993439de940b5dc96b8485d30ab46995d0f6814d5282669e0
-EBUILD papers-please-1.1.65.ebuild 1413 BLAKE2B 7ffd79b71c896447068677c3a4b63c905bc9465c6e1770ce0f5e81c4ffb8a6731d7056c8e2f7a79d02270af8bd77c391cb1fc496bb5654c793425fbbe0a78bb9 SHA512 a400988a8d1c9b65d8f46ac57c38eca4c96f6ed61147af53427352111a5be2748f72c3911fd2b294b12c5ac6af9ac940cb89af126107ed8ec5f9b8395238af01
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-misc/papers-please/metadata.xml b/games-misc/papers-please/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-misc/papers-please/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-misc/papers-please/papers-please-1.1.65.ebuild b/games-misc/papers-please/papers-please-1.1.65.ebuild
deleted file mode 100644
index fc553bd4d136..000000000000
--- a/games-misc/papers-please/papers-please-1.1.65.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="A Dystopian Document Thriller"
-HOMEPAGE="http://papersplea.se"
-SRC_URI="papers-please_${PV}_i386.tar.gz"
-
-LICENSE="PAPERS-PLEASE"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch bindist"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/*"
-
-RDEPEND="
-	amd64? (
-		>=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/libXxf86vm-1.1.3[abi_x86_32]
-		>=x11-libs/libdrm-2.4.46[abi_x86_32]
-		>=x11-libs/libxcb-1.9.1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	)
-	x86? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXxf86vm
-		x11-libs/libdrm
-		x11-libs/libxcb
-		virtual/opengl
-	)"
-
-S=${WORKDIR}/${PN}
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy & download \"${SRC_URI}\" from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-}
-
-src_prepare() {
-	rm -v launch.sh LICENSE || die
-	mv README "${T}"/README || die
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/PapersPlease
-
-	games_make_wrapper ${PN} "./PapersPlease" "${dir}" "${dir}"
-	make_desktop_entry ${PN} "Papers, Please"
-
-	dodoc "${T}"/README
-
-	prepgamesdirs
-}
diff --git a/games-misc/ponysay-3.0.2 b/games-misc/ponysay-3.0.2
new file mode 100644
index 000000000000..a23730ae8ec9
--- /dev/null
+++ b/games-misc/ponysay-3.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] doc? ( sys-apps/texinfo )
+DESCRIPTION=cowsay reimplemention for ponies
+EAPI=6
+HOMEPAGE=https://github.com/erkin/ponysay
+IUSE=doc +non-free bash-completion fish-completion zsh-completion python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] fish-completion? ( app-shells/fish ) zsh-completion? ( app-shells/zsh )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/erkin/ponysay/archive/3.0.2.tar.gz -> ponysay-3.0.2.tar.gz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1165da6e7ef10ccf776fc19b6e092e73
diff --git a/games-misc/ponysay/Manifest b/games-misc/ponysay/Manifest
deleted file mode 100644
index 613eaae338f2..000000000000
--- a/games-misc/ponysay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ponysay-3.0.2.tar.gz 2110382 BLAKE2B eb547ca62315c1aff227bec5e71328b1e333ba6aa14061b262d1130997ec2de2d54665fd498c8c571eacce15757030ca84d29d82a40b9fc82675d63e62617118 SHA512 47d5c584b3b8c233567eff534b5109548c92075f69776703bc303929ba4278f67fd599987ef4a098aa871c2af0efd89186f96fa28565e73b4672abeb0c23fa45
-EBUILD ponysay-3.0.2.ebuild 1459 BLAKE2B 0253592c9606c3d0ddb8e459bb60d34f38449d81c2d2477e3811cb631aa7cc520f9fc15d43051d2afc9507685ed59603edd426f0a7567f5c1137e8bcdac9f00d SHA512 18abbfbd9ff75b7a101deb9e4a44ef11b5d67ab405bb5b8957ccbc5a576d58c6aacda1edf0ff538531f82bdc0b1ce2cba09ed59d5fd2c08cb4f7f049c357f636
-MISC metadata.xml 500 BLAKE2B a937b3dcb9fb8a11ceefa20731973096578f503d711731a22afd3fbaea75b25d37cb736af36fbe8696a0d01afca261a4156444ac6b26b9a87f30f29d785f7408 SHA512 612eee4d25e1f3e3ef18b08ac4fcf59fbee5ab179d1f4da5e6784909c1985aa816317eba1a4c1a0aae8b1dfc0bfcc63ea44ab844b1400e565a2ebfaf5d7f8d4c
diff --git a/games-misc/ponysay/metadata.xml b/games-misc/ponysay/metadata.xml
deleted file mode 100644
index 288c0bcfb305..000000000000
--- a/games-misc/ponysay/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="fish-completion">Enable fish completion support</flag>
-		<flag name="non-free">Install non-free ponies (i.e. from the MLP franchise)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">erkin/ponysay</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/ponysay/ponysay-3.0.2.ebuild b/games-misc/ponysay/ponysay-3.0.2.ebuild
deleted file mode 100644
index f71db68ff6b6..000000000000
--- a/games-misc/ponysay/ponysay-3.0.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit bash-completion-r1 python-single-r1
-
-DESCRIPTION="cowsay reimplemention for ponies"
-HOMEPAGE="https://github.com/erkin/ponysay"
-SRC_URI="https://github.com/erkin/ponysay/archive/3.0.2.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +non-free bash-completion fish-completion zsh-completion"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	doc? ( sys-apps/texinfo )"
-
-RDEPEND="${PYTHON_DEPS}
-	fish-completion? ( app-shells/fish )
-	zsh-completion? ( app-shells/zsh )"
-
-setup_py() {
-	"${PYTHON}" setup.py \
-		--prefix="${EPREFIX}"/usr \
-		--everything \
-		--without-info-compression \
-		--without-man-compression \
-		--without-pdf-compression \
-		--without-shared-cache \
-		--freedom=$(usex non-free no yes) \
-		$(use_with fish-completion) \
-		$(use_with zsh-completion) \
-		$(use_with doc info) \
-		$(use_with doc pdf "${EPREFIX}"/usr/share/doc/${PF}) \
-		"${@}" || die
-}
-
-src_compile() {
-	setup_py \
-		$(use_with bash-completion) \
-		build
-}
-
-src_install() {
-	setup_py \
-		--without-bash-completion \
-		--destdir="${D}" \
-		prebuilt
-
-	python_fix_shebang "${ED}"/usr/bin/${PN}
-
-	rm -rv "${ED}"/usr/share/licenses || die
-	dodoc CHANGELOG CONTRIBUTING CREDITS README.md
-
-	use bash-completion &&
-		newbashcomp completion/bash-completion.${PN}.install ${PN}
-}
diff --git a/games-misc/rfksay-0.1-r1 b/games-misc/rfksay-0.1-r1
new file mode 100644
index 000000000000..1e55c73a772b
--- /dev/null
+++ b/games-misc/rfksay-0.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=dev-lang/perl
+DESCRIPTION=Like cowsay, but different because it involves robots and kittens
+EAPI=6
+HOMEPAGE=http://www.robotfindskitten.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=mirror://gentoo/rfksay.tar.gz
+_md5_=9e870a56b12e271a455f6a61051828d7
diff --git a/games-misc/rfksay/Manifest b/games-misc/rfksay/Manifest
deleted file mode 100644
index f467ab7a88e6..000000000000
--- a/games-misc/rfksay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rfksay.tar.gz 997 BLAKE2B dba9095fde7e533fcc7ad2a6a178a11f0b92b207ca63540f82fbe8bcb118bbcc01fe9e7270df071e63eebeb96eee02a5e55b78414fb9dcded5ee31469265ebd8 SHA512 8eb5766b8a3efc31a20a128be0ec95eba7f61599ca402dc48d7c247516ac9f221d9f72a471923da566645b53e119831e61a7caa94f7b8c17ee4af802c42f6714
-EBUILD rfksay-0.1-r1.ebuild 497 BLAKE2B 41a196054ccd5407060cf3a3c95def30f8e51bf9e327dcb3749fc0a765c3b0994721e8eaaffaff78f921f8f19475bc3e3ea1d10077eebc36d87ce64b41db60d4 SHA512 c3ae1a25929700a7d5365253a6fca5d20ae84072fa8d8b33a8f9a9168bbacfb0b7dced4177b003fed186afd7575a61d07d08fb85e6e4b9199193bbe6c5574a0a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/rfksay/metadata.xml b/games-misc/rfksay/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/rfksay/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/rfksay/rfksay-0.1-r1.ebuild b/games-misc/rfksay/rfksay-0.1-r1.ebuild
deleted file mode 100644
index 705771832222..000000000000
--- a/games-misc/rfksay/rfksay-0.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Like cowsay, but different because it involves robots and kittens"
-HOMEPAGE="http://www.robotfindskitten.org/"
-#SRC_URI="http://www.redhotlunix.com/${PN}.tar.gz"
-SRC_URI="mirror://gentoo/${PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}
-
-src_install() {
-	dobin kittensay rfksay robotsay
-}
diff --git a/games-misc/robotfindskitten-2.7182818.701-r1 b/games-misc/robotfindskitten-2.7182818.701-r1
new file mode 100644
index 000000000000..2a800d6bf26f
--- /dev/null
+++ b/games-misc/robotfindskitten-2.7182818.701-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=Help robot find kitten
+EAPI=6
+HOMEPAGE=http://robotfindskitten.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=mirror://sourceforge/rfk/robotfindskitten-2.7182818.701.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_=12feb292c1dcca25da3203df1dc63092
diff --git a/games-misc/robotfindskitten/Manifest b/games-misc/robotfindskitten/Manifest
deleted file mode 100644
index dea7203d6ea1..000000000000
--- a/games-misc/robotfindskitten/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX robotfindskitten-2.7182818.701-gentoo.patch 872 BLAKE2B b741d5ac234798e46436f3f0cad615e4abebc3199bc44cc4dffb622e33f42c66430a452256ede3f1c8a6d452445714a053fff246597f2c4a5a84bcc3fe3c6ecf SHA512 4189fc914f7047599f45b8f6a00968159e14a8c14d3e40f62e217c30ad96db5ab38f389f7cac608db27ba8f67c9841ac8a0927e2654dba9c1e04d997936ce8c2
-DIST robotfindskitten-2.7182818.701.tar.gz 437810 BLAKE2B d34a72c4120562844e17441ba8e2c4a04863ad5241c04425cf5a83296b047d2b5c0c52d6dbaab253be37534fd4de2f6a0d6cf8dd19124695805b457320b45c32 SHA512 736e44a62f016fb2a0dd03e31e6f1fb7c50a9115182812518666f3e4ad69f5703d7018f28ab14e0cfdbc8741656b15fa6ee577c2a5920e0d9af9acb658ac620b
-EBUILD robotfindskitten-2.7182818.701-r1.ebuild 522 BLAKE2B 2cb974c5427a63ae65f2b359c71137ea0d199e00e1d3cc8cfa05ecc0eabf882376c3c5e6a836e51eeba4793a493674ee1ad3c85a5d094cee85eed39c6e1a528d SHA512 7a80e3531a33086aa4a0c8a68a59bcad76a8c2b767df3be94de2258c416630a9bdbf12c464629d01f958f6360ab8691579a5db139fae8cbbc8c55963ecea994a
-MISC metadata.xml 326 BLAKE2B b7e04ad279076c022578833b14abb5f00e1decebe7e7a09f687f03c15cc71e81d1f418d5e81ece7965fff067b1ca42dea0e53f24d65dfc6b55a8e6a5f330b7ee SHA512 1620797c8b2a84b0711c6bda03a739a5a6b1fc5f527077224fe0f3d0e462260d3aa0d1516d11f0dc723f4ad74072cfb5e5e1550c00c4001f78e78b4e3d827080
diff --git a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch b/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch
deleted file mode 100644
index 6f5aa29a9f51..000000000000
--- a/games-misc/robotfindskitten/files/robotfindskitten-2.7182818.701-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- robotfindskitten-2.7182818.701.orig/nki/Makefile.in
-+++ robotfindskitten-2.7182818.701/nki/Makefile.in
-@@ -197,7 +197,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--nkidir = $(datadir)/games/robotfindskitten
-+nkidir = $(datadir)/robotfindskitten
- nki_DATA = vanilla.nki
- all: all-am
- 
---- robotfindskitten-2.7182818.701.orig/src/Makefile.in
-+++ robotfindskitten-2.7182818.701/src/Makefile.in
-@@ -199,8 +199,8 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--execgamesdir = $(prefix)/games
--AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/games/robotfindskitten\"
-+execgamesdir = $(bindir)
-+AM_CPPFLAGS = -DSYSTEM_NKI_DIR=\"$(datadir)/robotfindskitten\"
- robotfindskitten_SOURCES = robotfindskitten.c 
- SPLINT_SUPPRESSIONS = +charintliteral +charindex
- all: all-am
diff --git a/games-misc/robotfindskitten/metadata.xml b/games-misc/robotfindskitten/metadata.xml
deleted file mode 100644
index b934bfeac57e..000000000000
--- a/games-misc/robotfindskitten/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">rfk</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild b/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild
deleted file mode 100644
index a6195c2f7a8a..000000000000
--- a/games-misc/robotfindskitten/robotfindskitten-2.7182818.701-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Help robot find kitten"
-HOMEPAGE="http://robotfindskitten.org/"
-SRC_URI="mirror://sourceforge/rfk/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS" \
-		default
-	insinto /usr/share/${PN}
-	doins nki/vanilla.nki
-}
diff --git a/games-misc/sdljoytest-11102003 b/games-misc/sdljoytest-11102003
new file mode 100644
index 000000000000..239cdabe17ff
--- /dev/null
+++ b/games-misc/sdljoytest-11102003
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-image
+DESCRIPTION=SDL app to test joysticks and game controllers
+EAPI=5
+HOMEPAGE=http://sdljoytest.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,opengl,video] virtual/opengl media-libs/sdl-image
+SLOT=0
+SRC_URI=mirror://sourceforge/sdljoytest/SDLJoytest-GL-11102003.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=089ddc535c442dbd971c9781548469ea
diff --git a/games-misc/sdljoytest/Manifest b/games-misc/sdljoytest/Manifest
deleted file mode 100644
index 5a65deded699..000000000000
--- a/games-misc/sdljoytest/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SDLJoytest-GL-11102003.tar.bz2 85997 BLAKE2B 23ae410c462d9501306d6e225d2523ef940dd3f3e6ab7c898313a25253f86c42d3c0c7d64385a0c6de06331ca68ddc49296cea572f0a1f42161a912e8ff3274d SHA512 4994e878eaacacb156d4d9988d1e7864ed4e5e3d4db6bc0be8a883d7edde87d56698eb22de5d39e2110be7f960e5bf080283a7563bb2bc3f17c390181e097c6a
-EBUILD sdljoytest-11102003.ebuild 872 BLAKE2B cc1368cb30bfc1f7c938a4df493d5819dace93a031cb5db50762cfac49f0d540d5e1059fd37af3da0331a4a7ea406a8e02cff458ab16bd8b8e7ddb5941347744 SHA512 4b16ec9ed12bc139dd4876459528fe8cb1c27c299315297c720015c008d9d3bcf68428b2acbb3856d13abfabb236b776247952266df682c231666274cd8322b9
-MISC metadata.xml 333 BLAKE2B 5eadf19507a2a63c03c3457ae2efec7cbc5a2b6abc8d323c7f38510f639b795e56d1e83e7ead78c1d3930317e712d6536cdc5453c84bc66573ea7c5963f63f58 SHA512 f3c36c935fc927fa6ccf4402f67ec8d213fd94c2bf5855b4f1e6852c3c2c32fa051998cda971050c7f2f3257dc4102369c0af8d5d386ecb2a1e4d2ab177217d9
diff --git a/games-misc/sdljoytest/metadata.xml b/games-misc/sdljoytest/metadata.xml
deleted file mode 100644
index 9a85b3b89d73..000000000000
--- a/games-misc/sdljoytest/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">sdljoytest</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/sdljoytest/sdljoytest-11102003.ebuild b/games-misc/sdljoytest/sdljoytest-11102003.ebuild
deleted file mode 100644
index 905eb1487338..000000000000
--- a/games-misc/sdljoytest/sdljoytest-11102003.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="SDL app to test joysticks and game controllers"
-HOMEPAGE="http://sdljoytest.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sdljoytest/SDLJoytest-GL-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[joystick,opengl,video]
-	virtual/opengl
-	media-libs/sdl-image"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/SDLJoytest-GL
-
-src_prepare() {
-	emake clean
-	sed -i -e 's:/usr/local:/usr:' joytest.h || die
-	sed -i -e 's:SDL/::' *.c || die
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		CFLAGS="$(sdl-config --cflags) ${CFLAGS}" \
-		LDFLAGS="$(sdl-config --libs) -lGL ${LDFLAGS}"
-}
-
-src_install() {
-	dobin SDLJoytest-GL
-	insinto /usr/share/SDLJoytest-GL
-	doins *.bmp
-	doman SDLJoytest.1
-}
diff --git a/games-misc/sex-1.0-r2 b/games-misc/sex-1.0-r2
new file mode 100644
index 000000000000..257bd8b05398
--- /dev/null
+++ b/games-misc/sex-1.0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Spouts silly mad-lib-style porn-like text
+EAPI=6
+HOMEPAGE=http://spatula.net/software/sex/
+KEYWORDS=~alpha ~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=!sci-astronomy/sextractor
+SLOT=0
+SRC_URI=http://spatula.net/software/sex/sex-1.0.tar.gz
+_md5_=33b3fea8b8baf912660aec1bf445d867
diff --git a/games-misc/sex/Manifest b/games-misc/sex/Manifest
deleted file mode 100644
index 11811e961e8b..000000000000
--- a/games-misc/sex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sex-1.0.tar.gz 4820 BLAKE2B 69df84b55d1a065f624bf739b4f3485f846a7a789c38e4afb839549ec672325553ec63285487d7a6043572927f2829cfd422b286a192f27a0cf7f6b1a245c387 SHA512 5b4802b63d20dc6ec5ab2b95210eadac02fe2887525d1235d0426589666d7413f2631504c69852ba494129ca66620f03b31fd6bf578642e88746b8639c3bba40
-EBUILD sex-1.0-r2.ebuild 563 BLAKE2B cc87493443c15fbe10e16efa8678c0dda88371b9e7fc0cfebef27be997d4fbf5d1d75704be69055be2b72c142d438b928816440fb791f1a008e436a143c81a24 SHA512 162f606884fba02a079c3b0c5361e521635b32d14145922e9b23989f04fe6ef576655da5daeec2cbaeea3bf00d4b02186907596e81feccd9a20fed27b7a79ef2
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/sex/metadata.xml b/games-misc/sex/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/sex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/sex/sex-1.0-r2.ebuild b/games-misc/sex/sex-1.0-r2.ebuild
deleted file mode 100644
index cfee798eada1..000000000000
--- a/games-misc/sex/sex-1.0-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spouts silly mad-lib-style porn-like text"
-HOMEPAGE="http://spatula.net/software/sex/"
-SRC_URI="http://spatula.net/software/sex/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!sci-astronomy/sextractor"
-
-src_prepare() {
-	default
-	rm -f Makefile
-}
-
-src_compile() {
-	emake sex
-}
-
-src_install() {
-	dobin sex
-	doman sex.6
-	dodoc README
-}
diff --git a/games-misc/sound-of-sorting-0.6.6_pre20151107-r1 b/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
new file mode 100644
index 000000000000..d7dc39c8ac1d
--- /dev/null
+++ b/games-misc/sound-of-sorting-0.6.6_pre20151107-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=unpack
+DEPEND=media-libs/libsdl x11-libs/wxGTK:3.0
+DESCRIPTION=Visualization and Audibilization of Sorting Algorithms
+EAPI=6
+HOMEPAGE=http://panthema.net/2013/sound-of-sorting/ https://github.com/bingmann/sound-of-sorting
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl x11-libs/wxGTK:3.0
+SLOT=0
+SRC_URI=https://github.com/bingmann/sound-of-sorting/archive/05db428c796a7006d63efdbe314f976e0aa881d6.tar.gz -> sound-of-sorting-0.6.6_pre20151107.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=181f4215040f6ae5d5c6752fdfc38704
diff --git a/games-misc/sound-of-sorting/Manifest b/games-misc/sound-of-sorting/Manifest
deleted file mode 100644
index e5d90bafc302..000000000000
--- a/games-misc/sound-of-sorting/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sound-of-sorting-0.6.6_pre20151107.tar.gz 179044 BLAKE2B 8027851e63cf8f3a0cec7e184b1970b9a138bcaa10b345e9fd742950bc397a7eb3d6911fbf8138eab3418c66788c6218b74ed03c1e6e72374b4b7dab0ce06387 SHA512 530caeefe4a37fed401ce56803900806a86efc1e4c0ff083c52e4bfc1cf78f8158539ca3c22f5cdf5cd176c8d6953089d14ca855643ce353457419a4f931a125
-EBUILD sound-of-sorting-0.6.6_pre20151107-r1.ebuild 734 BLAKE2B 9ecd617316db06fd444f512e1dd5bae6fc4c6596247222907222667c56614b8e098edff72cc76b96c413202aec3a40929118b260bd0ee521d198925ac22cda39 SHA512 4ae4904c126a0505c4eef067a3cc3d4da2e82e62407c35f584d4c25ed372b75f31ab52ca4d27d867e177159f5eb08d9e9b8b37a517bd535abb6f88fbf06f129e
-MISC metadata.xml 342 BLAKE2B 929b4e7e99b167d0d2257654bde3bf4eca115e4c86b1e059a87a37e612747d865359dca06c39631b5cc0715a1a600b3e5d448905e988ec31b1b285d97ad88d24 SHA512 68ea3ba1786f4c5d32a9a56ea9fbaa609ae230b2b493b4853c33330db52288da7eb930d7720c1106d7259b9a9597b464e7c4467d9434035ea010a7ae6d83c8b6
diff --git a/games-misc/sound-of-sorting/metadata.xml b/games-misc/sound-of-sorting/metadata.xml
deleted file mode 100644
index 9a10c42074f3..000000000000
--- a/games-misc/sound-of-sorting/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>blueness@gentoo.org</email>
-		<name>Anthony G. Basile</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">bingmann/sound-of-sorting</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild b/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild
deleted file mode 100644
index f17d1467c1f6..000000000000
--- a/games-misc/sound-of-sorting/sound-of-sorting-0.6.6_pre20151107-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-
-inherit vcs-snapshot wxwidgets
-
-DESCRIPTION="Visualization and Audibilization of Sorting Algorithms"
-HOMEPAGE="http://panthema.net/2013/sound-of-sorting/ https://github.com/bingmann/sound-of-sorting"
-#SRC_URI="http://panthema.net/2013/sound-of-sorting/${P}.tar.bz2"
-COMMIT="05db428c796a7006d63efdbe314f976e0aa881d6"
-SRC_URI="https://github.com/bingmann/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	x11-libs/wxGTK:${WX_GTK_VER}
-"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-	need-wxwidgets unicode
-}
diff --git a/games-misc/typespeed-0.6.5-r1 b/games-misc/typespeed-0.6.5-r1
new file mode 100644
index 000000000000..8af51fbf3ba3
--- /dev/null
+++ b/games-misc/typespeed-0.6.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Test your typing speed, and get your fingers CPS
+EAPI=6
+HOMEPAGE=http://typespeed.sourceforge.net/
+IUSE=nls
+KEYWORDS=~alpha ~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/typespeed/typespeed-0.6.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=286b4eb8cae4eddf435920acc670c6f7
diff --git a/games-misc/typespeed/Manifest b/games-misc/typespeed/Manifest
deleted file mode 100644
index 9fef946670d9..000000000000
--- a/games-misc/typespeed/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX typespeed-0.6.5-musl.patch 418 BLAKE2B c1af19bfbb0c05d3cbc0c4308ff89ecdad0825d8e77b19d32b02d8ba410538ead7c90a20f31083174cf0e0cd9a428cb4070ef76949c105c2768086ac6fbcc81e SHA512 3f5f2d1d1fd85e1829fb024bfbf355b945c04bd0a624b3e2a86dbe029f64d15473c66c7410bd4013d263fcf3142474e2ac92656699aebc0570c62d8a18a4b635
-DIST typespeed-0.6.5.tar.gz 254170 BLAKE2B ce39d5e7d31a068a34deafa1c81dc69b028339d4f8e7461e5bfce335bdc47885b224f33efc7eb02765a2ae0cc1d1b52559b210a04fa0a549d54093dbc816acc0 SHA512 cf3a8cdeb5fb1ee81bd5cf50d6b2aca1e7331b0bfde518c38050abae35ca617fbeed5bf2a37830a7568712ab71920f60c89197317a2721ae8c89829b0eede190
-EBUILD typespeed-0.6.5-r1.ebuild 852 BLAKE2B ebc7616fb387dd6814e7707ef4a3565272cb5f0b4dec6c80625d23894f4f6b8bf01313bb3521fc867fe4e5a2e8880be605b4ff6073ac4779330fc23bf523bcfd SHA512 3a220b3ff616b6dc285128370a853c843fa195e9da6fd70cd1e57c3417e981673b2bb1418629b081fa13cb3ac697cd825aaa7e3eda3d0f5fa1807eabbdd58dd6
-MISC metadata.xml 332 BLAKE2B a7dea2ab5d54a1bf0455a41fa30f7bfb1eee06f547e2b14ce5b7d63dbf826ae43287304a331754829819addceade50bae557de63fb7d0536cf0573342ef42734 SHA512 3038edc39a8e186f2d054ff72afd3f28e62e116e436bd818080e65dc8cea1a93b5e41658c86709ca70a9df91116631b90deaefb1dc5cbe77e9f6e802e9b5af1e
diff --git a/games-misc/typespeed/files/typespeed-0.6.5-musl.patch b/games-misc/typespeed/files/typespeed-0.6.5-musl.patch
deleted file mode 100644
index 3967b10f3428..000000000000
--- a/games-misc/typespeed/files/typespeed-0.6.5-musl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur a/typespeed-0.6.5/src/typespeed.h b/typespeed-0.6.5/src/typespeed.h
---- typespeed-0.6.5/src/typespeed.h	2008-08-13 15:36:51.000000000 +0100
-+++ typespeed-0.6.5/src/typespeed.h	2016-01-01 10:41:54.919998820 +0100
-@@ -27,10 +27,10 @@
- 
- #include <stdint.h>
- #include <stdio.h>
-+#include <time.h>
- 
- #ifdef WIN32
- 	#include <dirent.h>
--	#include <time.h>
- 
- 	#ifndef MAXHOSTNAMELEN
- 		#define MAXHOSTNAMELEN	256
diff --git a/games-misc/typespeed/metadata.xml b/games-misc/typespeed/metadata.xml
deleted file mode 100644
index 2b49be614f65..000000000000
--- a/games-misc/typespeed/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">typespeed</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/typespeed/typespeed-0.6.5-r1.ebuild b/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
deleted file mode 100644
index 354c9eba5a35..000000000000
--- a/games-misc/typespeed/typespeed-0.6.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Test your typing speed, and get your fingers CPS"
-HOMEPAGE="http://typespeed.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/testsuite//' \
-		-e 's/doc//' \
-		Makefile.am || die
-	sed -i -e '/^CC =/d' src/Makefile.am || die
-	eapply "${FILESDIR}"/${P}-musl.patch
-	rm -rf m4 #417265
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dodoc doc/README
-}
diff --git a/games-misc/wtf-20090924 b/games-misc/wtf-20090924
new file mode 100644
index 000000000000..9c8ef370f0ae
--- /dev/null
+++ b/games-misc/wtf-20090924
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!games-misc/bsd-games
+DESCRIPTION=translates acronyms for you
+EAPI=5
+HOMEPAGE=http://netbsd.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=!games-misc/bsd-games
+SLOT=0
+SRC_URI=http://dev.gentooexperimental.org/~darkside/distfiles/wtf/wtf-20090924.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6b010f07667647169652a3db432871cc
diff --git a/games-misc/wtf/Manifest b/games-misc/wtf/Manifest
deleted file mode 100644
index 8e39aca54cdc..000000000000
--- a/games-misc/wtf/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wtf-20090924-prefix.patch 351 BLAKE2B c5b9ef4f6c9e3ff7f0d6ee83e55b1fa58638a5c0c50cf87f20838defe7f023d6206cfa4c23e1d0991a6b0082855906a2864e254113cd789e539dbd692b8222a3 SHA512 ff8eb5bd961c0498f0371d6ba850d1d407a0e9779469838a5982bce843d40d08bd7a97b50ce013054928198da7c9fa395d9472b4c995e9454c93bced8d953a25
-DIST wtf-20090924.tar.bz2 9888 BLAKE2B 67cd7c7b4af61d576373faa242e8718fe9a8286b3aaf9a9eaf45ac83a8a322257ccb694222a2d8b1052cf709ecd6bfc73c6a4dcb9e96985601e933ebe80c5f1c SHA512 85a7b5b7add12f775272851095f86efa2962875aa9008aec5079d3aec31a74a2d475d5c904013134b4045872fb8e301e95f3c5fa25ab8872a7d31012653bddb0
-EBUILD wtf-20090924.ebuild 767 BLAKE2B 272fc29f9bcf12f8f64308af20963753f02c377fb38e9cc9905d186fe750aa47eb859f653969e47d0f8028a33ad8a518df8864295eff746c6ccdc5facc6499d3 SHA512 9ad677d5b869086aa76d1b8d530b1e8ea63595e419c378698fefe04a33e24530397f3ff563aff5028cf7cd18327e96b0054e0c113f7f635fa76a7550bbb72657
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/wtf/files/wtf-20090924-prefix.patch b/games-misc/wtf/files/wtf-20090924-prefix.patch
deleted file mode 100644
index 87dc6436e086..000000000000
--- a/games-misc/wtf/files/wtf-20090924-prefix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- wtf.orig	2009-09-27 10:46:12 +0200
-+++ wtf	2009-09-27 10:46:57 +0200
-@@ -12,7 +12,7 @@
- 	exit 1
- }
- 
--acronyms=${ACRONYMDB:-`ls /usr/share/misc/acronyms* 2>/dev/null`}
-+acronyms=${ACRONYMDB:-`ls "@GENTOO_PORTAGE_EPREFIX@"/usr/share/misc/acronyms* 2>/dev/null`}
- 
- if [ "$acronyms" = "" ]; then
- 	echo "$PROGNAME: acronyms database not found!" >&2
diff --git a/games-misc/wtf/metadata.xml b/games-misc/wtf/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/wtf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/wtf/wtf-20090924.ebuild b/games-misc/wtf/wtf-20090924.ebuild
deleted file mode 100644
index ca02243d6a14..000000000000
--- a/games-misc/wtf/wtf-20090924.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils prefix
-
-DESCRIPTION="translates acronyms for you"
-HOMEPAGE="http://netbsd.org/"
-SRC_URI="http://dev.gentooexperimental.org/~darkside/distfiles/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="!games-misc/bsd-games"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify wtf
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dobin wtf
-	doman wtf.6
-	insinto /usr/share/misc
-	doins acronyms*
-	dodoc README
-}
diff --git a/games-misc/wumpus-1.4-r1 b/games-misc/wumpus-1.4-r1
new file mode 100644
index 000000000000..06d496fe6592
--- /dev/null
+++ b/games-misc/wumpus-1.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=sys-apps/less
+DESCRIPTION=Classic Hunt the Wumpus Adventure Game
+EAPI=6
+HOMEPAGE=http://cvsweb.netbsd.org/bsdweb.cgi/src/games/wump/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-apps/less
+SLOT=0
+SRC_URI=ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.c ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.6 ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.info
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e8fbb01ac4d5391add35df8be9b8221d
diff --git a/games-misc/wumpus/Manifest b/games-misc/wumpus/Manifest
deleted file mode 100644
index 8a126ff22600..000000000000
--- a/games-misc/wumpus/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST wump.6 4821 BLAKE2B b8eee837341f329d60bd27a143d4b9f1e5e5fd27835821efc8b028190f253b090f1d494e4be0b84c16f6c23552b9fbb56d86463749fa2b07a868aa49befeabcd SHA512 51e61efa71d46bace722dae3dbc7ea782f97ef02cb529054c1f5ea56139017b90e6a31ae70314c4a4c82bbcb821f826aa0f6032d934104bf3e7851437377e471
-DIST wump.c 22691 BLAKE2B 569819c0b335a2847864d8d6e468eb9d8abaae245d93fedd7c9d267a106d32fcbd340273c7ca5695b37a5d4ce0d0b375961437cf896a6c073a7ced62ac69d59f SHA512 a914e1eb9e6204e5d763a7c32445721b849a753c3007312c7f9bbbaed9fc3f133639e7ef27a66636e9c5bc7bb13ab7a54f4f607272403014042723de38cbd878
-DIST wump.info 1883 BLAKE2B cb29de61f2756a7a1d53f20e015325bb14364d3bd04e32fad0077c9d8467907f74ce7bae36570f2f6ef0a282ed2e257527c4480db0b76383afe82d813b71d567 SHA512 faee0552c7065f6cc98db53d0ed085b7b4c6aadb5f457733e36a621f9ea1753cb627d4a3813cc9b9aaaa1cd178458fd7ceb4ef9114892e0f8faeb303cc0351d8
-EBUILD wumpus-1.4-r1.ebuild 981 BLAKE2B 86921d3cd2170441dd1aee617155a71679f8847e361ffbbb2394011e9ebaff0a6b67044b2aed1e2dd4e7b77590ac8f3149663ddf1dd221142ec2dd0bf26f4a80 SHA512 c0cc9ae702f9864923e692e59a74a7f0a4325d163d0d43c281ae5764c36dac1793478deb66963506effcf43364eb42586c65c491708faff34b11848dd762b76c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/wumpus/metadata.xml b/games-misc/wumpus/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/wumpus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/wumpus/wumpus-1.4-r1.ebuild b/games-misc/wumpus/wumpus-1.4-r1.ebuild
deleted file mode 100644
index 56125c56d369..000000000000
--- a/games-misc/wumpus/wumpus-1.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Classic Hunt the Wumpus Adventure Game"
-HOMEPAGE="http://cvsweb.netbsd.org/bsdweb.cgi/src/games/wump/"
-SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.c
-	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.6
-	ftp://ftp.netbsd.org/pub/NetBSD/NetBSD-release-1-6/src/games/wump/wump.info"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/less"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/wump.{info,c,6} "${S}/" || die
-}
-
-src_compile() {
-	touch pathnames.h
-	[ -z "${PAGER}" ] && PAGER=/usr/bin/less
-	$(tc-getCC) ${LDFLAGS} -Dlint -D_PATH_PAGER=\"${PAGER}\" \
-		-D_PATH_WUMPINFO=\"/usr/share/${PN}/wump.info\" ${CFLAGS} \
-		-o wump wump.c || die
-}
-
-src_install() {
-	dobin wump
-	doman wump.6
-	insinto /usr/share/${PN}
-	doins wump.info
-}
diff --git a/games-misc/xcowsay-1.3 b/games-misc/xcowsay-1.3
new file mode 100644
index 000000000000..ded803367c65
--- /dev/null
+++ b/games-misc/xcowsay-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dbus? ( sys-apps/dbus ) dev-libs/dbus-glib fortune? ( games-misc/fortune-mod ) media-libs/freetype:2 media-libs/libpng x11-libs/pango x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 virtual/pkgconfig
+DESCRIPTION=configurable talking graphical cow (inspired by cowsay)
+EAPI=6
+HOMEPAGE=http://www.doof.me.uk/xcowsay/
+IUSE=dbus fortune
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dbus? ( sys-apps/dbus ) dev-libs/dbus-glib fortune? ( games-misc/fortune-mod ) media-libs/freetype:2 media-libs/libpng x11-libs/pango x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2
+SLOT=0
+SRC_URI=http://www.nickg.me.uk/files/xcowsay-1.3.tar.gz
+_md5_=2bf1a825696d5b955d99654799b17586
diff --git a/games-misc/xcowsay/Manifest b/games-misc/xcowsay/Manifest
deleted file mode 100644
index 1bcaa03db14e..000000000000
--- a/games-misc/xcowsay/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xcowsay-1.3.tar.gz 269836 BLAKE2B 40eea935eb8784c182c03cf68c89f790c826f5162bbed526facee4d7488fb833e55bbecb9824d0b5e98abf3f5bc77068e150a1817f9745fb8ace11b7d7fdbb00 SHA512 b6f6493a988d8e8036ba9f2a0434627ffbd28eacd3330b256d8e6754b7be02eeb41390b28a8160091eca87d142e284adf2e2a37f22d715bca3b58ef1db8cdcf1
-EBUILD xcowsay-1.3.ebuild 753 BLAKE2B 4f891974dd52437b57ecf04b817b04ffe04a6b8ea40b0ce1738efe86b0e24947104e85f279f290ff1d28151090512a7a8a9995405b272234a3299c4cb7940acd SHA512 5fe53c78d754264a6f295ceebd377501b54ea8c441203b05cfe771d278b0f17a1711a7a93273a1d55becfc9a691b52b1368849849791fc4b2e12e534071eef1c
-MISC metadata.xml 323 BLAKE2B 351a7a10edfe4cdc966fe283e89cd6a67bc6609ae7355c23ba9ac4c56d070af1585e0d172c51748d86f6fc917ffd1fc0a6b29c1db0977c5e85bce1849b94eb53 SHA512 e560764dae2cbdf7d747479e49c51cac3ccc02d5e9ed39fe726b8217a0c5f30d5e5306015758f1afb12df022e58a3902f9f007cf412af7940c8743523db088a2
diff --git a/games-misc/xcowsay/metadata.xml b/games-misc/xcowsay/metadata.xml
deleted file mode 100644
index 50abf08fa7b2..000000000000
--- a/games-misc/xcowsay/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<use>
-	<flag name="fortune">Installs the fortune-mod xcow binary</flag>
-</use>
-</pkgmetadata>
diff --git a/games-misc/xcowsay/xcowsay-1.3.ebuild b/games-misc/xcowsay/xcowsay-1.3.ebuild
deleted file mode 100644
index 23b83fa32d22..000000000000
--- a/games-misc/xcowsay/xcowsay-1.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="configurable talking graphical cow (inspired by cowsay)"
-HOMEPAGE="http://www.doof.me.uk/xcowsay/"
-SRC_URI="http://www.nickg.me.uk/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus fortune"
-
-RDEPEND="dbus? ( sys-apps/dbus )
-	dev-libs/dbus-glib
-	fortune? ( games-misc/fortune-mod )
-	media-libs/freetype:2
-	media-libs/libpng
-	x11-libs/pango
-	x11-libs/gtk+:2
-	x11-libs/gdk-pixbuf:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf $(use_enable dbus)
-}
-
-src_install() {
-	default
-	if ! use fortune; then
-		rm -f "${ED}"/usr/bin/xcowfortune || die "Removal of xcowfortune failed"
-	fi
-}
diff --git a/games-misc/xcruiser-0.30-r1 b/games-misc/xcruiser-0.30-r1
new file mode 100644
index 000000000000..5c7cadedb980
--- /dev/null
+++ b/games-misc/xcruiser-0.30-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libXaw app-text/rman x11-misc/gccmakedep x11-misc/imake
+DESCRIPTION=Fly about 3D-formed file system
+EAPI=5
+HOMEPAGE=http://xcruiser.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXaw
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/xcruiser/xcruiser-0.30.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=95377d00eff2858a6424cb2147bd1bb0
diff --git a/games-misc/xcruiser/Manifest b/games-misc/xcruiser/Manifest
deleted file mode 100644
index d9cfc16e54dc..000000000000
--- a/games-misc/xcruiser/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xcruiser-0.30.tar.gz 38667 BLAKE2B 5cc5e296c9c8e73a51b2dc39b58beef09aaf7122c0b41126fc06897a474a057f27b44ff782855fa8f6bb39b6857b928a15e8e258a71f0aeb1b5d3d657788f557 SHA512 77f1dbfd4497e30bb1ee0f41121a6f85cd1bf2b59fc542e88326bded8b806ecd7439689765a73ea88215c768a3bdca1370ae80b956de38a131b927b6af9e674b
-EBUILD xcruiser-0.30-r1.ebuild 657 BLAKE2B 166b423086f51c58267bad1c3f6cf3e28b313eb4109ee56971e51f213fce992ea190348c20a1d227a5fa6edd92f0fa0f766759bd8603f6b37fe47f42b7ce3134 SHA512 d25db0bfacdd1e9caba87ba16934cc2d43a8c1266b60dd8f40b3d43ea636adb198ef14d8654834df11d7e50dfca3c72df291f73181f57dc112be8ec72b3e253e
-MISC metadata.xml 331 BLAKE2B 503f508585b5ad0a23a933c923766a7e50b9ffb531e39f83a77107baeee17e78848db7f48ca2b87ff85ecfd684c6b9a3353d8af2966236e28888c498cd7db3d3 SHA512 6ead6b1b6ef634bd700ce10f4e3c29c2542a5079420ec01f7f8f2d9ecccf1ec4b2cdadb11ea1a9c58e868f3c438dd5ed925da0f3b95fa986f6443c73d9f5d3f1
diff --git a/games-misc/xcruiser/metadata.xml b/games-misc/xcruiser/metadata.xml
deleted file mode 100644
index 4aa4af005108..000000000000
--- a/games-misc/xcruiser/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xcruiser</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-misc/xcruiser/xcruiser-0.30-r1.ebuild b/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
deleted file mode 100644
index c5f7a85927f4..000000000000
--- a/games-misc/xcruiser/xcruiser-0.30-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Fly about 3D-formed file system"
-HOMEPAGE="http://xcruiser.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/gccmakedep
-	x11-misc/imake"
-
-src_compile() {
-	xmkmf -a
-	emake CC=$(tc-getCC) CDEBUGFLAGS="${CFLAGS}" LOCAL_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xcruiser
-	dodoc CHANGES README README.jp TODO
-	newman xcruiser.man xcruiser.1
-}
diff --git a/games-misc/xpenguins-2.2-r2 b/games-misc/xpenguins-2.2-r2
new file mode 100644
index 000000000000..02a5cce97de5
--- /dev/null
+++ b/games-misc/xpenguins-2.2-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=x11-libs/libXpm x11-base/xorg-proto
+DESCRIPTION=Cute little penguins invading your desktop
+EAPI=6
+HOMEPAGE=http://xpenguins.seul.org/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXpm
+SLOT=0
+SRC_URI=http://xpenguins.seul.org/xpenguins-2.2.tar.gz http://xpenguins.seul.org/xpenguins_themes-1.0.tar.gz
+_md5_=a379b8212489022fce6ebb54a8eac97e
diff --git a/games-misc/xpenguins/Manifest b/games-misc/xpenguins/Manifest
deleted file mode 100644
index e80d05b29252..000000000000
--- a/games-misc/xpenguins/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST xpenguins-2.2.tar.gz 275210 BLAKE2B e9d20cf8fe210f00dcdaf7789d7fb5f477c6623b81e2ae4071367bc2d645f2e8d719d4ecb59e34642a26a3626ba97bbdc5b2abf632f32935d7cf38c6457c5539 SHA512 cb24e17a5a19df0de162b2214dec2fbfc07396cdea9d138b8426d8fc38e248b1faba65ebfb8ba74a5cf515063ba8f4032c4588586b23b5be6aa0a208cfcfebf1
-DIST xpenguins_themes-1.0.tar.gz 215487 BLAKE2B 922d360ed38959bc3e0452949c68f3438d4e2bfa3f8abce997888e2e288e420cae92ef51ebad17a88bd71bbc9f86d8a65d2d49d302d85b6927551144e4cf7cfb SHA512 577dedccfff8f4581c9285deb809d43a09631e15461783bfb5f00d2bf0e687d54f04ad3bcf1051113777d74f57c94c278b99749265a3efe8ebc6aabb1501eaf8
-EBUILD xpenguins-2.2-r2.ebuild 556 BLAKE2B b2f812f33a28dea618444672ccf9639a9b5c96810d1ca557e545bb2512e15345957b01277a4dd2dd566ad2b8e78c575e5d20cad68cdac296a4e70ef9a21aeeec SHA512 c981b93cab6595aaf80db88202018e5d9d6ef7975b5623936c60a7a345266537ca39ec88e6c494173e7d7a4b2cb5ed1239317cd832d9628d7a664f49ccffce82
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/xpenguins/metadata.xml b/games-misc/xpenguins/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/xpenguins/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild b/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
deleted file mode 100644
index d3d5a27a0831..000000000000
--- a/games-misc/xpenguins/xpenguins-2.2-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-THEMES_VERSION="1.0"
-DESCRIPTION="Cute little penguins invading your desktop"
-HOMEPAGE="http://xpenguins.seul.org/"
-SRC_URI="http://xpenguins.seul.org/${P}.tar.gz
-	http://xpenguins.seul.org/xpenguins_themes-${THEMES_VERSION}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins -r ../themes/
-}
diff --git a/games-misc/yadex-1.7.0-r1 b/games-misc/yadex-1.7.0-r1
new file mode 100644
index 000000000000..2008bcf9d14e
--- /dev/null
+++ b/games-misc/yadex-1.7.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=x11-libs/libX11
+DESCRIPTION=A Doom level (wad) editor
+EAPI=6
+HOMEPAGE=http://www.teaser.fr/~amajorel/yadex/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 games-fps/freedoom
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.teaser.fr/~amajorel/yadex/yadex-1.7.0.tar.gz http://www.teaser.fr/~amajorel/yadex/logo_small.png -> yadex.png http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff https://dev.gentoo.org/~pacho/yadex/yadex-1.7.0-mrmeval-differential-patch.patch
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=89a7d9a4136c9cf0265af1a14d00c152
diff --git a/games-misc/yadex/Manifest b/games-misc/yadex/Manifest
deleted file mode 100644
index f594e0c0ebc7..000000000000
--- a/games-misc/yadex/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX yadex-1.7.0-64bit.patch 6085 BLAKE2B 1df8487ca4e67be00bd7c1f2dc9d503438898d00fddbad82cc898379cf09d065509c524839d3d696d4cb868eda09de2953987989ea46c2fca07878d8b72da0e7 SHA512 9bfd6d4a898ea098faf4b1f28f19f6a53d17845ddb0b65e013138c5d90e72a0d4abedb7efe2a066e92345cbb7f8f51a903dc2cefedb8286cec1b6dff0bca555d
-AUX yadex-1.7.0-NULL-is-not-zero.patch 406 BLAKE2B b526bbeb768f49024059beb56270a1ff1c975ed035583b95a2dcb1e70229041da88b086e27f61f5f9604f9e0019f8c6bf3740685e859a704ed5c7dafcfe64d3a SHA512 874fb952496bf87fbe7c2d4e8a2260a0b01841c4e52c9ec40290e2dcef782bbf3618228ff2284dbd0bc4c5bdcac8ac41ebda050a310962ab905b456a4232e4de
-AUX yadex-1.7.0-datadir.patch 2284 BLAKE2B 6e6c1f365959549f4d25d8414de23a290da9b469fd1239b3d13e3ab71766971adea7ef226c2cabd59c31315257148ef2dbd19d20f674bfd0ddcdd398a92013a0 SHA512 3178de8d4500aad849c7527cf3baec045f6f9b4028b0b8263f86bc55337b9048f562bae12d8650b7da1be79b2210382fca1e1d3124e6a3e4d9398d9b3139c744
-AUX yadex-1.7.0-destdir.patch 1652 BLAKE2B ef193ec637e5681de4d7614c285812e0c5091008cb548d40d872b4fdd0e44f6550e21bd95a4e0914979502f9ccc2da559d4b36c0a923d1681b3fcd7cf01fa70b SHA512 79cea41ad3a3a948df221c84c27314f85563c8d934513dc50f91a4bcd0d0d772dd42f33a28846b341e18e96b55ef8eafe273712dc3ff47f258017c99a87e51f1
-AUX yadex-1.7.0-elif.patch 364 BLAKE2B 40a888da9af747cf99819fa40a5f3885dd71005cc6d69b95f2e2629dce0d6fa6132a0a440e1a0921cee8b1ee6d61c3bf997f1bae433a7a0f74223f0ed4826a0f SHA512 ca03c8121c9f4689a1e39f3f5d1a37d0a31eddf9e38a507252dc974739ec74cf89cfd88d02b27fc6d02b5897d0e09769345c754e86e41cea598a3ba2e9ceaf4c
-AUX yadex_170-obj-overflow.patch 997 BLAKE2B 6542976c79aa3b369868fb5e9ebfa882b4309de7d467067868934c39e4023e5331e293a71642dcbc3de177a51f4bf5a13fe7157be8e62c6050feac4adb955868 SHA512 d05c56431a14a79abca3a0e2784edee71aa311e9eb78b516cc8a5e0efb2b0d20345c312b4bc9ba8b77bbc316948cea09b1d376475fe10c3fa83468cdd85c3783
-AUX yadex_170_O2.patch 573 BLAKE2B 758aa60ab6cbf6554933f844541f707fa0ac87220a259de8412c6362dde5a72e7e3592551e748e21cbeff381a53ab7dce5614291bf7f20e5a54752a80efae3de SHA512 30f986ef0744e26c043b1221d06bb3f7ec63a2e553ce1de85ac4f38c2ec50e5dbb3cb32bedf396b44d932b683698263c6b3f5d990fa46206805bfbffee71edbc
-AUX yadex_170_wm.patch 2131 BLAKE2B 3331adc1f62f6dfaba8313e91bb8382bf438f229708063b718cc3423068034bfadb229b352f2a3ea02760c521aef854a92b4cb3608986f8c2042fd4d82d1c070 SHA512 1d378c8739b39d35484aff2ba51d24934e20126cca2d3a90e5a99628a9727759e864e484c850cacff1155dbce15ea0ec9984c9eb057871358131585312148ada
-DIST Yadex_170_ALL.diff 73652 BLAKE2B dfead81153d0674d70d6e27b27e5abf0f4834c1e10d874d2c6148b4715539646b1cdf7d65f669413f4814f65e838e1f7031f221ba0baa3f7b248305e3fbe0598 SHA512 0879fa5f62e395d53ee9a004b116fbc0180178f41099876d7fea159c9ced25a54218be787d155895e74707e70a2c2e48f752dcf86aec4d1a8f41f96e2bcbe279
-DIST yadex-1.7.0-mrmeval-differential-patch.patch 128529 BLAKE2B 500df2ed4173f39313416728a70e6fe2823ec604c8ab63076058944cfe83ba8a584276a77ee87a0ac46e635484a2215c96c068e0ee231698b683cb0c65c0f391 SHA512 4ec1d9c452db88dd42c145c04e2ec3f9958e7a462eaa14512cffb57ede1f263d375105917845f52e76e7eb171476d4f44bd95dd8615131ca9fdaf6e229cb53fc
-DIST yadex-1.7.0.tar.gz 551318 BLAKE2B c5655c190466419505691762bb6b6641a61f68d80bc8a06f0e600a1e4a562b4989179400a2185104994971eeb55105e5f3691d6286c7431147b97cef0d00b3a2 SHA512 017f0ffc21b7b49e25e81a16c5badc3159f0b34954e278d658175da51b7ecf1e15e12579a244530afb10e133c890761d78c1f1a209a800887c145c5c1af5d317
-DIST yadex.png 2229 BLAKE2B 4559d8b134b58231b062e18b0e151a952a42748c7b2ddc9db64fa6456a37b0f4839d92eae92dec66085b1ad5f46f3d50082cd9398cc68713fec431d3e3ee946c SHA512 290cee14dea91ca4fb618f00575351b77b7c63ec155256274f83707d1f457cf4e7a921803203c75b371dc688d2ee90890f943ce3744987840aa1c5e0b5d977ee
-EBUILD yadex-1.7.0-r1.ebuild 1506 BLAKE2B 7ff7c86c7fd161cdb3eebc25fbc7b3b12a98ba059243ba6b12659ac4d93663880d8785eb60078fdfa5d3249c8f7f65e01cc9bffc07ebe335dd5b73728d7e1ad5 SHA512 44f1a82537cdb1dd026ae13bb596f8348458ed31a6464ce32744d054eeac9064bff675fe2dd6abc5118fe4ce8873c5b40d525dbfa6eaeb4be8514f0d80541ae4
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-misc/yadex/files/yadex-1.7.0-64bit.patch b/games-misc/yadex/files/yadex-1.7.0-64bit.patch
deleted file mode 100644
index 7f6b84216e5a..000000000000
--- a/games-misc/yadex/files/yadex-1.7.0-64bit.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
---- yadex-1.7.0/GNUmakefile	2006-03-16 20:33:36.000000000 -0800
-+++ yadex-1.7.0.new/GNUmakefile	2006-03-16 18:37:50.000000000 -0800
-@@ -53,6 +53,7 @@
- 
- # Which OS ?
- OS := $(shell uname -s | tr A-Z a-z)
-+ARCH := $(shell uname -i | tr A-Z a-z)
- 
- # Where your X11 libraries and headers reside.
- # Current rule:
-@@ -67,7 +68,11 @@
-     X11LIBDIR     = /usr/openwin/lib
-     X11INCLUDEDIR = /usr/openwin/include
-   else
--    X11LIBDIR     = /usr/X11R6/lib
-+    ifeq ($(findstring $(ARCH), x86_64), $(ARCH))
-+        X11LIBDIR     = /usr/X11R6/lib64
-+    else
-+        X11LIBDIR     = /usr/X11R6/lib
-+    endif
-     X11INCLUDEDIR = /usr/X11R6/include
-   endif
- endif
-diff -Naur yadex-1.7.0/src/levels.cc yadex-1.7.0.new/src/levels.cc
---- yadex-1.7.0/src/levels.cc	2003-03-28 04:37:32.000000000 -0800
-+++ yadex-1.7.0.new/src/levels.cc	2006-03-16 20:38:01.000000000 -0800
-@@ -1387,7 +1387,7 @@
-       }
-    NumWTexture = (int) val + 1;
-    /* read in the offsets for texture1 names */
--   offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
-+   offsets = (i32 *) GetMemory ((long) NumWTexture * (sizeof(i32)));
-    wf->read_i32 (offsets + 1, NumWTexture - 1);
-    if (wf->error ())
-       {
-@@ -1445,7 +1445,7 @@
-       }
-       NumWTexture = (int) val + 1;
-       /* read in the offsets for texture1 names */
--      offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
-+      offsets = (i32 *) GetMemory ((long) NumWTexture * sizeof(i32));
-       wf->read_i32 (offsets + 1, NumWTexture - 1);
-       {
- 	// FIXME
-@@ -1489,7 +1489,7 @@
- 	// FIXME
-       }
-       /* read in the offsets for texture2 names */
--      offsets = (i32 *) GetMemory ((long) val * 4);
-+      offsets = (i32 *) GetMemory ((long) val * sizeof(i32));
-       wf->read_i32 (offsets, val);
-       if (wf->error ())
-       {
-diff -Naur yadex-1.7.0/src/pic2img.cc yadex-1.7.0.new/src/pic2img.cc
---- yadex-1.7.0/src/pic2img.cc	2003-03-28 04:37:32.000000000 -0800
-+++ yadex-1.7.0.new/src/pic2img.cc	2006-03-16 20:30:40.000000000 -0800
-@@ -192,7 +192,7 @@
- 
- ColumnData    = (u8 *) GetMemory (TEX_COLUMNBUFFERSIZE);
- /* FIXME DOS and pic_width_ > 16000 */
--NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * 4);
-+NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * (sizeof(i32)));
- 
- if (long_offsets)
-    dir->wadfile->read_i32 (NeededOffsets, pic_width_);
-diff -Naur yadex-1.7.0/src/r_images.cc yadex-1.7.0.new/src/r_images.cc
---- yadex-1.7.0/src/r_images.cc	2006-03-16 20:33:12.000000000 -0800
-+++ yadex-1.7.0.new/src/r_images.cc	2006-03-16 20:39:17.000000000 -0800
-@@ -182,7 +182,7 @@
-       dir->wadfile->seek (dir->dir.start);
-       dir->wadfile->read_i32 (&numtex);
-       /* read in the offsets for texture1 names and info. */
--      offsets = (i32 *) GetMemory ((long) numtex * 4);
-+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
-       dir->wadfile->read_i32 (offsets, numtex);
-       for (n = 0; n < numtex && !texofs; n++)
-          {
-@@ -205,7 +205,7 @@
-       dir->wadfile->seek (dir->dir.start);
-       dir->wadfile->read_i32 (&numtex);
-       /* read in the offsets for texture1 names and info. */
--      offsets = (i32 *) GetMemory ((long) numtex * 4);
-+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
-       dir->wadfile->read_i32 (offsets, numtex);
-       for (n = 0; n < numtex && !texofs; n++)
-          {
-@@ -225,7 +225,7 @@
-          dir->wadfile->seek (dir->dir.start);
-          dir->wadfile->read_i32 (&numtex);
-          /* read in the offsets for texture2 names */
--         offsets = (i32 *) GetMemory ((long) numtex * 4);
-+         offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
-          dir->wadfile->read_i32 (offsets, numtex);
-          for (n = 0; n < numtex && !texofs; n++)
-             {
-diff -Naur yadex-1.7.0/src/textures.cc yadex-1.7.0.new/src/textures.cc
---- yadex-1.7.0/src/textures.cc	2003-04-24 13:50:36.000000000 -0700
-+++ yadex-1.7.0.new/src/textures.cc	2006-03-16 20:38:44.000000000 -0800
-@@ -177,7 +177,7 @@
- 	 goto textures_done;
- 	 }
-       // Read in the offsets for texture1 names and info
--      offsets = (i32 *) GetMemory ((long) numtex * 4);
-+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
-       wf->read_i32 (offsets, numtex);
-       if (wf->error ())
- 	 {
-@@ -233,7 +233,7 @@
- 	 goto texture1_done;
- 	 }
-       // Read in the offsets for texture1 names and info
--      offsets = (i32 *) GetMemory ((long) numtex * 4);
-+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
-       wf->read_i32 (offsets, numtex);
-       if (wf->error ())
- 	 {
-@@ -286,7 +286,7 @@
- 	    goto texture2_done;
- 	    }
- 	 // Read in the offsets for TEXTURE2 names
--	 offsets = (i32 *) GetMemory ((long) numtex * 4);
-+	 offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
- 	 wf->read_i32 (offsets, numtex);
- 	 if (wf->error ())
- 	    {
-@@ -514,7 +514,7 @@
-       dir->wadfile->seek (dir->dir.start);
-       dir->wadfile->read_i32 (&numtex);
-       // Read in the offsets for texture1 names and info
--      offsets = (i32 *) GetMemory ((long) numtex * 4);
-+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
-       dir->wadfile->read_i32 (offsets, numtex);
-       for (n = 0; n < numtex && !texofs; n++)
- 	 {
-@@ -534,7 +534,7 @@
- 	 dir->wadfile->seek (dir->dir.start);
- 	 dir->wadfile->read_i32 (&numtex);
- 	 // Read in the offsets for texture2 names
--	 offsets = (i32 *) GetMemory ((long) numtex * 4);
-+	 offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
- 	 dir->wadfile->read_i32 (offsets);
- 	 for (n = 0; n < numtex && !texofs; n++)
- 	    {
-diff -Naur yadex-1.7.0/src/yadex.h yadex-1.7.0.new/src/yadex.h
---- yadex-1.7.0/src/yadex.h	2006-03-16 20:33:12.000000000 -0800
-+++ yadex-1.7.0.new/src/yadex.h	2006-03-16 20:29:15.000000000 -0800
-@@ -98,11 +98,11 @@
- #define F_I16_D "hd"
- #define F_I16_H "hX"
- 
--typedef unsigned long  u32;
-+typedef unsigned int  u32;
- #define F_U32_D "lu"
- #define F_U32_H "lX"
- 
--typedef signed   long  i32;
-+typedef signed   int  i32;
- #define F_I32_D "ld"
- #define F_I32_H "lX"
- 
diff --git a/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch b/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch
deleted file mode 100644
index 7ceb7a558873..000000000000
--- a/games-misc/yadex/files/yadex-1.7.0-NULL-is-not-zero.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- yadex-1.7.0/src/wadlist.cc.old	2003-01-29 14:45:19.000000000 -0700
-+++ yadex-1.7.0/src/wadlist.cc	2003-01-29 14:45:56.000000000 -0700
-@@ -175,7 +175,7 @@
-   priv->iter = priv->list.erase (i);
-   if (priv->iter == priv->list.begin ())
-   {
--    priv->iter = 0;			// Catch bugs
-+    priv->iter = (std::_List_iterator<boost::shared_ptr<Wad_file> >)NULL;			// Catch bugs
-     priv->rewound = true;
-   }
- }
diff --git a/games-misc/yadex/files/yadex-1.7.0-datadir.patch b/games-misc/yadex/files/yadex-1.7.0-datadir.patch
deleted file mode 100644
index f7b2ab5fb7ef..000000000000
--- a/games-misc/yadex/files/yadex-1.7.0-datadir.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Naur yadex-1.7.0/configure yadex-1.7.0.new/configure
---- yadex-1.7.0/configure	2006-03-16 18:49:20.000000000 -0800
-+++ yadex-1.7.0.new/configure	2006-03-16 16:36:21.000000000 -0800
-@@ -408,16 +408,16 @@
-   ETCDIR=/etc/$APPNAME/%v
-   ETCDIRNV=/etc/$APPNAME
-   MANDIR=/usr/share/man
--  SHAREDIR=/usr/share/games/$APPNAME/%v
--  SHAREDIRNV=/usr/share/games/$APPNAME
-+  SHAREDIR=/usr/share/$APPNAME/%v
-+  SHAREDIRNV=/usr/share/$APPNAME
- elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null
- then
-   BINDIR=/usr/local/bin		# FHS-ly correct is /usr/local/games
-   ETCDIR=/etc/$APPNAME/%v
-   ETCDIRNV=/etc/$APPNAME
-   MANDIR=/usr/local/man
--  SHAREDIR=/usr/local/share/games/$APPNAME/%v
--  SHAREDIRNV=/usr/local/share/games/$APPNAME
-+  SHAREDIR=/usr/local/share/$APPNAME/%v
-+  SHAREDIRNV=/usr/local/share/$APPNAME
- elif expr "$PREFIX" : '//*opt/*$' >/dev/null
- then
-   echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2
-diff -Naur yadex-1.7.0/yadex.cfg yadex-1.7.0.new/yadex.cfg
---- yadex-1.7.0/yadex.cfg	2006-03-16 18:49:20.000000000 -0800
-+++ yadex-1.7.0.new/yadex.cfg	2006-03-16 18:49:43.000000000 -0800
-@@ -20,16 +20,17 @@
- #  9 doompr   Doom press release pre-beta (/pub/idgames/historic/doomprbt.zip)
- # 10 strife10 Strife 1.0 (demo or commercial)
- 
--  iwad1  = /usr/local/share/games/doom/doom.wad
--  iwad2  = /usr/local/share/games/doom2/doom2.wad
--  iwad3  = /usr/local/share/games/heretic/heretic.wad
--  iwad4  = /usr/local/share/games/hexen/hexen.wad
--  iwad5  = /usr/local/share/games/strife/strife1.wad
--  iwad6  = /usr/local/share/games/doom02/doom.wad
--  iwad7  = /usr/local/share/games/doom04/doom.wad
--  iwad8  = /usr/local/share/games/doom05/doom.wad
--  iwad9  = /usr/local/share/games/doompr/doompres.wad
--  iwad10 = /usr/local/share/games/strife10/strife1.wad
-+  iwad1  = /usr/share/doom/doom.wad
-+#  iwad2  = /usr/share/doom/doom2.wad
-+  iwad2  = /usr/share/doom/freedoom.wad
-+  iwad3  = /usr/share/doom/heretic.wad
-+  iwad4  = /usr/share/doom/hexen.wad
-+  iwad5  = /usr/share/doom/strife1.wad
-+  iwad6  = /usr/share/doom/doom.wad
-+  iwad7  = /usr/share/doom/doom.wad
-+  iwad8  = /usr/share/doom/doom.wad
-+  iwad9  = /usr/share/doom/doompres.wad
-+  iwad10 = /usr/share/doom/strife1.wad
- 
- # Name of the patch wads you want to load. None by default.
- 
diff --git a/games-misc/yadex/files/yadex-1.7.0-destdir.patch b/games-misc/yadex/files/yadex-1.7.0-destdir.patch
deleted file mode 100644
index a1f430c4bd9f..000000000000
--- a/games-misc/yadex/files/yadex-1.7.0-destdir.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
---- yadex-1.7.0/GNUmakefile	2006-03-16 16:08:10.000000000 -0800
-+++ yadex-1.7.0.new/GNUmakefile	2006-03-16 16:11:32.000000000 -0800
-@@ -392,19 +392,19 @@
- 
- .PHONY: install
- install: $(OBJDIR)/install
--	@scripts/mkinstalldirs $(BINDIR)
--	@scripts/mkinstalldirs $(ETCDIR)
--	@scripts/mkinstalldirs $(MANDIR)
--	@scripts/mkinstalldirs $(MANDIR)/man6
--	@scripts/mkinstalldirs $(SHAREDIR)
--	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION)
--	rm -f $(BINDIR)/yadex
--	ln -s yadex-$(VERSION) $(BINDIR)/yadex
--	$(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6
--	rm -f $(MANDIR)/man6/yadex.6
--	ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6
--	$(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD)
--	$(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg
-+	@scripts/mkinstalldirs $(DESTDIR)$(BINDIR)
-+	@scripts/mkinstalldirs $(DESTDIR)$(ETCDIR)
-+	@scripts/mkinstalldirs $(DESTDIR)$(MANDIR)
-+	@scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6
-+	@scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR)
-+	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(DESTDIR)$(BINDIR)/yadex-$(VERSION)
-+	rm -f $(DESTDIR)$(BINDIR)/yadex
-+	ln -s yadex-$(VERSION) $(DESTDIR)$(BINDIR)/yadex
-+	$(OBJDIR)/install -m 644 doc/yadex.6 $(DESTDIR)$(MANDIR)/man6/yadex-$(VERSION).6
-+	rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6
-+	ln -s yadex-$(VERSION).6 $(DESTDIR)$(MANDIR)/man6/yadex.6
-+	$(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD)
-+	$(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg
- 	@echo "---------------------------------------------------------------"
- 	@echo "  Yadex is now installed."
- 	@echo
diff --git a/games-misc/yadex/files/yadex-1.7.0-elif.patch b/games-misc/yadex/files/yadex-1.7.0-elif.patch
deleted file mode 100644
index 6674d5becdc2..000000000000
--- a/games-misc/yadex/files/yadex-1.7.0-elif.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gfx.cc.old	2009-08-01 18:47:46.000000000 +0200
-+++ b/src/gfx.cc	2009-08-01 18:46:03.000000000 +0200
-@@ -310,7 +310,7 @@
-     win_vis_id    = vis_info->visualid;
- #if defined _cplusplus || defined __cplusplus
-     win_vis_class = vis_info->c_class;
--#elif
-+#else
-     win_vis_class = vis_info->class;
- #endif
-     win_ncolours  = vis_info->colormap_size;
diff --git a/games-misc/yadex/files/yadex_170-obj-overflow.patch b/games-misc/yadex/files/yadex_170-obj-overflow.patch
deleted file mode 100644
index aba86f1e0e0e..000000000000
--- a/games-misc/yadex/files/yadex_170-obj-overflow.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- yadex-1.7.0/src/objects.cc	2003-03-28 06:37:32.000000000 -0600
-+++ yadex-1.7.0/src/objects.cc	2010-05-06 11:42:36.824661556 -0500
-@@ -543,7 +543,7 @@
- 	 SideDefs[last].yoff = 0;
- 	 strcpy (SideDefs[last].tex1, "-");
- 	 strcpy (SideDefs[last].tex2, "-");
--	 strcpy (SideDefs[last].tex3, default_middle_texture);
-+	 strncpy (SideDefs[last].tex3, default_middle_texture, sizeof(SideDefs[last].tex3));
- 	 SideDefs[last].sector = NumSectors - 1;
- 	 }
-       MadeMapChanges = 1;
---- yadex-1.7.0/src/editobj.cc	2003-04-24 15:32:39.000000000 -0500
-+++ yadex-1.7.0/src/editobj.cc	2010-05-07 16:36:49.825412601 -0500
-@@ -937,7 +937,7 @@
- 	       struct SideDef *s = SideDefs + l->sidedef1;
- 	       strcpy (s->tex1, "-");
- 	       strcpy (s->tex2, "-");
--	       strcpy (s->tex3, default_middle_texture);
-+	       strncpy (s->tex3, default_middle_texture, sizeof(s->tex3));
- 	       }
- 	    /* Don't delete the 2nd sidedef, it could be used
-                by another linedef. And if it isn't, the next
diff --git a/games-misc/yadex/files/yadex_170_O2.patch b/games-misc/yadex/files/yadex_170_O2.patch
deleted file mode 100644
index 5ef90ca94253..000000000000
--- a/games-misc/yadex/files/yadex_170_O2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -dupr yadex-1.7.901-patched/src/pic2img.cc yadex-1.7.901/src/pic2img.cc
---- yadex-1.7.901-patched/src/pic2img.cc	2006-11-06 17:35:03.000000000 +0100
-+++ yadex-1.7.901/src/pic2img.cc	2015-11-24 09:54:25.578048649 +0100
-@@ -92,9 +92,9 @@ uint8_t      *buf;	/* This variable is s
- 		   should be pasted. It can be off the image buffer! */
- 
- // Locate the lump where the picture is
-+   MasterDirectory dirbuf;
- if (picloc.wad != 0)
-    {
--   MasterDirectory dirbuf;
-    dirbuf.wadfile   = picloc.wad;
-    dirbuf.dir.start = picloc.ofs;
-    dirbuf.dir.size  = picloc.len;
diff --git a/games-misc/yadex/files/yadex_170_wm.patch b/games-misc/yadex/files/yadex_170_wm.patch
deleted file mode 100644
index 88006a28a2d4..000000000000
--- a/games-misc/yadex/files/yadex_170_wm.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -dupr yadex-1.7.901-patched/src/gfx.cc yadex-1.7.901/src/gfx.cc
---- yadex-1.7.901-patched/src/gfx.cc	2015-11-23 15:53:56.087783740 +0100
-+++ yadex-1.7.901/src/gfx.cc	2015-11-23 22:17:45.876127582 +0100
-@@ -114,6 +114,7 @@ int      win_depth;	// The depth of win
- int      x_server_big_endian = 0;	// Is the X server big endian ?
- int      ximage_bpp;	// Number of bytes per pixels in XImages
- int      ximage_quantum;// Pad XImages lines to a multiple of that many bytes
-+Atom     wm_delete;
- static pcolour_t *app_colour = 0;	// Pixel values for the app. colours
- static int DrawingMode    = 0;		// 0 = copy, 1 = xor
- static int LineThickness  = 0;		// 0 = thin, 1 = thick
-@@ -471,6 +472,10 @@ int InitGfx (void)
-     | ExposureMask
-     | StructureNotifyMask);
- 
-+  // register for message from window manager if the window is closed
-+  wm_delete = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-+  XSetWMProtocols(dpy, win, &wm_delete, 1);
-+
-   /*
-    *	Possibly load and query the font
-    */
-diff -dupr yadex-1.7.901-patched/src/gfx.h yadex-1.7.901/src/gfx.h
---- yadex-1.7.901-patched/src/gfx.h	2005-02-06 10:45:21.000000000 +0100
-+++ yadex-1.7.901/src/gfx.h	2015-11-23 22:16:10.674721105 +0100
-@@ -96,6 +96,7 @@ extern int      win_bpp;	// The depth of
- extern int	x_server_big_endian;	// Is the X server big-endian ?
- extern int      ximage_bpp;	// Number of bytes per pixels in XImages
- extern int      ximage_quantum;	// Pad XImage lines to a mult of that many B.
-+extern Atom     wm_delete;
- #endif  // ifdef X_PROTOCOL
- #endif  // ifdef Y_X11
- extern int	text_dot;     // DrawScreenText()/DrawScreenString() debug flag
-diff -dupr yadex-1.7.901-patched/src/input.cc yadex-1.7.901/src/input.cc
---- yadex-1.7.901-patched/src/input.cc	2006-11-03 14:49:01.000000000 +0100
-+++ yadex-1.7.901/src/input.cc	2015-11-23 22:15:21.398133938 +0100
-@@ -413,6 +413,12 @@ switch (ev.type)
- 	 }
- #endif
-       break;
-+
-+   case ClientMessage:
-+      if ((Atom)ev.xclient.data.l[0] == wm_delete)
-+        // window has been closed, simulate ESC keypress
-+        is.key = YK_ESC;
-+      break;
-       }
-    }  /* switch (ev.type) */
- }
diff --git a/games-misc/yadex/metadata.xml b/games-misc/yadex/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-misc/yadex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-misc/yadex/yadex-1.7.0-r1.ebuild b/games-misc/yadex/yadex-1.7.0-r1.ebuild
deleted file mode 100644
index 6cbfd87a8ed0..000000000000
--- a/games-misc/yadex/yadex-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A Doom level (wad) editor"
-HOMEPAGE="http://www.teaser.fr/~amajorel/yadex/"
-SRC_URI="http://www.teaser.fr/~amajorel/yadex/${P}.tar.gz
-	http://www.teaser.fr/~amajorel/yadex/logo_small.png -> ${PN}.png
-	http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff
-	https://dev.gentoo.org/~pacho/${PN}/${P}-mrmeval-differential-patch.patch
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}
-	games-fps/freedoom
-"
-
-src_prepare() {
-	default
-
-	eapply "${DISTDIR}"/Yadex_170_ALL.diff
-	eapply "${DISTDIR}"/${P}-mrmeval-differential-patch.patch
-	eapply "${FILESDIR}"/*.patch
-
-	# Remove bundled boost
-	rm -rf boost/
-	# Force the patched file to be old, otherwise the compile fails
-	touch -t 197010101010 "${S}"/src/wadlist.cc
-	touch -t 197010101010 "${S}"/src/gfx.cc
-}
-
-src_configure() {
-	tc-export CC CXX LD AR RANLIB
-	# not an autoconf script
-	./configure --prefix="/usr" || die "configure failed"
-}
-
-src_compile() {
-	emake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS} -std=gnu++03"
-}
-
-src_install() {
-	dobin obj/0/yadex
-	insinto "/usr/share/${PN}/${PV}"
-	doins ygd/*
-	doman doc/yadex.6
-	HTML_DOCS="docsrc/" einstalldocs
-	insinto /etc/yadex/${PV}
-	doins yadex.cfg
-
-	make_desktop_entry "yadex -i2 /usr/share/doom-data/freedoom/freedm.wad"
-	doicon "${DISTDIR}"/${PN}.png
-}
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index 9fc152675af0..16894443b824 100644
--- a/games-mud/Manifest.gz
+++ b/games-mud/Manifest.gz
diff --git a/games-mud/circlemud-3.1 b/games-mud/circlemud-3.1
new file mode 100644
index 000000000000..ef543a946c0a
--- /dev/null
+++ b/games-mud/circlemud-3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-libs/openssl:0=
+DESCRIPTION=a multi-user dungeon game system server
+EAPI=5
+HOMEPAGE=http://www.circlemud.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=circlemud
+RDEPEND=dev-libs/openssl:0= games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.circlemud.org/pub/CircleMUD/3.x/circle-3.1.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=138159cc4bf6fe5b176fccdbdcef80d4
diff --git a/games-mud/circlemud/Manifest b/games-mud/circlemud/Manifest
deleted file mode 100644
index 34efe204faa6..000000000000
--- a/games-mud/circlemud/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX circlemud-3.1-ldflags.patch 2808 BLAKE2B 89eb13ad95e943c2d46802ff86ca921759f39c47812df41ba91ca640ac559f0eb1d5685bab0727b0b7e1085f5b87e9fd7dc1288e88447a404f07005d4e1472ac SHA512 e60d6732cd488257f770e561852394ce6f5437b1c9b96233e9a650c02f4e66d3a31e37438655a7a25cd5af050d3da67c19154500cc3679ca0b4cb3d2aff92ba8
-DIST circle-3.1.tar.bz2 1176136 BLAKE2B f48a8feeb2cca17f23142f3456e09bc319aa26e2e295badc0e80b9d5f87f09f30f697ffba87c2edefdd6f77c8c56af68e395532c4a2232687c02ad869c19fb3f SHA512 161a0fd74aa248f6b357447be1de2d7c55e1fd281e9621d1cf7eb02d802ae06f362a318eeb3eb2425aad96620f71775245775a3aa42250e4374e8c82947df194
-EBUILD circlemud-3.1.ebuild 1477 BLAKE2B 5da20e2d5ec5f0e04c4d792a89b1c88cae0f0014525b2b1f739a46a2e3f00ca8b8d842fe85dde921155289cd4fa19d1d3332ab0cd6597d325e239526532588b0 SHA512 6ae81a0e438c1b48065de16063afd7df3b46b02a009ac782f96129513e39ce96ab7681f271f88a449ef36d5febb703eb8fa32c1cd053f74300928c2078aebc7d
-MISC metadata.xml 711 BLAKE2B 1ca940940c272abadf5883a5458c414fdff03775c999d6156c1552bfd8abfd2199d0bc273498248e091f9c04ea3f43bbf4cc10cef06daab6014d867281e07a40 SHA512 4e0b5aa6ad14a7a0ae17be00023586becd1c370f01eca9730632a52ea56b3b6a91cb0180ead036937df09c4adaf6a9950cd872de42bd8c81ca69112a63dd37f6
diff --git a/games-mud/circlemud/circlemud-3.1.ebuild b/games-mud/circlemud/circlemud-3.1.ebuild
deleted file mode 100644
index a0b3a10589f9..000000000000
--- a/games-mud/circlemud/circlemud-3.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="a multi-user dungeon game system server"
-HOMEPAGE="http://www.circlemud.org/"
-SRC_URI="http://www.circlemud.org/pub/CircleMUD/3.x/circle-${PV}.tar.bz2"
-
-LICENSE="circlemud"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/circle-${PV}
-
-src_prepare() {
-	cd src
-	touch .accepted
-	sed -i \
-		-e 's:^read.*::' licheck || die
-
-	# make circlemud fit into Gentoo nicely
-	sed -i \
-		-e "s:\"lib\":\"${GAMES_DATADIR}/${PN}\":g" \
-		-e "s:\(LOGNAME = \)NULL:\1\"${GAMES_LOGDIR}/${PN}.log\":g" \
-		config.c || die
-	sed -i \
-		-e "s:etc/:${GAMES_SYSCONFDIR}/${PN}/:g" db.h || die
-
-	# now lets rename binaries (too many are very generic)
-	sed -i \
-		-e "s:\.\./bin/autowiz:${PN}-autowiz:" limits.c || die
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	local bin
-
-	for bin in autowiz delobjs listrent mudpasswd play2to3 purgeplay \
-	           shopconv showplay sign split wld2html ; do
-		newgamesbin bin/${bin} ${PN}-${bin}
-	done
-	dogamesbin bin/circle
-
-	dodir "${GAMES_DATADIR}/${PN}"
-	cp -r lib/*  "${D}/${GAMES_DATADIR}/${PN}" || die
-
-	insinto "${GAMES_SYSCONFDIR}/${PN}"
-	doins lib/etc/*
-
-	dodoc doc/{README.UNIX,*.pdf,*.txt} ChangeLog FAQ README release_notes.${PV}.txt
-	prepgamesdirs
-	fperms 770 "${GAMES_SYSCONFDIR}/${PN}/players"
-}
diff --git a/games-mud/circlemud/files/circlemud-3.1-ldflags.patch b/games-mud/circlemud/files/circlemud-3.1-ldflags.patch
deleted file mode 100644
index fc86e5e7056e..000000000000
--- a/games-mud/circlemud/files/circlemud-3.1-ldflags.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/Makefile.in.old	2010-09-16 12:19:26.000000000 +0200
-+++ src/Makefile.in	2010-09-16 12:19:41.000000000 +0200
-@@ -54,7 +54,7 @@
- 	$(MAKE) $(BINDIR)/circle
- 
- $(BINDIR)/circle : $(OBJFILES)
--	$(CC) -o $(BINDIR)/circle $(PROFILE) $(OBJFILES) $(LIBS)
-+	$(CC) $(LDFLAGS) -o $(BINDIR)/circle $(PROFILE) $(OBJFILES) $(LIBS)
- 
- clean:
- 	rm -f *.o
---- src/util/Makefile.in.old	2010-09-16 12:31:01.000000000 +0200
-+++ src/util/Makefile.in	2010-09-16 12:32:08.000000000 +0200
-@@ -52,40 +52,40 @@
- 
- $(BINDIR)/autowiz: autowiz.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h $(INCDIR)/utils.h $(INCDIR)/db.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/autowiz autowiz.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/autowiz autowiz.c
- 
- $(BINDIR)/delobjs: delobjs.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h $(INCDIR)/utils.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/delobjs delobjs.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/delobjs delobjs.c
- 
- $(BINDIR)/listrent: listrent.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/listrent listrent.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/listrent listrent.c
- 
- $(BINDIR)/mudpasswd: mudpasswd.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h $(INCDIR)/utils.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/mudpasswd mudpasswd.c @CRYPTLIB@
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/mudpasswd mudpasswd.c @CRYPTLIB@
- 
- $(BINDIR)/play2to3: play2to3.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/play2to3 play2to3.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/play2to3 play2to3.c
- 
- $(BINDIR)/purgeplay: purgeplay.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h $(INCDIR)/utils.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/purgeplay purgeplay.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/purgeplay purgeplay.c
- 
- $(BINDIR)/shopconv: shopconv.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h $(INCDIR)/db.h $(INCDIR)/utils.h $(INCDIR)/shop.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
- 
- $(BINDIR)/showplay: showplay.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h \
- 	$(INCDIR)/structs.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/showplay showplay.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/showplay showplay.c
- 
- $(BINDIR)/sign: sign.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/sign sign.c @NETLIB@
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/sign sign.c @NETLIB@
- 
- $(BINDIR)/split: split.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/split split.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/split split.c
- 
- $(BINDIR)/wld2html: wld2html.c $(INCDIR)/conf.h $(INCDIR)/sysdep.h
--	$(CC) $(CFLAGS) -o $(BINDIR)/wld2html wld2html.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(BINDIR)/wld2html wld2html.c
diff --git a/games-mud/circlemud/metadata.xml b/games-mud/circlemud/metadata.xml
deleted file mode 100644
index 53568db4ed74..000000000000
--- a/games-mud/circlemud/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-CircleMUD is a multi-user dungeon game system (MUD) written by Jeremy Elson, originally at 
-Johns Hopkins University's Department of Computer Science (I graduated in May of 1996). 
-CircleMUD is a derivative of DikuMUD Gamma 0.0, which was written in 1990 at DIKU, the 
-Department of Computer Science at the University of Copenhagen, by Katja Nyboe, Tom 
-Madsen, Hans Henrik Staerfeldt, Michael Seifert, and Sebastian Hammer.
-</longdescription>
-</pkgmetadata>
diff --git a/games-mud/crystal-0.2.4-r1 b/games-mud/crystal-0.2.4-r1
new file mode 100644
index 000000000000..22eb81b0d4be
--- /dev/null
+++ b/games-mud/crystal-0.2.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/openssl:0= sys-libs/ncurses:0= sys-libs/zlib virtual/libiconv 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=The crystal MUD client
+EAPI=6
+HOMEPAGE=http://www.evilmagic.org/crystal/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/openssl:0= sys-libs/ncurses:0= sys-libs/zlib virtual/libiconv
+SLOT=0
+SRC_URI=http://www.evilmagic.org/dist/crystal-0.2.4.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_=8b4f20a7c77a79800a7e3588866c6fcd
diff --git a/games-mud/crystal/Manifest b/games-mud/crystal/Manifest
deleted file mode 100644
index 1b4a51028f25..000000000000
--- a/games-mud/crystal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX crystal-0.2.4-build.patch 916 BLAKE2B 90529e6be405c8f137041252109ad12a33a075baf3f3deab1c1f2279a26d49f3cd076e240e002e62f422c4fa25aef43aacd0daa643344a700cb9b9a7db586ee3 SHA512 4e3446634ca2996fecde8c9a12e2cc8d0900862dc2019cc0b260e58b5a1222f7e9b4faeeffc30f560dcaf97d83e1113800b19af36b054dbff9ed0b99296e777b
-AUX crystal-0.2.4-gcc43.patch 194 BLAKE2B 43b2ad908ea17e3b7c6123492a2c28a5dc0f3a0210d09a125efaab48d8da370b85d30538ccf3ee4b9e7af7ee46c7a2d5105b5d67982414610040fe4be296361d SHA512 98fbde01a18f36edabf8e324e1c5b7c12026032c59e5b628519cc21027e9553dda5d76fd1458f851ff9796d49f697b76f6f11fde85fbfdb433bcf05abdbf1021
-DIST crystal-0.2.4.tar.gz 146962 BLAKE2B 0b98e7db594ea27be26d7391c1f1ee8cdbf3239b9d841ebebf61d1022e492e3791057b70ddbe67f3da2e4a93c5b2d3f390ee2852cb489cbad7426b14661b7de0 SHA512 8493b0d84db610606ce97e918cfa418123c39e5afffb4bf880aa905c46dc13d0b7ff0366b497e020276afadf9db951fcd6fa7aa0e25f5357574fa465ee152916
-EBUILD crystal-0.2.4-r1.ebuild 748 BLAKE2B 636fd486c1f060124a75f18745449c34a7d0eefd8b8d0996e77a20ab5d2367cfd925c8562e15d2215c1bd606a5f15f98d71ef1a3bd2e7a40c40659361dbc818d SHA512 ce1df203325428707f3df00755fdf17f39ad5aa0d6b0bb6d97f6e170411f3d3a7e8476503c750ce874b499902559faf796e3512855391451130efabfd49ad8eb
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/crystal/crystal-0.2.4-r1.ebuild b/games-mud/crystal/crystal-0.2.4-r1.ebuild
deleted file mode 100644
index c5f5e04e44bf..000000000000
--- a/games-mud/crystal/crystal-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="The crystal MUD client"
-HOMEPAGE="http://www.evilmagic.org/crystal/"
-SRC_URI="http://www.evilmagic.org/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/openssl:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-
-	# avoid colliding with xscreensaver (bug #281191)
-	mv crystal.6 crystal-mud.6 || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-scripting
-}
diff --git a/games-mud/crystal/files/crystal-0.2.4-build.patch b/games-mud/crystal/files/crystal-0.2.4-build.patch
deleted file mode 100644
index 1f8917e4056d..000000000000
--- a/games-mud/crystal/files/crystal-0.2.4-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -31,7 +31,9 @@
- AC_PROG_CXX
- AC_CHECK_FUNCS(select socket strerror strstr)
- 
--AC_CHECK_LIB(curses, main, [LIBS=" -lcurses "], AC_CHECK_LIB(ncurses, main, [LIBS=" -lncurses "], AC_MSG_ERROR([No curses])))
-+PKG_CHECK_MODULES([NCURSES], [ncurses])
-+AC_SUBST([NCURSES_CFLAGS])
-+AC_SUBST([NCURSES_LIBS])
- 
- AC_CHECK_LIB(z, main, [LIBS=$LIBS" -lz "; AC_DEFINE(HAVE_ZLIB)], AC_MSG_WARN([No zlib - MCCP support will not be built]))
- 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -5,7 +5,11 @@
- 		common.h crystal.h grid.h io.h telnet.h wcwidth.c \
- 	scripting.cc scripting.h
- 
--man_MANS = crystal.6
-+crystal_CPPFLAGS = $(NCURSES_CFLAGS)
-+
-+crystal_LDADD = $(NCURSES_LIBS)
-+
-+man_MANS = crystal-mud.6
- 
- DEBDIST = README.Debian debian/changelog.real debian/compat debian/control debian/copyright debian/crystal-default.ex debian/crystal.substvars debian/docs debian/rules debian/watch.ex
- 
diff --git a/games-mud/crystal/files/crystal-0.2.4-gcc43.patch b/games-mud/crystal/files/crystal-0.2.4-gcc43.patch
deleted file mode 100644
index dbb4e2a1649f..000000000000
--- a/games-mud/crystal/files/crystal-0.2.4-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common.h
-+++ b/common.h
-@@ -3,6 +3,8 @@
- 
- #include <string>
- #include <stdio.h>
-+#include <cstring>
-+#include <cstdlib>
- #include <curses.h>
- #include <termios.h>
- #include <sys/ioctl.h>
diff --git a/games-mud/crystal/metadata.xml b/games-mud/crystal/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-mud/crystal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/gmudix-1.0-r1 b/games-mud/gmudix-1.0-r1
new file mode 100644
index 000000000000..9bcf13c84530
--- /dev/null
+++ b/games-mud/gmudix-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=GTK+ MUD client with many features and an easy scripting language
+EAPI=6
+HOMEPAGE=http://dw.nl.eu.org/mudix.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://dw.nl.eu.org/gmudix/gmudix-1.0.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_=df1eaa7a2197bcab8868e728c3645f11
diff --git a/games-mud/gmudix/Manifest b/games-mud/gmudix/Manifest
deleted file mode 100644
index 65c69a696eab..000000000000
--- a/games-mud/gmudix/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gmudix-1.0-as-needed.patch 1086 BLAKE2B 8e85a01154f336450888b8e42939a7328ea90ce17c6b05e72fb15d25fcbbbadc026af7f0a08803701c049389c9bfa5f9f210a813c7964446f3f52c1660aa7780 SHA512 74abd6878a94ab149977baa665c11881f56bfc33b8515bce9fa1582c488ea765f7ef84e65dd45c6fdf681f3e1d21d8052319c6e9b56da6da8180e2de1c69cbdc
-AUX gmudix-1.0-format.patch 514 BLAKE2B e223a4b8ba17237fed51c3f0eb3e541c4589e8d85a82e84caec693970af4d334c5a1018214d4c5cd754db37e73a3b87a773ccb6427dfb707472a16cf4f731a9f SHA512 009826ea4ece40a7f1face057eca8161d517aa5e498a3dc4cce84b8fa1dbfbe4bd5e0dff93cea8cc60c312ceffb18b857266062762d8f60681e25df67cd8bce9
-DIST gmudix-1.0.tar.gz 137548 BLAKE2B 5b6b5cb75a41967e8a436651397e2560303006f34a88cf47991b331a60589b9e47835657155bf284f569180169f10a5f8871659d1d380a1cf211b8d853e2c575 SHA512 c22a725af6914d5177a737c1abf1ee38c133854fab8723dc01a89739b58214937008c3931ccc5928e88ee1ecbda385304ff862606eacec377addd6ee8de02b38
-EBUILD gmudix-1.0-r1.ebuild 700 BLAKE2B 5a5425181665122036de40ac91f36b450c6641ff8783e1dfb0d07e874c7462518b1c764348a86baf605f9983bf93805d2b0ffc919a79f4d0851051d6e7638ba1 SHA512 060e0970cc1eca5a1baf5df5fdd13a344b90b60447bceea033f6fb4657793b7039d510053a0f4ced7a038767cc4ad5a30600afdeafc06702f83c51979d8ec2d2
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/gmudix/files/gmudix-1.0-as-needed.patch b/games-mud/gmudix/files/gmudix-1.0-as-needed.patch
deleted file mode 100644
index fe1de7b8cbdc..000000000000
--- a/games-mud/gmudix/files/gmudix-1.0-as-needed.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -8,7 +8,8 @@
- AC_PROG_MAKE_SET
- 
- dnl Checks for libraries.
--PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= 2.0.0)
-+PKG_CHECK_MODULES(GTK, gtk+-2.0)
-+PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
- 
- dnl Checks for header files.
- AC_HEADER_STDC
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,10 +1,5 @@
- bin_PROGRAMS   = gmudix
- gmudix_SOURCES = alias.c commands.c file.c gui_alias.c gui_capture.c gui_character.c gui_color.c gui_font.c gui_general.c gui_macro.c gui_main.c gui_path.c gui_preferences.c gui_tab.c gui_timer.c gui_trigger.c gui_user.c gui_variable.c history.c log.c macro.c mccp.c mudix.c net.c path.c process.c string.c tabs.c telnet.c timer.c trigger.c user.c variable.c
--INCLUDES = -Wall -I.. -I../include `pkg-config --cflags gtk+-2.0`
--gmudix_LDFLAGS = -lz `pkg-config --libs gtk+-2.0` `pkg-config --libs gthread-2.0`
--
--if DEBUG_SYMBOLS
--CFLAGS := $(CFLAGS) -O2 -g
--else
--CFLAGS := $(CFLAGS) -O2 
--endif
-+AM_CFLAGS = -Wall
-+INCLUDES = -I.. -I../include $(GTK_CFLAGS) $(GTHREAD_CFLAGS)
-+LDADD = -lz $(GTK_LIBS) $(GTHREAD_LIBS)
diff --git a/games-mud/gmudix/files/gmudix-1.0-format.patch b/games-mud/gmudix/files/gmudix-1.0-format.patch
deleted file mode 100644
index 4bb9729840e8..000000000000
--- a/games-mud/gmudix/files/gmudix-1.0-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/gui_user.c	2016-02-04 21:21:15.141455597 +0100
-+++ b/src/gui_user.c	2016-02-04 21:21:31.016156493 +0100
-@@ -820,7 +820,7 @@
- 
-     dialog = gtk_message_dialog_new(GTK_WINDOW(user->gui_user.g_window), 
-                 GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, 
--                GTK_BUTTONS_CLOSE, msg);
-+                GTK_BUTTONS_CLOSE, "%s", msg);
-                 
-     gtk_window_set_transient_for(GTK_WINDOW(user->gui_user.g_window), 
-                                  GTK_WINDOW(dialog));
diff --git a/games-mud/gmudix/gmudix-1.0-r1.ebuild b/games-mud/gmudix/gmudix-1.0-r1.ebuild
deleted file mode 100644
index fa4c5f6bdf05..000000000000
--- a/games-mud/gmudix/gmudix-1.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="GTK+ MUD client with many features and an easy scripting language"
-HOMEPAGE="http://dw.nl.eu.org/mudix.html"
-SRC_URI="http://dw.nl.eu.org/gmudix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_prepare() {
-	default
-
-	mv configure.in configure.ac || die
-	rm -f missing || die
-	eautoreconf
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc AUTHORS ChangeLog README TODO doc/*txt
-}
diff --git a/games-mud/gmudix/metadata.xml b/games-mud/gmudix/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-mud/gmudix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/gnome-mud-0.11.2-r2 b/games-mud/gnome-mud-0.11.2-r2
new file mode 100644
index 000000000000..186586466639
--- /dev/null
+++ b/games-mud/gnome-mud-0.11.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=virtual/libintl dev-libs/libpcre dev-perl/XML-Parser gnome-base/gconf:2 >=gnome-base/libglade-2.0.1:2.0 gstreamer? ( media-libs/gstreamer:1.0 ) net-libs/gnet:2 x11-libs/gtk+:2 >=x11-libs/vte-0.11:0 virtual/pkgconfig app-text/rarian >=dev-util/intltool-0.23 >=sys-devel/gettext-0.11.5 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME MUD client
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/GnomeMud
+IUSE=gstreamer
+KEYWORDS=amd64 x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=virtual/libintl dev-libs/libpcre dev-perl/XML-Parser gnome-base/gconf:2 >=gnome-base/libglade-2.0.1:2.0 gstreamer? ( media-libs/gstreamer:1.0 ) net-libs/gnet:2 x11-libs/gtk+:2 >=x11-libs/vte-0.11:0
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-mud/0.11/gnome-mud-0.11.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3983cab052c92705cfe34c9e7fc38230
diff --git a/games-mud/gnome-mud-9999 b/games-mud/gnome-mud-9999
new file mode 100644
index 000000000000..b88ef15b2d4e
--- /dev/null
+++ b/games-mud/gnome-mud-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=virtual/libintl >=dev-libs/glib-2.36:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.11:0 dev-libs/libpcre gnome-base/gconf:2 gstreamer? ( media-libs/gstreamer:1.0 ) virtual/pkgconfig app-text/rarian >=dev-util/intltool-0.23 >=sys-devel/gettext-0.11.5 >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=GNOME MUD client
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/GnomeMud
+IUSE=debug gstreamer
+LICENSE=GPL-2+
+RDEPEND=virtual/libintl >=dev-libs/glib-2.36:2 >=x11-libs/gtk+-2.24.0:2 >=x11-libs/vte-0.11:0 dev-libs/libpcre gnome-base/gconf:2 gstreamer? ( media-libs/gstreamer:1.0 )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4dd7162b3535e2b3c4c1f5e9183a6c68
diff --git a/games-mud/gnome-mud/Manifest b/games-mud/gnome-mud/Manifest
deleted file mode 100644
index 15b8d4ffa416..000000000000
--- a/games-mud/gnome-mud/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0.11.2-gst1.patch 1645 BLAKE2B ad5ec717a6dbaec685d12754c7f2fc8ba29fc3485884a2ab77776f1917f1afd3ba4f7ac04c6323b06bf125bd1609da5c2502205f9d7d9570c7eca925004941c0 SHA512 ed3ec4831e1cd7955d0629939270643ee2fe7a6995608fa2ce22e03f86a9ca3ad5c3b66aad648ed0133db6f601995bc7b9e767438b296d23efbc9819b6b5b45b
-AUX 0.11.2-telopts-reenable.patch 1284 BLAKE2B edb0ff64c37b9da04ac5bbd40d2b8e8ebae981571259c8fcdbe736171a97569c900307dfe77b1fe5dad7b3718a6d9a07be0653a1eea716cd42af8c2ab11215b2 SHA512 9a9f8ade511282bcc4142d3bff15b0a64dda36b327920f4d665852d43a13854b5e876bef8e8c667c28330896e9fc09965317595850b4c0e67285d9c8d8223ed5
-DIST gnome-mud-0.11.2.tar.bz2 444294 BLAKE2B e3e1c6ebb4dbd4169f947adb5e481db19b8a7d774866e56e17d6448486b2962cdd5a021195e3b26840143362dbe60c519105166c7b5f8d0f9cc10e3563eef8f9 SHA512 b8dd4ffa0cd5ab7077b21c908fb92b6b5c3e1fc65c06c890d8ebb4ab4fd6d1f8ac4a67d9a815634fc45f3357dd495ba329057df5662c00d2074278a16470c422
-EBUILD gnome-mud-0.11.2-r2.ebuild 1249 BLAKE2B 991a0d465eb7df2a026f4506a137db28067eebfaf4fc894b8c3b1a98eb944da83d480c7a69649822e185a2916c3bdaea86d03ebe35e63f6fb56d7ed6e9fcaef6 SHA512 bee265e98a53b11a1133fa987f65236fdf394aa8e64d876b70b7c1e9962be1ed9254e24fab8c79cce02d7c73f6b421002fa4f842b138cd73369bf32e5bc3babe
-EBUILD gnome-mud-9999.ebuild 891 BLAKE2B c44f14049be4069dfdcf226aa7c51e9c4b68769c9e5ead68df5c263760854d6795a6829c048baae9bf85bb2f684ecd47033c214a9467cb9c6c4808fa1bc90783 SHA512 12fefeaf3d0509f2ba41ffc1dffbb55c0d4c99f2b79f7527aa7e7325efc6a382441c720db562b07dbbd75f2eb4232ee776a2f40faea3ce7f448caa527ad4ef34
-MISC metadata.xml 350 BLAKE2B 6bd2e206bc7a4f2e4d9cde3a52ea0879f08187ee03b79abaf712cf4574e4539302552781c00764dc78f42f70576e4d0faf2d938c9d787c5345c0122a4db77d12 SHA512 0531e7ca85ea8011f5aeef4517ea6dc1362323dbb4b05be0c9fa028e2a3cdeae880cdcbdef070c048649520cbe23ec8bce4785c2bfbbdd3c989380b036d51984
diff --git a/games-mud/gnome-mud/files/0.11.2-gst1.patch b/games-mud/gnome-mud/files/0.11.2-gst1.patch
deleted file mode 100644
index 64c6682c6726..000000000000
--- a/games-mud/gnome-mud/files/0.11.2-gst1.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 15c37855ab3559efaeffcef651c98ed971ae84bb Mon Sep 17 00:00:00 2001
-From: Steven Jackson
-Date: Wed, 19 Apr 2017 20:02:57 +0100
-Subject: [PATCH] gstreamer: Upgrade to 1.0 from 0.10
----
- configure.ac      | 6 +++---
- gnome-mud.spec.in | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 50c4c81..125b054 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,7 +76,7 @@ LIBGNET_REQUIRED=0.22
- VTE_REQUIRED=0.11.00
- PCRE_REQUIRED=6.0.0
- GCONF_REQUIRED=0.20
--GSTREAMER_REQUIRED=0.10
-+GSTREAMER_REQUIRED=1.0
- 
- PKG_CHECK_MODULES(GMUD, gtk+-2.0 >= $GTK_REQUIRED vte >= $VTE_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libpcre >= $PCRE_REQUIRED gmodule-2.0 >= $GMODULE_REQUIRED gnet-2.0 >= $LIBGNET_REQUIRED gconf-2.0 >= $GCONF_REQUIRED)
- AC_SUBST(GMUD_CFLAGS)
-@@ -114,14 +114,14 @@ AC_ARG_ENABLE(gstreamer,
- 		       [Enable GStreamer used for MSP (Mud Sound Protocol) Default=auto]),,
- 		enable_gstreamer=auto)
- if test "x$enable_gstreamer" != "xno"; then
--	PKG_CHECK_EXISTS(gstreamer-0.10, have_gst=yes, have_gst=no)	
-+	PKG_CHECK_EXISTS(gstreamer-1.0, have_gst=yes, have_gst=no)
- 	if test "x$have_gst" = "xno" -a "x$enable_gstreamer" = "xyes"; then
- 	  AC_MSG_ERROR([Gstreamer support explicitly requested but libgstreamer was not found])
- 	fi
- 	if test "x$have_gst" = "xyes"; then
- 	  AC_DEFINE(ENABLE_GST, 1, [Define if GStreamer should be enabled])
- 	  enable_gstreamer=yes
--	  PKG_CHECK_MODULES(MSP, gstreamer-0.10 >= $GSTREAMER_REQUIRED)
-+	  PKG_CHECK_MODULES(MSP, gstreamer-1.0 >= $GSTREAMER_REQUIRED)
- 	fi
- fi
- AM_CONDITIONAL(USE_GSTREAMER, test "x$enable_gstreamer" = xyes)
--- 
-2.10.2
-
diff --git a/games-mud/gnome-mud/files/0.11.2-telopts-reenable.patch b/games-mud/gnome-mud/files/0.11.2-telopts-reenable.patch
deleted file mode 100644
index ebafe30c4cf4..000000000000
--- a/games-mud/gnome-mud/files/0.11.2-telopts-reenable.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 62b043beedc14741a000e848a004ba44982b28b8 Mon Sep 17 00:00:00 2001
-From: Steven Jackson
-Date: Wed, 19 Apr 2017 10:38:18 +0000
-Subject: [PATCH] mud-telnet: Fix re-enabling disabled TELOPTS
-
-When the server disabled a TELOPT it wasn't possible for it to
-re-enable it, as it should.
-
-Enabling and disabling MSP and CHARSET in the preferences window
-doesn't control the MudTelnetHandler enabled field, so this change
-doesn't break that. Those preferences are used at a higher level,
-in mud-window-view.c.
-
-Thanks to shentino for reporting and assisting with the fix.
-
-Bug report: https://bugzilla.gnome.org/show_bug.cgi?id=781452
----
- src/mud-telnet.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mud-telnet.c b/src/mud-telnet.c
-index 052ba04..0fe274a 100644
---- a/src/mud-telnet.c
-+++ b/src/mud-telnet.c
-@@ -939,7 +939,7 @@ mud_telnet_handle_positive_nego(MudTelnet *telnet,
- 	// his state to YES and send DO; otherwise send DONT
- 	// FIXME-US/HIM
- 	// FIXME: What to do in the opposite "him" gint value case?
--	if (mud_telnet_isenabled(telnet, opt_no, him))
-+	if (mud_telnet_get_index_by_option(telnet, opt_no) != -1)
- 	{
- 	    mud_telnet_set_telopt_state(opt, TELOPT_STATE_YES, bitshift);
- 	    mud_telnet_send_iac(telnet, affirmative, opt_no);
---
-1.9.1
diff --git a/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild b/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild
deleted file mode 100644
index d8bafca919dc..000000000000
--- a/games-mud/gnome-mud/gnome-mud-0.11.2-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME MUD client"
-HOMEPAGE="https://wiki.gnome.org/Apps/GnomeMud"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="gstreamer"
-
-RDEPEND="virtual/libintl
-	dev-libs/libpcre
-	dev-perl/XML-Parser
-	gnome-base/gconf:2
-	>=gnome-base/libglade-2.0.1:2.0
-	gstreamer? ( media-libs/gstreamer:1.0 )
-	net-libs/gnet:2
-	x11-libs/gtk+:2
-	>=x11-libs/vte-0.11:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/rarian
-	>=dev-util/intltool-0.23
-	>=sys-devel/gettext-0.11.5"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-telopts-reenable.patch #616000
-	"${FILESDIR}"/${PV}-gst1.patch # Needs eautoreconf
-)
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gstreamer)
-}
-
-src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS PLUGIN.API README ROADMAP" \
-		gnome2_src_install
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "For proper plugin operation, please create ~/.gnome-mud/plugins/"
-	elog "if that directory doesn't already exist."
-	elog "The command to do that is:"
-	elog "    mkdir -p ~/.gnome-mud/plugins/"
-	echo
-}
diff --git a/games-mud/gnome-mud/gnome-mud-9999.ebuild b/games-mud/gnome-mud/gnome-mud-9999.ebuild
deleted file mode 100644
index 074b3bad3d25..000000000000
--- a/games-mud/gnome-mud/gnome-mud-9999.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 git-r3
-
-DESCRIPTION="GNOME MUD client"
-HOMEPAGE="https://wiki.gnome.org/Apps/GnomeMud"
-SRC_URI=""
-EGIT_REPO_URI="git://git.gnome.org/gnome-mud"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug gstreamer"
-
-RDEPEND="virtual/libintl
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gtk+-2.24.0:2
-	>=x11-libs/vte-0.11:0
-	dev-libs/libpcre
-	gnome-base/gconf:2
-	gstreamer? ( media-libs/gstreamer:1.0 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/rarian
-	>=dev-util/intltool-0.23
-	>=sys-devel/gettext-0.11.5"
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable gstreamer) \
-		$(use_enable debug debug-logger)
-}
-
-src_install() {
-	DOCS="AUTHORS BUGS ChangeLog NEWS README ROADMAP" \
-		gnome2_src_install
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-}
diff --git a/games-mud/gnome-mud/metadata.xml b/games-mud/gnome-mud/metadata.xml
deleted file mode 100644
index 03ad2b003494..000000000000
--- a/games-mud/gnome-mud/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>leio@gentoo.org</email>
-	<name>Mart Raudsepp</name>
-</maintainer>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/kildclient-3.0.1-r1 b/games-mud/kildclient-3.0.1-r1
new file mode 100644
index 000000000000..22f23802aa69
--- /dev/null
+++ b/games-mud/kildclient-3.0.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-lang/perl dev-perl/Locale-gettext dev-perl/JSON sys-libs/zlib x11-libs/gtk+:3 virtual/libintl spell? ( app-text/gtkspell:3 ) gnutls? ( net-libs/gnutls ) sys-devel/gettext 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=Powerful MUD client with a built-in PERL interpreter
+EAPI=6
+HOMEPAGE=http://kildclient.sourceforge.net
+IUSE=doc gnutls spell
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-lang/perl dev-perl/Locale-gettext dev-perl/JSON sys-libs/zlib x11-libs/gtk+:3 virtual/libintl spell? ( app-text/gtkspell:3 ) gnutls? ( net-libs/gnutls )
+SLOT=0
+SRC_URI=mirror://sourceforge/kildclient/kildclient-3.0.1.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_=44e72759008fb434151bf409f92ad798
diff --git a/games-mud/kildclient/Manifest b/games-mud/kildclient/Manifest
deleted file mode 100644
index e5f3f7098e35..000000000000
--- a/games-mud/kildclient/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kildclient-3.0.1-gentoo.patch 3882 BLAKE2B 9f2bf6c8794365d17f9b1271d7ff20ede322056bd59a527e43fc82d36541c9d4b565d67271a468f82ada266265a7ae5b84bc406d75b5656df6d15dfa8e1544a9 SHA512 8f4468cab922a911486f891215cb29de667da3f99c7ac2a4b6b59c59e2c2ba2f7f11c467b7009b0bb77b1a4953a99cbf851cc09a88a905e7c2478273546fc1ea
-DIST kildclient-3.0.1.tar.gz 1838526 BLAKE2B 06243adbd682574f0ff155b9087fa81a35c2b7462b8051a9315d67eeb520dd6211e8c402d7f90a76a04d105f517645e628cec5d355c8f1b6725775fd94eb3911 SHA512 835b31b2e45a5895fd4aefcb662d6c3bf2c888836f12511ef7bc6c15a12dac8563bc9226dbc33fb75915fdf6024ed61a0a05185d0998646ba380410d6e33a706
-EBUILD kildclient-3.0.1-r1.ebuild 928 BLAKE2B 338491d726e643a48337d65772cd04dfd3be63e90bac49e60fb2c21e9c0b81acda131ef63ea7bc067a0f53c0da3a68aed72159eae6a8211777ac084f8e64fecb SHA512 f87cc640c1b2012d23d57dbadc82428d311b72d5dd4acf435cbb790e202f4c4c01b35031450b13b66b4340c301dba149dbe2cfb3988860f8c850f1bcf2fbb879
-MISC metadata.xml 333 BLAKE2B 200074c6521739d98bbf4e4c840f6ba192b480e3cf4de4ac6572df9d87b27f905c5919b83509eb69e3ff8252940e8be591b2a85fd5dca0a8c45763baff81a0a2 SHA512 7bb05074dcc9fcee20760e4d1be1d3d1bf5684a932636c9fba9b790dc9ef5ea477efe67854d0aa44561d081068418cadf4b237164ff6be7eb1cdf4f613276522
diff --git a/games-mud/kildclient/files/kildclient-3.0.1-gentoo.patch b/games-mud/kildclient/files/kildclient-3.0.1-gentoo.patch
deleted file mode 100644
index 75b39cfad414..000000000000
--- a/games-mud/kildclient/files/kildclient-3.0.1-gentoo.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -ru kildclient-3.0.1.orig/Makefile.am kildclient-3.0.1/Makefile.am
---- kildclient-3.0.1.orig/Makefile.am	2014-09-07 11:49:16.000000000 -0400
-+++ kildclient-3.0.1/Makefile.am	2015-01-03 22:33:12.578096926 -0500
-@@ -9,11 +9,7 @@
-           share
- endif
- 
--pkgdocdir = $(datadir)/doc/kildclient
--
--pkgdoc_DATA = README AUTHORS NEWS COPYING
--
--appsdir = $(datadir)/applications
-+appsdir = /usr/share/applications
- apps_DATA = kildclient.desktop
- 
- EXTRA_DIST = kildclient.spec \
-diff -ru kildclient-3.0.1.orig/doc/C/Makefile.am kildclient-3.0.1/doc/C/Makefile.am
---- kildclient-3.0.1.orig/doc/C/Makefile.am	2012-02-12 10:48:07.000000000 -0500
-+++ kildclient-3.0.1/doc/C/Makefile.am	2015-01-04 00:11:46.422941983 -0500
-@@ -1,8 +1,8 @@
- SUBDIRS = images
- 
--pkgdocdir = $(datadir)/doc/kildclient
-+pkgdocdir = @docdir@
- 
--manualdir = $(pkgdocdir)/html
-+manualdir = @htmldir@
- 
- #pkgdoc_DATA = kildclient.pdf
- 
-diff -ru kildclient-3.0.1.orig/po/Makefile.in.in kildclient-3.0.1/po/Makefile.in.in
---- kildclient-3.0.1.orig/po/Makefile.in.in	2014-12-13 05:47:22.000000000 -0500
-+++ kildclient-3.0.1/po/Makefile.in.in	2015-01-04 00:13:33.357326034 -0500
-@@ -28,9 +28,8 @@
- datarootdir = @datarootdir@
- datadir = @datadir@
- libdir = @libdir@
--localedir = $(libdir)/locale
--gnulocaledir = $(datadir)/locale
--gettextsrcdir = $(datadir)/glib-2.0/gettext/po
-+localedir = @localedir@
-+gnulocaledir = @localedir@
- subdir = po
- 
- INSTALL = @INSTALL@
-@@ -163,13 +162,6 @@
- 	    fi; \
- 	  fi; \
- 	done
--	if test "$(PACKAGE)" = "glib"; then \
--	  $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
--	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
--	else \
--	  : ; \
--	fi
- 
- # Define this as empty until I found a useful application.
- installcheck:
-@@ -184,9 +176,6 @@
- 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
- 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
- 	done
--	if test "$(PACKAGE)" = "glib"; then \
--	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
--	fi
- 
- check: all
- 
-diff -ru kildclient-3.0.1.orig/share/Makefile.am kildclient-3.0.1/share/Makefile.am
---- kildclient-3.0.1.orig/share/Makefile.am	2012-02-12 10:48:56.000000000 -0500
-+++ kildclient-3.0.1/share/Makefile.am	2015-01-04 00:14:05.375243115 -0500
-@@ -5,7 +5,7 @@
- 		kildclient.hlp \
- 		kcworld.dtd
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir = /usr/share/pixmaps
- pixmap_DATA = kildclient.png kildclient.xpm
- 
- 
-diff -ru kildclient-3.0.1.orig/src/Makefile.am kildclient-3.0.1/src/Makefile.am
---- kildclient-3.0.1.orig/src/Makefile.am	2014-12-13 05:40:02.000000000 -0500
-+++ kildclient-3.0.1/src/Makefile.am	2015-01-04 00:14:47.606814577 -0500
-@@ -84,11 +84,11 @@
- 
- EXTRA_DIST = $(pkgdata_DATA) $(uifiles)
- 
--pkgdocdir = $(datadir)/doc/kildclient
-+pkgdocdir = @docdir@
- 
--manualdir = $(pkgdocdir)/html
-+manualdir = @htmldir@
- 
--localedir = $(datadir)/locale
-+localedir = @localedir@
- 
- kildclient_LDADD = $(GTK_LIBS) $(KILDCLIENT_PERL_LIBS) $(GTKSPELL_LIBS) $(LIBGNUTLS_LIBS) $(INTLLIBS) -lz
- 
-diff -ru kildclient-3.0.1.orig/src/mainwindow.c kildclient-3.0.1/src/mainwindow.c
---- kildclient-3.0.1.orig/src/mainwindow.c	2014-12-13 05:40:02.000000000 -0500
-+++ kildclient-3.0.1/src/mainwindow.c	2015-01-04 00:15:43.877910836 -0500
-@@ -172,9 +172,9 @@
-   window = GTK_WIDGET(gtk_builder_get_object(main_builder, "wndMain"));
- #ifndef __WIN32__
-   gtk_window_set_icon_from_file(GTK_WINDOW(window),
--                                SYSDATADIR "/pixmaps/kildclient.png",
-+                                "/usr/share/pixmaps/kildclient.png",
-                                 NULL);
--  gtk_window_set_default_icon_from_file(SYSDATADIR "/pixmaps/kildclient.png",
-+  gtk_window_set_default_icon_from_file("/usr/share/pixmaps/kildclient.png",
-                                         NULL);
- #endif
- 
diff --git a/games-mud/kildclient/kildclient-3.0.1-r1.ebuild b/games-mud/kildclient/kildclient-3.0.1-r1.ebuild
deleted file mode 100644
index 2840e2017830..000000000000
--- a/games-mud/kildclient/kildclient-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="Powerful MUD client with a built-in PERL interpreter"
-HOMEPAGE="http://kildclient.sourceforge.net"
-SRC_URI="mirror://sourceforge/kildclient/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnutls spell"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Locale-gettext
-	dev-perl/JSON
-	sys-libs/zlib
-	x11-libs/gtk+:3
-	virtual/libintl
-	spell? ( app-text/gtkspell:3 )
-	gnutls? ( net-libs/gnutls )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localedir=/usr/share/locale \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		$(use_with spell gtkspell) \
-		$(use_with gnutls libgnutls) \
-		$(use_with doc docs)
-}
diff --git a/games-mud/kildclient/metadata.xml b/games-mud/kildclient/metadata.xml
deleted file mode 100644
index 9909f4b3cd17..000000000000
--- a/games-mud/kildclient/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kildclient</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-mud/lyntin-4.2-r2 b/games-mud/lyntin-4.2-r2
new file mode 100644
index 000000000000..e7b4431cb7a7
--- /dev/null
+++ b/games-mud/lyntin-4.2-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=tintin mud client clone implemented in Python
+EAPI=6
+HOMEPAGE=http://lyntin.sourceforge.net/
+IUSE=tk python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/lyntin/lyntin-4.2.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ddffe93159aa7fedf8a7434d3b10985
diff --git a/games-mud/lyntin/Manifest b/games-mud/lyntin/Manifest
deleted file mode 100644
index 41dde497b343..000000000000
--- a/games-mud/lyntin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lyntin-4.2.tar.gz 180111 BLAKE2B e54c7c609f9f6150a6aa30b0ef9d913cad16ada0e227bdd9369dd02b27b5f6871cd64f10e0f404cef68ba91ab4be2d28e77e6dcbbee95d35bb21ebaae9f0ee28 SHA512 72792b0ffd3f07d6ad7ec335beca2b064e348c7e30c7517edb07a90ece0608b34ce68798fb7a0aa7ef6568ebbed14f5246368421f5e14c7520d306ae6a29e432
-EBUILD lyntin-4.2-r2.ebuild 984 BLAKE2B 4243ab931dd90047fd118610fad0f437380a2a64d62ee5bc9a746310a35f18e542a1c11b2ecddd96ab5fa22c3a9e3325d93f5a1e46e3c31d6dc2c5702e43c75f SHA512 73fc58e52ed6add4a1085b35b58b884b46842a14edfc236cc02abc8742abeef2ca982d9f78ed464b6d107be6d66d1e7fc437d09f1c9085899dcddba5c06c0966
-MISC metadata.xml 329 BLAKE2B 40cd4956e16ad3204992b238cfbbc478c16b38fab04a7d31b56d667fdba34f1330dbfe78d8d0118d58bd9813ff85d9893dd08c7997a9ea9032800fc3a01ddd58 SHA512 28fbdbddc2ee51833133c9ec8d4f035ec82086bca4811d065da82bf5b73fb3930b7ea99537a82ed9700e224e4ba6f2f9cc026f69e54d8b5380106937be06332f
diff --git a/games-mud/lyntin/lyntin-4.2-r2.ebuild b/games-mud/lyntin/lyntin-4.2-r2.ebuild
deleted file mode 100644
index a579a566c971..000000000000
--- a/games-mud/lyntin/lyntin-4.2-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk?"
-
-inherit distutils-r1
-
-DESCRIPTION="tintin mud client clone implemented in Python"
-HOMEPAGE="http://lyntin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lyntin/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-DOCS=( COMMANDS PKG-INFO HACKING README )
-
-python_install() {
-	distutils-r1_python_install --install-scripts=/usr/bin
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	if use tk ; then
-		elog "To start lyntin in GUI mode, create a config file"
-		elog "with this in it:"
-		elog
-		elog "[Lyntin]"
-		elog "ui:    tk"
-		elog
-		elog "Then start lyntin like this:"
-		elog
-		elog "runlyntin -c /path/to/config_file\n"
-	fi
-}
diff --git a/games-mud/lyntin/metadata.xml b/games-mud/lyntin/metadata.xml
deleted file mode 100644
index 5b5b19a5e7cc..000000000000
--- a/games-mud/lyntin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lyntin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-mud/metadata.xml b/games-mud/metadata.xml
deleted file mode 100644
index a8e01b3f7cec..000000000000
--- a/games-mud/metadata.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-mud category contains multi-user dungeon games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-mud enthält Multi-User Dungeon (MUD) Clients und Spiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-mud contiene juegos de tipo MUD multijugador.
-	</longdescription>
-	<longdescription lang="ja">
-		games-mudカテゴリーには多人数用のダンジョン・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-mud categorie bevat MUD (Multi-User Dungeon) spellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-mud chứa các trò chơi dạng multi-user dungeon.
-	</longdescription>
-	<longdescription lang="sk">
-		Kategória games-mud obsahuje klienty a servery MUD (Multi User Dungeon).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-mud contiene giochi di tipo MUD (Multi User Dungeon).
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-mud contém jogos do tipo MUD (Multi User
-		Dungeon).
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-mud zawiera gry wieloosobowe typu MUD.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-mud/mudix-4.3-r2 b/games-mud/mudix-4.3-r2
new file mode 100644
index 000000000000..0a9ae9671a31
--- /dev/null
+++ b/games-mud/mudix-4.3-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:0
+DESCRIPTION=A small, stable MUD client for the console
+EAPI=6
+HOMEPAGE=http://dw.nl.eu.org/mudix.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=http://dw.nl.eu.org/mudix/mudix-4.3.tar.gz
+_md5_=1058362e634376f4cd7f39dc2827d92a
diff --git a/games-mud/mudix/Manifest b/games-mud/mudix/Manifest
deleted file mode 100644
index 411b559835ab..000000000000
--- a/games-mud/mudix/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mudix-4.3-as-needed.patch 317 BLAKE2B e8a498bb7e9a7287bab60b25c7f435cab498fcd6a4e42f28f61942423bb74bba01a869bdd4b85672591e9bf9e2bb75723fb901bd40e78fa094e5809302849a16 SHA512 79d7a833f4e9b2225d09e87d1b9d97bba068882390d1af42436be99c83129ee1a1d0168f2aedb2c21df54178f20ce2d5bb946386d1a87367678059c8f2e1da6c
-DIST mudix-4.3.tar.gz 43003 BLAKE2B e7bc7a053de3987ae9903cda01b6d5cf3bcf7967bc25bc502d8968792638b890afadaf2e66f09890a83beb80e5e340ec4af8b8559f967020ed76a4954b925b0a SHA512 9f9c8ee43ded9b837eb50e463e67b666e0b2b34334d93e9a4471fa792da99350042cd8abbd9f8e97aa7ba114736b2d99c1b6595c76a5254270a514681130eb94
-EBUILD mudix-4.3-r2.ebuild 527 BLAKE2B 4298430978fac2fb670913310c21ad26ce90aeef2eed0bbeff77b735af4b7947943eb256f882be48b20c43afbdc1b60ef5afa3aa96ff61069654673f61e50801 SHA512 f122f9fa21a17fd8eb1840fd9f842e382139c6a981231c6dccd9f2c8449341339419a62c55d5dd005c814ddc1f2d6f3d54d2b8756ca7626ca401358b51e3aaa3
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/mudix/files/mudix-4.3-as-needed.patch b/games-mud/mudix/files/mudix-4.3-as-needed.patch
deleted file mode 100644
index 4230ac507763..000000000000
--- a/games-mud/mudix/files/mudix-4.3-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in	2009-02-08 17:32:15.000000000 +0100
-+++ b/src/Makefile.in	2009-02-08 17:34:15.000000000 +0100
-@@ -23,7 +23,7 @@
- 
- $(EXEC): $(O_FILES)
- 	rm -f $(EXEC) 
--	$(CC) -o $(EXEC) $(L_FLAGS) $(O_FILES)
-+	$(CC) -o $(EXEC) $(LDFLAGS) $(O_FILES) $(L_FLAGS)
- 
- .c.o: mudix.h conf.h 
- 	$(CC) -c $(C_FLAGS) $<
diff --git a/games-mud/mudix/metadata.xml b/games-mud/mudix/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-mud/mudix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/mudix/mudix-4.3-r2.ebuild b/games-mud/mudix/mudix-4.3-r2.ebuild
deleted file mode 100644
index 067ddf344613..000000000000
--- a/games-mud/mudix/mudix-4.3-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A small, stable MUD client for the console"
-HOMEPAGE="http://dw.nl.eu.org/mudix.html"
-SRC_URI="http://dw.nl.eu.org/mudix/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-)
-
-src_compile() {
-	emake -C src O_FLAGS="${CFLAGS}"
-}
-
-src_install () {
-	dobin mudix
-	dodoc README sample.usr
-}
diff --git a/games-mud/powwow-1.2.16-r1 b/games-mud/powwow-1.2.16-r1
new file mode 100644
index 000000000000..ed459716d8a1
--- /dev/null
+++ b/games-mud/powwow-1.2.16-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-libs/ncurses:0 >=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=PowWow Console MUD Client
+EAPI=6
+HOMEPAGE=https://www.hoopajoo.net/projects/powwow.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0
+SLOT=0
+SRC_URI=https://www.hoopajoo.net/static/projects/powwow-1.2.16.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_=ac99282c492c61de16a63ac609a16de9
diff --git a/games-mud/powwow/Manifest b/games-mud/powwow/Manifest
deleted file mode 100644
index cf9a9881f5a3..000000000000
--- a/games-mud/powwow/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX powwow-1.2.16-underlinking.patch 540 BLAKE2B b30bc40fdb408686dd2f77e1ade851b1c4c770b895fac7624f97f491d5ba2fffe0467bb6dbd92c6a1ab9e1c010afaafb1b5985ff36cd98320653d12f234a4787 SHA512 2917a553f844d3bd8ef15b3f1e4f0dfeca7ac06371aba5912a40adc8334a74ec81767d3c73d27d27a7f45d8ca27acf279b3d9095dd426ce4c21e93dceea30861
-DIST powwow-1.2.16.tar.gz 295441 BLAKE2B 36f45e57af83b624e8f061ba7cc10ac7429b42bba56b1f61c737d9541ded788e5d94c76e1c70d00f49aac98a2a1fac6a04965d2eb78e587d53cea8b0d17ea736 SHA512 9bc046ba14760d55a7aabb550229d5f5b234f3ef0690d837f1de8df5e1f404b8483e61981cffdf8e82f164bd5a68f4da3f8342b0c09b98155adaabf14d8b079e
-EBUILD powwow-1.2.16-r1.ebuild 898 BLAKE2B 485a4974eedd5ac783cd54bb5e5f636223790cad6842a6b58e072363b21f70bf8f03d1441f1c83d25acde6db2d0071c62b5994c525f73f40f50e64edee971d4f SHA512 202abe00158972f52c97e8f9f6fb314ffbc73cc022724c06c44c5b1a72371f35eb25fc961e3a5638cd9672952bdad342837e0d6912903d68220c50aa82e20b7b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/powwow/files/powwow-1.2.16-underlinking.patch b/games-mud/powwow/files/powwow-1.2.16-underlinking.patch
deleted file mode 100644
index d6c5cceba1fd..000000000000
--- a/games-mud/powwow/files/powwow-1.2.16-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Feb 18 02:25:38 UTC 2013
-Subject: fix underlinking
-
-https://bugs.gentoo.org/show_bug.cgi?id=454928
-
---- powwow-1.2.16/Makefile.am
-+++ powwow-1.2.16/Makefile.am
-@@ -5,7 +5,7 @@
- powwow_SOURCES = beam.c cmd.c log.c edit.c cmd2.c eval.c \
- 		 utils.c main.c tcp.c list.c map.c tty.c \
- 		 ptr.c
--powwow_LDFLAGS = @dl_ldflags@
-+powwow_LDADD = @dl_ldflags@
- powwowdir = $(pkgincludedir)
- powwow_HEADERS = beam.h cmd.h log.h edit.h cmd2.h eval.h \
- 		 utils.h main.h tcp.h list.h map.h tty.h \
diff --git a/games-mud/powwow/metadata.xml b/games-mud/powwow/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-mud/powwow/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/powwow/powwow-1.2.16-r1.ebuild b/games-mud/powwow/powwow-1.2.16-r1.ebuild
deleted file mode 100644
index 0581652736a5..000000000000
--- a/games-mud/powwow/powwow-1.2.16-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils
-
-DESCRIPTION="PowWow Console MUD Client"
-HOMEPAGE="https://www.hoopajoo.net/projects/powwow.html"
-SRC_URI="https://www.hoopajoo.net/static/projects/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
-)
-
-src_prepare() {
-	default
-
-	# note that that the extra, seemingly-redundant files installed are
-	# actually used by in-game help commands
-	sed -i \
-		-e "s/pkgdata_DATA = powwow.doc/pkgdata_DATA = /" \
-		Makefile.am || die
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --includedir=/usr/include
-}
-
-src_install () {
-	DOCS="ChangeLog Config.demo Hacking NEWS powwow.doc powwow.help README.* TODO" \
-		default
-}
diff --git a/games-mud/tf-50_beta8-r2 b/games-mud/tf-50_beta8-r2
new file mode 100644
index 000000000000..e6d66633dffa
--- /dev/null
+++ b/games-mud/tf-50_beta8-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=ssl? ( dev-libs/openssl:0= ) dev-libs/libpcre
+DESCRIPTION=A small, flexible, screen-oriented MUD client (aka TinyFugue)
+EAPI=6
+HOMEPAGE=http://tinyfugue.sourceforge.net/
+IUSE=+atcp debug doc +gmcp ipv6 +option102 ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= ) dev-libs/libpcre
+SLOT=0
+SRC_URI=mirror://sourceforge/tinyfugue/tf-50b8.tar.gz http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt doc? ( mirror://sourceforge/tinyfugue/tf-50b8-help.tar.gz )
+_md5_=923cfc004b3e6db69a9439a9a0342e44
diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest
deleted file mode 100644
index 1d1977656ea7..000000000000
--- a/games-mud/tf/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX tf-50_beta8-pcre.patch 1917 BLAKE2B 547218b46b5c6cb4c8991e98cbac6871f90d4f8440ff52140b86b311f10d8f0b6aa5a4dfb1e1ba27baf0016fb476c57d4302a26edd7e8fb17b5c6b42acb0e5dd SHA512 942574f4a24f5c2660124caf6cc41438e42fb20b5d1781c60341da96ace2338a3b69a744454e5c2319d83d83a8de21af26029ec6f328a50facbc56db7091c092
-AUX tf-50_beta8-stdarg.patch 1074 BLAKE2B b1a40c283919ee717181bd9851563c8fa8b972fb041b172a9b3851188f8bd60914926c19cbd3d32823339d3a47b64b004589a157bc7ff7cfde94e166d452c50d SHA512 ad8e051cf1fbfd6bc5e038a6ac252c1e61619dd96b5d0f72d25af7fba1754dd1c5d6b1557611b3ea322b030be1db89b2b3740e9137ab3fe6135bd5ce0d4e62b7
-DIST tf-50b8-help.tar.gz 175591 BLAKE2B b4b5d2be336206fa00db870367369454d33a7e32c0aed83a3eed107feba9a5737ad6c7963b8c570cede6e3de80b211edb4ed6dd818b4ca90e23e8bab99a92725 SHA512 fd0fcf7e96772cbb61a97d24d0327c45b31b280bca329dfe6c680137cc25b7db5b4b79c0f608ad213cd24a0f2a67ee471ce7ee1c405b039f52033d7d87974b74
-DIST tf-50b8.tar.gz 719553 BLAKE2B 3218878cdc4a2049fd7f2a8e0426ec589bf304e0bb24ad557e5bea39cbaba76e6a1c52f064860e499623abb51bc9f14a0c8388b927fd15a66a7945fe5eaccf84 SHA512 3b99c039d7a9c6ab7ee7b1040ff7c99fe39cbe991f373333ea7c130d54383f102f14ae33303a415f5419cd43238caffc46114e842c6964329c0999e0f506e3d0
-DIST tf-allrootpatch.txt 3349 BLAKE2B ca57b7ddfdbaa377c69ad07427185a3952368d35231f4bca77c78a5ed7b5c1c362f4ef1512e23c248b96810739056e8f53c4d41320a1c1dc320b1fd22d965199 SHA512 3fe44e7291d133abd04040f0f8258da6a2b7f67cab79cb1628897a4a483a0998495b6cf97eaf29ee447a650fdb16a48c846599807e570f687a256bb58179495e
-DIST tf-allsrcpatch.txt 10392 BLAKE2B 9a24f99d6bdaa835b4cc2588d87824ea07a12fee38d576ec63f48493f5b92c7155ad959fa80599edf28a39f76d85ba8a2a19e1ff2b03c7893fe4d7b4b7d9af97 SHA512 3ac2447e05911d156509bb44e8809c06c4b1a92cbc8067d196c7e5f688fccd5186a9073001958ca0e757c9db20e9f96889fe7a5b6255495539f23208f72ec613
-EBUILD tf-50_beta8-r2.ebuild 1720 BLAKE2B ab5afd5b09818b93cffbc72d1746e4df0652db2ea3f8186123825d99992667ee2c37555388a790959fc832cc9e5d2f6a327064c76f47a664463f84390f7ec898 SHA512 44892161b87ef2eb53d26d54dacce3652ce85317ae2913479b97cf05f62dec44acd4e12a635103edb2e593fa5faf6939345fc8359e25d2d8882f444d105f105d
-MISC metadata.xml 527 BLAKE2B c02bbc61246899c14aef26cf8533fa21b350ee978514bbdfe286e8130a4823f57dbfe468bca4badcce9bf2fa867bb56d1d162ddad6685df5e56f09e66fec5db5 SHA512 6449cb8a605dad5d0c5f2f825e38a4f972b61be1033087cc906d293a10129d88a803d9f5755b413df8f700aad3eb50eacc668d508365090ca5d01c61d884d833
diff --git a/games-mud/tf/files/tf-50_beta8-pcre.patch b/games-mud/tf/files/tf-50_beta8-pcre.patch
deleted file mode 100644
index 4ff5e44db91b..000000000000
--- a/games-mud/tf/files/tf-50_beta8-pcre.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
-Date: Fri, 10 Feb 2012 13:55:46 +0100
-Subject: [PATCH] Fix build with PCRE-8.30+
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch fixes build with the latest PCRE release which removes some
-obsolete code tinyfugue still uses, namely pcre_info().
-
-Signed-off-by: Petr Šabata <contyk@redhat.com>
----
- src/macro.c   |    3 ++-
- src/pattern.c |    2 +-
- src/pattern.h |    2 +-
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/macro.c b/src/macro.c
-index ac28fc9..b492717 100644
---- a/src/macro.c
-+++ b/src/macro.c
-@@ -893,7 +893,8 @@ static int complete_macro(Macro *spec, unsigned int hash, int num,
-     }
-     spec->attr &= ~F_NONE;
-     if (spec->nsubattr) {
--	int n = pcre_info(spec->trig.ri->re, NULL, NULL);
-+	int n;
-+	pcre_fullinfo(spec->trig.ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
- 	for (i = 0; i < spec->nsubattr; i++) {
- 	    spec->subattr[i].attr &= ~F_NONE;
- 	    if (spec->subattr[i].subexp > n) {
-diff --git a/src/pattern.c b/src/pattern.c
-index 047a44a..a7228ff 100644
---- a/src/pattern.c
-+++ b/src/pattern.c
-@@ -151,7 +151,7 @@ static RegInfo *tf_reg_compile_fl(const char *pattern, int optimize,
- 	    emsg ? emsg : "unknown error");
- 	goto tf_reg_compile_error;
-     }
--    n = pcre_info(ri->re, NULL, NULL);
-+    pcre_fullinfo(ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
-     if (n < 0) goto tf_reg_compile_error;
-     ri->ovecsize = 3 * (n + 1);
-     ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line);
-diff --git a/src/pattern.h b/src/pattern.h
-index 1eec0f9..cbe9af9 100644
---- a/src/pattern.h
-+++ b/src/pattern.h
-@@ -10,7 +10,7 @@
- #ifndef PATTERN_H
- #define PATTERN_H
- 
--#include "pcre-2.08/pcre.h"
-+#include <pcre.h>
- 
- typedef struct RegInfo {
-     pcre *re;
--- 
-1.7.7.6
-
diff --git a/games-mud/tf/files/tf-50_beta8-stdarg.patch b/games-mud/tf/files/tf-50_beta8-stdarg.patch
deleted file mode 100644
index a34b70abe1fd..000000000000
--- a/games-mud/tf/files/tf-50_beta8-stdarg.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U5 -r a/src/tfio.c b/src/tfio.c
---- a/src/tfio.c	2007-01-13 18:12:39.000000000 -0500
-+++ b/src/tfio.c	2007-02-02 16:50:12.000000000 -0500
-@@ -495,10 +495,11 @@
-     const char *q, *sval;
-     char *specptr, quote;
-     const conString *Sval;
-     int len, min, max, leftjust, stars;
-     attr_t attrs = buf->attrs;
-+    va_list aq;
- 
-     if (!(flags & SP_APPEND) && buf->data) Stringtrunc(buf, 0);
-     while (*fmt) {
-         if (*fmt != '%' || *++fmt == '%') {
-             for (q = fmt + 1; *q && *q != '%'; q++);
-@@ -520,11 +521,13 @@
-         switch (*fmt) {
-         case 'd': case 'i':
-         case 'x': case 'X': case 'u': case 'o':
-         case 'f': case 'e': case 'E': case 'g': case 'G':
-         case 'p':
--            vsprintf(tempbuf, spec, ap);
-+            va_copy(aq, ap);
-+            vsprintf(tempbuf, spec, aq);
-+            va_end(aq);
-             Stringcat(buf, tempbuf);
-             /* eat the arguments used by vsprintf() */
-             while (stars--) (void)va_arg(ap, int);
-             switch (*fmt) {
-             case 'd': case 'i':
diff --git a/games-mud/tf/metadata.xml b/games-mud/tf/metadata.xml
deleted file mode 100644
index f351406f3216..000000000000
--- a/games-mud/tf/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="atcp">enable ATCP support.</flag>
-    <flag name="gmcp">enable GMCP support.</flag>
-    <flag name="option102">enable telnet option 102 support.</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">tinyfugue</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-mud/tf/tf-50_beta8-r2.ebuild b/games-mud/tf/tf-50_beta8-r2.ebuild
deleted file mode 100644
index 1009fb07dc03..000000000000
--- a/games-mud/tf/tf-50_beta8-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_beta/b}"
-
-DESCRIPTION="A small, flexible, screen-oriented MUD client (aka TinyFugue)"
-HOMEPAGE="http://tinyfugue.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/tinyfugue/${MY_P}.tar.gz
-	http://homepage.mac.com/mikeride/abelinc/scripts/allrootpatch.txt -> tf-allrootpatch.txt
-	http://homepage.mac.com/mikeride/abelinc/scripts/allsrcpatch.txt -> tf-allsrcpatch.txt
-	doc? ( mirror://sourceforge/tinyfugue/${MY_P}-help.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+atcp debug doc +gmcp ipv6 +option102 ssl"
-
-RDEPEND="
-	ssl? ( dev-libs/openssl:0= )
-	dev-libs/libpcre"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${DISTDIR}"/tf-allrootpatch.txt
-	"${DISTDIR}"/tf-allsrcpatch.txt
-	"${FILESDIR}"/${P}-pcre.patch
-	"${FILESDIR}"/${P}-stdarg.patch
-)
-
-src_configure() {
-	STRIP=: econf \
-		$(use_enable atcp) \
-		$(use_enable gmcp) \
-		$(use_enable option102) \
-		$(use_enable ssl) \
-		$(use_enable debug core) \
-		$(use_enable ipv6 inet6) \
-		--enable-manpage
-}
-
-src_install() {
-	dobin src/tf
-	newman src/tf.1.nroffman tf.1
-
-	use doc && HTML_DOCS=( ../${MY_P}-help/{*.html,commands,topics} )
-	einstalldocs
-
-	insinto /usr/share/${PN}-lib
-	# the application looks for this file here if /changes is called.
-	# see comments on bug #23274
-	doins CHANGES
-	insopts -m0755
-	doins -r tf-lib/.
-}
-
-pkg_postinst() {
-	if use ipv6; then
-		ewarn
-		ewarn "You have merged TinyFugue with IPv6-support."
-		ewarn "Support for IPv6 is still being experimental."
-		ewarn "If you experience problems with connecting to hosts,"
-		ewarn "try re-merging this package with USE="-ipv6""
-		ewarn
-	fi
-}
diff --git a/games-mud/tintin-2.01.1-r1 b/games-mud/tintin-2.01.1-r1
new file mode 100644
index 000000000000..b642535eeb1e
--- /dev/null
+++ b/games-mud/tintin-2.01.1-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=dev-libs/libpcre net-libs/gnutls sys-libs/readline:0 sys-libs/zlib
+DESCRIPTION=(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t
+EAPI=6
+HOMEPAGE=http://tintin.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/libpcre net-libs/gnutls sys-libs/readline:0 sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/tintin/tintin-2.01.1.tar.gz
+_md5_=cf491c64d29854d10b30c94d839cb4aa
diff --git a/games-mud/tintin/Manifest b/games-mud/tintin/Manifest
deleted file mode 100644
index 91364ee551d5..000000000000
--- a/games-mud/tintin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tintin-2.01.1.tar.gz 272506 BLAKE2B c8fba9d72b34e2a05ede408dfb6105dd6c39d0d1e41582908acd35d712a92abacbce025b702a24a59cd9754cce284fa7277dadc0ff3933359cc9ef77e50b6a2c SHA512 b77a1ecc09438a165a27f70f31132d60350d790e4e6b0509af00979517a7f21838407acdbf1fe0d3b4612853c4e1269679e95fe90b8588133b17f98b85a28b07
-EBUILD tintin-2.01.1-r1.ebuild 684 BLAKE2B fd2ac367903993ce6efbf26843cfe354fb0f25ba9caec2a6e6f8e1177a5e53115d212f860f93e7f1821a3100ae97c0db11465808c6013120ef9c815c11d80726 SHA512 48924b9d674205abf8f419bc596a19a8d0acadda054960dafcb8c641a62878db1a51c8d766ed2a6ac4740370d3189238fbf831490d8e8d681c63a1c38538ea8c
-MISC metadata.xml 329 BLAKE2B 805c0747a5170609f8580c6e7c1b9eed0ebcac1be9b6f71b81f109996af3c26041fe729586678859af8544e7f2711c4985059140d29c051c025304f744841779 SHA512 7572490346a0c56e05c8bf9a07f321e1cc8cfe3548c4c2fe3f2d69455b351c6b27de5e9bbddda6de7ddd9cd2e8fbf04f548b40810ccf794699703ae6f7d23cbb
diff --git a/games-mud/tintin/metadata.xml b/games-mud/tintin/metadata.xml
deleted file mode 100644
index 2c9d6ccb67c2..000000000000
--- a/games-mud/tintin/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">tintin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-mud/tintin/tintin-2.01.1-r1.ebuild b/games-mud/tintin/tintin-2.01.1-r1.ebuild
deleted file mode 100644
index 7da9b8553b33..000000000000
--- a/games-mud/tintin/tintin-2.01.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="(T)he k(I)cki(N) (T)ickin d(I)kumud clie(N)t"
-HOMEPAGE="http://tintin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tintin/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-libs/libpcre
-	net-libs/gnutls
-	sys-libs/readline:0
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/tt/src
-
-src_install () {
-	dobin tt++
-	dodoc ../{CREDITS,FAQ,README,SCRIPTS,TODO,docs/*}
-}
-
-pkg_postinst() {
-	echo
-	ewarn "**** OLD TINTIN SCRIPTS ARE NOT 100% COMPATIBLE WITH THIS VERSION ****"
-	ewarn "read the README for more details."
-	echo
-}
diff --git a/games-mud/tkmoo-0.3.32-r1 b/games-mud/tkmoo-0.3.32-r1
new file mode 100644
index 000000000000..dcf05b2070b7
--- /dev/null
+++ b/games-mud/tkmoo-0.3.32-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/tcl-8.3.3:0= >=dev-lang/tk-8.3.3:0=
+DESCRIPTION=MOO Client written in Tcl/Tk
+EAPI=6
+HOMEPAGE=http://www.awns.com/tkMOO-light/
+KEYWORDS=~amd64 ~x86
+LICENSE=tkMOO
+RDEPEND=>=dev-lang/tcl-8.3.3:0= >=dev-lang/tk-8.3.3:0=
+SLOT=0
+SRC_URI=http://www.awns.com/tkMOO-light/Source/tkMOO-light-0.3.32.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_=5774059e170d6dfe8ec70df834c106e4
diff --git a/games-mud/tkmoo/Manifest b/games-mud/tkmoo/Manifest
deleted file mode 100644
index ea1f303c8d33..000000000000
--- a/games-mud/tkmoo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 0.3.32-Makefile-noclean.patch 445 BLAKE2B d0bd081129ebf2453118215eb48cebc918484ed948cd6bec22fe20bb81140de8a4d642ee6583d496eb359f63d9cfbe8cad066a3fd299ccf47470836ef131f5f5 SHA512 0bbba363d579527b1cca8fa5c953b9724ea939b416c3681b582959f64f36e8d311e17325bc5ca21cccc02e6209ba7f3687cc26fd3b9abe390e8dfbaee9082e53
-AUX 0.3.32-keys-workaround.patch 377 BLAKE2B 568b5d06b953ab5268174dcef0a903ec33547bfb09b3da718ead97ce889025d62c8e3dc04a1135b6f4ef7c31c3c2f0e85542c8cacbb753ea7cc20a4d0e6dfa1f SHA512 2d454f251f817267482597376e4f65972d766ed8ec90ecf79c085e431c82febf27d8c286bc40c3334d1b7f248258fa6c6ca601425d6767d3d6eab93a30590a02
-DIST tkMOO-light-0.3.32.tar.gz 95332 BLAKE2B 44fd5c1476527c3b1c18e44df71b49007caeb78e1ca788c718a532c716746a9b8df3f42d616bc0384bff167a484c8585a0fe13f607810c74006810635ed1ae6c SHA512 59543692900613eae77b73f5f88a2380a77d1be38d486dc0461d0990ccb941497dd0d35aa109a5697dba3b92157d9943b540a73fe4fc0d519e144f65620443d2
-EBUILD tkmoo-0.3.32-r1.ebuild 952 BLAKE2B bbceaeff20b11c7fda1373783453188f3dc9f17ede4e1c45c2fe946c1b1a219eda89ff4d444669927b20cc17b843476d9472de017d86611524f652503808eed6 SHA512 27eae2fed3d067665079a81462a54a075920e1193060d13324eee252a9c992474af084c4d1394eb2048935764763347bb382496ac1ad164f0b0c73b844a4c947
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-mud/tkmoo/files/0.3.32-Makefile-noclean.patch b/games-mud/tkmoo/files/0.3.32-Makefile-noclean.patch
deleted file mode 100644
index cebc1fecfc34..000000000000
--- a/games-mud/tkmoo/files/0.3.32-Makefile-noclean.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile	2003-07-12 03:04:24.000000000 -0400
-+++ b/Makefile	2003-07-12 03:04:32.000000000 -0400
-@@ -32,11 +32,8 @@
- 
- # some shells are set 'noclobber', so force overwriting of the
- # executable and installation
--clean:
--	\rm -f $(EXECUTABLE)
--	\rm -f $(TKMOO_BIN_DIR)/$(EXECUTABLE)
- 
--executable: clean
-+executable:
- 	if [ ! -e $(WISH) ]; then \
- 	    echo "***"; \
- 	    echo "*** Can't find executable '$(WISH)', building anyway..."; \
diff --git a/games-mud/tkmoo/files/0.3.32-keys-workaround.patch b/games-mud/tkmoo/files/0.3.32-keys-workaround.patch
deleted file mode 100644
index db8886ed4b61..000000000000
--- a/games-mud/tkmoo/files/0.3.32-keys-workaround.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/source.tcl	2004-12-28 23:36:47.000000000 -0800
-+++ b/source.tcl	2004-12-28 23:37:09.000000000 -0800
-@@ -51,6 +51,10 @@
- #
- #
- 
-+tk::unsupported::ExposePrivateCommand tkTextSetCursor
-+tk::unsupported::ExposePrivateCommand tkTextScrollPages
-+tk::unsupported::ExposePrivateCommand tkTextInsert
-+
- proc db.set { id field val args } {
-     global db
-     if { $args == {} } {
diff --git a/games-mud/tkmoo/metadata.xml b/games-mud/tkmoo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-mud/tkmoo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild b/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
deleted file mode 100644
index 557406e7a29f..000000000000
--- a/games-mud/tkmoo/tkmoo-0.3.32-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_PN=${PN/moo/MOO-light}
-MY_P=${P/moo/MOO-light}
-DESCRIPTION="MOO Client written in Tcl/Tk"
-HOMEPAGE="http://www.awns.com/tkMOO-light/"
-SRC_URI="http://www.awns.com/tkMOO-light/Source/${MY_P}.tar.gz"
-
-LICENSE="tkMOO"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/tcl-8.3.3:0=
-	>=dev-lang/tk-8.3.3:0="
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PV}-Makefile-noclean.patch"
-		"${FILESDIR}/${PV}-keys-workaround.patch"
-)
-
-src_compile() {
-	emake \
-		WISH="$(type -P wish)" \
-		TKMOO_LIB_DIR="/usr/$(get_libdir)/${MY_PN}" \
-		TKMOO_BIN_DIR=/usr/bin
-}
-
-src_install() {
-	emake \
-		TKMOO_LIB_DIR="${D}/usr/$(get_libdir)/${MY_PN}" \
-		TKMOO_BIN_DIR="${D}/usr/bin" \
-		install
-	dodoc README dot.tkmoolightrc bugsmail.txt
-	dosym tkMOO-lite /usr/bin/tkmoo
-	make_desktop_entry tkmoo "tkMOO"
-}
diff --git a/games-mud/trebuchet-1.075-r1 b/games-mud/trebuchet-1.075-r1
new file mode 100644
index 000000000000..501d7476ad54
--- /dev/null
+++ b/games-mud/trebuchet-1.075-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A crossplatform TCL/TK based MUD client
+EAPI=6
+HOMEPAGE=http://belfry.com/fuzzball/trebuchet/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0= >=dev-lang/tk-8.3.3:0=
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/trebuchet/trebuchet-1.075.tar.gz
+_md5_=e4277b4f75955782a68fcb47576279c5
diff --git a/games-mud/trebuchet/Manifest b/games-mud/trebuchet/Manifest
deleted file mode 100644
index 4e62e9d94fbd..000000000000
--- a/games-mud/trebuchet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST trebuchet-1.075.tar.gz 339202 BLAKE2B cfb19d1b92dc93aff829d0a199678faeefefbeee659b25e2f7ae5f11fdc944e7d62b258efff651241b39705e667845b53dae230765d9de3b264894a12c724e64 SHA512 7d007172e228e1a33563b4141b9dc544de8d2ae124ec0ec1a9da8a253339d910ab00ce0570e1da81499a97aadfea701f9131fbafc20eae1e64830d1bd15ab1fa
-EBUILD trebuchet-1.075-r1.ebuild 690 BLAKE2B e30b5d37fbadcb91c5dad471c067ff36bf38644bed7718f3fb2e76b365098cff1d118e75e064e2ef02208fd4403af67e14e07e5d528fa88ef9defe037fdecb80 SHA512 586aacf27bb02b12b2d627fae66915e5e688933f2296f437b5af995c8f411a6e6084cf928e9f9f83c97a35c6bde98ab69af2dc7e935c6bde143baffdf5f63d9f
-MISC metadata.xml 332 BLAKE2B 90c065efeeec6f3c1d04d16119ba2a3e55deb29ec323c1df8934cd298cfdc40e77cf90f29fe09f8f1887c643fbeff8fbe5efa2938a516773de00ed7a33213f88 SHA512 7a22f6902d2ff3d4ca14faaeab3360599bb0c44338dabf1de3300a07b8cdcd858f191a6e4f1f533dc8d1cecb2f98266945a4e4026ffe3dca8766bc41bcd64ada
diff --git a/games-mud/trebuchet/metadata.xml b/games-mud/trebuchet/metadata.xml
deleted file mode 100644
index 022b68c4918f..000000000000
--- a/games-mud/trebuchet/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">trebuchet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-mud/trebuchet/trebuchet-1.075-r1.ebuild b/games-mud/trebuchet/trebuchet-1.075-r1.ebuild
deleted file mode 100644
index 403c9113c2b5..000000000000
--- a/games-mud/trebuchet/trebuchet-1.075-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A crossplatform TCL/TK based MUD client"
-HOMEPAGE="http://belfry.com/fuzzball/trebuchet/"
-SRC_URI="mirror://sourceforge/trebuchet/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	>=dev-lang/tk-8.3.3:0=
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/Nothing/d" \
-        -e "/LN/ s:../libexec:/usr/share:" \
-		Makefile || die
-}
-
-src_install() {
-	emake prefix="${D}/usr" \
-		ROOT="${D}/usr/share/${PN}" install
-
-	insinto /usr/share/${PN}
-	doins COPYING
-	dodoc changes.txt readme.txt trebtodo.txt
-}
diff --git a/games-puzzle/4stattack-2.1.4-r1 b/games-puzzle/4stattack-2.1.4-r1
new file mode 100644
index 000000000000..487043be9e81
--- /dev/null
+++ b/games-puzzle/4stattack-2.1.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Connect-4 game, single or network multiplayer
+EAPI=6
+HOMEPAGE=http://forcedattack.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/forcedattack/4stAttack-2.1.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=432fafc865caa46a4224d9a2f1d3277f
diff --git a/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild b/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild
deleted file mode 100644
index d04ec26a8f3f..000000000000
--- a/games-puzzle/4stattack/4stattack-2.1.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Connect-4 game, single or network multiplayer"
-HOMEPAGE="http://forcedattack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/forcedattack/4stAttack-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/4stAttack-${PV}"
-
-src_prepare() {
-	default
-
-	# move the doc files aside so it's easier to install the game files
-	mv README.txt credits.txt changelog.txt ..
-	rm -f GPL version~
-
-	# This patch makes the game save settings in $HOME
-	eapply "${FILESDIR}"/${P}-gentoo.diff
-}
-
-src_install() {
-	make_wrapper ${PN} "python2 ${PN}.py" /usr/share/${PN}
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon kde/icons/64x64/forcedattack2.png ${PN}.png
-	make_desktop_entry ${PN} "4st Attack 2"
-	dodoc ../{README.txt,credits.txt,changelog.txt}
-}
diff --git a/games-puzzle/4stattack/Manifest b/games-puzzle/4stattack/Manifest
deleted file mode 100644
index d16e4839ca28..000000000000
--- a/games-puzzle/4stattack/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 4stattack-2.1.4-gentoo.diff 513 BLAKE2B 9cf9396347fb40d23bf89516653eaca79af24e20137228021a02679dd965a7d6a9db42f4c669cbbfe8da773fa279a3509a7ae3a55b17b57e6ff44d30b0b8d153 SHA512 def42479c82d4a5bce910028b5726602b2d07b97afdabf2cb464ae24bc8d081136c81e437fa8d997e171bda14a0af91e14b8d2f1f1b12d5264ebbb1e96fa727d
-DIST 4stAttack-2.1.4.tar.gz 1828247 BLAKE2B 82575adaa8994939f978a0ae796c6a57d64eacf715465ee3ea9614dda28b1543c199d2776408b989e82bf9e4b28cd90cf7b57dc7c21be1329aac2295043f8a57 SHA512 4819c0915bfe47bb965ea39d49fa007fb18cfa965b15e5e72a4b0ac3be8a03c616d9438c8dedd960ee257e44b48f98f75ced6bed5bfc77f3366328c797b30f3c
-EBUILD 4stattack-2.1.4-r1.ebuild 1070 BLAKE2B 27bc1a5465bf2191adbf28c2ff6ce29bbfda912e8f68ba594898c4e8c116498d9bcffc65b015b5b167ac4b826976436b5ec48258858df2cd460c1e987f4cb7bc SHA512 dfbad8200b667ac60167305922db97fc1730072f37c059a3857cc0d70371498e8dd76b3641b6e1d5eb3d8d5f85fece3a34ff90045cb92fe67701545b8e7c405a
-MISC metadata.xml 335 BLAKE2B 558a9365482fa1fec17fec2f638b22f02bbcdfa90529f0bc1524c611f7f90e192583f344105a9e619b009278f130e0c58a13a74d68860760486486aa84606a74 SHA512 eff7c6df19ba9adc535fcc0e33216dcbdad8a04a8a09544263c120ee6185842709c0d08065b64d89be09c37afa270f6736216e78ef779e3a13ac8b82ca0fa299
diff --git a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff b/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
deleted file mode 100644
index 9cb5be53b793..000000000000
--- a/games-puzzle/4stattack/files/4stattack-2.1.4-gentoo.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/4stattack.py
-+++ b/4stattack.py
-@@ -28,6 +28,9 @@
- images	= None
- screen	= None
- 
-+f = os.path.expanduser('~/.4stattackrc')
-+if not os.path.exists(f):
-+    os.system('cp settings.ini %s' % f)
- 
- def playMusic(datadir):
- 	if pygame.mixer.get_init():
-@@ -78,7 +81,7 @@
- 	if options.has_key('-ini'):
- 		ini_settings = IniSettings(options['-ini'])
- 	else:
--		ini_settings = IniSettings('settings.ini')
-+		ini_settings = IniSettings(os.path.expanduser('~/.4stattackrc'))
- 	
- 	settings = ini_settings.settings
- 	
diff --git a/games-puzzle/4stattack/metadata.xml b/games-puzzle/4stattack/metadata.xml
deleted file mode 100644
index ddef1505ee47..000000000000
--- a/games-puzzle/4stattack/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">forcedattack</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index fc7e2ae8167f..16984faf5a5e 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/amoebax-0.2.1-r1 b/games-puzzle/amoebax-0.2.1-r1
new file mode 100644
index 000000000000..434c5d3a2ded
--- /dev/null
+++ b/games-puzzle/amoebax-0.2.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=media-libs/libsdl[sound,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=A cute and addictive action-puzzle game, similar to tetris
+EAPI=6
+HOMEPAGE=http://www.emma-soft.com/games/amoebax/
+KEYWORDS=~amd64 ~x86
+LICENSE=FreeArt GPL-2
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://www.emma-soft.com/games/amoebax/download/amoebax-0.2.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8af41b7854fbed8597a05088ff9f490a
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
deleted file mode 100644
index 88c3507409a8..000000000000
--- a/games-puzzle/amoebax/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX amoebax-0.2.1-aclocal.patch 1536 BLAKE2B bb83bfc7e254ca1f649a735121ba8f9bc71abe35c7c935083d50682ee7cbd77b6eeb5f87ac35b5235f46d5abf8b0a995796548401ed2b943b3acf374bd6e18d9 SHA512 f5f501b0bbe76902c65d404e7aebf830d84c329cf8d84ee5c769660bb4a30cbfbae9a0e16eb2697bd693de77ef38811ac52e68fe799add00b97292c2e79a2d27
-AUX amoebax-0.2.1-compile.patch 227 BLAKE2B de56259f5d58fd3509b2fe2b6d51e7ecd3bdebee4196d03ca3529a24e10123f005529b6e0e9fb434a45c7a8caaaf8197ce9e730276bd3631ad5e3c1b47df2ffc SHA512 fe6b2b3b7d61f5548fc9959dce491e25cdf51313bc46141615e3ea5e96edff34084ac8294b0b8ddace6dc6a374a02cd173e3a4308cb9d56018535f62dfa6defe
-DIST amoebax-0.2.1.tar.bz2 10645579 BLAKE2B 0e8f5d5bb92dd20444bfcb735fdc28142bc359676e057471089b94a6df8a8b45cdecdb1462022909f025310fbc9da1946a50a4d716aa75e34ffc71b4fbc8cfbe SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181
-EBUILD amoebax-0.2.1-r1.ebuild 937 BLAKE2B 796983bbdbe49edcb964bc15095e2a049599ec0f523223277f124c42d3310369d176738ec99ab0834a063585b4e34134aed72cd005d96ab4b7da06a43fe27bdb SHA512 5f7de2cdf5fe0f91b32f012f61f8d3cd8a589e88dcf70d44b4139372e6e0df4541188c71e4bb3c1d4ec90fd1ee427ac91129802514587c9f95e7533c9c7c9ea3
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild b/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
deleted file mode 100644
index 316d438bcddd..000000000000
--- a/games-puzzle/amoebax/amoebax-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A cute and addictive action-puzzle game, similar to tetris"
-HOMEPAGE="http://www.emma-soft.com/games/amoebax/"
-SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
-
-LICENSE="FreeArt GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	default
-
-	eapply \
-		"${FILESDIR}"/${P}-aclocal.patch \
-		"${FILESDIR}"/${P}-compile.patch
-
-	sed -i \
-		-e "/^SUBDIRS/s:doc ::" \
-		Makefile.am || die
-	sed -i \
-		-e "/^iconsdir/s:=.*:=/usr/share/pixmaps:" \
-		-e "/^desktopdir/s:=.*:=/usr/share/applications:" \
-		data/Makefile.am || die
-	sed -i \
-		-e '/Encoding/d' \
-		-e '/Icon/s/.svg//' \
-		data/amoebax.desktop || die
-	AT_M4DIR=m4 eautoreconf
-}
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
deleted file mode 100644
index 11d903516c19..000000000000
--- a/games-puzzle/amoebax/files/amoebax-0.2.1-aclocal.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/m4/objc.m4.old
-+++ b/m4/objc.m4
-@@ -448,32 +448,32 @@
- 
- # AC_LANG_SOURCE(Objective C)(BODY)
- # ---------------------------------
--m4_copy([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
-+m4_copy_force([AC_LANG_SOURCE(C)], [AC_LANG_SOURCE(Objective C)])
- 
- 
- # AC_LANG_PROGRAM(Objective C)([PROLOGUE], [BODY])
- # ------------------------------------------------
--m4_copy([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
-+m4_copy_force([AC_LANG_PROGRAM(C)], [AC_LANG_PROGRAM(Objective C)])
- 
- 
- # AC_LANG_CALL(Objective C)(PROLOGUE, FUNCTION)
- # ---------------------------------------------
--m4_copy([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
-+m4_copy_force([AC_LANG_CALL(C)], [AC_LANG_CALL(Objective C)])
- 
- 
- # AC_LANG_FUNC_LINK_TRY(Objective C)(FUNCTION)
- # --------------------------------------------
--m4_copy([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
-+m4_copy_force([AC_LANG_FUNC_LINK_TRY(C)], [AC_LANG_FUNC_LINK_TRY(Objective C)])
- 
- 
- # AC_LANG_BOOL_COMPILE_TRY(Objective C)(PROLOGUE, EXPRESSION)
- # -----------------------------------------------------------
--m4_copy([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
-+m4_copy_force([AC_LANG_BOOL_COMPILE_TRY(C)], [AC_LANG_BOOL_COMPILE_TRY(Objective C)])
- 
- 
- # AC_LANG_INT_SAVE(Objective C)(PROLOGUE, EXPRESSION)
- # ---------------------------------------------------
--m4_copy([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
-+m4_copy_force([AC_LANG_INT_SAVE(C)], [AC_LANG_INT_SAVE(Objective C)])
- 
- 
- 
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
deleted file mode 100644
index 6be301674149..000000000000
--- a/games-puzzle/amoebax/files/amoebax-0.2.1-compile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/binreloc.cxx
-+++ b/src/binreloc.cxx
-@@ -739,7 +739,8 @@
- char *
- br_dirname (const char *path)
- {
--	char *end, *result;
-+	const char *end;
-+	char *result;
- 
- 	if (path == (const char *) NULL)
- 		return (char *) NULL;
diff --git a/games-puzzle/amoebax/metadata.xml b/games-puzzle/amoebax/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/amoebax/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/anagramarama-0.2-r1 b/games-puzzle/anagramarama-0.2-r1
new file mode 100644
index 000000000000..bc2c1e078b62
--- /dev/null
+++ b/games-puzzle/anagramarama-0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2
+DESCRIPTION=Create as many words as you can before the time runs out
+EAPI=6
+HOMEPAGE=http://www.coralquest.com/anagramarama/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 sys-apps/miscfiles
+SLOT=0
+SRC_URI=http://www.omega.clara.net/anagramarama/dist/anagramarama-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1b9a4977cc7752821cb6985c79003ad0
diff --git a/games-puzzle/anagramarama/Manifest b/games-puzzle/anagramarama/Manifest
deleted file mode 100644
index 251355711db0..000000000000
--- a/games-puzzle/anagramarama/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX anagramarama-0.2-gentoo.patch 918 BLAKE2B da8f286fd932f9bf8f8b00541565ea11f60e3d13581a46b86c4b9cb0572fbaa821b672554b3448da026ad15e97c87e39766fcba8ab4ece464cf605cbbb582712 SHA512 d87759b401efc4bb51dcf7f121548038b736d89b026cfc9fb82e467c131dae10cc933dd0aa2ec668c3636d93cb37bb8b6325691ed46366b7668605d8921308ab
-DIST anagramarama-0.2.tar.gz 861484 BLAKE2B 9fb6b759b9d2f7a797e8ecf214c8723676577b8a7a88049da7b59a1e4287363c3ac58ee203033e7d7cad777d175599433fffc37fe824da4ca5511e85918b6ae8 SHA512 7cdafaf489100c184a71859f50b64fe8534210d953c4144d822727815ae2f7dd12302447b159039d95c9b3097711ab14931538789ac81c01233cc2c767291603
-EBUILD anagramarama-0.2-r1.ebuild 981 BLAKE2B c9684174378d228f6c147cd4677cb15c680073988797472fbde1f98b3fb624e4b31d0976b068948c8c32c37277ff1a2c46e814c1f8eb5762ca4db63430040398 SHA512 fbe12367b60218d971a180506d29b077aa7d8561874ff067b0b49570a81aea8fce7c0b199d7e684feb83dd7268e7b0603e7e2d70f43bba111ff5155349e4726a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild b/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
deleted file mode 100644
index 4e1bc1d0b0b2..000000000000
--- a/games-puzzle/anagramarama/anagramarama-0.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop vcs-clean
-
-DESCRIPTION="Create as many words as you can before the time runs out"
-HOMEPAGE="http://www.coralquest.com/anagramarama/"
-SRC_URI="http://www.omega.clara.net/anagramarama/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2
-	>=media-libs/sdl-mixer-1.2
-	>=media-libs/sdl-image-1.2"
-RDEPEND="${DEPEND}
-	sys-apps/miscfiles
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	ecvs_clean
-	sed -i \
-		-e "s:wordlist.txt:/usr/share/${PN}/wordlist.txt:" \
-		-e "s:audio/:/usr/share/${PN}/audio/:" \
-		-e "s:images/:/usr/share/${PN}/images/:" \
-		src/{ag.c,dlb.c} \
-		|| die "sed failed"
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	newbin ag ${PN}
-	insinto "/usr/share/${PN}"
-	doins wordlist.txt
-	doins -r images/ audio/
-	dodoc readme
-	make_desktop_entry ${PN} "Anagramarama"
-}
diff --git a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch b/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
deleted file mode 100644
index fb60615055db..000000000000
--- a/games-puzzle/anagramarama/files/anagramarama-0.2-gentoo.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/makefile.old	2009-02-08 18:24:33.000000000 +0100
-+++ b/makefile	2009-02-08 18:29:12.000000000 +0100
-@@ -1,5 +1,4 @@
--LFLAGS=-Wall -funroll-loops -fomit-frame-pointer -pipe -O9
--CFLAGS=-Wall `sdl-config --cflags --libs` -funroll-loops -fomit-frame-pointer -pipe -O9 -lSDL_mixer
-+LDLIBS=`sdl-config --cflags --libs` -lSDL_mixer
- CC=gcc
- 
- C_FILES=src/dlb.c src/linked.c src/sprite.c src/ag.c
-@@ -9,19 +8,19 @@
- all:ag
- 
- ag: $(OBJ_FILES)
--	$(CC) $(CFLAGS) -o $(OUT_FILE) $(OBJ_FILES)
-+	$(CC) $(LDFLAGS) -o $(OUT_FILE) $(OBJ_FILES) $(LDLIBS)
- 
- src/dlb.o: src/dlb.c
--	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 
- src/linked.o: src/linked.c
--	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 	
- src/sprite.o: src/sprite.c
--	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 
- src/ag.o: src/ag.c
--	$(CC) $(LFLAGS) -c -o $@ $^
-+	$(CC) $(CFLAGS) -c -o $@ $^
- 
- clean:
- 	rm -f src/*.o
diff --git a/games-puzzle/anagramarama/metadata.xml b/games-puzzle/anagramarama/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/anagramarama/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/angrydd-1.0.1-r2 b/games-puzzle/angrydd-1.0.1-r2
new file mode 100644
index 000000000000..f25781bf039a
--- /dev/null
+++ b/games-puzzle/angrydd-1.0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter
+EAPI=6
+HOMEPAGE=https://www.sacredchao.net/~piman/angrydd/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.sacredchao.net/~piman/angrydd/angrydd-1.0.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1d951cea0d4049e8838f68371520673c
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
deleted file mode 100644
index 14abbd385135..000000000000
--- a/games-puzzle/angrydd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
-EBUILD angrydd-1.0.1-r2.ebuild 1006 BLAKE2B 7e309de57f4417e00355df3c1a5da1441d1cabdcb105b00448e12933522ae61901e3da9b4ffa0b576067156268d7ac9b148e2bd2771e41279c7d78e77748b901 SHA512 6134d6a094786875b9f9b06ed4ab8b19c3496898752378a408145d3812de548039df78d86d0dccd2acfc677745c811d1ec469c54a1cf63457e838ebf9c4ff325
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild b/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
deleted file mode 100644
index 822cc2d5e973..000000000000
--- a/games-puzzle/angrydd/angrydd-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-single-r1
-
-DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
-HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
-SRC_URI="https://www.sacredchao.net/~piman/angrydd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr/share/" \
-		TO="${PN}" \
-		install
-	rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die
-
-	python_optimize "${ED}/usr/share/${PN}"
-
-	dodir /usr/bin
-	dosym "${ED}/usr/share/${PN}/angrydd.py" "/usr/bin/${PN}"
-	doman angrydd.6
-	dodoc README TODO HACKING
-
-	doicon angrydd.png
-	make_desktop_entry angrydd "Angry, Drunken Dwarves"
-}
diff --git a/games-puzzle/angrydd/metadata.xml b/games-puzzle/angrydd/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/angrydd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/arrows-0.6-r1 b/games-puzzle/arrows-0.6-r1
new file mode 100644
index 000000000000..39d9b04e5ab4
--- /dev/null
+++ b/games-puzzle/arrows-0.6-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=x11-libs/gtk+-2.4:2 virtual/pkgconfig
+DESCRIPTION=Simple maze-like game where you navigate around and destroy arrows
+EAPI=6
+HOMEPAGE=http://noreason.ca/?file=software
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-2.4:2
+SLOT=0
+SRC_URI=http://noreason.ca/data/arrows-0.6.tar.gz
+_md5_=a04d2d96fa34e84ad10b04f1a4679859
diff --git a/games-puzzle/arrows/Manifest b/games-puzzle/arrows/Manifest
deleted file mode 100644
index 14cbc0307882..000000000000
--- a/games-puzzle/arrows/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arrows-0.6.tar.gz 53374 BLAKE2B ba31d4ef1bc6e48ada197a13a359004a661a6dcf8875933da2a74f57ad90c3b0d422fd4c2427c4eb340fb26870952ebaa679ff8b0f88d7470f012bc3b8c0f868 SHA512 f6c55d616283ad25d9d830440deaa11de81bccfc2d8eabe627104626ea111d986e522f73d61e5aed58476cc34a3e2b3fe2a20ab1538b7ecef04ecb941f34d83e
-EBUILD arrows-0.6-r1.ebuild 895 BLAKE2B 2aab21a3b6e89451fe1972cd0eace456542641a47bde688958ee0602c75bce6b1fde432603c17c41e97ece3535a71eea7ad4da586dfce99928c4dac224e6e15e SHA512 bf8e71f225251531348c42b99cbd2718a9c68975e26f66f5b8ca16418f0efe4c0664bf00c7d86986d1e3bbc5fef344d413ba824ea03ea2b7131a29278c00d9cc
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/arrows/arrows-0.6-r1.ebuild b/games-puzzle/arrows/arrows-0.6-r1.ebuild
deleted file mode 100644
index 5e3b5c6834b5..000000000000
--- a/games-puzzle/arrows/arrows-0.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple maze-like game where you navigate around and destroy arrows"
-HOMEPAGE="http://noreason.ca/?file=software"
-SRC_URI="http://noreason.ca/data/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.4:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	# Modify path to data
-	sed -i \
-		-e "s:arrfl:/usr/share/${PN}/arrfl:" \
-		-e 's:nm\[9:nm[35:' \
-		-e 's:nm\[6:nm[30:' \
-		-e 's:nm\[7:nm[31:' \
-		game.c \
-		|| die 'sed failed'
-	sed -i \
-		-e '/^CC /d' \
-		-e '/CCLIBS/s:$: $(LDFLAGS):' \
-		Makefile \
-		|| die 'sed failed'
-}
-
-src_compile() {
-	make clean || die "make clean failed"
-	emake CCOPTS="${CFLAGS}"
-}
-
-src_install() {
-	dobin arrows
-	insinto "/usr/share/${PN}"
-	doins arrfl*
-	einstalldocs
-}
diff --git a/games-puzzle/arrows/metadata.xml b/games-puzzle/arrows/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/arrows/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/atomix-3.22.0 b/games-puzzle/atomix-3.22.0
new file mode 100644
index 000000000000..da2e7b2bb984
--- /dev/null
+++ b/games-puzzle/atomix-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3 dev-libs/appstream-glib >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Build molecules, from simple inorganic to extremely complex organic ones
+EAPI=6
+HOMEPAGE=http://ftp.gnome.org/pub/GNOME/sources/atomix/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.36:2 >=x11-libs/gdk-pixbuf-2.0.5:2 >=x11-libs/gtk+-3.10:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/atomix/3.22/atomix-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=47a0b5461ba034f6f3c654b2b7813cfa
diff --git a/games-puzzle/atomix/Manifest b/games-puzzle/atomix/Manifest
deleted file mode 100644
index c2a7559d0db3..000000000000
--- a/games-puzzle/atomix/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST atomix-3.22.0.tar.xz 551424 BLAKE2B be2c9c60a5e526ce810d8742bf3b799edc8aea8b493ddc0beb356dce2aef9f4daa6b38c885c2b48e7ce7fff80685522d546fddc134cd2d06c6cb72128522a52e SHA512 111c1d1cbd4e07ef7fdfa6d6431b2b7f460dfcceabd1460675640c3965e7f40fb145c921d27e0f3c06605e943190fd36af6d6d462533dca207b8d29487470212
-EBUILD atomix-3.22.0.ebuild 535 BLAKE2B 555c47c9d8226b8b229ec3783770453f8a657891618c55e436219b4378b1ee6b1ba601a8212b79c1e6c751db24edc702f6ffc0936b689c570d68b3ad8231697a SHA512 7551095fc1489cfdef0b86d4bb8e29e36bfe2f8439ec27bcb75acf5ed2245d9bc44bc913d817a861f43db5b215bcaaafb7f1e1659384ed1e213af07f52373acb
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/atomix/atomix-3.22.0.ebuild b/games-puzzle/atomix/atomix-3.22.0.ebuild
deleted file mode 100644
index a5b20639ca59..000000000000
--- a/games-puzzle/atomix/atomix-3.22.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Build molecules, from simple inorganic to extremely complex organic ones"
-HOMEPAGE="http://ftp.gnome.org/pub/GNOME/sources/atomix/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/gdk-pixbuf-2.0.5:2
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/atomix/metadata.xml b/games-puzzle/atomix/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-puzzle/atomix/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/bastet-0.43 b/games-puzzle/bastet-0.43
new file mode 100644
index 000000000000..58a24239a9b7
--- /dev/null
+++ b/games-puzzle/bastet-0.43
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/ncurses:0 dev-libs/boost:0
+DESCRIPTION=a simple, evil, ncurses-based Tetris(R) clone
+EAPI=5
+HOMEPAGE=http://fph.altervista.org/prog/bastet.shtml
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0 dev-libs/boost:0 games-misc/games-envd
+SLOT=0
+SRC_URI=http://fph.altervista.org/prog/files/bastet-0.43.tgz
+_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_=0e07932b50c211515d72447fd4186617
diff --git a/games-puzzle/bastet/Manifest b/games-puzzle/bastet/Manifest
deleted file mode 100644
index caac8ee082e3..000000000000
--- a/games-puzzle/bastet/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX bastet-0.43-gentoo.patch 474 BLAKE2B e05a58a66f3cb5df6dcbbb00c550ed322ee526b207f1e564edfb41af597eeccab1e80b5c45204d37ac73d4f46bd472c5bd1ede35f3a5a7bffaba51ef4bfa8c99 SHA512 8d381ecb59f141cfc16f64ec21eac18d91ece99e01e2ae327117545c8ea354e6e50a17cf966e43dc7bb5fe7ec6b1b3008fcf385098a222791cb15ec67bab400b
-DIST bastet-0.43.tgz 29115 BLAKE2B df8c866da77be5ecbee9ed24c26f506a26d84a218af3916ece8e6b1ea18dc6ff51e3d76a9553ddfe404212e0bed63073892cb53bdbd334e207ee115877ae4989 SHA512 a3683c2cea4df592d9cef2be1b0006acc2b6eddbe6b64aba1c21e81ba39df9bcff6494e0949b67a84f3d1a0fa6837f0d1b7cebb2eb8a551b54392e4a45f2e172
-EBUILD bastet-0.43.ebuild 732 BLAKE2B dd2a3dccf5853d8a5da1711b52ac867c284045857a19c2686b4926eccf3ab37a9ca104540a4ab1e868837160d5df1b807e46941e9068ab4a40af26bed35e01f7 SHA512 900f6161e7232a30624cc82eba64f534a4e8fa67111019f16abd515be3e962c54835da90163f0ff599faaf4149ea5ee3065a4d0ee0373168542a7cab7f8a889a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/bastet/bastet-0.43.ebuild b/games-puzzle/bastet/bastet-0.43.ebuild
deleted file mode 100644
index c395170fbcbe..000000000000
--- a/games-puzzle/bastet/bastet-0.43.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="a simple, evil, ncurses-based Tetris(R) clone"
-HOMEPAGE="http://fph.altervista.org/prog/bastet.shtml"
-SRC_URI="http://fph.altervista.org/prog/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses:0
-	dev-libs/boost:0"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	dogamesbin bastet
-	doman bastet.6
-	dodoc AUTHORS NEWS README
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/bastet.scores" || die "touch failed"
-	fperms 664 "${GAMES_STATEDIR}/bastet.scores"
-	prepgamesdirs
-}
diff --git a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch b/games-puzzle/bastet/files/bastet-0.43-gentoo.patch
deleted file mode 100644
index db7671592224..000000000000
--- a/games-puzzle/bastet/files/bastet-0.43-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.old	2010-12-02 15:43:29.000000000 +0100
-+++ Makefile	2010-12-02 15:47:18.000000000 +0100
-@@ -11,10 +11,10 @@
- depend: *.hpp $(SOURCES)
- 	$(CXX) -MM $(SOURCES) > depend
- 
--include depend
-+-include depend
- 
- $(PROGNAME): $(SOURCES:.cpp=.o)
--	$(CXX) -ggdb -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options
-+	$(CXX) ${CXXFLAGS} -o $(PROGNAME) $(SOURCES:.cpp=.o) $(LDFLAGS) -lboost_program_options
- 
- clean:
- 	rm -f $(SOURCES:.cpp=.o) $(PROGNAME)
diff --git a/games-puzzle/bastet/metadata.xml b/games-puzzle/bastet/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/bastet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/biniax2-1.30-r1 b/games-puzzle/biniax2-1.30-r1
new file mode 100644
index 000000000000..e95c43394fa9
--- /dev/null
+++ b/games-puzzle/biniax2-1.30-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+DESCRIPTION=Logic game with arcade and tactics modes
+EAPI=6
+HOMEPAGE=http://biniax.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=http://mordred.dir.bg/biniax/biniax2-1.30-fullsrc.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=45bf1bd59dfbe0011583d41638962045
diff --git a/games-puzzle/biniax2/Manifest b/games-puzzle/biniax2/Manifest
deleted file mode 100644
index 574da8e3dffc..000000000000
--- a/games-puzzle/biniax2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX biniax2-1.30-build.patch 529 BLAKE2B 4c1a391a9d4534d83b017962c62d8cc776cf44a53f942d468f5e033287158ad7781451a174901e06103f73af216eb1792bb0f18f7941367c2ba9d1d2eaf7ec63 SHA512 3f335b2e71c81f46298c188a1cd3fc5e74210ddb79c4ec514156bfc581125aaf3aaee792f1f86b2b87edc6f8507cee577d817d3c15ce6691c45624c9def11b50
-AUX biniax2-1.30-dotfiles.patch 1372 BLAKE2B 2e33067d9fa951d371093ef33c61303e93760707730ce513f951235b3dad0ff146c6b8132f722da29ec05c61fb5a50eeb58e92ea50251a09e56bfcbd538a1b19 SHA512 7cc2c04ee62931038afe7b89eaeffef33e7e9312a206b987817760c6537c1923945634243abc380b059fc332d12b220d83660f5158f832d1dadb854dc1ea5fa3
-AUX biniax2.xpm 1292 BLAKE2B de60ee16f9229155b2a31682f759b025822eed85bfbe2b7c3d83cd18df230dd3a62bff7d5a5c11e496715a4e3565bee1e565cfbfae15b634993a3c26ec29b070 SHA512 5a53233b27f5e8dd792cd697d8233c8d34adaf00dda51944caad186deb50311e55bd76916f4aa6e352973fe14855d34a27bcf9a91a8f6a56238f5fe18f5d3b58
-DIST biniax2-1.30-fullsrc.tar.gz 3072220 BLAKE2B 7a62f9cf625e7f7d59ac6b84528911f939e489da131a7b414fcdc7cb4acffe1877363983a190aacbc2ce8ca87ae5a631ecc1f9bc937c103b65b6c0543c3cb641 SHA512 180564b24051b629c29bc6245664a36b7ff9881ac5003b03b91eeebff86c89b9507c028c1155387c42debaa51482d8f1e2b08e9e9236b77da1c3f286b78be8b5
-EBUILD biniax2-1.30-r1.ebuild 805 BLAKE2B e3277770de490616fa92e5e2f6bfac4f469a2ae6c31726f9e6e1818702a39248026550c7c4282df0a224d298ba8717e4d44facc43868159e81fcb33f0788f87d SHA512 d8f89846c14ff7232284a097032674d164ede3ce12b563be2a0afce5305deddcd1c460f42f299d798da235c56e098c31ee376dda47b0e41f190f5c3968a3b245
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild b/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
deleted file mode 100644
index e4710407e8e7..000000000000
--- a/games-puzzle/biniax2/biniax2-1.30-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Logic game with arcade and tactics modes"
-HOMEPAGE="http://biniax.com/"
-SRC_URI="http://mordred.dir.bg/biniax/${P}-fullsrc.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-
-	rm -f data/Thumbs.db
-	sed -i \
-		-e "s:data/:/usr/share/${PN}/:" \
-		desktop/{gfx,snd}.c \
-		|| die
-	eapply \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-dotfiles.patch
-}
-
-src_install() {
-	dobin ${PN}
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry ${PN} Biniax-2
-}
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-build.patch b/games-puzzle/biniax2/files/biniax2-1.30-build.patch
deleted file mode 100644
index cce8abe91a93..000000000000
--- a/games-puzzle/biniax2/files/biniax2-1.30-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -4,7 +4,7 @@
- # To execute the game you need the runtimes of SDL, SDL_mixer and SDL_image.
- 
- FLAGS=-W -WALL
--CC=gcc
-+CC?=gcc
- FILES=biniax.c hof.c desktop/cfg.c desktop/gfx.c desktop/snd.c desktop/inp.c desktop/sys.c
- INCLUDES=-I . -I desktop
- LINKTO=-lSDL -lSDL_mixer -lSDL_image
-@@ -12,4 +12,4 @@
- TARGET=biniax2
- 
- biniax:
--	$(CC) $(AUTO) $(FILES) $(INCLUDES) -o $(TARGET) $(LINKTO)
-\ No newline at end of file
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(AUTO) $(FILES) $(INCLUDES) -o $(TARGET) $(LINKTO)
diff --git a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch b/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
deleted file mode 100644
index 00391677ce8a..000000000000
--- a/games-puzzle/biniax2/files/biniax2-1.30-dotfiles.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/biniax.c
-+++ b/biniax.c
-@@ -47,6 +47,8 @@
- INCLUDES

- ******************************************************************************/

- 

-+#include <unistd.h>

-+

- #include "game.h"

- #include "lev.h"

- #include "inc.h"

-@@ -97,6 +99,8 @@
- 	UNREF( argc );

- 	UNREF( argv );

- 

-+	chdir( getenv( "HOME" ) );

-+

- 	cfgInit();

- 	hofInit();

- 	if ( gfxInit() == BNX_FALSE )

---- a/desktop/cfg.c
-+++ b/desktop/cfg.c
-@@ -36,7 +36,7 @@
- ******************************************************************************/

- 

- #define _Cfg_Buffer 255

--#define csConfigName "config.bnx2"

-+#define csConfigName ".config.bnx2"

- 

- struct BNX_SETUP

- {

---- a/game.h
-+++ b/game.h
-@@ -37,7 +37,7 @@
- DEFINITIONS

- ******************************************************************************/

- 

--#define csSaveGameName		"autosave.bnx2"

-+#define csSaveGameName		".autosave.bnx2"

- 

- /******************************************************************************

- CONSTANTS

---- a/hof.c
-+++ b/hof.c
-@@ -34,7 +34,7 @@
- #define chCursor		'_'			/* Cursor ON */

- #define chSpace			' '			/* Cursor OFF*/

- 

--#define csHOFName		"hof.bnx2"	/* File name */

-+#define csHOFName		".hof.bnx2"	/* File name */

- #define cHOFFileSize	504			/* File size */

- 

- BNX_HALL	Hof;

-@@ -292,4 +292,4 @@
- BNX_HALL *hofGet()

- {

- 	return (BNX_HALL *) &Hof;

--}
-\ No newline at end of file
-+}

diff --git a/games-puzzle/biniax2/files/biniax2.xpm b/games-puzzle/biniax2/files/biniax2.xpm
deleted file mode 100644
index da3c5ddd7d1d..000000000000
--- a/games-puzzle/biniax2/files/biniax2.xpm
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * icon_xpm[] = {
-"32 32 6 1",
-" 	c None",
-".	c #800000",
-"+	c #FF8204",
-"@	c #FC4E04",
-"#	c #FCA204",
-"$	c #FEC489",
-"                                ",
-"                                ",
-"                                ",
-"               .                ",
-"  ++++++++++  .@.               ",
-"  +########$ .@@@$              ",
-"  +#$$$$$$$$  $@$               ",
-"  +#$          $                ",
-"  +#$                           ",
-"  +#$                           ",
-"  +#$   ++++         +++   +++  ",
-"  +#$   +####        +#$   +#$  ",
-"  +#$   +####+       +#$   +#$  ",
-"  +#$   +#$####      +#$   +#$  ",
-"  +#$   +#$ $##+     +#$   +#$  ",
-"  +#$   +#$  ####    +#$   +#$  ",
-"  +#$   +#$   $##+   +#$   +#$  ",
-"  +#$   +#$    ####  +#$   +#$  ",
-"  +#$   +#$     $##+ +#$   +#$  ",
-"  +#$   +#$      ######$   +#$  ",
-"  +#$   +#$       $####$   +#$  ",
-"  +#$   +#$        ####$   +#$  ",
-"  $$$   $$$         $$$$   +#$  ",
-"                           +#$  ",
-"                           +#$  ",
-"                .          +#$  ",
-"               .@.  ++++++++#$  ",
-"              .@@@$ +########$  ",
-"               $@$  $$$$$$$$$$  ",
-"                $               ",
-"                                ",
-"                                "};
diff --git a/games-puzzle/biniax2/metadata.xml b/games-puzzle/biniax2/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/biniax2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/braincurses-0.5b-r1 b/games-puzzle/braincurses-0.5b-r1
new file mode 100644
index 000000000000..de43a176e540
--- /dev/null
+++ b/games-puzzle/braincurses-0.5b-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=An ncurses-based mastermind clone
+EAPI=6
+HOMEPAGE=http://freshmeat.net/projects/braincurses/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/braincurses/braincurses-0.5b.tar.gz
+_md5_=8b9a89aec36e5a3b79fa3047e21cbeb7
diff --git a/games-puzzle/braincurses/Manifest b/games-puzzle/braincurses/Manifest
deleted file mode 100644
index 2cf5850d9cde..000000000000
--- a/games-puzzle/braincurses/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX braincurses-0.5b-as-needed.patch 696 BLAKE2B e0d234562842a30aceec3b686c9315be7f856e14b0398c14a3f7c7350a9ccf34d9bd96d7a10e62978b372a28e99178ce81b54960416e08c23bb347935eebd2c3 SHA512 8788fe4ef94d3b501104e66dc31a4df43b55b0949ef35b1fe9d6acf936e178d8a7bacbc331af6db093a056218658e845a816e51746000085581f8e623fbcd42c
-AUX braincurses-0.5b-gcc43.patch 192 BLAKE2B 4f557c7666e4d1b772feb1de5a793868aaf38dcdec583f9feb795bc72b98262078924a5734e137cd5719cdd77cc35c596f758677d0682035859f6575b6c8eb6d SHA512 94a6664162be766918280af07201ba3eb55c22e0eabbf8701aecb5c7f0eb5151e24d7b65aadb6db4262373c1323b170c332f3700f5e90a74f048511600f88f64
-DIST braincurses-0.5b.tar.gz 18487 BLAKE2B 4d3874eb6625781e866ba2250da45ff165d662abaeabda2c4525bb300479b33e1efb91f997165310b7a4edc61f81ac841b00b940d319ef0c18b8684dd5355d60 SHA512 7f90da3a5c480e0bf736dd4a53efc08abeb85969e727882e3d06f888b2a4b6002f9fd9bc1554ac2256c9821dea5fabf2638eba4a672046a09c1adb8690803a0e
-EBUILD braincurses-0.5b-r1.ebuild 650 BLAKE2B aa7d73dd33fd0c1ee69b24c2de0aba5b73a926c1d35a724f7e5a2538b3f8e7a121c8b30ad02c268baa9f883ec891c2bf93dcb13694dce14407deb00b396198d2 SHA512 799cd2186eff518fb5c3ced616a2d42c1e56c22d487012e0794bd1e33f1c382999ddee8251a901679339eecfbbcc1c05ac886d594336a18a73473dd7ed2cae17
-MISC metadata.xml 388 BLAKE2B eb17cdee5b9a933eb9ee52b34a7b6085394d76fa182a1e696014a16fa32eea47c4c5372b342e203296dcc4cc590c1c90833a1ba1681b70c9c65aa20ed037c974 SHA512 22fb2671d0f2029bea4e513d469b2d9940fef9a5ed6a6d9b47dfc80aae50b41bae3d89a620ff4be028ab46ab2dcca801a4653e95feca142c3b2921d436e2e6c0
diff --git a/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild b/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
deleted file mode 100644
index 609bfa218305..000000000000
--- a/games-puzzle/braincurses/braincurses-0.5b-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="An ncurses-based mastermind clone"
-HOMEPAGE="http://freshmeat.net/projects/braincurses/"
-SRC_URI="mirror://sourceforge/braincurses/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-as-needed.patch
-
-	# fix buffer overflow (bug #301033)
-	sed -i \
-		-e 's/guessLabel\[2/guessLabel[3/' \
-		curses/windows.cpp \
-		|| die 'sed failed'
-}
-
-src_install() {
-	dobin braincurses
-	einstalldocs
-}
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch b/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
deleted file mode 100644
index 2101602c6372..000000000000
--- a/games-puzzle/braincurses/files/braincurses-0.5b-as-needed.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/Makefile.old	2009-02-09 16:04:47.000000000 +0100
-+++ b/Makefile	2009-02-09 16:14:41.000000000 +0100
-@@ -1,22 +1,9 @@
- # Makefile for braincurses game
- # written by Brian Derr
- 
--CC=g++
--CFLAGS=-Wall
--CURSES_LIBS=-lncurses
-+LDLIBS=-lncurses
- 
--ncurses: curses/windows.o braincurses.o 
--	${CC} ${CURSES_LIBS} ${CFLAGS} -o braincurses curses/windows.o \
--	braincurses.o
--
--windows.o: windows.cpp
--	${CC} ${CFLAGS} -c curses/windows.cpp
--
--braincurses.o: braincurses.cpp
--	${CC} ${CFLAGS} -c braincurses.cpp
--
--#top_scores.o: top_scores.cpp
--#	${CC} ${CFLAGS} -c top_scores.cpp
-+braincurses: curses/windows.cpp braincurses.cpp 
- 
- install:
- 	install -o root -g root braincurses /usr/local/bin/
diff --git a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch b/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
deleted file mode 100644
index 6fa5509a7786..000000000000
--- a/games-puzzle/braincurses/files/braincurses-0.5b-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/braincurses.h
-+++ b/braincurses.h
-@@ -12,6 +12,7 @@
- #include <cstddef>
- #include <cstdlib>
- #include <ctime>
-+#include <cstring>
- #include <iostream>
- #include <map>
- #include <string>
diff --git a/games-puzzle/braincurses/metadata.xml b/games-puzzle/braincurses/metadata.xml
deleted file mode 100644
index 8444fd297f54..000000000000
--- a/games-puzzle/braincurses/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">braincurses</remote-id>
-		<remote-id type="freshmeat">braincurses</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/brainparty-0.61-r1 b/games-puzzle/brainparty-0.61-r1
new file mode 100644
index 000000000000..89f2564fa7f6
--- /dev/null
+++ b/games-puzzle/brainparty-0.61-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+DESCRIPTION=A puzzle-solving, brain-stretching game for all ages
+EAPI=6
+HOMEPAGE=http://www.tuxradar.com/brainparty
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=https://launchpad.net/brainparty/trunk/0.61/+download/brainparty0.61.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_=aba43fd12b129df0efafa4234fadb87c
diff --git a/games-puzzle/brainparty/Manifest b/games-puzzle/brainparty/Manifest
deleted file mode 100644
index 84e8324bb1d8..000000000000
--- a/games-puzzle/brainparty/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX brainparty-0.61-gcc49.patch 489 BLAKE2B f4f317679669fca33429e19a967945691e8baa24ec7ccea2d7a943e1ea4eed0108ea13c30208ac75b80d253b7166540556b20a7b47443e644bf8af8eeee78a82 SHA512 9859614d97c9fe8efd8cefedd8ef935cbdf4344154f2e272e0624268e48533b620a55654c9d0097e3726579ce1a7028ad44eb705c2e86bbc983cb490faec6295
-AUX brainparty-0.61-gnu_cxx-hash.patch 219 BLAKE2B 8a0570732bc55c2a0fe5b703e947650fe92200582581bc39857eb5a4898bdd9925ebd5e8568efc0e0c1765db26b4c9d5c15afab7fba49aa2a2016573e56be539 SHA512 d42cb49d0c320d91fc9c31706e2fb3e8cffcd0b08803b1a016ff30e283f35f86bbbdaae98a1f0ee3cece82d027dd767ce0a30ca8565887a2d2d619789ce51e30
-AUX brainparty-0.61-savegame.patch 674 BLAKE2B 051698e4fde8dab50ff591657705c32e5926d74ca83833ed0e901c6cc11bf82c66a6b7b5ef201d3e0ec2e27be0e8e0991c41216cfe34ece92ad21933606aaf0e SHA512 9e158b97ff15cfb4b6b8e4f6eb8006335841c48ff94b5da8bbb0cba03868b8ead92d2520bc8adae887d4baabac93c8104e44b46d87b6c4258792ab64376ce34a
-DIST brainparty0.61.tar.gz 40676905 BLAKE2B cfa1a408a66438491e6053be0e76ca64d1d78724be86379cb06e750fc842e9835b624af7b98163c232ee6e205a4c2f9478f9d42fe0eaa28d18b45e218db75971 SHA512 bc8578a551ce4b7f40e212d9ab9910b2435b88d8b7b7e90a1c088e37d5f26b5c6126fcb9ffee7e39981eff34c13144c8f3204e020532b5abf1c4815cc8074eb9
-EBUILD brainparty-0.61-r1.ebuild 1223 BLAKE2B eab12dfb377265408a9192c02ff20a0308d780acd7beee685dddfbec805aa4635e22f1cb09777f4b092cfdd4ecb58cd0f3f8f12993d4d25fa401add2a76dee11 SHA512 2dd1e3071749fe87480d37c3d4e8eebf0c24479cdbb624c28e0960b9dfd08eb830c5fe5dc25f3d987a02adbc141c2b3cc75fdc785ee40c734ca4bdb56dc99e4b
-MISC metadata.xml 331 BLAKE2B e2ed6c3f26c4637f2ca40dd55ecda347ffd596dc9c55db194668bd546f362bf37e41e52ba94a6777da6bcfa4d53513b865a6acb615b60b2a6ce8f6e6634087ac SHA512 bcea1853cf01102eb88c58723e585f81c55b4208be24b46bc421b62afa84405539116b33289e94c7b1da5c259ca91d0fc6553e6441e59ec5d41326525742a404
diff --git a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild b/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
deleted file mode 100644
index 97d4b35c28aa..000000000000
--- a/games-puzzle/brainparty/brainparty-0.61-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="A puzzle-solving, brain-stretching game for all ages"
-HOMEPAGE="http://www.tuxradar.com/brainparty"
-SRC_URI="https://launchpad.net/brainparty/trunk/${PV}/+download/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,opengl,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-savegame.patch
-	"${FILESDIR}"/${P}-gcc49.patch
-	"${FILESDIR}"/${P}-gnu_cxx-hash.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's/$(LIBS) $(OSXCOMPAT) $(OBJFILES)/$(OSXCOMPAT) $(OBJFILES) $(LIBS)/' \
-		-e 's/CXXFLAGS = .*/CXXFLAGS+=-c/' \
-		-e '/^CXX =/d' \
-		-e '/-o brainparty/s/INCLUDES) /&$(LDFLAGS) /' \
-		Makefile || die
-	sed -i \
-		"/^int main(/ a\\\\tchdir(\"/usr/share/${PN}\");\n" \
-		main.cpp || die
-}
-
-src_install() {
-	dobin brainparty
-
-	insinto /usr/share/${PN}/Content
-	doins -r Content/.
-
-	newicon Content/icon.bmp ${PN}.bmp
-	make_desktop_entry brainparty "Brain Party" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch b/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch
deleted file mode 100644
index 7147cd460be6..000000000000
--- a/games-puzzle/brainparty/files/brainparty-0.61-gcc49.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/BPList.h
-+++ a/BPList.h
-@@ -138,7 +138,7 @@
- 	~BPPList();
- 	void Add(T item);
- 	bool Contains(T item);
--	void Clear(bool safe_delete);
-+	void Clear(bool safe_delete = true);
- 	int IndexOf(T item);
- 	void Insert(int pos, T item);
- 	void Remove(T item);
-@@ -171,7 +171,7 @@
- }
- 
- template <class T>
--void BPPList<T>::Clear(bool safe_delete = true) {
-+void BPPList<T>::Clear(bool safe_delete) {
- 	if (safe_delete) {
- 		for (int i = data.size() - 1; i >= 0; --i) {
- 			T item = data[i];
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch b/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch
deleted file mode 100644
index 8d933462673b..000000000000
--- a/games-puzzle/brainparty/files/brainparty-0.61-gnu_cxx-hash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/WordList.h
-+++ b/WordList.h
-@@ -35,7 +35,7 @@
- 	};
- }
- 
--typedef hash_set<string, hash<string> > string_hash_set;
-+typedef hash_set<string, __gnu_cxx::hash<string> > string_hash_set;
- 
- class WordList {
- private:
diff --git a/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch b/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
deleted file mode 100644
index 08526d345100..000000000000
--- a/games-puzzle/brainparty/files/brainparty-0.61-savegame.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/BPGame.cpp
-+++ b/BPGame.cpp
-@@ -1294,8 +1294,10 @@ void BPGame::LoadSettings() {
- 	Secret1 = Secret2 = Secret3 = Secret4 = false;
- 	NumUnlockedGames = 0;
- 
-+	string file = string("/.brainparty");
-+	file.insert(0, getenv("HOME"));
- 	ifstream ifs;
--	ifs.open(".brainparty");
-+	ifs.open(file.c_str());
- 	
- 	FirstRun = false;
- 	
-@@ -1425,8 +1428,11 @@ void BPGame::LoadSettings() {
- }
- 
- void BPGame::SaveSettings() {
-+	string file = string("/.brainparty");
-+	file.insert(0, getenv("HOME"));
-+	
-  	ofstream savefile;
-- 	savefile.open(".brainparty");
-+ 	savefile.open(file.c_str());
- 	savefile << EnableSound << endl;
- 	savefile << EnableMusic << endl;
- 	savefile << endl;
diff --git a/games-puzzle/brainparty/metadata.xml b/games-puzzle/brainparty/metadata.xml
deleted file mode 100644
index 441580ff56b3..000000000000
--- a/games-puzzle/brainparty/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">brainparty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/brainworkshop-4.8.4 b/games-puzzle/brainworkshop-4.8.4
new file mode 100644
index 000000000000..203bca98b8a1
--- /dev/null
+++ b/games-puzzle/brainworkshop-4.8.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Short-term-memory training N-Back game
+EAPI=5
+HOMEPAGE=http://brainworkshop.sourceforge.net/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+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/pyopenal || ( >=dev-python/pyglet-1.1.4[openal] >=dev-python/pyglet-1.1.4[alsa] ) games-misc/games-envd
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/brainworkshop/brainworkshop-4.8.4.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=23ed68ce35fc4d24d4cef90fcf27ad43
diff --git a/games-puzzle/brainworkshop/Manifest b/games-puzzle/brainworkshop/Manifest
deleted file mode 100644
index 02da8edfd58c..000000000000
--- a/games-puzzle/brainworkshop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX brainworkshop-4.8.4-fix-paths.patch 473 BLAKE2B 703ef1f87fe646b361fb9cb4e783cb33ebe1338a88c5c3cd464675a3a39cda954f7ac7396a3e6844bbce78d93d7d83f7f87a66e971ddee8feee0176e8660a5fb SHA512 858e837e001db04efd9a3c420860821e02ca9b7ef7197a8fe69221d0135f11a05cb6f2f9b4c19cd9eeec84c84ec5842c7e8126f08dc94f9ff79569f580f9d515
-DIST brainworkshop-4.8.4.zip 9373980 BLAKE2B 85af1f17755f0007f01c1684f4d746de6bab6580ed29c717e9462f8dd57115ce8ed7d2d61a411523e2d92191abe5a49d29b2598e937b014e68b3e1cb9ac3e059 SHA512 d3819036fef98fab9a89637ba01b2d844146babc7cb34b6ec6f4a589c18a7532fd23cf083c867ea1c917df9d7a6507ab51a5942e745d3ab9d01d938812486936
-EBUILD brainworkshop-4.8.4.ebuild 1238 BLAKE2B 2eb5ac9efd7a04445b1893ba33e3e7efc29777079c048a93f8827238964576b46724acb6f5edc09a7ec5c9dabf2cc4f9a372fac5fd785ec59eb9f6da71656974 SHA512 2a0b06c445c5da235da3da51672b2377c0a94b58ff1d7b2299f7763d8ed3f498a6593747b2203f8757319e27ad5230fd56670b11c0070fe013c68074e4ec1d05
-MISC metadata.xml 336 BLAKE2B 23696671d75d4a994a40ad18a57fdf4551932540ab62d153cfa0d41dafb59bec11466e0d8c14b3ff25ca1ed085e71f86d74aea672b56d9c53fa01d8d35243b7e SHA512 75e98aaef9436c2e488b304a19cfcaa1659748c97209ad217708046516aa4a76d9ac18c3c4762db08c496efe21a7ed5006bd4b2100989adb2b7fa0b9a8372b12
diff --git a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild b/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
deleted file mode 100644
index e454d7dd3448..000000000000
--- a/games-puzzle/brainworkshop/brainworkshop-4.8.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils gnome2-utils python-r1 games
-
-DESCRIPTION="Short-term-memory training N-Back game"
-HOMEPAGE="http://brainworkshop.sourceforge.net/"
-SRC_URI="mirror://sourceforge/brainworkshop/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pyopenal
-	|| ( >=dev-python/pyglet-1.1.4[openal]
-		 >=dev-python/pyglet-1.1.4[alsa] )"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-paths.patch
-	edos2unix ${PN}.pyw
-
-	sed -i \
-		-e 's#@GENTOO_DATADIR@#'${GAMES_DATADIR}'#' \
-		${PN}.pyw || die
-}
-
-src_install() {
-	newgamesbin ${PN}.pyw ${PN}
-	python_replicate_script "${D}${GAMES_BINDIR}"/${PN}
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r res/*
-	dodoc Readme.txt data/Readme-stats.txt
-	newicon -s 48 res/misc/brain/brain.png ${PN}.png
-	make_desktop_entry ${PN} "Brain Workshop"
-	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-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch b/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
deleted file mode 100644
index 061187b7cfe0..000000000000
--- a/games-puzzle/brainworkshop/files/brainworkshop-4.8.4-fix-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/brainworkshop.pyw	2010-10-15 19:06:16.529006906 +0200
-+++ b/brainworkshop.pyw	2010-10-15 19:08:17.095632136 +0200
-@@ -35,8 +35,10 @@
- NOVBO = True

- VSYNC = False

- DEBUG = False

--FOLDER_RES = 'res'

--FOLDER_DATA = 'data'

-+FOLDER_RES = '@GENTOO_DATADIR@/brainworkshop'

-+FOLDER_DATA = os.path.expanduser('~/.brainworkshop')

-+if not os.path.isdir(FOLDER_DATA):

-+	os.mkdir(FOLDER_DATA)

- CONFIGFILE = 'config.ini'

- STATS_BINARY = 'logfile.dat'

- USER = 'default'

diff --git a/games-puzzle/brainworkshop/metadata.xml b/games-puzzle/brainworkshop/metadata.xml
deleted file mode 100644
index c0fd59a21391..000000000000
--- a/games-puzzle/brainworkshop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">brainworkshop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/color-lines-0.6-r1 b/games-puzzle/color-lines-0.6-r1
new file mode 100644
index 000000000000..dc65f9e36597
--- /dev/null
+++ b/games-puzzle/color-lines-0.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
+DESCRIPTION=Color lines game written with SDL with bonus features
+EAPI=6
+HOMEPAGE=https://github.com/OpenA/color-lines-sdl
+KEYWORDS=~amd64 ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[wav,mod]
+SLOT=0
+SRC_URI=https://color-lines.googlecode.com/files/lines_0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=8bdaad715e716713d0f8c0d61f1a109d
diff --git a/games-puzzle/color-lines/Manifest b/games-puzzle/color-lines/Manifest
deleted file mode 100644
index 558fbc61372e..000000000000
--- a/games-puzzle/color-lines/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX color-lines-0.6-Makefile.patch 999 BLAKE2B 81490ece15e51ea8c267155152675def9442cd403e1f8736ee23f8c453d50d3b2712c10249999ad0a05e046f8d13bea5498cfd00e5e0debaa69218931107a947 SHA512 372707ef56d86fd4f8c439767495cb10eadcd9e9683053c7179dac7e655cf423a8a2b4a1b1e0a23667263370ac4e188aa8ec6a4123416f76d40b2d115ad41148
-DIST lines_0.6.tar.gz 862137 BLAKE2B 11be598d89963b7a32479565538d85531d8bab16e46b8c5851e30cda7fd480a9d40d43b10fd3d74f2d0f820f0606aabe775ff44bbe5dd9f55551095aeb95cb60 SHA512 fe9e96b598fb6cf0980d0970facbc070715b33491a8f0ad979c57332a22e97ab801e85dd17b5d0b2a1b8aba69b48b6c42dc115b01a36654ad05a5e9a06c5405a
-EBUILD color-lines-0.6-r1.ebuild 995 BLAKE2B 305616400e1967f08416b18813a78586d647e9e5fc1e976cbc96926429a883c72338ea53f46267567adc17b35e98e959b9e520bc5447b75b433246f74b3b21a5 SHA512 53ac641a27f9a3e4b71a4a042f419bd3ad5f42f3b54b05ef01580e13bdb43b06838e4d280556507e67f54407067867a8549067601b705ae242ffbf234fc8920d
-MISC metadata.xml 333 BLAKE2B 2a8b880fbec7f3e76183adc5b788587326e5560ee88419e72353c3450c106b362413b9a21d077ad336523626c11a83ad2059c5f7b0b30c21e10c3449788b75d7 SHA512 f0ff7b81095a841ea93ad665fb91e9504b5cbf97b5e3f020e61173f92fa1e2750a77732f49a2f3636b33f3d80505c4cfe0edfc9267f05e5279c38ef04e791d2a
diff --git a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild b/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
deleted file mode 100644
index e239fd1588a2..000000000000
--- a/games-puzzle/color-lines/color-lines-0.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Color lines game written with SDL with bonus features"
-HOMEPAGE="https://github.com/OpenA/color-lines-sdl"
-SRC_URI="https://color-lines.googlecode.com/files/lines_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-
-RDEPEND="
-	media-libs/libsdl[X,sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[wav,mod]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/lines-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}-Makefile.patch"
-
-	sed -i \
-		-e '/^Encoding/d' \
-		-e '/^Version/d' \
-		-e '/^Icon/s/.png//' \
-		color-lines.desktop.in || die 'sed on color-lines.desktop.in failed'
-}
-
-src_compile() {
-	emake BINDIR="${EPREFIX}/usr/bin/" GAMEDATADIR="${EPREFIX}/usr/share/${PN}/"
-}
-
-src_install() {
-	insinto "/usr/share/${PN}"
-	doins -r gfx sounds
-
-	domenu ${PN}.desktop
-	doicon icon/${PN}.png
-	einstalldocs
-	dobin ${PN}
-}
diff --git a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch b/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
deleted file mode 100644
index bf1339b94a01..000000000000
--- a/games-puzzle/color-lines/files/color-lines-0.6-Makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.unix.orig	2013-04-12 13:56:42.131113000 +0400
-+++ b/Makefile.unix	2013-04-12 13:57:26.595946027 +0400
-@@ -2,18 +2,18 @@
- VERTITLE := lines-$(VERSION)
- ARCHIVE := lines_$(VERSION).tar.gz
- 
--CFLAGS:=-Wall -O2 $(shell sdl-config --cflags) 
-+CFLAGS += $(shell sdl-config --cflags) 
- #-DMAEMO
- 
--LDFLAGS:=$(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-+LIBS   := -lm $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
- 
- SRC     := board.c graphics.c main.c sound.c
- OBJ     := $(patsubst %.c, %.o, $(SRC))
- 
- all: color-lines
--PREFIX:=/usr/local
-+PREFIX:=/usr
- 
--BINDIR:=$(DESTDIR)/$(PREFIX)/games/
-+BINDIR:=$(DESTDIR)$(PREFIX)/games/bin
- GAMEDATADIR:=$(DESTDIR)/$(PREFIX)/share/games/color-lines/
- 
- svnclean:
-@@ -29,8 +29,7 @@
- 
- color-lines:  $(OBJ)
- 	cat color-lines.desktop.in | sed -e "s|@BINDIR|$(BINDIR)|g" > color-lines.desktop
--	$(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) 
--	strip color-lines
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(^) -o $(@) $(LIBS)
- 
- clean:
- 	rm -f *.o color-lines
diff --git a/games-puzzle/color-lines/metadata.xml b/games-puzzle/color-lines/metadata.xml
deleted file mode 100644
index cb511abfbaf8..000000000000
--- a/games-puzzle/color-lines/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">OpenA/color-lines-sdl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/colorcode-0.8.5 b/games-puzzle/colorcode-0.8.5
new file mode 100644
index 000000000000..fad0e7b58199
--- /dev/null
+++ b/games-puzzle/colorcode-0.8.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+DESCRIPTION=A free advanced MasterMind clone
+EAPI=6
+HOMEPAGE=http://colorcode.laebisch.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=http://colorcode.laebisch.com/download/ColorCode-0.8.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e3e6bdc41cf938ff4c6195215dc1681c
diff --git a/games-puzzle/colorcode/Manifest b/games-puzzle/colorcode/Manifest
deleted file mode 100644
index a016a8ee1089..000000000000
--- a/games-puzzle/colorcode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ColorCode-0.8.5.tar.gz 233676 BLAKE2B aa474cf7990cb425edd9452d0241dfe9ae9b8156200b14985a270897cb42fe2f86190503bf2eff72e8831416fb03312e7bdc148f1f26bb391cf95239ea4f856d SHA512 55f935944a91441ae09b1636fe85c8174de53ba10e04df0d9cef6c4f2441879735230ac0fe313b91cf9870777df24bc95d975767f27940156b5698716b78b507
-EBUILD colorcode-0.8.5.ebuild 683 BLAKE2B db4c1fad46894fd0e6548178c9c5a876ddc385f57bf0f6d1d1dbab716b9d796df2d926a355df6630f508c35abb5d649844287e9003001432e6e3d37166d373d7 SHA512 c886978d4d3981dc6a0302b6a06a5b1d5bda2e254f1507a6840b975c980d7f4cbcd7b58b202b69f45763322c8e0f052cbda2ef9d59184f69d12fabe9fd5d8565
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/colorcode/colorcode-0.8.5.ebuild b/games-puzzle/colorcode/colorcode-0.8.5.ebuild
deleted file mode 100644
index c304b720483c..000000000000
--- a/games-puzzle/colorcode/colorcode-0.8.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils qmake-utils
-
-MY_PN=ColorCode
-DESCRIPTION="A free advanced MasterMind clone"
-HOMEPAGE="http://colorcode.laebisch.com/"
-SRC_URI="http://${PN}.laebisch.com/download/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	default
-	sed -i -e '/FLAGS/d' ${PN}.pro || die
-}
-
-src_configure() {
-	eqmake5
-}
-
-src_install() {
-	dobin ${PN}
-	newicon img/cc64.png ${PN}.png
-	make_desktop_entry ${PN} ${MY_PN}
-}
diff --git a/games-puzzle/colorcode/metadata.xml b/games-puzzle/colorcode/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/colorcode/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/concentration-1.2-r2 b/games-puzzle/concentration-1.2-r2
new file mode 100644
index 000000000000..f1e9fd73891e
--- /dev/null
+++ b/games-puzzle/concentration-1.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
+DESCRIPTION=The classic memory game with some new life
+EAPI=6
+HOMEPAGE=https://packages.gentoo.org/package/games-puzzle/concentration
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=mirror://gentoo/concentration-1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=d5aebd2609f1d4af129b817feb7ed6cb
diff --git a/games-puzzle/concentration/Manifest b/games-puzzle/concentration/Manifest
deleted file mode 100644
index 4af5be1be537..000000000000
--- a/games-puzzle/concentration/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX concentration-1.2-gentoo.patch 4615 BLAKE2B 9057a3518a3f93d4db73019e3128d00deb5b578ff6dcda11a5a05d0cae6a48b40832c1e0dd638d32aef75d70f81f9c2d75404300c261f35f3c16e9ed2115b092 SHA512 a513b43e96e6d401ea705fc9ebcfb868c4680af117551b166c20900417e977a588ab12d19ee6d7e4f58cfea1dc3799845581fb122470093b6fdba187d73689c4
-DIST concentration-1.2.tar.gz 1044563 BLAKE2B 2bd6c36be747ab16c77e5a9d01d270d82674957d3e66c07571c5dc5edbcb86aae59213992fe7a2d8ee34bbbbe8ff32157b5f5dd3125acc0ab0726e977c28c119 SHA512 afa9007cfaaa9a1cedcbfc490cb63d93d8ed1e91230ee714cece481ed3a39b73c82ec4cda65b29a27e9e71a7d2215be7f476e3217b487af54716eb4d692ca005
-EBUILD concentration-1.2-r2.ebuild 650 BLAKE2B abc116b14da1f8cb4c34ebf80f927c462336f45176ee2173c351375f25e9b1bed91a28242c138ba3af9ab3e3407fb1fd1d24111e4ac101dbd19a94365de18d8e SHA512 58296e33b985c3f77f148e32c4934c8ea923ea2ba46d65586b05bf01f486c40e76539d66f7a7e16d755af8a77215728b35b8f178ac8a890026af1a98a85b9527
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/concentration/concentration-1.2-r2.ebuild b/games-puzzle/concentration/concentration-1.2-r2.ebuild
deleted file mode 100644
index 5233b13dc8d8..000000000000
--- a/games-puzzle/concentration/concentration-1.2-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="The classic memory game with some new life"
-HOMEPAGE="https://packages.gentoo.org/package/games-puzzle/concentration"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_install() {
-	default
-	newicon pics/set1/19.png ${PN}.png
-	make_desktop_entry ${PN} Concentration
-}
diff --git a/games-puzzle/concentration/files/concentration-1.2-gentoo.patch b/games-puzzle/concentration/files/concentration-1.2-gentoo.patch
deleted file mode 100644
index 759d068b5bae..000000000000
--- a/games-puzzle/concentration/files/concentration-1.2-gentoo.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -ru concentration-1.2.orig/src/ShiftyEngine.c concentration-1.2/src/ShiftyEngine.c
---- concentration-1.2.orig/src/ShiftyEngine.c	2004-09-20 21:08:59.000000000 -0400
-+++ concentration-1.2/src/ShiftyEngine.c	2010-05-18 13:39:22.717713130 -0400
-@@ -61,13 +61,13 @@
- 	int len = strlen(name);
- 	assert(name);
- 
--	gameName = (char *)malloc((sizeof(char) * len) + 1);
-+	gameName = malloc(len + 1);
- 	if(!gameName) {
- 		fprintf(stderr, "Out Of Memory.");
- 		exit(1);
- 	}
- 
--	strncpy(gameName, name, len);
-+	snprintf(gameName, len + 1, "%s", name);
- }
- 
- /*****************************************************
-@@ -87,13 +87,13 @@
- 	int len = strlen(name);
- 	assert(name);
- 
--	backgroundName = (char *)malloc((sizeof(char) * len) + 1);
-+	backgroundName = malloc(len + 1);
- 	if(!backgroundName) {
- 		fprintf(stderr, "Out Of Memory.");
- 		exit(1);
- 	}
- 
--	strncpy(backgroundName, name, len);
-+	snprintf(backgroundName, len + 1, "%s", name);
- }
- 
- /*****************************************************
-@@ -175,7 +175,7 @@
- 		exit(1);
- 	}
- 
--	strncpy(t->name, name, 16);
-+	snprintf(t->name, 16, "%s", name);
- 	t->x = x;
- 	t->y = y;
- 	t->w = w;
-diff -ru concentration-1.2.orig/src/concentration.c concentration-1.2/src/concentration.c
---- concentration-1.2.orig/src/concentration.c	2005-11-09 11:05:02.000000000 -0500
-+++ concentration-1.2/src/concentration.c	2010-05-18 13:42:19.688474410 -0400
-@@ -202,7 +202,7 @@
- 
- /*****************************************************
-  ****************************************************/
--inline void drawText(char * str, SDL_Color color, int x, int y, TTF_Font * font)
-+void drawText(char * str, SDL_Color color, int x, int y, TTF_Font * font)
- {
- 	static SDL_Rect dest;
- 	
-@@ -814,7 +814,7 @@
- 				SE_Error("A blit failed.");
- 			SDL_FreeSurface(text);
- 			
--			sprintf(str, "%d seconds", myclock);
-+			snprintf(str, sizeof(str), "%d seconds", myclock);
- 			text   = TTF_RenderText_Blended(smallFont, str, black);
- 			if(!text)
- 				SE_Error("A render failed.");
-@@ -831,7 +831,7 @@
- 				SE_Error("A blit failed.");
- 			SDL_FreeSurface(text);
- 			
--			sprintf(str, "%d trys", hits + misses);
-+			snprintf(str, sizeof(str), "%d trys", hits + misses);
- 			text   = TTF_RenderText_Blended(smallFont, str, black);
- 			if(!text)
- 				SE_Error("A render failed.");
-@@ -840,7 +840,7 @@
- 				SE_Error("A blit failed.");
- 			SDL_FreeSurface(text);
- 			
--			sprintf(str, "Total pairs: %d", (size == 2) ? 2 : (size == 4) ? 8 : 36);
-+			snprintf(str, sizeof(str), "Total pairs: %d", (size == 2) ? 2 : (size == 4) ? 8 : 36);
- 			text   = TTF_RenderText_Blended(smallFont, str, black);
- 			if(!text)
- 				SE_Error("A render failed.");
-@@ -1327,7 +1327,7 @@
- {
- 	int x, makeFullScreen = 0;
- 
--	char name[16];
-+	char name[64];
- 	
- 	SE_SetName("Concentration 1.2");
- 	SE_SetBackground("pics/background.png");
-@@ -1395,13 +1395,13 @@
- 
- 	/* load icon set 1 */
- 	for(x = 1; x <= 30; x++) {
--		sprintf(name, "pics/set1/%d.png", x);
-+		snprintf(name, sizeof(name), "pics/set1/%d.png", x);
- 		icons[x] = loadPNG(name);
- 
--		sprintf(name, "pics/set2/%d.png", x);
-+		snprintf(name, sizeof(name), "pics/set2/%d.png", x);
- 		icons2[x] = loadPNG(name);
- 
--		sprintf(name, "pics/set3/%d.png", x);
-+		snprintf(name, sizeof(name), "pics/set3/%d.png", x);
- 		icons3[x] = loadPNG(name);
- 	}
- 
-diff -ru concentration-1.2.orig/src/gfx.c concentration-1.2/src/gfx.c
---- concentration-1.2.orig/src/gfx.c	2004-09-20 21:08:59.000000000 -0400
-+++ concentration-1.2/src/gfx.c	2010-05-18 13:39:22.718722669 -0400
-@@ -39,8 +39,7 @@
- 		exit(1);
- 	}
- 
--	strcpy(newname, sg_data_path);
--	strcat(newname, name);
-+	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
- 
- 	temp = IMG_Load(newname);
- 	if (temp == NULL) {
-@@ -67,8 +66,7 @@
- 		exit(1);
- 	}
- 
--	strcpy(newname, sg_data_path);
--	strcat(newname, name);
-+	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
- 
- 	temp = IMG_Load(newname);
- 	if (temp == NULL) {
-@@ -99,8 +97,7 @@
- 		exit(1);
- 	}
- 
--	strcpy(newname, sg_data_path);
--	strcat(newname, name);
-+	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
- 
- 	temp = TTF_OpenFont(newname, size);
- 	if (temp == NULL) {
-diff -ru concentration-1.2.orig/src/sound.c concentration-1.2/src/sound.c
---- concentration-1.2.orig/src/sound.c	2004-09-20 21:08:59.000000000 -0400
-+++ concentration-1.2/src/sound.c	2010-05-18 13:39:22.718722669 -0400
-@@ -57,8 +57,7 @@
- 		fprintf(stderr, "Out of memory!\n");
- 		exit(1);
- 	}
--	strcpy(newname, sg_data_path);
--	strcat(newname, name);
-+	snprintf(newname, len1 + len2 + 1, "%s%s", sg_data_path, name);
- 
- 	temp = Mix_LoadWAV(newname);
- 	if(!temp)
diff --git a/games-puzzle/concentration/metadata.xml b/games-puzzle/concentration/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/concentration/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/connectagram-1.2.8 b/games-puzzle/connectagram-1.2.8
new file mode 100644
index 000000000000..7767ef64ab5d
--- /dev/null
+++ b/games-puzzle/connectagram-1.2.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A word unscrambling game
+EAPI=6
+HOMEPAGE=https://gottcode.org/connectagram/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/connectagram/connectagram-1.2.8-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5814a5b55b19eedfb78c8fad3ab80bd8
diff --git a/games-puzzle/connectagram/Manifest b/games-puzzle/connectagram/Manifest
deleted file mode 100644
index 926cb20cc477..000000000000
--- a/games-puzzle/connectagram/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX connectagram-1.2.8-gentoo.patch 2479 BLAKE2B 128389ff604e5a7a623e5893d3366ff9f4b7e58f05b49e1435a70c546d754718d0640451fb79a56e1b5a12893445040a020aa09cbd876b31e1dc8042afde0250 SHA512 d45be3e0734c3f2832cbdf56aaf722df5e4fe37ebf9a1d44001463d2bbb0f90de762a55898699343ad99e999c751e7f041f0bb7cefa679a95f56454c6140571c
-DIST connectagram-1.2.8-src.tar.bz2 1760028 BLAKE2B db29251339abaa8ecbda69afff55366a2cc94ae9515bdc3750b9d328b7f5445613ee2da4c308008fb5ad09e20435cb294f97c5e9a23124a4330004cde11bd6c5 SHA512 f48fe0320745919f9532a0bb25799b05272dc30b9acba20e559d1df7ce15570eb37a29a2f746af94077f56306c45e2ee32d49f27585b6e4385477aeb795f4ed8
-EBUILD connectagram-1.2.8.ebuild 910 BLAKE2B 6975e489cb78a8994783b57bd43419eac6c1d00e55e6875aeca89103a28d24b7133289344ebd6b0172adbdbfaf7a1339747e56d026673ba2366b2da48feda22b SHA512 b868f018cea2ddeb980b5950669792a2972d749c614cc2f87f1daf3339af529c0de28b451004022e234001ec92d118566b624305e362ccc5b7c54a1dd69bb093
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/connectagram/connectagram-1.2.8.ebuild b/games-puzzle/connectagram/connectagram-1.2.8.ebuild
deleted file mode 100644
index 8405ae6061d8..000000000000
--- a/games-puzzle/connectagram/connectagram-1.2.8.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="A word unscrambling game"
-HOMEPAGE="https://gottcode.org/connectagram/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s#@GAMES_BINDIR@#/usr/bin#" \
-		-e "s#@GAMES_DATADIR@#/usr/share#" \
-		${PN}.pro src/{locale_dialog,new_game_dialog,wordlist}.cpp || die
-}
-
-src_configure() {
-	eqmake5 connectagram.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch b/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
deleted file mode 100644
index 7bb74baeee82..000000000000
--- a/games-puzzle/connectagram/files/connectagram-1.2.8-gentoo.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/connectagram.pro	2018-07-11 19:19:33.058534696 +0200
-+++ b/connectagram.pro	2018-07-11 19:20:30.536282297 +0200
-@@ -90,16 +90,16 @@
- 	RESOURCES += icons/icon.qrc
- 
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
--		BINDIR = bin
-+		BINDIR = @GAMES_BINDIR@
- 	}
- 
--	target.path = $$PREFIX/$$BINDIR/
-+	target.path = $$BINDIR/
- 
- 	data.files = data
--	data.path = $$PREFIX/share/connectagram/
-+	data.path = @GAMES_DATADIR@/connectagram/
- 
- 	pixmap.files = icons/connectagram.xpm
- 	pixmap.path = $$PREFIX/share/pixmaps/
-@@ -114,7 +114,7 @@
- 	appdata.path = $$PREFIX/share/metainfo/
- 
- 	qm.files = $$replace(TRANSLATIONS, .ts, .qm)
--	qm.path = $$PREFIX/share/connectagram/translations
-+	qm.path = @GAMES_DATADIR@/connectagram/translations
- 	qm.CONFIG += no_check_exist
- 
- 	man.files = doc/connectagram.6
---- a/src/locale_dialog.cpp
-+++ b/src/locale_dialog.cpp
-@@ -88,6 +88,7 @@
- 		paths.append(appdir);
- 		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
- 		paths.append(appdir + "/../Resources");
-+		paths.append("@GAMES_DATADIR@/connectagram");
- 	}
- 	for (const QString& path : paths) {
- 		if (QFile::exists(path + "/translations/")) {
---- a/src/new_game_dialog.cpp
-+++ b/src/new_game_dialog.cpp
-@@ -48,7 +48,7 @@
- 	m_wordlist = new WordList(this);
- 	m_wordlist->setLanguage(WordList::defaultLanguage());
- 	m_languages_box = new QComboBox(this);
--	QStringList languages = QDir("connectagram:").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-+	QStringList languages = QDir("@GAMES_DATADIR@/connectagram/data").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
- 	for (const QString& language : languages) {
- 		m_languages_box->addItem(LocaleDialog::languageName(language), language);
- 	}
---- a/src/wordlist.cpp
-+++ b/src/wordlist.cpp
-@@ -91,9 +91,9 @@
- 
- QString WordList::defaultLanguage() {
- 	QString language = QLocale().name();
--	if (!QFile::exists("connectagram:" + language)) {
-+	if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 		language = language.left(2);
--		if (!QFile::exists("connectagram:" + language)) {
-+		if (!QFile::exists("@GAMES_DATADIR@/connectagram/data/" + language)) {
- 			language = "en";
- 		}
- 	}
-@@ -112,7 +112,7 @@
- 	m_maximum_length(0)
- {
- 	// Read words from disk
--	QFile file("connectagram:" + language + "/words");
-+	QFile file("@GAMES_DATADIR@/connectagram/data/" + language + "/words");
- 	if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
- 		return;
- 	}
diff --git a/games-puzzle/connectagram/metadata.xml b/games-puzzle/connectagram/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/connectagram/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/construo-0.2.2-r1 b/games-puzzle/construo-0.2.2-r1
new file mode 100644
index 000000000000..c4991662bf9e
--- /dev/null
+++ b/games-puzzle/construo-0.2.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-base/xorg-proto >=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 construction toy with objects that react on physical forces
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/construo/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm
+SLOT=0
+SRC_URI=http://freesoftware.fsf.org/download/construo/construo.pkg/0.2.2/construo-0.2.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=7b2dc80001455ee6f8c654e4ac55b3bf
diff --git a/games-puzzle/construo/Manifest b/games-puzzle/construo/Manifest
deleted file mode 100644
index da7032b36ddf..000000000000
--- a/games-puzzle/construo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX construo-0.2.2-gcc43.patch 1813 BLAKE2B 514c17651894fa7f991abe397696fae5de567579730635d6b115cfe18099bd98a575e7bb104f73607b0809be90b7e882d41a72875fc4d34801694ec4c6479c6d SHA512 5865311df15e510a4212778cf7bfc2cf82c60449841f3d9717b4d04a2a241977319296b7696567a39c95e16b1f94fe2959c9eb8775b3b56b0e804335c73159ed
-AUX construo-0.2.2-lGLU.patch 429 BLAKE2B da44fd32544394f66fd0ab5f5cda3cccf0cbe65646b73d38b672902cc639355ddb9bbbfe8f6255fc9253fe78444468593dfffc7d6bf9c6b69aa16dfa0027a314 SHA512 2fcba9fdc7f96bd802341a42bba33ca659152421d1ba7f6a1d56a5de75f5811ee08298831f1c3951e364600146364e64efdc9a67a45bb9f946ab19867bff27b2
-DIST construo-0.2.2.tar.gz 442626 BLAKE2B c6c9c566c8e4014aba1e06d12af2c3c3076d533a9f11513e903a6fff027ecbd3b492c1ca35a50b42dbd0aea5064614147529f2dcfd6b75af2376a7a410fdc470 SHA512 b73854a64aedcb9ddcd8f2c3e809f975ef3d2f63bdefd2e126c808a4154d7ff3d402457f9da5f866e6b9d74c6010ffc58d44b04277976fe1a9aeabc20ea786a9
-EBUILD construo-0.2.2-r1.ebuild 829 BLAKE2B 865546804f13c8a201789d3d13d6b60605d4b3ea14c5e7f4b40d67c0f807e5576cb042d18dc642d10befbb026edf0c322a449f2a739678de73edf01faf0986ba SHA512 268821a99a0f74fb7d33e3105a41cdcac1f430f0253ab1050f9b03c1ac49d5bd9f7c07a5f1f3de401ff710a2e2fdad3248446f8e02a46774ca0217f35224550b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/construo/construo-0.2.2-r1.ebuild b/games-puzzle/construo/construo-0.2.2-r1.ebuild
deleted file mode 100644
index 4370d583ab81..000000000000
--- a/games-puzzle/construo/construo-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="2d construction toy with objects that react on physical forces"
-HOMEPAGE="http://www.nongnu.org/construo/"
-SRC_URI="http://freesoftware.fsf.org/download/construo/construo.pkg/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/freeglut
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-lGLU.patch
-	sed -i -e 's/^bindir=.*/bindir=@bindir@/' Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	make_desktop_entry "${PN}.glut" "${PN}.glut"
-	make_desktop_entry "${PN}.x11" "${PN}.x11"
-}
diff --git a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch b/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
deleted file mode 100644
index 48165ed21df0..000000000000
--- a/games-puzzle/construo/files/construo-0.2.2-gcc43.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- a/command_line.cxx
-+++ b/command_line.cxx
-@@ -19,7 +19,9 @@
- 
- #include <config.h>
- #include <iostream>
--#include <stdio.h>
-+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
- #include "settings.hxx"
- #include "command_line.hxx"
- 
---- a/config.hxx
-+++ b/config.hxx
-@@ -21,6 +21,7 @@
- #define CONFIG_HH
- 
- #include <string>
-+#include <cstdlib>
- 
- class Config
- {
---- a/lisp_reader.cxx
-+++ b/lisp_reader.cxx
-@@ -17,6 +17,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
-+#include <cstring>
- #include "construo_error.hxx"
- #include "lisp_reader.hxx"
- 
---- a/unix_system.cxx
-+++ b/unix_system.cxx
-@@ -17,8 +17,9 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--#include <stdio.h>
--#include <assert.h>
-+#include <cstdio>
-+#include <cassert>
-+#include <cstring>
- #include <unistd.h>
- #include <sys/time.h>
- #include <time.h>
---- a/vector.cxx
-+++ b/vector.cxx
-@@ -16,8 +16,8 @@
- 	totally replaced old CL_Vector with this code
- */
- 
--#include <assert.h>
--#include <math.h>
-+#include <cassert>
-+#include <cmath>
- #include "vector.hxx"
- 
- CL_Vector::CL_Vector(float x, float y, float z, float w)
---- a/world.cxx
-+++ b/world.cxx
-@@ -17,7 +17,8 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
--#include <assert.h>
-+#include <cassert>
-+#include <cstring>
- #include <algorithm>
- #include "config.h"
- 
---- a/x11_display.cxx
-+++ b/x11_display.cxx
-@@ -19,6 +19,7 @@
- 
- #include <config.h>
- #include <iostream>
-+#include <cstring>
- #include <X11/Xutil.h>
- #include <X11/cursorfont.h>
- #include <X11/keysym.h>
diff --git a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch b/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
deleted file mode 100644
index be8e7b604d6f..000000000000
--- a/games-puzzle/construo/files/construo-0.2.2-lGLU.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/configure.ac.old	2009-11-24 18:27:48.000000000 +0100
-+++ b/configure.ac	2009-11-24 18:28:29.000000000 +0100
-@@ -114,7 +114,7 @@
- AC_CHECK_LIB(glut, glutMainLoop,
- [
-   ConstruoTargets="$ConstruoTargets construo.glut"
--  AC_SUBST(glut_LIBS,"-lglut")
-+  AC_SUBST(glut_LIBS,"-lglut -lGLU -lGL -lm")
- ],
- [])
- 
-@@ -158,4 +158,4 @@
- echo "  Ingo Ruhnke <grumbel@gmx.de>"
- echo ""
- 
--# EOF #
-\ No newline at end of file
-+# EOF #
diff --git a/games-puzzle/construo/metadata.xml b/games-puzzle/construo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/construo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/cutemaze-1.2.3 b/games-puzzle/cutemaze-1.2.3
new file mode 100644
index 000000000000..24a53765f370
--- /dev/null
+++ b/games-puzzle/cutemaze-1.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A simple, top-down game in which mazes are randomly generated
+EAPI=6
+HOMEPAGE=https://gottcode.org/cutemaze/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/cutemaze/cutemaze-1.2.3-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=60442de858295c9357b636a9a65bacb3
diff --git a/games-puzzle/cutemaze/Manifest b/games-puzzle/cutemaze/Manifest
deleted file mode 100644
index 335d3f89df84..000000000000
--- a/games-puzzle/cutemaze/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cutemaze-1.2.3-src.tar.bz2 938593 BLAKE2B 004a793ce12cae345f00eb5a018d69d13b2c99d24424938da5a00420fe3c25403ea02fb04603cb662c87c170cc6d8b6daf36228e2ac002c3e4692ee01caafcf3 SHA512 d864cc8e61047948272e9b910c7b90d393ac974ce1ca63475c7d308cfc3c96d771edd87f3a5a93803a777dcddf6049feacc2f373d21529187a83de03aa5f08ea
-EBUILD cutemaze-1.2.3.ebuild 696 BLAKE2B b4a3b0198a3d0fed185a479de37d98ad675acfaef866a91bae622b3141b3e315a0c7922fea20ff901e15952219235f74121a89b0de52939090c70aca200eb2d6 SHA512 01c5115193cded98542e3f1d4f7fc60aab5a16f3760c68ca19086da28d37a88defc929e56243c238bd05c7e1b5d748405d17f61a8dbe25d6ebf111c54892c07b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild b/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild
deleted file mode 100644
index 0f3981c5b115..000000000000
--- a/games-puzzle/cutemaze/cutemaze-1.2.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="A simple, top-down game in which mazes are randomly generated"
-HOMEPAGE="https://gottcode.org/cutemaze/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/cutemaze/metadata.xml b/games-puzzle/cutemaze/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/cutemaze/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/cuyo-2.1.1-r1 b/games-puzzle/cuyo-2.1.1-r1
new file mode 100644
index 000000000000..9c8acf527d03
--- /dev/null
+++ b/games-puzzle/cuyo-2.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=highly addictive and remotely related to tetris
+EAPI=6
+HOMEPAGE=http://www.karimmi.de/cuyo/
+IUSE=+music
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib media-libs/libsdl[sound,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) media-libs/sdl-image
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
+_eclasses_=autotools	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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9c42543f2c8d1db4c3683c0c17c1a874
diff --git a/games-puzzle/cuyo/Manifest b/games-puzzle/cuyo/Manifest
deleted file mode 100644
index 789809a6823c..000000000000
--- a/games-puzzle/cuyo/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cuyo-2.1.1-gcc44.patch 161 BLAKE2B f6b288dfdf81ac39d0c58e144e36ed554bbec67c5533eb57ae9458fc73f0ca2348b3a3d65170a9c62ff5c8734b61b8e90d631a3044b171981feb27c42a04fc90 SHA512 461bd27073288eb5327770d18ce5a10a38a4e6ceb3c6f5e39a50a47bc3f6f5c8a06f9ac13d80bfbbeae1a0f45dd62ee0fa084dd832eb2d1313096f3d8e5c3149
-AUX cuyo-2.1.1-gcc6.patch 1024 BLAKE2B 12331f090b146d9f26b1a1300830153a599354c302cbe6d400eb3b39b403071853fcdc0a9559da23a0167d863794499e97f9a1f409333b722d9b95cfa9492e3c SHA512 ae8733da8afceee4e54ac8cac5a11d20a1adce494d76cdfaa821ffeba64886d9b0c9680fdab013c67e641bac9c96ba3dc23d1ecb86d1b59ca3f354692d218d2c
-AUX cuyo-2.1.1-gentoo.patch 851 BLAKE2B 70c082a9e19ca1a093810c810825986390abe5a0b0c671eb97dd95e731ee529a9aea1491f3c59651648ad0e9c451ecb269a66d0b17b4f0b237b961e47117e9a7 SHA512 c96c855c4650f50d6ed1c38d7105047f386c1828592389ce482cecefeb46bae224ee46f6f07dc63bbed67d81e4beadd5868962ad52dcca8fd9f99f3ea0899f8a
-DIST cuyo-2.~-1.1.tar.gz 3005426 BLAKE2B af83365568b16d230b8f253589c0300e1ba29471c8a406bd161da20b8282da4ca845aa1a06b8c5b2bf076828a71e0add9c317b710c476f56540a29f87dc53194 SHA512 a29c6ffc7e63b74dd93e8aeeace78bdbc50398771922aaf06a43256c883f9eff23e10fa91e4964b716cd209551cef771cf00108fb7977ce13a463da542322787
-EBUILD cuyo-2.1.1-r1.ebuild 941 BLAKE2B 37b6a8a120d67ec0fa16474ec79a42f320493d9e14b540eeccd3601f80bc3844f73ea44cb3e17b27cc7a909df24b2915cc261378f2a3d78486f4f7bb6f851f16 SHA512 e779d2b956903e8f587b52f5268bd264bbfbbc39a7c60340e2a968a2507059c63292afd6d3e0d96e90c1a88bf2f43492334b3f005c79e94ac595cf1873d87a60
-MISC metadata.xml 324 BLAKE2B 2d20b6235b6445d30b7da2729b4e3367456ebd9ea2b4ce290044e1202714ed0b460151e02af09648fe23e8095ee8aacac77923d232be8d8e0656f35e6f54387b SHA512 3392ab16d9e90d0dd6dba06994ba2096940075961de7e6fed43d70946e82916af7b40e95bd27e25d5eba9d9eb46afe61fe4200147385cc93211ab14c0e6b13ce
diff --git a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild b/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
deleted file mode 100644
index 55b13cc7ed85..000000000000
--- a/games-puzzle/cuyo/cuyo-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2-utils versionator
-
-MY_P="${PN}-$(get_version_component_range 1).~-$(get_version_component_range 2-3)"
-DESCRIPTION="highly addictive and remotely related to tetris"
-HOMEPAGE="http://www.karimmi.de/cuyo/"
-SRC_URI="https://savannah.nongnu.org/download/cuyo/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+music"
-
-DEPEND="sys-libs/zlib
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	music? ( media-libs/sdl-mixer[mod] )
-	media-libs/sdl-image
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
deleted file mode 100644
index 9ad50b067fb5..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc44.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cuyo-2.~-1.1.orig/src/stringzeug.h
-+++ cuyo-2.~-1.1/src/stringzeug.h
-@@ -20,7 +20,7 @@
- 
- #include <config.h>
- #include <string>
--
-+#include <stdio.h>
- 
- 
- 
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch
deleted file mode 100644
index b1ba5b535de5..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gcc6.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/src/pfaditerator.h
-+++ b/src/pfaditerator.h
-@@ -21,6 +21,11 @@
- #include "stringzeug.h"
- 
- 
-+#if __cplusplus >= 201103L
-+#define NOEXCEPT noexcept(false)
-+#else
-+#define NOEXCEPT
-+#endif
- 
- 
- /** Iteriert durch alle Pfade, an denen sich eine
-@@ -43,7 +48,7 @@
- class PfadIterator {
- public: 
-   PfadIterator(Str dat, bool auch_gz = false, bool setzDefault = false);
--  ~PfadIterator();
-+  ~PfadIterator() NOEXCEPT;
-   
-   /** N�chster Pfad */
-   PfadIterator & operator++();
---- a/src/pfaditerator.cpp
-+++ b/src/pfaditerator.cpp
-@@ -48,7 +48,7 @@
-      -1 und f�hren dann gleich ein ++ aus. */
-   ++(*this);
- }
--PfadIterator::~PfadIterator() {
-+PfadIterator::~PfadIterator() NOEXCEPT {
-   /** Soll der default-Pfad gesetzt werden? */
-   if (mSetzDefault) {
- 
---- a/src/xpmladen.cpp
-+++ b/src/xpmladen.cpp
-@@ -314,7 +314,7 @@
-   try {
- 
-     /* Datei laden. Dabei werden gDatAnfang und gDatEnde gesetzt. */
--    if (!ladeDatei(na)) return false;
-+    if (!ladeDatei(na)) return NULL;
- 
- 
-     gDatBei = gDatAnfang;
diff --git a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch b/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
deleted file mode 100644
index 78bafe2ded47..000000000000
--- a/games-puzzle/cuyo/files/cuyo-2.1.1-gentoo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- cuyo-2.~-1.1.orig/icons/Makefile.am
-+++ cuyo-2.~-1.1/icons/Makefile.am
-@@ -1,4 +1,4 @@
--desktopdir = $(datadir)/applications
-+desktopdir = /usr/share/applications
- desktop_DATA = cuyo.desktop
- 
- 
-@@ -25,7 +25,7 @@
- # Das vorige war falsch: die png sollen alle cuyo.png heissen
- # und nicht cuyo-xxxx.png. Deshalb nachfolgend neue Version:
- 
--iconsdir = $(datadir)/icons/hicolor
-+iconsdir = /usr/share/icons/hicolor
- icons_DATA = cuyo-32x32.png cuyo-64x64.png
- 
- install-iconsDATA:
---- cuyo-2.~-1.1.orig/icons/cuyo.desktop
-+++ cuyo-2.~-1.1/icons/cuyo.desktop
-@@ -3,9 +3,8 @@
- Icon=cuyo
- Type=Application
- Terminal=false
--MimeType=application/x-executable
-+MimeType=application/x-executable;
- Categories=Game;BlocksGame;
--Encoding=UTF-8
- Comment=A tetris like game with many levels
- Comment[de]=Ein Tetris-artiges Spiel mit vielen Leveln
- Exec=cuyo
diff --git a/games-puzzle/cuyo/metadata.xml b/games-puzzle/cuyo/metadata.xml
deleted file mode 100644
index 1329ada5712f..000000000000
--- a/games-puzzle/cuyo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="music">Enable playing of background music</flag>
-</use>
-</pkgmetadata>
diff --git a/games-puzzle/einstein-2.1.1 b/games-puzzle/einstein-2.1.1
new file mode 100644
index 000000000000..400d6a44ff88
--- /dev/null
+++ b/games-puzzle/einstein-2.1.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
+DESCRIPTION=A puzzle game inspired by Albert Einstein
+EAPI=6
+HOMEPAGE=https://github.com/lksj/einstein-puzzle
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf
+SLOT=0
+SRC_URI=https://github.com/lksj/einstein-puzzle/archive/v2.1.1.tar.gz -> einstein-2.1.1.tar.gz mirror://gentoo/einstein.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=24bcd334ed9b044f2717419f4c4ab347
diff --git a/games-puzzle/einstein/Manifest b/games-puzzle/einstein/Manifest
deleted file mode 100644
index 11ee45776453..000000000000
--- a/games-puzzle/einstein/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX einstein-2.0-as-needed.patch 314 BLAKE2B a76c5d93cf391eed152c151618c47db2029f70fa711dca0b816de9d6c282cb3da9f3455e99ddf0ba308db14daca1f228eef32ab76c26b5d53b300acb5ba0afc8 SHA512 4943199a89fb19025618c1a95afc4e57f740259992997460292af1cbdd764d668538c5acca2e1077bdfb78936c66b3a88e698194167ad72b3ee8e42501070dd3
-DIST einstein-2.1.1.tar.gz 1317979 BLAKE2B 7924774c2d540ecd7cbecb344907d20ab9514219407a02852bbd80bbb9d1d27bac14654a1553dbe30e8f0fd79e08f12338a4e43dfc3c06bfb433fb3a46330a64 SHA512 e34e8e0ef47c311d7417c42ba306b9e9cf94d1fd1829b3948d791543d1fb5f8f1d8d975154bab2559691cf3b94574d5485f8541882d59dd0b6284ff76e435cf3
-DIST einstein.png 932 BLAKE2B 13ecf24e5600bf39bbaec662afda5b4fdba2c5adf4560e8f08996b2e6c475002857187be2dac2d2c898cdb63854cc7ea1748b6b1d34a67adcc2f4789aafd5c25 SHA512 9e19d351e915509a11d7275ef0ea7e246d0d334933ec4b48ea0f56aa552ac69041a5c2a64075b02ec3601b1c2b8307cef314c9427ab7615b16e689faaa074283
-EBUILD einstein-2.1.1.ebuild 909 BLAKE2B d01a1d5614203f3da997ce819cab6a1660187c615ea4f987ebb55a797348fba072ae57e06b8853fb6fe27d253e38038b88439cb94c5bad6a504c79cf0d0b9d65 SHA512 cf7c474f025a4e0d9a8eef09d5e50047ece42e9c33682a9c84453ee0aff03753be660d310d8abbb71e15854e5f54906b55cfeea04a8a0f70da097eb323ad536a
-MISC metadata.xml 334 BLAKE2B bd52f381c3b7a79dfad6318f086d3ac04f1e52e0707dc4556a886dcd37416f191a36d4e47e22b67b7539d99b00159f179a12b12faeafe2c2c1ca7b42c4226255 SHA512 defe221da415005e05b0b8d58edd84050a565b3249bfd0eae9875f92a67ee0faf320f86cd2b6f703add270f86edfc187e8597fb659b4499e092825b82cd91f64
diff --git a/games-puzzle/einstein/einstein-2.1.1.ebuild b/games-puzzle/einstein/einstein-2.1.1.ebuild
deleted file mode 100644
index 857e57a6e54a..000000000000
--- a/games-puzzle/einstein/einstein-2.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A puzzle game inspired by Albert Einstein"
-HOMEPAGE="https://github.com/lksj/einstein-puzzle"
-SRC_URI="https://github.com/lksj/einstein-puzzle/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-puzzle-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-2.0-as-needed.patch
-	sed -i \
-		-e "/PREFIX/s:/usr/local:/usr:" \
-		-e "s/\(OPTIMIZE=[^#]*\)/\0 ${CXXFLAGS}/" Makefile \
-		|| die
-}
-
-src_install() {
-	dobin "${PN}"
-	insinto "/usr/share/${PN}/res"
-	doins einstein.res
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Einstein Puzzle"
-	einstalldocs
-}
diff --git a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch b/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
deleted file mode 100644
index 3edb666ad690..000000000000
--- a/games-puzzle/einstein/files/einstein-2.0-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old        2009-02-09 16:37:58.000000000 +0100
-+++ b/Makefile    2009-02-09 16:38:13.000000000 +0100
-@@ -49,7 +49,7 @@
- 
- 
- $(TARGET): $(OBJECTS)
--	$(CXX) $(LNFLAGS) $(OBJECTS) -o $(TARGET)
-+	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(TARGET) $(LNFLAGS)
- 
- clean:
- 	rm -f $(OBJECTS) core* *core $(TARGET) *~
diff --git a/games-puzzle/einstein/metadata.xml b/games-puzzle/einstein/metadata.xml
deleted file mode 100644
index c3f8c58cea81..000000000000
--- a/games-puzzle/einstein/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">einsteinpuzzle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/enigma-1.21-r3 b/games-puzzle/enigma-1.21-r3
new file mode 100644
index 000000000000..930479b138c2
--- /dev/null
+++ b/games-puzzle/enigma-1.21-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=media-libs/sdl-ttf media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] media-libs/libpng:0= sys-libs/zlib net-misc/curl || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:= nls? ( virtual/libintl ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=Puzzle game similar to Oxyd
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/enigma/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/sdl-ttf media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] media-libs/libpng:0= sys-libs/zlib net-misc/curl || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:= nls? ( virtual/libintl ) media-fonts/dejavu x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.tar.gz
+_eclasses_=autotools	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_=7a39fe1a5cc89e9ee6eb309833d4a085
diff --git a/games-puzzle/enigma/Manifest b/games-puzzle/enigma/Manifest
deleted file mode 100644
index 95e29c1ff023..000000000000
--- a/games-puzzle/enigma/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX enigma-1.21-build.patch 3543 BLAKE2B bb4cd5fc8105b15cf913e8a5f6baeb58cba93965a422a7bd514fc4eea848f73f65853595da023e3458a48f861d7a42f1300dfd90418600f4432c327114ab4f17 SHA512 accfb31abaadbee476961f38cc2f76a1fceac4befbf4721d4e08061a3509d05f2e534b4f8f69f1765e082a4ed4f70ccbba0c73c4479a49ee1cfde4c1ae1cdcc4
-AUX enigma-1.21-gcc6.patch 927 BLAKE2B 279415c5cf96e9f4db37b29b4555fe2d66ce82c3c04199281c175176bab812351a342633888c524558d4f9362ccd1b1602fd7fc100e062e45bbac85fe966e06f SHA512 d0eb1f356370431e3b3b96c7fa3a56ca52ed15fa94286d1b5075ba8a4b4b349deb676479bd8e045a7463f65a3885c44aab90166549850e19c510d606aed2e746
-DIST enigma-1.21.tar.gz 56409951 BLAKE2B c03cf3c66cb1df771671c6c92d5a64e66ab78c2abbf25008285dedb5db10fb1c8daf2053c15a09147e00f0a22a7882e47b1c6ed66588b2397deec084456af1b9 SHA512 0cca56a193f0f416e0fde02caf2e30b61eef506b6c62e151ff575f5c130f1e2e778d77149007b114ebaeec3a3e793434328555cb5190954a0ae13ed6cee229f0
-EBUILD enigma-1.21-r3.ebuild 1503 BLAKE2B 3e1a2bc825ed265e7cb362c9d42b73e01157123c48552406ed6ce52844759189292da998da668c6791f96eb18900d40f26aad125ec482a0a100e79e44ab352ed SHA512 052f053424ddafe241002e78a8107eafe412048113bd0d97f8ca0351d7fb3fd0fb30d021ec2b76ebc57ec9ed1a176559128afdfd517d59c95f25c3ebf1010ae2
-MISC metadata.xml 334 BLAKE2B 8e61a1119a930895b0773b8865550fde4bf532532ea4e904d537a6f4f93a27580841d121ff246bc4f9f60849a2224bedaf91bcb2e8ce3aa0b2a6ebee51dff1a8 SHA512 885fc4263252767f8861f2d45dc11a319cb5b0a7a9eccdf073a0433ba4908d97f7a590a96ae542372e53f16780a41cee4ee80556c0cedffbf34f6e4bcadeacc6
diff --git a/games-puzzle/enigma/enigma-1.21-r3.ebuild b/games-puzzle/enigma/enigma-1.21-r3.ebuild
deleted file mode 100644
index bdecef930251..000000000000
--- a/games-puzzle/enigma/enigma-1.21-r3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2-utils
-
-DESCRIPTION="Puzzle game similar to Oxyd"
-HOMEPAGE="http://www.nongnu.org/enigma/"
-SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-COMMON_DEPS="
-	media-libs/sdl-ttf
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	media-libs/sdl-image[jpeg,png]
-	media-libs/libpng:0=
-	sys-libs/zlib
-	net-misc/curl
-	|| ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] )
-	net-libs/enet:=
-	nls? ( virtual/libintl )
-"
-DEPEND="${COMMON_DEPS}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPS}
-	media-fonts/dejavu
-	x11-misc/xdg-utils
-"
-
-src_prepare() {
-	default
-	cp /usr/share/gettext/config.rpath .
-	eapply "${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	sed -i \
-		-e "s:DOCDIR:\"/usr/share/doc/${P}/html\":" \
-		src/main.cc || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-system-enet \
-		$(use_enable nls)
-}
-
-src_install() {
-	HTML_DOCS="doc/*" DOCS="ACKNOWLEDGEMENTS AUTHORS CHANGES README doc/HACKING" \
-		default
-	dosym \
-		/usr/share/fonts/dejavu/DejaVuSansCondensed.ttf \
-		/usr/share/${PN}/fonts/DejaVuSansCondensed.ttf
-	dosym \
-		/usr/share/fonts/dejavu/DejaVuSans.ttf \
-		/usr/share/${PN}/fonts/vera_sans.ttf
-	doman doc/enigma.6
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/enigma/files/enigma-1.21-build.patch b/games-puzzle/enigma/files/enigma-1.21-build.patch
deleted file mode 100644
index 6d5e91ca76e4..000000000000
--- a/games-puzzle/enigma/files/enigma-1.21-build.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ru enigma-1.21.orig/Makefile.am enigma-1.21/Makefile.am
---- enigma-1.21.orig/Makefile.am	2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/Makefile.am	2015-02-06 18:20:22.239518323 -0500
-@@ -3,12 +3,9 @@
- #   tools -> lib-src/lua
- #   src   -> tools, lib-src
- #
--SUBDIRS = m4 lib-src tools intl src data doc po etc
-+SUBDIRS = m4 lib-src tools intl src data po etc
- EXTRA_DIST = enigma CHANGES ACKNOWLEDGEMENTS
- 
--docdir = @datadir@/doc/enigma
--doc_DATA = README CHANGES COPYING ACKNOWLEDGEMENTS
--
- ACLOCAL_AMFLAGS = -I m4
- 
- .PHONY: tolua
-diff -ru enigma-1.21.orig/configure.ac enigma-1.21/configure.ac
---- enigma-1.21.orig/configure.ac	2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/configure.ac	2015-02-06 18:20:22.282516643 -0500
-@@ -342,7 +342,6 @@
- 	CXXFLAGS="$CXXFLAGS -O2 -ffast-math -fomit-frame-pointer"
- 	AC_MSG_RESULT(yes)
- else
--	CXXFLAGS="$CXXFLAGS -g"
- 	AC_MSG_RESULT(no)
- fi
- 
-diff -ru enigma-1.21.orig/etc/Makefile.am enigma-1.21/etc/Makefile.am
---- enigma-1.21.orig/etc/Makefile.am	2014-12-19 16:26:05.000000000 -0500
-+++ enigma-1.21/etc/Makefile.am	2015-02-06 18:25:44.131945494 -0500
-@@ -1,18 +1,18 @@
- # if !MINGW32
- # Comply with xdg icon theme specification
--icondir = $(prefix)/share/icons/hicolor/48x48/apps
-+icondir = /usr/share/icons/hicolor/48x48/apps
- icon_DATA = enigma.png
- 
- # Backwards-compatible global search location for images
--pixmapdir = $(prefix)/share/pixmaps
-+pixmapdir = /usr/share/pixmaps
- pixmap_DATA = enigma.png
- 
- # Install .desktop file in xdg standard location
--desktopdir = $(prefix)/share/applications
-+desktopdir = /usr/share/applications
- desktop_DATA = enigma.desktop
- 
- # Install AppData file
--appdatadir = $(prefix)/share/appdata
-+appdatadir = /usr/share/appdata
- dist_appdata_DATA = enigma.appdata.xml
- # endif !MINGW32
- 
-diff -ru enigma-1.21.orig/etc/enigma.desktop enigma-1.21/etc/enigma.desktop
---- enigma-1.21.orig/etc/enigma.desktop	2014-12-19 16:26:05.000000000 -0500
-+++ enigma-1.21/etc/enigma.desktop	2015-02-06 18:20:22.282516643 -0500
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=1.21
-+Version=1.0
- Name=Enigma
- Name[be]=Enigma
- Name[cs]=Enigma
-@@ -44,5 +44,5 @@
- StartupNotify=false
- Icon=enigma
- Type=Application
--Categories=Application;Game;PuzzleGame;
-+Categories=Game;X-PuzzleGame;
- 
-diff -ru enigma-1.21.orig/po/Makefile.in.in enigma-1.21/po/Makefile.in.in
---- enigma-1.21.orig/po/Makefile.in.in	2014-12-19 16:26:06.000000000 -0500
-+++ enigma-1.21/po/Makefile.in.in	2015-02-06 18:20:22.283516604 -0500
-@@ -25,12 +25,12 @@
- exec_prefix = @exec_prefix@
- datarootdir = @datarootdir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@ 
-+MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs
- #install_sh@ -d
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
-diff -ru enigma-1.21.orig/src/Makefile.am enigma-1.21/src/Makefile.am
---- enigma-1.21.orig/src/Makefile.am	2014-12-19 16:24:38.000000000 -0500
-+++ enigma-1.21/src/Makefile.am	2015-02-06 18:20:22.283516604 -0500
-@@ -12,7 +12,7 @@
- CXXFLAGS = @CXXFLAGS@\
- 	-DSYSTEM_DATA_DIR=\"$(datadir)/enigma\" \
- 	-DDOCDIR=\"$(docdir)\" \
--	-DLOCALEDIR=\"$(localedir_enigma)\" \
-+	-DLOCALEDIR=\"/usr/share/locale\" \
- 	-I$(top_srcdir)/lib-src/zipios++  \
- 	-I$(top_builddir)/lib-src/zipios++ \
- 	-I$(top_srcdir)/lib-src/lua \
-@@ -440,7 +440,7 @@
- 
- else # not MINGW32
- 
--  localedir_enigma := $(datadir)/locale
-+  localedir_enigma := /usr/share/locale
-   mingw_ldadd =
- 
- endif
diff --git a/games-puzzle/enigma/files/enigma-1.21-gcc6.patch b/games-puzzle/enigma/files/enigma-1.21-gcc6.patch
deleted file mode 100644
index fd72dbc89065..000000000000
--- a/games-puzzle/enigma/files/enigma-1.21-gcc6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Bug: https://bugs.gentoo.org/610778
-
-From e0f31f63ba4252ced7128d3ceec2bc668e8681f4 Mon Sep 17 00:00:00 2001
-From: Legimet <legimet.calc@gmail.com>
-Date: Sat, 13 Aug 2016 23:41:27 -0400
-Subject: [PATCH] Fix build error with GCC 6, caused by comparing
- basic_ifstream to NULL
-
----
- src/lev/Proxy.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lev/Proxy.cc b/src/lev/Proxy.cc
-index 6d58c0ba..69f54a20 100644
---- a/src/lev/Proxy.cc
-+++ b/src/lev/Proxy.cc
-@@ -933,7 +933,7 @@ namespace enigma { namespace lev {
-                     } else if (haveLocalCopy) {
-                         // plain file
-                         basic_ifstream<char> ifs(absExtPath.c_str(), ios::binary | ios::in);
--                        if (ifs != NULL)
-+                        if (ifs)
-                             Readfile(ifs, extCode);
-                         else
-                             haveLocalCopy = false;
diff --git a/games-puzzle/enigma/metadata.xml b/games-puzzle/enigma/metadata.xml
deleted file mode 100644
index 31c04074be24..000000000000
--- a/games-puzzle/enigma/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">enigma-game</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/ensemblist-040126 b/games-puzzle/ensemblist-040126
new file mode 100644
index 000000000000..e78c6c7eee63
--- /dev/null
+++ b/games-puzzle/ensemblist-040126
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/freeglut media-libs/libmikmod:0 media-libs/libpng:0 virtual/glu virtual/opengl x11-libs/libXmu
+DESCRIPTION=Put together several primitives to build a given shape. (C.S.G. Game)
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/ensemblist/index_en.html
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut media-libs/libmikmod:0 media-libs/libpng:0 virtual/glu virtual/opengl x11-libs/libXmu games-misc/games-envd
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/ensemblist/ensemblist-040126.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_=7d50f1d638e5ae12bf94c75a17a79176
diff --git a/games-puzzle/ensemblist/Manifest b/games-puzzle/ensemblist/Manifest
deleted file mode 100644
index 105aa905cf91..000000000000
--- a/games-puzzle/ensemblist/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ensemblist-040126-build.patch 1610 BLAKE2B 42492746d138019727da45c6f6ee89d155e73e45a1c1fd3a06a10cfd1b0639261901d52d32099f05e2633444e1cf9e445e9602c093d897ae98e89a855f4e31ef SHA512 19e9e9625786d43053a72ba633aaa08d18b7a91fe5995cb583b6830605f0ec2b37b8c002d7853db520fc7ccfc4bbe8699184d2ac69f62be51d4801b438ea6ce5
-DIST ensemblist-040126.tar.gz 1312095 BLAKE2B 715aba1d5d62b3b4f7889b87ed70f1a33441d8ce7fe878c17dbdd342b45906c9242eb34b9eca8d34f41e9146d1eceac771e28e49b209b85dac31fce8e16b21eb SHA512 59202fe3c6168cfd60a7204f64dba5ab9fec2aa80e32be2f649862cf60dd27df0a51f4359161f8ca1ab3cf541fb1ea127f4f83b2213c4cb40bf6a574c14c8052
-EBUILD ensemblist-040126.ebuild 859 BLAKE2B 7e9fd9a8d6873b8cd51a4fce1dcfb9810f88475891a195a19585feabfc7ca875cd78b92ecfc8d39f9d8f7a010854f8f5674ad9c666a16e5cabc78b730b402e21 SHA512 18e85ad3e9adb8b8793b83c30dfb791cc3a5c2e135bafb0183e9205195a662c62f81f28f991ecd36d66f55a15ad6770306be931163739279470e9def0886440d
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/ensemblist/ensemblist-040126.ebuild b/games-puzzle/ensemblist/ensemblist-040126.ebuild
deleted file mode 100644
index 559fa92b6034..000000000000
--- a/games-puzzle/ensemblist/ensemblist-040126.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Put together several primitives to build a given shape. (C.S.G. Game)"
-HOMEPAGE="http://www.nongnu.org/ensemblist/index_en.html"
-SRC_URI="https://savannah.nongnu.org/download/ensemblist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="media-libs/freeglut
-	media-libs/libmikmod:0
-	media-libs/libpng:0
-	virtual/glu
-	virtual/opengl
-	x11-libs/libXmu"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake DATADIR="\"${GAMES_DATADIR}\"/${PN}/datas" \
-		CFLAGSLD="${LDFLAGS}"
-}
-
-src_install() {
-	dogamesbin ensemblist
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r datas
-	dodoc Changelog README
-	make_desktop_entry ${PN} Ensemblist
-	prepgamesdirs
-}
diff --git a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch b/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
deleted file mode 100644
index 42cc04070eef..000000000000
--- a/games-puzzle/ensemblist/files/ensemblist-040126-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ru ensemblist-040126.orig/Makefile ensemblist-040126/Makefile
---- ensemblist-040126.orig/Makefile	2004-01-26 10:37:05.000000000 -0500
-+++ ensemblist-040126/Makefile	2009-01-23 03:24:05.000000000 -0500
-@@ -1,17 +1,8 @@
- NAME=ensemblist
--CC=gcc
--ifdef DEBUG
--DATADIR=/home/rixed/src/ensemblist/datas
--COMPILE_FLAGS=-Wall -fno-builtin -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wredundant-decls -O0 -g `libmikmod-config --cflags` -DDATADIR=$(DATADIR)
--LINK_FLAGS=-g -lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lefence -lpthread
--else
- DATADIR=$(DESTDIR)/usr/share/$(NAME)
--COMPILE_FLAGS=-Wall -O3 -fomit-frame-pointer `libmikmod-config --cflags` -DNDEBUG -DDATADIR=$(DATADIR)
--LINK_FLAGS=-lm -L /usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread
--endif
-+COMPILE_FLAGS=`libmikmod-config --cflags` -DDATADIR=$(DATADIR)
-+LINK_FLAGS=-L/usr/X11R6/lib -lXmu -lGL -lglut -lGLU -lpng `libmikmod-config --libs` -lpthread -lm
- APPLE_FRAMEWORKS=-framework GLUT -framework Cocoa -framework OpenGL
--#uncomment the following if you want to compile on MacOS/X
--#LINK_FLAGS=$(LINK_FLAGS) $(APPLE_FRAMEWORKS)
- CFILES=$(wildcard *.c)
- OFILES=$(patsubst %.c,%.o,$(CFILES))
- 
-@@ -22,15 +13,10 @@
- all: $(NAME)
- 
- $(NAME): $(OFILES)
--	@echo '$(COL)$@$(NORM)'
--	$(CC) $(COMPILE_FLAGS) $(LINK_FLAGS) $^ -o $@
--ifndef DEBUG
--	strip $(NAME)
--endif
-+	$(CC) $(CFLAGSLD) $(COMPILE_FLAGS) $^ -o $@ $(LINK_FLAGS) 
- 
- .c.o:
--	@echo '$(COL)$@$(NORM)'
--	$(CC) $(COMPILE_FLAGS) -c $<
-+	$(CC) $(CFLAGS) $(COMPILE_FLAGS) -c $<
- 
- clean:
- 	@echo '$(COL)$@$(NORM)'
diff --git a/games-puzzle/ensemblist/metadata.xml b/games-puzzle/ensemblist/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/ensemblist/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/fbg-0.9-r2 b/games-puzzle/fbg-0.9-r2
new file mode 100644
index 000000000000..91ec72413859
--- /dev/null
+++ b/games-puzzle/fbg-0.9-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
+DESCRIPTION=A Tetris clone written in OpenGL
+EAPI=6
+HOMEPAGE=http://fbg.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu dev-games/physfs media-libs/libsdl[opengl,video] media-libs/libmikmod x11-libs/libXt
+SLOT=0
+SRC_URI=mirror://sourceforge/fbg/fbg-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=6496846e678673ab39646f9b6685c86c
diff --git a/games-puzzle/fbg/Manifest b/games-puzzle/fbg/Manifest
deleted file mode 100644
index 26743052b907..000000000000
--- a/games-puzzle/fbg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fbg-0.9.tar.gz 1127384 BLAKE2B c732f0bfce5cdf92ed94b75764403f1e64efebdb6be92b900704601922a9a3e9f86de975613778aad9c5685303fc9e31dbd624283cc8ad2964cbf3c9c42b27b6 SHA512 8aede56515da472509068037bd295d7a37f365dd54ea8332c02409e84bf685b76f1733b93b90fa49ca58e9094a4506137c6459d4761a929cfa2e60bb0907a353
-EBUILD fbg-0.9-r2.ebuild 791 BLAKE2B 0eec4a1245d54542666bc46299034668774242b606a9e904d879661b295460b448f03ee9d02c99b15caed692c6b190ace7acfce91a8146b81c448d3abc59b01b SHA512 34ee1ebd58eaccb2dddbe8742c006dd5a6ddf47d8b5dc572cdd7ce0fbdd473313c80fdd1f5856c94d25f434b22cf80909a2d80a1b92ccb250b894d43cb8b96a5
-MISC metadata.xml 326 BLAKE2B 8488642d926fbabc6c18c7739859dbf7b3ff8f14253d3bf30bf6402000cc7dbc4d9143ecf4bcf04309200f5ce346b958e1a8c148ee8cc15455763b5983d9499f SHA512 530accf52134a0d9947a35e2499225d8557410008a5df1b8bb2189eabe7c8cda7787a5ce05ec4efe5af67a9a2e1aae30008c18bf97f2c46a9608d3625bdc5ea2
diff --git a/games-puzzle/fbg/fbg-0.9-r2.ebuild b/games-puzzle/fbg/fbg-0.9-r2.ebuild
deleted file mode 100644
index b0c84fa8eeca..000000000000
--- a/games-puzzle/fbg/fbg-0.9-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A Tetris clone written in OpenGL"
-HOMEPAGE="http://fbg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fbg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	dev-games/physfs
-	media-libs/libsdl[opengl,video]
-	media-libs/libmikmod
-	x11-libs/libXt"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/FBGDATADIR=/s:\".*\":\"/usr/share/${PN}\":" \
-		-e '/^datadir=/d' \
-		configure || die
-}
-
-src_configure() {
-	econf --disable-fbglaunch
-}
-
-src_install() {
-	default
-	newicon startfbg/icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Falling Block Game" ${PN}
-	rm -rf "${ED}/usr/doc"
-}
diff --git a/games-puzzle/fbg/metadata.xml b/games-puzzle/fbg/metadata.xml
deleted file mode 100644
index 3122d95d7524..000000000000
--- a/games-puzzle/fbg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fbg</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/fish-fillets-1.0.1-r1 b/games-puzzle/fish-fillets-1.0.1-r1
new file mode 100644
index 000000000000..bdb7e2df41ba
--- /dev/null
+++ b/games-puzzle/fish-fillets-1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5:0 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Underwater puzzle game - find a safe way out
+EAPI=6
+HOMEPAGE=http://fillets.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5:0
+SLOT=0
+SRC_URI=mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=de86afe409d07ddab620efb86ccdf5b6
diff --git a/games-puzzle/fish-fillets/Manifest b/games-puzzle/fish-fillets/Manifest
deleted file mode 100644
index 92509c1e6f18..000000000000
--- a/games-puzzle/fish-fillets/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST fillets-ng-1.0.1.tar.gz 380290 BLAKE2B 675839cb451686c35611120b0b8e1044bc6511ce2369157f7d7c934eb0477b10e925268ffb35d5415070f25d7469da249027f148ac06ba65bd139fbddfb20a03 SHA512 fe4a5186f94e953cbc85fe8b0ce804c881c96feda385cfc36e1840e448cf094c3d815fdbe32976a6697a855038951f97a384c277a1c52a048520e8da71136718
-DIST fillets-ng-data-1.0.0.tar.gz 146418413 BLAKE2B 0359cee1db5d54a124f76520c4c416d954969bd9fc79eb9305613549722133684c2f6696b754729316ca4f4ebcc3aff63db845fd71ffc955d5e9584d89a50999 SHA512 61c7fe3980510a7dbd85f4c246e7e42a0f79d8e2aacd96a0c7a14189c5dee92292efb030ac92299474162995039073288283fee0f352cf08be6975a2c86703e7
-EBUILD fish-fillets-1.0.1-r1.ebuild 1292 BLAKE2B 0b87179878b44942f3341a23c965f96db07abe3e86eeb312e0081484196648d363a29635b9dc152ca6a2ef65c63cc6e55d216902e3812b1edc80a0e398f93891 SHA512 84a81e5956a0a23143d8f2c75936938b865c2705f093091a0ade7fb1808c26629c41beab6c5de90a1b585421836511ed33a943188fbcdb7f2c6825d36bfb92c6
-MISC metadata.xml 330 BLAKE2B 47ef211faf9977fbf1b3f58ead7b59c2b025e3b731433586d948d82b3f25b95470beb1904981bc001cd4f086deb133c809ac4676c553135502f0b00699c6b996 SHA512 dbe794bba7ca2d4414f5ea3b4ef5b8958268abf2f8bd45705300baddcca5cbb485ddc24b3328e25568b9aa741c50251417ee4100f3f118827fcc5c1a285dba66
diff --git a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild b/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
deleted file mode 100644
index 722c291c1dd8..000000000000
--- a/games-puzzle/fish-fillets/fish-fillets-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DATA_PV="1.0.0"
-DESCRIPTION="Underwater puzzle game - find a safe way out"
-HOMEPAGE="http://fillets.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fillets/fillets-ng-${PV}.tar.gz
-	mirror://sourceforge/fillets/fillets-ng-data-${DATA_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[sound,video]
-	>=media-libs/sdl-mixer-1.2.5[vorbis]
-	>=media-libs/sdl-image-1.2.2[png]
-	media-libs/smpeg
-	x11-libs/libX11
-	media-libs/sdl-ttf
-	dev-libs/fribidi
-	>=dev-lang/lua-5:0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/fillets-ng-${PV}"
-
-src_prepare() {
-	default
-	#.mod was renamed to .fmod in lua 5.1.3 - bug #223271
-	sed -i \
-		-e 's/\.mod(/.fmod(/' \
-		$(grep -rl "\.mod\>" "${WORKDIR}"/fillets-ng-data-${DATA_PV}) \
-		|| die "sed failed"
-	rm -f missing
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf --datadir="/usr/share/${PN}"
-}
-
-src_install() {
-	default
-	insinto "/usr/share/${PN}"
-	cd "${WORKDIR}"/fillets-ng-data-${DATA_PV} || die
-	rm -f COPYING
-	einstalldocs
-	doins -r *
-	newicon images/icon.png ${PN}.png
-	make_desktop_entry fillets "Fish Fillets NG"
-}
diff --git a/games-puzzle/fish-fillets/metadata.xml b/games-puzzle/fish-fillets/metadata.xml
deleted file mode 100644
index e70cd0e424d2..000000000000
--- a/games-puzzle/fish-fillets/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fillets</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/five-or-more-3.22.2 b/games-puzzle/five-or-more-3.22.2
new file mode 100644
index 000000000000..c4ee34086d82
--- /dev/null
+++ b/games-puzzle/five-or-more-3.22.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.12:3 app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Five or More Game for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Five%20or%20more
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 >=gnome-base/librsvg-2.32:2 >=x11-libs/gtk+-3.12:3 !<x11-themes/gnome-themes-standard-3.14
+SLOT=0
+SRC_URI=mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cdd7788621a56c8e59090c1c031cdfad
diff --git a/games-puzzle/five-or-more/Manifest b/games-puzzle/five-or-more/Manifest
deleted file mode 100644
index 16cc1ab8480b..000000000000
--- a/games-puzzle/five-or-more/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST five-or-more-3.22.2.tar.xz 3297904 BLAKE2B d727f18946b9ce26351db1b98c9396b9b4d79db0c412ca48c8a08266f162c47639af1612a27bb2ba0b513719a88574126c54da856df35c9e80bb01fbbb763cf0 SHA512 a809e227f7ec59912915f4808676c25777a0264268a06dcc7524d121b943e32fc95cfb815f2153aa0960aa0cdd0b3fed054c15d9d0c12d89ed155f0352fcb6f3
-EBUILD five-or-more-3.22.2.ebuild 605 BLAKE2B 18af18d9d82bcd7062e3868d16f916850bdf7f4eb3da62181d402ca433228286b9c1cb068f1ffe2f11d81b59d89525e18ef085c36c5f716f6d11449f46118cca SHA512 7c470d8de623350a26af84eee5c0bdc755d361defbec0a5b18187871ff8e037cee18b08b64b39c1bd2867cc903f25b55815484e82d77ab504f5bf6c2a6ec29ff
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild b/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild
deleted file mode 100644
index 074be2bc1d11..000000000000
--- a/games-puzzle/five-or-more/five-or-more-3.22.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Five or More Game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32:2
-	>=gnome-base/librsvg-2.32:2
-	>=x11-libs/gtk+-3.12:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<x11-themes/gnome-themes-standard-3.14
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/five-or-more/metadata.xml b/games-puzzle/five-or-more/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/five-or-more/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/flobopuyo-0.20-r2 b/games-puzzle/flobopuyo-0.20-r2
new file mode 100644
index 000000000000..5c203667ff50
--- /dev/null
+++ b/games-puzzle/flobopuyo-0.20-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
+DESCRIPTION=Clone of the famous PuyoPuyo game
+EAPI=6
+HOMEPAGE=http://www.ios-software.com/?page=projet&quoi=29
+IUSE=opengl
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod] opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=http://www.ios-software.com/flobopuyo/flobopuyo-0.20.tgz mirror://gentoo/flobopuyo.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=4757271660e5a721706e1fd8071b6c6b
diff --git a/games-puzzle/flobopuyo/Manifest b/games-puzzle/flobopuyo/Manifest
deleted file mode 100644
index 59ba75160a57..000000000000
--- a/games-puzzle/flobopuyo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX flobopuyo-0.20-gcc4.patch 967 BLAKE2B befdc13ec4da55497fae89f79aa1ad518738ffd69a8eae10167551dc45daeffbb9130adb319e426a8d5c65e2743a0bfc0d83dfec2ee19855d72fe86d0dba4478 SHA512 f1bfdbf6ba4e4fc2be453aa7d2299f70a2a47a1906e2b7043ef8c14a7b4c8e5bc1de29565e1404ba9c6688c03f4439f123b3325f3223bd3771eee9fe458ecd62
-AUX flobopuyo-0.20-gcc41.patch 447 BLAKE2B 189a5e2f970fd4e9ea1e5e12b6344e9c96d29a4de99ace9a9fbcaba35b832369159535d3195c871b91e75678b97f274fc0e4bf788a17608fdf7ab84a75716228 SHA512 05b888959fcc4e1bc0a1248c9efdbdc9768ee25382fb67dad1d49214c7180e97fa498853bca4483c7786f946d9b0527cfbd79065e5585cc26f72ade3900219ec
-AUX flobopuyo-0.20-libs.patch 4687 BLAKE2B fc571a5de46bb52bfa65eacc3078fddbe6b5c5f1e58378b2ff7e1f91b6130a0011705f6f17cf47dbe3c5417fbc7dfa3f708b970548f81f7234d467d11b6cf09e SHA512 fd879dca79a8532909286a50ec9d3d66b2fdf149a64602ee8990aad2a3de8dbed268f6837d39039db77774ab7e29a91b121f06dc172eae59a6c69c0f799a810b
-DIST flobopuyo-0.20.tgz 2949750 BLAKE2B 5e6b451ca05c4e3c497889fe350ceea8dffd9a0bc53b69747449e1ab607c26328ee3d2d1acb9ebf8a7fa634e43e12746f02c50166f16c7e2d3bbfa6531878250 SHA512 8ec7e690e53cfc171959663ef07912f2b23ae1842b72faa0125de8d6d2ad93672b9b4d68593b1f49f97c53a13409aca7bc5a598858fc7cff4698a4064ec95276
-DIST flobopuyo.png 25038 BLAKE2B ab9af4d0785614725c5b03942956c5cabfdfa38b3f5b2870dfbed9428ab51c553dad784b643f3387bfb4d90073befe9ea6d6bac57bbb266154b28092410d5c1d SHA512 6eca6fd1559d8ecb62b19be9fcaef2af1edb727154dd4e10f9f0f9ef9863d99c9445689bd64724cb5da0b251384efc491acfa40bf5105fa9bdcecad3f809ceb6
-EBUILD flobopuyo-0.20-r2.ebuild 1109 BLAKE2B 28e3b6500145e50fe01bc40f990b110859de6e3a60d39b818f5f24078e5e8d9697f2ab4a6b880c47f52513dfd429c90e52e2483ad177ea49af8c86a00779c426 SHA512 c47cd9c0d5475b7a8d4065d4d9cc8558612c9dcdbefb9e5405ae8f294da92553273d362e377d62af657bfd5e16e8cd24fba9d46faf7fac8cec557a7f4be26663
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
deleted file mode 100644
index 6c5d39445a4c..000000000000
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: flobopuyo-0.20/IosVector.cpp
-===================================================================
---- flobopuyo-0.20.orig/IosVector.cpp
-+++ flobopuyo-0.20/IosVector.cpp
-@@ -102,6 +102,6 @@ void IosVector::increaseVectorSize()

- void IosVector::dumpVector() const {

- 	fprintf(stderr, "Size: %d\n", getSize());

- 	for (int i = 0, j = getSize() ; i < j ; i++)

--		fprintf(stderr, "elt[%d]=%d ", i, (int)getElementAt(i));

-+		fprintf(stderr, "elt[%d]=%p ", i, getElementAt(i));

- 	fprintf(stderr, "\n");

- }

-Index: flobopuyo-0.20/PuyoGame.cpp
-===================================================================
---- flobopuyo-0.20.orig/PuyoGame.cpp
-+++ flobopuyo-0.20/PuyoGame.cpp
-@@ -45,7 +45,7 @@ PuyoState PuyoRandomSystem::getPuyoForSe
- 		return (PuyoState)newItem;

- 	}

- 	else

--		return (PuyoState)(int)(sequenceItems.getElementAt(sequence));

-+		return (PuyoState)(long)(sequenceItems.getElementAt(sequence));

- }

- 

- PuyoPuyo::PuyoPuyo(PuyoState state)

diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
deleted file mode 100644
index 6b3f54ef5630..000000000000
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-gcc41.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: flobopuyo-0.20/PuyoGame.h
-===================================================================
---- flobopuyo-0.20.orig/PuyoGame.h
-+++ flobopuyo-0.20/PuyoGame.h
-@@ -46,7 +46,7 @@ public:

-     virtual ~PuyoPuyo() {};

-     PuyoState getPuyoState();

-     void setPuyoState(PuyoState state);

--    bool PuyoPuyo::isFalling();

-+    bool isFalling();

-     int getPuyoX() const;

-     int getPuyoY() const;

-     void setPuyoXY(int X, int Y);

diff --git a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch b/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
deleted file mode 100644
index b9b55a333cb6..000000000000
--- a/games-puzzle/flobopuyo/files/flobopuyo-0.20-libs.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- a/Makefile.orig	2004-10-08 18:41:12.000000000 -0400
-+++ b/Makefile	2008-08-06 19:48:47.000000000 -0400
-@@ -41,15 +41,13 @@
- ##############
- 
- SDL_CONFIG=sdl-config
--CC=g++
--CXX=g++
- 
--CFLAGS= -DDATADIR=\"${DATADIR}\"
--LDFLAGS=
-+CXXFLAGS+= -DDATADIR=\"${DATADIR}\"
- 
- ifneq ($(PLATFORM), $(CYGWIN_VERSION))
--CFLAGS:=$(CFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
--LDFLAGS:=$(LDFLAGS) `$(SDL_CONFIG) --cflags --libs`
-+CXXFLAGS:=$(CXXFLAGS) `$(SDL_CONFIG) --cflags` -I/sw/include
-+LDFLAGS:=$(LDFLAGS)
-+LIBS:=$(LIBS) `$(SDL_CONFIG) --cflags --libs`
- endif
- 
- HFILES= HiScores.h IosException.h IosImgProcess.h IosVector.h PuyoCommander.h\
-@@ -71,46 +69,46 @@
- ################
- # Mac OS X
- ifeq ($(PLATFORM), Darwin)
--CFLAGS:=$(CFLAGS) -DMACOSX -UDATADIR
-+CXXFLAGS:=$(CXXFLAGS) -DMACOSX -UDATADIR
- endif
- 
- ################
- # Win32
- ifeq ($(PLATFORM), $(CYGWIN_VERSION))
--CFLAGS:=$(CFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
--LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
-+CXXFLAGS:=$(CXXFLAGS) -mno-cygwin -mwindows -DWIN32 -DYY_NEVER_INTERACTIVE=1 -I$(WINSDLINCLUDE) 
-+LDFLAGS:=$(LDFLAGS) -L$(WINSDLDEVLIBS)
-+LIBS:=$(LIBS) -lmingw32 -ljpeg -lzlib -lpng1 -lSDL_image -lSDL_mixer -lSDL -lSDLmain 
- endif
- 
- ifeq ($(ENABLE_AUDIO), true)
--CFLAGS:=$(CFLAGS) -DUSE_AUDIO=1
-+CXXFLAGS:=$(CXXFLAGS) -DUSE_AUDIO=1
- OBJFILES:=$(OBJFILES)
- endif
- 
- ifeq ($(ENABLE_OPENGL), true)
--CFLAGS:=$(CFLAGS) -DHAVE_OPENGL=1
-+CXXFLAGS:=$(CXXFLAGS) -DHAVE_OPENGL=1
- OBJFILES:=$(OBJFILES) glSDL.o
- ifeq ($(PLATFORM), Linux)
--LDFLAGS:=$(LDFLAGS) -lGL
-+LDFLAGS:=$(LDFLAGS)
-+LIBS:=$(LIBS) -lGL
- endif
- endif
- 
- ifeq ($(ENABLE_DGA), true)
- ifeq ($(PLATFORM), Linux)
--CFLAGS:=$(CFLAGS) -DUSE_DGA=1
-+CXXFLAGS:=$(CXXFLAGS) -DUSE_DGA=1
- endif
- endif
- 
- ifeq ($(DEBUG), true)
--CFLAGS:=$(CFLAGS) -DDEBUG=1 -g
-+CXXFLAGS:=$(CXXFLAGS) -DDEBUG=1 -g
- LDFLAGS:=$(LDFLAGS) -g
- endif
- 
--CXXFLAGS=${CFLAGS}
--
- all: prelude flobopuyo
- 
- flobopuyo: ${OBJFILES}
--	@echo "[flobopuyo]" && g++ $(CFLAGS) $(LDFLAGS) -o flobopuyo -lSDL_mixer -lSDL_image ${OBJFILES}
-+	@echo "[flobopuyo]" && $(CXX) $(LDFLAGS) $(OBJFILES) -o flobopuyo $(LIBS) -lSDL_mixer -lSDL_image
- 	@echo "--------------------------------------"
- 	@echo " Compilation finished"
- 	@[ "x`cat WARNINGS | wc -l`" != "x0" ] && echo -e "--------------------------------------\n There have been some warnings:\n" && cat WARNINGS && rm -f WARNINGS && echo "--------------------------------------" || true
-@@ -121,14 +119,14 @@
- prelude:
- 	@rm -f WARNINGS
- 	@touch WARNINGS
--	@echo "Compiling with CFLAGS=$(CFLAGS)"
-+	@echo "Compiling with CXXFLAGS=$(CXXFLAGS)"
- 	@echo "Compiling with LDFLAGS=$(LDFLAGS)"
- 
- %.o:%.c
--	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 
- %.o:%.cpp
--	@echo "[$@]" && $(CXX) $(CFLAGS) -c $< 2>> WARNINGS || (cat WARNINGS && false)
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 
- PuyoDoomMelt.o:PuyoDoomMelt.c ${HFILES}
- HiScores.o:HiScores.cpp HiScores.h preferences.h
-@@ -155,10 +153,10 @@
- IosException.o:IosException.cpp
- IosVector.o:IosVector.cpp
- glSDL.o:glSDL.c
--	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 	@rm -f EXT_WARNINGS
- SDL_prim.o:SDL_prim.c
--	@echo "[$@]" && $(CC) $(CFLAGS) -c $< 2>> EXT_WARNINGS
-+	@echo "[$@]" && $(CXX) $(CXXFLAGS) -c $<
- 	@rm -f EXT_WARNINGS
- corona.o:corona.cpp
- corona32.o:corona32.cpp
-@@ -178,7 +176,6 @@
- 	rm -f  .DS_Store */.DS_Store */*/.DS_Store .gdb_history
- 
- install: flobopuyo
--	strip flobopuyo
- 	mkdir -p ${INSTALL_BINDIR}
- 	mkdir -p ${INSTALL_DATADIR}
- 	cp -r data/* ${INSTALL_DATADIR}
-@@ -191,7 +188,7 @@
- 	chmod a+rx ${INSTALL_BINDIR}/flobopuyo
- 
- flobopuyo-static: prelude  ${OBJFILES}
--	@echo "[flobopuyo-static]" && g++ $(CFLAGS) -o flobopuyo-static ${OBJFILES}\
-+	@echo "[flobopuyo-static]" && g++ $(CXXFLAGS) -o flobopuyo-static ${OBJFILES}\
-         /sw/lib/libSDL_mixer.a /sw/lib/libvorbisfile.a /sw/lib/libvorbis.a /sw/lib/libogg.a /sw/lib/libsmpeg.a /sw/lib/libSDL_image.a /sw/lib/libjpeg.a /sw/lib/libpng.a -lz `$(SDL_CONFIG) --static-libs`
- 	@echo "--------------------------------------"
- 	@echo " Compilation finished"
-@@ -207,7 +204,6 @@
- 	rm -rf $(bundle_name)/Contents/Resources/data/CVS $(bundle_name)/Contents/Resources/data/*/CVS
- 	rm -rf $(bundle_name)/Contents/Resources/data/.xvpics $(bundle_name)/Contents/Resources/data/*/.xvpics
- 	rm -f $(bundle_name)/Contents/Resources/data/.DS_Store $(bundle_name)/Contents/Resources/data/*/.DS_Store
--	strip $(bundle_name)/Contents/MacOS/flobopuyo
- 
- mac-package: bundle
- 	mkdir -p $(macimage_name)
diff --git a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild b/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
deleted file mode 100644
index 41ee671603ff..000000000000
--- a/games-puzzle/flobopuyo/flobopuyo-0.20-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="Clone of the famous PuyoPuyo game"
-HOMEPAGE="http://www.ios-software.com/?page=projet&quoi=29"
-SRC_URI="http://www.ios-software.com/flobopuyo/${P}.tgz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-libs.patch
-
-	find . -type f -name ".*" -exec rm -f \{\} \;
-	sed -i \
-		-e "s:^DATADIR=.*:DATADIR=\"/usr/share/${PN}\":" \
-		-e "/^INSTALL_BINDIR/s:/\$(PREFIX)/games:/usr/bin:" \
-		Makefile \
-		|| die
-}
-
-src_compile() {
-	emake \
-		CXX="$(tc-getCXX)" \
-		ENABLE_OPENGL="$(use opengl && echo true || echo false)"
-}
-
-src_install() {
-	default
-	doman man/flobopuyo.6
-	doicon "${DISTDIR}/${PN}.png"
-	make_desktop_entry flobopuyo FloboPuyo
-}
diff --git a/games-puzzle/flobopuyo/metadata.xml b/games-puzzle/flobopuyo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/flobopuyo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/freesweep-0.92-r1 b/games-puzzle/freesweep-0.92-r1
new file mode 100644
index 000000000000..2f0ba26d86f5
--- /dev/null
+++ b/games-puzzle/freesweep-0.92-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=Console Minesweeper
+EAPI=6
+HOMEPAGE=http://freshmeat.net/projects/freesweep
+KEYWORDS=~amd64 ~x86 ~ppc-macos
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://www.upl.cs.wisc.edu/~hartmann/sweep/freesweep-0.92.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b75af3d4dc92cd83588e18171e0064c6
diff --git a/games-puzzle/freesweep/Manifest b/games-puzzle/freesweep/Manifest
deleted file mode 100644
index 223568c85522..000000000000
--- a/games-puzzle/freesweep/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freesweep-0.92.tar.gz 87353 BLAKE2B 8775a5c135e5a7faba00af2e2fd279c619a8092ad905c8dfa3d3ac7755d0b6337cb39f4b93e0c4bb1e905a87770e946cb728256bc5a2897794802424fa5ebdc2 SHA512 9f7f33ba5fab62d1ea3a6a57b9a60323281c91255218afb51251c4e20500c123769f003ae1a3622205be34fa7cfe11b691e58ad8787782da4d0a7045d4f41122
-EBUILD freesweep-0.92-r1.ebuild 562 BLAKE2B 39f1d588d6245207d91fcb7637cd90f5abf278b3365284d4abbae573a3fa05168386293b45e32a5251a41f29d3cf13c6753067a82b239ae941523def9a2caed4 SHA512 0ac25425de4675260d51871255debb06e54603843afd8559e077c7421fa62a865519b4b64c63c3b91317f9c928cca758d97bbd2fe0dcf0263b04c4af599ff2f2
-MISC metadata.xml 330 BLAKE2B e435f3a2e4a5c8fba959c2e181052f9ae3cfabbd1d6ebb57b6a12704db3d2dd6acfefadb84bf4b27dbd0a68c201384dd2edf9a6373158655598f1a3680d02001 SHA512 4df540d39a83e0bfc22135a1463f8bce474615410c58d5fab2e323c82c5e9b3d732428417da18a76c09bd4ca41e1f04b8d141e29743690eb38b4142ce3920a37
diff --git a/games-puzzle/freesweep/freesweep-0.92-r1.ebuild b/games-puzzle/freesweep/freesweep-0.92-r1.ebuild
deleted file mode 100644
index fe5d96ca8f6d..000000000000
--- a/games-puzzle/freesweep/freesweep-0.92-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="Console Minesweeper"
-HOMEPAGE="http://freshmeat.net/projects/freesweep"
-SRC_URI="http://www.upl.cs.wisc.edu/~hartmann/sweep/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos"
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_compile() {
-	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)"
-}
-
-src_install() {
-	dobin freesweep
-	einstalldocs
-	doman freesweep.6
-}
diff --git a/games-puzzle/freesweep/metadata.xml b/games-puzzle/freesweep/metadata.xml
deleted file mode 100644
index 7b6242aeadc0..000000000000
--- a/games-puzzle/freesweep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freshmeat">freesweep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/galaxis-1.8-r1 b/games-puzzle/galaxis-1.8-r1
new file mode 100644
index 000000000000..843fa2c2286e
--- /dev/null
+++ b/games-puzzle/galaxis-1.8-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=sys-libs/ncurses-5.3:0=
+DESCRIPTION=Curses-based clone of the nifty little Macintosh freeware game Galaxis
+EAPI=6
+HOMEPAGE=http://www.catb.org/~esr/galaxis/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.3:0=
+SLOT=0
+SRC_URI=http://www.catb.org/~esr/galaxis/galaxis-1.8.tar.gz
+_md5_=5bcba8b0402b86405ec1e49e356250dd
diff --git a/games-puzzle/galaxis/Manifest b/games-puzzle/galaxis/Manifest
deleted file mode 100644
index b73b13ef9377..000000000000
--- a/games-puzzle/galaxis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX galaxis-1.8-gentoo.patch 1412 BLAKE2B be1f33db0ddd13a5db8dc4f7c5e7c7bd7e1311d8d9eba60b60a816bd9c7f79b7b123d8898d6ec74f696234744cea14424ed8158da02bb0810833f8450c249ea0 SHA512 110c500bdd46e7ea5fdd90bf93468e7560f9de7735b2f7b89f74ddd273d5d9afc1983891106103632429b73f3af16c667d7133987218ca7c5a7f5cceb1106301
-DIST galaxis-1.8.tar.gz 8962 BLAKE2B 3380d44ca6b168ddc71edf4e7fb61bc9a22c24cf73e1bbd4b60a87517a769f3b3b2475d64281168fe6ade7b88bbc75b3eec923cf1d26532b097d6820b14f9817 SHA512 9d4c7447827fea333ddec8a289d5d6415777379c7aab53fc2088418051f3a38c8abeceff2e8ba0472f792fac457345f2307b3f51c8366aa0b9affa37c3eee05f
-EBUILD galaxis-1.8-r1.ebuild 531 BLAKE2B 6fd0836871c4b21c54392fe80970695beafd8dcaa4f14ba71d382c3c1048cf54b1d28fe3dbf03e038f35730b440c0ca601cc84500c5bfddee675cc740efc356b SHA512 24c6ddf649ace9a4ff56297a6f91c05e1eb03a6ec268aaae3c0c0b1c14887744b3ae60b478517854a2055319b374e5494fc45d6ecc0ea844ce8467e252882537
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch b/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
deleted file mode 100644
index abee05096288..000000000000
--- a/games-puzzle/galaxis/files/galaxis-1.8-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru galaxis-1.8.orig/Makefile galaxis-1.8/Makefile
---- galaxis-1.8.orig/Makefile	2010-10-19 09:48:58.000000000 -0400
-+++ galaxis-1.8/Makefile	2010-10-20 04:04:49.246650551 -0400
-@@ -3,9 +3,8 @@
- VERS=$(shell sed <galaxis.spec -n -e '/Version: \(.*\)/s//\1/p')
- 
- # Flags for use with the Linux ncurses package (recommended)
--CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
-+CFLAGS += -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
- TERMLIB = -lncurses
--CC = gcc
- 
- # Flags for use with stock curses
- #CFLAGS = -DNDEBUG
-@@ -13,7 +12,7 @@
- #CC = gcc
- 
- galaxis: galaxis.c
--	$(CC) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o galaxis galaxis.c $(TERMLIB)
- 
- galaxis.6: galaxis.xml
- 	xmlto man galaxis.xml
-diff -ru galaxis-1.8.orig/galaxis.c galaxis-1.8/galaxis.c
---- galaxis-1.8.orig/galaxis.c	2010-10-13 06:13:31.000000000 -0400
-+++ galaxis-1.8/galaxis.c	2010-10-20 04:05:30.036888771 -0400
-@@ -8,6 +8,8 @@
- #define _POSIX_SOURCE
- 
- #include <stdio.h>
-+#include <unistd.h>
-+#include <time.h>
- #include <termios.h>
- #include <curses.h>
- #include <signal.h>
-@@ -176,6 +177,7 @@
-     (void) refresh();
- }
- 
-+#if 0
- static void error(char *s)
- {
-     (void) move(PROMPTLINE + 2, 0);
-@@ -186,6 +188,7 @@
- 	(void) beep();
-     }
- }
-+#endif
- 
- static int rnd(int n)
- {
-@@ -644,7 +647,7 @@
-     }
- }
- 
--main(argc, argv)
-+int main(argc, argv)
- int argc;
- char *argv[];
- {
diff --git a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild b/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
deleted file mode 100644
index 73020c4a91e1..000000000000
--- a/games-puzzle/galaxis/galaxis-1.8-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Curses-based clone of the nifty little Macintosh freeware game Galaxis"
-HOMEPAGE="http://www.catb.org/~esr/galaxis/"
-SRC_URI="http://www.catb.org/~esr/galaxis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.3:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_install() {
-	dobin galaxis
-	doman galaxis.6
-	einstalldocs
-}
diff --git a/games-puzzle/galaxis/metadata.xml b/games-puzzle/galaxis/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/galaxis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gemdropx-0.9-r2 b/games-puzzle/gemdropx-0.9-r2
new file mode 100644
index 000000000000..1aa44920b990
--- /dev/null
+++ b/games-puzzle/gemdropx-0.9-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
+DESCRIPTION=A puzzle game where it's your job to clear the screen of gems
+EAPI=6
+HOMEPAGE=http://www.newbreedsoftware.com/gemdropx/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.3-r1[joystick,video] >=media-libs/sdl-mixer-1.2.1[mod]
+SLOT=0
+SRC_URI=ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/gemdropx-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e6ff3ad024f7e2ddaac256dd84c1b987
diff --git a/games-puzzle/gemdropx/Manifest b/games-puzzle/gemdropx/Manifest
deleted file mode 100644
index 33b0de50b644..000000000000
--- a/games-puzzle/gemdropx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gemdropx-0.9.tar.gz 903036 BLAKE2B 8ac4a7df1e0983cc48e17db07d3c0e66c76c23f34df5c094ddd690a8f18bc50ee0a4c0c378b23da1f266b61d4da634655d051daa71592f35d5a8645f0db29761 SHA512 f99292f44575cb86c50e29f220d5fd358b3e6dd379148dcd764eac5bca5edcc49f88e119f9bebddb14017403985378f1bc07633c987556a9264f36ce20cc6fb2
-EBUILD gemdropx-0.9-r2.ebuild 1068 BLAKE2B 9f647c38a0730c05d5fb97b6380964dddf8d20f7530f37544f8408a935c32f56b0a39c52d7377ab307c519af104ae46b3d33e1efbfb13068019cfa16e9787f66 SHA512 e1cab173982a30529b7a86bae686988f15ead3e027e8bdefbf2f3cc0103e1142f346d3f09244e75de9d5b5eb985cfac0b266748d6c5242b1bb171aeeae7460a9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
deleted file mode 100644
index 307663065741..000000000000
--- a/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A puzzle game where it's your job to clear the screen of gems"
-HOMEPAGE="http://www.newbreedsoftware.com/gemdropx/"
-SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.3-r1[joystick,video]
-	>=media-libs/sdl-mixer-1.2.1[mod]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CXX/d' \
-		-e 's/CXX/CC/' \
-		-e 's/-o/$(LDFLAGS) -o/' \
-		Makefile || die
-
-	find data/ -type d -name .xvpics -exec rm -rf \{\} +
-}
-
-src_compile() {
-	emake \
-		DATA_PREFIX="/usr/share/${PN}" \
-		XTRA_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin gemdropx
-	dodir "/usr/share/${PN}"
-	cp -r data/* "${ED}/usr/share/${PN}/" || die
-	dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
-	newicon data/images/gemdropx-icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gem Drop X" /usr/share/pixmaps/${PN}.xpm
-}
diff --git a/games-puzzle/gemdropx/metadata.xml b/games-puzzle/gemdropx/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/gemdropx/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gfifteen-1.0.3-r1 b/games-puzzle/gfifteen-1.0.3-r1
new file mode 100644
index 000000000000..8e75e8010524
--- /dev/null
+++ b/games-puzzle/gfifteen-1.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Graphical implementation of the sliding puzzle game fifteen
+EAPI=6
+HOMEPAGE=https://frigidcode.com/code/gfifteen/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/gtk+:3
+SLOT=0
+SRC_URI=https://frigidcode.com/code/gfifteen/gfifteen-1.0.3.tar.gz
+_eclasses_=desktop	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_=d6067d752571b1e31c60ea9d134b142a
diff --git a/games-puzzle/gfifteen/Manifest b/games-puzzle/gfifteen/Manifest
deleted file mode 100644
index 39ef45aa8121..000000000000
--- a/games-puzzle/gfifteen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gfifteen-1.0.3.tar.gz 525454 BLAKE2B 253f74439d491b8ff30697c755dd8e04203a9282de0640603ae4e90fc37f3965ca7f1a02dc1263a71f5b00a18ccf42e7ac371cd20c5bc518fe9b12361fc80818 SHA512 a3699a2484ec3334ec9489c6ae6d8b332e41a769c72ea2971684197f8eb9e6c30431232f3423aaa85ded0fa57410929d432b2efe4370409bdcc63f2fb0b31ae4
-EBUILD gfifteen-1.0.3-r1.ebuild 866 BLAKE2B 5f7df7a00769db391a9b2f678b0744efcfc79db8e20d55e8f81a9f67ceadd166402c61ce4d9aade6cbc57afe5f1988f8a5b930cb59f061b278f748f98130c9a1 SHA512 65147433ed36d9c67a979270adc0b371898b217681830173956d82de847e103c87f4eaa61d62d07f43be0520b6a6b131fe8c61b26aa79fd5666385a7d813a176
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild b/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
deleted file mode 100644
index 863fc84ff7f1..000000000000
--- a/games-puzzle/gfifteen/gfifteen-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Graphical implementation of the sliding puzzle game fifteen"
-HOMEPAGE="https://frigidcode.com/code/gfifteen/"
-SRC_URI="https://frigidcode.com/code/gfifteen/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	# make it compile against newer gtk+:3 (bug #536994)
-	sed -i \
-		-e 's/-DGTK_DISABLE_DEPRECATED=1 //' \
-		Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-assembly
-}
-
-src_install() {
-	default
-	doicon -s scalable ${PN}.svg
-	domenu gfifteen.desktop
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/gfifteen/metadata.xml b/games-puzzle/gfifteen/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/gfifteen/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/glightoff-1.0.0-r1 b/games-puzzle/glightoff-1.0.0-r1
new file mode 100644
index 000000000000..4df64d0de685
--- /dev/null
+++ b/games-puzzle/glightoff-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2 >=dev-util/intltool-0.29 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A simple (but not so easy to solve!) puzzle game
+EAPI=5
+HOMEPAGE=http://glightoff.sourceforge.net/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=gnome-base/librsvg media-libs/libpng:0= >=x11-libs/gtk+-2.6:2
+SLOT=0
+SRC_URI=mirror://sourceforge/glightoff/glightoff-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d0af3a754820db0c014254722d75d19
diff --git a/games-puzzle/glightoff/Manifest b/games-puzzle/glightoff/Manifest
deleted file mode 100644
index bb5b21bcc743..000000000000
--- a/games-puzzle/glightoff/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX glightoff-1.0.0-desktop.patch 402 BLAKE2B 7963509566d34f84f6850385093774cd1829b6791e63494eaf774a2ec634288c68f57746046e47d76a8978dbf7dc9d6d4c6199a9c9358418a93d509892ac1c83 SHA512 4571865a471d210b5218775a09076bdc4003880e6683a245efeeba47a7e128822c11c6b1198fdfae21460900dce5fd747166c30f75c75d0322b1e8a68f7daa27
-DIST glightoff-1.0.0.tar.gz 349274 BLAKE2B 1c8198215ad1b5229f7ca9ef55df2858cf61474d18343ab0d506ace2104807573b29a3e570c5b88149fa788601c4f2fda872f2f36948cbd8f0de3dc2c5193293 SHA512 b3be7f65bfbb6b3affbddd20a12321ee401defb2bc0b64e58b5aed05d319e6ac51100cfa8dfb4beddb3c919deb9ee6931235dbc4183c12d3e501da5eb748ae94
-EBUILD glightoff-1.0.0-r1.ebuild 703 BLAKE2B 03d9201fa1b7dcc37f33affeb79add8924fe982e218f6ee652d5ec352eec2e9ba0b4cb42ddfe87abab8c1d3cee95488710dc9cd3080b4cc8d3a940e99ea0ef25 SHA512 2ea4bc1971fe1352c5c3e94a8150e20000ac5a8ffec0e295f3f39a645416c340d6470c2ebfc4499f218e47a0661d66d5092a51e223d4b61015416aa7084b3433
-MISC metadata.xml 332 BLAKE2B 31bf81162a12c4192ab3fcf74e2e72c1f0f188c163e74b6db1de3986de1c335d641250c125732172fd7a2412edad4a97f01e53dd0f7e9470163fae5e3947210a SHA512 83debe37911969e2b45ad0ca5ff90684a7d7e3dc3fd4bb504aa537c3c7823b68131f8e919075c9e5806d6b29a8874086f3c69fbfbb1335898d241d8b46f70e70
diff --git a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch b/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
deleted file mode 100644
index 0d087d78df9f..000000000000
--- a/games-puzzle/glightoff/files/glightoff-1.0.0-desktop.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- glightoff.desktop.in.old	2014-11-22 17:57:47.019838007 +0100
-+++ glightoff.desktop.in	2014-11-22 17:58:15.484321664 +0100
-@@ -1,10 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=GLightOff
- _Comment=Simple Light Off game
- Exec=glightoff
- Terminal=false
- Type=Application
--Icon=glightoff.png
--Categories=GNOME;Application;Game;PuzzleGame;
-+Icon=glightoff
-+Categories=GNOME;Game;
- StartupNotify=true
diff --git a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild b/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
deleted file mode 100644
index 5a209fa62cf1..000000000000
--- a/games-puzzle/glightoff/glightoff-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="A simple (but not so easy to solve!) puzzle game"
-HOMEPAGE="http://glightoff.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	gnome-base/librsvg
-	media-libs/libpng:0=
-	>=x11-libs/gtk+-2.6:2
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.29
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix broken png files
-	pngfix -q --out=out.png glightoff.png
-	mv -f out.png glightoff.png || die
-
-	epatch "${FILESDIR}/${PN}-1.0.0-desktop.patch"
-
-	gnome2_src_prepare
-}
diff --git a/games-puzzle/glightoff/metadata.xml b/games-puzzle/glightoff/metadata.xml
deleted file mode 100644
index a6bc0cedd676..000000000000
--- a/games-puzzle/glightoff/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">glightoff</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/gnome-klotski-3.22.3 b/games-puzzle/gnome-klotski-3.22.3
new file mode 100644
index 000000000000..f082127c1a42
--- /dev/null
+++ b/games-puzzle/gnome-klotski-3.22.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.19.0:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Slide blocks to solve the puzzle
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Klotski
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libgee:0.8= dev-libs/libgnome-games-support:1 >=gnome-base/librsvg-2.32.0:2 >=x11-libs/gtk+-3.19.0:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5eb47c03f26a36f6242842bccde1a5dd
diff --git a/games-puzzle/gnome-klotski/Manifest b/games-puzzle/gnome-klotski/Manifest
deleted file mode 100644
index a75dd6c0e5c9..000000000000
--- a/games-puzzle/gnome-klotski/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-klotski-3.22.3.tar.xz 664380 BLAKE2B 3c5ca5da9baa30921796a8701fcd2e1f5214fe19070895390fd26617af6eac7dbe12c92e643cfd2b3b5b1bbb0303e4272e338100f23a79011939506a433be014 SHA512 d86b39c60b545abfe6fce2366dd40e2d603e635f4b33c42e76a4447b845981c51fadfdb8f9f073e515ccd9772c9ee5f29258ac63b6620acff03150cc52a51d0d
-EBUILD gnome-klotski-3.22.3.ebuild 679 BLAKE2B a9f706d663fadb1df9168610833f5abcd2d699c55174564d4cebfe9f2c8a0cf624576c41a3feed4a1dc4b591188c0079dffe4e875b3e57983dae49f1717b9851 SHA512 8715400c87b692733e3935f3319cd6cb806dae39703b26dba91a42bcfa4f0ad47b0d3901feccf8ea72ef194801a46dd9f9370276d84675eb6ec25b01e9d7f7aa
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
deleted file mode 100644
index 8d225bd382fd..000000000000
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.22.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Slide blocks to solve the puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	dev-libs/libgee:0.8=
-	dev-libs/libgnome-games-support:1
-	>=gnome-base/librsvg-2.32.0:2
-	>=x11-libs/gtk+-3.19.0:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-klotski/metadata.xml b/games-puzzle/gnome-klotski/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/gnome-klotski/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gnome-sudoku-3.24.0 b/games-puzzle/gnome-sudoku-3.24.0
new file mode 100644
index 000000000000..9528596c73dd
--- /dev/null
+++ b/games-puzzle/gnome-sudoku-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection] || ( dev-lang/vala:0.36 ) app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Test your logic skills in this number grid puzzle
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Sudoku
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8=[introspection] dev-libs/json-glib >=dev-libs/qqwing-1.3.4 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.19.0:3[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=54a5d6afef03c9c1401292e7899a9fed
diff --git a/games-puzzle/gnome-sudoku/Manifest b/games-puzzle/gnome-sudoku/Manifest
deleted file mode 100644
index e7ce3ce75c74..000000000000
--- a/games-puzzle/gnome-sudoku/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-sudoku-3.24.0.tar.xz 2890256 BLAKE2B 81e8c2cf8df3a441979dfcd6d5726439231d9c4175be1fc765f02aef5bd13bee3675708cd33694f1c2a3a0097e35a83023b6add3bfe7930c4289be576fbfbf2f SHA512 3e00726be6ceebe6107f0e7c1100e1072f815dcaf0f4d5f2ce5cf75ae0393457aead001fe8b43420d20ef6e09bc8a7d6fd79d8aaa72a87c21e7c9f8d18ee0809
-EBUILD gnome-sudoku-3.24.0.ebuild 772 BLAKE2B 7716caf3d721948cba678ee7e260aacb2defb1839c990a81d1686fcd211d48b3ff89f989e702938325a3967f8fc888af543a27fb4fe40538b2101fb2e7eed072 SHA512 b940bda715837ad7814a04e13ac1526cdd42a0c4673524783519d15e7eb91a29d0a45f5e76ec49e4b82227972f6200b1ecbf1172588fcec24bef3f9b3a58d8d5
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
deleted file mode 100644
index 0da196bf2483..000000000000
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.24.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.36"
-
-inherit gnome2 vala
-
-DESCRIPTION="Test your logic skills in this number grid puzzle"
-HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libgee:0.8=[introspection]
-	dev-libs/json-glib
-	>=dev-libs/qqwing-1.3.4
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.19.0:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-sudoku/metadata.xml b/games-puzzle/gnome-sudoku/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/gnome-sudoku/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gnome-taquin-3.22.0 b/games-puzzle/gnome-taquin-3.22.0
new file mode 100644
index 000000000000..3b74dfe1c724
--- /dev/null
+++ b/games-puzzle/gnome-taquin-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Move tiles so that they reach their places
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Taquin
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0
+RDEPEND=>=dev-libs/glib-2.40:2 >=gnome-base/librsvg-2.32:2 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.15:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef6b5e40791ff5c6984c52b2a7735559
diff --git a/games-puzzle/gnome-taquin/Manifest b/games-puzzle/gnome-taquin/Manifest
deleted file mode 100644
index c41e64f74a43..000000000000
--- a/games-puzzle/gnome-taquin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-taquin-3.22.0.tar.xz 5030156 BLAKE2B e2757fe196a985c19de5b902d866fb1e9c6f97234dc25af59db10b3c066d1095a7280a5a0054b0c15c913fa93c541f4c0626f481257ab3bfefe5db9fdf308493 SHA512 9fbfa651b2546af16ca215ce0edb4466dd3663c90bf1c130c983422a0c5860f6146db97f7d9095b727d99ee98496e3bdb02afe46c9ced66672435638ba49788a
-EBUILD gnome-taquin-3.22.0.ebuild 681 BLAKE2B 548d984c52259163ab17e583ca5779f094511661e9e221e29dff65e38ffcbcf33b18747fd76283d758961abe396f2815478031ed9a4227f031ddc55a3b9bf97c SHA512 0ae6e60c94c1973c9cbe4fb842349925e15e279ddddb17f6d8fb1d9eff6da09ef501d7ed5d2e997ecd9760af0a368f25ae21738bd9b072ef59bd976dec9eb18e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild
deleted file mode 100644
index 6cba03479009..000000000000
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.22.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 vala
-
-DESCRIPTION="Move tiles so that they reach their places"
-HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0 CC-BY-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.15:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-taquin/metadata.xml b/games-puzzle/gnome-taquin/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/gnome-taquin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gnome-tetravex-3.22.0 b/games-puzzle/gnome-tetravex-3.22.0
new file mode 100644
index 000000000000..6ddde107f880
--- /dev/null
+++ b/games-puzzle/gnome-tetravex-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.13.4:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Complete the puzzle by matching numbered tiles
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Tetravex
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.13.4:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tetravex/3.22/gnome-tetravex-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c5898fe6fec94f0afe4e6d56398d966
diff --git a/games-puzzle/gnome-tetravex/Manifest b/games-puzzle/gnome-tetravex/Manifest
deleted file mode 100644
index 3369b5679f13..000000000000
--- a/games-puzzle/gnome-tetravex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-tetravex-3.22.0.tar.xz 2170464 BLAKE2B 43ee2d93a8d8b2a1f9515ee23a85a77be3f30b299652f2b5192d5f97bf3064d6a636f10e78438aee329ad91d1f0b7fed6ec2109593397b7c849c36ec727692d2 SHA512 d4497fae7e2c95f6d6e26b72690c86ec12250ccc6136f02436a53fa285215415a471d91f2ded10690faced6f6f856218750eb76313d368863a7a31afd02a9d2d
-EBUILD gnome-tetravex-3.22.0.ebuild 615 BLAKE2B 5d9bdf3ccd0cae3d817cf749a416510600c0b3b52039fdc41dadaaf815f521ef7951ba8a2ceec374c4bced011a393ec23976e57610c752204257b192f553e9bc SHA512 d8bb6588b321314a3895252aa0847901c18e1a132cd2e6bc07b1f63476182ab969750d8491409192bf9895c5a25c9e33d0b626c66d089d3bc9015d0bbee2266f
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
deleted file mode 100644
index 73045c053f32..000000000000
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.22.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Complete the puzzle by matching numbered tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.40:2
-	>=x11-libs/gtk+-3.13.4:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/gnome-tetravex/metadata.xml b/games-puzzle/gnome-tetravex/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/gnome-tetravex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gnudoku-0.93-r1 b/games-puzzle/gnudoku-0.93-r1
new file mode 100644
index 000000000000..9e9fb27af113
--- /dev/null
+++ b/games-puzzle/gnudoku-0.93-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-cpp/gtkmm-2.6:2.4 virtual/pkgconfig
+DESCRIPTION=A program for creating and solving Su Doku puzzles
+EAPI=6
+HOMEPAGE=http://www.icculus.org/~jcspray/GNUDoku
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-cpp/gtkmm-2.6:2.4
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.icculus.org/~jcspray/GNUDoku/GNUDoku-0.93.tar.gz
+_eclasses_=desktop	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_=95eb1f668fb50f3cd66916f94a8e9b31
diff --git a/games-puzzle/gnudoku/Manifest b/games-puzzle/gnudoku/Manifest
deleted file mode 100644
index 0f6ccc3a65eb..000000000000
--- a/games-puzzle/gnudoku/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnudoku-0.93-gcc43.patch 329 BLAKE2B 7c76007733a0d78c71d0e11416a2ccc415cbe44260cb231d5391c980c018d0d759e07844376fe8ef92b0c6bf40966ddcc3b990534be8532ef5192577cef5fac8 SHA512 b7cbfbaad6a73029ee0b31cab0c630a594e7ac6433c6972255ed7ea475a5729fe004fe5791ec82b97df84f19637cbc40a37df8fa5ff29fde115d343b836bdfe0
-DIST GNUDoku-0.93.tar.gz 26212 BLAKE2B 77d47294dbdfb3b9074e7ffb4a2083d13a33caa7a6268bb70722970beb5b065e54b4cb16733686ab2c8d08d4e88855ed51cacdd639aff5a84f1c62c5ab43aa35 SHA512 124bde796149136320758de5088f7d177ec8a4ffe03190f22bd8b228c00d1adb790450c760110e14d1cc9bf70f7dd54477405582c313c91e8da97d39c8fc55a6
-EBUILD gnudoku-0.93-r1.ebuild 867 BLAKE2B db5adacbe1fe2ca0f41a87e85b7b7ac609e73cb57199a5008cd32b1c2b10dc30b7865b3bbd77cb1385807165e030c92788bd025c00d13fe09c033e1f9135d621 SHA512 5e615e8a0b5384084b90fa1ff5582c90e9b9cae2692f4cbe2b00d15466f552832de995867daf3051160603867735b9ffcae9b6df25916bb2a768fb02051a0fb9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch b/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
deleted file mode 100644
index bb92102a37de..000000000000
--- a/games-puzzle/gnudoku/files/gnudoku-0.93-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/GNUDoku.C
-+++ b/GNUDoku.C
-@@ -25,6 +25,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <ctime>
-+#include <cstring>
- 
- #include <vector>
- #include <cassert>
---- a/sudoku.C
-+++ b/sudoku.C
-@@ -10,6 +10,7 @@
- #include <cstdio>
- #include <cstdlib>
- #include <ctime>
-+#include <cstring>
- 
- #include <map>
- namespace sudoku
diff --git a/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild b/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild
deleted file mode 100644
index bfd07d1a9a25..000000000000
--- a/games-puzzle/gnudoku/gnudoku-0.93-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-MY_PN="GNUDoku"
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="A program for creating and solving Su Doku puzzles"
-HOMEPAGE="http://www.icculus.org/~jcspray/GNUDoku"
-SRC_URI="http://www.icculus.org/~jcspray/GNUDoku/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=dev-cpp/gtkmm-2.6:2.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gcc43.patch
-	append-cxxflags -std=c++11
-	sed -i \
-		-e "s:\$(CXX):\$(CXX) ${CXXFLAGS} ${LDFLAGS}:" \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	dobin GNUDoku
-	newicon GNUDoku.png ${PN}.png
-	make_desktop_entry ${MY_PN} ${MY_PN}
-	dodoc ALGORITHM Changelog README TODO
-}
diff --git a/games-puzzle/gnudoku/metadata.xml b/games-puzzle/gnudoku/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/gnudoku/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gnurobbo-0.66-r1 b/games-puzzle/gnurobbo-0.66-r1
new file mode 100644
index 000000000000..3c87a00975c0
--- /dev/null
+++ b/games-puzzle/gnurobbo-0.66-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+DESCRIPTION=Robbo, a popular Atari XE/XL game ported to Linux
+EAPI=6
+HOMEPAGE=http://gnurobbo.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BitstreamVera
+RDEPEND=media-libs/libsdl[sound,video,joystick] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=mirror://sourceforge/gnurobbo/gnurobbo-0.66-source.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=0a434e079fbb44a64b5fb3bd81037b16
diff --git a/games-puzzle/gnurobbo/Manifest b/games-puzzle/gnurobbo/Manifest
deleted file mode 100644
index f4924af58a2a..000000000000
--- a/games-puzzle/gnurobbo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnurobbo-0.66-underlink.patch 858 BLAKE2B b3ddef3a919afd45c5d949d5f48cecaaea1c013e1924fffd8ce17e32c407562c9054059696db92750322d9378b900ce8432cc30741d0c43b86b5c6b8dd407e4c SHA512 b2053326e1e06cc780647f0c40452729430dd7d0c641406719ce48ba5159e7dd160efc9c892de9424f50ac43386cd6f2a598558e604c34be41a3ccf15d937375
-DIST gnurobbo-0.66-source.tar.gz 1765034 BLAKE2B 4a88d1281fdea44516c86e704a828e1d3ef2116cc7d6401960524ea53435828bb09f73adf57016bf3b7a0fa107ee411c575ca2f288375148658bf1bdf0b16aa2 SHA512 5f217ba87e8d1c56d9630cca44bde8d405c93929ebb1722c80955fceedec93a5e02ab3dbafd557c3cbedd63a97a73abe6e8aeff115931844a11f6cc1dd00533c
-EBUILD gnurobbo-0.66-r1.ebuild 910 BLAKE2B 8b6e1f9b6d9a76d23a64a3a60231fb28763b6669a9d4ef861fdd8e31d85fead9f77650c263c82682a9cfef2e7bdb392f8ee16858a5335358b9a95133ef7cc78d SHA512 c59070e20efad3ccf4716bfc66408c059a25215517605b6d3b4defd4bbd221b025b772b40cb34b3e01a267117e3c5d10402df74285ac4bf94834ba77e54d054e
-MISC metadata.xml 331 BLAKE2B 9e3cb9283f67936d5be789e0c65509547ddbfee86c3695ded8ff72310458e7937710915e82b2f9c9f50102b0a78ab08d3d78e5da7e05923bc53bdb69bf8b75e1 SHA512 56663c15b5d9135317f5cfdef851959613abd44ced462fc3429540a76be55970f831bfc284d2fe06ace79ea98586109bc64489ba9d12fab9a0909186f40365da
diff --git a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch b/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
deleted file mode 100644
index af69bd9e1c9d..000000000000
--- a/games-puzzle/gnurobbo/files/gnurobbo-0.66-underlink.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/Makefile.old	2011-06-20 21:19:49.578922392 +0200
-+++ b/Makefile	2011-06-20 21:20:28.535421648 +0200
-@@ -39,14 +39,13 @@
- CFLAGS?=-O3 -pipe
- CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
- 	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
--LDFLAGS=
- # Use these instead for debugging and/or profiling (mainly intended for GNU Robbo developers)
- #CFLAGS?=-O0 -pipe -g -pg
- #CFLAGS+=-Wall `$(SDL_CONFIG) --cflags` -DPLATFORM_PC -DVERSION=\"$(VERSION)\" \
- #	-DPACKAGE_DATA_DIR=\"$(PACKAGE_DATA_DIR)\" $(FONT_USE_PIXMAP) $(MUSIC) $(DESIGNER)
- #LDFLAGS=-pg
- LINK=$(CC)
--LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF)
-+LIBS=`$(SDL_CONFIG) --libs` -lSDL_image -lSDL_mixer $(FONT_USE_SDL_TTF) -lm
- 
- # You won't need to alter anything below
- all: $(SOURCES) $(TARGET)
diff --git a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild b/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
deleted file mode 100644
index 39a81fdcd790..000000000000
--- a/games-puzzle/gnurobbo/gnurobbo-0.66-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Robbo, a popular Atari XE/XL game ported to Linux"
-HOMEPAGE="http://gnurobbo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnurobbo/${P}-source.tar.gz"
-
-LICENSE="GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[sound,video,joystick]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-underlink.patch )
-
-src_compile() {
-	emake \
-		PACKAGE_DATA_DIR="/usr/share/${PN}" \
-		BINDIR="/usr/bin" \
-		DOCDIR="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	dobin gnurobbo
-	insinto "/usr/share/${PN}"
-	doins -r data/{levels,skins,locales,rob,sounds}
-	dodoc AUTHORS Bugs ChangeLog README TODO
-	newicon icon32.png ${PN}.png
-	make_desktop_entry ${PN} Gnurobbo
-}
diff --git a/games-puzzle/gnurobbo/metadata.xml b/games-puzzle/gnurobbo/metadata.xml
deleted file mode 100644
index 446252dcc733..000000000000
--- a/games-puzzle/gnurobbo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gnurobbo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/gottet-1.1.6 b/games-puzzle/gottet-1.1.6
new file mode 100644
index 000000000000..141aad50dce8
--- /dev/null
+++ b/games-puzzle/gottet-1.1.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A tetris clone based on Qt5
+EAPI=6
+HOMEPAGE=https://gottcode.org/gottet/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/gottet/gottet-1.1.6-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=83edcbde256b9e458cc139d82f2face8
diff --git a/games-puzzle/gottet/Manifest b/games-puzzle/gottet/Manifest
deleted file mode 100644
index 8fe7778f6950..000000000000
--- a/games-puzzle/gottet/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gottet-1.1.6-src.tar.bz2 527181 BLAKE2B 1cd090c81c6b4c629b3cf08c8c96a73b3aed18a86a70a1d837d866d0354e8adecfd438cdfc93a821991f9ab919263f2db7e542e13f2503abe16d4b311ea03c95 SHA512 6e004d96ccd11169c19ce5234691db35af34ff050139ae7fee3949f0a36170a1ec906f83ba2a1f2f15fc3538adb08da8c8b744fbfb3202dfc59ebfeea7136f0d
-EBUILD gottet-1.1.6.ebuild 644 BLAKE2B e1fbd0e68fec61bcaeb954ef4db063cd6269a0afe7ec6798e5b9d793c6dd6ba2601494563a4788713edc042e8b9473c82292383236d80a6811d60648ca22704d SHA512 8924ce580c1b7c3a5ede9dc29b5efd6434baff443b679aee4292032968aaa7bbdd3f9a2978c80df6cf98c4c2e9e93d12f610a02cb9c11dc7f2b188ab90f5f532
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gottet/gottet-1.1.6.ebuild b/games-puzzle/gottet/gottet-1.1.6.ebuild
deleted file mode 100644
index 0d95a54b6a90..000000000000
--- a/games-puzzle/gottet/gottet-1.1.6.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="A tetris clone based on Qt5"
-HOMEPAGE="https://gottcode.org/gottet/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/gottet/metadata.xml b/games-puzzle/gottet/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/gottet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/greedy-0.2.0-r1 b/games-puzzle/greedy-0.2.0-r1
new file mode 100644
index 000000000000..a8a5dd0d2561
--- /dev/null
+++ b/games-puzzle/greedy-0.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/ncurses:0 virtual/pkgconfig
+DESCRIPTION=fun little ncurses puzzle game
+EAPI=5
+HOMEPAGE=http://www.kotinet.com/juhamattin/linux/index.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0 games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.kotinet.com/juhamattin/linux/download/greedy-0.2.0.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_=342d575934ead774452e71d146639c7f
diff --git a/games-puzzle/greedy/Manifest b/games-puzzle/greedy/Manifest
deleted file mode 100644
index 29a80e311f6d..000000000000
--- a/games-puzzle/greedy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST greedy-0.2.0.tar.gz 13152 BLAKE2B e31aa4965a3347ae86c2c598e7eb9cfb3a24657fd24cb49f6d1a925a77e67d162b64647a3f0ea74ff40ac14aa996faaafa305a47991b2a40cd46d3e293ee5859 SHA512 07376d003193244d336909f6336d68c4ce0f1e15388f28cc8e50121856b1f341f46f2aeba6e09118063b27d572916b4f596b75354543df3a72930a44b6b6f8ac
-EBUILD greedy-0.2.0-r1.ebuild 896 BLAKE2B c7983666a3718b661cc7b0385729eb1e069d472b2fc2405847fa743a0816a385f29eb8ce1c84b767802125f9d158cc597ef3c4ba45dcc3df81150b149b8cb57f SHA512 548171eafbf6a19ca223d98387e82935898142a5ef453c382c3731994d3fc5734772ef9435b33cb429a95e95f252907878fe15a541611e5342119ee1f8af708b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild b/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
deleted file mode 100644
index dffb899aebff..000000000000
--- a/games-puzzle/greedy/greedy-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs games
-
-DESCRIPTION="fun little ncurses puzzle game"
-HOMEPAGE="http://www.kotinet.com/juhamattin/linux/index.html"
-SRC_URI="http://www.kotinet.com/juhamattin/linux/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	rm -f Makefile
-	# It wants a scores file.  We need to touch one and install it.
-	touch greedy.scores
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) ncurses --libs)" ${PN}
-}
-
-src_install() {
-	insinto "${GAMES_STATEDIR}"
-	doins greedy.scores
-
-	dogamesbin greedy
-	dodoc CHANGES README TODO
-
-	prepgamesdirs
-	# We need to set the permissions correctly
-	fperms 664 "${GAMES_STATEDIR}/greedy.scores"
-}
diff --git a/games-puzzle/greedy/metadata.xml b/games-puzzle/greedy/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/greedy/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/groundhog-1.4-r1 b/games-puzzle/groundhog-1.4-r1
new file mode 100644
index 000000000000..ed1e192fe318
--- /dev/null
+++ b/games-puzzle/groundhog-1.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Put the balls in the pockets of the same color by manipulating a maze of tubes
+EAPI=6
+HOMEPAGE=http://home-2.consunet.nl/~cb007736/groundhog.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://home-2.consunet.nl/~cb007736/groundhog-1.4.tar.gz mirror://debian/pool/main/g/groundhog/groundhog_1.4-9.diff.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f02b04e82a09b036001de4a0fe143c4d
diff --git a/games-puzzle/groundhog/Manifest b/games-puzzle/groundhog/Manifest
deleted file mode 100644
index b0bc9139eefb..000000000000
--- a/games-puzzle/groundhog/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX groundhog-1.4-flags.patch 608 BLAKE2B aec098b6453a3541a087d382f93e4aa1c9ba9deb6435118836cef9825c617e417981a25040ca2b36268de6c688a29d71f62c8e1bab197e824aee9bec81da0d1d SHA512 ee6e08ead434e9285ee6d2b8580effd33528a8c4c13635e9ecf1973ca25a7869a98ed6231f95e4e789867bfa56e8b57e2a939ebf35107f15959eb643df880862
-DIST groundhog-1.4.tar.gz 221871 BLAKE2B e9b7dd2c7498b6320ee4fe396679ba76831c13357b1e7fc9cd14578f387de6d1ca38fa0f5aa4fb3461afb3c27080751de45e3b26ded281dcb59475d85eccbe35 SHA512 9d1cf9073658cd325c4dceb6009825f50d8d4c55d0cca1b762cfdd066663257958d92e0e67ad49593add5821ce202e19c1106793ae8c77e4776c3b2e1fdc093c
-DIST groundhog_1.4-9.diff.gz 8613 BLAKE2B 5bbfd5deaa0f7579369baea93be40e5b2ced14d9356417b0aaef595df830bb29abb4b3676878f49005e68ec81c5ec762ab418fce55c26fbbd2af062263757335 SHA512 ddbb7c8b51fe63a1d318e080133737a851276ab55324875e5d68650d2399ac141667c62ab79ee41ababd2b5426e7bee5f158e7aa4edfe8ee82c6c3b6fb8179b8
-EBUILD groundhog-1.4-r1.ebuild 1221 BLAKE2B c282f82e888dadf7330bce1e4b99018e17fcb3713894ff27591320de9a167b86bebdb93a7ddd9b29545eb205946f61c38b64f5614b958ea554299e9a3b9a6410 SHA512 982cefcc7b8b5df623a5d7e49531334c7453072569efdb9304b7a8445109c0051733c92f88a15c0f6a2b2cce9c00a6c8a4d71828336868776ecfd661f61cf72f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch b/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
deleted file mode 100644
index 9726f249820b..000000000000
--- a/games-puzzle/groundhog/files/groundhog-1.4-flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-respect flags
-
-applied on top of debian patches
-
---- a/configure.in
-+++ b/configure.in
-@@ -46,8 +46,6 @@
- dnl Checks for libraries.
- dnl AM_PATH_GTK_2_0(2.0.0,,AC_MSG_ERROR(Groundhog needs GTK 2.0))
- 
--CXXFLAGS="-O2 -Wall"
--
- dnl Checks for header files.
- AC_CHECK_HEADERS(unistd.h)
- 
-@@ -57,16 +55,6 @@
- 
- dnl Checks for library functions.
- 
--dnl Use -Wall if we have gcc.
--changequote(,)dnl
--if test "x$GCC" = "xyes"; then
--  case " $CFLAGS " in
--  *[\ \	]-Wall[\ \	]*) ;;
--  *) CFLAGS="$CFLAGS -Wall" ;;
--  esac
--fi
--changequote([,])dnl
--
- AC_OUTPUT([ m4/Makefile  intl/Makefile
- Makefile 
- src/Makefile 
diff --git a/games-puzzle/groundhog/groundhog-1.4-r1.ebuild b/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
deleted file mode 100644
index ba93616b6702..000000000000
--- a/games-puzzle/groundhog/groundhog-1.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop epatch autotools
-
-DEB_VER="9"
-DESCRIPTION="Put the balls in the pockets of the same color by manipulating a maze of tubes"
-HOMEPAGE="http://home-2.consunet.nl/~cb007736/groundhog.html"
-SRC_URI="http://home-2.consunet.nl/~cb007736/${P}.tar.gz
-	mirror://debian/pool/main/g/groundhog/groundhog_${PV}-${DEB_VER}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	cd "${WORKDIR}"
-	epatch groundhog_${PV}-${DEB_VER}.diff
-	cd "${S}"
-	sed -e "s:groundhog-1.4/::" -i \
-		debian/patches/sv.po.patch || die
-	eapply \
-		$(sed -e 's:^:debian/patches/:' debian/patches/series) \
-		"${FILESDIR}"/${P}-flags.patch
-	mv configure.in configure.ac || die
-	AT_M4DIR="m4" eautoreconf
-	sed -i 's:$(localedir):/usr/share/locale:' \
-		$(find . -name 'Makefile.in*') || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	doicon src/pixmaps/${PN}.xpm
-	make_desktop_entry ${PN} "Groundhog" /usr/share/pixmaps/${PN}.xpm
-}
diff --git a/games-puzzle/groundhog/metadata.xml b/games-puzzle/groundhog/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/groundhog/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gtetrinet-0.7.11-r3 b/games-puzzle/gtetrinet-0.7.11-r3
new file mode 100644
index 000000000000..960bff838bc8
--- /dev/null
+++ b/games-puzzle/gtetrinet-0.7.11-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tetrinet Clone for GNOME
+EAPI=5
+HOMEPAGE=http://gtetrinet.sourceforge.net/
+IUSE=nls ipv6 debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gtetrinet/0.7/gtetrinet-0.7.11.tar.bz2 mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5f776c0f0f85c8184d8ac2313114466d
diff --git a/games-puzzle/gtetrinet/Manifest b/games-puzzle/gtetrinet/Manifest
deleted file mode 100644
index 25002f45de62..000000000000
--- a/games-puzzle/gtetrinet/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gtetrinet-0.7.11-desktopfile.patch 706 BLAKE2B 612988eb68f8bb1c8529ae7dfce1f9fb043887dc14e9729c26cfa8c3ea4216a82b464f676c7af0ecf1465b850311a21983876f7025c51640e5cfe8ec8bcd1b66 SHA512 d12b4f302388b3620ed77254916d3e3845b3da4bc3d1fc5b1c10c370e46088aea1a11603a8ce5ec844be5bf1026120d6b627170f4a09df663c5b579fe7ba937a
-AUX gtetrinet-0.7.11-format-security.patch 681 BLAKE2B ac89cac24dea4a350a0e79eb577bd288cbc371817023b516c2b66f02fc488798bf285265ae9dec9aaadad442a4e38bdf84a9c0b508bbee30768734195eb72573 SHA512 1f3236da7320249c6d8969a73d2d9f50c4dce68525e563958b52c3cfae5bd2c4fa0fda44960acce6bb9326a4b75560c60ab605aadce3b28d770c44c971209406
-AUX gtetrinet-0.7.11-noesd.patch 4007 BLAKE2B 446c6b3aa133ed29d96ff9735498575c32dc73e5eed750915c4409f7255a39441edd8b7af866fef8781aaf92dbea67b376e019f2826852c8ae9eca2e5c93cd5b SHA512 7674d4d54e4c4b0172e14c02036e88d08f8ebb7745ca7c34fff60dd1b2a46f54568fd89c77c19df12bce74296919bd5c6a7bd48a5ca4a427c6cc04d90384bfcc
-DIST gtetrinet-0.7.11.tar.bz2 416744 BLAKE2B f3bb72b307066e1af41de5c1483fa5b9c88377a3f70924520bc1e36206ad7b75c233d5fb10c0398aac4ed228d8cac6f26a1acaaf97c27858f1c24e4d0aebc4aa SHA512 5de7df7647ed9f7c0b6aba4eac976c625b7632eb5ab8034b11ef09aeb4582f90b4f9fc1791dc5371e1067d59c90b792a70276c69b75ebd6dc8c74c96c47c7130
-DIST gtetrinet-gentoo-theme-0.1.tbz2 88240 BLAKE2B 60ead98512ddd812cf1f95f041479f9dad9e7e0f3a55931779382b95fc7aada11498b6517cbd425547d3d46281bb6ec982325b0ad361ef339daa321d45a6ffe8 SHA512 6834ed4d70d94d94c201c5fa76d670ed21e4451ad18b1f41292c69e8ba18f56198898bb9d0c90343e28fa05a53e2e92536aa07fad747d4321d2e67c638d7ab8d
-EBUILD gtetrinet-0.7.11-r3.ebuild 1233 BLAKE2B d2aa1906d70f9f501111068f46bda8be474980e762499fc21243a7ec42f084ff03142e4a4ba23d64bcbb4450344471574e41e8e16b3275eb3e7b4b59a32e9947 SHA512 7613d3054033d08043be560a025509e79bd51fcbd6d86d359f732963744eb6a755c749dd1e3d12f9bde6789a84efeb24b65b83de3ebf194ac13b7dbc0ba997d2
-MISC metadata.xml 923 BLAKE2B ed221250cd92620c983bdc77af5ec64483ae5cb34ca9c63d6d4445051a7766e104df6b8a2e48e0ae355cd01698807c3f1ef6aa59c8efc5803664d9f1ab33f323 SHA512 81b70c3f4973cd7664a064df27fbcfb8af1f2aa748b269c68d62d3def6f2aee829a0c965b6b93aca51176f60fc34cb170cc20984d5b3b2e1beeb26206fee4e9b
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch
deleted file mode 100644
index 9bf7c2e506db..000000000000
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-desktopfile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Nov 30 20:02:03 UTC 2012
-Subject: desktop file
-
-	fix desktop file according to fd.o spec
-
---- gtetrinet.desktop
-+++ gtetrinet.desktop
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=GTetrinet
- Name[am]=GTetrinet
- Name[bg]=GTetrinet
-@@ -99,11 +98,11 @@
- Comment[zh_HK]=Tetrinet 的 GNOME 客戶端程式
- Comment[zh_TW]=Tetrinet 的 GNOME 客戶端程式
- Exec=gtetrinet
--Icon=gtetrinet.png
-+Icon=gtetrinet
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Game;BlocksGame;
-+Categories=GNOME;Game;BlocksGame;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gtetrinet
- X-GNOME-Bugzilla-Component=general
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
deleted file mode 100644
index 59389a18f7c5..000000000000
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-format-security.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Jordi Mallach <jordi@debian.org>
-Description: Fix build when using -Werror=format-security, now default
- on Debian.
-Status: committed-upstream
-
---- gtetrinet-0.7.11.orig/src/tetrinet.c
-+++ gtetrinet-0.7.11/src/tetrinet.c
-@@ -232,7 +232,7 @@
-             dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                              GTK_MESSAGE_ERROR,
-                                              GTK_BUTTONS_OK,
--                                             buf);
-+                                             "%s", buf);
-             gtk_dialog_run (GTK_DIALOG(dialog));
-             gtk_widget_destroy (dialog);
-             g_free (data_utf8);
diff --git a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch b/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
deleted file mode 100644
index b49758401298..000000000000
--- a/games-puzzle/gtetrinet/files/gtetrinet-0.7.11-noesd.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- gtetrinet-0.7.11/configure.in~	2006-11-15 17:02:36.000000000 +0000
-+++ gtetrinet-0.7.11/configure.in	2011-03-06 15:39:10.000000000 +0000
-@@ -30,7 +30,6 @@
- LIBGTK_REQUIRED=2.6.0
- LIBGNOME_REQUIRED=2.0.0
- LIBGNOMEUI_REQUIRED=2.0.0
--LIBESD_REQUIRED=0.2.36
- 
- dnl *****************************************
- dnl libgnome, libgnomeui needed for all utils
-@@ -40,21 +39,21 @@
- AC_SUBST(GTET_CFLAGS)
- AC_SUBST(GTET_LIBS)
- 
--dnl Check for libesd
--if pkg-config --exists esound ; then
--	have_esound=yes
-+dnl Check for libcanberra
-+if pkg-config --exists libcanberra ; then
-+	have_libcanberra=yes
- else 
--	have_esound=no
-+	have_libcanberra=no
- fi
- 
--if test "x$have_esound" = "xyes"; then
--AC_DEFINE(HAVE_ESD, 1, [Define this to enable EsounD support.])
--PKG_CHECK_MODULES(ESOUND, esound >= $LIBESD_REQUIRED)
--AC_SUBST(ESOUND_CFLAGS)
--AC_SUBST(ESOUND_LIBS)
-+if test "x$have_libcanberra" = "xyes"; then
-+AC_DEFINE(HAVE_LIBCANBERRA, 1, [Define this to enable libcanberra support.])
-+PKG_CHECK_MODULES(LIBCANBERRA, libcanberra)
-+AC_SUBST(LIBCANBERRA_CFLAGS)
-+AC_SUBST(LIBCANBERRA_LIBS)
- fi
- 
--AM_CONDITIONAL(HAVE_ESOUND, test "x$have_esound" = "xyes")
-+AM_CONDITIONAL(HAVE_LIBCANBERRA, test "x$have_libcanberra" = "xyes")
- 
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
---- gtetrinet-0.7.11/config.h.in~	2006-11-15 17:03:53.000000000 +0000
-+++ gtetrinet-0.7.11/config.h.in	2011-03-06 15:39:31.000000000 +0000
-@@ -15,8 +15,8 @@
- /* Define to 1 if you have the `dcgettext' function. */
- #undef HAVE_DCGETTEXT
- 
--/* Define this to enable EsounD support. */
--#undef HAVE_ESD
-+/* Define this to enable libcanberra support. */
-+#undef HAVE_LIBCANBERRA
- 
- /* Define if the GNU gettext() function is already present or preinstalled. */
- #undef HAVE_GETTEXT
---- gtetrinet-0.7.11/src/dialogs.c~	2006-11-03 12:49:49.000000000 +0000
-+++ gtetrinet-0.7.11/src/dialogs.c	2011-03-06 15:40:45.000000000 +0000
-@@ -1054,7 +1054,7 @@
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(soundcheck), soundenable);
-     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(midicheck), midienable);
- 
--#ifdef HAVE_ESD
-+#ifdef HAVE_LIBCANBERRA
-     if (midienable) prefdialog_midion ();
-     else prefdialog_midioff ();
-     if (soundenable) prefdialog_soundon ();
---- gtetrinet-0.7.11/src/sound.c~	2005-03-18 21:19:18.000000000 +0000
-+++ gtetrinet-0.7.11/src/sound.c	2011-03-06 15:47:24.000000000 +0000
-@@ -36,33 +36,36 @@
- char midifile[1024];
- char midicmd[1024];
- 
--#ifdef HAVE_ESD
-+#ifdef HAVE_LIBCANBERRA
- 
--#include <esd.h>
--#include <libgnome/gnome-sound.h>
-+#include <canberra.h>
- 
--static int soundsamples[S_NUM];
- static int midipid = 0;
-+static ca_context *ctx = 0;
- 
- void sound_cache (void)
- {
-     int i;
-     if (!soundenable) return;
-+    if (!ctx)
-+        ca_context_create(&ctx);
-+    if (ctx) {
-     for (i = 0; i < S_NUM; i ++) {
--        if (soundsamples[i])
--            esd_sample_free (gnome_sound_connection_get (), soundsamples[i]);
-         if (soundfiles[i][0])
--            soundsamples[i] = gnome_sound_sample_load (soundfiles[i], soundfiles[i]);
--        else
--            soundsamples[i] = 0;
-+                ca_context_cache(ctx,
-+                    CA_PROP_MEDIA_FILENAME, soundfiles[i],
-+                    NULL);
-+        }
-     }
- }
- 
- void sound_playsound (int id)
- {
--    if (!soundenable) return;
--    if (soundsamples[id] > 0)
--      esd_sample_play (gnome_sound_connection_get (), soundsamples[id]);
-+    if (!soundenable || !ctx) return;
-+    if (soundfiles[id][0])
-+        ca_context_play(ctx, 0,
-+            CA_PROP_MEDIA_FILENAME, soundfiles[id],
-+            NULL);
- }
- 
- void sound_playmidi (char *file)
---- gtetrinet-0.7.11/src/Makefile.am~	2006-11-03 16:20:08.000000000 +0000
-+++ gtetrinet-0.7.11/src/Makefile.am	2011-03-06 15:57:32.000000000 +0000
-@@ -7,8 +7,8 @@
- 	   -DGTETPIXMAPSDIR=\""$(datadir)/pixmaps/gtetrinet"\" \
- 	   $(GTET_CFLAGS)
- 
--if HAVE_ESOUND
--LDADD = $(GTET_LIBS) $(ESOUND_LIBS)
-+if HAVE_LIBCANBERRA
-+LDADD = $(GTET_LIBS) $(LIBCANBERRA_LIBS)
- else
- LDADD = $(GTET_LIBS)
- endif
diff --git a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild b/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
deleted file mode 100644
index 44052954303d..000000000000
--- a/games-puzzle/gtetrinet/gtetrinet-0.7.11-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Tetrinet Clone for GNOME"
-HOMEPAGE="http://gtetrinet.sourceforge.net/"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls ipv6"
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/libcanberra
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/libgnomeui-2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-noesd.patch
-	epatch "${FILESDIR}"/${P}-desktopfile.patch
-	epatch "${FILESDIR}"/${P}-format-security.patch
-	sed -i \
-		-e "/^pkgdatadir =/s:=.*:= ${GAMES_DATADIR}/${PN}:" \
-		src/Makefile.in themes/*/Makefile.in || die
-	sed -i \
-		-e '/^gamesdir/s:=.*:=@bindir@:' \
-		src/Makefile.am || die
-
-	rm -rf "${WORKDIR}"/gentoo/.xvpics || die # Remove cruft
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable ipv6)
-}
-
-src_install() {
-	gnome2_src_install
-	mv "${WORKDIR}"/gentoo "${ED}/usr/share/${PN}/themes/" || die
-}
diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml
deleted file mode 100644
index a29c0a42dfee..000000000000
--- a/games-puzzle/gtetrinet/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription>
-GTetrinet is a client program for the popular Tetrinet game, a 
-multiplayer tetris game that is played over the internet.
-
-Gee, Tetris?  Whats that?  Yeah, yeah, so it's been
-done 2 billion times before (give or take a few bil),
-but this is different!  Yes, all you tetris addicts
-out there be prepared for even MORE excitement..
-internet tetris!  Now you can play your five best
-buddies in one of the most well known games in
-existence!
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">gtetrinet</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/gtkballs-3.1.5-r2 b/games-puzzle/gtkballs-3.1.5-r2
new file mode 100644
index 000000000000..9c688f2f2a0f
--- /dev/null
+++ b/games-puzzle/gtkballs-3.1.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( >=sys-devel/gettext-0.10.38 )
+DESCRIPTION=An entertaining game based on the old DOS game lines
+EAPI=6
+HOMEPAGE=http://gtkballs.antex.ru/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://gtkballs.antex.ru/dist/gtkballs-3.1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=73c20bf967cb11593ef98ecc9a728a01
diff --git a/games-puzzle/gtkballs/Manifest b/games-puzzle/gtkballs/Manifest
deleted file mode 100644
index 7c768bd25574..000000000000
--- a/games-puzzle/gtkballs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtkballs-3.1.5.tar.gz 1176977 BLAKE2B b1da2eee3876df889cec576ce526d1f475b45b10aad40549bc36d710beb7e27b963719509818959bac884add72f0e91ae48e76745ab76c3d1e6063c780591067 SHA512 a22352a19368c3b957e6fbd21aea0b4636efd3042f4e6b1c44a40f946643eb89873b182fe35a8888111ca42277e69fccfe2e2b683e804358ad36f4feca235e8a
-EBUILD gtkballs-3.1.5-r2.ebuild 822 BLAKE2B c7ff0c7a44a6988346cf28ff6c1f5d70a194321aa9221407e232bd3266a62f8a89b02f78f646cc7a1e5ebdd5f00300558e5d587cfc9f876bf61edf7e54c61ea7 SHA512 cd1748adadf92e287a4da3cfe8ca87184d52b341d35604f0d72f75373dbbeccf8ebbcaee8c489ba39be71be4405b22412722a44664578d77953c9c15cc8b42c7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild b/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild
deleted file mode 100644
index eece76f8cc06..000000000000
--- a/games-puzzle/gtkballs/gtkballs-3.1.5-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="An entertaining game based on the old DOS game lines"
-HOMEPAGE="http://gtkballs.antex.ru/"
-SRC_URI="http://gtkballs.antex.ru/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( >=sys-devel/gettext-0.10.38 )
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^nlsdir=/s:=.*:=/usr/share/locale:' \
-		-e '/^localedir/s:=.*:=/usr/share/locale:' \
-		configure po/Makefile.in.in || die "sed locale failed"
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon gnome-gtkballs.png ${PN}.png
-	make_desktop_entry gtkballs "GTK Balls"
-}
diff --git a/games-puzzle/gtkballs/metadata.xml b/games-puzzle/gtkballs/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/gtkballs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/gweled-0.9.1-r2 b/games-puzzle/gweled-0.9.1-r2
new file mode 100644
index 000000000000..918885e47ec7
--- /dev/null
+++ b/games-puzzle/gweled-0.9.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Bejeweled clone game
+EAPI=6
+HOMEPAGE=http://www.gweled.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 media-libs/libmikmod gnome-base/librsvg:2
+SLOT=0
+SRC_URI=https://launchpad.net/gweled/trunk/0.9.1/+download/gweled-0.9.1.tar.gz
+_eclasses_=autotools	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_=1c9b35f160ff6c6abe81faf6ab5d394c
diff --git a/games-puzzle/gweled/Manifest b/games-puzzle/gweled/Manifest
deleted file mode 100644
index 5c80c135821e..000000000000
--- a/games-puzzle/gweled/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gweled-0.9.1-gentoo.patch 360 BLAKE2B a1e618e443d08693fe9cce4d263f1ba7095606f0af5a8504fef8eccbb5d46d3fc42792468263c36e26b448cafc487b92258422c2eb3d46c5ac3c83e7bd9b3a15 SHA512 38efa262f9144d64363d0724291d786545875c0e81fe2e537be456b9fbade2d3a29210e70c4680f28009f317dce9c907745259bc4bc6ded22b0acffb19cb4db4
-DIST gweled-0.9.1.tar.gz 403252 BLAKE2B 6a80e10fecc858a94d79deb7ad1a9dce0f5af36649bcb61c819816218fbcd72e70cdbfaa8915db13082a6274b75bd4c585c5f583f9f290bb95c2cb4468c4d2dd SHA512 12ac6f0033e9af037febca3ecc86f7531491498a38cdc36d7baf113fecece75da4a5b83f6c6e8f4fc6beebb24d479eac10087baa9effec4966cfcfb6c42df75a
-EBUILD gweled-0.9.1-r2.ebuild 696 BLAKE2B ce6a0c0215106eba80d0188bfc4e419cd0358f4ef44aef4bae606ea42e518d70690ff162d04523955f16458850eeae574c4625ce5934d1e28eeb832418052781 SHA512 538a19c85daf8808cee07785c427c272ed334ec85df64f63d023f2b13e4a79e3df8a7d61e42a37851bbcfbdf081519b17f8713b5c294f5952c6360ed7017c804
-MISC metadata.xml 327 BLAKE2B 7ffb95636156cb62206ed6ec1de127958d12d19ec71835683022f87da8943b715762871e930a678dd51bd3533fbf0ffacf4f9302c657d8a17ae4ddf59841d019 SHA512 cc3134245580e54c44dffa610e7910e4081dd175125bd4fad074eeeb119715f24698417dcc0683ae32e943d28cb79c5b82239648d1f70a00857fdba04b6804c4
diff --git a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch b/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
deleted file mode 100644
index fa5857492da3..000000000000
--- a/games-puzzle/gweled/files/gweled-0.9.1-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in.old	2014-06-03 09:21:52.868225743 +0200
-+++ b/configure.in	2014-06-03 09:22:06.604614448 +0200
-@@ -66,7 +66,7 @@
-     *) AC_MSG_ERROR([bad value ${enableval} for --disable-setgid]) ;;
-    esac],[setgid=true;enable_setgid=yes])
- 
--scoredir='${localstatedir}/games'
-+scoredir='${localstatedir}/gweled'
- scores_group=games
- scores_user=games
- 
diff --git a/games-puzzle/gweled/gweled-0.9.1-r2.ebuild b/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
deleted file mode 100644
index 0f88623656e1..000000000000
--- a/games-puzzle/gweled/gweled-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="Bejeweled clone game"
-HOMEPAGE="http://www.gweled.org/"
-SRC_URI="https://launchpad.net/gweled/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/gtk+:2
-	media-libs/libmikmod
-	gnome-base/librsvg:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -fomit-frame-pointer
-	append-ldflags -Wl,--export-dynamic
-
-	econf --disable-setgid
-}
diff --git a/games-puzzle/gweled/metadata.xml b/games-puzzle/gweled/metadata.xml
deleted file mode 100644
index 47048a2c35ed..000000000000
--- a/games-puzzle/gweled/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">gweled</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/hangman-0.9.2-r1 b/games-puzzle/hangman-0.9.2-r1
new file mode 100644
index 000000000000..3e542331318c
--- /dev/null
+++ b/games-puzzle/hangman-0.9.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf
+DESCRIPTION=The classic word guessing game
+EAPI=6
+HOMEPAGE=http://www.shiftygames.com/hangman/hangman.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!games-misc/bsd-games media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image media-libs/sdl-ttf sys-apps/miscfiles
+SLOT=0
+SRC_URI=http://www.shiftygames.com/hangman/hangman-0.9.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=ee3bcaf5cbb1c580b0fd4fdf851f1629
diff --git a/games-puzzle/hangman/Manifest b/games-puzzle/hangman/Manifest
deleted file mode 100644
index aa3651698e14..000000000000
--- a/games-puzzle/hangman/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hangman-0.9.2.tar.gz 1023712 BLAKE2B d9d12e02cb48fb80e0cf9c5f9dcb52f57e6305342b41443a791252701758c302bdbfb15dfefcfbbc7c4fc39fe1bfaccd961d1eb3d9a351f937c219ce98c26a26 SHA512 cbf940310b4821cf4de27a99a5228bccf42093a65ca83b0a2582556865ee5cea5a4ee2ebe08d2e02ac93f0cfc8d190b1f5427adbd74e7ddb57b90cee84f85d65
-EBUILD hangman-0.9.2-r1.ebuild 736 BLAKE2B df7383c6bc804a56b9af4df28c2c63bef82acded3ae43acf4f3362bea4ad413b918525987edd6dd16e667db4ddc80aa69291faf5b72d3e15a0b92ae7e35bff6e SHA512 8ed9ba6285e05d5b87a8b3f8613618630c65fcf832f6ce52962cce900d25135d314c4d89d5d53654ff9529c357bb68708a80cdb9be29ac0a50fd18236d378451
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild b/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
deleted file mode 100644
index abfc77ca017b..000000000000
--- a/games-puzzle/hangman/hangman-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="The classic word guessing game"
-HOMEPAGE="http://www.shiftygames.com/hangman/hangman.html"
-SRC_URI="http://www.shiftygames.com/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!games-misc/bsd-games
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}
-	sys-apps/miscfiles"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
-		src/hangman.c \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	newicon pics/noose.png ${PN}.png
-	make_desktop_entry ${PN} Hangman
-}
diff --git a/games-puzzle/hangman/metadata.xml b/games-puzzle/hangman/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/hangman/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/hexalate-1.1.3 b/games-puzzle/hexalate-1.1.3
new file mode 100644
index 000000000000..fc714f2d3235
--- /dev/null
+++ b/games-puzzle/hexalate-1.1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A color matching game
+EAPI=6
+HOMEPAGE=https://gottcode.org/hexalate/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://gottcode.org/hexalate/hexalate-1.1.3-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=68bc1a94ac4802ce7ea3804c8bfe1d74
diff --git a/games-puzzle/hexalate/Manifest b/games-puzzle/hexalate/Manifest
deleted file mode 100644
index 7d9c433b5fd0..000000000000
--- a/games-puzzle/hexalate/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hexalate-1.1.3-src.tar.bz2 798580 BLAKE2B 685a5fb106b9e4e33d63651059bc63b155c4b1afc1426506f8535b93c54bda1cbf8705244790fe130fe92e82bb6b7d9710c3aa8f245f0d578ddf09fa1e51551d SHA512 037dec9bb7b9dbc3cf3659e765c6e333dbbd0a94426e0b79c20695cf402cffb141c28c9ece4405281617dace7510b982180475c129648a871036be226e868bd6
-EBUILD hexalate-1.1.3.ebuild 640 BLAKE2B c2ff441c608e2880001395edf798962bae05bc3ba734358241e110722d573ee0dcfaf4b08da2c52e048501ed59efaca63e7fc4e13976ff4936c99f3dc46ebcc3 SHA512 29fc44d328d67558d0731cc7970abf0251b6a04433ade8a87e22cd430bd4d33d86da3d0aab001b85b1ae38fbb79a4dbc0ac59017cf670f3fbde7dc329b7242f7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hexalate/hexalate-1.1.3.ebuild b/games-puzzle/hexalate/hexalate-1.1.3.ebuild
deleted file mode 100644
index 23dec27a0760..000000000000
--- a/games-puzzle/hexalate/hexalate-1.1.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils qmake-utils
-
-DESCRIPTION="A color matching game"
-HOMEPAGE="https://gottcode.org/hexalate/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX="/usr"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/hexalate/metadata.xml b/games-puzzle/hexalate/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/hexalate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/hexamine-0.2.1-r1 b/games-puzzle/hexamine-0.2.1-r1
new file mode 100644
index 000000000000..b65368d90a50
--- /dev/null
+++ b/games-puzzle/hexamine-0.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Hexagonal Minesweeper
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/hexamine
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/hexamine/hexamine-0.2.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b3260ee21c0171f3448cf22c8a331325
diff --git a/games-puzzle/hexamine/Manifest b/games-puzzle/hexamine/Manifest
deleted file mode 100644
index ac8b8fd309e6..000000000000
--- a/games-puzzle/hexamine/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hexamine-0.2.1.tar.gz 130603 BLAKE2B e49b60e78346d59f5d0bf60f8aaa3f1230e87e6e76052c49197984df695cb4aacf947a2b5855f0388ed62f59fa04e47853f2c36583c38c9249100910eb5b5ff7 SHA512 eaf7c110f1c2434c2ea7bc01cc13266ed8e91cbbf0fff4ee8d8a78c549f9fd3f8d877210f574ba1cefad5a6ea230f376aab7d9ced6a4e2f477b6be776332a640
-EBUILD hexamine-0.2.1-r1.ebuild 807 BLAKE2B 43c3d0be8faf714bd021d6505b020eb75d337753005c78865f381716795fbdaac28e73436834cab63a1981bb2311028cb0b3b4e28b83188fff84d2ea8790a57f SHA512 cdcc4a822d89da500a130542bb2582db91d15159a457bc55e158ec326e27367aa0f2eb6ce1762b2047e4587b7157660b43bae6175c2fcd1fad40361d70550c06
-MISC metadata.xml 331 BLAKE2B f3ccbece9bcd1b9fe00383805f636401bb5b3bd10d2e1a2d5564182aebfe2a7e6614e3366ddf28e90ba5a62725d78dc08d1072c65c07ec3bc4ab5761bd2d2f39 SHA512 452f03abf92762a26c6492a3823b4fb3957abd627ec039daa73bb90c14079b71f0b79ce5af0548e3290c74275f5bf02ff264655cff6bb72a607e258a32e36bde
diff --git a/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild b/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild
deleted file mode 100644
index 67529d0521a4..000000000000
--- a/games-puzzle/hexamine/hexamine-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-single-r1
-
-DESCRIPTION="Hexagonal Minesweeper"
-HOMEPAGE="https://sourceforge.net/projects/hexamine"
-SRC_URI="mirror://sourceforge/hexamine/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame
-"
-DEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	# Modify game data directory
-	sed -i \
-		-e "s:\`dirname \$0\`:/usr/share/${PN}:" \
-		-e "s:\./hexamine:exec ${EPYTHON} &:" \
-		hexamine || die
-}
-
-src_install() {
-	dobin hexamine
-	insinto "/usr/share/${PN}"
-	doins -r hexamine.* skins
-	einstalldocs
-	make_desktop_entry ${PN} "Hexamine"
-}
diff --git a/games-puzzle/hexamine/metadata.xml b/games-puzzle/hexamine/metadata.xml
deleted file mode 100644
index eaf56d416367..000000000000
--- a/games-puzzle/hexamine/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">hexamine</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/hitori-3.22.4 b/games-puzzle/hitori-3.22.4
new file mode 100644
index 000000000000..8ee4d841b59b
--- /dev/null
+++ b/games-puzzle/hitori-3.22.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4 app-text/yelp-tools dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Logic puzzle game for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Hitori
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/cairo-1.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/hitori/3.22/hitori-3.22.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91f2e2365aaa4095c9e4dc73a08b6971
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
deleted file mode 100644
index 2594b1afcc2c..000000000000
--- a/games-puzzle/hitori/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hitori-3.22.4.tar.xz 471136 BLAKE2B e9581f9588ab307fba781b3907c1e5d5a34db462a9fa050cf6b2438efbae76ed74fc69623de28a2ec59c4340f487df68156dee453a314adab7cb6846edc347ef SHA512 8c75824d29918c096f3a33283dcb2e49e227c8259d37a4ae5e77d420d4a18a2760f789e12f32cfb8ffc16bfdf19e4aca26d93719d6b762c15b9ac4dbfca93e1a
-EBUILD hitori-3.22.4.ebuild 555 BLAKE2B 00ee8a59a0735d72bc6a4a5b4e005b9d272da3514044cd1501a05fec43b640a8835bf109237e27904727dabb5fda085baf891ce3603d0f37b26ad646fb8d1ac2 SHA512 5644692be1b2d64887746c951d85065832af2a36273f60619f29d159b527a2a7431c633c35e6fdcdb5b07c9ed2cb0cbdbb3182fe4058b766eef781b539960dc0
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/hitori/hitori-3.22.4.ebuild b/games-puzzle/hitori/hitori-3.22.4.ebuild
deleted file mode 100644
index aa2927ffbd30..000000000000
--- a/games-puzzle/hitori/hitori-3.22.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Logic puzzle game for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/cairo-1.4
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
diff --git a/games-puzzle/hitori/metadata.xml b/games-puzzle/hitori/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/hitori/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/hoh-bin-1.01 b/games-puzzle/hoh-bin-1.01
new file mode 100644
index 000000000000..10f92da80461
--- /dev/null
+++ b/games-puzzle/hoh-bin-1.01
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=PC remake of the spectrum game, Head Over Heels
+EAPI=5
+HOMEPAGE=http://retrospec.sgn.net/games/hoh/
+KEYWORDS=~amd64 ~x86
+LICENSE=free-noncomm
+RDEPEND=x11-libs/libX11[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-101.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=64632342aa5c63ddf28d255047695f19
diff --git a/games-puzzle/hoh-bin/Manifest b/games-puzzle/hoh-bin/Manifest
deleted file mode 100644
index e966c632f3c3..000000000000
--- a/games-puzzle/hoh-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hohlin-101.tar.bz2 14808528 BLAKE2B bfa0563f900f5bf7fdb05011baddd0fcc4c1f16eb30215f9db8b539e7c1b6f11e2c978a978c989732d832e309b3f61f0ee1ac4270c45c8c7d0e82f155d987004 SHA512 38f5815d9b2356c5d566d8b5b4730e1ed24192dfb5c3fcae9096b4a2c6110de60245b13da6bffc359032165d7fc0681a6adfa3503005c9281807c4734d519c0b
-EBUILD hoh-bin-1.01.ebuild 1083 BLAKE2B 45b2b531522742a77413a42fa305052660b3d400b53d5a05a8237141d00a554fcbadc02bf17eab83e4f114dd27dffbae3bdf1741efb65c2d73c82bfb7b2654a0 SHA512 a4bcd813fdfb8b9322e359389b7b1958c889881df7be9e4736e0f556ddb21ef7db664800bc9fbfc17cb7e37a1394eeac99d48f121b95f9e4397dafd0bc4f4e5b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild b/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
deleted file mode 100644
index ad681b47a18e..000000000000
--- a/games-puzzle/hoh-bin/hoh-bin-1.01.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="PC remake of the spectrum game, Head Over Heels"
-HOMEPAGE="http://retrospec.sgn.net/games/hoh/"
-SRC_URI="http://retrospec.sgn.net/download.php?id=63\&path=games/hoh/bin/hohlin-${PV/./}.tar.bz2"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="x11-libs/libX11[abi_x86_32(-)]"
-
-S=${WORKDIR}/hoh-install-${PV}
-
-# bug #448420
-QA_PREBUILT="
-/opt/HoH/data/runtime/libstdc++-libc6.2-2.so.3
-/opt/HoH/data/HoH
-"
-
-src_compile() {
-	cat > "${T}/hoh" <<-EOF
-		#!/bin/bash
-		export LD_LIBRARY_PATH="${GAMES_PREFIX_OPT}/HoH/data/runtime"
-		cd "${GAMES_PREFIX_OPT}/HoH/data"
-		exec ./HoH \$@
-EOF
-}
-
-src_install() {
-	local DATADIR="${GAMES_PREFIX_OPT}/HoH/data"
-	local DOCDIR="${GAMES_PREFIX_OPT}/HoH/docs"
-
-	dogamesbin "${T}/hoh"
-	dodir "${DATADIR}" "${DOCDIR}"
-	cp -pPRf data/* "${D}/${DATADIR}/" || die
-	cp -pPRf docs/* "${D}/${DOCDIR}/"  || die
-	make_desktop_entry hoh "Head Over Heels"
-	prepgamesdirs
-}
diff --git a/games-puzzle/hoh-bin/metadata.xml b/games-puzzle/hoh-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/hoh-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/icebreaker-1.9.6-r1 b/games-puzzle/icebreaker-1.9.6-r1
new file mode 100644
index 000000000000..edf071e6e041
--- /dev/null
+++ b/games-puzzle/icebreaker-1.9.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
+DESCRIPTION=Trap and capture penguins on Antarctica
+EAPI=6
+HOMEPAGE=http://www.mattdm.org/icebreaker/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer
+SLOT=0
+SRC_URI=http://www.mattdm.org/icebreaker/1.9.x/icebreaker-1.9.6.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=bb9cb78444bbc02e6ae914bf81ccd920
diff --git a/games-puzzle/icebreaker/Manifest b/games-puzzle/icebreaker/Manifest
deleted file mode 100644
index 886ec33ffad3..000000000000
--- a/games-puzzle/icebreaker/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX icebreaker-1.9.6-gentoo.patch 8599 BLAKE2B b572190c99b2d3d27cebf80751df57d6c80e36189d95e98c11987232ce630668d1158fa2bdb62d09e584a48d42e1cc1618cd607661809b4972e558ce796843a4 SHA512 36685c3a0534305d13385f88b259ece8befdeb1115c0e5958ec2edde5cb3502b213c4b7b2f39a8a2183bab94385b0c2e678346b4175f1a1aa057269b011a6a1c
-AUX icebreaker-1.9.6-ldflags.patch 874 BLAKE2B e888051b968e3139f21a4a912e8dbeb891d9c93bbe96d1a9ceb5a3d5690eb2ae4f74d7afe9aca3892011341d034f2648e41f8ee5bfc5d6ad392add8d3ea85457 SHA512 1c27aa4373744f3a5d59643d36a950aa50377b5ef26fec988754d66860dc3f262bb46e82e40cf4222abb000f0a7ab4aac03d9508e55536212fa5eb7d1a0f5e5f
-AUX icebreaker-1.9.6-ovfl.patch 699 BLAKE2B 9203cb2007abe94d6746512c1bdeca9a0163fda87c443ce9ca4b99a0a435d5553ed972ea368f7717912ec8c9c994f3471f14f187be336738dee6ee70de95c2f8 SHA512 49dae47f4f4d446fbdcb0f5faaa6ff01ecacd695d0af01e10f70001245680116e83aa78b2a9cb4fa80e0641e4cb02c5fc09c0fa87cc79207aa5c5d4dca5f0658
-AUX icebreaker-1.9.6-parallell-install.patch 1187 BLAKE2B 52c23882a6a1f6c265232effed850f34caebdbc8c63e15268e3f1a6fe42c604c5a9ca7d2c20eaee22c896733f7d77752ce7f75e30fdc49664954e302ea4034e5 SHA512 d315283c5e0605e4cddaebc1d891b72a86cd0e6f27693864896ac6557fd4c0f9e748e648b11ae8682d6d47ad9ff0f4c9d63fd4dde09e621886a70828001b8327
-DIST icebreaker-1.9.6.tgz 137333 BLAKE2B 3fdfde734f868493313a2a7b018582f79d6140fa71c1802a27b558d2973968eb9cc01efb55c0b5a45d95cd4d1bc94b66f74809a82853d6d8c0ce1b7bf767e362 SHA512 c3b085dc42d33757011d6d526016477312c5e1cbab4c5584c1e271a1e43b40d61ad1e7f0c96c8f41348550b2e198b3ee7bca65fbef90125dbfa32544cbdf357b
-EBUILD icebreaker-1.9.6-r1.ebuild 963 BLAKE2B 7e603e75245f247bc1f4f0312228891a585fbc791dfb09da804af15741c03ee66acbd7f991b36d4a190057c8216890eb6b22991c1aa3329b32ac0c5631f38e17 SHA512 2a65988b2199477a930771f03b0a2c215e6e7844c87ace0a2499358c9e8f0a0789c8db658f8963a4f93a82d87b021c0cb2324661163cb04322447ed0cf1e7e0b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
deleted file mode 100644
index 846d5b4141bc..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-gentoo.patch
+++ /dev/null
@@ -1,247 +0,0 @@
---- a/dialog.c
-+++ b/dialog.c
-@@ -279,10 +279,10 @@ PopupReturnType popuphighscores()
- 
- 	for (i=0;i<HISCORENUM;i++)
- 	{
--		snprintf(buf,4,"%d.",i+1);
-+		snprintf(buf,sizeof(buf),"%d.",i+1);
- 		puttext(scorelistrect.x+BLOCKWIDTH,scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,buf);		
- 		puttext(scorelistrect.x+BLOCKWIDTH*4,scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,hiscorename[i]);		
--		snprintf(buf,30,"%ld",hiscoreval[i]);		
-+		snprintf(buf,sizeof(buf),"%ld",hiscoreval[i]);		
- 		puttext(scorelistrect.x+scorelistrect.w-(BLOCKWIDTH*5),scorelistrect.y+45+i*(CHARHEIGHT*2+5),2,color.normaltext,buf);
- 	}
- 	
-@@ -364,7 +364,7 @@ PopupReturnType popuphelp()
- 	{
- 		puttext(helprect.x+BLOCKWIDTH/2,helprect.y+BLOCKHEIGHT/2+i*(CHARHEIGHT*2+4),2,color.normaltext,helptext[i]);		
- 	}
--	snprintf(buf,80,"v%d.%d.%d   %s",VERMAJOR,VERMINOR,VERSUB,"Copyright (c) 2000-2002 Matthew Miller. Released under the GPL.");
-+	snprintf(buf,sizeof(buf),"v%d.%d.%d   %s",VERMAJOR,VERMINOR,VERSUB,"Copyright (c) 2000-2002 Matthew Miller. Released under the GPL.");
- 	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*3,1,color.copyrighttext,buf);		
- 	puttext(helprect.x+BLOCKWIDTH/2,helprect.y+helprect.h-CHARHEIGHT*1-3,1,color.copyrighttext,"Thanks to my wonderful wife Karen for inspiration (and for patience)!");		
- 	
---- a/menu.c
-+++ b/menu.c
-@@ -193,12 +193,12 @@ PopupReturnType popupoptionsmenu()
- 
- 	if (strlen(commandline.theme)>0)
- 	{
--		snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",commandline.theme);
-+		snprintf(originaltheme,sizeof(originaltheme),"%s",commandline.theme);
- 		originalthemecl=true;
- 	}
- 	else
- 	{
--		snprintf(originaltheme,MAXTHEMENAMELENGTH+1,"%s",options.theme);
-+		snprintf(originaltheme,sizeof(originaltheme),"%s",options.theme);
- 		originalthemecl=false;	
- 	}
- 				
-@@ -521,7 +521,7 @@ PopupReturnType menuitem_theme(char * va
- 		if (((mbutton==1 || mbutton==4) && t==themecount-1) || ((mbutton!=1 && mbutton!=4) && t==0))
- 		{ // "random", at the end/beginning of the list
- 			
--			strncpy(val,"random",MAXMENUVALUELENGTH);
-+			strcpy(options.theme,"random");
- 			snprintf(options.theme,MAXMENUVALUELENGTH,"random");
- 			
- 			settheme("linux"); // just for pretty
-@@ -538,7 +538,7 @@ PopupReturnType menuitem_theme(char * va
- 			if (mbutton==1 || mbutton==4) // left click or scroll forwards
- 			{
- 				strncpy(val,themelist[(t+1)%themecount],MAXMENUVALUELENGTH);
--				snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t+1)%themecount]);
-+				snprintf(options.theme,sizeof(options.theme),"%s",themelist[(t+1)%themecount]);
- 			}
- 			else // right or middle or scroll back
- 			{
---- a/hiscore.c
-+++ b/hiscore.c
-@@ -72,7 +72,7 @@
- 	// make sure all entries are zeroed out to start.
- 	for (i=0;i<HISCORENUM;i++)
- 	{
--		snprintf(temphiscorename[i],7,"Nobody");
-+		strcpy(temphiscorename[i],"Nobody");
- 		temphiscoreval[i]=100; //100 is better than 0. :)
- 	}
- 
-@@ -103,7 +103,7 @@
- 	// ok, so now, we can copy things over in the proper sorted order
- 	for (i=0;i<HISCORENUM;i++)
- 	{
--		snprintf(hiscorename[i],50,temphiscorename[arrayindex[i]]);
-+		snprintf(hiscorename[i],50,"%s",temphiscorename[arrayindex[i]]);
- 		hiscoreval[i]=temphiscoreval[arrayindex[i]];
- 	}
- 
-@@ -201,13 +201,13 @@
- 	// make sure the temp array contains the right data
- 	for (i=0;i<HISCORENUM;i++)
- 	{
--		snprintf(temphiscorename[i],50,hiname[i]);
-+		snprintf(temphiscorename[i],50,"%s",hiname[i]);
- 		temphiscoreval[i]=hival[i];
- 	}
- 	
- 	// and toss in the new data 
- 	//(this is why these arrays are size HISCORENUM+1)
--	snprintf(temphiscorename[HISCORENUM],50,username);
-+	snprintf(temphiscorename[HISCORENUM],50,"%s",username);
- 	temphiscoreval[HISCORENUM]=score;
- 
- 	// fill the "helper" array. 
-@@ -221,7 +221,7 @@
- 	// and take the top ones back.
- 	for (i=0;i<HISCORENUM;i++)
- 	{
--		snprintf(hiname[i],50,temphiscorename[arrayindex[i]]); 
-+		snprintf(hiname[i],50,"%s",temphiscorename[arrayindex[i]]); 
- 		hival[i]=temphiscoreval[arrayindex[i]];
- 	}
- }
---- a/line.c
-+++ b/line.c
-@@ -30,8 +30,9 @@
- 
- Line createline(int linenum)
- {
--	Line l;
-+	static Line l;
- 
-+	memset(&l, 0, sizeof(l));
- 	switch (linenum)
- 	{
- 		case 1: 
---- a/options.c
-+++ b/options.c
-@@ -66,7 +66,7 @@
- 	options.autopause=AUTOPAUSEOFF;	
- 	options.difficulty=NORMAL;
- 	options.fullscreen=FULLSCREENOFF;
--	snprintf(options.theme,MAXTHEMENAMELENGTH+1,"linux");
-+	strcpy(options.theme,"linux");
- }
- 
- int readoptions(void)
-@@ -81,7 +81,7 @@
- 
- 	setdefaultoptions();
- 	
--	snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
-+	snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
- 	
- 	optionfile=fopen(filename,"r");
- 	if (optionfile==NULL)
-@@ -135,7 +135,7 @@
- 			}
- 			else if (!strcmp(optbuf,"theme"))
- 			{
--				snprintf(options.theme,MAXTHEMENAMELENGTH+1,"%s",valbuf);
-+				snprintf(options.theme,sizeof(options.theme),"%s",valbuf);
- 			}
- 			// FIX: add username
- 		}
-@@ -150,7 +150,7 @@
- {
- 	FILE * optionfile;
- 	char filename[255];
--	snprintf(filename,255,"%s/%s",homedir,OPTIONFILE);
-+	snprintf(filename,sizeof(filename),"%s/%s",homedir,OPTIONFILE);
- 	
- 	optionfile=fopen(filename,"w");
- 	if (optionfile==NULL)
-@@ -292,7 +292,7 @@
- 			else
- 			{
- 				// fix -- we should probably search for malicious characters here.
--				snprintf(commandline.theme,MAXTHEMENAMELENGTH+1,"%s",argv[i]+strlen(FLAGTHEME));
-+				snprintf(commandline.theme,sizeof(commandline.theme),"%s",argv[i]+strlen(FLAGTHEME));
- 			}	
- 		}
- 		else if (strncmp(argv[i],FLAGTHEMELONG "=" ,strlen(FLAGTHEMELONG "=")) == 0)
-@@ -312,7 +312,7 @@
- 			else
- 			{
- 				// fix -- we should probably search for malicious characters here.
--				snprintf(commandline.theme,MAXTHEMENAMELENGTH+1,"%s",argv[i]+strlen(FLAGTHEMELONG "="));
-+				snprintf(commandline.theme,sizeof(commandline.theme),"%s",argv[i]+strlen(FLAGTHEMELONG "="));
- 			}	
- 		}
- 		else if (strncmp(argv[i],FLAGTHEMELONG,strlen(FLAGTHEMELONG)) == 0)
---- a/penguin.c
-+++ b/penguin.c
-@@ -40,8 +40,9 @@
- 
- Penguin createpenguinxy(int x, int y)
- {
--	Penguin p;
-+	static Penguin p;
- 
-+	memset(&p, 0, sizeof(p));
- 	switch (random() % 4)
- 	{
- 		case 0:
---- a/themes.c
-+++ b/themes.c
-@@ -183,7 +183,7 @@
- 
- 	foundcolor.spritetransparent = 0;
- 	
--	snprintf(themefilename, 256,"%s/%s%s",DATAPREFIX,themename,THEMEFILEEXTENSION);
-+	snprintf(themefilename, sizeof(themefilename),"%s/%s%s",DATAPREFIX,themename,THEMEFILEEXTENSION);
- 	
- 	themefile=fopen(themefilename,"r");
- 	if (themefile==NULL)
-@@ -329,7 +329,7 @@
- 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- 						               "(Filename is %s)\n",themename,valbuf);
- 					}
--					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- 					spriteimage=loadsprite(themename,loadfilebuf);
- 				}
- 				else if (!strcmp(optbuf,"spritemirrorbitmap"))
-@@ -340,7 +340,7 @@
- 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- 						               "(Filename is %s)\n",themename,valbuf);
- 					}
--					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- 					spritemirrorimage=loadsprite(themename,loadfilebuf);
- 				}
- 				else if (!strcmp(optbuf,"soundouch"))
-@@ -351,7 +351,7 @@
- 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- 						               "(Filename is %s)\n",themename,valbuf);
- 					}
--					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- 					loadsounds(themename,loadfilebuf,NULL);
- 				}
- 				else if (!strcmp(optbuf,"soundcrash"))
-@@ -362,7 +362,7 @@
- 						               "We'll try to load it anyway, but don't be surpised if there's a problem.\n"
- 						               "(Filename is %s)\n",themename,valbuf);
- 					}
--					snprintf(loadfilebuf, 256,"%s/%s",DATAPREFIX,valbuf);
-+					snprintf(loadfilebuf, sizeof(loadfilebuf),"%s/%s",DATAPREFIX,valbuf);
- 					loadsounds(themename,NULL,loadfilebuf);
- 				}
- 			}
-@@ -474,11 +474,11 @@
- 	{
- 		fprintf(stderr,"Hey! You can't have a theme named random! Please remove the random.ibt\n"
- 		        "file from your themes directory.\n");
--		snprintf(themename,MAXTHEMENAMELENGTH+1,"linux");
-+		strcpy(themename,"linux");
- 	}
- 	else
- 	{
--		snprintf(themename,MAXTHEMENAMELENGTH+1,themelist[random() %themecount]);
-+		snprintf(themename,sizeof(themename),"%s",themelist[random() %themecount]);
- 	}
- 	freethemenames(&themelist,themecount);
- 	return settheme(themename);
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
deleted file mode 100644
index 93b40fc67687..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.orig	2010-10-11 12:20:01.274684641 -0400
-+++ b/Makefile	2010-10-11 12:22:02.256897083 -0400
-@@ -1,5 +1,3 @@
--CC=gcc
--
- SDLCONFIG=sdl-config
- 
- ifndef prefix
-@@ -177,7 +175,7 @@
- 	[ -d win32.build ] && rm -rf win32.build || true
- 
- icebreaker:	$(SRC:.c=.o)
--	$(CC) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
-+	$(CC) $(LDFLAGS) $(CFLAGS) $^ -o icebreaker $(SDL_LIB)
- 
- man: icebreaker.6
- 
-@@ -202,8 +200,8 @@
- 	install -m 644 *.wav *.bmp $(datadir)/icebreaker
- 
- install-bin: icebreaker
--	install -s -g games -m 2755 icebreaker $(bindir) || \
--	  install -s -m 755 icebreaker $(bindir)
-+	install -g games -m 2755 icebreaker $(bindir) || \
-+	  install -m 755 icebreaker $(bindir)
- 	@test -g $(bindir)/icebreaker || \
- 	  echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
- 
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
deleted file mode 100644
index 5e8ffc01d8d2..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-ovfl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/menu.c.old	2013-06-24 22:09:11.606750080 +0200
-+++ b/menu.c	2013-06-24 22:25:51.635735351 +0200
-@@ -522,7 +522,7 @@
- 		{ // "random", at the end/beginning of the list
- 			
- 			strcpy(options.theme,"random");
--			snprintf(options.theme,MAXMENUVALUELENGTH,"random");
-+			snprintf(options.theme,MAXTHEMENAMELENGTH,"random");
- 			
- 			settheme("linux"); // just for pretty
- 			
-@@ -544,7 +544,7 @@
- 			{
- 				if (t<0) t=themecount;
- 				strncpy(val,themelist[(t-1)%themecount],MAXMENUVALUELENGTH);
--				snprintf(options.theme,MAXMENUVALUELENGTH,themelist[(t-1)%themecount]);
-+				snprintf(options.theme,MAXTHEMENAMELENGTH,"%s",themelist[(t-1)%themecount]);
- 			}
- 			
- 			settheme(options.theme);
diff --git a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch b/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
deleted file mode 100644
index 419262791d98..000000000000
--- a/games-puzzle/icebreaker/files/icebreaker-1.9.6-parallell-install.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/Makefile.old	2010-10-19 10:26:18.000000000 +0200
-+++ b/Makefile	2010-10-19 10:38:28.000000000 +0200
-@@ -196,26 +196,30 @@
- themes-install: install-themes
- 
- install-themes:
-+	mkdir -p $(datadir)/icebreaker
- 	install -m 644 *.ibt $(datadir)/icebreaker
- 	install -m 644 *.wav *.bmp $(datadir)/icebreaker
- 
- install-bin: icebreaker
-+	mkdir -p $(bindir)
- 	install -g games -m 2755 icebreaker $(bindir) || \
- 	  install -m 755 icebreaker $(bindir)
- 	@test -g $(bindir)/icebreaker || \
- 	  echo -e '*** Note: icebreaker binary not installed set-group-ID "games" -- shared\n*** highscores may be impossible. (Try installing as root.)'
- 
- install-man: icebreaker.6
-+	mkdir -p $(mandir)/man6
- 	install -m 644 icebreaker.6 $(mandir)/man6
- 
- install-scorefile:
-+	mkdir -p $(highscoredir)
- 	touch $(highscoredir)/icebreaker.scores
- 	chown -f games:games $(highscoredir)/icebreaker.scores && \
- 	chmod 664 $(highscoredir)/icebreaker.scores || \
- 	chmod 644 $(highscoredir)/icebreaker.scores
- 
- 
--install: all install-mkdirs install-themes install-bin install-man install-scorefile
-+install: install-themes install-bin install-man install-scorefile
- 
- %.d: %.c
- 	set -e; $(CC) -M $(CFLAGS) $< \
diff --git a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild b/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
deleted file mode 100644
index f064951fac68..000000000000
--- a/games-puzzle/icebreaker/icebreaker-1.9.6-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Trap and capture penguins on Antarctica"
-HOMEPAGE="http://www.mattdm.org/icebreaker/"
-SRC_URI="http://www.mattdm.org/${PN}/1.9.x/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-parallell-install.patch
-	"${FILESDIR}"/${P}-ovfl.patch
-)
-
-src_compile() {
-	emake \
-		OPTIMIZE="${CFLAGS}" \
-		prefix=/usr \
-		bindir=/usr/bin \
-		datadir=/usr/share \
-		highscoredir="/var"
-}
-
-src_install() {
-	emake \
-		prefix="${D}/usr" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share" \
-		highscoredir="${D}/var" install
-
-	newicon ${PN}_48.bmp ${PN}.bmp
-	make_desktop_entry ${PN} IceBreaker /usr/share/pixmaps/${PN}.bmp
-	einstalldocs
-}
diff --git a/games-puzzle/icebreaker/metadata.xml b/games-puzzle/icebreaker/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/icebreaker/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/jools-0.20-r3 b/games-puzzle/jools-0.20-r3
new file mode 100644
index 000000000000..375c6865e148
--- /dev/null
+++ b/games-puzzle/jools-0.20-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=clone of Bejeweled, a popular pattern-matching game
+EAPI=6
+HOMEPAGE=http://pessimization.com/software/jools/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://pessimization.com/software/jools/jools-0.20.tar.gz http://pessimization.com/software/jools/jools-musicpack-1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3ea436543d2e76a9a781d8e2090a843
diff --git a/games-puzzle/jools/Manifest b/games-puzzle/jools/Manifest
deleted file mode 100644
index b082e4e04e8a..000000000000
--- a/games-puzzle/jools/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST jools-0.20.tar.gz 1710143 BLAKE2B 715c8be3e1e223cc5e8b8e6a0dfb0655c25bdd713bf5df678482063a6f68178449354f984b2ef0e52268379936e217786d0be7952ac2083f936d9bfe3551eca3 SHA512 11eadceb8208a72846a9e16a2dae0a1b1d7f8995d5ff2487ee03dd62811f3a232c0d08dc044c351f44c120e6e75eba11df1a727a9d5c6c57ce5e2ef8ee4d0986
-DIST jools-musicpack-1.0.tar.gz 4447501 BLAKE2B 2786a30d8a6cd09a05f1d13963b2c5f232b8d7c7c94bf83a5dc13979fc62349b9385bac1f08c2288e73134e38f78ef9bd48d84b4849f22c9ac791059be3b721b SHA512 1773beb8cd7df756cb4f7ba55729a6dfa995ca860f3381e2fed3884f42227d19955e13f8be9b2f6f64d4d86e452be9fe876963e24c85cd2c3cc42df62804b9c2
-EBUILD jools-0.20-r3.ebuild 1242 BLAKE2B c0db451dc3fad43264e5212de8ef3db07af83d4b939ba5c387fe8aa76aaedc0dda3af9b6681f86862794aa27c6c44fb286169fb90fcfd1a26a64eaec1137481d SHA512 578d076e12e0e71e9873b90bf0b5edfb9cf5e1beeb227ebd0238a40ec4bb7cb23d78b8395da9753d21690a44a5a6d584564be71ae37c1446175d33276276fd4c
-MISC metadata.xml 671 BLAKE2B 3d2b8089c8988076718719b26c9e0678ee0197297e72653baf5011a6a45a65bf210e0dababf5a17a254858af8c73155fad6d5cdde684c71169c76338e5630f9a SHA512 928c0217e8ef9222cee84694ef0da21cb7fa50bc190361979c4eb44e01081b49e805e441128baddfb13269b7a8f02f991cc4cb08b253cc1a475859d393f786c6
diff --git a/games-puzzle/jools/jools-0.20-r3.ebuild b/games-puzzle/jools/jools-0.20-r3.ebuild
deleted file mode 100644
index e70ad0267d87..000000000000
--- a/games-puzzle/jools/jools-0.20-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-MUS_P="${PN}-musicpack-1.0"
-DESCRIPTION="clone of Bejeweled, a popular pattern-matching game"
-HOMEPAGE="http://pessimization.com/software/jools/"
-SRC_URI="http://pessimization.com/software/jools/${P}.tar.gz
-	 http://pessimization.com/software/jools/${MUS_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/jools"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}"/music
-	unpack ${MUS_P}.tar.gz
-}
-
-src_prepare() {
-	default
-	echo "MEDIAROOT = \"/usr/share/${PN}\"" > config.py
-	python_fix_shebang .
-}
-
-src_install() {
-	make_wrapper ${PN} "${EPYTHON} ./__init__.py" /usr/"$(get_libdir)"/${PN}
-	insinto /usr/"$(get_libdir)"/${PN}
-	doins *.py
-	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
-
-	insinto /usr/share/${PN}
-	doins -r fonts images music sounds
-
-	newicon images/ruby/0001.png ${PN}.png
-	make_desktop_entry ${PN} Jools
-
-	dodoc ../{ChangeLog,doc/{POINTS,TODO}}
-	HTML_DOCS="../doc/manual.html" einstalldocs
-}
diff --git a/games-puzzle/jools/metadata.xml b/games-puzzle/jools/metadata.xml
deleted file mode 100644
index 5e917c0945b8..000000000000
--- a/games-puzzle/jools/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Jools is a graphical puzzle game in the tradition of Tetris. It has begun as
-a clone of Bejeweled, which is currently available for Windows, Mac, and
-Palm/Pocket PC devices.  In a nutshell, the goal is to swap adjacent jools
-(jewels) within a grid, in order to create rows of three or more of a kind.
-These jools will then disappear, and more will fall to fill their places.
-</longdescription>
-</pkgmetadata>
diff --git a/games-puzzle/ksokoban-0.5.0_pre20170827 b/games-puzzle/ksokoban-0.5.0_pre20170827
new file mode 100644
index 000000000000..afc68a9da95a
--- /dev/null
+++ b/games-puzzle/ksokoban-0.5.0_pre20170827
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=The japanese warehouse keeper game
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/ksokoban.git
+IUSE=debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=0
+SRC_URI=https://github.com/KDE/ksokoban/archive/048b42324ef6dac807af4351174065cda2f32f44.tar.gz -> ksokoban-0.5.0_pre20170827.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a0641f5c81a35102f210b8c1bc6e0492
diff --git a/games-puzzle/ksokoban-9999 b/games-puzzle/ksokoban-9999
new file mode 100644
index 000000000000..db06705a8185
--- /dev/null
+++ b/games-puzzle/ksokoban-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
+DESCRIPTION=The japanese warehouse keeper game
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/ksokoban.git
+IUSE=debug +handbook
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0 >=kde-frameworks/kconfig-5.46.0 >=kde-frameworks/kcoreaddons-5.46.0 >=kde-frameworks/ki18n-5.46.0 >=kde-frameworks/kiconthemes-5.46.0 >=kde-frameworks/kio-5.46.0 >=kde-frameworks/kwidgetsaddons-5.46.0 >=kde-frameworks/kxmlgui-5.46.0 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0cad6e6b2cf80cfe9e8f451bb3b0105c
diff --git a/games-puzzle/ksokoban/Manifest b/games-puzzle/ksokoban/Manifest
deleted file mode 100644
index 8b5f0165af45..000000000000
--- a/games-puzzle/ksokoban/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ksokoban-0.5.0_pre20170827.tar.gz 433276 BLAKE2B b29624ea0bae724b798ebb88aaca0623c9912b6d0155f7bcfc945dc76d5b0ace51f36b9991b2e6314d4f0f9c12fe3892bc1eda56789a2eefa9263d1048a61414 SHA512 50b650733c021fe95ea087fdfc6e354071b587156ddc38dc1ae571d893c555bf7405f7d089403d3af3b907a956a3d5dc7beecc9279c8c687b867ac813c796d31
-EBUILD ksokoban-0.5.0_pre20170827.ebuild 802 BLAKE2B 9f0e4c4d4f08cbfe12bcc93fa95ea0c9327d453128d2512d765e3cd3cac0f50e52b7ab9e5160ad75ad2e8a9a4838e554294c2ef497514ef9b58aba75239fd802 SHA512 a5406f5e8ed282f0b3f388b662ff8888f6b6075617980046b123c1a44ae15ca00ca04e652d6653d3e0b7b4cf570c9969b6880b2416084b64f94477258b0f7d9a
-EBUILD ksokoban-9999.ebuild 651 BLAKE2B 78797363b971c6310710b113bba4d191b0af5b309a947101c525a9dcb4b585f4eaad54c739094c8d21b3c8a2631a3fa97c2901aba82aed69a536813cc66d0a60 SHA512 3fc37f0460f2fe7539b343e2ece45d16d91847bfa086dbfcaae6409ed1438e1891d749d9d393adaf4e87492052e11890818c314989fdd736508e1b04b48d0133
-MISC metadata.xml 296 BLAKE2B 8abfdabec906c0024c978d0df7911b26d1df5c21269f78f6b327da8ae9a3955e0a091540741553cd9b805cdae52c09c713d868df83fa92c59e43b203d5db3219 SHA512 50facad52c9acec67642e499d377ccd05b7a18f578f0d71b6b8b222e6ac6a310b24913d9374bb9ba995fbc3cd55612f79ae562c8fe9ecd1e451d472505bd8e14
diff --git a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild b/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
deleted file mode 100644
index 109daa9faf8b..000000000000
--- a/games-puzzle/ksokoban/ksokoban-0.5.0_pre20170827.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=048b42324ef6dac807af4351174065cda2f32f44
-EGIT_BRANCH="port-to-kf5"
-KDE_HANDBOOK="optional"
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="The japanese warehouse keeper game"
-HOMEPAGE="https://cgit.kde.org/ksokoban.git"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/games-puzzle/ksokoban/ksokoban-9999.ebuild b/games-puzzle/ksokoban/ksokoban-9999.ebuild
deleted file mode 100644
index 632e47c6c561..000000000000
--- a/games-puzzle/ksokoban/ksokoban-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="port-to-kf5"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="The japanese warehouse keeper game"
-HOMEPAGE="https://cgit.kde.org/ksokoban.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-
-DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}"
diff --git a/games-puzzle/ksokoban/metadata.xml b/games-puzzle/ksokoban/metadata.xml
deleted file mode 100644
index 0328a782193f..000000000000
--- a/games-puzzle/ksokoban/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ksokoban</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/lightsoff-3.24.0 b/games-puzzle/lightsoff-3.24.0
new file mode 100644
index 000000000000..3908c13e7f13
--- /dev/null
+++ b/games-puzzle/lightsoff-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Turn off all the lights
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Lightsoff
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/librsvg-2.32:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5.5:1.0 >=x11-libs/gtk+-3.13.4:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ba7110f248914b90b4cf1047b839792
diff --git a/games-puzzle/lightsoff/Manifest b/games-puzzle/lightsoff/Manifest
deleted file mode 100644
index 43ddd5bb79e7..000000000000
--- a/games-puzzle/lightsoff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lightsoff-3.24.0.tar.xz 1943672 BLAKE2B fc6c8643e791a7b6e3e1183ea9678138d53aab5ba7234c4c6417b576dda571a741c3eeb8fab36ae5a00b25420fcc1269e412800a4a5c56efc16943905d6002f5 SHA512 ef036512b3c4e60b4419005864c3f6f4f9447af2e4d12fac1df7603f5837adf2cbe0f41f6089d3e683c3606d021d35e0cc41589938054988506aef3881936e6a
-EBUILD lightsoff-3.24.0.ebuild 660 BLAKE2B 4dbace47d031bc653108e807136c5541794358b6140a92ba5b5f9a8d2925599020fe1401828a2e1175d03311ee030a149c80ff8583457803ea7ce2a10e431886 SHA512 f7631fa627778f32c69cb79091b20f4fdf11e6fdfb771a81b0fdea79de7345ad3e5c48234f8532290b06729e9558eefb8c98ff08d187eda8446fc9e0a3ec95cd
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
deleted file mode 100644
index 065214d72703..000000000000
--- a/games-puzzle/lightsoff/lightsoff-3.24.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Turn off all the lights"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/librsvg-2.32:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5.5:1.0
-	>=x11-libs/gtk+-3.13.4:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/lightsoff/metadata.xml b/games-puzzle/lightsoff/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/lightsoff/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/lmarbles-1.0.8 b/games-puzzle/lmarbles-1.0.8
new file mode 100644
index 000000000000..24162999bb3e
--- /dev/null
+++ b/games-puzzle/lmarbles-1.0.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer >=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=puzzle game inspired by Atomix and written in SDL
+EAPI=5
+HOMEPAGE=http://lgames.sourceforge.net/LMarbles/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=64ee62039f2cdf38a00db38da312751b
diff --git a/games-puzzle/lmarbles/Manifest b/games-puzzle/lmarbles/Manifest
deleted file mode 100644
index b41a13fedce0..000000000000
--- a/games-puzzle/lmarbles/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lmarbles-1.0.8-gentoo.patch 560 BLAKE2B e4eb5153feb40d53ac831fc7f53e5673a49a546f9ee8b4020f8fabc9643661f78e74ed12756409598f2e25def084376cbab762dc534d0243270110fa48efaee6 SHA512 158a253d346fc5bec9eb8ecdd8541df04fdd9946bc2f59d7404e5ae08415a161079f38697ecfde2b22065708c8704b2fd9232f13872c394ab8274063166d0d41
-DIST lmarbles-1.0.8.tar.gz 914238 BLAKE2B 263f069cdd82d300bd5185152158912a3972bd38b9baf254fe89ba5afced151edbc95c199acb43c2db00c805cbcaf2b0d6a13f4ac5f2a91580b70f3aabd4cb6f SHA512 d765b669a1b0039a0af8b28ede8209e9736c2f967b21d9f8372d1fc5475d49a766bef297615bff090532ade41fe44e084a458227b443566a54afebc3e989b57a
-EBUILD lmarbles-1.0.8.ebuild 714 BLAKE2B 5cdfb7482198c8c1c03b77fb9f20d8a9ea5a8c46af804c06080d6da2a451c19685f169ede54b0a443693eb55e83ae6037f7bcae47b3a6b6676602c16b9cc8d87 SHA512 172643957b074d7b285b69c2e477493584e9fb2b57542f02a2d0accd32083c596dd746031b8b78302dec1d266c7bc799973c52f775a230e7fa7099d417bf1d7c
-MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch b/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
deleted file mode 100644
index 160b6d0f79d5..000000000000
--- a/games-puzzle/lmarbles/files/lmarbles-1.0.8-gentoo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru lmarbles-1.0.8.orig/Makefile.am lmarbles-1.0.8/Makefile.am
---- lmarbles-1.0.8.orig/Makefile.am	2009-10-26 16:01:08.000000000 -0400
-+++ lmarbles-1.0.8/Makefile.am	2009-11-07 13:23:55.994140203 -0500
-@@ -4,11 +4,6 @@
- README-SDL.txt TODO LMarbles.prj lmarbles32.gif lmarbles48.gif \
- lmarbles.desktop.in
- 
--desktopdir = $(datadir)/applications
--desktop_DATA = lmarbles.desktop
--icondir = $(datadir)/icons
--icon_DATA = lmarbles48.gif
--
- AUTOMAKE_OPTIONS = foreign
- 
- WIN32_TEXT = AUTHORS COPYING ChangeLog INSTALL README README-SDL.txt TODO marbles.spec
diff --git a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild b/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
deleted file mode 100644
index 59381278471a..000000000000
--- a/games-puzzle/lmarbles/lmarbles-1.0.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils games
-
-DESCRIPTION="puzzle game inspired by Atomix and written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/LMarbles/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv configure.{in,ac}
-	rm *.m4
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon lmarbles48.gif ${PN}.gif
-	make_desktop_entry lmarbles LMarbles /usr/share/pixmaps/${PN}.gif
-	dohtml src/manual/*
-	prepgamesdirs
-}
diff --git a/games-puzzle/lmarbles/metadata.xml b/games-puzzle/lmarbles/metadata.xml
deleted file mode 100644
index 2cbba7c09d17..000000000000
--- a/games-puzzle/lmarbles/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lgames</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/lpairs-1.0.4-r1 b/games-puzzle/lpairs-1.0.4-r1
new file mode 100644
index 000000000000..412f70c97ff6
--- /dev/null
+++ b/games-puzzle/lpairs-1.0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=A classical memory game
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LPairs/
+IUSE=nls sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound?,video] nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/lpairs-1.0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=779780f0046420930872d322047081d6
diff --git a/games-puzzle/lpairs/Manifest b/games-puzzle/lpairs/Manifest
deleted file mode 100644
index 21f4686caf6f..000000000000
--- a/games-puzzle/lpairs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lpairs-1.0.4.tar.gz 536625 BLAKE2B f020f50b47290b961d77335d567dd68bc009e0952e7ebd39d39c041fcc5a2d9e97d6827921b862dd3dd59c7bef0f11165356f41eda022d7583ca27f584e4b02b SHA512 637f9782c1c1faee3fe0d02adeeb7ea70704f1b625922e1ba086cd03e9a6cf1d61a082eff4753a2ec8be5fc7041bd029f193adf847a39e773e4eedd9eafb2b97
-EBUILD lpairs-1.0.4-r1.ebuild 939 BLAKE2B 93d2d8c38038efc7ceed0ca8a0554fa5489ca838591f2d36f918b4a54bfd3c6680f12332288b73f99d8d9c518a9e6632eb887c45b2d50fd710ed4b920b9399a2 SHA512 5ecf4fcbcdc5bd6487959c9fecc8027af2e60c01d7200072424ae3a212db96a59ae76984b23cf711456c65bb38abee596864d910d02607fe54eef88eab482fb2
-MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild b/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
deleted file mode 100644
index 0f13cdb89b69..000000000000
--- a/games-puzzle/lpairs/lpairs-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A classical memory game"
-HOMEPAGE="http://lgames.sourceforge.net/LPairs/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls sound"
-
-RDEPEND="
-	media-libs/libsdl[sound?,video]
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:$localedir:/usr/share/locale:' \
-		-e 's:$(localedir):/usr/share/locale:' \
-		configure po/Makefile.in.in || die
-	# gcc5 doesn't like the way inline is used.  just punt it. (bug #568684)
-	sed -i -e 's/^inline//g' lpairs/{sdl.[ch],pairs.[ch]} || die
-}
-
-src_configure() {
-	econf \
-		--datadir=/usr \
-		$(use_enable nls) \
-		$(usex sound '' --disable-sound)
-}
-
-src_install() {
-	default
-	doicon lpairs.png
-	make_desktop_entry lpairs LPairs
-}
diff --git a/games-puzzle/lpairs/metadata.xml b/games-puzzle/lpairs/metadata.xml
deleted file mode 100644
index 2cbba7c09d17..000000000000
--- a/games-puzzle/lpairs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lgames</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/ltris-1.0.19-r1 b/games-puzzle/ltris-1.0.19-r1
new file mode 100644
index 000000000000..e459462f9a12
--- /dev/null
+++ b/games-puzzle/ltris-1.0.19-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Very polished Tetris clone
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LTris/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/lgames/ltris-1.0.19.tar.gz
+_eclasses_=autotools	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_=343a241586ab5af9c0a7c1423fda32a6
diff --git a/games-puzzle/ltris/Manifest b/games-puzzle/ltris/Manifest
deleted file mode 100644
index 7c4903844dc4..000000000000
--- a/games-puzzle/ltris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ltris-1.0.19-gentoo.patch 1769 BLAKE2B e7e30abae3b5d6a0ce088476164ad084c37acd95014a44ada8fdb2dcd27eb9331037bc3160d7956abe081fd746cc4267f2d97b6b02a054729df12a577681f69c SHA512 c0040258b95252efba67cc9da7e598ee2c2cb92b97702b14487d6b0c796bf25022af05350459540a95caf84249b95245d80d5da4be09bff6670f15ca754505a6
-DIST ltris-1.0.19.tar.gz 883543 BLAKE2B c175f8e85377e66b446bc5060c0808a258a22258b72e0b1f48491e12272e4ca63eb69900308d522877407b9aeb231e3a0885c6ca3da010755666d8151c1b4f10 SHA512 ab43b3d8f04ab40016be5b5c414f8679bee4f5f344ef9cab52c3628d48017458b84b0fbc0bcaecdfab43853a1ef628ee1cabf3a1373ea108650d4e76015881c5
-EBUILD ltris-1.0.19-r1.ebuild 822 BLAKE2B db6f23c999eaeb776a37658d8e073239b7cae3b165a141264372593b8a50b04e0defad9549f71251bfc8fea18c3b481936ee1b742f1d740c8d126412bb42ffd2 SHA512 819deaabff7c0c303b34eb62fa24987d2d65e687b09b4c06fc538c8912d055855ff9afe6e0bdef7542e12b8c8413fbdeea8a89adb3304c832b8f4f33e5bebddb
-MISC metadata.xml 329 BLAKE2B bcb35c37e05c93388a83ec235e25d38fb4a37ecb7df64c38a00e6bc7959090297f2c0168d1d461b24a43d0991184f62690de6d483a1d610bc74810238181593d SHA512 2439299362958450ac88f39ba8332cb84d42694d471f79cf8a6b9d38ecc96fa629b91530dee7c50aa23fab5e5a0155cb92cb3a8131a1b69e9375f114da86b463
diff --git a/games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch b/games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch
deleted file mode 100644
index 82acee7d33bc..000000000000
--- a/games-puzzle/ltris/files/ltris-1.0.19-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -ru ltris-1.0.15.orig/Makefile.am ltris-1.0.15/Makefile.am
---- ltris-1.0.15.orig/Makefile.am	2010-09-20 13:26:05.000000000 -0400
-+++ ltris-1.0.15/Makefile.am	2010-09-21 02:01:52.680858712 -0400
-@@ -1,21 +1,9 @@
--SUBDIRS = intl m4 po src icons
-+SUBDIRS = intl m4 po src
- 
- EXTRA_DIST = config.rpath  AUTHORS COPYING ChangeLog INSTALL \
- README TODO touchall ABOUT-NLS po/tr.po_full po/pt.po_full \
--po/nonascii.pl ltris32.gif ltris48.gif ltris.desktop.in
--
--desktopdir = $(datadir)/applications
--desktop_DATA = ltris.desktop
--icondir = $(datadir)/icons
--icon_DATA = ltris48.gif
-+po/nonascii.pl
- 
- AUTOMAKE_OPTIONS = foreign
- 
--# We can't use static desktop file because of icon location. Is this 
--# the right way to handle it? At least it works... as long as $datadir
--# does not contain plus signs. :-)
--ltris.desktop:
--	@sed -e "s+Icon=+Icon=$(datadir)/icons/ltris48.gif+" \
--	< ltris.desktop.in > ltris.desktop
--
- ACLOCAL_AMFLAGS = -I m4
-diff -ru ltris-1.0.15.orig/configure.in ltris-1.0.15/configure.in
---- ltris-1.0.15.orig/configure.in	2010-09-20 13:23:17.000000000 -0400
-+++ ltris-1.0.15/configure.in	2010-09-21 02:02:22.418843746 -0400
-@@ -55,7 +55,7 @@
- AC_SUBST(buf_flag)
- 
- dnl set localedir
--localedir=$datadir/locale
-+localedir=/usr/share/locale
- locdir_flag="-DLOCALEDIR=\\\"$localedir\\\""
- 
- dnl installation path
-diff -ru ltris-1.0.15.orig/po/Makefile.in.in ltris-1.0.15/po/Makefile.in.in
---- ltris-1.0.15.orig/po/Makefile.in.in	2005-10-04 14:41:03.000000000 -0400
-+++ ltris-1.0.15/po/Makefile.in.in	2010-09-21 02:02:40.464207966 -0400
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/games-puzzle/ltris/ltris-1.0.19-r1.ebuild b/games-puzzle/ltris/ltris-1.0.19-r1.ebuild
deleted file mode 100644
index 9f3d02d2cc06..000000000000
--- a/games-puzzle/ltris/ltris-1.0.19-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="Very polished Tetris clone"
-HOMEPAGE="http://lgames.sourceforge.net/LTris/"
-SRC_URI="mirror://sourceforge/lgames/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	mv configure.in configure.ac || die
-	AT_M4DIR=m4 eautoreconf
-	append-cflags -std=gnu89 # build with gcc5 (bug #570966)
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-	newicon icons/ltris48.xpm ${PN}.xpm
-	make_desktop_entry ltris LTris
-}
diff --git a/games-puzzle/ltris/metadata.xml b/games-puzzle/ltris/metadata.xml
deleted file mode 100644
index 2cbba7c09d17..000000000000
--- a/games-puzzle/ltris/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lgames</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/magiccube4d-2.2-r1 b/games-puzzle/magiccube4d-2.2-r1
new file mode 100644
index 000000000000..ed2c6770d8b2
--- /dev/null
+++ b/games-puzzle/magiccube4d-2.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libXaw
+DESCRIPTION=Four-dimensional analog of Rubik's cube
+EAPI=6
+HOMEPAGE=http://www.superliminal.com/cube/cube.htm
+KEYWORDS=~amd64 ~x86
+LICENSE=free-noncomm
+RDEPEND=x11-libs/libXaw
+SLOT=0
+SRC_URI=http://www.superliminal.com/cube/mc4d-src-2_2.tgz http://superliminal.com/cube/cube_transp.gif -> magiccube4d.gif
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e214163ade0cde5381a80522bb08f8b2
diff --git a/games-puzzle/magiccube4d/Manifest b/games-puzzle/magiccube4d/Manifest
deleted file mode 100644
index 97074b4f57d1..000000000000
--- a/games-puzzle/magiccube4d/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX magiccube4d-2.2-64bit-ptr.patch 1406 BLAKE2B 7741efef6045568adfb19b9cf64191ff682969dbcc4b12fdbbe62c55a9f4a4ae87a1208ad56fbd9ae8c331a33a79cde2ad28296da2a72d0c54810d1e183334ed SHA512 eb684cca4f6f02903c71e970146f6c110d9634ce2f1416e64bdf258b85264c79eaaa9b869f05ddb116373d908f4d0d2675c87d275ab79f76b21f77c5ce1c1563
-AUX magiccube4d-2.2-gcc41.patch 885 BLAKE2B 42990103d195d793e1b10efa573179373202de3d798168b309c14e96a868a80171501d63993e0adff569c8f5a072c55f312431b2eb0deab9f0f9dbb88fef7489 SHA512 2ac9eed48b4598b006ce866c319075eb6b06e8119890db28a0a88d6c680949606d89f5aa113a946c565a4abae529d07d22c7def72dd17beb810ea2f555833d69
-AUX magiccube4d-2.2-ldflags.patch 501 BLAKE2B 2abc1cf4e4b9d210634fae3da618848d21b818d006d30d67a316e750f4e9c77bb2ab8097fc07a1a34aace7efb64f5b3845d8975aa65e7ed83de662eb2dff7968 SHA512 76183b674fa09d330edb82e3c72b605b992a6fe24273c55a45d819ad08854869a7a73ae2ab0d03c14cd872fb13fc0836b75c8d17e3828559bb49d0064caa41b6
-AUX magiccube4d-EventHandler.patch 429 BLAKE2B 7572ff178552f47fe12012f6d6a822a2e2d2d63115eb14fce6ecc8bf489a7ab3c04a7f028d7a514d8de9adca27e6032051b0930386e7d40db08378ad16690a4c SHA512 e11bc6d31a41dca68b450773f575ff1708426daf1f8750117de81592f7050cebe9ea61385e24bd09186d166d764b2d00351b203552eb9d1c2a10be03b3be4f03
-DIST magiccube4d.gif 20739 BLAKE2B feaf1911e483bff7244476000c75b34794911fe279772b8f5d46ee8bd4125881fb71aaab0ebac891fd0a5db38b746c940991bf5fe9e1ad8a678240b2d6cddf82 SHA512 7a8902710eaa78a6580f024a86bfa1828870dc873a4fef30a7d4fa197a67cd1dde162d6d1d1ba0bea4307c13198d52505fb1a1fa3f6d10b3914af42d7c0ebd49
-DIST mc4d-src-2_2.tgz 144645 BLAKE2B 5b29963d056961ce425f7644b14c35e44ce94bc7be6ea5f3fbbb4048478366951005eb8e91fe7cb12e6f1424ad55add31493e0ad3a4ab18eea9e747f940c35f3 SHA512 19491460bada93b4ee2010004128279cb88ab866a5a8c791080d59fa86e5bacf966d7dab0c9b3074e94b77611ae341480d19b384079e83df549ef25e592b12a6
-EBUILD magiccube4d-2.2-r1.ebuild 1028 BLAKE2B d8a43720dd54d430685c2ef90bb4425a764dab690af518c9ed524ba85b830604728f94735d6cf6a678edee6ddfea87d08fff6873e0a13b6b61c16dac8fd61dd9 SHA512 ffcb0d692bca7fb0684cb93f3d1d7eb809f2ddf20d196e6c949f5d4cbef5895ad7e3e5cbc1e63bcb7a778a74c9d4876595d14182c24a18c9f6884f720fce9d08
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
deleted file mode 100644
index 7fbd52871887..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-64bit-ptr.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Nru magiccube4d-src-2_2.orig/EventHandler.cpp magiccube4d-src-2_2/EventHandler.cpp
---- magiccube4d-src-2_2.orig/EventHandler.cpp	2007-09-30 12:01:46.503967712 +0200
-+++ magiccube4d-src-2_2/EventHandler.cpp	2007-09-30 12:03:23.489172011 +0200
-@@ -20,6 +20,7 @@
- #include <iostream>
- #include <unistd.h>
- #include <stdio.h>
-+#include <stdint.h>
- 
- #include "MagicCube.h"
- #include "Puzzlest.h"
-@@ -415,7 +416,7 @@
- void
- EventHandler::undo_cb(void* argp)
- {
--    int arg = (int) argp;
-+    int arg = (intptr_t) argp;
-     struct stickerspec grip;
-     int         dir;
-     int         slicesmask;
-@@ -461,7 +462,7 @@
- void
- EventHandler::redo_cb(void* argp)
- {
--    int arg = (int) argp;
-+    int arg = (intptr_t) argp;
-     struct stickerspec grip;
-     int         dir;
-     int         slicesmask;
-@@ -507,7 +508,7 @@
- void
- EventHandler::scramble_cb(void *arg = NULL)
- {
--    int n = (int)arg;
-+    int n = (intptr_t)arg;
-     struct stickerspec grip;
-     int i, previous_face = -1;
-     int ngrips = NFACES * 3 * 3 * 3;
-@@ -855,12 +856,12 @@
- void
- EventHandler::newPuzzle_cb(void* arg)
- {
--    if ((int)arg == preferences.getLength())
-+    if ((intptr_t)arg == preferences.getLength())
-     {
-         reset_cb(0);
-         return;
-     }
--    preferences.setLength((int)arg);
-+    preferences.setLength((intptr_t)arg);
-     int length = preferences.getLength();
- 
-     polymgr->reset(length);
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
deleted file mode 100644
index 8e2aaf2b5fcd..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/EventHandler.h.old	2006-05-19 22:11:48.000000000 +0200
-+++ b/EventHandler.h	2006-05-19 22:11:58.000000000 +0200
-@@ -165,7 +165,7 @@
- 
-     int  number_of_reference_stickers_needed;
-     int  (*reference_stickers_needed)[4];
--    void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg = NULL);
-+    void (EventHandler::*what_to_do_after_got_reference_stickers) (void *arg);
-     void* cur_ui_data;
- 
-     bool quick_mode;
---- a/Machine.h.old	2006-05-19 22:12:17.000000000 +0200
-+++ b/Machine.h	2006-05-19 22:12:29.000000000 +0200
-@@ -31,7 +31,7 @@
- {
- public:
-     typedef void (EventHandler::*event_handler)(EventHandler::Event*,
--                                                void *arg = 0);
-+                                                void *arg);
-     virtual ~Machine() {};
- 
-     static Machine* createMachine(EventHandler*, int& argc, char *argv[],
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch b/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
deleted file mode 100644
index 73d1b4a59dca..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-2.2-ldflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/Makefile.in.old	2010-10-15 10:38:48.000000000 +0200
-+++ b/Makefile.in	2010-10-15 10:39:07.000000000 +0200
-@@ -72,10 +72,10 @@
- 	$(CXX) -c $(CXXFLAGS) $<
- 
- $(TARGET): $(OBJS)
--	$(CXX) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LIBDIRS) $(LIBS)
- 
- $(TARGET).static: $(OBJS)
--	$(CXX) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
-+	$(CXX) $(LDFLAGS) -static -o $(TARGET).static $(OBJS) $(LIBDIRS) $(LIBS)
- 
- Vec.h: vec_h.c
- 	$(CC) -o vec_h vec_h.c
diff --git a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch b/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
deleted file mode 100644
index d242438d8d05..000000000000
--- a/games-puzzle/magiccube4d/files/magiccube4d-EventHandler.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/EventHandler.cpp.old	2004-11-04 22:58:13.735812448 +1100
-+++ b/EventHandler.cpp	2004-11-04 22:57:03.176539088 +1100
-@@ -326,7 +326,7 @@
-         number_of_reference_stickers_needed--;
-         reference_stickers_needed++;
-         if (number_of_reference_stickers_needed == 0)
--            (this->*what_to_do_after_got_reference_stickers)();
-+            (this->*what_to_do_after_got_reference_stickers)(NULL);
-     }
- }
- 
diff --git a/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild b/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
deleted file mode 100644
index 5f9eac856d8f..000000000000
--- a/games-puzzle/magiccube4d/magiccube4d-2.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_PV="${PV/./_}"
-DESCRIPTION="Four-dimensional analog of Rubik's cube"
-HOMEPAGE="http://www.superliminal.com/cube/cube.htm"
-SRC_URI="http://www.superliminal.com/cube/mc4d-src-${MY_PV}.tgz
-	http://superliminal.com/cube/cube_transp.gif -> ${PN}.gif"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-src-${MY_PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PN}-EventHandler.patch \
-		"${FILESDIR}/${P}"-gcc41.patch \
-		"${FILESDIR}/${P}"-64bit-ptr.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:-Werror::" \
-		configure \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake DFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin magiccube4d
-	dodoc ChangeLog MagicCube4D-unix.txt readme-unix.txt Intro.txt
-	doicon "${DISTDIR}"/${PN}.gif
-	make_desktop_entry ${PN} "Magic Cube 4D" /usr/share/pixmaps/${PN}.gif
-}
diff --git a/games-puzzle/magiccube4d/metadata.xml b/games-puzzle/magiccube4d/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/magiccube4d/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/meandmyshadow-0.4-r1 b/games-puzzle/meandmyshadow-0.4-r1
new file mode 100644
index 000000000000..0fa7c41af94d
--- /dev/null
+++ b/games-puzzle/meandmyshadow-0.4-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/libarchive dev-libs/openssl:0= media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-misc/curl x11-libs/libX11 opengl? ( virtual/opengl ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A puzzle/platform game with a player and its shadow
+EAPI=6
+HOMEPAGE=http://meandmyshadow.sourceforge.net/
+IUSE=opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 OFL-1.1 CC-BY-SA-2.5
+RDEPEND=app-arch/libarchive dev-libs/openssl:0= media-libs/libsdl[sound,video,X] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-misc/curl x11-libs/libX11 opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=mirror://sourceforge/meandmyshadow/0.4/meandmyshadow-0.4-src.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=48d3316aaf9c363763022effb3a8cf9b
diff --git a/games-puzzle/meandmyshadow/Manifest b/games-puzzle/meandmyshadow/Manifest
deleted file mode 100644
index ef11b52bc354..000000000000
--- a/games-puzzle/meandmyshadow/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX meandmyshadow-0.4-cmake.patch 479 BLAKE2B a242388410af6608f7bca6dd09c125049f5e62c142ac5633d63389755bad41b0a6a3761bb189fac5fde3bfec3fd45c6d39ccb097602a617f627f7e4860ff4222 SHA512 caf5db2cc564feb07753e86788b9f3deb7d280d5fb0474bfee0238fe80af0179aa5b7772b1a5033be55a6dff5f32c9913f8952f973cd30bbce7e1a992ed76e9e
-DIST meandmyshadow-0.4-src.tar.gz 16962805 BLAKE2B 607c08c0484b049e02ed54d2483f30f1c7af8aeffc31c977dba335e57eb14734517469f345387778875567db7f446b159dfbc7e51832cddc0d29e8352b308b29 SHA512 945f096fdc2df58b29f91314cd88953d897bbdbd094d8092d6712d33f7dbacadd298ca797e678ebad08ca579ed67a7b9d664e1fa202753e687a021935032a92b
-EBUILD meandmyshadow-0.4-r1.ebuild 1183 BLAKE2B 370e15518b5d280e57f4e4f7954a19a1df6254dd3a1a8a3a64d0dea0f3101801a4176c220144e61d4a2bc12c72c0f0e8b6d3453c5ade55b5e0fee6bf27c4e820 SHA512 a715992109689a592c8dab50e890180b5bbc4c40ff0260732e176cedd2d9db777305d55b3757e4da202f18000912d71ed9e826151fd97e264ac5515924f58767
-MISC metadata.xml 336 BLAKE2B ef2dbc4f110f2be12490cafc36b1efa95c025822eebdcda0cbec755f1c943d4111304cb0b0a0b415b297ee8face8bef5328a062d28fac6f00ce5ab4f20a8f321 SHA512 8641b7544c71bf31e801587fb889e92e248b4c3500be88ae976423e39d93a6d870b18f05d7af9ce0e0c1d5e2ec081501cecb070cbf2a1452724cc20851617a55
diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
deleted file mode 100644
index 504f6c0987a6..000000000000
--- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -15,13 +15,12 @@

- Find_Package(CURL REQUIRED)

- Find_Package(LibArchive REQUIRED)

- Find_Package(OpenSSL REQUIRED)

-+Find_Package(X11 REQUIRED)

- 

- #Use openGL only when compiling with HARDWARE_ACCELERATION.

- #Otherwise we try to find XLib.

- if(HARDWARE_ACCELERATION)

- 	Find_Package(OpenGL REQUIRED)

--else(HARDWARE_ACCELERATION)

--	INCLUDE(FindX11)

- endif(HARDWARE_ACCELERATION)

- 

- #Add the include dirs of the libraries.

diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
deleted file mode 100644
index 567f9a34f9b4..000000000000
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="A puzzle/platform game with a player and its shadow"
-HOMEPAGE="http://meandmyshadow.sourceforge.net/"
-SRC_URI="mirror://sourceforge/meandmyshadow/${PV}/${P}-src.tar.gz"
-
-LICENSE="GPL-3 OFL-1.1 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="
-	app-arch/libarchive
-	dev-libs/openssl:0=
-	media-libs/libsdl[sound,video,X]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	net-misc/curl
-	x11-libs/libX11
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		-DBINDIR="/usr/bin"
-		-DDATAROOTDIR="/usr/share"
-		-DICONDIR=/usr/share/icons
-		-DDESKTOPDIR=/usr/share/applications
-		-DHARDWARE_ACCELERATION=$(usex opengl)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/meandmyshadow/metadata.xml b/games-puzzle/meandmyshadow/metadata.xml
deleted file mode 100644
index d0cf56051e6c..000000000000
--- a/games-puzzle/meandmyshadow/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">meandmyshadow</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/metadata.xml b/games-puzzle/metadata.xml
deleted file mode 100644
index abb3008d8ab0..000000000000
--- a/games-puzzle/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-puzzle category contains puzzle games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-puzzle enthält Knobelspiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-puzzle contiene juegos puzzle.
-	</longdescription>
-	<longdescription lang="ja">
-		games-puzzle カテゴリーにはパズル・ゲームが
-		含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-puzzle categorie bevat puzzelspellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-puzzle chứa các trò chơi dạng đánh đố (puzzle).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-puzzle contiene giochi tipo puzzle.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-puzzle contém jogos de puzzle.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-puzzle zawiera układanki.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-puzzle/mindless-1.6-r1 b/games-puzzle/mindless-1.6-r1
new file mode 100644
index 000000000000..5a907e8ace85
--- /dev/null
+++ b/games-puzzle/mindless-1.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prepare unpack
+DEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc gnome-base/librsvg:2 virtual/pkgconfig
+DESCRIPTION=Play trading card games (Magic: the Gathering etc.) against other people
+EAPI=6
+HOMEPAGE=http://mindless.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 media-fonts/font-schumacher-misc
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://sourceforge/mindless/mindless-1.6.tar.gz http://www.wizards.com/dci/oracle/OracleAll_050523.txt http://mindless.sourceforge.net/images/logo.png -> mindless.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3
+_md5_=27140614cc9cf4cccdb3d4fe45d8994f
diff --git a/games-puzzle/mindless/Manifest b/games-puzzle/mindless/Manifest
deleted file mode 100644
index e8364b713aa5..000000000000
--- a/games-puzzle/mindless/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST OracleAll_050523.txt 1280717 BLAKE2B 8ae2c78cd0c1453785d5d5e382804e2e186d481a0195a92a93adf091dcd51833311d9111806641eff4489a47842eb362f09d9a6d69973817619c07b9be1cadd2 SHA512 d2d46e330a697974bc6c69b8616bdd08c959d1b20840468ccb20ca22a105d7cfac01dd0262113804fb84e790cb1f8ad439c1aa3c17927551617ec2f6de5b83e5
-DIST mindless-1.6.tar.gz 85620 BLAKE2B 5922cdb31ec83a0e7cda6c8646c75f35d1e52ce96711b62bd5749762e5074b39568f499bcd3dce39e4bb6d9d7e70097d62c310235bb59f1eda790d057197544a SHA512 bcb47311aebc127e30e10931e489cbbdb80845c6d95008834abab7ecbb7565eb61a38f47e68d24db5ed9da2cb3467fdaccccd05c6eaaca403afaf41cc76a991f
-DIST mindless.png 5119 BLAKE2B 19796bda1bc29c7a78a91cf083e98ef1a51fae0581cece3f8822f2474011cab5d20d0ffc797ef83912cebe406816271d67016cfef86393fe554c03dd42956541 SHA512 1a26d6f241889887a4464555189f25936e3961ef6df113dd4d3eab0f60699ea6bba9af3d88517e61ae9ad9dfc630e663a9d4c7ff0876ff3bcf21cbcee6a7f50a
-EBUILD mindless-1.6-r1.ebuild 1364 BLAKE2B 2a4bcd5db9a7155a0068502b1d4fe8489ec7d2a178383551ac0c1af82a74996cc28daff359d393a493910a978818c409b2c04baab93a0e0616f89a71fac4cdf8 SHA512 28097522c5e04e79bc7036e74cf5c728a99d39c10fba8808af23a5589e13e2238277193d91222529fe036a93abebb828c36944ae9249edef0d313debea9b7375
-MISC metadata.xml 331 BLAKE2B 7663f41ea5c4e0ce0680d1815f4d62ff469d25274a253aad5c9597836eaa1fb392636730c25b4535ecba191518b8a4a5cbf2f6cfc58767dcda05738bf3157f30 SHA512 bae00e9836e3224a3f2c4fc7c6be572153b8693f42de869c4670edc2c5b8f103182a5f7c97ab2abd7744a29b0ed30f2c5dc56c7c661bdc28f14aaa5355eb5b5a
diff --git a/games-puzzle/mindless/metadata.xml b/games-puzzle/mindless/metadata.xml
deleted file mode 100644
index c5f9e589b91f..000000000000
--- a/games-puzzle/mindless/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mindless</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/mindless/mindless-1.6-r1.ebuild b/games-puzzle/mindless/mindless-1.6-r1.ebuild
deleted file mode 100644
index 4777d0640580..000000000000
--- a/games-puzzle/mindless/mindless-1.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop readme.gentoo-r1
-
-ORANAME="OracleAll_050523.txt"
-DESCRIPTION="Play trading card games (Magic: the Gathering etc.) against other people"
-HOMEPAGE="http://mindless.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mindless/${P}.tar.gz
-	http://www.wizards.com/dci/oracle/${ORANAME}
-	http://mindless.sourceforge.net/images/logo.png -> ${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror" # for the card database
-
-RDEPEND="
-	x11-libs/gtk+:2
-	media-fonts/font-schumacher-misc
-"
-DEPEND="${RDEPEND}
-	gnome-base/librsvg:2
-	virtual/pkgconfig
-"
-
-DATAFILE="/usr/share/${PN}/${ORANAME}"
-DOC_CONTENTS="
-	The first time you start ${PN} you need to tell it where to find
-	the text database of cards.  This file has been installed at:
-	${DATAFILE}
-"
-
-src_unpack() {
-	unpack "${P}.tar.gz"
-	cp "${DISTDIR}/${ORANAME}" "${WORKDIR}" || die "cp failed"
-}
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^CC=/d' \
-		-e '/^CFLAGS=/d' \
-		Makefile \
-		|| die 'sed failed'
-}
-
-src_install() {
-	dobin mindless
-	insinto "/usr/share/${PN}"
-	doins "${WORKDIR}/${ORANAME}"
-	einstalldocs
-	readme.gentoo_create_doc
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Mindless Automaton"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-puzzle/mirrormagic-2.0.2-r2 b/games-puzzle/mirrormagic-2.0.2-r2
new file mode 100644
index 000000000000..eecb18493ea3
--- /dev/null
+++ b/games-puzzle/mirrormagic-2.0.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image ) !sdl? ( x11-libs/libXt )
+DESCRIPTION=A game like Deflektor (C 64) or Mindbender (Amiga)
+EAPI=6
+HOMEPAGE=http://www.artsoft.org/mirrormagic/
+IUSE=sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sdl? ( x11-libs/libX11 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image )
+SLOT=0
+SRC_URI=http://www.artsoft.org/RELEASES/unix/mirrormagic/mirrormagic-2.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=c9f3f0d80a3f5569451ef709b84b4f74
diff --git a/games-puzzle/mirrormagic/Manifest b/games-puzzle/mirrormagic/Manifest
deleted file mode 100644
index bfd2a6a44442..000000000000
--- a/games-puzzle/mirrormagic/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX mirrormagic-2.0.2-64bit.patch 892 BLAKE2B afadf37d81290831ebd6c479d98520e2e3e80df12c84d7fadab93d78d720c9ec1d926a948fc424fa57b64d3d861c16bb5ecd246bfaf07496bb25c07c606f785f SHA512 c625eb00098c4d7c41ce58ed2ca3ee28f34f6a06025d20e0533f6b171cfc2f2b0cb01ce80fb057902d839868303aa20329452c67f7c7e86809472207aeba6207
-AUX mirrormagic-2.0.2-editor.patch 499 BLAKE2B 9b09e8e9962b018945fae2a1c5c6e72134b80e267c189e60774889761b0d5264410ce4015523edce73de1e313e780c2fdf0f62d263d8d3398dd8162eb365be60 SHA512 2d2d497402596b0108b0b79f8ce93d4e7404a64f20107582d40ac5d72291645379f920af5bd156e607f724e0427817bf6557223a7c152ebdf41b6787e81fb353
-AUX mirrormagic-2.0.2-gcc41.patch 271 BLAKE2B c9af7a0ca7cbdfeb752b914def445de7089d541e8c0a37b4cb17d6a5c0d2e60ff46c539d32bddf36c7c57ab1ed1adcdbf803e2967dd5932cedee07e3bbe2415a SHA512 7ff5419ecbf4598c30241dc68cf0191abe4b806226628533d261e10eb33b90c1f5909c7b6afedd2f2fad87bea7cc6a06dceafe513ec3a93e4ea9d6bda1d8eaea
-AUX mirrormagic-2.0.2-gcc5.patch 14581 BLAKE2B 70ead8b2ae5fef95d7c465c2dc80380789377f8d59df9a8f24ab641e8ee3fd0c4891de18ad2d85cbfa55fa940f698f19c7ab9395e16e0eff96672452f35aa59b SHA512 bf71d63c5bef22cb49f2dd9b63d7e8150ea6e6a49cc2430a834ebd31f07f9b2e26411330550ff181386654b9695682fd9a71a3975df24ead8e1386746756b59b
-AUX mirrormagic-2.0.2-parallel.patch 238 BLAKE2B 76e437bc253ec82381161748b24ff2b08d5723fc8ce9e6beb294904f8263f95ed06afb648f35898997f6b53524c5f921f3b4c4e4b49c46f892e2b56fc7ac0830 SHA512 54cd926d2278878b7647ef790138e5f9f77ac9086c7d86d047bbea7481e39efd760393c3aa5657070e1fb0d07fb82cab64d63a593234e9dc6eff7ba7794ec5ee
-AUX mirrormagic.xpm 6347 BLAKE2B a5bf1e854b3d0f379567649ddae43891c6929301472618cc5f2beeef0f46e1faa05f8f726825a94714fbe1b77d13ec68663299b4edb8903e812a6759d2cde6eb SHA512 5040a6232ba047fe0038276bf574ca22b5270827c21e9dbba0f130f0b25c2157be611cca1e662af2ff8cc43ab78f69a925b6687fcaedc4778672ebfedfe00227
-DIST mirrormagic-2.0.2.tar.gz 1168098 BLAKE2B 0feefa2e7af82b212c3c08a347154d701a8492c2fef35cf625f4176e4893888904d88a2ee6d36c4e239fbf2cb6f1f77aa8e273023a86dce04dce8f5b77b62946 SHA512 cd49b1325485b68f2b59341e91f0564693dd12117aa3d6b5078c0a7f0e074114196870af11f0a154a0934cfce7106ba9685d886611f2efeff665ea030d705e03
-EBUILD mirrormagic-2.0.2-r2.ebuild 1231 BLAKE2B 49d51d7b6a58f7eb04619445ad3cf1c4c82e25916649ff997f816d9732d6fea70c4c0cbdaa003d3bd972cb728f2535bb50920f9afefa59fd701861c411b883fe SHA512 96f248137e83883402c99854debe17869524763d7766a093ddd29baf40c54f4e8059f5648761f3f7bf9d20d95cd9651359480263ec50b901304dd7377c503516
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
deleted file mode 100644
index 4817f75786f8..000000000000
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-64bit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From Debian:
-
-In src/libgame/gadgets.c, check for 64bit when handling
-GDI_TYPE,GDI_STATE in HandleGadgetTags() and use int instead of
-unsigned long.  Should probably really be uint32_t but I'll leave
-that decision to upstream. Thanks Pelle Nilsson (and son).
-64bit check borrowed from bug #496863.  Closes: #498912.
-
---- a/src/libgame/gadgets.c
-+++ b/src/libgame/gadgets.c
-@@ -18,6 +18,12 @@
- #include "text.h"
- #include "misc.h"
- 
-+/* check for 64bit */
-+#ifdef _LP64
-+#ifndef L64
-+#define L64 1
-+#endif
-+#endif
- 
- /* values for DrawGadget() */
- #define DG_UNPRESSED		0
-@@ -301,11 +307,19 @@
- 	break;
- 
-       case GDI_TYPE:
-+#ifdef L64
-+	gi->type = va_arg(ap, int);
-+#else
- 	gi->type = va_arg(ap, unsigned long);
-+#endif
- 	break;
- 
-       case GDI_STATE:
-+#ifdef L64
-+	gi->state = va_arg(ap, int);
-+#else
- 	gi->state = va_arg(ap, unsigned long);
-+#endif
- 	break;
- 
-       case GDI_CHECKED:
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch
deleted file mode 100644
index 459ffa6bf4aa..000000000000
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-editor.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mirrormagic-2.0.2/src/editor.c.orig
-+++ mirrormagic-2.0.2/src/editor.c
-@@ -2751,7 +2751,7 @@
- 	break;
-       }
- 
--      if (!LevelContainsPlayer)
-+      if (!LevelContainsPlayer())
- 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
-       else
-       {
-@@ -2766,7 +2766,7 @@
-       break;
- 
-     case GADGET_ID_TEST:
--      if (!LevelContainsPlayer)
-+      if (!LevelContainsPlayer())
- 	Request("No Level without Gregor Mc Duffin please !", REQ_CONFIRM);
-       else
-       {
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
deleted file mode 100644
index be7f701de42f..000000000000
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc41.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/main.h.old
-+++ b/src/main.h
-@@ -459,7 +459,6 @@
- #endif
- extern struct HiScore		highscore[];
- extern struct TapeInfo		tape;
--extern struct JoystickInfo	joystick[];
- extern struct SetupInfo		setup;
- extern struct GameInfo		game;
- extern struct LaserInfo		laser;
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch
deleted file mode 100644
index de2cc8042adc..000000000000
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-gcc5.patch
+++ /dev/null
@@ -1,483 +0,0 @@
-gcc5 inline semantics changed and caused a build fauilure (bug #568618).
-
---- mirrormagic-2.0.2.orig/src/libgame/misc.h
-+++ mirrormagic-2.0.2/src/libgame/misc.h
-@@ -137,8 +137,8 @@
- void sortLevelDirInfo(struct LevelDirInfo **,
- 		      int (*compare_function)(const void *, const void *));
- 
--inline void swap_numbers(int *, int *);
--inline void swap_number_pairs(int *, int *, int *, int *);
-+extern inline void swap_numbers(int *, int *);
-+extern inline void swap_number_pairs(int *, int *, int *, int *);
- 
- char *getUserDataDir(void);
- char *getSetupDir(void);
---- mirrormagic-2.0.2.orig/src/libgame/msdos.h
-+++ mirrormagic-2.0.2/src/libgame/msdos.h
-@@ -711,7 +711,7 @@
- Pixmap XCreatePixmap(Display *, Drawable, unsigned int, unsigned int,
- 		     unsigned int);
- void XSync(Display *, Bool);
--inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int,
-+extern inline void XCopyArea(Display *, Drawable, Drawable, GC, int, int,
- 		      unsigned int, unsigned int, int, int);
- int Read_PCX_to_Pixmap(Display *, Window, GC, char *, Pixmap *, Pixmap *);
- int XReadBitmapFile(Display *, Drawable, char *,
---- mirrormagic-2.0.2.orig/src/libgame/sdl.h
-+++ mirrormagic-2.0.2/src/libgame/sdl.h
-@@ -314,20 +314,20 @@
- 
- /* SDL function definitions */
- 
--inline void SDLInitVideoDisplay(void);
--inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
--inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
--inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
--inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
--inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
--inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
--inline Pixel SDLGetPixel(Bitmap *, int, int);
-+extern inline void SDLInitVideoDisplay(void);
-+extern inline void SDLInitVideoBuffer(DrawBuffer **, DrawWindow **, boolean);
-+extern inline boolean SDLSetVideoMode(DrawBuffer **, boolean);
-+extern inline void SDLCopyArea(Bitmap *, Bitmap *, int, int, int, int, int, int, int);
-+extern inline void SDLFillRectangle(Bitmap *, int, int, int, int, unsigned int);
-+extern inline void SDLDrawSimpleLine(Bitmap *, int, int, int, int, unsigned int);
-+extern inline void SDLDrawLine(Bitmap *, int, int, int, int, Uint32);
-+extern inline Pixel SDLGetPixel(Bitmap *, int, int);
- 
- Bitmap *SDLLoadImage(char *);
- 
--inline void SDLOpenAudio(void);
--inline void SDLCloseAudio(void);
-+extern inline void SDLOpenAudio(void);
-+extern inline void SDLCloseAudio(void);
- 
--inline void SDLNextEvent(Event *);
-+extern inline void SDLNextEvent(Event *);
- 
- #endif /* SDL_H */
---- mirrormagic-2.0.2.orig/src/libgame/system.c
-+++ mirrormagic-2.0.2/src/libgame/system.c
-@@ -172,12 +172,12 @@
- /* video functions                                                           */
- /* ========================================================================= */
- 
--inline static int GetRealDepth(int depth)
-+static int GetRealDepth(int depth)
- {
-   return (depth == DEFAULT_DEPTH ? video.default_depth : depth);
- }
- 
--inline void InitVideoDisplay(void)
-+void InitVideoDisplay(void)
- {
- #if defined(TARGET_SDL)
-   SDLInitVideoDisplay();
-@@ -186,7 +186,7 @@
- #endif
- }
- 
--inline void CloseVideoDisplay(void)
-+void CloseVideoDisplay(void)
- {
-   KeyboardAutoRepeatOn();
- 
-@@ -198,7 +198,7 @@
- #endif
- }
- 
--inline void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
-+void InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window,
- 			    int width, int height, int depth,
- 			    boolean fullscreen)
- {
-@@ -215,7 +215,7 @@
- #endif
- }
- 
--inline Bitmap *CreateBitmapStruct(void)
-+Bitmap *CreateBitmapStruct(void)
- {
- #ifdef TARGET_SDL
-   return checked_calloc(sizeof(struct SDLSurfaceInfo));
-@@ -224,7 +224,7 @@
- #endif
- }
- 
--inline Bitmap *CreateBitmap(int width, int height, int depth)
-+Bitmap *CreateBitmap(int width, int height, int depth)
- {
-   Bitmap *new_bitmap = CreateBitmapStruct();
-   int real_depth = GetRealDepth(depth);
-@@ -265,7 +265,7 @@
-   return new_bitmap;
- }
- 
--inline void FreeBitmap(Bitmap *bitmap)
-+void FreeBitmap(Bitmap *bitmap)
- {
-   if (bitmap == NULL)
-     return;
-@@ -287,7 +287,7 @@
-   free(bitmap);
- }
- 
--inline void CloseWindow(DrawWindow *window)
-+void CloseWindow(DrawWindow *window)
- {
- #ifdef TARGET_X11
-   if (window->drawable)
-@@ -300,7 +300,7 @@
- #endif
- }
- 
--inline void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
-+void BlitBitmap(Bitmap *src_bitmap, Bitmap *dst_bitmap,
- 		       int src_x, int src_y,
- 		       int width, int height,
- 		       int dst_x, int dst_y)
-@@ -314,7 +314,7 @@
- #endif
- }
- 
--inline void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
-+void ClearRectangle(Bitmap *bitmap, int x, int y, int width, int height)
- {
- #ifdef TARGET_SDL
-   SDLFillRectangle(bitmap, x, y, width, height, 0x000000);
-@@ -329,7 +329,7 @@
- #endif
- #endif
- 
--inline void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
-+void SetClipMask(Bitmap *bitmap, GC clip_gc, Pixmap clip_pixmap)
- {
- #ifdef TARGET_X11
-   if (clip_gc)
-@@ -343,7 +343,7 @@
- #endif
- }
- 
--inline void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
-+void SetClipOrigin(Bitmap *bitmap, GC clip_gc, int clip_x, int clip_y)
- {
- #ifdef TARGET_X11
-   if (clip_gc)
-@@ -357,7 +357,7 @@
- #endif
- }
- 
--inline void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
-+void BlitBitmapMasked(Bitmap *src_bitmap, Bitmap *dst_bitmap,
- 			     int src_x, int src_y,
- 			     int width, int height,
- 			     int dst_x, int dst_y)
-@@ -371,7 +371,7 @@
- #endif
- }
- 
--inline void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
-+void DrawSimpleWhiteLine(Bitmap *bitmap, int from_x, int from_y,
- 				int to_x, int to_y)
- {
- #ifdef TARGET_SDL
-@@ -384,7 +384,7 @@
- }
- 
- #if !defined(TARGET_X11_NATIVE)
--inline void DrawLine(Bitmap *bitmap, int from_x, int from_y,
-+void DrawLine(Bitmap *bitmap, int from_x, int from_y,
- 		     int to_x, int to_y, Pixel pixel, int line_width)
- {
-   int x, y;
-@@ -414,7 +414,7 @@
- }
- #endif
- 
--inline void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
-+void DrawLines(Bitmap *bitmap, struct XY *points, int num_points,
- 		      Pixel pixel)
- {
- #if !defined(TARGET_X11_NATIVE)
-@@ -438,7 +438,7 @@
- #endif
- }
- 
--inline Pixel GetPixel(Bitmap *bitmap, int x, int y)
-+Pixel GetPixel(Bitmap *bitmap, int x, int y)
- {
- #if defined(TARGET_SDL)
-   return SDLGetPixel(bitmap, x, y);
-@@ -458,7 +458,7 @@
- #endif
- }
- 
--inline Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
-+Pixel GetPixelFromRGB(Bitmap *bitmap, unsigned int color_r,
- 			     unsigned int color_g, unsigned int color_b)
- {
-   Pixel pixel;
-@@ -481,7 +481,7 @@
-   return pixel;
- }
- 
--inline Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
-+Pixel GetPixelFromRGBcompact(Bitmap *bitmap, unsigned int color)
- {
-   unsigned int color_r = (color >> 16) & 0xff;
-   unsigned int color_g = (color >>  8) & 0xff;
-@@ -491,7 +491,7 @@
- }
- 
- /* execute all pending screen drawing operations */
--inline void FlushDisplay(void)
-+void FlushDisplay(void)
- {
- #ifndef TARGET_SDL
-   XFlush(display);
-@@ -499,14 +499,14 @@
- }
- 
- /* execute and wait for all pending screen drawing operations */
--inline void SyncDisplay(void)
-+void SyncDisplay(void)
- {
- #ifndef TARGET_SDL
-   XSync(display, FALSE);
- #endif
- }
- 
--inline void KeyboardAutoRepeatOn(void)
-+void KeyboardAutoRepeatOn(void)
- {
- #ifdef TARGET_SDL
-   SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY / 2,
-@@ -518,7 +518,7 @@
- #endif
- }
- 
--inline void KeyboardAutoRepeatOff(void)
-+void KeyboardAutoRepeatOff(void)
- {
- #ifdef TARGET_SDL
-   SDL_EnableKeyRepeat(0, SDL_DEFAULT_REPEAT_INTERVAL);
-@@ -529,7 +529,7 @@
- #endif
- }
- 
--inline boolean PointerInWindow(DrawWindow *window)
-+boolean PointerInWindow(DrawWindow *window)
- {
- #ifdef TARGET_SDL
-   return TRUE;
-@@ -546,7 +546,7 @@
- #endif
- }
- 
--inline boolean SetVideoMode(boolean fullscreen)
-+boolean SetVideoMode(boolean fullscreen)
- {
- #ifdef TARGET_SDL
-   return SDLSetVideoMode(&backbuffer, fullscreen);
-@@ -567,7 +567,7 @@
- #endif
- }
- 
--inline boolean ChangeVideoModeIfNeeded(boolean fullscreen)
-+boolean ChangeVideoModeIfNeeded(boolean fullscreen)
- {
- #ifdef TARGET_SDL
-   if ((fullscreen && !video.fullscreen_enabled && video.fullscreen_available)||
-@@ -600,7 +600,7 @@
- /* audio functions                                                           */
- /* ========================================================================= */
- 
--inline void OpenAudio(void)
-+void OpenAudio(void)
- {
-   /* always start with reliable default values */
-   audio.sound_available = FALSE;
-@@ -627,7 +627,7 @@
- #endif
- }
- 
--inline void CloseAudio(void)
-+void CloseAudio(void)
- {
- #if defined(TARGET_SDL)
-   SDLCloseAudio();
-@@ -640,7 +640,7 @@
-   audio.sound_enabled = FALSE;
- }
- 
--inline void SetAudioMode(boolean enabled)
-+void SetAudioMode(boolean enabled)
- {
-   if (!audio.sound_available)
-     return;
-@@ -653,7 +653,7 @@
- /* event functions                                                           */
- /* ========================================================================= */
- 
--inline void InitEventFilter(EventFilter filter_function)
-+void InitEventFilter(EventFilter filter_function)
- {
- #ifdef TARGET_SDL
-   /* set event filter to filter out certain events */
-@@ -661,7 +661,7 @@
- #endif
- }
- 
--inline boolean PendingEvent(void)
-+boolean PendingEvent(void)
- {
- #ifdef TARGET_SDL
-   return (SDL_PollEvent(NULL) ? TRUE : FALSE);
-@@ -670,7 +670,7 @@
- #endif
- }
- 
--inline void NextEvent(Event *event)
-+void NextEvent(Event *event)
- {
- #ifdef TARGET_SDL
-   SDLNextEvent(event);
-@@ -679,7 +679,7 @@
- #endif
- }
- 
--inline Key GetEventKey(KeyEvent *event, boolean with_modifiers)
-+Key GetEventKey(KeyEvent *event, boolean with_modifiers)
- {
- #ifdef TARGET_SDL
- #if 0
-@@ -707,7 +707,7 @@
- #endif
- }
- 
--inline boolean CheckCloseWindowEvent(ClientMessageEvent *event)
-+boolean CheckCloseWindowEvent(ClientMessageEvent *event)
- {
-   if (event->type != EVENT_CLIENTMESSAGE)
-     return FALSE;
-@@ -724,7 +724,7 @@
- }
- 
- 
--inline void dummy(void)
-+void dummy(void)
- {
- #ifdef TARGET_SDL
- #else
---- mirrormagic-2.0.2.orig/src/libgame/system.h
-+++ mirrormagic-2.0.2/src/libgame/system.h
-@@ -278,41 +278,41 @@
- void InitGfxDoor2Info(int, int, int, int);
- void InitGfxScrollbufferInfo(int, int);
- 
--inline void InitVideoDisplay(void);
--inline void CloseVideoDisplay(void);
--inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
--inline Bitmap *CreateBitmapStruct(void);
--inline Bitmap *CreateBitmap(int, int, int);
--inline void FreeBitmap(Bitmap *);
--inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
--inline void ClearRectangle(Bitmap *, int, int, int, int);
--inline void SetClipMask(Bitmap *, GC, Pixmap);
--inline void SetClipOrigin(Bitmap *, GC, int, int);
--inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
--inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
--inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
--inline Pixel GetPixel(Bitmap *, int, int);
--inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
--inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
--
--inline void FlushDisplay(void);
--inline void SyncDisplay(void);
--inline void KeyboardAutoRepeatOn(void);
--inline void KeyboardAutoRepeatOff(void);
--inline boolean PointerInWindow(DrawWindow *);
--inline boolean SetVideoMode(boolean);
--inline boolean ChangeVideoModeIfNeeded(boolean);
-+extern inline void InitVideoDisplay(void);
-+extern inline void CloseVideoDisplay(void);
-+extern inline void InitVideoBuffer(DrawBuffer **,DrawWindow **, int,int,int, boolean);
-+extern inline Bitmap *CreateBitmapStruct(void);
-+extern inline Bitmap *CreateBitmap(int, int, int);
-+extern inline void FreeBitmap(Bitmap *);
-+extern inline void BlitBitmap(Bitmap *, Bitmap *, int, int, int, int, int, int);
-+extern inline void ClearRectangle(Bitmap *, int, int, int, int);
-+extern inline void SetClipMask(Bitmap *, GC, Pixmap);
-+extern inline void SetClipOrigin(Bitmap *, GC, int, int);
-+extern inline void BlitBitmapMasked(Bitmap *, Bitmap *, int, int, int, int, int, int);
-+extern inline void DrawSimpleWhiteLine(Bitmap *, int, int, int, int);
-+extern inline void DrawLines(Bitmap *, struct XY *, int, Pixel);
-+extern inline Pixel GetPixel(Bitmap *, int, int);
-+extern inline Pixel GetPixelFromRGB(Bitmap *, unsigned int,unsigned int,unsigned int);
-+extern inline Pixel GetPixelFromRGBcompact(Bitmap *, unsigned int);
-+
-+extern inline void FlushDisplay(void);
-+extern inline void SyncDisplay(void);
-+extern inline void KeyboardAutoRepeatOn(void);
-+extern inline void KeyboardAutoRepeatOff(void);
-+extern inline boolean PointerInWindow(DrawWindow *);
-+extern inline boolean SetVideoMode(boolean);
-+extern inline boolean ChangeVideoModeIfNeeded(boolean);
- 
- Bitmap *LoadImage(char *);
- 
--inline void OpenAudio(void);
--inline void CloseAudio(void);
--inline void SetAudioMode(boolean);
--
--inline void InitEventFilter(EventFilter);
--inline boolean PendingEvent(void);
--inline void NextEvent(Event *event);
--inline Key GetEventKey(KeyEvent *, boolean);
--inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
-+extern inline void OpenAudio(void);
-+extern inline void CloseAudio(void);
-+extern inline void SetAudioMode(boolean);
-+
-+extern inline void InitEventFilter(EventFilter);
-+extern inline boolean PendingEvent(void);
-+extern inline void NextEvent(Event *event);
-+extern inline Key GetEventKey(KeyEvent *, boolean);
-+extern inline boolean CheckCloseWindowEvent(ClientMessageEvent *);
- 
- #endif /* SYSTEM_H */
---- mirrormagic-2.0.2.orig/src/libgame/x11.c
-+++ mirrormagic-2.0.2/src/libgame/x11.c
-@@ -21,7 +21,7 @@
- static void X11InitDisplay();
- static DrawWindow *X11InitWindow();
- 
--inline void X11InitVideoDisplay(void)
-+void X11InitVideoDisplay(void)
- {
-   /* initialize X11 video */
-   X11InitDisplay();
-@@ -30,7 +30,7 @@
-   video.default_depth = XDefaultDepth(display, screen);
- }
- 
--inline void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
-+void X11InitVideoBuffer(DrawBuffer **backbuffer, DrawWindow **window)
- {
-   *window = X11InitWindow();
- 
---- mirrormagic-2.0.2.orig/src/libgame/x11.h
-+++ mirrormagic-2.0.2/src/libgame/x11.h
-@@ -286,8 +286,8 @@
- 
- /* X11 function definitions */
- 
--inline void X11InitVideoDisplay(void);
--inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
-+extern inline void X11InitVideoDisplay(void);
-+extern inline void X11InitVideoBuffer(DrawBuffer **, DrawWindow **);
- Bitmap *X11LoadImage(char *);
- 
- #endif /* X11_H */
diff --git a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch b/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
deleted file mode 100644
index a7effd4b6984..000000000000
--- a/games-puzzle/mirrormagic/files/mirrormagic-2.0.2-parallel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.old
-+++ b/src/Makefile
-@@ -146,7 +146,7 @@
- endif
- 
- 
--all: libgame_dir $(PROGNAME)
-+all: $(PROGNAME)
- 
- $(PROGNAME): $(LIBGAME) $(OBJS) $(ICON)
- 	$(CC) $(PROFILING) $(OBJS) $(ICON) $(LIBGAME) $(LDFLAGS) -o $(PROGNAME)
diff --git a/games-puzzle/mirrormagic/files/mirrormagic.xpm b/games-puzzle/mirrormagic/files/mirrormagic.xpm
deleted file mode 100644
index 4e98696d3ef1..000000000000
--- a/games-puzzle/mirrormagic/files/mirrormagic.xpm
+++ /dev/null
@@ -1,292 +0,0 @@
-/* XPM */
-static char * mirrormagic_xpm[] = {
-"32 32 257 2",
-"  	c None",
-". 	c #000000",
-"+ 	c #999999",
-"@ 	c #77AAFF",
-"# 	c #4C2208",
-"$ 	c #6E4C08",
-"% 	c #7F7F7F",
-"& 	c #AACCFF",
-"* 	c #777777",
-"= 	c #BB6622",
-"- 	c #0000CC",
-"; 	c #994411",
-"> 	c #00FF00",
-", 	c #EECC11",
-"' 	c #5D5D5D",
-") 	c #447F44",
-"! 	c #555555",
-"~ 	c #0000AA",
-"{ 	c #3B3B3B",
-"] 	c #009900",
-"^ 	c #990000",
-"/ 	c #007F00",
-"( 	c #005500",
-"_ 	c #CCCCCC",
-": 	c #CC0000",
-"< 	c #7F0000",
-"[ 	c #19447F",
-"} 	c #AAAAAA",
-"| 	c #FF0000",
-"1 	c #331900",
-"2 	c #888888",
-"3 	c #000055",
-"4 	c #663300",
-"5 	c #6E6E6E",
-"6 	c #666666",
-"7 	c #DD9911",
-"8 	c #5D3311",
-"9 	c #00337F",
-"0 	c #FFFFFF",
-"a 	c #00CC00",
-"b 	c #4C4C4C",
-"c 	c #FFFF00",
-"d 	c #444444",
-"e 	c #00AA00",
-"f 	c #7F7F00",
-"g 	c #DDDDDD",
-"h 	c #0066FF",
-"i 	c #006600",
-"j 	c #004C00",
-"k 	c #776608",
-"l 	c #3388FF",
-"m 	c #BBBBBB",
-"n 	c #0000FF",
-"o 	c #000000",
-"p 	c #000000",
-"q 	c #000000",
-"r 	c #000000",
-"s 	c #000000",
-"t 	c #000000",
-"u 	c #000000",
-"v 	c #000000",
-"w 	c #000000",
-"x 	c #000000",
-"y 	c #000000",
-"z 	c #000000",
-"A 	c #000000",
-"B 	c #000000",
-"C 	c #000000",
-"D 	c #000000",
-"E 	c #000000",
-"F 	c #000000",
-"G 	c #000000",
-"H 	c #000000",
-"I 	c #000000",
-"J 	c #000000",
-"K 	c #000000",
-"L 	c #000000",
-"M 	c #000000",
-"N 	c #000000",
-"O 	c #000000",
-"P 	c #000000",
-"Q 	c #000000",
-"R 	c #000000",
-"S 	c #000000",
-"T 	c #000000",
-"U 	c #000000",
-"V 	c #000000",
-"W 	c #000000",
-"X 	c #000000",
-"Y 	c #000000",
-"Z 	c #000000",
-"` 	c #000000",
-" .	c #000000",
-"..	c #000000",
-"+.	c #000000",
-"@.	c #000000",
-"#.	c #000000",
-"$.	c #000000",
-"%.	c #000000",
-"&.	c #000000",
-"*.	c #000000",
-"=.	c #000000",
-"-.	c #000000",
-";.	c #000000",
-">.	c #000000",
-",.	c #000000",
-"'.	c #000000",
-").	c #000000",
-"!.	c #000000",
-"~.	c #000000",
-"{.	c #000000",
-"].	c #000000",
-"^.	c #000000",
-"/.	c #000000",
-"(.	c #000000",
-"_.	c #000000",
-":.	c #000000",
-"<.	c #000000",
-"[.	c #000000",
-"}.	c #000000",
-"|.	c #000000",
-"1.	c #000000",
-"2.	c #000000",
-"3.	c #000000",
-"4.	c #000000",
-"5.	c #000000",
-"6.	c #000000",
-"7.	c #000000",
-"8.	c #000000",
-"9.	c #000000",
-"0.	c #000000",
-"a.	c #000000",
-"b.	c #000000",
-"c.	c #000000",
-"d.	c #000000",
-"e.	c #000000",
-"f.	c #000000",
-"g.	c #000000",
-"h.	c #000000",
-"i.	c #000000",
-"j.	c #000000",
-"k.	c #000000",
-"l.	c #000000",
-"m.	c #000000",
-"n.	c #000000",
-"o.	c #000000",
-"p.	c #000000",
-"q.	c #000000",
-"r.	c #000000",
-"s.	c #000000",
-"t.	c #000000",
-"u.	c #000000",
-"v.	c #000000",
-"w.	c #000000",
-"x.	c #000000",
-"y.	c #000000",
-"z.	c #000000",
-"A.	c #000000",
-"B.	c #000000",
-"C.	c #000000",
-"D.	c #000000",
-"E.	c #000000",
-"F.	c #000000",
-"G.	c #000000",
-"H.	c #000000",
-"I.	c #000000",
-"J.	c #000000",
-"K.	c #000000",
-"L.	c #000000",
-"M.	c #000000",
-"N.	c #000000",
-"O.	c #000000",
-"P.	c #000000",
-"Q.	c #000000",
-"R.	c #000000",
-"S.	c #000000",
-"T.	c #000000",
-"U.	c #000000",
-"V.	c #000000",
-"W.	c #000000",
-"X.	c #000000",
-"Y.	c #000000",
-"Z.	c #000000",
-"`.	c #000000",
-" +	c #000000",
-".+	c #000000",
-"++	c #000000",
-"@+	c #000000",
-"#+	c #000000",
-"$+	c #000000",
-"%+	c #000000",
-"&+	c #000000",
-"*+	c #000000",
-"=+	c #000000",
-"-+	c #000000",
-";+	c #000000",
-">+	c #000000",
-",+	c #000000",
-"'+	c #000000",
-")+	c #000000",
-"!+	c #000000",
-"~+	c #000000",
-"{+	c #000000",
-"]+	c #000000",
-"^+	c #000000",
-"/+	c #000000",
-"(+	c #000000",
-"_+	c #000000",
-":+	c #000000",
-"<+	c #000000",
-"[+	c #000000",
-"}+	c #000000",
-"|+	c #000000",
-"1+	c #000000",
-"2+	c #000000",
-"3+	c #000000",
-"4+	c #000000",
-"5+	c #000000",
-"6+	c #000000",
-"7+	c #000000",
-"8+	c #000000",
-"9+	c #000000",
-"0+	c #000000",
-"a+	c #000000",
-"b+	c #000000",
-"c+	c #000000",
-"d+	c #000000",
-"e+	c #000000",
-"f+	c #000000",
-"g+	c #000000",
-"h+	c #000000",
-"i+	c #000000",
-"j+	c #000000",
-"k+	c #000000",
-"l+	c #000000",
-"m+	c #000000",
-"n+	c #000000",
-"o+	c #000000",
-"p+	c #000000",
-"q+	c #000000",
-"r+	c #000000",
-"s+	c #000000",
-"t+	c #000000",
-"u+	c #000000",
-"v+	c #000000",
-"w+	c #000000",
-"x+	c #000000",
-"y+	c #000000",
-"z+	c #000000",
-"A+	c #000000",
-"B+	c #000000",
-"C+	c #000000",
-"D+	c #000000",
-"E+	c #000000",
-"F+	c #000000",
-"G+	c #000000",
-"H+	c #000000",
-"                                                                ",
-"                            - n n l h h : n - ~                 ",
-"                          n - - l l h n n n n -                 ",
-"        , 7             l l h h n : n n n n ~ ~ 7 ,             ",
-"        c 7 =         h l h h n n n n n - - ~ = 7 c             ",
-"        c , 7 , 7 ~ h h h n n n - - ~ ~ ~ 7 , 7 , c             ",
-"        , , 7 7 = ~ h h n n - - ~ ~ ~ ~ ~ = 7 7 , ,             ",
-"          , 7 = - ~ l _ } b 4 4 b b b ~ ~ - = 7 ,               ",
-"        ~ ~ 4 4 4 ~ m g 1 1 = = 1 1 d d h ~ 4 4 ~ ~             ",
-"    ~ ~ ~ ~ 4 4 4 l g g 7 7 , 7 ; ; d { @ h 4 4 4 ~ ~ ~         ",
-"    ~ ~ ~ ~ h h l l 0 g 7 7 , 7 ; ; d { @ @ h n 4 ~ ~ ~ n       ",
-"    @ @ @ @ @ @ l l 0 g } 7 , , ; d d { @ l h h n n n - -       ",
-"      @ @ | @ @ l 0 2 0 g } = = d d d { @ l h n n n n - -       ",
-"        @ @ & & @ @ l g + _ 2 2 6 6 ! @ @ l h n ^ n - -         ",
-"          @ & & @ @ l l } 2 _ _ 2 2 @ @ h h n n n n - -         ",
-"            @ @ @ | l l + _ _ } _ l @ h h h n n n - -           ",
-"            @ @ @ @ l l + _ _ _ } _ @ h h n n n n - -           ",
-"              @ @ @ l l h } _ _ } } h h h n n n - -             ",
-"              @ @ @ l l h h _ _ } } } h n ^ n - - -             ",
-"                @ n h h h h } _ _ } 2 2 n n - - -               ",
-"                @ n n h h h } _ _ _ 2 ~ n n ~ - -               ",
-"                n n n n | h ~ } } } ~ ~ - ~ ~ ~ -               ",
-"              h n n n h h h - ~ } } } - - ^ ~ ~ -               ",
-"              h n n h h h n - n - - * * ~ ~ ~ -                 ",
-"              h n h h h h n - n - - - - ~ ~ ~ - -               ",
-"            h l h h h l h h n n : - - - ~ ~ ~ ~ ^ -             ",
-"            h @ h | l l h n n n - - - ~ ~ ~ ~ ~ ~ -             ",
-"          n l @ l l l l h n n - ~ - - ~ ~ ~ ^ ~ ~ ~ -           ",
-"          n l @ l l l h n n - - ~ ~ - ~ ~ ~ ~ ~ ~ ~ -           ",
-"        n | h h h = ; ; 4 ~ - ~ ~ ~ - = ; ; 4 ~ ~ ~ ^ -         ",
-"        n - h h = = ; ; 4 4 ~ ~ ~ ~ = = ; ; 4 4 ~ ~ ~ -         ",
-"                                                                "};
diff --git a/games-puzzle/mirrormagic/metadata.xml b/games-puzzle/mirrormagic/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/mirrormagic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild b/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
deleted file mode 100644
index 812835fd25d0..000000000000
--- a/games-puzzle/mirrormagic/mirrormagic-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A game like Deflektor (C 64) or Mindbender (Amiga)"
-HOMEPAGE="http://www.artsoft.org/mirrormagic/"
-SRC_URI="http://www.artsoft.org/RELEASES/unix/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sdl"
-
-RDEPEND="
-	!sdl? ( x11-libs/libX11 )
-	sdl? (
-		media-libs/libsdl[video]
-		media-libs/sdl-mixer
-		media-libs/sdl-image
-	)
-"
-DEPEND="${RDEPEND}
-	!sdl? ( x11-libs/libXt )
-"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-parallel.patch \
-		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-gcc5.patch \
-		"${FILESDIR}"/${P}-editor.patch
-	rm -f ${PN} || die
-}
-
-src_compile() {
-	emake \
-		-C src \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		OPTIONS="${CFLAGS}" \
-		EXTRA_LDFLAGS="${LDFLAGS}" \
-		RO_GAME_DIR=/usr/share/${PN} \
-		RW_GAME_DIR=/var/${PN} \
-		TARGET=$(usex sdl sdl x11)
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r graphics levels music sounds
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry ${PN} "Mirror Magic II"
-	einstalldocs
-}
diff --git a/games-puzzle/monsterz-0.7.1-r4 b/games-puzzle/monsterz-0.7.1-r4
new file mode 100644
index 000000000000..a9795eface79
--- /dev/null
+++ b/games-puzzle/monsterz-0.7.1-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+DESCRIPTION=A little puzzle game, similar to the famous Bejeweled or Zookeeper
+EAPI=6
+HOMEPAGE=http://sam.zoy.org/projects/monsterz/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-1+ LGPL-2+ WTFPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/sdl-image[png] media-libs/sdl-mixer[mod]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://sam.zoy.org/projects/monsterz/monsterz-0.7.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=e46ffe7dc890d1c777c5087567866d6a
diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
deleted file mode 100644
index 7f42c1695386..000000000000
--- a/games-puzzle/monsterz/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX monsterz-0.7.1-64bit.patch 1093 BLAKE2B a27d602e4087926e053abd4f1cefb22a88fa37f8a3a773e13ea2f5db0914d6589db5fb09c78551da2f6f5b78d5cfd6c46bf08b9d77e6cfed99a451ffb9311c24 SHA512 3098e5a287c2b3e5e415a06e9e671fb4e56ebd4405a4580c5bb3529c1708ada9efdb40b1369040c7dba50ee1e0c33b6f088da898a8eec7f2997e4d376b67dea4
-AUX monsterz-0.7.1-blit.patch 1298 BLAKE2B ef1c5961a0a1c48ab01a289f7504355b445beae6f7387f68a901b75d403c2422b53fd1c7a4923d954320de73555fd649ff913ddd68336fc1233f94655fb34b8b SHA512 682542801240d7b32497105774ed240b08eefd9a92dfd20caf66d00fb1d77ec563c97262ed323c96a71fa19e5c2f9a13cffd7a8698aae92b2dfd858d35d8ed98
-AUX monsterz-0.7.1-gentoo.patch 970 BLAKE2B 658224adbc150cf01dfe72a3f1ea5fd14d0122eb1ac3b55f1d52c1f89ecbefeafa88e3aff08d4d832f8b2b6b2922890514609652e0c8f3cee26889f66b0ca5bc SHA512 1dc1994cb03f794b9f015d8d812b8519c826b0a0d02ecb3a9f4bb0e25d69aeb8f3784dcf1fbc1624ca18f645b55e0889f0d2ce8f1339639e8ed55d305af0f3e1
-DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-EBUILD monsterz-0.7.1-r4.ebuild 1100 BLAKE2B 9eee9e6e0cb08ac23cc78abea1981877d017046ea3dbe3136bc3ac2ff1c6ce53752729a5b53ee2ca12bd6853dc930154954596621e2f6ce9f147f34a8a44a8ab SHA512 6d83c1ad052d362b6e364fec40eb321696e68a70fdeb2138018f1a316dd9c2d4b528bea8e54777022d50ab6ed82274af4d2106bba0ae634bce30b3995ad96808
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
deleted file mode 100644
index 64d6527768f8..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-64bit.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: monsterz-0.7.1/monsterz.py
-===================================================================
---- monsterz-0.7.1.orig/monsterz.py	2008-05-09 16:35:25.000000000 +0000
-+++ monsterz-0.7.1/monsterz.py	2008-05-09 16:35:33.000000000 +0000
-@@ -108,7 +108,9 @@
-                 M = int(max(r, g, b))
-                 m = int(min(r, g, b))
-                 val = (2 * M + r + g + b) / 5
--                p[:] = (val + r) / 2, (val + g) / 2, (val + b) / 2
-+                p[0] = (val + r) / 2
-+                p[1] = (val + g) / 2
-+                p[2] = (val + b) / 2
-                 if alpha[y][x] >= 250:
-                     alpha[y][x] = 255 - (M - m) * 3 / 4
-         del pixels
-@@ -129,7 +131,9 @@
-                 r, g, b = p
-                 M = int(max(r, g, b))
-                 m = int(min(r, g, b))
--                p[:] = (m + r) / 2, (m + g) / 2, (m + b) / 2
-+                p[0] = (m + r) / 2
-+                p[1] = (m + g) / 2
-+                p[2] = (m + b) / 2
-                 if alpha[y][x] >= 250:
-                     alpha[y][x] = 255 - M * 2 / 3
-         del pixels
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
deleted file mode 100644
index d0847d6c2c10..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-blit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/monsterz.py
-+++ b/monsterz.py
-@@ -829,10 +829,10 @@
-             pass
-         else:
-             for x in range(4):
--                for y, p in enumerate(alpha[x]):
--                    alpha[x][y] = p * x / 4
--                for y, p in enumerate(alpha[406 - x - 1]):
--                    alpha[406 - x - 1][y] = p * x / 4
-+                for y in range(len(alpha[x])):
-+                    alpha[x][y] = alpha[x][y] * x / 4
-+                for y in range(len(alpha[406 - x - 1])):
-+                    alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 4
-             for col in alpha:
-                 l = len(col)
-                 for y in range(4):
-@@ -1287,10 +1287,10 @@
-             pass
-         else:
-             for x in range(10):
--                for y, p in enumerate(alpha[x]):
--                    alpha[x][y] = p * x / 12
--                for y, p in enumerate(alpha[406 - x - 1]):
--                    alpha[406 - x - 1][y] = p * x / 12
-+                for y in range(len(alpha[x])):
-+                    alpha[x][y] = alpha[x][y] * x / 12
-+                for y in range(len(alpha[406 - x - 1])):
-+                    alpha[406 - x - 1][y] = alpha[406 - x - 1][y] * x / 12
-             del alpha
-             scroll.unlock()
-         system.blit(scroll, (13, 437))
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
deleted file mode 100644
index 6920e0e36971..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/monsterz.py.orig	2006-05-12 18:55:51.000000000 -0400
-+++ b/monsterz.py	2006-05-12 18:57:44.000000000 -0400
-@@ -1907,7 +1906,7 @@
-     print '          (C) Mike Kershaw <dragorn@kismetwireless.net>'
- 
-     print 'This program is free software; you can redistribute it and/or modify it under'
--    print 'the terms of the Do What The Fuck You Want To Public License, Version 2, as'
-+    print 'the terms of the WTFPL, Version 2, as'
-     print 'published by Sam Hocevar. See http://sam.zoy.org/wtfpl/ for more details.'
-     print 'The sound effects are released under their own licences: applause.wav and'
-     print 'pop.wav are covered by the LGPL, the others are covered by the GPL.'
-@@ -1932,7 +1931,7 @@
-     global system, data, settings, fonter, monsterz
-     override = {}
-     scorefile = None
--    sharedir = dirname(argv[0])
-+    sharedir = "GENTOO_DATADIR"
-     outfd = None
-     try:
-         long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/metadata.xml b/games-puzzle/monsterz/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/monsterz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild b/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
deleted file mode 100644
index 4cff31b75f8c..000000000000
--- a/games-puzzle/monsterz/monsterz-0.7.1-r4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-r1
-
-DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
-HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
-SRC_URI="http://sam.zoy.org/projects/monsterz/${P}.tar.gz"
-
-LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-blit.patch
-	sed -i \
-		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
-		monsterz.py || die "sed failed"
-	rm Makefile || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r graphics sound
-	newbin monsterz.py ${PN}
-	newicon graphics/icon.png ${PN}.png
-	make_desktop_entry ${PN} Monsterz
-	einstalldocs
-	python_replicate_script "${ED%/}"/usr/bin/monsterz
-}
diff --git a/games-puzzle/mures-0.5-r1 b/games-puzzle/mures-0.5-r1
new file mode 100644
index 000000000000..20ff4c29e7bc
--- /dev/null
+++ b/games-puzzle/mures-0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A clone of Sega's Chu Chu Rocket
+EAPI=6
+HOMEPAGE=http://mures.sourceforge.net/
+IUSE=opengl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=mirror://sourceforge/mures/mures-0.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ddd0ab80ab34d043bff861d4b385cae5
diff --git a/games-puzzle/mures/Manifest b/games-puzzle/mures/Manifest
deleted file mode 100644
index 99ec18b21954..000000000000
--- a/games-puzzle/mures/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mures-0.5-save.patch 654 BLAKE2B 57992955c9bb850ec7f13c50039eaa02d81540abbe94dba7cc0d034d5dab3c0f63d82fcdeb666efc664494e39f47c152f84efebaa1b3c2a108b55ff5c960dacc SHA512 b1762660ecd5cd373d39957003a0e455c3f981886191955eca2ccdd54d6ce2a302f6eaed3d022ac5acd64cabed364a6c1dc6cbdf53e0fd32208ce3d12db0a187
-AUX mures-0.5-underlink.patch 300 BLAKE2B f20a6a2e2e82e0f16a9ed8f49d2cf4071d4f19c2149f12b98572e0e4a8e42e04556d02bd93675f5805dae96a496ea4586ce064ea2f33c33586a24afecab889ce SHA512 ffbd6e23fab8fff7ccb191c1fcc4f405b2c5cc6cffaa388eca11185244a5328d16b8f3301ce1dd29ba036637e281e55b08ac39c039ff187cac35f01f078ced21
-DIST mures-0.5.tar.gz 638528 BLAKE2B 35861cbc0497091c716664a6a1d38884a64981f6228637cbeb93b4be64c42bf84b8033c2f5d95f197c26436fbf621ff8322ffb5aa3dc241b50372e94a395599b SHA512 907b22adffcc0457d866da27bd11d61663c6a1eed1c0aa4b437f8e341065df86f2ab06851619e2fa4088aa0b2becaf9376bad693c83345f8d1ee862c31740eff
-EBUILD mures-0.5-r1.ebuild 2079 BLAKE2B 9fded27b1529d579f3dd27673472396507f14061ea14f43c2d1997cc059241e432fd63bbdfc4bf9aefd597499f50f5069fd46072eb48b3879f48a193129414d7 SHA512 7bcaf4b664fe92b1ec3b4f5da68875daf5f6c0c64705ace569b082a6a8b6a6ed4c5609a2b3c9c7993d7b5efbcd4e56ba6b48b1b6843fec94f48466075cdac049
-MISC metadata.xml 328 BLAKE2B 10dbb393d6e09fe667ad28913d38f785c0d8d51da581bbc2fe2d19c18faea716bc901097829cc4927b6d3d0265ecd53e62635461f6bb3619cba1540b7b033c66 SHA512 f6818639d9ff510efe1dc98505eb03086d46024def2a1b5fef5273181e6eef91135ef4e7902613776da51a951c50373b5cc80848a9887d3919f7adfd9ef40f18
diff --git a/games-puzzle/mures/files/mures-0.5-save.patch b/games-puzzle/mures/files/mures-0.5-save.patch
deleted file mode 100644
index 697db8ef7a28..000000000000
--- a/games-puzzle/mures/files/mures-0.5-save.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/gi_sdl.c
-+++ b/gi_sdl.c
-@@ -606,6 +606,7 @@
- {
-   int i,found;
-   gi_sdl_data *data = &GI;
-+  char temp_path[70];
- 
-   switch(e.type) {
- 
-@@ -714,7 +715,8 @@
- 	  sim_start(&g->sim);
- 	break;
-       case SDLK_F6:
--	map_save(&g->sim.map, "saved.mus");
-+	snprintf(temp_path, 70, "%s/.mures.save", getenv("HOME"));
-+	map_save(&g->sim.map, temp_path);
- 	break;
-       case SDLK_F1:
- 	game_restart(g);
-
---- a/output.c
-+++ b/output.c
-@@ -215,7 +215,8 @@
- 
- void output_screenshot()
- {
--  char *l = "shot.bmp";
-+  char l[70];
-+  snprintf(l, 70, "%s/mures_shot.bmp", getenv("HOME"));
-   SDL_SaveBMP(screen, l);
-   printf("Screenshot saved to %s.\n", l);
- }
diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
deleted file mode 100644
index 3acf0b0f7233..000000000000
--- a/games-puzzle/mures/files/mures-0.5-underlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
-+++ b/src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
-@@ -1,8 +1,8 @@
- bin_PROGRAMS = mures
- 
- mures_LDADD = \
--	-llua -L./lua
--	$(STATIC_LIBS)
-+	-llua -L./lua \
-+	$(STATIC_LIBS) -lm
- 
- SUBDIRS = lua gui images maps sounds textures
- 
diff --git a/games-puzzle/mures/metadata.xml b/games-puzzle/mures/metadata.xml
deleted file mode 100644
index adf89afdd42a..000000000000
--- a/games-puzzle/mures/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">mures</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/mures/mures-0.5-r1.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
deleted file mode 100644
index 36b51630c7e7..000000000000
--- a/games-puzzle/mures/mures-0.5-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A clone of Sega's Chu Chu Rocket"
-HOMEPAGE="http://mures.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mures/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	opengl? ( virtual/opengl )
-"
-RDEPEND="${DEPEND}"
-
-dir="/usr/share/${PN}"
-
-src_prepare() {
-	default
-
-	# Disable OpenGL support if USE flag is not set
-	if ! use opengl ; then
-		sed -i \
-			-e 's: -DHAVE_GL::' \
-			-e 's: -lGL::' \
-			configure.in || die "sed failed"
-	fi
-
-	sed -i '$ s/\\//' \
-		src/lua/Makefile.am \
-		src/maps/battle/Makefile.am \
-		|| die "sed failed"
-
-	eapply "${FILESDIR}"/${P}-underlink.patch
-
-	mv configure.in configure.ac
-	eautoreconf
-
-	cd src
-
-	# Save to HOME
-	eapply "${FILESDIR}"/${P}-save.patch
-
-	# Modify game data & scrips path
-	sed -i \
-		-e "s:gui/:${dir}/gui/:" \
-		-e "s:sounds/:${dir}/sounds/:" \
-		gui.c || die "sed gui.c failed"
-	sed -i \
-		-e "s:images/:${dir}/images/:" \
-		-e "s:textures/:${dir}/textures/:" \
-		go_sdl.c || die "sed go_sdl.c failed"
-	sed -i \
-		-e "s:textures/:${dir}/textures/:" \
-		go_gl.c || die "sed go_gl.c failed"
-	sed -i \
-		-e "s:input.lua:${dir}/input.lua:" \
-		gi_sdl.c || die "sed gi_sdl.c failed"
-	sed -i \
-		-e "s:images/:${dir}/images/:" \
-		anim.c output.c || die "sed anim.c output.c failed"
-	sed -i \
-		-e "s:maps/:${dir}/maps/:" \
-		load_maps.lua || die "sed load_maps.lua failed"
-	sed -i \
-		-e "s:sounds/:${dir}/sounds/:" \
-		audio_sdl.c || die "sed audio_sdl.c failed"
-	sed -i \
-		-e "s:load_maps.lua:${dir}/load_maps.lua:" \
-		map.c || die "sed map.c failed"
-}
-
-src_install() {
-	# Remove makefiles before installation
-	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
-	insinto "${dir}"
-	doins -r src/{gui,images,sounds,textures,maps,*.lua}
-	einstalldocs
-	dobin src/mures
-	newicon src/images/cat_right.png ${PN}.png
-	make_desktop_entry ${PN} "Mures"
-}
diff --git a/games-puzzle/neverball-1.6.0-r1 b/games-puzzle/neverball-1.6.0-r1
new file mode 100644
index 000000000000..c90554a2cefe
--- /dev/null
+++ b/games-puzzle/neverball-1.6.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl ) sys-devel/gettext >=sys-apps/sed-4
+DESCRIPTION=Clone of Super Monkey Ball using SDL/OpenGL
+EAPI=6
+HOMEPAGE=https://neverball.org
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ IJG
+RDEPEND=media-libs/libsdl2[sound,joystick,opengl,video] media-libs/sdl2-ttf media-libs/libpng:0= virtual/jpeg:0 media-libs/libvorbis virtual/opengl dev-games/physfs media-fonts/dejavu media-fonts/wqy-microhei nls? ( virtual/libintl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://neverball.org/neverball-1.6.0.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_=d338753e8733d30968ce143ed601f67b
diff --git a/games-puzzle/neverball/Manifest b/games-puzzle/neverball/Manifest
deleted file mode 100644
index ef9bcc0eaabe..000000000000
--- a/games-puzzle/neverball/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST neverball-1.6.0.tar.gz 37772911 BLAKE2B c9ebf9b5e87665055d3c09b93ffa71d8bf9b953b8a4b9ab7a0e7667c5521c94c80fa66c8df496066434b25319f7d22498ad19fa52e5ffee71ff4ee25188e3c41 SHA512 174d05308aee3a5e693782c54dd389439752b3597f28193771041d30f6c4236a5d055b2fcca9460b1005e9f000ddb3cbc01b86ea15c2abbf6e5a7996e836f787
-EBUILD neverball-1.6.0-r1.ebuild 1994 BLAKE2B 4ea20e44571cffddd17e7f972e59f8bce89c5838ca4aaa6e8812ae510b7015f5ae1d927d111f5ef4df2924bfb144ed0fb57b2cdfbe0baafe1d74efb597d5793e SHA512 8d0d793fcca8fd5268c3d84fb1f4a8a6c8b66e04dd2092c3de41f9c19b74a0f1be26eb9721419f38010ff799ab676af30fe47676a3214e8fc3a087f7dbf9e448
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/neverball/metadata.xml b/games-puzzle/neverball/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/neverball/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild b/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
deleted file mode 100644
index f2991bb60a72..000000000000
--- a/games-puzzle/neverball/neverball-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="Clone of Super Monkey Ball using SDL/OpenGL"
-HOMEPAGE="https://neverball.org"
-SRC_URI="https://neverball.org/${P}.tar.gz"
-
-LICENSE="GPL-2+ IJG"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-RESTRICT="test"
-
-RDEPEND="
-	media-libs/libsdl2[sound,joystick,opengl,video]
-	media-libs/sdl2-ttf
-	media-libs/libpng:0=
-	virtual/jpeg:0
-	media-libs/libvorbis
-	virtual/opengl
-	dev-games/physfs
-	media-fonts/dejavu
-	media-fonts/wqy-microhei
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's:mapc:neverball-mapc:g' \
-		-e 's:MAPC:NEVERBALL-MAPC:g' \
-		-e '1 s/ 1 / 6 /' \
-		dist/mapc.1 || die
-	sed -i \
-		-e '/CFLAGS.*O2/s:-O2:$(E_CFLAGS):' \
-		-e '/CXXFLAGS.*O2/s:-O2:$(E_CXXFLAGS):' \
-		-e "/^MAPC_TARG/s/mapc/${PN}-mapc/" \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		ENABLE_NLS=$(use nls && echo 1 || echo 0) \
-		E_CFLAGS="${CFLAGS}" \
-		E_CXXFLAGS="${CXXFLAGS}" \
-		LOCALEDIR=/usr/share/locale \
-		DATADIR="/usr/share/${PN}"
-}
-
-src_install() {
-	local font
-
-	dobin ${PN}-mapc neverball neverputt
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-	for font in DejaVuSans-Bold.ttf wqy-microhei.ttc; do
-		rm -f "${ED}/usr/share/${PN}"/ttf/${font}
-		dosym /usr/share/fonts/*/${font} \
-			"/usr/share/${PN}"/ttf/${font}
-	done
-	if [[ -d locale ]] ; then
-		insinto /usr/share
-		doins -r locale
-	fi
-	dodoc doc/{authors.txt,manual.txt,release-notes.md} README.md
-
-	local res name
-	for name in ball putt; do
-		for res in 16 32 64 128 256; do
-			newicon -s ${res} dist/never${name}_${res}.png never${name}.png
-		done
-	done
-
-	doman dist/*.6
-	newman dist/mapc.1 neverball-mapc.6
-	make_desktop_entry neverball Neverball
-	make_desktop_entry neverputt Neverputt neverputt
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/nightsky-20111222 b/games-puzzle/nightsky-20111222
new file mode 100644
index 000000000000..6b58317a214d
--- /dev/null
+++ b/games-puzzle/nightsky-20111222
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Puzzle game that puts you inside and ambient and mysterious universe
+EAPI=5
+HOMEPAGE=http://www.nicalis.com/nightsky/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm !bundled-libs? ( media-libs/freealut media-libs/freeglut media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib ) games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=nightskyhd-linux-1324519044.tar.gz
+_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_=4a9e34cca2a59985323f7b97aab9407d
diff --git a/games-puzzle/nightsky/Manifest b/games-puzzle/nightsky/Manifest
deleted file mode 100644
index 6ce1ead47d89..000000000000
--- a/games-puzzle/nightsky/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX nightsky-wrapper 540 BLAKE2B 19eb62deb97cc4383e5b33920446278d369ec0c725dfa2a33709d7112cea8f97816724ee5976f7638b7610d110a4c3ff744ed23d248116c52113da141634e17d SHA512 6ecb52d390757bb6b1ffcd7b06c1a154d5a3253822e989d7b9276ede8627d241b203afb88afff731f33967a3e380d1fcaf3feeef61713485848f654df3855248
-DIST nightskyhd-linux-1324519044.tar.gz 123971537 BLAKE2B 52aafe22177ff3266bcff10a9de0b6a120f92c9dda0176a17c71140436b7ba6c13cab1775dd2406f8560ff0f8bfc2c4a38de4be40ef195535d9636edfb6005ba SHA512 a1d4ec588fa67c3dfbefe563d37df7bd93ce6a7580e7fcedda6567f6f05f362fc478fbd6ac921854fa5fe26270a037c49f9bce2df5527a6490ff0984b9bb671e
-EBUILD nightsky-20111222.ebuild 1878 BLAKE2B 229d53081e7e45e14a0b2ca812fc65ff4bf0cf72fb6be4643c22d85faf428e4bdeb092cbc2ff9641a35480b318622dba40ae1348298a83952ca923f9402e7676 SHA512 47f922164e5b28a0f344153c6835cf07442221383d0735dba964f0d47812816f590695bb596f757d4ab2d2f0ea276eeadcf787759ad1b47b981fee2441847337
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/nightsky/files/nightsky-wrapper b/games-puzzle/nightsky/files/nightsky-wrapper
deleted file mode 100644
index be838c7432cc..000000000000
--- a/games-puzzle/nightsky/files/nightsky-wrapper
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-HOMEDIR="${HOME}/.nightsky"
-GAMEDIR="@GAMES_PREFIX_OPT@/nightsky"
-
-# create root config dir
-[ -e "${HOMEDIR}" ] || mkdir "${HOMEDIR}"
-
-# symlink game data
-for i in `cd "${GAMEDIR}" || exit 1 ; ls -d *` ; do
-	[ -e "${HOMEDIR}/${i}" ] || ln -sf "${GAMEDIR}/${i}" "${HOMEDIR}/${i}"
-done
-# create empty Settings dir
-[ -e "${HOMEDIR}/Settings" ] || mkdir "${HOMEDIR}/Settings"
-
-cd "${HOMEDIR}"
-
-# start architecture dependent binary
-if [ -e "${HOMEDIR}/NightSkyHD_64" ] ; then
-	exec ./NightSkyHD_64 "$@"
-else
-	exec ./NightSky "$@"
-fi
diff --git a/games-puzzle/nightsky/metadata.xml b/games-puzzle/nightsky/metadata.xml
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-puzzle/nightsky/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-puzzle/nightsky/nightsky-20111222.ebuild b/games-puzzle/nightsky/nightsky-20111222.ebuild
deleted file mode 100644
index aebfa6393e06..000000000000
--- a/games-puzzle/nightsky/nightsky-20111222.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils games
-
-DESCRIPTION="Puzzle game that puts you inside and ambient and mysterious universe"
-HOMEPAGE="http://www.nicalis.com/nightsky/"
-SRC_URI="nightskyhd-linux-1324519044.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/NightSky*
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*"
-
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXxf86vm
-	!bundled-libs? (
-		media-libs/freealut
-		media-libs/freeglut
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		sys-libs/zlib
-	)"
-
-S=${WORKDIR}/NightSky
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	einfo "removing ${ARCH} unrelated files..."
-	rm -v NightSkyHD$(usex amd64 "" "_64") || die
-	rm -rv lib$(usex amd64 "" "64") || die
-
-	if ! use bundled-libs ; then
-		einfo "removing bundled libs..."
-		rm -rv lib* || die
-	fi
-
-	# empty dir, we create symlink here later
-	rm -r Settings || die
-
-	sed \
-		-e "s#@GAMES_PREFIX_OPT@#${GAMES_PREFIX_OPT}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-}
-
-src_install() {
-	dogamesbin "${T}"/${PN}
-
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	newicon -s 128 "World/The Void/Physical"/Circle72.png ${PN}.png
-	make_desktop_entry ${PN}
-
-	fperms +x "${MYGAMEDIR}"/NightSkyHD$(usex amd64 "_64" "")
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	echo
-	elog "Saves and Settings are in ~/.nightsky/Settings"
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/nudoku-1.0.0 b/games-puzzle/nudoku-1.0.0
new file mode 100644
index 000000000000..eda5856df8ea
--- /dev/null
+++ b/games-puzzle/nudoku-1.0.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-libs/ncurses:0= >=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=ncurses based sudoku game
+EAPI=6
+HOMEPAGE=https://jubalh.github.io/nudoku
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/jubalh/nudoku/archive/1.0.0.tar.gz -> nudoku-1.0.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=565d701689de99db65c27a8acdd03b6c
diff --git a/games-puzzle/nudoku/Manifest b/games-puzzle/nudoku/Manifest
deleted file mode 100644
index 548fcef53538..000000000000
--- a/games-puzzle/nudoku/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nudoku-1.0.0.tar.gz 20442 BLAKE2B b258362012b889a0756bc8cdbfbcdc9aba09e1162f6dc8a593061689e81d02935111bac8561648e89e7287af4702f110ea86fb20ae4e18bfba09f3578f0909cb SHA512 f29a698eec076729ce065633bb05e0146e229774ff1eb3f2bd5cd5733698e30b91085b55d871657d42f2d3d8bcf7bb45918f4a127d6a0464ebc8b90ccc384ec3
-EBUILD nudoku-1.0.0.ebuild 485 BLAKE2B 02f2a94050b3be4b5c76df209b536855752492fa5b484961f5e6446aa9f4b6472822313a285af551a24fbc8d76aa792d268bf0bbd53cc425fdeaea173f623f99 SHA512 0dd5d960c1d2314c7eed00fdd82c6d3e209ef4bb95f2bfb50a24959fd91171751ce7dd47c4ed501bc504f2604dc6f112c209d3abbecd3d9aed68bf36f98c2649
-MISC metadata.xml 442 BLAKE2B f41c2981dcecd90c3855fe81f16cb9fa07dea3416543e0459b75cf726e45796e5d8c186e9a1cdfe2640433d19e8478fda4649c3e6c82ef1fd6d0653bbe10d55e SHA512 43aaba52d460b3130d82e47f08c04253416ffe885e280d8beb03a8a750ab4367b01bd58caf0c83916c0e69115c629a48b5e0138229ba471a023171bb3e254a60
diff --git a/games-puzzle/nudoku/metadata.xml b/games-puzzle/nudoku/metadata.xml
deleted file mode 100644
index 3f5e183bc801..000000000000
--- a/games-puzzle/nudoku/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jubalh@iodoru.org</email>
-		<name>Michael Vetter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jubalh/nudoku</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/nudoku/nudoku-1.0.0.ebuild b/games-puzzle/nudoku/nudoku-1.0.0.ebuild
deleted file mode 100644
index 3277e1193f18..000000000000
--- a/games-puzzle/nudoku/nudoku-1.0.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="ncurses based sudoku game"
-HOMEPAGE="https://jubalh.github.io/nudoku"
-SRC_URI="https://github.com/jubalh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-}
diff --git a/games-puzzle/numptyphysics-0.3.4 b/games-puzzle/numptyphysics-0.3.4
new file mode 100644
index 000000000000..a9440d785baa
--- /dev/null
+++ b/games-puzzle/numptyphysics-0.3.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=postinst postrm preinst prepare
+DEPEND=virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
+EAPI=6
+HOMEPAGE=http://thp.io/2015/numptyphysics/
+IUSE=+user-levels
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-libs/glib:2
+SLOT=0
+SRC_URI=user-levels? ( https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> numptyphysics-0.3.4.tar.gz http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d364278d0b6ce75bc162967721a932c3
diff --git a/games-puzzle/numptyphysics-9999 b/games-puzzle/numptyphysics-9999
new file mode 100644
index 000000000000..0b77d46e8f2e
--- /dev/null
+++ b/games-puzzle/numptyphysics-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst prepare unpack
+DEPEND=virtual/pkgconfig >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Crayon Physics-like drawing puzzle game using the same excellent Box2D engine
+EAPI=6
+HOMEPAGE=http://thp.io/2015/numptyphysics/
+IUSE=+user-levels
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl2[opengl,video] media-libs/sdl2-image[png] media-libs/sdl2-ttf virtual/opengl dev-libs/glib:2
+SLOT=0
+SRC_URI=user-levels? ( http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz http://numptyphysics.garage.maemo.org/levels/guile/guile.npz http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz http://numptyphysics.garage.maemo.org/levels/papky/papky.npz http://numptyphysics.garage.maemo.org/levels/perli/perli.npz http://numptyphysics.garage.maemo.org/levels/qole/qole.npz http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz http://numptyphysics.garage.maemo.org/levels/werre/werre.npz http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d9b00a506d92eff4bb81ed621a60cd5
diff --git a/games-puzzle/numptyphysics/Manifest b/games-puzzle/numptyphysics/Manifest
deleted file mode 100644
index b8f1faa7c50a..000000000000
--- a/games-puzzle/numptyphysics/Manifest
+++ /dev/null
@@ -1,26 +0,0 @@
-AUX numptyphysics-0.3.4-gentoo.patch 1087 BLAKE2B 354c6a2e692ba0f75684696c77c6fb170a02cc258d49a248918baf4483754f846aade1eacab7aa879eaf7c53bf914cc1d4a87307f6bcc18b826beaa66b4bcd0d SHA512 84279382cf5f8faf1f77a44d87a49b4d9ef3adf11c3c3fbfe11c77cfd7aa7c4eaf7a6917f09ee4ac67e0e8bf8584406e7afb8ab86db11b2fd269e2cf7c0e6a13
-DIST butelo.npz 7209 BLAKE2B bfcc1e56d0bde0762db0253ea85d669cbd06295f037357e21d6b192710db36b767cc7932030f37ab18f60d35c1232d32c0c8f2af7a06f5911764acdfa14fc0a7 SHA512 a1f6ce15c0a921969a0e6c96d2e354aa666e760275a86d45b85db833731273e16ac9cdb4975beca71c1abcfe5dd64a0181f74bbc3e3aba1c2bb541c3bbe80090
-DIST catalyst.npz 8778 BLAKE2B e36c1651306af2cf2f43d300f674a665fd13aace71244173537165ddf5cb91bb150fb4370d15ecea28f83a79678626e501874efad30be59928a214781a76080d SHA512 ad2c02721e1b2ded3621a5a5217f78ed1022a86472f4de030c9b3d258f0b7b580e953fc2d017519477cea4df1b482e61fca565a3d98d511e894805e6683e6830
-DIST christeck.npz 4868 BLAKE2B c3a3a9416bea3160cdd16a5184b1923e3daedf369f973d0160b4683ab9c41b297ffea6a1fed025c3e296eb620d99fc30eef8f3978d385dcad2f8647ead9e2036 SHA512 562ed1fe6caa026dcc897aa914c5cad648aa191127714c888f5d1fbf82bbac15477928e49e02a5ab8940a84a085afb6e282e04ac1478a0ace5449541137f89fc
-DIST dneary.npz 5041 BLAKE2B 6ee77c20808d4d4bef812ff5396ae33d4247978fbe1fdd19003ad5432929a94eafbe5ce987036f2d6723daf18cee5b109180785014ea88c9889ee46e99847b24 SHA512 94bf7238bda8c9ba4133bd4bb8f6c978bb06f42432a6854ba570466d3a4b780a737a2138702072fbb9d6b913307a52734b3747a255d3f611df8e8753751d1c55
-DIST gnuton.npz 3734 BLAKE2B cd3de0fa77202c275a0dcadc41e7d87ae412e7b24e9b4f74987f95fbfe053859d1eec322b219c31ce2998125b8a919bc33d01fdcdce8cdf82944f8268db61207 SHA512 f3c910ac426b8044400ff882c0f8e193a19d35d1de2f6a8b5729acb9cc2fe383b116f79854897d3162c9ce223df92c76981a676ffc83268716fb20d8fecca13c
-DIST gudger.npz 7101 BLAKE2B db05d8c733e247302dbc69811a4fa7f01981b3b8fa09259e4df8bb659a2417854ca96194accb9db8211ff4a1694c01b59db9f9b15bd66483c099ef40e6ed8c0c SHA512 507536e83ef99a135d187b54369e12ea585a0aaa354ee4e8cf50540ffcd9b12798f11807940ee487d759617379794d447ab06bc185cb1021d06cca51908f35aa
-DIST guile.npz 27182 BLAKE2B e1e679f7f1169c5fd018ca45a7abade20953fbc85b450a6bde288845ba9e015535b8c78e8ea4d15a82f7f814d67759a72f3367ee441a87349de9cb946140ddcd SHA512 62a98d028335ce0a2a78cec86ef0e9164d10d057f0d99e5c27352f604ca06c6f0634617517ffb5d4c2609859f4316367ce805669d70002058168d332dee2f81e
-DIST hurd.npz 7819 BLAKE2B 3c0154a3ac261bd813a355b02045f7bad497ec6839810bd66d834c1024a7639bdcf424f2eadea3f0ac9b37adc00e0d62075306bd7e4e90e4d264241d8b07c9be SHA512 5a7ce05af8c0cb8b63296a19827286bee46e41c876817cd4a190f8294be8c3c53fdfab63908c9d64b93c9e104d9b36f812fc3c3e05e47dcfdb7a47f9c0a15dab
-DIST ioan.npz 8672 BLAKE2B eff0e2affc5902817da94b2ea813968c093c0fc77943ad7220a2c96f77aea96bb4019cdd345d37d0a453970e0b4c388c668e4870743612473aa1d4b0b1b442d6 SHA512 aeb707ffa3a7fc64d1a401a9f1f2c59b5d031c4443e6b679cf534be0824493f54dc20e1ceb127352e7847ac403dc1971470b52369b0bb0933f0c8ade299961d4
-DIST jhoff80.npz 4612 BLAKE2B 167174fe7e7ed9a765964a4325ac7478d1f60b7e5ea22c55b082582c68395d7c7634fbcd2e7246f7dca35d34c836da781b539300dc5e131c7ca42179eea449d4 SHA512 4d060a35f18204509726db2f1cdfd8a69444bf10e784fcc32ce54a76aa541628903e5ce70d65a64b3ea079095cdc979475ff553e428bb321640d7a87e60f6384
-DIST leonet.npz 4885 BLAKE2B 94355b22e995ba91c2c57afa6572d5a669f600d7a21b890a11150c88145727914595d39fb2ee2a8c1d3f21320ed69b06991bf7db521ff68984fae04600b18487 SHA512 789cdde6313b7cc9e8616c7969d86ed44866baa9ae88befa605d7066ca8134f167aac9490afa3918305929dbbc0acaf46708e02be4353f98ebeb3dbe3b0eefa1
-DIST melvin.npz 18147 BLAKE2B 285580aa6561e4842aee385f349c77fc8bc05ffb645f623a3fd586ad9737e6248c6a742835c2d17eca4a467f3933b16fc9278315f4d04e98f07b0532762016bf SHA512 391a82b4c42cd2597dd06b299f15cf41302ec593658929d320b66caa69cd73e7cbe3128a18c811017c3b73c435a6f42b763c6e531c8fd193715bc41f85a6b5c2
-DIST noodleman.npz 46574 BLAKE2B 408ec52adc0b65965858e54c9b281e418cdfce46fd125d30736719fd181fc0a2543f5bb486868b949db740c4a08d07b3f8abf7f3525daff2348e2eb0d24d7080 SHA512 a088c2c86303985e7d8beec34809f09fcf8e510f7c2af2530620774d1f6579ac1e5ac73989b8e423079c1171a79c92a0cb6e6e01dca950fc519007c91b86ea82
-DIST numptyphysics-0.3.4.tar.gz 1646818 BLAKE2B a78b68437bf446036b227dd9e37bcc3b7e3098f9998aa4a6172e68736b5b840db153538c063a20a02b3a1e7e2d5b0c9b3e976f5ffa8b631a44b8544e9c34bb24 SHA512 2934303737309c058f64ba9dc24a292553e065c7604c8f0964365a9ca2ef68356a68515df5d71b2d3a0f59d115ebcc8b052a17f66ca2cfd5ffa80b68a38ca407
-DIST papky.npz 2075 BLAKE2B f638dfae861027a7c89fdfdb305b273cc07aef26ae16e1e2b11bac467d0b13a663d700ca0c6aa1c3630c0b20eb453c27c87b700182e701754f25b0be3b3c16e5 SHA512 69733167ef00f64c19e4f8805e1a881332698e26950f996fc5d41e9e5580f5578b2b9d3f9781bacc9293519e139b7d531891b91f36c45031ac06da6e8e78fbfa
-DIST perli.npz 15452 BLAKE2B 9c57af22a31eead27a3e48605c362a4018a3bc9e6227ac1e9e813a9ca2f8c3e2f771d6bbfc7fe1f7415989a14852105802ea054d12ddb5c6ce2697b47dadec03 SHA512 cee513ed0e728334f0e60571e38dc68e476681bad8a22497ac01f790c6975bbffba727ede054bfc6f594f289c9bf6346c3e9b3537145707c3ed6f4d6c21136c8
-DIST qole.npz 6533 BLAKE2B 35b24ea2a5462c079099ed511abbca8abf6e7362646574726027187166cac817509ff6c1bce3ef0e57d5e086adf9585edf9e00421a0a4954e755a8b056f718da SHA512 dc624c5ffdcb0f9f18c20db7a08d7e9d9d4fa5314e3fabfa730e21bb0a27d4b415432ec66eab64d8252c7fe4793a2cff231e856ca06d85c61558a867bf2fb03b
-DIST siminz.npz 187396 BLAKE2B b7374c44aecf78ed6bf5347ff76b4cab142e2375504e48d86ebee4d6c193ebd46c337027d845a596048385c1d66edf2484e496cc6363f966275c267957dccdb9 SHA512 cedf3d90bc93adb2dac45ea69a8f87965002810527ce35122c5b1bcf1bf07fa1de9230f33bb84e542eeb0b4235216eb633d8a79cef1db34e24f8fff25f846758
-DIST szymanowski.npz 2577 BLAKE2B 827b5e15d6c1d6003d311cdf58b02b70a0986ab3232d196089f9838049cec4da1441f5e6fec2ea357820aa5e666124008b4c369f0102660c707aefb32ba9014a SHA512 b87be9d66cb3025a6168855fa473377609268c7d5fd6dbe53df7fc6156bc58dbb2d35c7e7a5d6caf88bbd92eb08ae2ac5b5d06dce6da9858e1ff1fa3553d3228
-DIST therealbubba.npz 6684 BLAKE2B debdb3a6788425726101a5368d27ade150edd1c0badcbf19903c6e9ae688adfce51c17ce276dd7c477d4d816526fe33541b34d0398563bfd0be6da5ded928c0a SHA512 c71a84345f0c6e0cde87e76b3084d89b2222d33b512458efd98d91c099b54e817b8421ea70001de6e5556c0e28be1c9fc1c19ad1411dd1b2bf194f987cdbdec6
-DIST werre.npz 7739 BLAKE2B 09f6ebfa4ffb3cc39149b39ce70940ba0437fbfd8e6ec1c905096c0d8093874d4caa7bde92b90ab4100472339b068218f75d1b64425d06f6910d1f32c39e0f90 SHA512 1caac7964cc51c6300648fa6be21f7ac3c0d585288ea2e18e725f5575a732b461b77bfd0ddf3118f5d4c922f16a30466e168bb38e81498291214597fd4442bcd
-DIST zeez.npz 8633 BLAKE2B 758382345615f942a095399e15faf8ed98e467e4454e0cc156b55d38f1cf994a23cf4bbe7895b3a276da7516758ea7bc0e7983595f77a784eca078b347590b36 SHA512 8f1945d79dc43e0bc6e2b814640d1587fc38bf8ca19f6b949821d3095eb22e9837a3f82433e452ce851b97e29d90440045866dfc6a28f9f5b31ffcf35f467e41
-EBUILD numptyphysics-0.3.4.ebuild 2294 BLAKE2B 7475c812f49a3799b50ba1568ecfcd9cb4f65aecd64de731e6093edc1be8a71686a73649a8ae87699d875ab82b69624ec8f4658edbae46121ddbad0e7624cfe6 SHA512 16d2b66c143d6f7d8bc78dd4884b4e4c99db07fc77b9581ad9a6503edd2ed8360013eab2f16314bce77936e07778f7ab0a4acd143a693a37ad3cffa26c729268
-EBUILD numptyphysics-9999.ebuild 2582 BLAKE2B 4d72ce01297bb7473f6d1809df05a6b3ca1c3f5ba47bad3c7df1f879a5ebf9063ec4b44c1634014182d834510af67ea17ce9d874fa97ee5ec1c1db2d41c191dd SHA512 4b09987f37bf36dab6d4605860d5f8d73255cdccc52bab37f5724a4a7e8dc9b846d69aa659b1502b984d081169401e2aa4f6e39d294a4099419a506ab205ecbf
-MISC metadata.xml 339 BLAKE2B 9e41c9460f243a37e945b14949cd7b4d46cde5ac5df468fddb8d3752d47cc19583d1a63d8b6287952f15bdf4cdc24e8bebb328ff0f37b895719f27805dc2d470 SHA512 a007e8ee484f70548c0348d35bf1c616da363968370ccdf30693eacef552d552e7b839e8d32d81aec1c452aeb184f3cc2af79992c2f0cd73c1fdcc010f13d29f
diff --git a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch b/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
deleted file mode 100644
index e3a7b2ee372f..000000000000
--- a/games-puzzle/numptyphysics/files/numptyphysics-0.3.4-gentoo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/external/glaserl/makefile b/external/glaserl/makefile
-index 4120459..f49d9e7 100644
---- a/external/glaserl/makefile
-+++ b/external/glaserl/makefile
-@@ -1,7 +1,5 @@
- TARGET := libglaserl.a
- 
--CFLAGS += -g -O2
--
- SOURCES := $(wildcard *.c)
- OBJECTS := $(SOURCES:.c=.o)
- 
-diff --git a/makefile b/makefile
-index 0f9a9b6..292b759 100644
---- a/makefile
-+++ b/makefile
-@@ -1,7 +1,6 @@
- APP := numptyphysics
- 
- SOURCES := $(wildcard src/*.cpp)
--CXXFLAGS += -std=c++11 -Isrc -Wall -Wno-sign-compare
- 
- all: app
- 
-@@ -13,7 +12,7 @@ app: $(TARGET)
- 
- $(TARGET): $(OBJECTS) $(LOCAL_LIBS)
- 	$(SILENTMSG) "\tLD\t$@\n"
--	$(SILENTCMD) $(CXX) -o $@ $^ $(LIBS)
-+	$(SILENTCMD) $(CXX) -o $@ $^ $(LDFLAGS) $(LIBS)
- 
- clean: $(ADDITIONAL_CLEAN_TARGETS)
- 	$(SILENTMSG) "\tCLEAN\n"
-diff --git a/src/Os.cpp b/src/Os.cpp
-index b5d7fb9..6a0ccf4 100644
---- a/src/Os.cpp
-+++ b/src/Os.cpp
-@@ -262,5 +262,5 @@ Os::globalDataDir()
-     }
- 
-     // System-wide installation
--    return thp::format("%s/../share/%s/data", g_appDir.c_str(), appName().c_str());
-+    return "/usr/share/numptyphysics/data";
- }
diff --git a/games-puzzle/numptyphysics/metadata.xml b/games-puzzle/numptyphysics/metadata.xml
deleted file mode 100644
index dc8c227d5260..000000000000
--- a/games-puzzle/numptyphysics/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="user-levels">Install some fun user-created levels</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild b/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
deleted file mode 100644
index f06dc622d84b..000000000000
--- a/games-puzzle/numptyphysics/numptyphysics-0.3.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic
-
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
-
-# This is only the SRC_URI for the user levels. The code is in git repo.
-SRC_URI="user-levels? (
-	https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz -> ${P}.tar.gz
-	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
-	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
-	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
-	http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
-	http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
-	http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
-	http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
-	http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
-	http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
-	http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
-	http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
-	http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
-	http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
-	http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
-	http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
-	http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
-	http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
-	http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
-	http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
-	http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
-	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
-)"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+user-levels"
-
-RDEPEND="
-	media-libs/libsdl2[opengl,video]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-ttf
-	virtual/opengl
-	dev-libs/glib:2
-"
-DEPEND="${DEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11 -Isrc
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild b/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
deleted file mode 100644
index 01e05708917e..000000000000
--- a/games-puzzle/numptyphysics/numptyphysics-9999.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils flag-o-matic git-r3
-
-DESCRIPTION="Crayon Physics-like drawing puzzle game using the same excellent Box2D engine"
-HOMEPAGE="http://thp.io/2015/numptyphysics/"
-
-# This is only the SRC_URI for the user levels. The code is in git repo.
-SRC_URI="user-levels? (
-	http://numptyphysics.garage.maemo.org/levels/butelo/butelo.npz
-	http://numptyphysics.garage.maemo.org/levels/catalyst/catalyst.npz
-	http://numptyphysics.garage.maemo.org/levels/christeck/christeck.npz
-	http://numptyphysics.garage.maemo.org/levels/dneary/dneary.npz
-	http://numptyphysics.garage.maemo.org/levels/gnuton/gnuton.npz
-	http://numptyphysics.garage.maemo.org/levels/gudger/gudger.npz
-	http://numptyphysics.garage.maemo.org/levels/guile/guile.npz
-	http://numptyphysics.garage.maemo.org/levels/hurd/hurd.npz
-	http://numptyphysics.garage.maemo.org/levels/ioan/ioan.npz
-	http://numptyphysics.garage.maemo.org/levels/jhoff80/jhoff80.npz
-	http://numptyphysics.garage.maemo.org/levels/leonet/leonet.npz
-	http://numptyphysics.garage.maemo.org/levels/melvin/melvin.npz
-	http://numptyphysics.garage.maemo.org/levels/noodleman/noodleman.npz
-	http://numptyphysics.garage.maemo.org/levels/papky/papky.npz
-	http://numptyphysics.garage.maemo.org/levels/perli/perli.npz
-	http://numptyphysics.garage.maemo.org/levels/qole/qole.npz
-	http://numptyphysics.garage.maemo.org/levels/siminz/siminz.npz
-	http://numptyphysics.garage.maemo.org/levels/szymanowski/szymanowski.npz
-	http://numptyphysics.garage.maemo.org/levels/therealbubba/therealbubba.npz
-	http://numptyphysics.garage.maemo.org/levels/werre/werre.npz
-	http://numptyphysics.garage.maemo.org/levels/zeez/zeez.npz
-)"
-
-EGIT_REPO_URI="https://github.com/thp/numptyphysics"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+user-levels"
-
-RDEPEND="media-libs/libsdl2[opengl,video]
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-ttf
-	virtual/opengl
-	dev-libs/glib:2"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_unpack() {
-	git-r3_src_unpack
-}
-
-src_prepare() {
-	append-cxxflags -std=c++11 -Isrc
-	sed -i '/-g -O2/d' external/Box2D/Source/Makefile \
-		external/glaserl/makefile || die
-	sed -i "/return thp::/s% thp::.*$%\"/usr/share/${PN}/data\";%" \
-		src/Os.cpp || die
-	sed -e '/CXXFLAGS +=/s/\(CXXFLAGS +=\).*\( -DAPP=.*\)/\1\2/' \
-		-e '/SILENTCMD/s/$(LIBS)$/$(LDFLAGS) $(LIBS)/' \
-		-i makefile || die
-	eapply_user
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/pathological-1.1.3-r3 b/games-puzzle/pathological-1.1.3-r3
new file mode 100644
index 000000000000..5c9cd422b1d1
--- /dev/null
+++ b/games-puzzle/pathological-1.1.3-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] doc? ( media-libs/netpbm )
+DESCRIPTION=An enriched clone of the game 'Logical' by Rainbow Arts
+EAPI=5
+HOMEPAGE=http://pathological.sourceforge.net/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-shells/bash >=dev-python/pygame-1.5.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] games-misc/games-envd
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/pathological/pathological-1.1.3.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=97a5d4a136ad0b7369c8ff6edf822045
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
deleted file mode 100644
index 1d9194351507..000000000000
--- a/games-puzzle/pathological/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pathological-1.1.3-build.patch 527 BLAKE2B eb58b42104ee13d4f438800656ac056e2b404c48615472ad18eda144c6976828e1ea3f58551d4ee9dc8032299bab492fc7c8af12048bbd6807b84af26822357a SHA512 d18b8e55d3f40fa69d0a551749b1242ba055ba8eb5bde517d7df8a46414d81232836bf232b28e77b1dcab8f0d049b3ee46ef666621674ac1be68e343e53f1c34
-AUX pathological-1.1.3-music-py.patch 475 BLAKE2B f73a83c4feba6810a39bca173845dd3b5c24ce752414f03e626879185ee53ee073c249136d9568f4866a337111d22f3aea2d13aeaeaed5b1da22a7cf520d26a5 SHA512 4a96a35d299f10ba90ff979ec77c7b117228d6e593be0b5858233fd44a0c746ad3abd52fe2751496e2ace813afc95ae7ee76c2e3d940678236de973cdae7aa87
-DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
-EBUILD pathological-1.1.3-r3.ebuild 1965 BLAKE2B 9a1856c81705fd53a79e00b847ae89e510a4f038039fe939cf94269a51ee7674a0d5ff82ca787ed78fde174276e9bea74a4554a24dd8c4a3193b3aac61e12898 SHA512 bc36d2f3f012273c2c3cdc9f74c656bfe40d51c568a3e916fd35b31d45a428717ffa9c7b6fe99de08940d66cd112912781cbaa15cb4967c822be996ccdb9801f
-MISC metadata.xml 335 BLAKE2B 775a6a1e8fcce8caa16099edfe9513a7dd1528584f8a54090e5064d9dc7b7c956caa585d90878f1f39148faf224fd941c04a2fe1be4cfdc3f1b1c27cf3a2a6c8 SHA512 d37783b18071c416deb0bbc6702ca086e84653bc7a54bc76283285eb0ece1f82a4f1b1a57ae6572b174c21a4d6d629d77f7edb8d2883cd2401f8cb0943646eaa
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-build.patch b/games-puzzle/pathological/files/pathological-1.1.3-build.patch
deleted file mode 100644
index d8793a6aef6e..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Use implicit rules to build write-highscores so we dont have to worry
-about CC/CFLAGS/LDFLAGS/etc...
-
-Include stdlib.h to get exit() prototype
-
---- write-highscores.c
-+++ write-highscores.c
-@@ -25,6 +25,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- 
- #define BUFFER_SIZE 1024
- 
---- Makefile
-+++ Makefile
-@@ -4,9 +4,6 @@
- 
- all: write-highscores html/wheel.png
- 
--write-highscores: write-highscores.c
--	gcc -s -o write-highscores write-highscores.c
--
- html/wheel.png:
- 	./makehtml
- 
diff --git a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch b/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
deleted file mode 100644
index 9d67085dd13a..000000000000
--- a/games-puzzle/pathological/files/pathological-1.1.3-music-py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Make sure music_pending_song is defined before we try using it
-
-http://bugs.gentoo.org/109272
-
---- pathological.py
-+++ pathological.py
-@@ -28,6 +28,7 @@
- colorblind = 0
- sound_on = 1
- music_on = 1
-+music_pending_song = 0
- for arg in sys.argv[1:]:
- 	if arg == '-s':
- 		screenshot = 1
-@@ -194,7 +195,7 @@
- 	sound_on = sound_on ^ 1
- 
- def toggle_music():
--	global music_on
-+	global music_pending_song, music_on
- 	music_on = music_on ^ 1
- 	if music_on:
- 		if music_pending_song:
diff --git a/games-puzzle/pathological/metadata.xml b/games-puzzle/pathological/metadata.xml
deleted file mode 100644
index f5be49640ddd..000000000000
--- a/games-puzzle/pathological/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pathological</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
deleted file mode 100644
index 88e3d609d04c..000000000000
--- a/games-puzzle/pathological/pathological-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1 games
-
-DESCRIPTION="An enriched clone of the game 'Logical' by Rainbow Arts"
-HOMEPAGE="http://pathological.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-shells/bash
-	>=dev-python/pygame-1.5.5[${PYTHON_USEDEP}]"
-DEPEND="${PYTHON_DEPS}
-	doc? ( media-libs/netpbm )"
-
-pkg_setup() {
-	games_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	unpack ./${PN}.6.gz
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-music-py.patch
-
-	if use doc ; then
-		sed -i -e '5,$ s/=/ /g' makehtml || die
-	else
-		echo "#!/bin/sh" > makehtml
-	fi
-
-	sed -i \
-		-e "s:/usr/share/games:${GAMES_DATADIR}:" \
-		-e "s:/var/games:${GAMES_STATEDIR}:" \
-		-e "s:exec:exec ${EPYTHON}:" \
-		${PN} || die
-
-	sed -i \
-		-e 's:\xa9:(C):' \
-		-e "s:/usr/lib/${PN}/bin:$(games_get_libdir)/${PN}:" \
-		${PN}.py || die
-
-	python_fix_shebang ${PN}.py
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	exeinto "$(games_get_libdir)"/${PN}
-	doexe write-highscores
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r circuits graphics music sounds ${PN}.py
-
-	insinto "${GAMES_STATEDIR}"
-	doins ${PN}_scores
-	fperms 660 "${GAMES_STATEDIR}"/${PN}_scores
-
-	dodoc changelog README TODO
-	doman ${PN}.6
-	use doc && dohtml -r html/*
-
-	doicon ${PN}.xpm
-	make_desktop_entry ${PN} Pathological ${PN}
-
-	# remove some unneeded resource files
-	rm -f "${D}/${GAMES_DATADIR}"/${PN}/graphics/*.xcf
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! has_version "media-libs/sdl-mixer[mod]" ; then
-		echo
-		elog "Since you have turned off the 'mod' use flag for media-libs/sdl-mixer"
-		elog "no background music will be played."
-		echo
-	fi
-
-}
diff --git a/games-puzzle/pauker-1.8-r1 b/games-puzzle/pauker-1.8-r1
new file mode 100644
index 000000000000..961f8e5a4bd8
--- /dev/null
+++ b/games-puzzle/pauker-1.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jdk-1.5 app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A java based flashcard program
+EAPI=6
+HOMEPAGE=http://pauker.sourceforge.net/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-java/browserlauncher2:1.0 dev-java/javahelp dev-java/lucene:2.4 dev-java/swing-layout:1 >=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/pauker/pauker-1.8.src.jar
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=0403618efb9058285364cfa647a7afe3
diff --git a/games-puzzle/pauker/Manifest b/games-puzzle/pauker/Manifest
deleted file mode 100644
index 9edccff11199..000000000000
--- a/games-puzzle/pauker/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pauker_bundledjars.patch 903 BLAKE2B 944e338bf1f0b4501ae68accaf44dcb6cd0c286722ac5077ce7748e93c524ff262a4e21fcfd2a576d2dc5c5d7d5ef9e04354e11d6e0b2a4fc9a0f018daf61708 SHA512 fd6d525fb49b956bfcecaf44e8f8044251d91341844418e1980db96bcfc6e91e86ec60aa08d112a84b1fe1c40b87e0429edfdbfaa1ea100993e89eded230bf6e
-DIST pauker-1.8.src.jar 33886665 BLAKE2B 9dddd9f7e5d5dbc9e7bc18b69e708ba3a4ea67e17b513b218eb14a77094fe40ef3d404e8dc85311ee2cd4d69587625828084cfbbf1d05534c90f40948e8ef8f4 SHA512 2d329571e857a05116ba499c4bd82669f0c99a748ca375ab06e701492a814b97fcc09bbf0ae4f48c52b05c67768a14d70a4217fee9680762424c96ab7f4341ae
-EBUILD pauker-1.8-r1.ebuild 1704 BLAKE2B 51df59fb8de90a8cb03f93fbbae9e60ecc68b076eae4bab2b1a3695b716296fb1ac2828382d2ea7d8a6c553e19a588c30d240a7b373499bf9d8451f1f2dc3203 SHA512 056bfe6a4fdf2490f02a5b1681a5173b34933b29aeb8abc24e89ba4d972933e549486c10aab32f929b9058ee4f9716a7840e309de953c09a6f99a4100a6f7da2
-MISC metadata.xml 329 BLAKE2B ac3b4fc371bc34aec1c68eccb0be370cc51c1dffb14fa0b13c5e50aa3476a5e557686a10922379026eccc8d61e60133bc199c9746484cd6a5ff588dcdfe61f67 SHA512 392a3af58bf88c1cfa5ad5f3a240b7c16d2cf4a469700d3e7628917923606b69d3aa65c01d258e17d1ad362fa4f64c424e75a73f849f4fd438f97ba951df8203
diff --git a/games-puzzle/pauker/files/pauker_bundledjars.patch b/games-puzzle/pauker/files/pauker_bundledjars.patch
deleted file mode 100644
index bebcbd088b12..000000000000
--- a/games-puzzle/pauker/files/pauker_bundledjars.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/build.xml.orig	2008-11-24 20:24:55.000000000 +1300
-+++ b/build.xml	2008-11-24 20:25:33.000000000 +1300
-@@ -88,11 +88,6 @@
-              basedir="build/classes/"
-              includes="pauker/**,tools/**"
-              excludes="pauker/Changes.txt,pauker/TODO.txt,**/*BeanInfo*,**/GraphicalStatisticPanel.gif">
--            <zipfileset src="${libs.swing-layout.classpath}"/>
--            <zipfileset src="libs/jhall.jar" excludes="META-INF/**"/>
--            <zipfileset src="libs/lucene-core-2.4.0.jar" excludes="META-INF/**"/>
--            <zipfileset src="libs/BrowserLauncher2-1_3.jar"
--                        excludes="META-INF/**,classes/,source/,package?cache/,.**,*.txt,build.xml"/>
-             <manifest>
-                 <attribute name="Main-Class" value="pauker.program.gui.swing.PaukerFrame"/>
-                 <attribute name="SplashScreen-Image" value="pauker/icons/Splash.png"/>
diff --git a/games-puzzle/pauker/metadata.xml b/games-puzzle/pauker/metadata.xml
deleted file mode 100644
index 80f7ca2adf2d..000000000000
--- a/games-puzzle/pauker/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pauker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/pauker/pauker-1.8-r1.ebuild b/games-puzzle/pauker/pauker-1.8-r1.ebuild
deleted file mode 100644
index 62c31d7abb45..000000000000
--- a/games-puzzle/pauker/pauker-1.8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc source"
-
-inherit desktop java-pkg-2 java-ant-2
-
-DESCRIPTION="A java based flashcard program"
-HOMEPAGE="http://pauker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pauker/${P}.src.jar"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/browserlauncher2:1.0
-	dev-java/javahelp
-	dev-java/lucene:2.4
-	dev-java/swing-layout:1
-"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.5
-"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	find . -iname '*.jar' -delete
-
-	eapply "${FILESDIR}/${PN}_bundledjars.patch"
-
-	java-pkg_jar-from --into libs browserlauncher2-1.0 browserlauncher2.jar BrowserLauncher2-1_3.jar
-	java-pkg_jar-from --into libs javahelp jhall.jar
-	java-pkg_jar-from --into libs lucene-2.4 lucene-core.jar lucene-core-2.4.0.jar
-	java-pkg_jar-from --into libs swing-layout-1 swing-layout.jar
-}
-
-src_compile() {
-	eant -Dfile.reference.BrowserLauncher2-1_3.jar="libs/BrowserLauncher2-1_3.jar" \
-		-Dlibs.swing-layout.classpath="libs/swing-layout.jar" \
-		-Dplatforms.JDK_1.5.home="${JAVA_HOME}" jar $(use_doc javadoc)
-}
-
-#test depend on jemmy, a netbeans module.  so unless it is packaged separately
-#tests cannot be build.
-
-src_install() {
-	java-pkg_jarinto "/usr/share/${PN}"
-	java-pkg_newjar "dist/${P}.jar"
-
-	java-pkg_dolauncher ${PN} \
-		-into "/usr" \
-		--pwd /usr/share/${PN} \
-		--main pauker.program.gui.swing.PaukerFrame
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src
-
-	newicon src/pauker/icons/repeat.png ${PN}.png
-	make_desktop_entry pauker Pauker
-}
diff --git a/games-puzzle/penguzzle-1.0-r2 b/games-puzzle/penguzzle-1.0-r2
new file mode 100644
index 000000000000..2f4813f38b51
--- /dev/null
+++ b/games-puzzle/penguzzle-1.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=Tcl/Tk variant of the well-known 15-puzzle game
+EAPI=6
+HOMEPAGE=http://www.naskita.com/linux/penguzzle/penguzzle.shtml
+KEYWORDS=~amd64 ~x86
+LICENSE=penguzzle
+RDEPEND=dev-lang/tk:0= dev-tcltk/tclx
+SLOT=0
+SRC_URI=http://www.naskita.com/linux/penguzzle/penguzzle.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=1541fd8ee0d9ee97371e3e1e5148f1b4
diff --git a/games-puzzle/penguzzle/Manifest b/games-puzzle/penguzzle/Manifest
deleted file mode 100644
index 801accda21f6..000000000000
--- a/games-puzzle/penguzzle/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX penguzzle-1.0-tclx.patch 161 BLAKE2B 2b7ffa6419d44f45f17d23166bd22729e07002f85408f34036e2f9e9e197cff302c70562f39f1d1d7576a2c33a9dfc164d596078de5fd15fd132b16f9c92546c SHA512 41292cdd6da21611de72eb363e277670bb6d641a4e9651e8ebdb4d73400a389cdc51191e0c551daab575888cbe88ff6f257c080c36c71b5000f7eb7b0d59e2c8
-DIST penguzzle.zip 21542 BLAKE2B d8f7de3c4ddac7c05aef1fafd04da81a00a22f246adaa0165dd491bf818081b3f384421f7786b4353e1d889e651568d2d10e64531573bce0636824dafbb4ace8 SHA512 fc6c57ac851df7fac7d91f90ec53fa543470e9721589966023028743951090994c372ff4538092c29aee12afc28809ad6e20a6b78ae9759bad2b41fed330b743
-EBUILD penguzzle-1.0-r2.ebuild 989 BLAKE2B 887999e3af25af6b4a1df6557340e05379556aea0d73c596459dab65135345b19e056394060fd5d132b9d7695b63b755e0752a8f1e5a8e140c8e1fd77170b463 SHA512 42d07ab7525b902c0e67080b5a95d7fb2bc5e8720c33f476467b3c32b3c4bc18d65172915413a9ee460b66f4921b586018173fab51c7ccad66cdbd47017d9fba
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch b/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
deleted file mode 100644
index 0f2ca8b8b23d..000000000000
--- a/games-puzzle/penguzzle/files/penguzzle-1.0-tclx.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/bin/penguzzle
-+++ b/bin/penguzzle
-@@ -1,4 +1,6 @@
--#!/usr/bin/wishx
-+#!/usr/bin/wish
-+package require Tk
-+package require Tclx
- 
- source ~/puzz/lib/init
- 
diff --git a/games-puzzle/penguzzle/metadata.xml b/games-puzzle/penguzzle/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/penguzzle/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild b/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild
deleted file mode 100644
index 54cc98723ec2..000000000000
--- a/games-puzzle/penguzzle/penguzzle-1.0-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Tcl/Tk variant of the well-known 15-puzzle game"
-HOMEPAGE="http://www.naskita.com/linux/penguzzle/penguzzle.shtml"
-SRC_URI="http://www.naskita.com/linux/${PN}/${PN}.zip"
-
-LICENSE="penguzzle"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/tk:0=
-	dev-tcltk/tclx
-"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}${PV}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:~/puzz/images:/usr/share/${PN}:" \
-		lib/init \
-		|| die "sed init failed"
-	sed -i \
-		-e "s:~/puzz/lib:/usr/$(get_libdir)/${PN}:" \
-		bin/${PN} \
-		|| die "sed ${PN} failed"
-
-	eapply "${FILESDIR}"/${P}-tclx.patch
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins images/img0.gif
-
-	insinto /usr/"$(get_libdir)"/${PN}
-	doins lib/init
-
-	dobin bin/${PN}
-
-	newicon images/img0.gif ${PN}.gif
-	make_desktop_entry ${PN} "Penguzzle" /usr/share/pixmaps/${PN}.gif
-
-	einstalldocs
-}
diff --git a/games-puzzle/picpuz-2.5-r1 b/games-puzzle/picpuz-2.5-r1
new file mode 100644
index 000000000000..789dd4661804
--- /dev/null
+++ b/games-puzzle/picpuz-2.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=x11-libs/gtk+:3 virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A jigsaw puzzle program
+EAPI=6
+HOMEPAGE=http://kornelix.squarespace.com/picpuz/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:3
+SLOT=0
+SRC_URI=http://kornelix.squarespace.com/storage/downloads/picpuz-2.5.tar.gz
+_eclasses_=desktop	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_=3c9e9a90f88b221e752a70f252ba1b0b
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
deleted file mode 100644
index 5d66c15f6100..000000000000
--- a/games-puzzle/picpuz/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX picpuz-2.5-build.patch 5499 BLAKE2B cb568f817502eef15695e5f1cdaad837127e6004616b63596125b3538421c51e11edafc9421b173809cc22fb166d636eb47467d23ad12b5a7446a21638e5d9ea SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11
-AUX picpuz-2.5-pthread-underlinking.patch 842 BLAKE2B c347703e5b8d069872c34b7af776ea5e5e27967683db9fa7834c876482e22dd41e36d3c16b7da31235bd0e5f5228dccf1e279be80969757a69acc8bc1b215532 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658
-DIST picpuz-2.5.tar.gz 267452 BLAKE2B c99126cb38611ad2e7013f0108631d6d5c7a51add0927be3fe45c6225a03db655770b05cc47626d5fe80680530527dcd5acc39495be7666fe9ec6959a2e5f0ca SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386
-EBUILD picpuz-2.5-r1.ebuild 1044 BLAKE2B eb75be02e73ea8f0c4d0faa9f062a3b8591ce1c6a388f7a92b661dd1d0274c59accc2d3c3183139554ec7e83e9538e98d18b1e7dcb0b079aa9945dd53ac0b654 SHA512 32bd76f61cd94c14bdb3f6c831896249f4b657522eff6d8a7cc7e42c05bc28584bd772d080f50c5555293dcd448068b17eef3f59d130393873a29ce9c5e1cf17
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
deleted file mode 100644
index dfec57fe6ec0..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 21 17:03:11 UTC 2012
-
---- picpuz-2.5/Makefile
-+++ picpuz-2.5/Makefile
-@@ -11,24 +11,26 @@
- 
- # target install directories
- BINDIR = $(PREFIX)/bin
--SHAREDIR = $(PREFIX)/share/$(PROGRAM)
--ICONDIR = $(SHAREDIR)/icons
--LOCALESDIR = $(SHAREDIR)/locales
-+DATADIR = $(PREFIX)/share/$(PROGRAM)
-+ICONDIR = $(DATADIR)/icons
-+LOCALESDIR = $(DATADIR)/locales
- DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
- MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
-+	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
- 
- $(PROGRAM).o: $(SOURCE)
--	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
-+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
- 
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
-+	$(CXX) $(CXXFLAGS) zfuncs.cc \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
- 
- install: $(PROGRAM)
- 	mkdir -p  $(DESTDIR)$(BINDIR)
-@@ -52,7 +54,7 @@
- 
- uninstall:
- 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
--	rm -R -f  $(DESTDIR)$(SHAREDIR)
-+	rm -R -f  $(DESTDIR)$(DATADIR)
- 	rm -R -f  $(DESTDIR)$(DOCDIR)
- 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
- 	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- picpuz-2.5/zfuncs.cc
-+++ picpuz-2.5/zfuncs.cc
-@@ -3111,7 +3111,6 @@
-          /prefix/share/appname/locales/         translations: appname-de.po  etc.
-          /home/user/.appname/                   parameters etc. are copied here
- 
--   zprefix        install location              has /bin and /share subtrees
-    zdatadir       installed data files          .desktop, parameters, etc.
-    zdocdir        user documentation            README, changelog, user guide
-    zicondir       icons                         icon files .png
-@@ -3123,7 +3122,7 @@
- namespace zfuncs
- {
-    char        zappname[20];
--   char        zprefix[200], zdatadir[200], zdocdir[200];                  //  app directories
-+   char        zdatadir[200], zdocdir[200];                                //  app directories
-    char        zicondir[200], zlocalesdir[200], zuserdir[200];
-    char        zlang[8] = "en";                                            //  "lc" or "lc_RC"
-    char        JPGquality[4] = "85";                                       //  JPG file save quality
-@@ -3132,7 +3131,6 @@
-    pthread_t   tid_main = 0;                                               //  main thread ID               v.4.8
- }
- 
--cchar * get_zprefix() { return zfuncs::zprefix; }                          //  /usr or /home/<userid>
- cchar * get_zuserdir() { return zfuncs::zuserdir; }                        //  /home/user/.appname
- cchar * get_zdatadir() { return zfuncs::zdatadir; }                        //  parameters, icons
- cchar * get_zdocdir()  { return zfuncs::zdocdir;  }                        //  documentation files
-@@ -3156,19 +3154,15 @@
-    
-    catch_signals();                                                        //  catch segfault, do backtrace
-    
--   strcpy(zappname,appname);                                               //  save app name
--   
--   #ifndef PREFIX                                                          //  install location                v.4.7
--      #define PREFIX "/usr"
--   #endif
--   
--   strncpy0(work,PREFIX,199);                                              //  /usr or /home/<userid>          v.4.6
--   strcpy(zprefix,work);                                                   //  /prefix
--   strncatv(zdatadir,199,work,"/share/",zappname,"/data",null);            //  /prefix/share/appname/data
--   strncatv(zicondir,199,work,"/share/",zappname,"/icons",null);           //  /prefix/share/appname/icons
--   strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
--   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
--   
-+   strcpy(zappname,appname);
-+
-+   strcpy(zdatadir,DATADIR);                                               //  macros from build script
-+   strcpy(zdocdir,DOCDIR);
-+   strcpy(zicondir,zdatadir);
-+   strcat(zicondir,"/icons");
-+   strcpy(zlocalesdir,zdatadir);
-+   strcat(zlocalesdir,"/locales");
-+
-    snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);                //  /home/user/.appname/            v.4.3
-    err = stat(zuserdir,&statdat);                                          //  does it exist already?
-    if (err) {
-@@ -3366,9 +3360,9 @@
-    fputs(work,fid);
-    fputs("Type=Application\n",fid);                                        //  Type=Application
-    fputs("Terminal=false\n",fid);                                          //  Terminal=false
--   snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command);                  //  Exec=/usr/bin/appname -options
-+   snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname);                  //  Exec=/usr/bin/appname -options
-    fputs(work,fid);
--   snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname);                 //  Icon=/usr/share/appname/icons/appname.png
-+   snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname);                 //  Icon=/usr/share/appname/icons/appname.png
-    fputs(work,fid);
-    fclose(fid);
- 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
deleted file mode 100644
index 652231f1d4ff..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix underlinking on recent binutils:
-
-> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
-> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
-> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
-diff --git a/Makefile b/Makefile
-index 28638de..700b610 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
- CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `pkg-config --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
- 	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/metadata.xml b/games-puzzle/picpuz/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/picpuz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
deleted file mode 100644
index 5da7fe0df616..000000000000
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="A jigsaw puzzle program"
-HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-pthread-underlinking.patch
-)
-
-src_compile() {
-	emake \
-		BINDIR="/usr/bin" \
-		DATADIR=/usr/share/${PN} \
-		DOCDIR=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r icons locales
-	doicon -s 48 icons/${PN}.png
-	make_desktop_entry ${PN} Picpuz
-	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
-	dodoc doc/{changelog,README,translations}
-	newman doc/${PN}.man ${PN}.1
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/pingus-0.7.6-r1 b/games-puzzle/pingus-0.7.6-r1
new file mode 100644
index 000000000000..e76d2d9475fc
--- /dev/null
+++ b/games-puzzle/pingus-0.7.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:= virtual/pkgconfig dev-util/scons[python_targets_python2_7]
+DESCRIPTION=free Lemmings clone
+EAPI=6
+HOMEPAGE=https://pingus.seul.org
+IUSE=opengl music
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:=
+SLOT=0
+SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=89179850ecbbacbeb05ba54e67934123
diff --git a/games-puzzle/pingus/Manifest b/games-puzzle/pingus/Manifest
deleted file mode 100644
index 7b9cd8bb1b49..000000000000
--- a/games-puzzle/pingus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX pingus-0.7.6-echo-e.patch 489 BLAKE2B 4268205c1c12bc5e8d4a4fb44b49b15b460763a10056a0720b28c25e76a23a0fa8568ca8163195f6ab531084fdd25c53c78d6caf8e7301123621cff58f39e10c SHA512 eb9f2859dcd68b2c1158499435a4742062069cb148e6658396c36fed6b1bba7589d9fbace40c25052e6d42a2b05cdca49561be45053dd9716ee9d9f41a5ab612
-AUX pingus-0.7.6-gcc47.patch 1096 BLAKE2B 8e7a56634eb69cc1c0797a2fa020b30e0eecf0e2ea7c00a0738915a92fd3dd4b5f51fe6dac3f7bd0cb84fea72f68f9e8edbac398b4d067dd7be2ff76560bb7be SHA512 7be7935ad664cde7c78d4363eef7391783ea868f096fc9dd03ce3e3eaaab69a839da5cb569449c106eae1779c41d9850f1a5683542bea4bf5cb98570f9d18e7d
-AUX pingus-0.7.6-gcc7.patch 675 BLAKE2B 76172b7151e30e800ab2210684a02605810b0f15b972ad6942b65c5c333f5f29e6ace7dd37a9d7541468906a2864925df5a899c5c98a6404b65dbfa802a9f5b7 SHA512 7e7fc8d7b23453b33899452d9ee19a134fe7ab1326a2560698624dc686de98108baeb026401704c06dd262c69542499b0cc3727c57d47f924f3a4020ff386027
-AUX pingus-0.7.6-noopengl.patch 315 BLAKE2B 49d2f078506c38d7da57847c6189bf0f9fd0b8a87e80b16fb848f52e37a466111be753f68dc9bf889c66d4ad9a4fea8495fe73b860001d644f2dbb0091b319fe SHA512 f375591892ddecea0659f94ab3d4fc6744625b546fdbc6d80524c25d8ee494163a9b4a90671eed9e7fa2724a1fd91ccde2e80b8ba097c21aa76e0e9fb7e6f4a0
-DIST pingus-0.7.6.tar.bz2 12622268 BLAKE2B 5ea1bbea7191919897bdedcda06f956d9b6cc0cda2ab11e475ef497ef8ba0c0de5a739ac334e2a5c9a0c138e6bfc44a23363dc59d3e4cfaea2b5388bbe57cc85 SHA512 6c8c2ace1a9229b4e3b506aee76aa94c0dd906a64fa2c817902c2cd3854df390cf675c8c6ddd3ba1926a467348b2103818bd44bc095378cc7bf3f2ff7af27188
-EBUILD pingus-0.7.6-r1.ebuild 1253 BLAKE2B 919c9b7804a82de227d068eab374816e85162180d34f3e979e2e5f4d96146d5ad0f97487d71ecee65fd81c13f846ab92acd9a1da7135d2e44d18d511fe1f5bf8 SHA512 5108028d928f683cb4ea2d612f7b3078798a88aff38570f9ff73344771580d2b21f0a2c8352054593d15fa01c8af07e756fb8808750f2e9f569458f98423656a
-MISC metadata.xml 1283 BLAKE2B 971b7c831e81413f71e70c7f66ef01b493296d33ff6bbb2997690b60c10eb1a4ffa29c47f335bbd4c57c178e35aef3d59586bbe06199bc50df34501f56b3be2d SHA512 04c0f4cb00f8b50e5f589d6bfa48389fb7fb2ff0ac2343c625f98383ec41ea77d63dbdc14d12325f3837e4961c544503f1a76a4298fa061458a71b1e198c8219
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch b/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
deleted file mode 100644
index ab772d8c72e9..000000000000
--- a/games-puzzle/pingus/files/pingus-0.7.6-echo-e.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# Work around Gentoo's crippled dash
-
---- pingus-0.7.6/Makefile
-+++ pingus-0.7.6/Makefile
-@@ -39,7 +39,7 @@
- 	install -d "$(DESTDIR)$(BINDIR)"
- 
- 	install -D build/pingus "$(DESTDIR)$(BINDIR)/pingus.bin"
--	echo -e "#!/bin/sh\nexec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
-+	printf '%s\n%s' "#!/bin/sh" "exec \"$(BINDIR)/pingus.bin\" --datadir \"$(DATADIR)\"" > "$(DESTDIR)$(BINDIR)/pingus"
- 	chmod 755 "$(DESTDIR)$(BINDIR)/pingus"
- 
- install-data:
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
deleted file mode 100644
index 3c1cac5589e4..000000000000
--- a/games-puzzle/pingus/files/pingus-0.7.6-gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/src/pingus/pingus_main.cpp
-+++ b/src/pingus/pingus_main.cpp
-@@ -465,7 +465,7 @@
- void
- PingusMain::print_greeting_message()
- {
--  std::string greeting = "Welcome to Pingus "VERSION;
-+  std::string greeting = "Welcome to Pingus " VERSION;
-   greeting += "!";
-   std::cout <<  greeting << std::endl;
-   for (unsigned int i = 0; i < greeting.length(); ++i)
---- a/src/pingus/screens/pingus_menu.cpp
-+++ b/src/pingus/screens/pingus_menu.cpp
-@@ -153,7 +153,7 @@
-                          gc.get_height()/2 - 280));
- 
-   gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
--                "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
-+                "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
-                 "See the file AUTHORS for a complete list of contributors.\n"
-                 "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
-                 "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch b/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
deleted file mode 100644
index bf04ccd047cc..000000000000
--- a/games-puzzle/pingus/files/pingus-0.7.6-gcc7.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From df6e2f445d3e2925a94d22faeb17be9444513e92 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Mon, 30 Jan 2017 15:41:53 +0000
-Subject: [PATCH] Add missing header for std::function and std::bind
-
----
- src/pingus/screens/demo_session.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/pingus/screens/demo_session.cpp b/src/pingus/screens/demo_session.cpp
-index e3ec49a2c..f887e50f0 100644
---- a/src/pingus/screens/demo_session.cpp
-+++ b/src/pingus/screens/demo_session.cpp
-@@ -18,6 +18,7 @@
- 
- #include <algorithm>
- #include <iostream>
-+#include <functional>
- 
- #include "engine/gui/gui_manager.hpp"
- #include "engine/gui/surface_button.hpp"
diff --git a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch b/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
deleted file mode 100644
index 6d1af794b032..000000000000
--- a/games-puzzle/pingus/files/pingus-0.7.6-noopengl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/engine/display/display.cpp
-+++ b/src/engine/display/display.cpp
-@@ -28,6 +28,7 @@
- #include "engine/display/delta/delta_framebuffer.hpp"
- #include "engine/display/null_framebuffer.hpp"
- #include "util/log.hpp"
-+#include "util/raise_exception.hpp"
- 
- std::unique_ptr<Framebuffer> Display::s_framebuffer;
- 
diff --git a/games-puzzle/pingus/metadata.xml b/games-puzzle/pingus/metadata.xml
deleted file mode 100644
index 844c1d47bf96..000000000000
--- a/games-puzzle/pingus/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>Pingus is a free Lemmings clone for GNU/Linux and Windows covered under the GNU GPL. Pingus
-uses ClanLib and libxml and might also be usable on some other OSs like FreeBSD, but hasn't
-been tested there. Pingus is mainly developed under GNU/Linux, that's why the Windows port
-is sometimes a bit behind.
-If you don't know Lemmingstm, here comes a short introduction. Its a puzzle game developed
-in 1991 by DMA Design. The player takes command in the game of a bunch of small animals and
-has to guide them around in levels. Since the animals walk on their own, the player can only
-influence them by giving them commands, like build a bridge, dig a hole or redirect all
-animals in the other direction. The goal of each level is to reach the exit, for fix
-multiple combination of commands are necessary. The game is presented in a 2D site view.</longdescription>
-	<upstream>
-		<remote-id type="google-code">pingus</remote-id>
-	</upstream>
-	<use>
-		<flag name="music">Enable playing of background music</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
deleted file mode 100644
index e23d02f4dafb..000000000000
--- a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
-
-DESCRIPTION="free Lemmings clone"
-HOMEPAGE="https://pingus.seul.org"
-SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl music"
-
-RDEPEND="media-libs/libsdl[joystick,opengl?,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	music? ( media-libs/sdl-mixer[mod] )
-	opengl? ( virtual/opengl )
-	media-libs/libpng:0=
-	dev-libs/boost:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-noopengl.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-echo-e.patch
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_prepare() {
-	default
-	strip-flags
-}
-
-src_compile() {
-	escons \
-		CXX="$(tc-getCXX)" \
-		CCFLAGS="${CXXFLAGS}" \
-		LINKFLAGS="${LDFLAGS}" \
-		with_opengl=$(usex opengl 1 0)
-}
-
-src_install() {
-	emake install-exec install-data \
-		DESTDIR="${D}" \
-		PREFIX="/usr"
-	doman doc/man/pingus.6
-	doicon data/images/icons/pingus.svg
-	make_desktop_entry ${PN} Pingus
-	dodoc AUTHORS NEWS README TODO
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/games-puzzle/pipepanic-0.1.3-r1 b/games-puzzle/pipepanic-0.1.3-r1
new file mode 100644
index 000000000000..784cbd2c7348
--- /dev/null
+++ b/games-puzzle/pipepanic-0.1.3-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=A simple pipe connecting game
+EAPI=6
+HOMEPAGE=http://www.users.waitrose.com/~thunor/pipepanic/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FreeArt
+SLOT=0
+SRC_URI=http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-0.1.3-source.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=18b1ddd84168a77f76f89b2e4322ba4b
diff --git a/games-puzzle/pipepanic/Manifest b/games-puzzle/pipepanic/Manifest
deleted file mode 100644
index 422d4981cf64..000000000000
--- a/games-puzzle/pipepanic/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pipepanic-0.1.3-gentoo.patch 584 BLAKE2B 7a785fc5494f71c14d2298caa87168a52d695e3b5c450c6f1395b9dee8f911fd35e28d23db4c14b252e337b203727647a48c4113b0b6349289a7044ed3c4145f SHA512 0fef3b79063bcae38412679ce5644d8d119ba3a86b8a752234d97b7009044373f6cda8e983b53864f266e5c00203fb278c61fa44af432014b1aba5a402d41bab
-DIST pipepanic-0.1.3-source.tar.gz 232200 BLAKE2B 25a344d0a78196d8416d7da663e4400acfe010b6020c3b64764c1dcf6f07d7a434add6d5c2c607a17ca356eb67fb0c8572d72410ea8ca5df915f9802792400d9 SHA512 468f3194976c7030c2fa3d8f30eaa13cc25e0b04feeb48a5d1267d119eb991618bad14ddba0a8268e6b92f38f2a17bc5b119728b222b0ee50494807832ad2ab7
-EBUILD pipepanic-0.1.3-r1.ebuild 869 BLAKE2B 8b4700bf2865b09dcf6f865e8cafdb5c5af4143bc986743c995042ed4b7d8f6e2e19eeb947911ef2aa557f3541656421e00aa7b8b303e7959c4c77b1eec2f5a5 SHA512 f1e1fb22f5c701a5e0a488c3610ec44f5ff540eb4e5f75d83b8b227add221b1986bcf15f2754ac430cd6045690edb958974ab12bbc94121965bab04c924543ce
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch b/games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch
deleted file mode 100644
index 1366b7d341c8..000000000000
--- a/games-puzzle/pipepanic/files/pipepanic-0.1.3-gentoo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru pipepanic-0.1.3-source.orig/Makefile pipepanic-0.1.3-source/Makefile
---- pipepanic-0.1.3-source.orig/Makefile	2006-05-16 16:11:29.000000000 -0400
-+++ pipepanic-0.1.3-source/Makefile	2009-11-03 13:38:52.109137983 -0500
-@@ -3,15 +3,12 @@
- TARGET=pipepanic
- 
- # Settings for x86.
--CC=gcc
--CFLAGS=-O2 -Wall -pedantic `sdl-config --cflags`
--LINK=gcc
--LDFLAGS=
-+CFLAGS+=`sdl-config --cflags`
- LIBS=`sdl-config --libs`
- 
- all:
- 	$(CC) $(CFLAGS) -c $(SOURCES)
--	$(LINK) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
-+	$(CC) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $(TARGET)
- 
- .PHONY: clean
- 
diff --git a/games-puzzle/pipepanic/metadata.xml b/games-puzzle/pipepanic/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/pipepanic/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild b/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
deleted file mode 100644
index bc849e724279..000000000000
--- a/games-puzzle/pipepanic/pipepanic-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A simple pipe connecting game"
-HOMEPAGE="http://www.users.waitrose.com/~thunor/pipepanic/"
-SRC_URI="http://www.users.waitrose.com/~thunor/pipepanic/dload/${P}-source.tar.gz"
-
-LICENSE="GPL-2 FreeArt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}-source"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	# change harcoded data paths to match the install directory
-	sed -i \
-		-e "s:/opt/QtPalmtop/share/pipepanic/:/usr/share/${PN}/:" \
-		main.h \
-		|| die "sed failed"
-}
-
-src_install() {
-	dobin "${PN}"
-
-	insinto "/usr/share/${PN}"
-	doins *.bmp
-	newicon PipepanicIcon64.png ${PN}.png
-	make_desktop_entry ${PN} "Pipepanic"
-	einstalldocs
-}
diff --git a/games-puzzle/pipewalker-0.9.4-r1 b/games-puzzle/pipewalker-0.9.4-r1
new file mode 100644
index 000000000000..799355e3fae5
--- /dev/null
+++ b/games-puzzle/pipewalker-0.9.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
+DESCRIPTION=Rotating pieces puzzle game
+EAPI=6
+HOMEPAGE=http://pipewalker.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/pipewalker/pipewalker-0.9.4.tar.gz
+_eclasses_=desktop	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_=fe502f2a63c0916f37efe06c421419a0
diff --git a/games-puzzle/pipewalker/Manifest b/games-puzzle/pipewalker/Manifest
deleted file mode 100644
index 50787c98da6c..000000000000
--- a/games-puzzle/pipewalker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pipewalker-0.9.4.tar.gz 948399 BLAKE2B 262cb373fca5aa5fd895a48d29d91e4efed5550b4798adf26bfdc869ec9153610cd04a0a0358d02909c885a41fb96f15a15ecc901b6ba95047d240d07d449685 SHA512 f4930739732164153663d11036eb2ac09447766779bc80bff4d355fe1bb764d617510ecf8d804f1ce0d81f58204b4e4049fb76246bc4e599c06c492b9c771951
-EBUILD pipewalker-0.9.4-r1.ebuild 672 BLAKE2B f5a17e6a68d15d2290161a6abf11f319ea7ecfb43480a4fa5e02ed68e16f20453abe73b1568cc0df7a20d62ba2b17173f2cfe994be935e6fa507700c1b4f1ea3 SHA512 cf7d64489227b6c4aafd4b4b42bd3e3f1e104a55ef97b808620ec513b6c4120334019d9b3af8c370724a6aa4b1a88dd31faf6b23ef509ad3642762704a3ec94f
-MISC metadata.xml 333 BLAKE2B 79283adcb9b624e2ce653dbc467cd87eeec420841e088a45bcb4726876bb796fd370a3d6feee64bc643e940ec18b8e83cca1cf3eaced4cc8127b3548ae610678 SHA512 51d60e626855010c46bc4d9022cb7b84965eac827ec82fe2cf02db6e9f7706f9f81cb2af66fe4e4bab64963cc64b7d5d6009aa38a850ec87322fb07ac1c7f0dd
diff --git a/games-puzzle/pipewalker/metadata.xml b/games-puzzle/pipewalker/metadata.xml
deleted file mode 100644
index ae5d354a68f5..000000000000
--- a/games-puzzle/pipewalker/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pipewalker</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild b/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild
deleted file mode 100644
index bab059bfdd7e..000000000000
--- a/games-puzzle/pipewalker/pipewalker-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop flag-o-matic
-
-DESCRIPTION="Rotating pieces puzzle game"
-HOMEPAGE="http://pipewalker.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pipewalker/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[opengl,video]
-	virtual/opengl
-	virtual/glu"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	append-flags $(sdl-config --cflags)
-	econf --datadir="/usr/share"
-}
-
-src_install() {
-	emake -C data DESTDIR="${D}" install
-	dobin src/${PN}
-	doicon extra/${PN}.xpm
-	make_desktop_entry ${PN} PipeWalker
-	einstalldocs
-}
diff --git a/games-puzzle/quadra-1.2.0-r1 b/games-puzzle/quadra-1.2.0-r1
new file mode 100644
index 000000000000..d8b4d3404707
--- /dev/null
+++ b/games-puzzle/quadra-1.2.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib sys-devel/bc x11-base/xorg-proto
+DESCRIPTION=A tetris clone with multiplayer support
+EAPI=6
+HOMEPAGE=https://github.com/quadra-game/quadra
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXxf86vm x11-libs/libXext media-libs/libpng:0= sys-libs/zlib
+SLOT=0
+SRC_URI=https://github.com/quadra-game/quadra/archive/v1.2.0.tar.gz -> quadra-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=f5aee0ddbf294a2c4d921eb20e92c6ce
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
deleted file mode 100644
index 1c3b62b8f221..000000000000
--- a/games-puzzle/quadra/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX quadra-1.2.0-format.patch 491 BLAKE2B 21341a7d0a6fa1556d9d79d3fa55f2cb1fc4cf6244dc8fbdc937acb9250bec258818ffd6644d1f40a5fc0db07e64555121f2d0ce5c9ef9ffeadf2da6ebe78412 SHA512 a0a05c3ced44a88d7766a0ef2053dce378df4e6cec74acc7d074a27bffc48d6c43977289e779bc526d730b9d5c8acc18c1cc46c865f3ea7de0a6226937a08ffe
-DIST quadra-1.2.0.tar.gz 5103875 BLAKE2B 7b0bce4e8be77de2e357cd14f60ebdbf3ef72f2262013954bca9a8d1a9a2833e00a0fe59f818b78603628999e7e1204c6974a5d9f74f4ea9bb288325d518744c SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837
-EBUILD quadra-1.2.0-r1.ebuild 916 BLAKE2B 93ae5d77d1550e6093955fd293ee12ca3b794d8237ffe34d760e99192418a1e1a35c9a6e875be5d0e5810fb2592f5d1fbe04ccb1da4f394f5609bc176c3e1262 SHA512 0291db9fde214222cdea677e5a287c71d2186d7ee84579c7655a8c45acaaf4544f2cfd39d7372e1e9b29e0ff09ad1a2455095ef55ade8ce52d835528aa7e83cd
-MISC metadata.xml 329 BLAKE2B b57a9d305d40db5c2682878b7c26c6150bbcc7825c17169c9380a288b69aec71d51793dbf0071f157a8e03be1d90632d26227cffc6855982562d37b606982a1e SHA512 81750413c002a39166c0802840aac367a3b07f61a1c711bb68fdea6f8dff71f4689c24ccf75c61336f03ddea9993c45c5b869d2f3467540f4695a35da9a6438f
diff --git a/games-puzzle/quadra/files/quadra-1.2.0-format.patch b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
deleted file mode 100644
index ca56f5b4cc00..000000000000
--- a/games-puzzle/quadra/files/quadra-1.2.0-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/net_list.cpp.old	2015-12-08 21:41:16.782404098 +0100
-+++ b/source/net_list.cpp	2015-12-08 21:41:33.153114600 +0100
-@@ -693,7 +693,7 @@
- 				//Drawn at a total higher or equal to end_value: suspense!
- 				//  or maybe timer just elapsed and the game is drawn
- 				//  (still suspense! :))
--				sprintf(st, ST_GAMETIED);
-+				sprintf(st, "%s", ST_GAMETIED);
- 				message(-1, st);
- 				{ Sfx stmp(sons.levelup, 0, 0, -1, 18050); }
- 				{ Sfx stmp(sons.levelup, 0, 0, -1, 18100); }
diff --git a/games-puzzle/quadra/metadata.xml b/games-puzzle/quadra/metadata.xml
deleted file mode 100644
index 018874d4b550..000000000000
--- a/games-puzzle/quadra/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">quadra</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
deleted file mode 100644
index c811bb17564e..000000000000
--- a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A tetris clone with multiplayer support"
-HOMEPAGE="https://github.com/quadra-game/quadra"
-SRC_URI="https://github.com/${PN}-game/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/bc
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^libgamesdir:=/s:/games:/${PN}:" \
-		-e "/^datagamesdir:=/s:/games:/${PN}:" \
-		config/config.mk.in || die
-	eapply "${FILESDIR}"/${P}-format.patch
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins ${PN}.res
-	doicon images/${PN}.xpm
-	make_desktop_entry ${PN} Quadra
-
-	HTML_DOCS="help/*" einstalldocs
-}
diff --git a/games-puzzle/quadrapassel-3.22.0 b/games-puzzle/quadrapassel-3.22.0
new file mode 100644
index 000000000000..ae5df68f7cd6
--- /dev/null
+++ b/games-puzzle/quadrapassel-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.12:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Fit falling blocks together
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Quadrapassel
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/glib:2 >=gnome-base/librsvg-2.32.0:2 >=media-libs/clutter-1:1.0 >=media-libs/clutter-gtk-0.91.6:1.0 >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/gtk+-3.12:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/quadrapassel/3.22/quadrapassel-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5e0fe5fb53be53799e1a65cfafc50a7
diff --git a/games-puzzle/quadrapassel/Manifest b/games-puzzle/quadrapassel/Manifest
deleted file mode 100644
index c697a447c235..000000000000
--- a/games-puzzle/quadrapassel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST quadrapassel-3.22.0.tar.xz 1737252 BLAKE2B fb3d611f59b4b42d1e3278e562b5d537bbd3fa5de9d433d8445c291971a777b674ec384d7faf6c3b09fd6187555fc448fb38d2a379ea3c2bb7f7b321e6a9346a SHA512 82cbac9b8bc1e7d0bc7958807037893c2dd0286fdc63c2f35ffc7fdcfd839cc6ddd115bada057aa9a3694fbb2736c0c7b852e0156be6fd59a85f6eb06f6f9a84
-EBUILD quadrapassel-3.22.0.ebuild 724 BLAKE2B 732d7c3f9e4d6feaeaff5aa838013e197096294a8fc02c0047ffcc5ea19be7b7a2b1d73b8047a19db42ae072b60bba01390221579e02ae6f046a9acd8fb47c30 SHA512 8b7790d19eb8a9fcc2105539afa79b2baa06146f32630079f755f41b49120ddbde87adb3a21d360524c4ef15b4709c0017d94fe6e5a59fdce793ab49a0e8d9c4
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/quadrapassel/metadata.xml b/games-puzzle/quadrapassel/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/quadrapassel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
deleted file mode 100644
index 175f792c2862..000000000000
--- a/games-puzzle/quadrapassel/quadrapassel-3.22.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Fit falling blocks together"
-HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	>=gnome-base/librsvg-2.32.0:2
-	>=media-libs/clutter-1:1.0
-	>=media-libs/clutter-gtk-0.91.6:1.0
-	>=media-libs/libcanberra-0.26[gtk3]
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/rezerwar-0.4.2-r1 b/games-puzzle/rezerwar-0.4.2-r1
new file mode 100644
index 000000000000..6da2c0615e2b
--- /dev/null
+++ b/games-puzzle/rezerwar-0.4.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
+DESCRIPTION=Puzzle game like the known tetromino and the average pipe games
+EAPI=6
+HOMEPAGE=http://tamentis.com/projects/rezerwar/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://tamentis.com/projects/rezerwar/files/rezerwar-0.4.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=e3167945521888ff630b1232d03b7d82
diff --git a/games-puzzle/rezerwar/Manifest b/games-puzzle/rezerwar/Manifest
deleted file mode 100644
index 3a57c79814b9..000000000000
--- a/games-puzzle/rezerwar/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rezerwar-0.4.2.tar.gz 4332498 BLAKE2B d1eab4137fe56ba39c81c04ab75b9b0b9dac7baaf01e861d84801aee255074c4dc0c24662aa61993af7b80f0dbe831dfef1574fd1b2686ecb8500aaa68b6c279 SHA512 0ab1b00d982a96f2fd1346ff822efc68ae0e6c14a4d190ba0e8720fb119d7750851803c1387e83b93eee9cd43e332631360a67534495c20969366c885e2297ee
-EBUILD rezerwar-0.4.2-r1.ebuild 1063 BLAKE2B 9ede59c7616f3f397e476e10fe8a9589ae38512d0f613300ec7bd35f973652b1fcc00d94c6baeeb7120033273b58bd8568179b2ac520823652349a745fbe320f SHA512 ff9bcd00ab7dde9ac9f740eafcd21921ffb3df533c4c6cb755038f40a03ac725646da5dbfb7fa301008f28c71ec2bc088a7d5b18a31b703c1672c71ea06ce0cf
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/rezerwar/metadata.xml b/games-puzzle/rezerwar/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/rezerwar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild b/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
deleted file mode 100644
index 042921d7df86..000000000000
--- a/games-puzzle/rezerwar/rezerwar-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Puzzle game like the known tetromino and the average pipe games"
-HOMEPAGE="http://tamentis.com/projects/rezerwar/"
-SRC_URI="http://tamentis.com/projects/rezerwar/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/check_sdl$/d' \
-		-e 's/-O2 //' \
-		configure \
-		|| die 'sed failed'
-	sed -i \
-		-e '/CC.*OBJECTS/s:$(CC):$(CC) $(LDFLAGS):' \
-		mkfiles/Makefile.src \
-		|| die "sed failed"
-}
-
-src_configure() {
-	SDLCONFIG=sdl-config \
-	TARGET_BIN="/usr/bin" \
-	TARGET_DOC=/usr/share/doc/${PF} \
-	TARGET_DATA="/usr/share/${PN}" \
-		./configure || die "configure failed"
-	sed -i \
-		-e '/TARGET_DOC/d' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	dodir /usr/bin
-	default
-	dodoc doc/{CHANGES,README,TODO}
-	make_desktop_entry rezerwar Rezerwar
-}
diff --git a/games-puzzle/scramble-0.9.5-r1 b/games-puzzle/scramble-0.9.5-r1
new file mode 100644
index 000000000000..3cbad2583070
--- /dev/null
+++ b/games-puzzle/scramble-0.9.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[png] media-libs/sdl-ttf media-libs/libpng:0 sys-apps/miscfiles >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Create as many words as you can before the time runs out
+EAPI=6
+HOMEPAGE=http://www.shiftygames.com/scramble/scramble.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libsdl-1.2[sound,video] >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[png] media-libs/sdl-ttf
+SLOT=0
+SRC_URI=http://www.shiftygames.com/scramble/scramble-0.9.5.tar.gz
+_eclasses_=autotools	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_=22c7f934147e914c51c80fae8418f85f
diff --git a/games-puzzle/scramble/Manifest b/games-puzzle/scramble/Manifest
deleted file mode 100644
index 92809aa388ea..000000000000
--- a/games-puzzle/scramble/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST scramble-0.9.5.tar.gz 552301 BLAKE2B 9bbdbe1551ba03dc66342eaab9b7e85356ca6fa78f2bbf7423b79a65cfe46711f0818ff41cba81a98b3888c9558692ec9879095e6353216675a869ab4544753f SHA512 ff361cefe842d6b2019a78571182fe35fc77a1332d6365211af7cf292da8532023bd565b7eed8b44545716474d441b0793253e856a1cad937f62396a5a29bd2b
-EBUILD scramble-0.9.5-r1.ebuild 977 BLAKE2B 6bb090026f26a0c4c90ebfb542bb21d9f187fb5fe7d07a2290fefdf9725efd49d6c086c7b2a20f0737623f51aa16fd52bbe16ea5ecd5ea91b5bb9654acc6ba3c SHA512 938d635fe8e1eacbf36d1183e939278bd1cd1f16325b9c6dfc3e2b464436fb969bbb58acd7a6320362eafa1b367db1fe0d45091055227f15d375b6377f5d26db
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/scramble/metadata.xml b/games-puzzle/scramble/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/scramble/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild b/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
deleted file mode 100644
index 9158e8985e9a..000000000000
--- a/games-puzzle/scramble/scramble-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="Create as many words as you can before the time runs out"
-HOMEPAGE="http://www.shiftygames.com/scramble/scramble.html"
-SRC_URI="http://www.shiftygames.com/scramble/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2[sound,video]
-	>=media-libs/sdl-mixer-1.2[vorbis]
-	>=media-libs/sdl-image-1.2[png]
-	media-libs/sdl-ttf
-"
-DEPEND="${RDEPEND}
-	media-libs/libpng:0
-	sys-apps/miscfiles
-"
-
-src_prepare() {
-	default
-	pngfix -q --out=pics/background-fixed.png pics/background.png
-	mv -f pics/background-fixed.png pics/background.png
-	append-cflags $(sdl-config --cflags)
-	sed -i -e 's/inline //' src/scramble.c || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon pics/sg_icon.png ${PN}.png
-	make_desktop_entry ${PN} "Scramble"
-}
diff --git a/games-puzzle/sdl-jewels-1.1.1-r1 b/games-puzzle/sdl-jewels-1.1.1-r1
new file mode 100644
index 000000000000..8388adfdd299
--- /dev/null
+++ b/games-puzzle/sdl-jewels-1.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[opengl,video] virtual/opengl
+DESCRIPTION=Swap and match 3 or more jewels in a line in order to score points
+EAPI=6
+HOMEPAGE=http://www.linuxmotors.com/gljewel/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[opengl,video] virtual/opengl
+RESTRICT=test
+SLOT=0
+SRC_URI=http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-1.1.1.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=add4b9d26537ab66f22c9995879e93d3
diff --git a/games-puzzle/sdl-jewels/Manifest b/games-puzzle/sdl-jewels/Manifest
deleted file mode 100644
index a37e58f09e40..000000000000
--- a/games-puzzle/sdl-jewels/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX sdl-jewels-1.1.1-Makefile.patch 488 BLAKE2B 95eceefb92d28c8968790c7b2b3954d957bc2f59a0764efb66aea618b6db0f01272a2bf7a56a6789b601e2e76a6f96497074a8c4689e924c5f08a7bd7ebb2317 SHA512 9d83dea588f699ef09f89ed320bece1bb001ee0a1bfa4d3e4d4b8c679af9b2028d535469c078f387564b37a16ee0e76f3e9cf20a4248784bf322ac902aa03f26
-DIST SDL_jewels-1.1.1.tgz 195366 BLAKE2B 4f8e3c85b8d6cc6388846fe3783cc3fed3cf1901a57788c8ebd62473ac3f0635eaf0f3f1017a06961706ec3143f8807b8170dc0a715b570e44c66a578eb7dae3 SHA512 720f1d89384bf267e8f5441efd70fcf94bfc89ddbd0ff90b1dafc6381e83e005281fcde256ee4cd0645f2832cf9c22aed487c105d7d9cf39711c5752e12763c4
-EBUILD sdl-jewels-1.1.1-r1.ebuild 968 BLAKE2B b2377f0968329902e5397f91d65978a933d6c8df57498165f6aca1c535907b1bb7d5faef0952232c6d71ef2c4dd099330a4fdb856a138e5dd0a7a6832d1c240e SHA512 50381f1020f1b8037ecfc9ac099e44c8850ecde13ce9aae6f5f45fe758d23b4399865dd7ea8a9470b5262d5f6b786c79463e8a6bdebfc8b5a27d52b9494545ae
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch b/games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch
deleted file mode 100644
index ba27fd5447bf..000000000000
--- a/games-puzzle/sdl-jewels/files/sdl-jewels-1.1.1-Makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- SDL_jewels-1.1.1/Makefile.old	2010-11-13 00:46:47.196000082 +0000
-+++ SDL_jewels-1.1.1/Makefile	2010-11-13 01:45:14.516000087 +0000
-@@ -1,11 +1,12 @@
- EXE = gljewel
- 
--CFLAGS = -O2 -Wall $(shell sdl-config --cflags)
--LDFLAGS = $(shell sdl-config --libs) -lGL -lm
-+CFLAGS += -Wall $(shell sdl-config --cflags)
-+LIBS = $(shell sdl-config --libs) -lGL -lm
- 
- OBJS	= $(EXE).o matrix.o sound.o
- 
- $(EXE):	$(OBJS)
-+	$(CC) $(LDFLAGS) $^ $(LIBS) -o $@
- 
- $(EXE).o: $(EXE).c matrix.h misc.h
- 
diff --git a/games-puzzle/sdl-jewels/metadata.xml b/games-puzzle/sdl-jewels/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/sdl-jewels/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild b/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
deleted file mode 100644
index e9f6f0422ae1..000000000000
--- a/games-puzzle/sdl-jewels/sdl-jewels-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop vcs-clean
-
-DESCRIPTION="Swap and match 3 or more jewels in a line in order to score points"
-HOMEPAGE="http://www.linuxmotors.com/gljewel/"
-SRC_URI="http://www.linuxmotors.com/gljewel/downloads/SDL_jewels-${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND="
-	media-libs/libsdl[opengl,video]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/SDL_jewels-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}-Makefile.patch"
-
-	# fix the data dir locations as it looks to be intended to run from src dir
-	sed -i -e "s|\"data\"|\"/usr/share/${PN}\"|" sound.c || die
-	sed -i -e "s|data/bigfont.ppm|/usr/share/${PN}/bigfont.ppm|" gljewel.c || die
-	ecvs_clean
-}
-
-src_install() {
-	dobin gljewel
-
-	insinto "/usr/share/${PN}"
-	doins -r data/*
-
-	einstalldocs
-	make_desktop_entry gljewel SDL_jewels
-}
diff --git a/games-puzzle/seatris-0.0.14 b/games-puzzle/seatris-0.0.14
new file mode 100644
index 000000000000..24f21b2bd755
--- /dev/null
+++ b/games-puzzle/seatris-0.0.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/pkgconfig
+DESCRIPTION=A color ncurses tetris clone
+EAPI=5
+HOMEPAGE=http://www.earth.li/projectpurple/progs/seatris.html
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.earth.li/projectpurple/files/seatris-0.0.14.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_=65abdf2ad1381b147940bb8deacb163d
diff --git a/games-puzzle/seatris/Manifest b/games-puzzle/seatris/Manifest
deleted file mode 100644
index 2faca1e489c0..000000000000
--- a/games-puzzle/seatris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX seatris-0.0.14-as-needed.patch 215 BLAKE2B 3d2ea91214f6f00ec767aa00bfce6c77c7a42132a94f0e394d0a7f89c1eeaa3ff9d8638cce1321f6fb97bec614fbdb0f07fcbc68a2cd65fbd48373887aaa5846 SHA512 587f8f4f555b6a97d38a0c7bb8069674e6612ff5e3027b7c7327a02178aabdc20a6d32f63b7a667eac31480e435f575844afdd79523707d0fcf586417d8fd38b
-DIST seatris-0.0.14.tar.gz 53056 BLAKE2B 8efbc4531f98f06857815c86e2833ede03de3206bfc89efe387e2b388252c05d11b404e4a72fe6b33f215908cf03bc5687c627fa61943cb549c59bfb82455939 SHA512 105722ddbeaa8ae3863331126cf816e7d590ebe4ca244b32d3275071c2537c2865183a90f60f8dbf46cfacbcee4e811b653ff9cc6d2eae51c9ed6efa9263fac2
-EBUILD seatris-0.0.14.ebuild 916 BLAKE2B 13f466c641404c7abd4c2dddeae48c93dceef273c709291b803d49caef50013bfdf437c079c79fd42352c4b5e865a0bad5b7548b73c979ff4dd7b28eb283086e SHA512 a4fd27855ebd40034b4d7878dd953019148d6c5ed7b1403c4a75b2ead6c8840b0776ab2bf340348268ee1dc9eb440841acf77f237728d5c41e89976e3347378f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch b/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
deleted file mode 100644
index e77c0dd75077..000000000000
--- a/games-puzzle/seatris/files/seatris-0.0.14-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -11,7 +11,7 @@
- 	parse.o readcfg.o
- 
- seatris: $(OBJS)
--	$(CC) $(LFLAGS) $(LIBS) -o seatris $(OBJS)
-+	$(CC) $(LDFLAGS) -o seatris $(OBJS) $(LIBS)
- 
- clean:
- 	rm -f *.o seatris
diff --git a/games-puzzle/seatris/metadata.xml b/games-puzzle/seatris/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/seatris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/seatris/seatris-0.0.14.ebuild b/games-puzzle/seatris/seatris-0.0.14.ebuild
deleted file mode 100644
index 30d84fd4afed..000000000000
--- a/games-puzzle/seatris/seatris-0.0.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="A color ncurses tetris clone"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/seatris.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-RDEPEND="sys-libs/ncurses"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e "s:/var/lib/games:${GAMES_STATEDIR}:" \
-		scoring.h seatris.6 || die
-
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-}
-
-src_compile() {
-	emake LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install () {
-	dogamesbin seatris
-	doman seatris.6
-	dodoc ACKNOWLEDGEMENTS HISTORY README TODO example.seatrisrc
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/seatris.score"
-	fperms 660 "${GAMES_STATEDIR}/seatris.score"
-	prepgamesdirs
-}
diff --git a/games-puzzle/sgt-puzzles-20171029 b/games-puzzle/sgt-puzzles-20171029
new file mode 100644
index 000000000000..2b8c17a8617d
--- /dev/null
+++ b/games-puzzle/sgt-puzzles-20171029
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.2 ) >=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=Simon Tatham's Portable Puzzle Collection
+EAPI=6
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+IUSE=+doc gtk3
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-20171029.69773d8.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_=e602c2fa5ba2bca72e78f24bf3570910
diff --git a/games-puzzle/sgt-puzzles-99999999 b/games-puzzle/sgt-puzzles-99999999
new file mode 100644
index 000000000000..7f182e8f7886
--- /dev/null
+++ b/games-puzzle/sgt-puzzles-99999999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) dev-lang/perl virtual/pkgconfig doc? ( >=app-doc/halibut-1.2 ) >=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 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Simon Tatham's Portable Puzzle Collection
+EAPI=6
+HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/puzzles/
+IUSE=+doc gtk3
+LICENSE=MIT
+RDEPEND=!gtk3? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-misc/xdg-utils
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~np-hardass/distfiles/sgt-puzzles/sgt-puzzles-icons-20160315.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b16b42700f5a383216cd7fa2e1664b30
diff --git a/games-puzzle/sgt-puzzles/Manifest b/games-puzzle/sgt-puzzles/Manifest
deleted file mode 100644
index eb0a71b2d714..000000000000
--- a/games-puzzle/sgt-puzzles/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX sgt-puzzles-20161207-builtin-help.patch 3086 BLAKE2B 80af8579911c9abd09324664609eac6b849cdec14925e0b6f86c014153980003ccf7c2c42ee532e4a4373a9ec31df9753d2ddd2d6b198561d478bd316812383f SHA512 daa001156ae8eadb8b4012d6713a327efb52e43271c9dbae936bf1002575548c2ef6b1aa39ea95278a602b38d443cd90507d4d9fedd4e4494b1fbf3222250fe4
-AUX sgt-puzzles.directory 65 BLAKE2B c51b022658d8bcc7b004f953f58c9848a992e5f82cfe5354d5dd3399fb12f355f609a33f3216998398572efc328cb19dc2228b70f55fb3488d8f05be3b089eb7 SHA512 b6cada99b9afae8407b494e066ce271cd65980e2d225e512d55b1905e93e70af3763e7e6e76fcdf30314005dfa309a5daa7e2ac6d83d312edaf2f74869d8079c
-AUX sgt-puzzles.menu 556 BLAKE2B 3e7ca65d13dbdd2d54520d549728cbf5d53e59f7d6cd836fa5807d8b883de157dbc006a8023831e15bdcceaa5828f5ce5cb19bbf89e635a352cbe0e864b18691 SHA512 2b3d68ae2eef33199953fe85af08c87ba91cfc8c1ea92b535af90c5f07fcbbccec124a0b9701b8cafe92786d945f2ed499e046a55d1e6da1bbb02ae5f02e5ee9
-DIST puzzles-20171029.69773d8.tar.gz 2923623 BLAKE2B 2e97005aa5ea7e95b4f312067d406fd37f5f89638b335c5eee748f4d8c2977f663cde91ea29d57ffb1cb3eb5264cad36a46106dc8f14ddedcb0dc5f4b3e4c1f6 SHA512 ca9885bcadd0bb979167f2f0b6129a17aeab6d7fd31eeabc9d29ab526a5a137b03f1f4aea7a268109c5aee1a522d514bf522ad25673705f50addd685401d7fb8
-DIST sgt-puzzles-icons-20160315.tar.xz 715536 BLAKE2B c50b3a6a0d0f8a052215dd9fba7c3eca5822bc7f866a825ad5e92391bb1867d141793877bc7c4545cc6da674bf273752612f7d3578a6a05b22cc2552ea798ce6 SHA512 2fe2c02984eb8c36ac6fb4195be7895b336b84f40ce8baeb23dc8a32aca9937ccf1d33050b4da3cfba3c87e124ecbdd940ee4e990b37eabe8e2af897c2e23b57
-EBUILD sgt-puzzles-20171029.ebuild 2469 BLAKE2B 2eb3149c037babbf64ed85b10f2eb948b2555d6ac015e3c5cc8ca0be7d85de6b0e6dfeac4580662c87d086f9e00643bacaea3e853548e0d25c68cb9f0b7fdec1 SHA512 dffa784d55c7a82ce632956f29e970091de1e3ee46b7a558072831d570498d4f4df82a40d9302b21719fafe3c6876f0e54559b2a4260fc948b6d947d0050cf03
-EBUILD sgt-puzzles-99999999.ebuild 2471 BLAKE2B 0abde514c681107afd85fc119ed58be61ce039408a26ad73433afec8d286e3031473bb8ba7b6c36b7679f498cd1081a0c9143bf9f7722d49468eb422cd71aea5 SHA512 c32aa429bb8943444c9d2291882a17e8469716448d2ca4bf3344030dbf46773e2ecf8a9b78103a892a5aa0a427f2750c614e53614c59aae3e47a149a8e4411d6
-MISC metadata.xml 450 BLAKE2B dd64e755862b5c621530b5dc2f612247acb16fda51d5f6018bfb9ca580cc7176d8cd62eda86b540cb260d2056572a887ecf7fdad8ddd563aaf13c494d42689db SHA512 1f1187d3e661b3913f0a9c02fc9b2980c90bc7829daf87ef5f59b03d87fb32680f30cbf2c922b92fde7c79f961872d1d7b13368db8b8eacba79340c6de2778ff
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch b/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
deleted file mode 100644
index a5c3a3695bd1..000000000000
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles-20161207-builtin-help.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Based on http://sources.debian.net/patches/sgt-puzzles/20160429.b31155b-1/202_online-help.diff/
-Simply opens HTML help files with xdg-open
-
-Author: Ben Hutchings <ben@decadent.org.uk>
-Description: Add HTML-based online help
-
-This works along the same lines as the Windows implementation,
-though we have to try a bit harder to find a help browser.
-
---- a/gtk.c	2016-12-08 07:53:06.812409184 -0500
-+++ b/gtk.c	2016-12-08 07:58:06.426415886 -0500
-@@ -2,6 +2,10 @@
-  * gtk.c: GTK front end for my puzzle collection.
-  */
- 
-+#ifndef _POSIX_C_SOURCE
-+#define _POSIX_C_SOURCE 1 /* for PATH_MAX */
-+#endif
-+
- #include <stdio.h>
- #include <assert.h>
- #include <stdlib.h>
-@@ -10,6 +14,9 @@
- #include <string.h>
- #include <errno.h>
- #include <math.h>
-+#include <limits.h>
-+#include <unistd.h>
-+#include <locale.h>
- 
- #include <sys/time.h>
- #include <sys/resource.h>
-@@ -2270,6 +2277,37 @@
-     resize_fe(fe);
- }
- 
-+static void show_help(frontend *fe, const char *topic)
-+{
-+    char path[PATH_MAX + 1];
-+
-+    sprintf(path, "%s/%s.html", HTMLDIR, topic);
-+    if (access(path, R_OK) != 0) {
-+        error_box(fe->window, "Help file could not be found");
-+        return;
-+    }
-+
-+    const char *argv[3];
-+
-+    argv[0] = "xdg-open";
-+    argv[1] = path;
-+    argv[2] = NULL;
-+    if (! g_spawn_async(NULL, (char **)argv, NULL,
-+                      G_SPAWN_SEARCH_PATH,
-+                      NULL, NULL, NULL, NULL))
-+        error_box(fe->window, "Failed to open help file");
-+}
-+
-+static void menu_help_contents_event(GtkMenuItem *menuitem, gpointer data)
-+{
-+    show_help((frontend *)data, "index");
-+}
-+
-+static void menu_help_specific_event(GtkMenuItem *menuitem, gpointer data)
-+{
-+    show_help((frontend *)data, thegame.htmlhelp_topic);
-+}
-+
- static void menu_about_event(GtkMenuItem *menuitem, gpointer data)
- {
-     frontend *fe = (frontend *)data;
-@@ -2590,6 +2628,25 @@
-     menu = gtk_menu_new();
-     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);
- 
-+    menuitem = gtk_menu_item_new_with_label("Contents");
-+    gtk_container_add(GTK_CONTAINER(menu), menuitem);
-+    g_signal_connect(G_OBJECT(menuitem), "activate",
-+                     G_CALLBACK(menu_help_contents_event), fe);
-+    gtk_widget_show(menuitem);
-+
-+    if (thegame.htmlhelp_topic) {
-+        char *item;
-+        assert(thegame.name);
-+        item = snewn(9+strlen(thegame.name), char); /*ick*/
-+        sprintf(item, "Help on %s", thegame.name);
-+        menuitem = gtk_menu_item_new_with_label(item);
-+        sfree(item);
-+        gtk_container_add(GTK_CONTAINER(menu), menuitem);
-+        g_signal_connect(G_OBJECT(menuitem), "activate",
-+                         G_CALLBACK(menu_help_specific_event), fe);
-+        gtk_widget_show(menuitem);
-+    }
-+
-     menuitem = gtk_menu_item_new_with_label("About");
-     gtk_container_add(GTK_CONTAINER(menu), menuitem);
-     g_signal_connect(G_OBJECT(menuitem), "activate",
---- a/Recipe
-+++ b/Recipe
-@@ -95,6 +95,7 @@ Puzzles.dmg: Puzzles
-
- !begin am
- bin_PROGRAMS = $(GAMES)
-+GTK_CFLAGS += -DHTMLDIR="\"$(htmldir)\""
- !end
- !begin am_begin
- GAMES =
-
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory b/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
deleted file mode 100644
index 25aa1aefbf5b..000000000000
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles.directory
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Name=Puzzles
-Icon=sgt-puzzles_map
diff --git a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu b/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
deleted file mode 100644
index e3f3264cff97..000000000000
--- a/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-"http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd">
-<Menu>
-  <Name>Applications</Name>
-  <Menu>
-    <Name>Games</Name>
-    <Exclude>
-      <Category>X-sgt-puzzles</Category>
-    </Exclude>
-    <Menu>
-      <Name>Puzzles</Name>
-      <Directory>sgt-puzzles.directory</Directory>
-      <Include>
-      	<And>
-	  <All></All>
-          <Category>X-sgt-puzzles</Category>
-	</And>
-      </Include>
-    </Menu> <!-- End Puzzles -->
-  </Menu> <!-- End Games -->
-</Menu> <!-- End Applications -->
diff --git a/games-puzzle/sgt-puzzles/metadata.xml b/games-puzzle/sgt-puzzles/metadata.xml
deleted file mode 100644
index 744f27f1fda6..000000000000
--- a/games-puzzle/sgt-puzzles/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>NP-Hardass@gentoo.org</email>
-		<name>NP-Hardass</name>
-	</maintainer>
-	<use>
-		<flag name="gtk3">Use x11-libs/gtk+:3 instead of x11-libs/gtk+:2</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
deleted file mode 100644
index cfc0b290bca1..000000000000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20171029.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs autotools
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.tartarus.org/simon/puzzles.git"
-	GENTOO_ICONS="20160315"
-	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
-	KEYWORDS=""
-else
-	MAGIC=69773d8
-	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
-	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+doc gtk3"
-
-COMMON_DEPEND="
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils" # Used by builtin help patch
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( >=app-doc/halibut-1.2 )"
-
-PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
-
-src_unpack() {
-	default
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-	sed -i \
-		-e 's/-O2 -Wall .* -g/-Wall/' \
-		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
-		mkfiles.pl || die
-	./mkfiles.pl || die
-	eautoreconf
-
-	# Import icons from latest Gentoo tarball for live
-	if [[ ${PV} == "99999999" ]]; then
-		cp -R ../${PN}-icons/icons . || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--program-prefix="${PN}_" \
-		--with-gtk=$(usex gtk3 3 2)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	if use doc ; then
-		halibut --text --html --info --pdf --ps puzzles.but || die
-	fi
-}
-
-src_install() {
-	default
-
-	local file name
-	for file in *.R ; do
-		[[ ${file} == "nullgame.R" ]] && continue
-		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
-		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
-	done
-
-	if use doc ; then
-		DOCS=( puzzles.{pdf,ps,txt} )
-		HTML_DOCS=( *.html )
-		einstalldocs
-		doinfo puzzles.info{,-1,-2,-3}
-	fi
-
-	insinto /etc/xdg/menus/applications-merged
-	doins "${FILESDIR}/${PN}.menu"
-	insinto /usr/share/desktop-directories
-	doins "${FILESDIR}/${PN}.directory"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
deleted file mode 100644
index 7eaeac646bc6..000000000000
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-99999999.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils toolchain-funcs autotools
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.tartarus.org/simon/puzzles.git"
-	GENTOO_ICONS="20160315"
-	SRC_URI="https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${PN}-icons-${GENTOO_ICONS}.tar.xz"
-	KEYWORDS=""
-else
-	MAGIC=69773d8
-	SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.${MAGIC}.tar.gz"
-	S=${WORKDIR}/puzzles-${PV}.${MAGIC}
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Simon Tatham's Portable Puzzle Collection"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="+doc gtk3"
-
-COMMON_DEPEND="
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-misc/xdg-utils" # Used by builtin help patch
-
-DEPEND="${COMMON_DEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	doc? ( >=app-doc/halibut-1.2 )"
-
-PATCHES=( "${FILESDIR}/${PN}-20161207-builtin-help.patch" )
-
-src_unpack() {
-	default
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-	sed -i \
-		-e 's/-O2 -Wall .* -g/-Wall/' \
-		-e "s/libstr =/libstr = '\$(LDFLAGS) ' ./" \
-		mkfiles.pl || die
-	./mkfiles.pl || die
-	eautoreconf
-
-	# Import icons from latest Gentoo tarball for live
-	if [[ ${PV} == "99999999" ]]; then
-		cp -R ../${PN}-icons/icons . || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--program-prefix="${PN}_" \
-		--with-gtk=$(usex gtk3 3 2)
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-	if use doc ; then
-		halibut --text --html --info --pdf --ps puzzles.but || die
-	fi
-}
-
-src_install() {
-	default
-
-	local file name
-	for file in *.R ; do
-		[[ ${file} == "nullgame.R" ]] && continue
-		name=$(awk -F: '/exe:/ { print $3 }' "${file}")
-		file=${file%.R}
-		newicon -s 48 icons/${file}-48d24.png ${PN}_${file}.png
-		make_desktop_entry "${PN}_${file}" "${name}" "${PN}_${file}" "Game;LogicGame;X-${PN};"
-	done
-
-	if use doc ; then
-		DOCS=( puzzles.{pdf,ps,txt} )
-		HTML_DOCS=( *.html )
-		einstalldocs
-		doinfo puzzles.info{,-1,-2,-3}
-	fi
-
-	insinto /etc/xdg/menus/applications-merged
-	doins "${FILESDIR}/${PN}.menu"
-	insinto /usr/share/desktop-directories
-	doins "${FILESDIR}/${PN}.directory"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/skoosh-2.5.0-r1 b/games-puzzle/skoosh-2.5.0-r1
new file mode 100644
index 000000000000..d7df01e9d571
--- /dev/null
+++ b/games-puzzle/skoosh-2.5.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=gnome-base/gconf-2:2 gnome-base/libgnome-keyring >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) app-text/rarian nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Sliding tile puzzle for Gnome 2
+EAPI=5
+HOMEPAGE=http://homepages.ihug.co.nz/~trmusson/programs.html
+IUSE=nls debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/gconf-2:2 gnome-base/libgnome-keyring >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=http://homepages.ihug.co.nz/~trmusson/stuff/skoosh-2.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0eca8c10e477d8f48d2814bd8db9cc63
diff --git a/games-puzzle/skoosh/Manifest b/games-puzzle/skoosh/Manifest
deleted file mode 100644
index a29c8b4b5cbd..000000000000
--- a/games-puzzle/skoosh/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX skoosh-2.5.0-desktop.patch 476 BLAKE2B 190a5dc7087d5112a9b957a865cd568a228c3f4cd05bbdfaae4655756719a8e71d9b2e193ec3b4af9a17bad2baad34a9d89e341db67b89781a3b917b7e31377d SHA512 0cded581a8a24902771ef49674171d1522ed50eabff20d48b65892e09671d5a25e41b046f45a7ac80e0a23fb13a638293d5f6073d99f4a5f3473c3b882b860ac
-DIST skoosh-2.5.0.tar.gz 209945 BLAKE2B 5797e93b2ff593b0da0b404b16758a37a17bf93f76829ba9297df7b572573ec28a7052275b343cf0b774757fb5463c143b9073ae3653c1eac3ab1039194489a2 SHA512 e67f0036f09890af62bcfe0fe895d899a76efb2901c5fbdd9fb97951553a4b9f35dfddd0a3e24937b53a1c8d3686caee8b83d35e0327d4bbdaeb4c1e0ab58736
-EBUILD skoosh-2.5.0-r1.ebuild 869 BLAKE2B e40ebb430b0749e81fb1c843e1e9be833248861f81f52f340ebf69e15a5ee2e844d23f8d35d8ed038e6c8c7cbcbf778ac123583f5f2f79f6af37aa180d1bcffc SHA512 4fefa0bab3c67fa6e83804937ea2d0ce06b524e5fbef561386cb693f25df6d6fe6c3e23266876ee2466309cb748dd3ab06279cf393ac3c807d4e3a0baeb7ca1f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch b/games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch
deleted file mode 100644
index 09f120cc75f7..000000000000
--- a/games-puzzle/skoosh/files/skoosh-2.5.0-desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- skoosh.desktop.old	2014-11-21 09:54:37.000861347 +0100
-+++ skoosh.desktop	2014-11-21 09:54:47.898132607 +0100
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
--Icon=skoosh.png
-+Icon=skoosh
- Name=Fifteen
- Comment=Slide tiles to reveal a picture
- Comment[fr]=Déplacez les tuiles pour révéler un dessin
- Exec=skoosh
- Terminal=false
- Type=Application
--Categories=GNOME;Application;Game;PuzzleGame;
-+Categories=Game;
- StartupNotify=true
- X-GNOME-DocPath=skoosh/skoosh.xml
diff --git a/games-puzzle/skoosh/metadata.xml b/games-puzzle/skoosh/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/skoosh/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild b/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
deleted file mode 100644
index 04f48cd4ecca..000000000000
--- a/games-puzzle/skoosh/skoosh-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Sliding tile puzzle for Gnome 2"
-HOMEPAGE="http://homepages.ihug.co.nz/~trmusson/programs.html"
-SRC_URI="http://homepages.ihug.co.nz/~trmusson/stuff/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=gnome-base/gconf-2:2
-	gnome-base/libgnome-keyring
-	>=gnome-base/libgnomeui-2
-	nls? ( virtual/libintl )
-"
-# needs scrollkeeper-preinstall from rarian to build
-DEPEND="${RDEPEND}
-	app-text/rarian
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	# Fix .desktop file
-	epatch "${FILESDIR}/${PN}-2.5.0-desktop.patch"
-
-	# Need to apply omf fix or else we get access
-	# violation errors related to sandbox.
-	gnome2_omf_fix "${S}/help/C/Makefile.in"
-
-	gnome2_src_prepare
-}
diff --git a/games-puzzle/splice-20121120 b/games-puzzle/splice-20121120
new file mode 100644
index 000000000000..426547300efb
--- /dev/null
+++ b/games-puzzle/splice-20121120
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DESCRIPTION=An experimental and artistic puzzler set in a microbial world
+EAPI=5
+HOMEPAGE=http://www.cipherprime.com/games/splice/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=splice-linux-1353389454.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_=d9ff46156c44c69d7b50eea255996b29
diff --git a/games-puzzle/splice/Manifest b/games-puzzle/splice/Manifest
deleted file mode 100644
index 6d55a3efcde1..000000000000
--- a/games-puzzle/splice/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST splice-linux-1353389454.tar.gz 305838859 BLAKE2B ef8c6ae70b48f6c1860e3d6591876063abea77fe0f9a7597f91e32295bee8e517fed1bf6fa3fa5e491ea11e8da7faffa26ad9d9329d960269e29dda7adf8a14d SHA512 67a83a30bdb8ff0eecf9097bb4615053fcdb073daada4a24b61ae239ed56b7d2192247e80989c67554dcfcc1069c2105a6083f9fafffa4bbd66bbf29edad6a44
-EBUILD splice-20121120.ebuild 1295 BLAKE2B f5b9bd1310df8d856d22d902c731e973aa7270463628f421dfceb590d7d89ace1f6abe5fd63e7753226c69fb576f295d28c36632572fb26731a0b86d7cc5fbf9 SHA512 4b3e62b2bfed9a7c5a33df7594a7dcb8558c1b255fe03b33bae9175e896281539e414d13747965569eb48298f42a4c1fbe9b06b7ff4e79b69e0698790690f0cc
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-puzzle/splice/metadata.xml b/games-puzzle/splice/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-puzzle/splice/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/splice/splice-20121120.ebuild b/games-puzzle/splice/splice-20121120.ebuild
deleted file mode 100644
index cd9f3346db97..000000000000
--- a/games-puzzle/splice/splice-20121120.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle mono? (seems hardcoded)
-#       icon
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="An experimental and artistic puzzler set in a microbial world"
-HOMEPAGE="http://www.cipherprime.com/games/splice/"
-SRC_URI="splice-linux-1353389454.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/Splice*
-	${MYGAMEDIR#/}/Splice_Data/Mono/*"
-
-RDEPEND="
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext"
-
-S=${WORKDIR}/Linux
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_prepare() {
-	einfo "removing ${ARCH} unrelated files..."
-	rm -v Splice.x86$(usex amd64 "" "_64") || die
-	rm -rv Splice_Data/Mono/x86$(usex amd64 "" "_64") || die
-
-	rm README~ || die
-	mv README "${T}"/ || die
-}
-
-src_install() {
-	dodoc "${T}"/README
-
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	make_desktop_entry ${PN}
-	games_make_wrapper ${PN} "./Splice.x86$(usex amd64 "_64" "")" "${MYGAMEDIR}"
-
-	fperms +x "${MYGAMEDIR}"/Splice.x86$(usex amd64 "_64" "")
-	prepgamesdirs
-}
diff --git a/games-puzzle/swell-foop-3.24.0 b/games-puzzle/swell-foop-3.24.0
new file mode 100644
index 000000000000..038e438eaf89
--- /dev/null
+++ b/games-puzzle/swell-foop-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) app-text/yelp-tools dev-libs/appstream-glib >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clear the screen by removing groups of colored and shaped tiles
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Swell%20Foop
+KEYWORDS=amd64 ~arm x86
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.36:2 >=media-libs/clutter-1.14:1.0 >=media-libs/clutter-gtk-1.5:1.0 >=x11-libs/gtk+-3.12:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e1ebe3ea028e357f4b37713e8d3ba8d
diff --git a/games-puzzle/swell-foop/Manifest b/games-puzzle/swell-foop/Manifest
deleted file mode 100644
index a41bb5a51b16..000000000000
--- a/games-puzzle/swell-foop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST swell-foop-3.24.0.tar.xz 2313656 BLAKE2B 2a52751eb1390a7bff7956ed21058fef913e5b125f04f6415ccb9aef28cd5517d1c4683318379dafa820c8124d7798ed2142c4ed1277234d70c1b9dfe8403b86 SHA512 470bcf9715e280b9cc7bba79d1d50e924416b6d29058ba0105aee48d30ee58971262e2304610334f92f2f6a9fc6983898047d3ad05443a2cb062e15564388ab0
-EBUILD swell-foop-3.24.0.ebuild 666 BLAKE2B 6813c366536c6a35d6b47417d8474922ac41371d1646989393ce5ab9eb335092f79ba0c6e27cf0b4e46b1af0d41f8d3f3982c607dd9bbd33191a1add264a2a8b SHA512 195d833ba4322ebcc2c6f8a1f1bfd2e871961b8f533eebf280a14730d1eb303b6c72a1545ead8356187322d40cf55ed2447c3dc9b56267c647ad2ec5ad53b174
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/games-puzzle/swell-foop/metadata.xml b/games-puzzle/swell-foop/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/games-puzzle/swell-foop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild b/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
deleted file mode 100644
index d0c5883d967d..000000000000
--- a/games-puzzle/swell-foop/swell-foop-3.24.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 vala
-
-DESCRIPTION="Clear the screen by removing groups of colored and shaped tiles"
-HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=media-libs/clutter-1.14:1.0
-	>=media-libs/clutter-gtk-1.5:1.0
-	>=x11-libs/gtk+-3.12:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
diff --git a/games-puzzle/tanglet-1.5.2 b/games-puzzle/tanglet-1.5.2
new file mode 100644
index 000000000000..e9627aaa6fa9
--- /dev/null
+++ b/games-puzzle/tanglet-1.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib:= dev-qt/linguist-tools:5 >=sys-apps/sed-4
+DESCRIPTION=A single player word finding game based on Boggle
+EAPI=6
+HOMEPAGE=https://gottcode.org/tanglet/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://gottcode.org/tanglet/tanglet-1.5.2-src.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=90e9164e3bbec5f9a479fb170e3b098f
diff --git a/games-puzzle/tanglet/Manifest b/games-puzzle/tanglet/Manifest
deleted file mode 100644
index 15886c8da228..000000000000
--- a/games-puzzle/tanglet/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tanglet-1.5.2-gentoo.patch 981 BLAKE2B a581aca772c797e31ad7bd85adf1fd1f12d2e768c9bee87139871f100eb8d4a77bfe343d86b1d29840a67338bdf5b003ff427acc6653abcd2fa4b182b8a362c4 SHA512 541d1feaf1b12acdf8ff477bf3e165d6ea6fa615eca8def32b092925dfb8902759ce29b3fe6f76d761688d298b3b452c71815e94e2cd71a9b07e6641f05386e6
-DIST tanglet-1.5.2-src.tar.bz2 8646616 BLAKE2B 0a38690069550e27a302f28e7db3753eaf67af7add730d8069ec4df001a431843e204603475146d56049cdf40c0be20d8ef83ea9f47b27cf82cc232e4fecef35 SHA512 a97b9fe3c9c80a843c4696766d15edcab48369bd905e893c2975bfb9faf91d4a58a3c440d242be91f5838aacdf1526022b5ce8c463adfd8b0bb62e008be460ee
-EBUILD tanglet-1.5.2.ebuild 876 BLAKE2B 0d3134ed3ee30c442b361d1b264c1172ef0e4ebba7b9abae289bcb9ae60a0794d2869ec53dcced262e317a2f0b28d70380896cee56170090b87254a1ccb9f8bd SHA512 75dd82c10284077788f1fe4dd01b9669f51c56dfe719cac263c24c8855e52782f10d402204a7e3966fdaf18ef0d1aace1f46c24c5ac900e0a6fdb71686d07ef9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch b/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
deleted file mode 100644
index 8409f2cc48cf..000000000000
--- a/games-puzzle/tanglet/files/tanglet-1.5.2-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/src.pro	2018-05-29 13:11:55.000000000 +0200
-+++ b/src/src.pro	2018-07-11 20:02:51.415773874 +0200
-@@ -99,7 +99,7 @@
- 	RESOURCES += ../icons/icon.qrc
- 
- 	isEmpty(PREFIX) {
--		PREFIX = /usr/local
-+		PREFIX = /usr
- 	}
- 	isEmpty(BINDIR) {
- 		BINDIR = bin
---- a/src/locale_dialog.cpp
-+++ b/src/locale_dialog.cpp
-@@ -85,7 +85,7 @@
- 	if (paths.isEmpty()) {
- 		QString appdir = QCoreApplication::applicationDirPath();
- 		paths.append(appdir);
--		paths.append(appdir + "/../share/" + QCoreApplication::applicationName().toLower());
-+		paths.append("/usr/share");
- 		paths.append(appdir + "/../Resources");
- 	}
- 	foreach (const QString& path, paths) {
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -46,7 +46,7 @@
- 	QString path = app.applicationDirPath();
- 	QStringList paths;
- 	paths.append(path + "/data/");
--	paths.append(path + "/../share/tanglet/data/");
-+	paths.append("/usr/share/data/");
- 	paths.append(path + "/../Resources/data/");
- 	QDir::setSearchPaths("tanglet", paths);
- 
diff --git a/games-puzzle/tanglet/metadata.xml b/games-puzzle/tanglet/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/tanglet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/tanglet/tanglet-1.5.2.ebuild b/games-puzzle/tanglet/tanglet-1.5.2.ebuild
deleted file mode 100644
index 2595d233626d..000000000000
--- a/games-puzzle/tanglet/tanglet-1.5.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils xdg-utils
-
-DESCRIPTION="A single player word finding game based on Boggle"
-HOMEPAGE="https://gottcode.org/tanglet/"
-SRC_URI="https://gottcode.org/${PN}/${P}-src.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	eqmake5 tanglet.pro
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-puzzle/tetrinet-0.11-r1 b/games-puzzle/tetrinet-0.11-r1
new file mode 100644
index 000000000000..90cc8717abb3
--- /dev/null
+++ b/games-puzzle/tetrinet-0.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=sys-libs/ncurses-5:0= virtual/pkgconfig
+DESCRIPTION=Console based tetrinet inc. standalone server
+EAPI=6
+HOMEPAGE=http://tetrinet.or.cz/
+IUSE=ipv6
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=sys-libs/ncurses-5:0=
+SLOT=0
+SRC_URI=http://tetrinet.or.cz/download/tetrinet-0.11.tar.bz2
+_eclasses_=desktop	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_=f915e222c86f112588e4c4a4a52aa64c
diff --git a/games-puzzle/tetrinet/Manifest b/games-puzzle/tetrinet/Manifest
deleted file mode 100644
index b9f3f7c6f804..000000000000
--- a/games-puzzle/tetrinet/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX tetrinet-0.11-build.patch 2331 BLAKE2B a23200aff602acaf0dd6c1341a8c63b3b4d16b417478034dc46db4d90081c2910a8026d5b419e18432309ded69de64e16bcdaf4d2301767dcb1a857367eb8207 SHA512 e56a43ef53d9df84c4ba49b39ba2d77f99de1b616f9e81e105d4c49553b909f418f74cb13d431dbd658c41c99388321e0806dbeb63294817ec85f7148f2d2ae0
-AUX tetrinet-0.11-no-ipv6.patch 185 BLAKE2B 47b66d15eaf30d233a60f0c877fd03b66ad6007630c4a45c1c208cb21582add109ccfc3ca77d741214dbb5d00a4719a55556ab404420d5383e098e748f6c055b SHA512 1851623b20e2685548650d54f290a49f9572b65a2293848c0d83a6fdc1c1256ebcdd0f737b2f32f7fb4bd921aa69c17e7120cfc8acb1d8c5a97342741964890f
-DIST tetrinet-0.11.tar.bz2 38607 BLAKE2B f794660b037d2605990b775a00381279eea64a361e4b66dcb9314a3f784ce77a0cfc87cea52d183fb5553f05f95b466318b6a1e98dbd735f34618964d2d901d2 SHA512 8123a8c50a3c1b6326d3209272a60c8050afd2a9eb455814fd676d8c4de922f8b81a88df9e4825d1ff5e0c8b8a7ac46ebe9ce68994587f829e047a3d889880fa
-EBUILD tetrinet-0.11-r1.ebuild 698 BLAKE2B bb5f84fad0c3940b313221d36e2079c53037ae1f57ee48eb34629fe785b9329fecb32f548cf9f097b67f4b7ee5cccc7f0dba9770740c8007652a59d6adb63a95 SHA512 c61e799893a744e1a5c14ecb2d2e8445681f632c2ee618878ed929416fb0254e8c735b26203740ed26e9ae26d8c3e76256b2187aa09ca641ebe63ecd2e626963
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch b/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
deleted file mode 100644
index 0540b7bc8ce9..000000000000
--- a/games-puzzle/tetrinet/files/tetrinet-0.11-build.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,4 @@
--CC = cc
--
--CFLAGS = -O2 -I/usr/include/ncurses -DHAVE_IPV6 -g -Wall
-+CFLAGS += -I/usr/include/ncurses -g -Wall
- OBJS = sockets.o tetrinet.o tetris.o tty.o xwin.o
- 
- ### If you want to have -server tetrinet client option, comment the two lines
-@@ -24,10 +22,10 @@
- ########
- 
- tetrinet: $(OBJS)
--	$(CC) -o $@ $(OBJS) -lncurses
-+	$(CC) $(LDFLAGS) -o $@ $(OBJS) $(shell ${PKG_CONFIG} --libs ncurses)
- 
- tetrinet-server: server.c sockets.c tetrinet.c tetris.c server.h sockets.h tetrinet.h tetris.h
--	$(CC) $(CFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -DSERVER_ONLY server.c sockets.c tetrinet.c tetris.c
- 
- .c.o:
- 	$(CC) $(CFLAGS) -c $<
---- a/sockets.c
-+++ b/sockets.c
-@@ -66,7 +66,7 @@
-     if (c == 0xFF)
- 	ptr--;
-     *ptr = 0;
--    if (log) {
-+    if (logging) {
- 	if (!logfile)
- 	    logfile = fopen(logname, "a");
- 	if (logfile) {
-@@ -89,7 +89,7 @@
-     unsigned char c = 0xFF;
-     int n = 0;
- 
--    if (log) {
-+    if (logging) {
- 	if (!logfile)
- 	    logfile = fopen(logname, "a");
- 	if (logfile) {
---- a/tetrinet.c
-+++ b/tetrinet.c
-@@ -21,7 +21,7 @@
- /*************************************************************************/
- 
- int fancy = 0;		/* Fancy TTY graphics? */
--int log = 0;		/* Log network traffic to file? */
-+int logging = 0;		/* Log network traffic to file? */
- char *logname;		/* Log filename */
- int windows_mode = 0;	/* Try to be just like the Windows version? */
- int noslide = 0;	/* Disallow piece sliding? */
-@@ -82,8 +82,7 @@
- 	    else
- 		winlist[i].team = 0;
- 	    s++;
--	    strncpy(winlist[i].name, s, sizeof(winlist[i].name)-1);
--	    winlist[i].name[sizeof(winlist[i].name)] = 0;
-+	    snprintf(winlist[i].name, sizeof(winlist[i].name), "%s", s);
- 	    winlist[i].points = atoi(t);
- 	    if ((t = strchr(t, ';')) != NULL)
- 		winlist[i].games = atoi(t+1);
-@@ -590,7 +589,7 @@
- 	    if (strcmp(av[i], "-fancy") == 0) {
- 		fancy = 1;
- 	    } else if (strcmp(av[i], "-log") == 0) {
--		log = 1;
-+		logging = 1;
- 		i++;
- 		if (i >= ac) {
- 		    fprintf(stderr, "Option -log requires an argument\n");
---- a/tetrinet.h
-+++ b/tetrinet.h
-@@ -74,7 +74,7 @@
- /* Externs */
- 
- extern int fancy;
--extern int log;
-+extern int logging;
- extern char *logname;
- extern int windows_mode;
- extern int noslide;
diff --git a/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch b/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
deleted file mode 100644
index addfd9a0047c..000000000000
--- a/games-puzzle/tetrinet/files/tetrinet-0.11-no-ipv6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sockets.c
-+++ b/sockets.c
-@@ -188,7 +188,7 @@
- 	return -1;
-     }
-     if (ipbuf)
--	memcpy(retbuf, &sa.sin_addr, 4);
-+	memcpy(ipbuf, &sa.sin_addr, 4);
- #endif
- 
-     return sock;
diff --git a/games-puzzle/tetrinet/metadata.xml b/games-puzzle/tetrinet/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/tetrinet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild b/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild
deleted file mode 100644
index 013dcef24a21..000000000000
--- a/games-puzzle/tetrinet/tetrinet-0.11-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Console based tetrinet inc. standalone server"
-HOMEPAGE="http://tetrinet.or.cz/"
-SRC_URI="http://tetrinet.or.cz/download/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ipv6"
-
-RDEPEND=">=sys-libs/ncurses-5:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-no-ipv6.patch \
-		"${FILESDIR}"/${P}-build.patch
-
-	use ipv6 && append-cflags -DHAVE_IPV6
-	tc-export PKG_CONFIG
-}
-
-src_install() {
-	dobin tetrinet tetrinet-server
-	dodoc README TODO tetrinet.txt
-}
diff --git a/games-puzzle/textmaze-1.2-r1 b/games-puzzle/textmaze-1.2-r1
new file mode 100644
index 000000000000..306eaf179075
--- /dev/null
+++ b/games-puzzle/textmaze-1.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=An ncurses-based maze solving game written in Perl
+EAPI=6
+HOMEPAGE=http://robobunny.com/projects/textmaze/html/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-perl/Curses
+SLOT=0
+SRC_URI=http://www.robobunny.com/projects/textmaze/textmaze_v1.2.tar.gz
+_md5_=960719f25146395a0938628732a531e6
diff --git a/games-puzzle/textmaze/Manifest b/games-puzzle/textmaze/Manifest
deleted file mode 100644
index a66fe6f1237a..000000000000
--- a/games-puzzle/textmaze/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST textmaze_v1.2.tar.gz 15827 BLAKE2B df66068bef5b39f18b03d4ce9243ebaa2ddc52f58f3d5b2d8a46ff81efd188467e1a9f13ab818fc592f25dd1acaecaba80aca153b7d3900d527cb9cc1d45c034 SHA512 f6a2733049ea461f15b40eec4a414356dbfe252d859d132278d9ea8a4efcdc6753a28817529b429bad662a2042f2f7cd5cb1f2383d9ddbf773c76b80ea2af7d9
-EBUILD textmaze-1.2-r1.ebuild 590 BLAKE2B 987c83c64716a66b65c6f8090325fcfebba2af2b2efba21954599fd372a671516742aaa72e88b9899f59b336d40bc1062012079270e656c90ea6367f1dbffd43 SHA512 baca7e929bc639bb20ea91a7e4cd854fbd23c39847992bd3e2c4533775ec3d4d97934cc26679403bf72bc17c45071bd480c3395f0bd31237b66eeb7e355116ca
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/textmaze/metadata.xml b/games-puzzle/textmaze/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/textmaze/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/textmaze/textmaze-1.2-r1.ebuild b/games-puzzle/textmaze/textmaze-1.2-r1.ebuild
deleted file mode 100644
index 959e94bd77ec..000000000000
--- a/games-puzzle/textmaze/textmaze-1.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}_v${PV}
-DESCRIPTION="An ncurses-based maze solving game written in Perl"
-HOMEPAGE="http://robobunny.com/projects/textmaze/html/"
-SRC_URI="http://www.robobunny.com/projects/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-perl/Curses"
-DEPEND=""
-
-S="${WORKDIR}/TextMaze"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s#/usr/local/bin/perl#/usr/bin/perl#" \
-		textmaze || die
-}
-
-src_install() {
-	dobin textmaze
-	einstalldocs
-}
diff --git a/games-puzzle/tint-0.03b-r1 b/games-puzzle/tint-0.03b-r1
new file mode 100644
index 000000000000..8fce94e812d1
--- /dev/null
+++ b/games-puzzle/tint-0.03b-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=>=sys-libs/ncurses-5.4-r1:0=
+DESCRIPTION=Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game
+EAPI=6
+HOMEPAGE=http://oasis.frogfoot.net/code/tint/
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=>=sys-libs/ncurses-5.4-r1:0=
+SLOT=0
+SRC_URI=http://oasis.frogfoot.net/code/tint/download/0.03b/tint_0.03b.tar.gz
+_md5_=e49bbb7058639af5c79d069570b26cd7
diff --git a/games-puzzle/tint/Manifest b/games-puzzle/tint/Manifest
deleted file mode 100644
index 28edb3d62d99..000000000000
--- a/games-puzzle/tint/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tint-0.03b-ovflfix.patch 1021 BLAKE2B e6188aff5847d05e6fa3909317d2dc054433ccd5a9dcd89a76f8e990efa182405b93ac8b06b81e58f9b12ae56a0981fedbd4c28659c6a87418b40392fcd636bc SHA512 da4d5871b46c57ee5e37f0a4b6e779c33bf7b5c45dcba281b84ccad308195d9b2498489ee22f105e6eef00274cf60757855ab9aa91a146f19159713971b828bf
-DIST tint_0.03b.tar.gz 16909 BLAKE2B 4d619b0def118f76f5d07b12f1fe6ccbe2688f3275d49c3514af9448cd74e6b199a55976fd4340dd8122f101f84a5a7be1c5e9fce6727850ed3ee4c684ec8118 SHA512 f442122248987a4f2843e0abe3ed4b3fcecbb6024aad2b486087468c84d80f94310dcf4a37a3d93a647d0abe9aaf10e7d957c88ec6314c25a9fd90d4dfc16ec1
-EBUILD tint-0.03b-r1.ebuild 759 BLAKE2B 71eb5ae49e191cdeba17d06f2a80f18496d1fd2c4fe7ab0e2861d2f1edf4658d0e195fb082d2344ee0b24a96b495ec4e882ddde6ff87978c3c3a5686b9e4134b SHA512 b78af49089beab3aba6cd2aeaea5fa178fb24db73c53188961eabb3e9cb1ef264f8aa0ce8927109ada319699f59e0ab89c92e92dc63b104295737dfd469cb7cf
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tint/files/tint-0.03b-ovflfix.patch b/games-puzzle/tint/files/tint-0.03b-ovflfix.patch
deleted file mode 100644
index 341f027999ce..000000000000
--- a/games-puzzle/tint/files/tint-0.03b-ovflfix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ru tint-0.03b.orig/io.c tint-0.03b/io.c
---- tint-0.03b.orig/io.c	2001-12-07 10:48:20.000000000 -0500
-+++ tint-0.03b/io.c	2010-11-08 13:40:16.786841434 -0500
-@@ -39,7 +39,7 @@
- #define NUM_COLORS	8
- 
- /* Number of attributes defined in io.h */
--#define NUM_ATTRS	7
-+#define NUM_ATTRS	9
- 
- /* Cursor definitions */
- #define CURSOR_INVISIBLE	0
-diff -ru tint-0.03b.orig/tint.c tint-0.03b/tint.c
---- tint-0.03b.orig/tint.c	2005-07-17 07:26:43.000000000 -0400
-+++ tint-0.03b/tint.c	2010-11-08 13:40:04.225203170 -0500
-@@ -365,7 +365,7 @@
-    FILE *handle;
-    int i,j;
-    score_t scores[NUMSCORES];
--   char header[strlen (SCORE_HEADER)];
-+   char header[strlen(SCORE_HEADER) + 1];
-    if (score == 0) return;	/* No need saving this */
-    for (i = 1; i < NUMSCORES; i++)
- 	 {
-@@ -418,7 +418,7 @@
-    FILE *handle;
-    int i,j,ch;
-    score_t scores[NUMSCORES];
--   char header[strlen (SCORE_HEADER)];
-+   char header[strlen(SCORE_HEADER) + 1];
-    time_t tmp = 0;
-    if ((handle = fopen (scorefile,"r")) == NULL)
- 	 {
diff --git a/games-puzzle/tint/metadata.xml b/games-puzzle/tint/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/tint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/tint/tint-0.03b-r1.ebuild b/games-puzzle/tint/tint-0.03b-r1.ebuild
deleted file mode 100644
index 4b2d9dc72843..000000000000
--- a/games-puzzle/tint/tint-0.03b-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/-/_}"
-DESCRIPTION="Tint Is Not Tetris, a ncurses based clone of the original Tetris(tm) game"
-HOMEPAGE="http://oasis.frogfoot.net/code/tint/"
-SRC_URI="http://oasis.frogfoot.net/code/tint/download/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.4-r1:0="
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-ovflfix.patch )
-
-src_compile() {
-	emake \
-		STRIP=true \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		localstatedir="/var/lib"
-}
-
-src_install() {
-	dobin tint
-	doman tint.6
-	dodoc CREDITS NOTES
-	insopts -m 0664
-	insinto /var/lib
-	doins tint.scores
-}
diff --git a/games-puzzle/tiny-and-big-1.4.1 b/games-puzzle/tiny-and-big-1.4.1
new file mode 100644
index 000000000000..64c1d62dbc91
--- /dev/null
+++ b/games-puzzle/tiny-and-big-1.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/bzip2
+DESCRIPTION=Combines elements of adventure, jump&run and physical puzzles
+EAPI=5
+HOMEPAGE=http://www.tinyandbig.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl media-libs/openal x11-libs/libX11 !bundled-libs? ( media-gfx/nvidia-cg-toolkit ) games-misc/games-envd
+RESTRICT=bindist fetch bundled-libs? ( splitdebug )
+SLOT=0
+SRC_URI=tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=622ecf0dff83cd393572fa9d4f4b8c8c
diff --git a/games-puzzle/tiny-and-big/Manifest b/games-puzzle/tiny-and-big/Manifest
deleted file mode 100644
index 3f7c8466e7dd..000000000000
--- a/games-puzzle/tiny-and-big/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST tinyandbig_grandpasleftovers-retail-linux-1.4.1_1370968537.tar.bz2 1170058011 BLAKE2B 2c1845165408cca68fd791b2d6f91c49e1131c25c29a49ab8512e82cf0664d52fcb8526741693e045e3ea1560ace47ed3d8a8e51a4851d6ce57adce6f2bcd445 SHA512 3dbf6ebbe6047f5258f482e776809c6817df8d14cfc20014fb6e4a6accc3db3e93051270ce29371bc0ef56d380bd382dbf8eb75b592c3f0097ca3546d889193e
-EBUILD tiny-and-big-1.4.1.ebuild 1389 BLAKE2B 8264701b9f84f4f20228be060cd557d843bcb970fde1b256b3a016bc77c7e424744a908f2129c8e8267725842c10c24f883b6cd32630aee370b81c71ed4a43df SHA512 3f18ac776c1e8ee9bb34dd6da4d9122b1e433e104430105de5c301d6a90fb5406e6111969e76d7a656c8e17079892bf6724e93d68ef358c3a24ae51f8339695f
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-puzzle/tiny-and-big/metadata.xml b/games-puzzle/tiny-and-big/metadata.xml
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-puzzle/tiny-and-big/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild b/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
deleted file mode 100644
index aea1846bd3c1..000000000000
--- a/games-puzzle/tiny-and-big/tiny-and-big-1.4.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle media-libs/cal3d, lib hacked or old version
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Combines elements of adventure, jump&run and physical puzzles"
-HOMEPAGE="http://www.tinyandbig.com/"
-SRC_URI="tinyandbig_grandpasleftovers-retail-linux-${PV}_1370968537.tar.bz2"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch bundled-libs? ( splitdebug )"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/bin32/*
-	${MYGAMEDIR#/}/bin64/*"
-
-DEPEND="app-arch/bzip2"
-RDEPEND="
-	virtual/opengl
-	media-libs/openal
-	x11-libs/libX11
-	!bundled-libs? (
-		media-gfx/nvidia-cg-toolkit
-	)"
-
-S=${WORKDIR}/tinyandbig
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_prepare() {
-	if use !bundled-libs ; then
-		rm -v $(usex amd64 "bin64" "bin32")/libCg{,GL}.so || die "unbundling libs failed!"
-	fi
-}
-
-src_install() {
-	local bindir=$(usex amd64 "bin64" "bin32")
-
-	insinto "${MYGAMEDIR}"
-	doins -r assets ${bindir}
-
-	games_make_wrapper ${PN} "./${bindir}/tinyandbig" "${MYGAMEDIR}" "${MYGAMEDIR}/${bindir}"
-	make_desktop_entry ${PN} "Tiny & Big"
-	dodoc readme.txt
-
-	fperms +x "${MYGAMEDIR}"/${bindir}/tinyandbig
-	prepgamesdirs
-}
diff --git a/games-puzzle/tod-0-r1 b/games-puzzle/tod-0-r1
new file mode 100644
index 000000000000..ff39ef6520cb
--- /dev/null
+++ b/games-puzzle/tod-0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/allegro:0[X] app-arch/unzip
+DESCRIPTION=Tetanus On Drugs simulates playing Tetris under the influence of drugs
+EAPI=6
+HOMEPAGE=http://www.pineight.com/tod/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/allegro:0[X]
+SLOT=0
+SRC_URI=http://www.pineight.com/pc/wintod.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=8049a612202b49240ebcdba0b6b521d8
diff --git a/games-puzzle/tod/Manifest b/games-puzzle/tod/Manifest
deleted file mode 100644
index 5d5da4e54316..000000000000
--- a/games-puzzle/tod/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tod-0-makefile.patch 336 BLAKE2B 914b05d5bf298a3d60c6ac836ef45127c253859fa8b620adf5827abbc3dd3375c02eebd614ab79277bd3c52f7f383a4b4458e80d8fabd8549e4d49ca5702959f SHA512 efd342bfedacdb1dcd20d5a938a02c555c7d260bf9584a0d6d24c4aa0617df7ba8e37fdfacc5b0e0f600a2cae752e50347ba8b6992c5ba2dc22c1b62306e7438
-DIST wintod.zip 115653 BLAKE2B 9c54be567954892eabc353bf5985579ff11fcb9e00304bf92792ef787bbaccf29084c68a58faae46229856fae103c4b27c462b62c2da489bfe635d474fd564ef SHA512 8cc203d9745cc4855c58c2f9119d06a1f02e1ecb9c1cc2c1dc1f1c77e5aa0553925bdcba3d744db462bbc77f3637a42e35a579a8807c8098aa2fde7452cc30cc
-EBUILD tod-0-r1.ebuild 748 BLAKE2B a78c2a73d87c13263a8400df1312e2c9d02972d92a2882080a6801e1a7dac7c8bd6545ce8546bcbc31d8927888b4c09a673985316d4b637fa4cbca2f33f74071 SHA512 e3b4566e211a670b1fce84958e79d95dee9af188ce73ce415976fc835f44f77639b989e3c3c8ceaf8d6e1a768bd239364a1e14ca08d19171fd57ffe01e429612
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tod/files/tod-0-makefile.patch b/games-puzzle/tod/files/tod-0-makefile.patch
deleted file mode 100644
index 9783fab0c4bc..000000000000
--- a/games-puzzle/tod/files/tod-0-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -1,8 +1,7 @@
- OBJ = hiscore rec scrctl tetanus crc allegdlg hgrcos

- HEADS = tod.h allegdlg.h crc.h hgrcos.h hiscore.h

--LIBS = -lalleg

--CFLAGS = -Wall -march=i486 -mcpu=i686 -O3 -ffast-math

--LDFLAGS = -mwindows

-+LIBS = `allegro-config --libs`

-+CFLAGS += `allegro-config --cflags`

- CC = gcc

- 

- 

diff --git a/games-puzzle/tod/metadata.xml b/games-puzzle/tod/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/tod/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/tod/tod-0-r1.ebuild b/games-puzzle/tod/tod-0-r1.ebuild
deleted file mode 100644
index 0ed9a29063f0..000000000000
--- a/games-puzzle/tod/tod-0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Tetanus On Drugs simulates playing Tetris under the influence of drugs"
-HOMEPAGE="http://www.pineight.com/tod/"
-SRC_URI="http://www.pineight.com/pc/win${PN}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/allegro:0[X]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-makefile.patch
-	sed -i \
-		-e "s:idltd\.dat:/usr/share/${PN}/idltd.dat:" \
-		rec.c || die
-}
-
-src_install() {
-	newbin tod-debug.exe tod
-	insinto /usr/share/${PN}
-	doins idltd.dat
-	dodoc readme.txt
-	make_desktop_entry ${PN} "Tetanus On Drugs"
-}
diff --git a/games-puzzle/tong-1.2-r1 b/games-puzzle/tong-1.2-r1
new file mode 100644
index 000000000000..0d7176350c6e
--- /dev/null
+++ b/games-puzzle/tong-1.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
+DESCRIPTION=Tetris and Pong in the same place at the same time
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/tong/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
+SLOT=0
+SRC_URI=http://www.nongnu.org/tong/tong-1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=6aa120c4e5260a069b954a092b3bca49
diff --git a/games-puzzle/tong/Manifest b/games-puzzle/tong/Manifest
deleted file mode 100644
index d9fb526a8084..000000000000
--- a/games-puzzle/tong/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tong-1.2-datadir.patch 1109 BLAKE2B dfc55c8bf75942e047440ec25fb6c9d51bbaa13f3a62329a6aac4ae82283cc14fe9f3f80ad11a13f563952bb0566a4f4d8aa47d72b3bdbd031b54d584ba89642 SHA512 8f35bc65273a77ed9190bdff9acaa932ae96030092023e5282bb3edd651e51fa29f52eedfbcdaf504540b5fbc67b76364b839be20e4a93dde01fee852a8dd80e
-AUX tong-1.2-fps.patch 557 BLAKE2B 5123aab67c2552c5e0b2ba4a2ad9082b24fa6276056c22c9fe97de6f1aa725c119a85cea79ea6d9e7ebb6c13e18610dd804c776000ddf3396d22e4a07af7c902 SHA512 a29b875ad777dc912c4080d339e5e00f8087322f4e0995631eb30180d2c409b9ede0d7ac6e6aab5a194fca0ca6e405685310e5b898fefd75d74e469129242c8b
-AUX tong-1.2-makefile.patch 901 BLAKE2B 7619c3b3155c1c56f239a2c529affbd3f1e1a8a5cf738a5235f1b928a065cc1aaacc5a09000a48b55f299e6130aad707e3399d2fe22937dd44de71efea1f9bab SHA512 1e15918cbb9fa98e174e2853be5c99ff369667035371cda95756b30ea246a640be22d308f86052a355f58596b676843dbb546caf8dd1aac9a66aad4cb1f7b34a
-DIST tong-1.2.tar.gz 88028070 BLAKE2B b82b5c012f5d12953a6e84dfe38921cff2f0e244c2a9ad9ef606b5ee41c2f455dbb288ddb477f4eb96471ed3dd4cb4de2a8cea9155942c51f850d263fb22ee71 SHA512 0544f489141bba37985f1ef3c316208e3e6dacdea8f8b79f37997a9489ff5c1710fd1426e02489f8adb33bf9a1511bb9a0250122fa2054ef4a6ef203c8881261
-EBUILD tong-1.2-r1.ebuild 1011 BLAKE2B e65ec73abd842e978831156ee44cd89fc74944f2ea2dbcc2aa0894856fbcbee2f0191544c8076fb02abb7b2daa5e7cd2f2da8e5674b6b301eb98e0a4db4e0e9b SHA512 002557b55e0e4e46feedba17eee0746300d7c0ce28b7de0c13a78f292cbf662ea7517df08e0418689d9ccf2339f1cb2d940719d1c65c123fbe6dcdea07c81c0f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/tong/files/tong-1.2-datadir.patch b/games-puzzle/tong/files/tong-1.2-datadir.patch
deleted file mode 100644
index 92a8bb4c18a1..000000000000
--- a/games-puzzle/tong/files/tong-1.2-datadir.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/tong.cpp.orig
-+++ b/tong.cpp
-@@ -202,7 +202,6 @@
- 	Tetrad *tetrad, *nexttetrad;
- 	Paddle *paddle;
- 	Ball *ball;
--	char datadir[256];
- 	input_t input;
- 	int volume = MIX_MAX_VOLUME;
- 
-@@ -210,7 +209,6 @@
- 	volume = 24;
- #endif
- 	memset(&input, 0, sizeof(input_t));
--	strcpy(datadir, GAME_DATA_DIR);
- 	if(argc>1) {
- 		if(!strcmp(argv[1], "-v") || !strcmp(argv[1], "--version")) {
- 			printf("%s\n", GAME_ID);
-@@ -219,10 +217,6 @@
- 				   "warranty; not even for MERCHANTABILITY or"
- 				   " FITNESS FOR A PARTICULAR PURPOSE.\n");
- 			return 0;
--		} else if(!strncmp(argv[1], "-p=", 3)) {
--			strcpy(datadir, argv[1]+(3*sizeof(char)));
--		} else if(!strncmp(argv[1], "--path=", 7)) {
--			strcpy(datadir, argv[1]+(7*sizeof(char)));
- 		} else {
- 			printf("Usage: %s [OPTION]\n", argv[0]);
- 			printf("Play TONG, a Free Software game (Tetris meets Pong)\n");
-@@ -237,11 +231,6 @@
- #ifdef WII
- 	fatInitDefault();
- #endif
--	if (chdir(datadir)) {
--		printf("Could not chdir to %s (attempting to use current dir)\n",
--			   datadir);
--	}
--
- 	if(SDL_Init(SDL_INIT_AUDIO
- 				|SDL_INIT_VIDEO
- 				|SDL_INIT_TIMER
diff --git a/games-puzzle/tong/files/tong-1.2-fps.patch b/games-puzzle/tong/files/tong-1.2-fps.patch
deleted file mode 100644
index 86566646b8d6..000000000000
--- a/games-puzzle/tong/files/tong-1.2-fps.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/tong.cpp.orig
-+++ b/tong.cpp
-@@ -64,6 +64,8 @@
- 
- #define DEMO_TIME           8000
- 
-+#define MIN_TIME            45
-+
- #define GP2X_BUTTON_UP         0
- #define GP2X_BUTTON_UPLEFT     1
- #define GP2X_BUTTON_LEFT       2
-@@ -1854,6 +1856,13 @@
- 		SDL_Flip(screen);
- 		lastlastupdate=lastupdate;
- 		lastupdate=SDL_GetTicks();
-+
-+		// limit to 1000/MIN_TIME fps
-+		if (lastupdate-lastlastupdate < MIN_TIME) {
-+			SDL_Delay(MIN_TIME - (lastupdate - lastlastupdate));
-+		}
-+		lastupdate = SDL_GetTicks();
-+
- 	}  //main game loop
- 
- 	Mix_FreeMusic(music);
diff --git a/games-puzzle/tong/files/tong-1.2-makefile.patch b/games-puzzle/tong/files/tong-1.2-makefile.patch
deleted file mode 100644
index ad9b283f4785..000000000000
--- a/games-puzzle/tong/files/tong-1.2-makefile.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.orig
-+++ b/Makefile
-@@ -1,11 +1,10 @@
- # TONG! makefile, tweak as you see fit
- 
--SDL_CFLAGS := $(shell sdl-config --cflags)
-+CXXFLAGS += $(shell sdl-config --cflags)
- SDL_LDFLAGS := $(shell sdl-config --libs)
- MIXER_FLAGS := -lSDL_mixer -lpthread
- IMG_FLAGS := -lSDL_image
- GAME_DATA_DIR := .
--CC = g++ -O3 -Wall #-ggdb3 
- SOURCES = tetris.cpp pong.cpp text.cpp option.cpp media.cpp
- # these sources need to be linked to SDL libs, so may have special flag settings
- SDL_SOURCES = tong.cpp
-@@ -29,11 +28,7 @@
- 
- # builds all, builds the target
- all:	$(OBJS)
--	$(CC) $(SDL_LDFLAGS) $(MIXER_FLAGS) $(IMG_FLAGS) $(OBJS) -o $(TARGET)
--%.o: %.cpp
--	$(CC) $(SDL_CFLAGS) -c -o $@ $<
--tong.o: $(SDL_SOURCES)
--	$(CC) -DGAME_DATA_DIR=\"$(GAME_DATA_DIR)\" $(SDL_CFLAGS) -c -o $@ $<
-+	$(CXX) $(LDFLAGS) $(OBJS) $(SDL_LDFLAGS) $(MIXER_FLAGS) $(IMG_FLAGS) -o $(TARGET)
- 
- # clean out the mess
- clean:
diff --git a/games-puzzle/tong/metadata.xml b/games-puzzle/tong/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/tong/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/tong/tong-1.2-r1.ebuild b/games-puzzle/tong/tong-1.2-r1.ebuild
deleted file mode 100644
index a16067fc57ba..000000000000
--- a/games-puzzle/tong/tong-1.2-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Tetris and Pong in the same place at the same time"
-HOMEPAGE="http://www.nongnu.org/tong/"
-SRC_URI="http://www.nongnu.org/tong/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}/${P}-makefile.patch" \
-		"${FILESDIR}/${P}-fps.patch" \
-		"${FILESDIR}/${P}-datadir.patch"
-	sed -i \
-		-e "s:\"media/:\"/usr/share/${PN}/media/:" \
-		media.cpp option.cpp option.h pong.cpp tetris.cpp text.cpp \
-		|| die
-	cp media/icon.png "${T}/${PN}.png" || die
-}
-
-src_install() {
-	dobin tong
-	dodir "/usr/share/${PN}"
-	cp -r media/ "${ED}/usr/share/${PN}" || die
-	dodoc CHANGELOG README making-of.txt CREDITS
-
-	make_desktop_entry tong TONG
-	doicon "${T}/${PN}.png"
-}
diff --git a/games-puzzle/toppler-1.1.6-r1 b/games-puzzle/toppler-1.1.6-r1
new file mode 100644
index 000000000000..fc326ce4573e
--- /dev/null
+++ b/games-puzzle/toppler-1.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=Reimplementation of Nebulous using SDL
+EAPI=6
+HOMEPAGE=http://toppler.sourceforge.net/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer[vorbis] nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/toppler/toppler-1.1.6.tar.gz
+_md5_=768162c55d0cb726eb5abb31ba39c88a
diff --git a/games-puzzle/toppler/Manifest b/games-puzzle/toppler/Manifest
deleted file mode 100644
index 280337638895..000000000000
--- a/games-puzzle/toppler/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX toppler-1.1.6-gentoo.patch 2004 BLAKE2B cc1221d33b4cf30bda597c4b95e669aa6c4ba7698669e5a762a89a4d8a5f8c637c81d07c47c22e7f0f85f96e9bd40f7da7e8c0be937ed28ec11c863e6604863f SHA512 0fc2d8eb7200c0c4e4986e0f53298d8a7b49f8be0d46bf2dc370e145a4ff39f7342874b5d80a18f703f7d134fd59274a72679afa7317f94609469042942dbfb4
-DIST toppler-1.1.6.tar.gz 2117137 BLAKE2B 1cff164e71924786d109a0c3f36ade3df8251872d454cb86d25b6f95553473dd10d5bc0f90fa0a3c43bcebfb6f3ef105ddf0d77f974282d65d0c510176b04ac9 SHA512 e0f6b7b72e38ba3402ba3608116fb51bf36cad129fb5591db62489829f4ed1ec49a4a3b7b1db4aaa34cd1561ee5228d91577f550aad2d55520ccefdff9bda9e9
-EBUILD toppler-1.1.6-r1.ebuild 558 BLAKE2B af00a1ff59f976c81fcb7c27be2cc1b9a2c1111fa569a5a2243a760572c6743fef0cf169755cda011a1b6c7ee0d941a82a391a699245310d3fca89e1fd2c2308 SHA512 199e0ce86bbdaf9689dd519b68de170e372dc9d8b38d6e1880fd6fbb11f94a615698f8cda31dcc6ec9806fd7a5fa3aee9a0812ffd9811415e8d77baf2e8c6dad
-MISC metadata.xml 330 BLAKE2B 924a2ff052635a1a394488cd20e1f1db9660abe63852e044d6da76f514475f472ad4221b750fdf12a8bfdfa1fbb219d957a0a0201bf4c53d262521e351595404 SHA512 68e3d67a21f67e1c0ede15141c8002156029bed457e521cdb532ae6524dff1e2bfe00b205a515ff816d61b953aca3c0ed5c9400a9a69cb44a859bd59c2394a62
diff --git a/games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch b/games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch
deleted file mode 100644
index d3f1ea52b9bc..000000000000
--- a/games-puzzle/toppler/files/toppler-1.1.6-gentoo.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -ru toppler-1.1.6.orig/Makefile.in toppler-1.1.6/Makefile.in
---- toppler-1.1.6.orig/Makefile.in	2012-12-22 06:03:04.000000000 -0500
-+++ toppler-1.1.6/Makefile.in	2013-01-16 18:51:16.442336579 -0500
-@@ -385,8 +385,8 @@
-   txtsys.cc        txtsys.h        \
-   qnxicon.c
- 
--pixmapsdir = $(datadir)/pixmaps
--applicationsdir = $(datadir)/applications
-+pixmapsdir = /usr/share/pixmaps
-+applicationsdir = /usr/share/applications
- pkgdocdir = $(docdir)/$(PACKAGE)
- pkglocalstatedir = $(localstatedir)/$(PACKAGE)
- dist_pixmaps_DATA = $(PACKAGE).xpm
-@@ -1143,7 +1143,7 @@
- info-am:
- 
- install-data-am: install-applicationsDATA install-dist_pixmapsDATA \
--	install-dist_pkgdataDATA install-dist_pkgdocDATA \
-+	install-dist_pkgdataDATA \
- 	install-dist_pkglocalstateDATA install-man
- 	@$(NORMAL_INSTALL)
- 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-diff -ru toppler-1.1.6.orig/po/Makefile.in.in toppler-1.1.6/po/Makefile.in.in
---- toppler-1.1.6.orig/po/Makefile.in.in	2012-12-22 06:02:52.000000000 -0500
-+++ toppler-1.1.6/po/Makefile.in.in	2013-01-16 18:52:01.929721259 -0500
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
-diff -ru toppler-1.1.6.orig/toppler.desktop.in toppler-1.1.6/toppler.desktop.in
---- toppler-1.1.6.orig/toppler.desktop.in	2012-12-22 06:02:06.000000000 -0500
-+++ toppler-1.1.6/toppler.desktop.in	2013-01-16 18:52:38.058438256 -0500
-@@ -1,12 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
--Categories=Application;Game;ArcadeGame;
-+Categories=Game;ArcadeGame;
- X-Desktop-File-Install-Version=0.2
- Name=@FULLNAME@
- Comment=A clone of the 'Nebulus' game on old 8 and 16 bit machines.
- Comment[de]=Klon des alten Spiels 'Nebulus'
- Comment[cs]=Klon hry 'Nebulus' z dob 8 a 16 bitovÜch počítačů.
--Icon=@prefix@/pixmaps/@PACKAGE@.xpm
-+Icon=@PACKAGE@
- Exec=@prefix@/bin/toppler
--Terminal=0
-+Terminal=false
- Type=Application
diff --git a/games-puzzle/toppler/metadata.xml b/games-puzzle/toppler/metadata.xml
deleted file mode 100644
index fdbdf5d6a77b..000000000000
--- a/games-puzzle/toppler/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">toppler</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/toppler/toppler-1.1.6-r1.ebuild b/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
deleted file mode 100644
index 98307d76c751..000000000000
--- a/games-puzzle/toppler/toppler-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Reimplementation of Nebulous using SDL"
-HOMEPAGE="http://toppler.sourceforge.net/"
-SRC_URI="mirror://sourceforge/toppler/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-mixer[vorbis]
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/games-puzzle/torrent-0.8.2-r1 b/games-puzzle/torrent-0.8.2-r1
new file mode 100644
index 000000000000..94f53472f7f8
--- /dev/null
+++ b/games-puzzle/torrent-0.8.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
+DESCRIPTION=Match rising tiles before reaching the top to score as many points as possible
+EAPI=6
+HOMEPAGE=http://www.shiftygames.com/torrent/torrent.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.4 >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 media-libs/sdl-ttf
+SLOT=0
+SRC_URI=http://www.shiftygames.com/torrent/torrent-0.8.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=8bc56a032dda80c80d0ce25aa780ba7f
diff --git a/games-puzzle/torrent/Manifest b/games-puzzle/torrent/Manifest
deleted file mode 100644
index 3f062ba19334..000000000000
--- a/games-puzzle/torrent/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST torrent-0.8.2.tar.gz 555686 BLAKE2B 17834483730fc9e4771899fed12b687568502e857e1f00355174944c2bf21a10065a762af801df556eead7248c74883c98e7732a2c5a6f377c88605024764ba8 SHA512 da7fbb21252a76fcd41c0b22ae4c0835e2fcabc4da5ce60ad04880c3fb633b6aaa951532ac0ce69d93f03b7608e4b110a23ed6f9f8839d053cd4a0d9500d1692
-EBUILD torrent-0.8.2-r1.ebuild 775 BLAKE2B 8619a1abb32de986396aede59561a6ab48c3aea9f519eace238d4adbd4994452d390c74569cefeb95ee08ce618a01917a77c7689869af593df926f9ad066cadb SHA512 87028937ce1e635c1999861052bf2ec465df90583e5f20444f978c5cb583d57c265e1618598ed3c801b5fd2479b8b1ca40c28abdfda9d6e6ff0274fdf74a3bdc
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/torrent/metadata.xml b/games-puzzle/torrent/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/torrent/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/torrent/torrent-0.8.2-r1.ebuild b/games-puzzle/torrent/torrent-0.8.2-r1.ebuild
deleted file mode 100644
index 76d28a5eee3a..000000000000
--- a/games-puzzle/torrent/torrent-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Match rising tiles before reaching the top to score as many points as possible"
-HOMEPAGE="http://www.shiftygames.com/torrent/torrent.html"
-SRC_URI="http://www.shiftygames.com/torrent/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.4
-	>=media-libs/sdl-mixer-1.2
-	>=media-libs/sdl-image-1.2
-	media-libs/sdl-ttf
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/inline void SE_CheckEvents/void SE_CheckEvents/' \
-		src/torrent.c \
-		|| die "sed failed"
-}
-
-src_install() {
-	default
-	newicon pics/sg_icon.png ${PN}.png
-	make_desktop_entry ${PN} Torrent ${PN}
-}
diff --git a/games-puzzle/triptych-1.16 b/games-puzzle/triptych-1.16
new file mode 100644
index 000000000000..c6e37c93050d
--- /dev/null
+++ b/games-puzzle/triptych-1.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DESCRIPTION=Fast-paced Tetris-like puzzler
+EAPI=7
+HOMEPAGE=http://www.chroniclogic.com/triptych.htm
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/libsdl-1.2[abi_x86_32,opengl,sound,video] virtual/opengl[abi_x86_32] x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32]
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=http://www.chroniclogic.com/demos/triptych.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eutils	5b8ce72259e08104b337fe28c6de5dbc	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=f8e37850043c49b74558caac64337947
diff --git a/games-puzzle/triptych/Manifest b/games-puzzle/triptych/Manifest
deleted file mode 100644
index 18a53864776b..000000000000
--- a/games-puzzle/triptych/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST triptych.tar.gz 1748316 BLAKE2B 0d66265df27f61ddee1e1777a1e749d3a8bbcebf0e2bfe64a054febb48def865b68ab59d9c25804ed725bb11d24af2bbd712cc2de88a7259db26aa6d7c3c8d1f SHA512 614de78c9f90dd2145ff3dfa6f7a799a069c5add80bc8b0494a752346a163ab0eff7b707292b815adbffa34e4fec446035cfb65df4dd6cf284f270bb732b6daa
-EBUILD triptych-1.16.ebuild 1294 BLAKE2B 6125e2c24fe8a02c6eec1b40e9cf47a240e56c4b3cc57a55a4662bd8a490149db24f2f1cfbe4fef79ca31ffb99a437422af87ff8e52faf2e411f319b8918187b SHA512 9d5bae71e7550254ede4d05d1d6bee2ba17e7126b4b7c87d9a6f5a0a4db517b01c8cfff7ce5fa117a9f28fd583f8f07b0d9d744d01027cee914e2fba158fec7e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/triptych/metadata.xml b/games-puzzle/triptych/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/triptych/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/triptych/triptych-1.16.ebuild b/games-puzzle/triptych/triptych-1.16.ebuild
deleted file mode 100644
index e2257e17ad3f..000000000000
--- a/games-puzzle/triptych/triptych-1.16.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils user
-
-DESCRIPTION="Fast-paced Tetris-like puzzler"
-HOMEPAGE="http://www.chroniclogic.com/triptych.htm"
-SRC_URI="http://www.chroniclogic.com/demos/${PN}.tar.gz"
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist mirror strip"
-
-RDEPEND=">=media-libs/libsdl-1.2[abi_x86_32,opengl,sound,video]
-	virtual/opengl[abi_x86_32]
-	x11-libs/libX11[abi_x86_32]
-	x11-libs/libXext[abi_x86_32]"
-
-QA_PREBUILT="opt/${PN}/${PN}
-	opt/${PN}/setup"
-
-S="${WORKDIR}/${PN}"
-
-DIR="/opt/${PN}"
-WRITABLE=( "${EROOT}${DIR}"/{hwconfig.cfg,${PN}.{clr,cnt,scr}} )
-
-pkg_setup() {
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	default
-	rm -v *.dll || die
-}
-
-src_install() {
-	local EXES=( ${PN} setup )
-
-	insinto "${DIR}"
-	doins -r .
-
-	exeinto "${DIR}"
-	doexe "${EXES[@]}"
-
-	fowners root:gamestat "${EXES[@]/#/${DIR}/}" || die
-	fperms g+s "${EXES[@]/#/${DIR}/}" || die
-
-	make_wrapper ${PN} ./${PN} "${DIR}"
-	make_wrapper ${PN}-setup ./setup "${DIR}"
-}
-
-pkg_postinst() {
-	touch "${WRITABLE[@]}" || die
-	chown root:gamestat "${WRITABLE[@]}" || die
-	chmod 0664 "${WRITABLE[@]}" || die
-}
-
-pkg_prerm() {
-	[[ -z ${REPLACED_BY_VERSION} ]] &&
-		rm -v "${WRITABLE[@]}"
-}
diff --git a/games-puzzle/twindistress-1.1.0 b/games-puzzle/twindistress-1.1.0
new file mode 100644
index 000000000000..548b095cbfaf
--- /dev/null
+++ b/games-puzzle/twindistress-1.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[png]
+DESCRIPTION=Match and remove all of the blocks before time runs out
+EAPI=5
+HOMEPAGE=http://twind.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[png] games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/twind/twind-1.1.0.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_=e5753c2aaa1124a7dd1bf5db060b5651
diff --git a/games-puzzle/twindistress/Manifest b/games-puzzle/twindistress/Manifest
deleted file mode 100644
index 1eb8b6364ce8..000000000000
--- a/games-puzzle/twindistress/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX twindistress-1.1.0-ldflags.patch 372 BLAKE2B 7966bd989fefdc13bf433f33ebcbada98723990d7779f6674a8ded1952ffcaf522b0c9df1795773f25e511fe22a8c9b33f31563cb0261e9a3eaaae040829d497 SHA512 5c19ffcfe2e9a451e95ac4d03da20cf54bf46ddc7bd369cc9e6c49a3215f8c39f50632d9e60167389859156c4df35ed7b813e1beb7a884c8ec0198f56a8d9f56
-AUX twindistress-1.1.0-warnings.patch 3342 BLAKE2B 3c96cb1a4f9c8073f493798ff653a7172294ceac58a283f08f12183cae498e3d2ef3f1bb091a7d18ade256d1ab7652baf4f3d9b743422382652292cf458c9566 SHA512 20bb973c6dea47436333f9449c7b924c38744e74b8eed6646062e4a48c74156cba8fd17150f5a4f8dc19de68ee1c394eee8aa0f2f867a72bddbbb32278e9c304
-DIST twind-1.1.0.tar.gz 2837845 BLAKE2B 2c5d0eff1fba42be02aeece2552f343ecfbba9e14484f78d3ef1acc08f313cb3bd9cfc7c4bc2033697bd3ae7792853d1c1206dc3b8e374215eb7d89365dae02b SHA512 f1b3be3e5706ce244dd291b6fba2160605593e51b60344521025daf882509e164aa5c201c8d696e56a64d6f3525d16ecd3fd78cc1b86f39f401d4137b615fe8f
-EBUILD twindistress-1.1.0.ebuild 1379 BLAKE2B 00dc5e4866c8dec94aad7a148819cfa9b4a3c2492afa3c533172cf897778fb012056c4f0c930022a882150135ebf1bc2c7b5da0df74edd58bcd5929b52d8ec06 SHA512 48ceef2f202934a39dd5920f5e20dd0db6b538a69173a07641a55e3102bdde4cf4ad0732344dec423efea875b650ff82f181d260da34def12d9798902dd1b215
-MISC metadata.xml 328 BLAKE2B c47ffd007164600a4f8e9ecabd1c8b29c65513a0fff46d5a4b2e2978ac8922263d3d10e6c5303e9a60e3645bb8ad030b561b1aaf5dfd5d69f4bb97998db024e7 SHA512 a7244b86047c6854bbec72296e625cc10aefa30a2e901dbc2f15083ab1532dc7b3e5fe91ae344fe8b4f0d1019b6f4c91def98cbeffb8fe4a044cc34cd9b03e38
diff --git a/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch b/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch
deleted file mode 100644
index 0ac589d88368..000000000000
--- a/games-puzzle/twindistress/files/twindistress-1.1.0-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old	2010-10-19 09:06:48.000000000 +0200
-+++ Makefile	2010-10-19 09:06:59.000000000 +0200
-@@ -50,7 +50,7 @@
- 	make twind MIXER_LIB= AUDIOFLAG=NOAUDIO
-  	
- twind: twind.o
--	$(CC) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind
-+	$(CC) $(LDFLAGS) twind.o $(LIBS) $(SDL_LIBS) $(MIXER_LIB) -o twind
- 
- twind.o: twind.c
- 	$(CC) $(CFLAGS) $(SDL_CFLAGS) -c twind.c
diff --git a/games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch b/games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch
deleted file mode 100644
index 67ee19149ec8..000000000000
--- a/games-puzzle/twindistress/files/twindistress-1.1.0-warnings.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ru twind-1.1.0.orig/twind.c twind-1.1.0/twind.c
---- twind-1.1.0.orig/twind.c	2004-07-15 21:44:50.000000000 -0400
-+++ twind-1.1.0/twind.c	2010-10-19 03:32:44.372280497 -0400
-@@ -674,10 +674,10 @@
-                     if (event.button.x >= MENULX && event.button.x < MENURX && event.button.y >= starty && event.button.y < (starty + height)) {
-                         current_menu_high = (event.button.y - starty) / game.font[font].height;
-                         /* re-assign current_menu_high if blank option */
--                        if (menu_items[game.menu][current_menu_high] == "")
-+                        if (*menu_items[game.menu][current_menu_high] == '\0')
-                             current_menu_high = game.last_menu_high;
-                         if (game.last_menu_high != current_menu_high) {
--                            if (menu_items[game.menu][current_menu_high] != "") {
-+                            if (*menu_items[game.menu][current_menu_high] != '\0') {
-                                 #ifndef NOAUDIO
-                                 if (game.audio_enabled) Mix_PlayChannel(MENU_OPTION, game.sound[MENU_OPTION], 0);
-                                 #endif
-@@ -697,7 +697,7 @@
-                         if (event.button.x >= MENULX && event.button.x < MENURX && event.button.y >= starty && event.button.y < (starty + height)) {
-                             current_menu_high = (event.button.y - starty) / game.font[font].height;
-                             /* make sure the option isn't blank */
--                            if (menu_items[game.menu][current_menu_high] != "") {
-+                            if (*menu_items[game.menu][current_menu_high] != '\0') {
-                                 #ifndef NOAUDIO
-                                 if (game.audio_enabled) Mix_PlayChannel(OPTION_CHOICE, game.sound[OPTION_CHOICE], 0);
-                                 #endif
-@@ -917,7 +917,7 @@
-         #endif
-         current_menu_high--;
-         /* if option blank, go to previous */
--        while (menu_items[game.menu][current_menu_high] == "")
-+        while (*menu_items[game.menu][current_menu_high] == '\0')
-             current_menu_high--;
-         /* wrap around to the bottom entry */
-         if (current_menu_high == -1)
-@@ -930,7 +930,7 @@
-         #endif
-         current_menu_high++;
-         /* if option blank, go to next */
--        while (menu_items[game.menu][current_menu_high] == "")
-+        while (*menu_items[game.menu][current_menu_high] == '\0')
-             current_menu_high++;
-         /* wrap around to the top entry */
-         if (current_menu_high == game.menu_item_cnt)
-@@ -1536,7 +1536,7 @@
-             if (level_time && game.stop_timer + game.added_time < game.best_time)
-                 game.best_time = game.stop_timer + game.added_time;
-             /* subtract a set amount of time after level 11 */
--            if (game.current_level > 11)
-+            if (game.current_level >= 11)
-                 game.level_time -= 10;
-             else
-                 game.level_time = times[level_time];
-@@ -1546,7 +1546,7 @@
-                 break;
-             }
-             /* increase time for next level */
--            if (level_time != 12)
-+            if (level_time != 10)
-                 level_time++;
-         }
-         if (game.exit_game != NEW_GAME) {
diff --git a/games-puzzle/twindistress/metadata.xml b/games-puzzle/twindistress/metadata.xml
deleted file mode 100644
index b3a48cd60dea..000000000000
--- a/games-puzzle/twindistress/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">twind</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/twindistress/twindistress-1.1.0.ebuild b/games-puzzle/twindistress/twindistress-1.1.0.ebuild
deleted file mode 100644
index cdc296985750..000000000000
--- a/games-puzzle/twindistress/twindistress-1.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_P="twind-${PV}"
-DESCRIPTION="Match and remove all of the blocks before time runs out"
-HOMEPAGE="http://twind.sourceforge.net/"
-SRC_URI="mirror://sourceforge/twind/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-	media-libs/sdl-image[png]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -i \
-		-e '/^CC/d' \
-		-e "/^CFLAGS/s:-g:${CFLAGS}:" \
-		-e "/^DATA_PREFIX/s:/.*$:${GAMES_DATADIR}/${PN}/:" \
-		-e "/^HIGH_SCORE_PREFIX/s:/.*$:${GAMES_STATEDIR}/${PN}/:" \
-		Makefile || die "sed failed"
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-warnings.patch
-}
-
-src_install() {
-	dogamesbin twind
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r graphics music sound
-
-	doicon graphics/twind.png
-	make_desktop_entry twind "Twin Distress"
-
-	dodoc AUTHORS ChangeLog CREDITS NEWS README TODO
-
-	dodir "${GAMES_STATEDIR}/${PN}"
-	touch "${D}/${GAMES_STATEDIR}/${PN}/twind.hscr"
-	fperms 660 "${GAMES_STATEDIR}/${PN}/twind.hscr"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if ! has_version "media-libs/sdl-mixer[vorbis]" ; then
-		ewarn "Music support will be disabled since sdl-mixer"
-		ewarn "wasn't built with USE=vorbis"
-	fi
-}
diff --git a/games-puzzle/wakkabox-1.1.0-r1 b/games-puzzle/wakkabox-1.1.0-r1
new file mode 100644
index 000000000000..7fe04fd3fc43
--- /dev/null
+++ b/games-puzzle/wakkabox-1.1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.0.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A simple block-pushing game
+EAPI=6
+HOMEPAGE=http://kenn.frap.net/wakkabox/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.0.1
+SLOT=0
+SRC_URI=http://kenn.frap.net/wakkabox/wakkabox-1.1.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f1b7249ac8506af28067b012f338d2bb
diff --git a/games-puzzle/wakkabox/Manifest b/games-puzzle/wakkabox/Manifest
deleted file mode 100644
index 83dc8213be69..000000000000
--- a/games-puzzle/wakkabox/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wakkabox-1.1.0-gentoo.patch 1768 BLAKE2B 57fc63581b1fecaf579fc70cee8a693c4c55a27c19afe85442e3a36b5d7fcf693dba91ff4cf52ab5f21813f15250abc3352930c333636780f0ff9c478b255c32 SHA512 28c261d77372ffad9815dc6d40118595d7896bafb352237ce708f028ac50ae0530d5a61f75ece36c35ec7f041da9979c9cfa37c19dae1e83ef9ddb34ffa4bf94
-DIST wakkabox-1.1.0.tar.gz 158231 BLAKE2B f756cf98135591dbae60f00a4e85f4286204f0206196b032c2ac547ae5f1259a4b228f673aed047a8848a6500abaccc0ea69f8eb47e1950309fadc9738e684da SHA512 a97fcf382c3703fa59d6c2159397cb795b698d2a28253a7e60690b24b3d72b4950b9a7c569600bac0dc637b9d9a52577a45944036518cf5e79c601b377a092be
-EBUILD wakkabox-1.1.0-r1.ebuild 613 BLAKE2B ac2beb4615cbb105771f47ad5a719acb72dab76cf9a440422fb2aa86392c1c745f7e3476050055b3234e283feef0daa5a718b4c9235adffbf8a78bfbc8307c21 SHA512 98d132cf9f39b470f20accdaa35fefb3b558776bc362e923b350cfa78c82b7914876b877e64f9b72bfccd4f35be507d3f01ab944a3274dd5557ab6e6c49bd800
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch b/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
deleted file mode 100644
index ad82efaeab94..000000000000
--- a/games-puzzle/wakkabox/files/wakkabox-1.1.0-gentoo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.ac.old	2015-02-26 23:25:34.146334845 +0100
-+++ b/configure.ac	2015-02-26 23:25:47.978312858 +0100
-@@ -17,6 +17,7 @@
- CFLAGS="$CFLAGS $SDL_CFLAGS"
--LIBS="$LIBS $SDL_LIBS"
-+LIBS="$LIBS -lm $SDL_LIBS"
- 
--AC_SUBST(CFLAGS LIBS)
-+AC_SUBST(CFLAGS)
-+AC_SUBST(LIBS)
- 
- AC_OUTPUT(	Makefile  )
---- a/configure.ac.old	2015-02-26 23:33:25.801552821 +0100
-+++ b/configure.ac	2015-02-26 23:33:47.509542361 +0100
-@@ -1,4 +1,4 @@
--AC_INIT( wakkabox.c )
-+AC_INIT([[wakkabox.c]])
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
---- a/wakkabox.c.old	2015-02-26 23:43:26.146386413 +0100
-+++ b/wakkabox.c	2015-02-26 23:44:39.647389816 +0100
-@@ -249,22 +249,22 @@
- 	printf("Loading bmp files from %s...", DATADIR);
- 	
- 	smallblockFname = (char*)malloc( strlen("smallblock.bmp") 
--									 + strlen(DATADIR) );
-+									 + strlen(DATADIR) + 2);
- 	medblockhFname = (char*)malloc( strlen("medblockh.bmp") 
--									+ strlen(DATADIR) );
-+									+ strlen(DATADIR) + 2);
- 	medblockvFname = (char*)malloc( strlen("medblockv.bmp") 
--									+ strlen(DATADIR) );
-+									+ strlen(DATADIR) + 2);
- 	bigblockFname = (char*)malloc( strlen("bigblock.bmp") 
--								   + strlen(DATADIR) );
-+								   + strlen(DATADIR) + 2);
- 
- 	smallblockLocalName = (char*)malloc( strlen("smallblock.bmp") 
--										 + strlen(".") );
-+										 + strlen(".") + 2);
- 	medblockhLocalName = (char*)malloc( strlen("medblockh.bmp") 
--										+ strlen(".") );
-+										+ strlen(".") + 2);
- 	medblockvLocalName = (char*)malloc( strlen("medblockv.bmp") 
--										+ strlen(".") );
-+										+ strlen(".") + 2);
- 	bigblockLocalName = (char*)malloc( strlen("bigblock.bmp") 
--									   + strlen(".") );
-+									   + strlen(".") + 2);
- 	
- 
- 	sprintf( smallblockFname, "%s/smallblock.bmp", DATADIR );
diff --git a/games-puzzle/wakkabox/metadata.xml b/games-puzzle/wakkabox/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/wakkabox/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild b/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
deleted file mode 100644
index a04dd8404b70..000000000000
--- a/games-puzzle/wakkabox/wakkabox-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop
-
-DESCRIPTION="A simple block-pushing game"
-HOMEPAGE="http://kenn.frap.net/wakkabox/"
-SRC_URI="http://kenn.frap.net/wakkabox/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.0.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-gentoo.patch
-	rm aclocal.m4
-	eautoreconf
-}
-
-src_install() {
-	default
-	newicon bigblock.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Wakkabox" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-puzzle/wizznic-369-r1 b/games-puzzle/wizznic-369-r1
new file mode 100644
index 000000000000..f4af6dd98cea
--- /dev/null
+++ b/games-puzzle/wizznic-369-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
+DESCRIPTION=Block-clearing puzzle game
+EAPI=6
+HOMEPAGE=http://wizznic.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/wizznic/Wizznic_src_build_369.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=1b30b1885ab03355271e7807c9717595
diff --git a/games-puzzle/wizznic/Manifest b/games-puzzle/wizznic/Manifest
deleted file mode 100644
index 2aa86cf8fdde..000000000000
--- a/games-puzzle/wizznic/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Wizznic_src_build_369.tar.bz2 38118227 BLAKE2B 2d48a53ab715a25b7f1b2c4e8c01935084cd44a99e1a6ded6c421f507f55961e8ebe5df6ea2b912c1be8ee8a82285376673114f3af0c1df9ec0ae1042e2f6145 SHA512 61c6ced873403bbd14e8c376321ae0c92a7333bb59409615de1e1305da3e4b3cb023af36e002d732877fd1371a322796df3e4050e5afe699e03f01039d7f7ead
-EBUILD wizznic-369-r1.ebuild 1028 BLAKE2B d8c5b4150ce087542cab468dcacf1e3788be43132a1c23427011b67128e77d27fc25a44ccc50610f941da6b18d1d4f9da90d8d3e4c4d4e11fdfb26eee9a451c6 SHA512 a5154526ffd4a6074c8274874f9168fbfa8c9fdf332badf4ef3652902d57ac829f10fb752a221f1805071abd3f45f99b01ba5275b22240ab99a50b458a986054
-MISC metadata.xml 330 BLAKE2B d5c884b078e412a6a8b74af3337c2e21226fca735a3c9400adf0335ab1f0251f911c0c2014ca6975e1bdb45683395056ab323d1f615decfcc3fb748797349cc3 SHA512 3cce7ff11dff9f3552a3e073a0ceb96d1032e9c87347554fb74b2a313a2f0a24774fe94debd1caef26cc0d57e051ff0fd616203f0e0bdae425bc1af834010580
diff --git a/games-puzzle/wizznic/metadata.xml b/games-puzzle/wizznic/metadata.xml
deleted file mode 100644
index 6b1e64c0e478..000000000000
--- a/games-puzzle/wizznic/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wizznic</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/wizznic/wizznic-369-r1.ebuild b/games-puzzle/wizznic/wizznic-369-r1.ebuild
deleted file mode 100644
index ca391dbb54d0..000000000000
--- a/games-puzzle/wizznic/wizznic-369-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Block-clearing puzzle game"
-HOMEPAGE="http://wizznic.org/"
-SRC_URI="mirror://sourceforge/wizznic/Wizznic_src_build_${PV}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Wizznic_src_build_${PV}"
-
-src_prepare() {
-	default
-	sed \
-		-e '/^\(CC\|LD\|STRIP\)/d' \
-		-e 's/(LD)/(CC)/g' \
-		-e '/CFLAGS.*=/d' \
-		Makefile.linux > Makefile || die
-}
-
-src_compile() {
-	emake \
-		DATADIR="/usr/share/${PN}/" \
-		BINDIR="/usr/bin" \
-		STRIP=true
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		DATADIR="/usr/share/${PN}/" \
-		BINDIR="/usr/bin" \
-		install
-	dodoc doc/{changelog.txt,credits.txt,media-licenses.txt,ports.txt,readme.txt}
-	newicon data/wmicon.png ${PN}.png
-	make_desktop_entry wizznic "Wizznic!"
-}
diff --git a/games-puzzle/wmpuzzle-0.5.2-r1 b/games-puzzle/wmpuzzle-0.5.2-r1
new file mode 100644
index 000000000000..c920d38f88ef
--- /dev/null
+++ b/games-puzzle/wmpuzzle-0.5.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm >=sys-apps/sed-4
+DESCRIPTION=a 4x4 puzzle on a 64x64 mini window
+EAPI=6
+HOMEPAGE=https://people.debian.org/~godisch/wmpuzzle/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
+SLOT=0
+SRC_URI=https://people.debian.org/~godisch/wmpuzzle/wmpuzzle-0.5.2.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_=1546ed5cefcd7b1e6c728908cb4138fc
diff --git a/games-puzzle/wmpuzzle/Manifest b/games-puzzle/wmpuzzle/Manifest
deleted file mode 100644
index 4c6f1e1baeab..000000000000
--- a/games-puzzle/wmpuzzle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wmpuzzle-0.5.2.tar.gz 87373 BLAKE2B c2187fce6fbfe4f68b969da605755f379d14d47a478c6ca43da25dcb607939cf63552e108073d7031ef0dfc2d5455aade5d2f8617cbadad62587ffcaef95ed1f SHA512 7d171d307e3829005dff4d718161655785e87129b07917d494bb498eff904adafc7c6f83e71f996759ee9e365fe70c67858a5ec9d2647fe573e0a1505126f6c0
-EBUILD wmpuzzle-0.5.2-r1.ebuild 706 BLAKE2B 38a8b2de1a1c1486edac11055710a776c89af5ad317fe4684095a01bba3c36d5b980cd077f86a03546069b980c7cdd329b4ab0d5a05f74e1494e27780bdece4b SHA512 8984449e55fb1872657e7aa53f53c3e41449e199ff481f5cc900e1a2219f45c0d467dc24ba723fc6c802da7e65be7d17801d59c74ea9d18dd5510947d43a78f1
-MISC metadata.xml 441 BLAKE2B 32c3a0ed8a9f2fd02246c333adea24fad083490055a0a8beaa4ec743c0efe07286d2bf8cb4318a7c4424a7c4a079d2bec9ae04908e352c35b40099f5c7d8371f SHA512 12d6a5472ef0f13f5703f22b584bdb75364db3018f0d280b18d2813f741d2820aa1daf3dec24e64e88c1df27822695680a269169ef682ebd95af26d130401714
diff --git a/games-puzzle/wmpuzzle/metadata.xml b/games-puzzle/wmpuzzle/metadata.xml
deleted file mode 100644
index 7e50655eda28..000000000000
--- a/games-puzzle/wmpuzzle/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="freecode">wmpuzzle</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild b/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
deleted file mode 100644
index 314b27ac091a..000000000000
--- a/games-puzzle/wmpuzzle/wmpuzzle-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="a 4x4 puzzle on a 64x64 mini window"
-HOMEPAGE="https://people.debian.org/~godisch/wmpuzzle/"
-SRC_URI="https://people.debian.org/~godisch/wmpuzzle/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-
-src_install() {
-	dobin ${PN}
-
-	dodoc ../{CHANGES,README}
-	newicon -s 48 numbers.xpm ${PN}.xpm
-	doman ${PN}.6
-	make_desktop_entry ${PN}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-puzzle/world-of-goo-1.41-r2 b/games-puzzle/world-of-goo-1.41-r2
new file mode 100644
index 000000000000..139174cc6d5e
--- /dev/null
+++ b/games-puzzle/world-of-goo-1.41-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch
+DESCRIPTION=A puzzle game with a strong emphasis on physics
+EAPI=6
+HOMEPAGE=http://2dboy.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=2dboy-EULA
+RDEPEND=media-libs/libsdl[alsa,sound,opengl,video] media-libs/sdl-mixer[vorbis] sys-libs/glibc virtual/opengl virtual/glu >=sys-devel/gcc-3.4
+RESTRICT=fetch bindist strip
+SLOT=0
+SRC_URI=WorldOfGooSetup.1.41.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_=3d36f9def39ebffb63a55d3f5deb8fdc
diff --git a/games-puzzle/world-of-goo-demo-1.41-r2 b/games-puzzle/world-of-goo-demo-1.41-r2
new file mode 100644
index 000000000000..caedc87a33c7
--- /dev/null
+++ b/games-puzzle/world-of-goo-demo-1.41-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install nofetch
+DESCRIPTION=A puzzle game with a strong emphasis on physics
+EAPI=6
+HOMEPAGE=http://2dboy.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=2dboy-EULA
+RDEPEND=media-libs/libsdl[sound,opengl,video] media-libs/sdl-mixer[vorbis] sys-libs/glibc virtual/opengl virtual/glu >=sys-devel/gcc-3.4
+RESTRICT=fetch strip
+SLOT=0
+SRC_URI=WorldOfGooDemo.1.41.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=13a42cddadb3853aa16c93d2d76b375c
diff --git a/games-puzzle/world-of-goo-demo/Manifest b/games-puzzle/world-of-goo-demo/Manifest
deleted file mode 100644
index 881e359439be..000000000000
--- a/games-puzzle/world-of-goo-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WorldOfGooDemo.1.41.tar.gz 34729052 BLAKE2B 02700d337d3aa1daa436bd418131c7c01565244aab303eb239b59b0e437f1e40441b1879de48ade44e6b1c0842c043b4ef40e07809539db9fcacb37204c2092c SHA512 5dcaf7cdacedf0df92133284c4781e1d4ad14abbeddd623a35e59129fc5c1cbb3782d570ac83bc6201f3212c15195e5ca637400839e87fe95edddc5ca671077a
-EBUILD world-of-goo-demo-1.41-r2.ebuild 1387 BLAKE2B 19d73315026e60bf1f64a926d3c27cc11e588f9f351ce0e5660e6f4790ca32ddf33bb4abbcdbb86cd808343172be204e8f34ca60d4319175699c92c48ed97b50 SHA512 1a46f38c0ca78ccb05df9468c75bb9bab3b81ec51de3b72efda63da1220e4d4b17de069ed13065a0822d3891ab2da13c9d91788be3ad759c3ffc085f1d8392b6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo-demo/metadata.xml b/games-puzzle/world-of-goo-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/world-of-goo-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild b/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
deleted file mode 100644
index 6e16ab61c1cd..000000000000
--- a/games-puzzle/world-of-goo-demo/world-of-goo-demo-1.41-r2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A puzzle game with a strong emphasis on physics"
-HOMEPAGE="http://2dboy.com/"
-
-if [[ ${PN} == *-demo ]] ; then
-	MY_PN="WorldOfGooDemo"
-	SRC_URI="${MY_PN}.${PV}.tar.gz"
-else
-	MY_PN="WorldOfGoo"
-	SRC_URI="${MY_PN}Setup.${PV}.tar.gz"
-fi
-
-LICENSE="2dboy-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch strip"
-
-RDEPEND="
-	media-libs/libsdl[sound,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/glibc
-	virtual/opengl
-	virtual/glu
-	>=sys-devel/gcc-3.4
-"
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}"
-dir="/opt/${PN}"
-
-QA_PREBUILT="
-	${dir:1}/${MY_PN%Demo}.bin32
-	${dir:1}/${MY_PN%Demo}.bin64
-"
-
-pkg_nofetch() {
-	if [[ ${PN} == *-demo ]] ; then
-		elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo"
-		elog "and download ${A} and place it in ${DISTDIR}"
-	else
-		elog "Download ${A} from ${HOMEPAGE} and place it in ${DISTDIR}"
-	fi
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe ${MY_PN%Demo}*
-
-	make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
-
-	insinto "${dir}"
-	doins -r icons properties res
-	newicon icons/scalable.svg ${PN}.svg
-
-	if [[ ${PN} == *-demo ]] ; then
-		make_desktop_entry ${PN} "World of Goo (Demo)"
-	else
-		make_desktop_entry ${PN} "World of Goo"
-	fi
-
-	dodoc linux-issues.txt
-	HTML_DOCS="readme.html" einstalldocs
-}
diff --git a/games-puzzle/world-of-goo/Manifest b/games-puzzle/world-of-goo/Manifest
deleted file mode 100644
index 9e80b891e04d..000000000000
--- a/games-puzzle/world-of-goo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST WorldOfGooSetup.1.41.tar.gz 66428181 BLAKE2B 476c05f0b3f78fa952728b9f7b5b95942e7f3e57dde4842144ccaa28c9ad2d2c264b1a2277ba5a1f3edf25cb812c72a0380b0d26b2bc99dd9a77116badcf5477 SHA512 278dfb983cf9cf4de87f13d94f5e75b3830af07523e2ddc7a443d5afb6fead130ed50440357554986b5b0d99c17651f77ae11298f51f9f1072ebd40287cad396
-EBUILD world-of-goo-1.41-r2.ebuild 1472 BLAKE2B 4464e577d888be78e0fdabc8a9026724ad3f249bb2b90b7e4d9369e9b84a051be4725b6d488f4cf880b56f44681e5115f64e7dcc7b56782bf1e9e1044d0b2877 SHA512 ee612026cb24862f5ebba0e69a5089dcbabc5a4dae3f9efdf04b65188e708cb06e779c91c67a3accdf1a9a3c36b75547ea7f491dbb9d02724a6c84171f725fe7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/world-of-goo/metadata.xml b/games-puzzle/world-of-goo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/world-of-goo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild b/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
deleted file mode 100644
index 51f7f12ff569..000000000000
--- a/games-puzzle/world-of-goo/world-of-goo-1.41-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils		# eutils for make_wrapper()
-
-DESCRIPTION="A puzzle game with a strong emphasis on physics"
-HOMEPAGE="http://2dboy.com/"
-
-if [[ ${PN} == *-demo ]] ; then
-	MY_PN="WorldOfGooDemo"
-	SRC_URI="${MY_PN}.${PV}.tar.gz"
-else
-	MY_PN="WorldOfGoo"
-	SRC_URI="${MY_PN}Setup.${PV}.tar.gz"
-fi
-
-LICENSE="2dboy-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="fetch bindist strip"
-
-RDEPEND="media-libs/libsdl[alsa,sound,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/glibc
-	virtual/opengl
-	virtual/glu
-	>=sys-devel/gcc-3.4"
-
-S="${WORKDIR}/${MY_PN}"
-dir="/opt/${PN}"
-
-QA_PREBUILT="${dir:1}/${MY_PN%Demo}.bin32
-	${dir:1}/${MY_PN%Demo}.bin64"
-
-pkg_nofetch() {
-	if [[ ${PN} == *-demo ]] ; then
-		elog "To download the demo, visit http://worldofgoo.com/dl2.php?lk=demo"
-		elog "and download ${A} and place it in your DISTDIR directory."
-	else
-		elog "Download ${A} from ${HOMEPAGE}"
-		elog "and place it in your DISTDIR directory."
-	fi
-}
-
-src_install() {
-	exeinto "${dir}"
-	doexe ${MY_PN%Demo}{,.$(usex amd64 bin64 bin32)}
-
-	make_wrapper ${PN} "${dir}"/${MY_PN%Demo}
-
-	insinto "${dir}"
-	doins -r icons properties res
-	newicon icons/scalable.svg ${PN}.svg
-
-	if [[ ${PN} == *-demo ]] ; then
-		make_desktop_entry ${PN} "World of Goo (Demo)"
-	else
-		make_desktop_entry ${PN} "World of Goo"
-	fi
-
-	dodoc linux-issues.txt
-	docinto html
-	dodoc readme.html
-}
diff --git a/games-puzzle/xblockout-1.1.6-r1 b/games-puzzle/xblockout-1.1.6-r1
new file mode 100644
index 000000000000..4bb9bd96ad54
--- /dev/null
+++ b/games-puzzle/xblockout-1.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=x11-libs/libX11 x11-libs/libXext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X Window block dropping game in 3 Dimension
+EAPI=6
+HOMEPAGE=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-1
+RDEPEND=x11-libs/libX11 x11-libs/libXext
+SLOT=0
+SRC_URI=http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-1.1.6.tar.gz
+_eclasses_=autotools	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_=a53a5d54fdb6f05464d0137f8d246aa2
diff --git a/games-puzzle/xblockout/Manifest b/games-puzzle/xblockout/Manifest
deleted file mode 100644
index 668a714270f9..000000000000
--- a/games-puzzle/xblockout/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xblockout-1.1.6-font.patch 1535 BLAKE2B 5ae0fffb0d04c69123bb0c1098bcbaf2053551530d9f7f6f001ae693d4826148d16f4793009c83b286a7c9df8669e507145e39f2c7aa6bf4638ddc1e97bab15b SHA512 f74245e8d97859fa692c82f69657a77d31e84f249b5d29e23b16f072d596e85a51800f4af4578ba194151a6d0c5b577bad7a40a95d0477f31d2ae8147bec585d
-DIST xbl-1.1.6.tar.gz 136504 BLAKE2B 253c4a950def66abaef3547596b569542ea0dcd180fa5e81a7cb581d9dc23b2038b39c1059ddd36cfc89275ef3fb2a25d174ada71ab1818e408818613559a33e SHA512 96bf0460863698136a61b43260feed0e90e7ca5b6613d54c8ca98f51557a3d235597eeab46141cd6771aa0bf4fe019c5e4291dd826338e186cc905e3837531e0
-EBUILD xblockout-1.1.6-r1.ebuild 1216 BLAKE2B 1fbed71ba49c6a5851d9934faec162692cd77250d9bf61e42cb663685b56df055ced6c7f3d0fdc776c7e8ce4595ee396a435b063f6488f1c2c848906bbab36b2 SHA512 ddc6e41fbe580d99d48dbe69407720b5dd50fdaca6ad9fe149b5d8c141373b880654f2a7dac98e1e143adaa15845eddfde52349b87128613b647253048dc7134
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch b/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
deleted file mode 100644
index 1e007494e93e..000000000000
--- a/games-puzzle/xblockout/files/xblockout-1.1.6-font.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/initmenu.c.old	2008-10-27 23:23:43.000000000 +0100
-+++ b/initmenu.c	2008-10-27 23:22:52.000000000 +0100
-@@ -408,19 +408,17 @@
-   XCharStruct overall_return ;
- 
-   m->xfont = XLoadQueryFont( x->display , opt->thefont ) ;
--  m->font = XLoadFont( x->display , opt->thefont ) ;
-   if ( opt->verbose )
-     {
-       fprintf(stderr,"font=%s\n", opt->thefont) ;
-     }
--  if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
-+  if ( m->xfont==0 )
-     {
-       fprintf(stderr,"Some problems when loading a font... trying others\n") ;
-       m->xfont = XLoadQueryFont( x->display , 
- 				 "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
--      m->font = XLoadFont( x->display , 
--			   "-*-*-*-*-*-*-*-*-*-*-*-*-*-*" ) ;
--      if ( m->font==BadAlloc || m->font==BadName || m->xfont==0 )
-+      m->font = m->xfont->fid;
-+      if ( m->xfont==0 )
- 	{
- 	  fprintf(stderr,"You haven't -*-*-*-*-*-*-*-*-*-*-*-*-*-*\n");
- 	  fprintf(stderr,"Have you A font?\n");
-@@ -428,17 +426,17 @@
- 	  exit(1) ;
- 	}
-     }
-+  m->font = m->xfont->fid;
-   m->xfont2 = XLoadQueryFont( x->display , opt->thefont2 ) ;
--  m->font2 = XLoadFont( x->display , opt->thefont2 ) ;
-   if ( opt->verbose )
-     {
-       fprintf(stderr,"font2=%s\n", opt->thefont2) ;
-     }
--  if ( m->font2==BadAlloc || m->font2==BadName || m->xfont2==0 )
-+  if ( m->xfont2==0 )
-     {
--      m->font2 = m->font ;
-       m->xfont2 = m->xfont ;
-     }
-+  m->font2 = m->xfont2->fid;
- 
-   xgc.background = x->back_pixel ;
-   xgc.foreground = opt->backcolor!=7 ? x->white_pixel : x->black_pixel;
diff --git a/games-puzzle/xblockout/metadata.xml b/games-puzzle/xblockout/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/xblockout/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild b/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
deleted file mode 100644
index 71a44a6d8c39..000000000000
--- a/games-puzzle/xblockout/xblockout-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic
-
-DESCRIPTION="X Window block dropping game in 3 Dimension"
-HOMEPAGE="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/"
-SRC_URI="http://perso.univ-lyon1.fr/thierry.excoffier/XBL/xbl-${PV}.tar.gz"
-
-LICENSE="GPL-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/xbl-${PV}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-font.patch
-	sed -i \
-		-e '/^CC/d' \
-		-e 's:-lm:-lm -lX11:' \
-		-e '/DGROUP_GID/d' \
-		-e "s:-g$:${CFLAGS}:" \
-		Makefile.in || die
-	# Don't know about other archs. --slarti
-	use amd64 && filter-flags "-fweb"
-
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_compile() {
-	emake \
-		USE_SETGID= \
-		SCOREDIR="/usr/share/${PN}" \
-		RESOURCEDIR="/usr/share/${PN}" \
-		LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
-	newbin bl xbl
-
-	insinto /usr/share/${PN}
-	newins Xbl.ad Xbl
-
-	newman xbl.man xbl.6
-	dodoc README xbl-README
-	HTML_DOCS="*.html *.gif" einstalldocs
-
-	newicon xbl-game.gif ${PN}.gif
-	make_desktop_entry xbl XBlockOut /usr/share/pixmaps/${PN}.gif
-}
diff --git a/games-puzzle/xbomb-2.2b b/games-puzzle/xbomb-2.2b
new file mode 100644
index 000000000000..2f7368638edb
--- /dev/null
+++ b/games-puzzle/xbomb-2.2b
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=x11-libs/libXaw
+DESCRIPTION=Minesweeper clone with hexagonal, rectangular and triangular grid
+EAPI=5
+HOMEPAGE=http://www.gedanken.org.uk/software/xbomb/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libXaw games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.gedanken.org.uk/software/xbomb/download/xbomb-2.2b.tgz
+_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_=af32cb52e8d92475e8b6d15fd12c5459
diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest
deleted file mode 100644
index bc88916ffec3..000000000000
--- a/games-puzzle/xbomb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xbomb-2.2b-DESTDIR.patch 871 BLAKE2B 4a6841b33ce4cbfdf17507d8fe5001d82fa4de026693eb898b915c22b9779bf83e279a3add9fdba67ae8614cd42df5fc81f686016437184e7d529290fd2ce2fd SHA512 98135eb5927b4bd92bc1a6ac6fb86bf8c1f7387949c1ac419e3f78cc84184e1c8b2b8b6fb5d23089b6fdd8a7a8dca05733821180d1316d30edc53f487a16e4c8
-AUX xbomb-2.2b-ldflags.patch 177 BLAKE2B 2b22fe367177a8551fc692e97de539be366da981c79f31646bfc8dc5cf98bafdc916d9d89af3e44773e1a4c54bb35700cee1d093dee0233a639a6a6c4849b814 SHA512 21c7d9c57ec972ae49dd20a94041378a53dcd310685c8c3755571243d51b0b0e1664b30c0ce9013ad289d8589e7e219bafdcbcc31503ccc25052f2c3dbc2df82
-DIST xbomb-2.2b.tgz 24774 BLAKE2B 77a447af42ecd47654b826d884e7c31e98e0bdfb06d1574401064fe79dc42c961fc95a96dd6509871d78589e06eb54f975a292a5371c16520e125b75aae8b637 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1
-EBUILD xbomb-2.2b.ebuild 1001 BLAKE2B 0d0a6b3342161c22217f9cf868f8854002aa13bf7666f2e78b45ea02908a4cf6fe03b5594d303f0b9a8667045e2bffdf3447649032ee0afe08bb1278af44d15c SHA512 05d114f256b1a641714848d96df47faeaa64396e670a95d376ca32eea4b0c2f59d6246454a23bf301aa010938bde8af758fe3c90a3f6b2ee4a354bd72fe65e6a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
deleted file mode 100644
index 2ee8edd4ec91..000000000000
--- a/games-puzzle/xbomb/files/xbomb-2.2b-DESTDIR.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-*** xbomb-2.1/Makefile	1996-01-20 16:02:46.000000000 -0500
---- xbomb-2.1.new/Makefile
-***************
-*** 27,34 ****
-  
-  OBJ=xbomb.o xwindow.o hiscore.o
-  
-- INSTDIR=/usr/local
-- 
-  ########
-  
-  xbomb : $(OBJ)
---- 27,32 ----
-***************
-*** 52,60 ****
-  
-  install :
-  	strip xbomb
-! 	install -d $(INSTDIR)/bin
-! 	install -d $(INSTDIR)/man/man6
-! 	install -d $(INSTDIR)/lib/app-defaults
-! 	install -m 755 xbomb $(INSTDIR)/bin
-! 	install -m 644 xbomb.6 $(INSTDIR)/man/man6
-! 	install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb
---- 50,58 ----
-  
-  install :
-  	strip xbomb
-! 	install -d $(DESTDIR)/usr/bin
-! 	install -d $(DESTDIR)/usr/share/man/man6
-! 	install -d $(DESTDIR)/etc/X11/app-defaults
-! 	install -m 755 xbomb $(DESTDIR)/usr/bin
-! 	install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6
-! 	install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb
diff --git a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
deleted file mode 100644
index a320b0900c53..000000000000
--- a/games-puzzle/xbomb/files/xbomb-2.2b-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.old
-+++ Makefile
-@@ -30,7 +30,7 @@
- ########
- 
- xbomb : $(OBJ)
--	$(LINK) $(OBJ) -o $@ $(LIB) $(XLIB)
-+	$(LINK) $(LDFLAGS) $(OBJ) -o $@ $(LIB) $(XLIB)
- 
- ########
- 
diff --git a/games-puzzle/xbomb/metadata.xml b/games-puzzle/xbomb/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/xbomb/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild
deleted file mode 100644
index 488c4de4bd50..000000000000
--- a/games-puzzle/xbomb/xbomb-2.2b.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid"
-HOMEPAGE="http://www.gedanken.org.uk/software/xbomb/"
-SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libXaw"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-DESTDIR.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e '/strip/d' \
-		-e '/^CC=/d' \
-		-e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \
-		-e "s:/usr/bin:${GAMES_BINDIR}:" \
-		Makefile || die
-	sed -i \
-		-e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \
-		hiscore.c || die
-}
-
-src_install() {
-	default
-	dodir "${GAMES_STATEDIR}"/${PN}
-	touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed"
-	fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi
-	make_desktop_entry xbomb XBomb
-	prepgamesdirs
-}
diff --git a/games-puzzle/xlogical-1.0.7 b/games-puzzle/xlogical-1.0.7
new file mode 100644
index 000000000000..6aceda07f538
--- /dev/null
+++ b/games-puzzle/xlogical-1.0.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] alt_gfx? ( app-arch/unzip ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=SDL logical clone
+EAPI=5
+HOMEPAGE=http://changeling.ixionstudios.com/xlogical/
+IUSE=alt_gfx
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod] games-misc/games-envd
+SLOT=0
+SRC_URI=http://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=718fa8c0171fb160d415ea4000fac010
diff --git a/games-puzzle/xlogical/Manifest b/games-puzzle/xlogical/Manifest
deleted file mode 100644
index 342d46e88b80..000000000000
--- a/games-puzzle/xlogical/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xlogical-1.0.7-gcc41.patch 1121 BLAKE2B 6e1f94c128cfc771deca86da18eb924e11b611e54c4150ed39cb53aeda46257de21ff6bdfd9d1688dd6aa559900089d457107ea78eb347466792c353aacbb602 SHA512 eb98b351ae14f9c3f4f5783ef48633957c21ddb3debd7ba00e9c651be395cb11a30b6109bd26fef12845111ff320c71ef2b43bee6ec1b8748ac6ac34dd8cb87b
-AUX xlogical-1.0.7-gcc43.patch 915 BLAKE2B c99de173bbd18bec630a8c3605ad77a6d56d3e4a4bb44fab011bb6f10a6140a4d843c7768557728deddb1edddbc6abc66445f1797bf8ca5d6b108f29598374ad SHA512 59cc10ec999aff4c8f5630e534ea834ff9a8b2d27e45752abdc46df812841e40de27ca406a45278f28a3a609c021c7753a6980edfaffd3c79b1bb7cf97336209
-DIST xlogical-1.0-7.tar.bz2 1853575 BLAKE2B 6f78f92a14313cf65f171b99c28a4377f7685bf73705a91b92fcf370ad1f3555b7aefe99e6004aa32c62cf8b71f2d754d64acadf3bda345cc8cf3e3f91647d02 SHA512 b47aadff91a7d3057fe8657bdda5c16a910f84f6d324bee82f1beba55de7faf6a599231c8d53ed68cc30f9edfe18f57f31dfc9fe06b8e03fa6120905f37c290d
-DIST xlogical_gfx.zip 347801 BLAKE2B b9c2f963e8ddc5af9fcd7adac691a71c6ee12bc3b3164ce243d076f85c36044b4aa523d27c5dd1480388ff97356ddabd3c7f2c4d223aeeff1a8660fc7c595995 SHA512 14322ae1c8fb7f50513ef47e05372c5dc1ec1b658b33c53477e6b05bbee1de0250b21127891f205d16adc386e7ce37c4b834a62794ee105754b97e49eb5d2a42
-EBUILD xlogical-1.0.7.ebuild 1458 BLAKE2B 8b2e9ff71f5bfca2863c622d446d5345bf702d3b4596be2344048b105442fe32e6b1b0892b47254b295464a2d4b6eadfa5e1f4de60ee803a6000fa3bf60eee29 SHA512 9ab4b8547c0afc8264c875906b8d6db776691534fe3ba49770ee5d86083885f1fc55737a25eb6f4e86b58cca8e6f910edc7b0b01c062f21e104ee91d28034d11
-MISC metadata.xml 554 BLAKE2B f7cc61f4cc79271b95e37334918f71934f91954f5a70d1601e817f6f134cd36117ed155b91a7929da537fcb7d423a627c1990c3c57f92a60fcbd6b3668329b8a SHA512 538cff1d408baf95b2d172490a3a038a8fd79edef5b8c1b64e3c495307b632870548dc0f33b6ed6bc77599d20e883a73a2c2d658b6ca85e131e404bc72e018ee
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
deleted file mode 100644
index 19cd188b0e0e..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc41.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- properties.h.old	2007-01-11 17:33:45.000000000 +0100
-+++ properties.h	2007-01-11 17:34:32.000000000 +0100
-@@ -33,9 +33,7 @@
- #include <map>
- #include <string>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #include "defs.h"
- 
---- anim.h.old	2007-01-11 17:36:20.000000000 +0100
-+++ anim.h	2007-01-11 17:36:37.000000000 +0100
-@@ -27,9 +27,7 @@
- // Language Includes
- #include <list>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- // Application Includes
- #include "graph.h"
---- exception.h.old	2007-01-11 17:37:37.000000000 +0100
-+++ exception.h	2007-01-11 17:38:21.000000000 +0100
-@@ -27,10 +27,9 @@
- 
- // Language Includes
- #include <string>
-+#include <iostream>
- 
--#ifdef WIN32
- using namespace std;
--#endif
- 
- #define CatchEx(aEx)		catch( CXLException aEx )
- #define ThrowEx(aError)		throw CXLException(aError,__FILE__,__LINE__)
---- gamelogic.cpp.old	2007-01-11 17:38:52.000000000 +0100
-+++ gamelogic.cpp	2007-01-11 17:39:12.000000000 +0100
-@@ -154,7 +154,7 @@
- 		levelFile = NULL;
- 	}
- 
--	currentMap = NULL;
-+	currentMap = gameLevels.begin();
- 
- 	playerName = new char[32+1];
- 	strcpy( playerName, "nobody" );
diff --git a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch b/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
deleted file mode 100644
index 4b64fcd67783..000000000000
--- a/games-puzzle/xlogical/files/xlogical-1.0.7-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- gamelogic.cpp
-+++ gamelogic.cpp
-@@ -25,6 +25,7 @@
- #include<fstream>
- #include<cstdio>
- #include<cctype>
-+#include <cstdlib>
- 
- #ifndef WIN32
- #include<unistd.h>
---- levelmap.cpp
-+++ levelmap.cpp
-@@ -21,6 +21,7 @@
- ////////////////////////////////////////////////////////////////////////

- 

- // Language Includes

-+#include <cstdlib>
- #include <cstdio>

- #include <cctype>

- #include <cstring>

---- mapedit.cpp
-+++ mapedit.cpp
-@@ -26,6 +26,8 @@
- #include<cstdio>

- #include<list>

- #include<vector>

-+#include <cstdlib>
-+#include <cstring>
- 

- #ifndef WIN32

- #include<unistd.h>

---- modlist.cpp
-+++ modlist.cpp
-@@ -22,6 +22,7 @@
- 

- #include <iostream>

- #include <fstream>

-+#include <cstdlib>

- 

- #ifdef WIN32

- #include <afxwin.h>

---- tile_spinner.cpp
-+++ tile_spinner.cpp
-@@ -24,6 +24,7 @@
- 
- 
- // Application Includes
-+#include <cstdlib>
- #include "audio.h"
- #include "properties.h"
- #include "defs.h"
diff --git a/games-puzzle/xlogical/metadata.xml b/games-puzzle/xlogical/metadata.xml
deleted file mode 100644
index e2b7cea129a5..000000000000
--- a/games-puzzle/xlogical/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-<longdescription lang="en">
-XLogical is a puzzle game based on the Logical! game that was originally
-released by Rainbow Arts on the Commodore Amiga computer.
-</longdescription>
-  <use>
-    <flag name="alt_gfx">Use alternate graphics which are closer to the original Amiga version</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-puzzle/xlogical/xlogical-1.0.7.ebuild b/games-puzzle/xlogical/xlogical-1.0.7.ebuild
deleted file mode 100644
index ea6857857a7d..000000000000
--- a/games-puzzle/xlogical/xlogical-1.0.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools versionator eutils games
-
-MY_PV=$(replace_version_separator 2 '-' )
-MY_P=${PN}-${MY_PV}
-DESCRIPTION="SDL logical clone"
-HOMEPAGE="http://changeling.ixionstudios.com/xlogical/"
-SRC_URI="http://changeling.ixionstudios.com/xlogical/downloads/${MY_P}.tar.bz2
-	alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alt_gfx"
-
-RDEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]"
-DEPEND="${RDEPEND}
-	alt_gfx? ( app-arch/unzip )"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	if use alt_gfx ; then
-		cd "${S}/images"
-		unpack xlogical_gfx.zip
-	fi
-}
-
-src_prepare() {
-	sed -i '/^CXXFLAGS/d' Makefile.am || die
-	edos2unix properties.h anim.h exception.h
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_install() {
-	dogamesbin ${PN}
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ${PN}.{properties,levels} music sound images
-	find "${D}" -name "Makefile*" -exec rm -f '{}' +
-
-	insinto "${GAMES_STATEDIR}"/${PN}
-	doins ${PN}.scores
-	fperms 0660 "${GAMES_STATEDIR}"/${PN}/${PN}.scores
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	make_desktop_entry ${PN} "Xlogical"
-	prepgamesdirs
-}
diff --git a/games-puzzle/xpired-1.22-r1 b/games-puzzle/xpired-1.22-r1
new file mode 100644
index 000000000000..44d7e3ee73bd
--- /dev/null
+++ b/games-puzzle/xpired-1.22-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
+DESCRIPTION=A Sokoban-styled puzzle game with lots more action
+EAPI=6
+HOMEPAGE=http://xpired.sourceforge.net
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/sdl-gfx media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
+SLOT=0
+SRC_URI=mirror://sourceforge/xpired/xpired-1.22-linux_source.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=ea1131c8817277602d817515c4d45821
diff --git a/games-puzzle/xpired/Manifest b/games-puzzle/xpired/Manifest
deleted file mode 100644
index 613f64a1d90e..000000000000
--- a/games-puzzle/xpired/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xpired-1.22-ldflags.patch 868 BLAKE2B 8230de4bfae81985ed37abb2c3810df680c64957411c0fa77c83d60581a373f2c85674bcbb5d4fd6070108981d76f6f2802fc5b191cdd8aa606f3f21df48d791 SHA512 81987d60466c459a98ac03b8f4bdf8da7c6004a716a83051b58ec35657ab3a93672305ff9a8edcf9e056784919c9ea235f81c71176bf6d4b75d5dabc72b1b7f9
-DIST xpired-1.22-linux_source.tar.gz 478593 BLAKE2B 54ee871017e39bd599a1e5e13df282d309d4ef9c91c7bf1e6eab31cd83d5f2bb4d31d9c08df091796d9f61f55eb0d54e9745b8162f9e9116eeac98d7c49b0f9d SHA512 08e506e6206be9346bde083a9cdd25a890c0100826a7fb2b515b60180cfd0b885712261db2e7a5d589078c0b74f2b9ad659b39d9378cb3dc92af111ab499ee10
-EBUILD xpired-1.22-r1.ebuild 867 BLAKE2B 7b8889364640262e543f705428f4032bd8e0906f7e59bc0027b9de59cfaa2fd55584159e659bb5a5f6be24ed5e800e764ef15118eb0fdafffed14dd0f09a2225 SHA512 f656f9466e29e94ea267c5f7e996d6732d7076fe7fb1779a2be0551eac0f49b57950bcdf13240872ee871cf9b9655542002c6b3742058abc3f3f70adb28bb719
-MISC metadata.xml 329 BLAKE2B 7c524c47d197b0205ef4fb908c0546932d08eedaf250445b796b7da70d100dd72bdbd82b6ef1cc551622046af5c0ee6d7b53db64bd6cfc14389a7d739f44d9d8 SHA512 457c612953cc30db620e0315c75ecb20619ee537692e0a871d0c60e8cedaa547bc9e50eb922bf995eb68bde526c641e901d3bfc9d88a097263f5bd90c68f257e
diff --git a/games-puzzle/xpired/files/xpired-1.22-ldflags.patch b/games-puzzle/xpired/files/xpired-1.22-ldflags.patch
deleted file mode 100644
index f3a1e6839cf4..000000000000
--- a/games-puzzle/xpired/files/xpired-1.22-ldflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ru src.orig/Makefile src/Makefile
---- src.orig/Makefile	2002-08-01 14:42:51.000000000 -0400
-+++ src/Makefile	2010-10-13 19:31:21.944183145 -0400
-@@ -1,18 +1,17 @@
- PREFIX=/usr/local
- SHARE_PREFIX=$(PREFIX)/share/xpired
--CFLAGS=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\"
--LDFLAGS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx
--CC=gcc
-+CFLAGS+=`sdl-config --cflags` -DUNIX -DPREFIX=\"$(PREFIX)\" -DSHARE_PREFIX=\"$(SHARE_PREFIX)\"
-+LDLIBS=`sdl-config --libs` -lSDL -lSDL_mixer -lSDL_image -lSDL_gfx
- 
- BINARIES = xpired xpiredit
- 
- all: $(BINARIES)
- 
- xpired: xpired.o
--	$(CC) -o xpired xpired.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o xpired xpired.o $(LDLIBS)
- 
- xpiredit: xpiredit.o xpired_unix.h
--	$(CC) -o xpiredit xpiredit.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o xpiredit xpiredit.o $(LDLIBS)
- 
- .PHONY: clean
- 
diff --git a/games-puzzle/xpired/metadata.xml b/games-puzzle/xpired/metadata.xml
deleted file mode 100644
index bcec96319239..000000000000
--- a/games-puzzle/xpired/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xpired</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/xpired/xpired-1.22-r1.ebuild b/games-puzzle/xpired/xpired-1.22-r1.ebuild
deleted file mode 100644
index 8ea6b7243bf8..000000000000
--- a/games-puzzle/xpired/xpired-1.22-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A Sokoban-styled puzzle game with lots more action"
-HOMEPAGE="http://xpired.sourceforge.net"
-SRC_URI="mirror://sourceforge/xpired/${P}-linux_source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-gfx
-	media-libs/sdl-image[jpeg]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/src"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_compile() {
-	emake \
-		PREFIX=/usr \
-		SHARE_PREFIX=/usr/share/xpired
-}
-
-src_install() {
-	emake \
-		PREFIX="${D}/usr" \
-		SHARE_PREFIX="${D}/usr/share/${PN}" \
-		install
-
-	newicon img/icon.bmp ${PN}.bmp
-	make_desktop_entry xpired Xpired /usr/share/pixmaps/${PN}.bmp
-	make_desktop_entry xpiredit "Xpired Level Editor"
-
-	einstalldocs
-}
diff --git a/games-puzzle/xtris-1.15-r1 b/games-puzzle/xtris-1.15-r1
new file mode 100644
index 000000000000..da282142112d
--- /dev/null
+++ b/games-puzzle/xtris-1.15-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=x11-libs/libX11
+DESCRIPTION=A networked Tetris-like game
+EAPI=5
+HOMEPAGE=http://www.iagora.com/~espel/xtris/xtris.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11
+SLOT=0
+SRC_URI=http://www.iagora.com/~espel/xtris/xtris-1.15.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=6fc9261a1dd1675b7307c1a12bc8a65a
diff --git a/games-puzzle/xtris/Manifest b/games-puzzle/xtris/Manifest
deleted file mode 100644
index 38c01d834c8a..000000000000
--- a/games-puzzle/xtris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xtris.xpm 1403 BLAKE2B dc765e15dfc0cc49837cfbadfa3fe0ad33aef0e88921e906e89f9af8f778c700508b5a451d835d77bca64094d5a0b6e7f1bce941f6a42b6bf00e089fea7167b7 SHA512 1956a02d844b517df41a5cc82e236a04ec9609849c4d7b097af5bbb4b03c1e16bc8d6f0491c6cb1c8920bec578beab07381b15cee468079c5e474c80c07d30a3
-DIST xtris-1.15.tar.gz 52130 BLAKE2B 3f39f4208b678be85064fd08cbaabc7a170f559e115d59a8ba50524520b106b6fba5b7a4af7424154032d6b83365bfbb932a3424b6ac03ab32aac49c7afbdb67 SHA512 a5d5c32a7e1650561464f0fda08c7040ca0061e59b374359894e7f181a2e9dfece7f6bee6ed82295779f3e4ac8e7a607c668c31eeb017d6b641c1fe09dea4791
-EBUILD xtris-1.15-r1.ebuild 751 BLAKE2B be3f924189ee3375f3e5939821f1274369cfe64cbab77a83d212e201c7a4a7967ec0c024b3016b77d551419d86d6a4514ec33a3352693e03cd5ca9e30fbcefd3 SHA512 891464e2e0e152eaf7461452be8591a68ec3daa6b5b68da3778fdf534bccb183f75d3c048127dadc3cf318ee960e68fb2c6d44b770e132e6a7861aab275f3fd2
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xtris/files/xtris.xpm b/games-puzzle/xtris/files/xtris.xpm
deleted file mode 100644
index 27ed16ef5ed7..000000000000
--- a/games-puzzle/xtris/files/xtris.xpm
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * xtris_xpm[] = {
-"34 34 4 1",
-" 	c None",
-".	c #00F000",
-"+	c #007000",
-"@	c #00A800",
-"                                  ",
-" ................................ ",
-" ...............+...............+ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" .+++++++++++++++.+++++++++++++++ ",
-" ++++++++++++++++++++++++++++++++ ",
-" ................................ ",
-" ...............+...............+ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" ..@@@@@@@@@@@@++..@@@@@@@@@@@@++ ",
-" .+++++++++++++++.+++++++++++++++ ",
-" ++++++++++++++++++++++++++++++++ ",
-"                                  "};
diff --git a/games-puzzle/xtris/metadata.xml b/games-puzzle/xtris/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/xtris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/xtris/xtris-1.15-r1.ebuild b/games-puzzle/xtris/xtris-1.15-r1.ebuild
deleted file mode 100644
index 1c863a9b1d17..000000000000
--- a/games-puzzle/xtris/xtris-1.15-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A networked Tetris-like game"
-HOMEPAGE="http://www.iagora.com/~espel/xtris/xtris.html"
-SRC_URI="http://www.iagora.com/~espel/xtris/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		BINDIR=/usr/bin \
-		MANDIR=/usr/share/man \
-		CFLAGS="${CFLAGS}" \
-		EXTRALIBS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xtris xtserv xtbot
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry ${PN} xtris ${PN}
-	doman xtris.6 xtserv.6 xtbot.6
-	dodoc ChangeLog PROTOCOL README
-}
diff --git a/games-puzzle/xwelltris-1.0.1 b/games-puzzle/xwelltris-1.0.1
new file mode 100644
index 000000000000..e7965ff8bb89
--- /dev/null
+++ b/games-puzzle/xwelltris-1.0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif]
+DESCRIPTION=2.5D tetris like game
+EAPI=5
+HOMEPAGE=http://xnc.jinr.ru/xwelltris/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[video] media-libs/sdl-image[gif] games-misc/games-envd
+SLOT=0
+SRC_URI=http://xnc.jinr.ru/xwelltris/src/xwelltris-1.0.1.src.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_=d1d06beb0fa232ed7b760c7d6376c816
diff --git a/games-puzzle/xwelltris/Manifest b/games-puzzle/xwelltris/Manifest
deleted file mode 100644
index 08340532ade4..000000000000
--- a/games-puzzle/xwelltris/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xwelltris-1.0.1.src.tar.gz 422822 BLAKE2B c6eda0d294e79c5715bcaa593776ecfb0cdc734386fc4e9a6825dd090340c2744a251ad1e753421865151928608e4aebdd5050b0091a0799b7d1da5a0b3bdd60 SHA512 6b1080c6e6d1b579c441d1f42bb6454dafed62a63790d5798e83cf137db7ff2ddc07db7e89b34402a5249770697cc3f8ad5e6222266142c7b43f6936828f2536
-EBUILD xwelltris-1.0.1.ebuild 974 BLAKE2B b76648e2ae47cd20b40c8b76f5a64b40afa8c6733ecdd9c165a5a835e324610e73d838c4e781fcda77a0c1acdca82247864ff6d52ca6984833a212c9967ee12e SHA512 cfc4027ef6409246fcf2d477e6a0653f470c24cb74f2409cf3c43470eabc91f1db4e5f1a711538814a04a2587eabd92f3ad8590c922b622987596640dc975e52
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-puzzle/xwelltris/metadata.xml b/games-puzzle/xwelltris/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-puzzle/xwelltris/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild b/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
deleted file mode 100644
index eb2e02cbf21d..000000000000
--- a/games-puzzle/xwelltris/xwelltris-1.0.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="2.5D tetris like game"
-HOMEPAGE="http://xnc.jinr.ru/xwelltris/"
-SRC_URI="http://xnc.jinr.ru/xwelltris/src/${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-image[gif]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL_PROGRAM/s/-s //' \
-		src/Make.common.in || die
-	sed -i \
-		-e "/GLOBAL_SEARCH/s:\".*\":\"${GAMES_DATADIR}/${PN}\":" \
-		src/include/globals.h.in || die
-}
-
-src_configure() {
-	# configure/build process is pretty messed up
-	egamesconf --with-sdl
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" /usr/share/man
-	emake install \
-		INSTDIR="${D}/${GAMES_BINDIR}" \
-		INSTLIB="${D}/${GAMES_DATADIR}/${PN}" \
-		INSTMAN=/usr/share/man
-	dodoc AUTHORS Changelog README*
-	prepgamesdirs
-}
diff --git a/games-puzzle/xye-0.12.2 b/games-puzzle/xye-0.12.2
new file mode 100644
index 000000000000..c2829486d95a
--- /dev/null
+++ b/games-puzzle/xye-0.12.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] >=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=Free version of the classic game Kye
+EAPI=6
+HOMEPAGE=http://xye.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+RDEPEND=media-fonts/dejavu media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png]
+SLOT=0
+SRC_URI=mirror://sourceforge/xye/xye-0.12.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=252cb7f9f27948aa128d256557dbf586
diff --git a/games-puzzle/xye/Manifest b/games-puzzle/xye/Manifest
deleted file mode 100644
index 73ecb2a9d92c..000000000000
--- a/games-puzzle/xye/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX xye-0.12.2-fix-buildsystem.patch 1020 BLAKE2B 6408b6df99db5ca103183a7cee8905f7cc1c851d7e2f00e60334b806517841eab0896028e0a178fcfdf42e0bd672a8594c47caae2ac629d915ceff9af883dab6 SHA512 d4b08db4eb5ee4b3e1e98e9faeda87aafe17ae444cb0a8400c9206c2871b56801040bddeffb13dfed0170094d48ffac593209b2ad69896f8993521d0b0929cf1
-AUX xye-0.12.2-fix-c++14.patch 502 BLAKE2B e3116515757af9e84d5bac340947df1e88e768058a3dfb65e0894388ad8e0fa98f63e6c16314e35b288fff8639d8f46972999c031e077d3417218c09bc9c00a7 SHA512 c9dcc309b5e451f1608174de4f6016d006879d2267627eebe8ff524af293137af90f4761c8eacbc5ebd9ee633cc7d087e23eb3e7c4970f5484e065dfa8dff3af
-AUX xye-0.12.2-fix-desktop-file.patch 414 BLAKE2B 3d4f87e6db2144407eaf5161d73184d23eabd4742dbc1f68e59d8932257491eb429d68d12d910ee311fdbafecd4c118a6ad9f9b3b225157384035868ced3ee48 SHA512 c798ed5da4e45b0a8d5aaa4dd77fe09d9cb08837a33b44a5c69f89e4d2456fb5964c4fc5646a83fd6166d315200924944ab6dd7eea3f983e4be403a8f14f8c9e
-DIST xye-0.12.2.tar.gz 2860290 BLAKE2B 426cd4afb84c0de8bdbafe9b63d0da2f686593449b4577ae0eb77e38364bcac166cb9bf4a3a41f7d15a0a1745bc9574f959e0429998c00ad78a6fe40c49093f1 SHA512 a31d922e0a0660d269d30430fbaf1d00924b0271db697f3cbc89b78815e597e11743bd9018fbf3f2f9e7561ad3469e9cca28687efaae7fc6dcba40ada2b5effa
-EBUILD xye-0.12.2.ebuild 932 BLAKE2B c77382cd8764e3425d8c257e9f36f3d91af9b8df27ef71c9bfff3102c739c7e1e907d7fff57da861025d704afac45086be9b90d4ab45b45ac6078f98e013ae65 SHA512 9b0c88bc789e73608ff3fb297c04a83cb1eca221130a3ca53148f170b187ac7f87b86181233535e8955ef0f944b5db5e7660f424d501ff608328fe83ba3322d7
-MISC metadata.xml 326 BLAKE2B 8f368cb2e89ca46600917931c95285943f8ededa8a3c1c6fe1602a11c68a00f53429be467d28a49cf9a0989cb6b6f0cfa70ded461f2b6f9adeb86e8c05a49e52 SHA512 05084d9dcce50a1d4302a83cb89abd67519143384ff6c1ca3f84e10db468483cf90e4d10c240dc58f47b10df747725c86514db303efaeca048d44a3085bb7fe6
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch b/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
deleted file mode 100644
index c96d42e34681..000000000000
--- a/games-puzzle/xye/files/xye-0.12.2-fix-buildsystem.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix build system to respect correct paths
-and install files in correct paths.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -4,13 +4,11 @@
- 
- 
- bin_PROGRAMS = xye
--xye_LDFLAGS = 
- 
-+doc_DATA = NEWS ChangeLog AUTHORS
-+html_DATA = ReadMe.html
- 
--docedir = $(datadir)/@PACKAGE@
--doce_DATA = ReadMe.html NEWS ChangeLog AUTHORS
--
--levelsdir= $(datadir)/@PACKAGE@/levels
-+levelsdir= $(datadir)/$(PACKAGE)/levels
- levels_DATA = levels/5levels.xye \
- levels/levels.xye \
- levels/logo.xye \
-@@ -25,12 +23,10 @@
- levels/xyester.xye \
- levels/SuperJustin.xye
- 
--resdir= $(datadir)/@PACKAGE@/res
-+resdir= $(datadir)/$(PACKAGE)/res
- res_DATA = res/default.xml \
- res/xye.png \
- res/xye_luminosity.png \
--res/DejaVuSans.ttf \
--res/DejaVuSans-Bold.ttf \
- res/fon.bmp \
- res/fon_bold.bmp \
- res/clean40.xml \
-@@ -103,7 +99,7 @@
- src/skins.cpp \
- src/skins.h
- 
--EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA} ${doce_DATA}
-+EXTRA_DIST = ${EXTRA_DIST1} ${xye_SOURCES} ${res_DATA} ${levels_DATA}
- 
- DEFS=@data_path_flag@
- 
diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch b/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
deleted file mode 100644
index f2083b871a82..000000000000
--- a/games-puzzle/xye/files/xye-0.12.2-fix-c++14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Add explicit cast to silence C++14 -Wnarrowing conversion warnings.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=600298
-
---- a/src/xsb_level.cpp
-+++ b/src/xsb_level.cpp
-@@ -784,7 +784,7 @@
- 

- bool FromXyeDFS(int* mem, unsigned char x, unsigned char y)

- {

--    static const unsigned char dx[4] = {0,0,-1,1}, dy[4] = {-1,1,0,0};

-+    static const unsigned char dx[4] = {0,0,(unsigned char)-1,1}, dy[4] = {(unsigned char)-1,1,0,0};

-     int &res =  mem[y*XYE_HORZ+x];

-     if( res==0)

-     {

diff --git a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch b/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
deleted file mode 100644
index 99558ef28732..000000000000
--- a/games-puzzle/xye/files/xye-0.12.2-fix-desktop-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix .desktop file to comply with FDO specifications.
-
---- a/xye.desktop
-+++ b/xye.desktop
-@@ -4,11 +4,11 @@
- Encoding=UTF-8
- Exec=xye
- Type=Application
--Categories=Application;Game;PuzzleGame
-+Categories=Game
- Name=Xye
- GenericName=Xye
- Comment=Solve puzzles and action challenges in order to get all the gems in the room.
- Terminal=false
- StartupNotify=false
--Icon=xye.png
-+Icon=xye
- MimeType=application/xye-xml
diff --git a/games-puzzle/xye/metadata.xml b/games-puzzle/xye/metadata.xml
deleted file mode 100644
index 136b7508becd..000000000000
--- a/games-puzzle/xye/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xye</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/xye/xye-0.12.2.ebuild b/games-puzzle/xye/xye-0.12.2.ebuild
deleted file mode 100644
index ed474f123243..000000000000
--- a/games-puzzle/xye/xye-0.12.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Free version of the classic game Kye"
-HOMEPAGE="http://xye.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xye/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-fonts/dejavu
-	media-libs/libsdl[video]
-	media-libs/sdl-ttf
-	media-libs/sdl-image[png]"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.2-fix-buildsystem.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-c++14.patch
-	"${FILESDIR}"/${PN}-0.12.2-fix-desktop-file.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	# create symlinks for previously bundled fonts
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/res/DejaVuSans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf /usr/share/${PN}/res/DejaVuSans-Bold.ttf
-}
diff --git a/games-puzzle/zaz-1.0.0-r1 b/games-puzzle/zaz-1.0.0-r1
new file mode 100644
index 000000000000..f984cb2715f0
--- /dev/null
+++ b/games-puzzle/zaz-1.0.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A puzzle game where the player has to arrange balls in triplets
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/zaz/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 GPL-3+ CC-BY-SA-3.0 OFL
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[X,sound,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
+_eclasses_=autotools	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_=94619645d32bc3a694562f2fde294d4b
diff --git a/games-puzzle/zaz/Manifest b/games-puzzle/zaz/Manifest
deleted file mode 100644
index a1d94c298b34..000000000000
--- a/games-puzzle/zaz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX zaz-1.0.0-build.patch 402 BLAKE2B 1f34e5961fee645ba6c55239d0795f7988bc2b3e0ee1da2ca3033f68d145d94ecc3894072bb8ac38802b6fd5cc3d8011ae5bde545dafd3b4133d73381b95a1f1 SHA512 4c7b8659407295b1a2003ecfe74f57dad73964666920a1f25fab87518fc6fb4f74285f051bf5df81c205faea5054908fb6da8e427d79ed4cd91f82212be2daa6
-DIST zaz-1.0.0.tar.bz2 25170073 BLAKE2B 6502b880a024dec356e7a1f8dfd29f7353d5de07e08a2de7480db32fec5af17adb9210e4f0b3c17f2b27a6977ae3647d7458d5d21dacff66c2085801fda45985 SHA512 8383732aefb1f83623af35c85fc90e0468ca15e2ffb5577d22a5a1b1c60154d3829c58c04bba675c49a7e4b4d14b6fec920c67c6a820a927d2ab5f80b5d694cb
-EBUILD zaz-1.0.0-r1.ebuild 1104 BLAKE2B b3a625b95df5abc7de588d49b78da79da8fa5df4272026e115fa79f6c611c458cf8887afe0d40073bdde16c5e20ececde1ea819e9b5ca3b86cac9ec82965f3f6 SHA512 6cd2843a7fda0ec2ff34c6618ba924ab30fd3ad0bf84bd6c095f50857a7e7a2805e1a648f2c0add6fb77d96905bdfc6b2fecd6ef0334f031efde3757feb898ec
-MISC metadata.xml 326 BLAKE2B 962f166dc4d93ffdf146a76d3e45bb96284a47bb845755e1f7450d2de5ad662abb1a2d63c21ad4e23e5e8cc16a8a2d9fa36503049262205666168c5486d86ff6 SHA512 c96c9c7a3ff21d49bcaf2418c5c21e2f83070d2d148d8a8faaeb790ca3dbc522ecab9d28a1df884e5e47543fb8067ce538e6ba62c04da8f43e6f6241cb0134ba
diff --git a/games-puzzle/zaz/files/zaz-1.0.0-build.patch b/games-puzzle/zaz/files/zaz-1.0.0-build.patch
deleted file mode 100644
index bef2954bf088..000000000000
--- a/games-puzzle/zaz/files/zaz-1.0.0-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru zaz-0.7.0.orig/Makefile.am zaz-0.7.0/Makefile.am
---- zaz-0.7.0.orig/Makefile.am	2009-10-14 18:20:14.000000000 -0400
-+++ zaz-0.7.0/Makefile.am	2010-05-13 15:49:59.404464060 -0400
-@@ -2,15 +2,6 @@
- 
- SUBDIRS = po src data extra
- 
--dist_doc_DATA = \
--	README\
--	COPYING\
--	AUTHORS\
--	ChangeLog\
--	INSTALL\
--	NEWS
--
--
- EXTRA_DIST = config.rpath m4/ChangeLog\
- 	$(shared_data_DATA) \
- 	zaz.anjuta\
diff --git a/games-puzzle/zaz/metadata.xml b/games-puzzle/zaz/metadata.xml
deleted file mode 100644
index 58fcbb5f8ac8..000000000000
--- a/games-puzzle/zaz/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">zaz</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild b/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
deleted file mode 100644
index 1ea20bafcd65..000000000000
--- a/games-puzzle/zaz/zaz-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic
-
-DESCRIPTION="A puzzle game where the player has to arrange balls in triplets"
-HOMEPAGE="https://sourceforge.net/projects/zaz/"
-SRC_URI="mirror://sourceforge/zaz/${P}.tar.bz2"
-
-LICENSE="GPL-3 GPL-3+ CC-BY-SA-3.0 OFL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[X,sound,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/libvorbis
-	media-libs/libtheora
-	media-libs/ftgl
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	local x=/usr/share/gettext/po/Makefile.in.in
-	[[ -e $x ]] && cp -f $x po/ #336119
-
-	eapply "${FILESDIR}"/${P}-build.patch
-	eautoreconf
-}
-
-src_configure() {
-	append-libs -lvorbis
-	append-cflags $(pkg-config sdl --cflags)
-	append-cxxflags $(pkg-config sdl --cflags)
-	econf \
-		--with-applicationdir=/usr/share/applications \
-		--with-icondir=/usr/share/pixmaps \
-		--localedir=/usr/share/locale \
-		$(use_enable nls)
-}
diff --git a/games-roguelike/FTL-1.5.13 b/games-roguelike/FTL-1.5.13
new file mode 100644
index 000000000000..34a89bcf5c7f
--- /dev/null
+++ b/games-roguelike/FTL-1.5.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DESCRIPTION=Faster Than Light: A spaceship simulation real-time roguelike-like game
+EAPI=5
+HOMEPAGE=http://www.ftlgame.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved Boost-1.0 free-noncomm MIT bundled-libs? ( FTL LGPL-2.1 ZLIB libpng )
+RDEPEND=sys-devel/gcc[cxx] virtual/opengl !bundled-libs? ( media-libs/devil[png] media-libs/freetype:2 media-libs/libsdl[X,sound,joystick,opengl,video] sys-libs/zlib ) games-misc/games-envd
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=FTL.1.5.13.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_=9dfb3a4aaa6bcaab09654d30b4b103cb
diff --git a/games-roguelike/FTL-gog-1.6.7.18662-r1 b/games-roguelike/FTL-gog-1.6.7.18662-r1
new file mode 100644
index 000000000000..7a0f99a34bca
--- /dev/null
+++ b/games-roguelike/FTL-gog-1.6.7.18662-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Top-down roguelike space ship simulator
+EAPI=6
+HOMEPAGE=https://www.gog.com/game/faster_than_light
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GOG-EULA
+RDEPEND=media-libs/freetype media-libs/libsdl[X,sound,opengl,video] media-libs/libpng sys-libs/zlib virtual/opengl
+RESTRICT=bindist fetch mirror strip test
+SLOT=0
+SRC_URI=ftl_advanced_edition_en_1_6_7_18662.sh
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	unpacker	87633b2194cdb56adaa1f5a5c8862c44
+_md5_=8de35f33686a2047b6f7e3be5158bf2d
diff --git a/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662-r1.ebuild b/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662-r1.ebuild
deleted file mode 100644
index c606b4d683d1..000000000000
--- a/games-roguelike/FTL-gog/FTL-gog-1.6.7.18662-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop unpacker
-
-DESCRIPTION="Top-down roguelike space ship simulator"
-HOMEPAGE="https://www.gog.com/game/faster_than_light"
-SRC_URI="ftl_advanced_edition_en_${PV//./_}.sh"
-RESTRICT="bindist fetch mirror strip test"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="media-libs/freetype
-	media-libs/libsdl[X,sound,opengl,video]
-	media-libs/libpng
-	sys-libs/zlib
-	virtual/opengl"
-
-S="${WORKDIR}/data/noarch"
-
-pkg_nofetch() {
-	elog "Please buy and download ${SRC_URI} from"
-	elog "https://www.gog.com/game/faster_than_light"
-}
-
-src_unpack() {
-	unpack_zip "${DISTDIR}/${A}"
-}
-
-src_prepare() {
-	default
-	rm -r support/{xdg*,*.{sh,txt}} || die
-	if ! use x86; then
-		rm game/data/FTL.x86 || die
-	fi
-	if ! use amd64; then
-		rm game/data/FTL.amd64 || die
-	fi
-
-	sed -i start.sh -e '/chmod/d'
-}
-
-src_install() {
-	insinto /opt/gog/FTL
-	doins -r .
-	fperms +x /opt/gog/FTL/{start.sh,game/FTL,game/data/FTL}
-
-	if use x86; then
-		fperms +x /opt/gog/FTL/game/data/FTL.x86
-	fi
-	if use amd64; then
-		fperms +x /opt/gog/FTL/game/data/FTL.amd64
-	fi
-
-	make_desktop_entry "/opt/gog/FTL/start.sh" "FTL: Advanced Edition" FTL
-	newicon support/icon.png FTL.png
-}
diff --git a/games-roguelike/FTL-gog/Manifest b/games-roguelike/FTL-gog/Manifest
deleted file mode 100644
index 487f81d3c87a..000000000000
--- a/games-roguelike/FTL-gog/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ftl_advanced_edition_en_1_6_7_18662.sh 190506416 BLAKE2B 0a628e4de3a5539add2f421377c32ead5397ad1709e30124aa8c9d0874b98eb37cda97873b21dbb78fe635769c1a3c3254988ae22494805409d28f5e33417e44 SHA512 3e9c08d32964e21b49ad3e1b6a17c2349d516fdbea4118518e022134affc43dd27d2e60eea94784096aea4725f2656b43f6b6be9fe02eaed743c167ef842d66b
-EBUILD FTL-gog-1.6.7.18662-r1.ebuild 1309 BLAKE2B 5b01fef968088d747e31b903575a13091ebd5fb904ffa61680e06ad3ba922814d92639df5fdfdcabadb518cc7ce9578206ba793d09872898ffa2f1a78816403c SHA512 39da6ae85d68b4b9f763c5f79766f3fd5d62dfa73c0d3fb8ea7ba8c9d190246ff3ee8c1dfcc714f48bbc8d356dc3de30af0818166af73f6d8d73893f67c0d16b
-MISC metadata.xml 487 BLAKE2B d1c2761fb3083ba140d1f87b1f52d179095ea37235acc3e0f2586e9b969174cc4aab34648523c6dce9f83499d05624e8afe2782101560e6a39cf61f5a9b27bf7 SHA512 69c1e069878db826f8a7c44d8d9f6349a37a60ec7777ea29886655082b6c57b152ab5cda35bd3126beef0a127472a57b0cc50b941224694446bb2de51bb90d92
diff --git a/games-roguelike/FTL-gog/metadata.xml b/games-roguelike/FTL-gog/metadata.xml
deleted file mode 100644
index 727ed940cf5b..000000000000
--- a/games-roguelike/FTL-gog/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>kitsunenokenja@protonmail.ch</email>
-		<name>Rob Levitsky</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/FTL/FTL-1.5.13.ebuild b/games-roguelike/FTL/FTL-1.5.13.ebuild
deleted file mode 100644
index ab2bc9ddb346..000000000000
--- a/games-roguelike/FTL/FTL-1.5.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Faster Than Light: A spaceship simulation real-time roguelike-like game"
-HOMEPAGE="http://www.ftlgame.com/"
-SRC_URI="FTL.${PV}.tar.gz"
-
-LICENSE="all-rights-reserved Boost-1.0 free-noncomm MIT bundled-libs? ( FTL LGPL-2.1 ZLIB libpng )"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="fetch bindist splitdebug"
-
-RDEPEND="
-	sys-devel/gcc[cxx]
-	virtual/opengl
-	!bundled-libs? (
-		media-libs/devil[png]
-		media-libs/freetype:2
-		media-libs/libsdl[X,sound,joystick,opengl,video]
-		sys-libs/zlib
-	)"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT#/}/${PN}/bin/${PN}
-	${GAMES_PREFIX_OPT#/}/${PN}/lib/*"
-
-S=${WORKDIR}/${PN}
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_prepare() {
-	if ! use bundled-libs ; then
-		# no system lib for libbass available
-		find data/${ARCH}/lib -type f \! -name "libbass*" -delete || die
-	fi
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-
-	insinto "${dir}"
-	doins -r data/resources
-
-	exeinto "${dir}"/bin
-	doexe data/${ARCH}/bin/${PN}
-	exeinto "${dir}"/lib
-	doexe data/${ARCH}/lib/*.so*
-
-	games_make_wrapper ${PN} "${dir}/bin/${PN}" "${dir}" "${dir}/lib"
-	make_desktop_entry ${PN} "Faster Than Light" "/usr/share/pixmaps/FTL.bmp"
-
-	newicon data/resources/exe_icon.bmp FTL.bmp
-	dohtml ${PN}_README.html
-
-	prepgamesdirs
-}
diff --git a/games-roguelike/FTL/Manifest b/games-roguelike/FTL/Manifest
deleted file mode 100644
index 7caa34676fe2..000000000000
--- a/games-roguelike/FTL/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST FTL.1.5.13.tar.gz 197569383 BLAKE2B 29b61c92dc242c6239e236761a89c464efc3889e1d28bbcd3466548090f4ba23450597ef9cd0a7130d0caea1d45a9cfdd87a56a65998dd4da146f1ade5d9a68d SHA512 129aa9ea13b6889520cb637bcbda0452f3dc2e8d93fb0e4d1c7938436d776b39a0a33b4e9d943e058ab5c80dcbb6e7bb874d0a78bd8a2a5a3a7e34159e1faac9
-EBUILD FTL-1.5.13.ebuild 1498 BLAKE2B 91e25c44e253d2802813c7e56a7372fafbc52db36835b9093c58ef20e7f27979cedafadcf0081a830674b3713137752804940e4213f417d6899714282f326537 SHA512 d7dcf52b3f59868e79a273c34edf4e9988ed36729e1fd32cb6faa5660d632177ccba553951006a1c2d4a361313794f105e6b40bb7c11df471c479d622889b54a
-MISC metadata.xml 545 BLAKE2B cbafb1a1af2bbb09c4af83e7158d769d2c1c47f5a76c7ff488956cc0af2acee2eb645de70a2a76a49da7448b22b2f1da43e0288c49b22aadf2b98c857d3196d4 SHA512 f7c2324cd2084736cb1bc7936622f2b33a9509c8c51dc32500683ad8eeb361e4e6e4f7663bc63eb483f02f88aa4f45d7c7d2a43869e69d60b525aed5f665ad1a
diff --git a/games-roguelike/FTL/metadata.xml b/games-roguelike/FTL/metadata.xml
deleted file mode 100644
index 2b826b46e1e1..000000000000
--- a/games-roguelike/FTL/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">Use bundled libraries.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 94e9fb82c21e..f38c0fd4932e 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/adom-1.1.1-r1 b/games-roguelike/adom-1.1.1-r1
new file mode 100644
index 000000000000..3c5925d5f02d
--- /dev/null
+++ b/games-roguelike/adom-1.1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Ancient Domains Of Mystery rogue-like game
+EAPI=5
+HOMEPAGE=http://www.adom.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=adom
+RDEPEND=|| ( >=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)] >=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=http://www.adom.de/adom/download/linux/adom-111-elf.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_=67d03d78d556f833728e3e77d9d4e632
diff --git a/games-roguelike/adom/Manifest b/games-roguelike/adom/Manifest
deleted file mode 100644
index 18bf38eba1a7..000000000000
--- a/games-roguelike/adom/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST adom-111-elf.tar.gz 1001683 BLAKE2B e8f263c88c910cd3df40f1bec34a32853438090d17c7f48dc3d7d2f321b3f0d24adb40bd5ec74479eb23c7b6782967d2f3e7c5e4ee445c5fb75fdbb175d8889d SHA512 7b1d8916f66273b4ab06edd2d77c30e2edce827d346451d83c677af32492c40e5c578a8450ab3cc9be7888a0052a0960306e97db408e8581700c71c1b480b128
-EBUILD adom-1.1.1-r1.ebuild 859 BLAKE2B 2d9a7a2f8115531b91f8e526defa8aba08cd59ecbc6c621568c327ba5fa08a66ae57214fd259075b515019b01019308eff9df8ce153a388cb549f30b351b8964 SHA512 9bbfeecd00a320001a22b3a05a6b00f6eb9073d8a889a7cb23a1f09eab9fdebd0e0946371a60b18ce590cf7a9a853d81cd670cd2e934dab2dc89cb8ac8096f55
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/adom/adom-1.1.1-r1.ebuild b/games-roguelike/adom/adom-1.1.1-r1.ebuild
deleted file mode 100644
index 594a56c07ebe..000000000000
--- a/games-roguelike/adom/adom-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Ancient Domains Of Mystery rogue-like game"
-HOMEPAGE="http://www.adom.de/"
-SRC_URI="http://www.adom.de/adom/download/linux/${P//.}-elf.tar.gz"
-
-LICENSE="adom"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip" #bug #137340
-QA_FLAGS_IGNORED="${GAMES_PREFIX_OPT:1}/bin/adom"
-
-RDEPEND="|| (
-	>=sys-libs/ncurses-5.9-r3:0/5[abi_x86_32(-)]
-	>=sys-libs/ncurses-5.9-r3:5/5[abi_x86_32(-)] )"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	exeinto "${GAMES_PREFIX_OPT}/bin"
-	doexe adom
-
-	keepdir "${GAMES_STATEDIR}/${PN}"
-	echo "${GAMES_STATEDIR}/${PN}" > adom_ds.cfg
-	insinto /etc
-	doins adom_ds.cfg
-
-	edos2unix adomfaq.txt
-	dodoc adomfaq.txt manual.doc readme.1st
-
-	prepgamesdirs
-	fperms g+w "${GAMES_STATEDIR}/${PN}"
-}
diff --git a/games-roguelike/adom/metadata.xml b/games-roguelike/adom/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-roguelike/adom/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/angband-4.0.5-r1 b/games-roguelike/angband-4.0.5-r1
new file mode 100644
index 000000000000..0baa31cb5a94
--- /dev/null
+++ b/games-roguelike/angband-4.0.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst preinst prepare
+DEPEND=X? ( x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-image media-libs/sdl-ttf sound? ( media-libs/libsdl[sound] ) media-libs/sdl-mixer[mp3] ) dev-python/docutils 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=A roguelike dungeon exploration game based on the books of J.R.R. Tolkien
+EAPI=6
+HOMEPAGE=http://rephial.org/
+IUSE=ncurses sdl +sound X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=X? ( x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) ) ncurses? ( sys-libs/ncurses:0=[unicode] ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-image media-libs/sdl-ttf sound? ( media-libs/libsdl[sound] ) media-libs/sdl-mixer[mp3] )
+SLOT=0
+SRC_URI=http://rephial.org/downloads/4.0/angband-4.0.5.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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a32000475864f10672e0e2f7c9059e3d
diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest
deleted file mode 100644
index efba74be21fa..000000000000
--- a/games-roguelike/angband/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX angband-4.0.5-pie-gcc.patch 453 BLAKE2B f303fd00ae875a12159027c1e4f7c48017dcddd300b72095c2d91ad3a532bf40b7a2c3267bfa6906e27452651ccd99e05aa26108e44ddabeb9107cbc9c85de06 SHA512 1173ab1e5eebfba393d34085d6896b9633ec5be4914cfe3925082b6ff8ba8194b6a85970c998dc268d84e71ac524b885a66becbaa2a28ee17acfc11d4957fb3a
-DIST angband-4.0.5.tar.gz 19886562 BLAKE2B 3b8410187a66dacc5f2310e116f3abe8ca04e1363701d455df68f3daaf2a23b0ad4811cee2a50129e1f8e096c6ee9e40f8879b25e97510946b4e4ac2a9124631 SHA512 9ad46430d7e3c4b7676042b28107a2a5b9b2ed967dd1f45b91ca37583fa2d5e9ba25d963a6510ee091b8fdb3a704a60002d851d7898a6298567f804dce36a88b
-EBUILD angband-4.0.5-r1.ebuild 2650 BLAKE2B eea5b92cbf3a3ae69b0a01dacbfcdfd61804acf75ede21be3c16f81d4b884a1421025fb7e7bf8349eb1a4409bfb6beaa7166c3f1aeb469705b3122bc9ddbe15e SHA512 0dcb532baf61ee94461b055b6a3b63f5b17d42f849ea318815d8960b7c0ba6b3b31c2b72d42e7788481357bb9b0c8f0694849d44c0c7641ccb094f6ef5d5701c
-MISC metadata.xml 322 BLAKE2B 121663252d3cc2808c692febb987b8220f8f8b507598833bc42d31cf72566ac9c9c6cf01f54ea5ccdb18a011ee08ddcc21d6a33a85b7609be8b54b4520783483 SHA512 0f2cb75c7386183901d5790e27da590b8e529807f9c0ea1781d072645bf5605fd66589851189ec4b58ff7d711c00c3c0df2ab88acb96ed01079dbe2f8ac17b24
diff --git a/games-roguelike/angband/angband-4.0.5-r1.ebuild b/games-roguelike/angband/angband-4.0.5-r1.ebuild
deleted file mode 100644
index d8830482e592..000000000000
--- a/games-roguelike/angband/angband-4.0.5-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2-utils versionator
-
-MAJOR_PV=$(get_version_component_range 1-2)
-
-DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien"
-HOMEPAGE="http://rephial.org/"
-SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses sdl +sound X"
-
-RDEPEND="X? ( x11-libs/libX11 )
-	!ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) )
-	ncurses? ( sys-libs/ncurses:0=[unicode] )
-	sdl? ( media-libs/libsdl[video,X]
-		media-libs/sdl-image
-		media-libs/sdl-ttf
-		sound? ( media-libs/libsdl[sound] )
-			media-libs/sdl-mixer[mp3] )"
-DEPEND="${RDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-PATCHES=("${FILESDIR}"/${P}-pie-gcc.patch)
-
-src_prepare() {
-	default
-
-	sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die
-	sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die
-	sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || die
-
-	if use !sound ; then
-		sed -i -e 's/sounds//' lib/Makefile || die
-	fi
-
-	# Game constant files are now system config files in Angband, but
-	# users will be hidden from applying updates by default
-	{
-		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/customize/\""
-		echo "CONFIG_PROTECT_MASK=\"/etc/${PN}/gamedata/\""
-	} > "${T}"/99${PN} || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	if use sdl; then
-		myconf="$(use_enable sound sdl-mixer)"
-	else
-		myconf="--disable-sdl-mixer"
-	fi
-
-	ac_cv_path_NCURSES_CONFIG="pkg-config ncursesw" \
-	econf \
-		--bindir="${EPREFIX}"/usr/bin \
-		--with-private-dirs \
-		$(use_enable X x11) \
-		$(use_enable sdl) \
-		$(use_enable ncurses curses) \
-		$(use !sdl && use !ncurses && use !X && \
-			echo --enable-curses) \
-		${myconf}
-}
-
-src_install() {
-	DOCS="changes.txt faq.txt readme.txt thanks.txt" \
-		default
-
-	dodoc doc/manual.html
-	doenvd "${T}"/99${PN}
-
-	if use X || use sdl ; then
-		if use X; then
-			make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}"
-		fi
-
-		if use sdl; then
-			make_desktop_entry "angband -msdl" "Angband (SDL)" "${PN}"
-		fi
-
-		local s
-		for s in 16 32 128 256 512
-		do
-			newicon -s ${s} lib/icons/att-${s}.png "${PN}.png"
-		done
-		newicon -s scalable lib/icons/att.svg "${PN}.svg"
-	fi
-}
-
-pkg_preinst() {
-	if use X || use sdl ; then
-		gnome2_icon_savelist
-	fi
-}
-
-pkg_postinst() {
-	echo
-	elog "Angband now uses private savefiles instead of system-wide ones."
-	elog "This version of Angband is not compatible with the save files"
-	elog "of previous versions."
-	echo
-
-	if use X || use sdl ; then
-		gnome2_icon_cache_update
-	fi
-}
diff --git a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch b/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
deleted file mode 100644
index b4f3c5707d43..000000000000
--- a/games-roguelike/angband/files/angband-4.0.5-pie-gcc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Allow gcc to construct correct partial linking command to ld.
-Otherwise ld gets an incompatible mix of '-pie -r'.
-
-https://bugs.gentoo.org/617982
-diff --git a/src/Makefile b/src/Makefile
-index 79be4cc..d27bb91 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -33,3 +33,3 @@ win/$(PROGNAME).res: win/$(PROGNAME).rc
- $(PROGNAME).o: $(OBJECTS)
--	$(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS)
-+	$(LD) -nostdlib -r -o $@ $(OBJECTS)
- 	@printf "%10s %-20s\n" LINK $@
diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
deleted file mode 100644
index dc2d1c7d2794..000000000000
--- a/games-roguelike/angband/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="sound">Enable and install sounds</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-roguelike/crossfire-client-1.71.0-r2 b/games-roguelike/crossfire-client-1.71.0-r2
new file mode 100644
index 000000000000..3e06251786e7
--- /dev/null
+++ b/games-roguelike/crossfire-client-1.71.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=lua? ( dev-lang/lua:0= ) media-libs/libpng:0 net-misc/curl opengl? ( virtual/opengl media-libs/freeglut ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] ) sound? ( media-libs/sdl-mixer[vorbis] ) sys-libs/zlib x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1: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=Client for the nethack-style but more in the line of UO
+EAPI=6
+HOMEPAGE=http://crossfire.real-time.com/
+IUSE=lua opengl sdl sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=lua? ( dev-lang/lua:0= ) media-libs/libpng:0 net-misc/curl opengl? ( virtual/opengl media-libs/freeglut ) sdl? ( media-libs/libsdl[video] media-libs/sdl-image[png] ) sound? ( media-libs/sdl-mixer[vorbis] ) sys-libs/zlib x11-libs/gtk+:2
+SLOT=0
+SRC_URI=mirror://sourceforge/crossfire/crossfire-client-1.71.0.tar.bz2
+_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_=23cf9bc51601674b0e1051665c137425
diff --git a/games-roguelike/crossfire-client/Manifest b/games-roguelike/crossfire-client/Manifest
deleted file mode 100644
index be65c3c2e83a..000000000000
--- a/games-roguelike/crossfire-client/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crossfire-client-1.71.0.tar.bz2 761156 BLAKE2B 6a5938ca8d9c7060f43f5b6a54ff2ed65521ec8ffbc76c10be25ae8802e95d77242edb6d52852410ccd352b51d5fc9edcdb9b85dc618cecfa79cd37ff0212c0f SHA512 86710d684fd7908ea9aaf5ba20bff0f1ba01ff0ba90c3e2847afff9d0db6f60c7b671413c8888b513c992fbf27474e744b79df185d5e2c04afc9d2dce3d8665e
-EBUILD crossfire-client-1.71.0-r2.ebuild 1573 BLAKE2B 741d6525b6acb4c3a5e23e296ae1348c8a47e96d70173e466c76721007a225dea02fc0602b345c81447dd3beac52d59400b198725d0a6410b40dec14b533a785 SHA512 488691c905c146e25847cd2839197167abfa860cd5875ce0cd4337932f585ebb9e870c4d52f79e904d2dcbbaa5c1316419afc41bd67ec563974530d1950f3f33
-MISC metadata.xml 332 BLAKE2B b2b20adc6daa1c491850292a929df2b67738519b81cbab2cd2c2d278176daf4e895a10bc712213abcb41714f27bb0c9e2b1731f970b7381cbf9ffefe6c393666 SHA512 cf046be69b614cd43deba574e8fbd23b566507c694b9f7cbda92d7009d727ac4087de411bf63463561beb3160ecfe7f9fb685574b018466b473535184529ccf7
diff --git a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r2.ebuild b/games-roguelike/crossfire-client/crossfire-client-1.71.0-r2.ebuild
deleted file mode 100644
index 0292fdf40be5..000000000000
--- a/games-roguelike/crossfire-client/crossfire-client-1.71.0-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs gnome2-utils
-
-DESCRIPTION="Client for the nethack-style but more in the line of UO"
-HOMEPAGE="http://crossfire.real-time.com/"
-SRC_URI="mirror://sourceforge/crossfire/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lua opengl sdl sound"
-
-RDEPEND="
-	lua? ( dev-lang/lua:0= )
-	media-libs/libpng:0
-	net-misc/curl
-	opengl? ( virtual/opengl
-		media-libs/freeglut )
-	sdl? ( media-libs/libsdl[video]
-		media-libs/sdl-image[png] )
-	sound? ( media-libs/sdl-mixer[vorbis] )
-	sys-libs/zlib
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -ri -e '/^.TH/s:$: 6:' $(find . -name "*man") || die
-	sed -i -e 's/lua-5.1/lua/' configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# bugs in configure script so we cant use $(use_enable ...)
-	local myconf
-
-	use lua    && myconf="${myconf} --enable-lua"
-	use sdl    || myconf="${myconf} --disable-sdl"
-	use opengl || myconf="${myconf} --disable-opengl"
-	use sound  || myconf="${myconf} --disable-sound"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# bug 139785
-	if use sound ; then
-		emake -C sound-src AR="$(tc-getAR)"
-	fi
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	local s
-
-	default
-	domenu gtk-v2/crossfire-client.desktop
-	for s in 16 32 48
-	do
-		newicon -s ${s} pixmaps/${s}x${s}.png ${PN}.png
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/crossfire-client/metadata.xml b/games-roguelike/crossfire-client/metadata.xml
deleted file mode 100644
index baf8c3afc277..000000000000
--- a/games-roguelike/crossfire-client/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">crossfire</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-roguelike/dwarf-fortress-0.43.05 b/games-roguelike/dwarf-fortress-0.43.05
new file mode 100644
index 000000000000..0a43532e5b7c
--- /dev/null
+++ b/games-roguelike/dwarf-fortress-0.43.05
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses:5[unicode] virtual/pkgconfig
+DESCRIPTION=A single-player fantasy game
+EAPI=6
+HOMEPAGE=http://www.bay12games.com/dwarves
+IUSE=debug
+KEYWORDS=~amd64 ~x86 -*
+LICENSE=free-noncomm BSD BitstreamVera
+RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_43_05_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_43_05_linux32.tar.bz2 )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=102c5922c0c4cd66a46474ac37fbd2e6
diff --git a/games-roguelike/dwarf-fortress-0.44.12 b/games-roguelike/dwarf-fortress-0.44.12
new file mode 100644
index 000000000000..0929309ea450
--- /dev/null
+++ b/games-roguelike/dwarf-fortress-0.44.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses:5[unicode] virtual/pkgconfig
+DESCRIPTION=A single-player fantasy game
+EAPI=6
+HOMEPAGE=http://www.bay12games.com/dwarves
+IUSE=debug
+KEYWORDS=~amd64 ~x86 -*
+LICENSE=free-noncomm BSD BitstreamVera
+RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_44_12_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_44_12_linux32.tar.bz2 )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=102c5922c0c4cd66a46474ac37fbd2e6
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
deleted file mode 100644
index dff2a0695a7b..000000000000
--- a/games-roguelike/dwarf-fortress/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX Makefile 1169 BLAKE2B 79ffa48adf56ae2233d9e10e6bb20acb55984cf969d50d2d2a73a31783b6692517062a1960eb01f1c9dd56c0d8ed38dd1612745e26101349f54e878941e2c605 SHA512 94baa1189e6a01415d46c475a0d1e40c785ded0473fd7dd89f136df36c07d58f718fee23b7d885e5ee8774a62063c9d92a1d26b02643f36ad5562e3e168e86bf
-AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c57200bd272ae37d5871793d5a0308cde8b4c3be9824b5549a23429d465f874e0ca018862f3072dc3b SHA512 d390c65f406cf8b43f3d493cd6513167c122a5811e3bc8614a66dc080eac21df9fc1d5f110503c8f6815f683eaeb5ddcdd833d310400ccc2426ae81c2b8159f8
-AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
-DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be SHA512 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
-DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
-DIST df_44_12_linux.tar.bz2 12081683 BLAKE2B 2410e8da6af6a8ced45d3e95dc06e2d0f4e31dbdcd6b8d9945a761d2278532bb24c1095418aa22639eedded256b3d485fa128984e6282a491d4dc7bd9af8671b SHA512 03cd7f6800d44873b573cc5bffb12c7a246c3aba0ee8535001372df689a5179dc02592670fd87f2fd5de82421605f34152f6241307c8f7b9fb4d7b8704aed70c
-DIST df_44_12_linux32.tar.bz2 12686340 BLAKE2B bf1e1370930d91d2c9e72d3366bc79706092d1505853eb63c6160fea39822551d3276958ac6d2916b8f7825be0c054a037219210f0c2c18a731065a2dd1bb842 SHA512 5cd352acf310592c7e30442205b7fe590f421c5e3562959dcfd32a17d3d562347c2b32e3bc5835637c5550ce2c696c17b6dc910ee4cf766be07af306e83537db
-EBUILD dwarf-fortress-0.43.05.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
-EBUILD dwarf-fortress-0.44.12.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
-MISC metadata.xml 455 BLAKE2B cad71196c8cb8c8246703bf00d8470faacd39b564ba7ce8a4819c19d1ef28561ad893000e991ba8eefaff8697497fe96fb19e3c07f18a073d2b9fd406c11346e SHA512 913a17c9b0f3d8909e1d01d1924d3efecb47dce07fe3f10cb7fda44150f816b690bd8698cef3b81a706f043db39b6e33a791fe704892010a47c522b1add8561e
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
deleted file mode 100644
index a8f36028ee27..000000000000
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
-MY_PN=df
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
-	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
-
-LICENSE="free-noncomm BSD BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
-IUSE="debug"
-
-RDEPEND="media-libs/glew:0
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/gtk+:2"
-# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
-# dlopens them at runtime if requested.
-DEPEND="${RDEPEND}
-	media-libs/libsndfile
-	media-libs/openal
-	sys-libs/ncurses:5[unicode]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}_linux
-
-gamesdir="/opt/${PN}"
-QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
-RESTRICT="strip"
-
-src_prepare() {
-	rm -f libs/*.so* || die
-	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
-	default
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
-}
-
-src_compile() {
-	emake -f "${FILESDIR}/Makefile.native"
-	sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
-}
-
-src_install() {
-	# install data-files and libs
-	insinto "${gamesdir}"
-	doins -r raw data libs
-
-	# install our wrapper
-	dobin dwarf-fortress
-
-	# install docs
-	dodoc README.linux *.txt
-
-	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
-}
-
-pkg_postinst() {
-	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
-	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
-	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
-	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
-	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
-	elog
-	elog "Optional runtime dependencies:"
-	elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
-	elog "Install media-libs/openal and media-libs/libsndfile for audio output"
-	elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
-}
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
deleted file mode 100644
index a8f36028ee27..000000000000
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator toolchain-funcs
-
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
-MY_PN=df
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
-	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
-
-LICENSE="free-noncomm BSD BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
-IUSE="debug"
-
-RDEPEND="media-libs/glew:0
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/gtk+:2"
-# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
-# dlopens them at runtime if requested.
-DEPEND="${RDEPEND}
-	media-libs/libsndfile
-	media-libs/openal
-	sys-libs/ncurses:5[unicode]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}_linux
-
-gamesdir="/opt/${PN}"
-QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
-RESTRICT="strip"
-
-src_prepare() {
-	rm -f libs/*.so* || die
-	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
-	default
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
-}
-
-src_compile() {
-	emake -f "${FILESDIR}/Makefile.native"
-	sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
-}
-
-src_install() {
-	# install data-files and libs
-	insinto "${gamesdir}"
-	doins -r raw data libs
-
-	# install our wrapper
-	dobin dwarf-fortress
-
-	# install docs
-	dodoc README.linux *.txt
-
-	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
-}
-
-pkg_postinst() {
-	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
-	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
-	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
-	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
-	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
-	elog
-	elog "Optional runtime dependencies:"
-	elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
-	elog "Install media-libs/openal and media-libs/libsndfile for audio output"
-	elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
-}
diff --git a/games-roguelike/dwarf-fortress/files/Makefile b/games-roguelike/dwarf-fortress/files/Makefile
deleted file mode 100644
index 856670b6a67e..000000000000
--- a/games-roguelike/dwarf-fortress/files/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2014-2016 Alex Xu (Hello71)
-# Distributed under the terms of the GNU General Public License v2
-
-PKG_CONFIG ?= pkg-config
-PKG_CONFIG_PATH ?= /usr/lib32/pkgconfig:/usr/lib/pkgconfig
-PKG_CONFIG := PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG)
-
-SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
-	g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \
-	g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \
-	g_src/music_and_sound_openal.cpp g_src/random.cpp g_src/textlines.cpp \
-	g_src/enabler_input.cpp g_src/KeybindingScreen.cpp \
-	g_src/win32_compat.cpp g_src/textures.cpp g_src/resize++.cpp \
-	g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp g_src/ViewBase.cpp
-OBJS := $(SRCS:.cpp=.o)
-
-BLIBS := ncursesw openal sndfile
-LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
-CXXFLAGS ?= -O2 -pipe -Wall -Wextra
-CXXFLAGS += -m32 $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
-LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
-
-LG := libs/libgraphics.so
-
-all: $(LG)
-$(LG): $(OBJS)
-	$(LINK.cpp) -shared $^ $(LDLIBS) -o $@
-
-clean:
-	$(RM) $(LG) $(OBJS)
-
-.PHONY: clean
diff --git a/games-roguelike/dwarf-fortress/files/Makefile.native b/games-roguelike/dwarf-fortress/files/Makefile.native
deleted file mode 100644
index 85383e5e2f1d..000000000000
--- a/games-roguelike/dwarf-fortress/files/Makefile.native
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2014-2016 Alex Xu (Hello71)
-# Distributed under the terms of the GNU General Public License v2
-
-SRCS := g_src/basics.cpp g_src/command_line.cpp g_src/enabler.cpp \
-	g_src/files.cpp g_src/find_files_posix.cpp g_src/graphics.cpp \
-	g_src/init.cpp g_src/interface.cpp g_src/keybindings.cpp \
-	g_src/music_and_sound_openal.cpp g_src/random.cpp g_src/textlines.cpp \
-	g_src/enabler_input.cpp g_src/KeybindingScreen.cpp \
-	g_src/win32_compat.cpp g_src/textures.cpp g_src/resize++.cpp \
-	g_src/renderer_offscreen.cpp g_src/ttf_manager.cpp g_src/ViewBase.cpp
-OBJS := $(SRCS:.cpp=.o)
-
-BLIBS := ncursesw openal sndfile
-LIBS := glew glu gtk+-2.0 sdl SDL_image SDL_ttf zlib
-CXXFLAGS ?= -O2 -pipe -Wall -Wextra
-CXXFLAGS += $(shell $(PKG_CONFIG) --cflags $(BLIBS) $(LIBS)) -Dunix -Dlinux -fPIC -std=c++11 -D_GLIBCXX_USE_CXX11_ABI=0
-LDLIBS := $(shell $(PKG_CONFIG) --libs $(LIBS))
-
-LG := libs/libgraphics.so
-
-all: $(LG)
-$(LG): $(OBJS)
-	$(LINK.cpp) -shared $^ $(LDLIBS) -o $@
-
-clean:
-	$(RM) $(LG) $(OBJS)
-
-.PHONY: clean
diff --git a/games-roguelike/dwarf-fortress/files/dwarf-fortress b/games-roguelike/dwarf-fortress/files/dwarf-fortress
deleted file mode 100644
index 23b9c348754c..000000000000
--- a/games-roguelike/dwarf-fortress/files/dwarf-fortress
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-gamesdir=/opt/dwarf-fortress
-install="$HOME/.dwarf-fortress"
-
-do_install() {
-	cp -rn "$gamesdir"/data "$install"/
-	# DF gets unhappy when this is out of sync
-	cp -f "$gamesdir"/data/index "$install"/data/
-	cp -rsn "$gamesdir"/* "$install"/
-}
-
-if [ -d "$install" ]; then
-	# delete dangling symlinks
-	find -L "$install/" -type l -delete
-	# ignore "are the same file" errors
-	do_install 2>/dev/null
-else
-	mkdir "$install" || exit
-	do_install || exit
-fi
-
-cd "$install" || exit
-exec ./libs/Dwarf_Fortress "$@"
diff --git a/games-roguelike/dwarf-fortress/metadata.xml b/games-roguelike/dwarf-fortress/metadata.xml
deleted file mode 100644
index 32ecf7b18035..000000000000
--- a/games-roguelike/dwarf-fortress/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>alex_y_xu@yahoo.ca</email>
-	<name>Alex Xu</name>
-</maintainer>
-<maintainer type="person">
-	<email>creffett@gentoo.org</email>
-	<name>Chris Reffett</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/hengband-1.6.2-r1 b/games-roguelike/hengband-1.6.2-r1
new file mode 100644
index 000000000000..a521e81059f3
--- /dev/null
+++ b/games-roguelike/hengband-1.6.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5:0 X? ( x11-libs/libX11 ) 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=An Angband variant, with a Japanese/fantasy theme
+EAPI=5
+HOMEPAGE=http://hengband.sourceforge.jp/en/
+IUSE=X l10n_ja
+KEYWORDS=~x86 ~x86-fbsd
+LICENSE=Moria
+RDEPEND=>=sys-libs/ncurses-5:0 X? ( x11-libs/libX11 ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge.jp/hengband/10331/hengband-1.6.2.tar.bz2 mirror://gentoo/hengband-1.6.2-mispellings.patch.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b791fad16563dd81d742cfe5e0e53696
diff --git a/games-roguelike/hengband/Manifest b/games-roguelike/hengband/Manifest
deleted file mode 100644
index 06ea699fe583..000000000000
--- a/games-roguelike/hengband/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX hengband-1.6.2-added_faq.patch 6371 BLAKE2B 322267980e2b9ddc75245528a1a29fae0936e6cb3a6d87287e4e4d475090c37c47b9d8268fbe52cc5e6725f6a2d034d28c4fdecba57a23137384340a5e5c3fcb SHA512 254283e117f6bf7d050ec152d7bb04cdcbd23235f56da8ed8aa587e23ef21de0a556cac4027e8a3b0fa32d66448c96ac18e9e76d242b9d1a921befcaf78195a1
-AUX hengband-1.6.2-ovflfix.patch 236 BLAKE2B 7a2fc1e76fb1d4755cb4d45ddd0f7f48ecf38e21b769196ccfeabe7cadaacd278c7e3c25e64711f7d362e310247773fb1e907e402a0b1f11a7ac0065325415ad SHA512 0e51671bce72cd0ab1109111556bfda71ef043475c033548ffd5873d9329597e705b9e6459d5e95369df5f5501e2553f9109622d522534ea43f787087160e3cf
-DIST hengband-1.6.2-mispellings.patch.gz 11964 BLAKE2B a409161c70d655078396c8774b251cbb467802eaa9d6c96322a49ba1956fb3c9a5ba24d8de74907afea96c1df62fdfee3fe581a45e19b77e51f917e862c63531 SHA512 73838981616e09deca7afc3911386e665ac38fafcdcea42d87bc41e4bc187551278efeaa608a772a444e0c178c3f990e16dd302b6a8dc6dfdd8625d463b9b3b5
-DIST hengband-1.6.2.tar.bz2 2029169 BLAKE2B 3a25a829f3fba8bd265d0b13fc81becbbf505dcb4efd78010d6cc8db29bb4be22911d18bf7c4496e4b408c3742aa12c36060bacd62bb79de0be4fa5c36191afa SHA512 24c67f00556d7899b4f18f3071c4bd50bc754566c4c4736c18248ced243b1332e6c84381250c1a59358e7a914e5d62db05c47ab0921bcf40fbd6cfe4b6717520
-EBUILD hengband-1.6.2-r1.ebuild 1453 BLAKE2B 3d256fa9e2330d39b0afc03c5f372602af8ae67a6f7bfef186416711e135a0d60cce152a58d955dd8079188bfe290f3e92b1166a2d50444fc27771566d64e4bb SHA512 0f122fb11e595edb3ff54a9ff172ac30d53bc86efeaa0cbc33bd265ceb17fa016ed38015516066c8f36ecd498c78ca426d9ce6d927258ac485ae16134f201cdc
-MISC metadata.xml 334 BLAKE2B 26c821bfd5ecfb9e843418084ffc417e2b22f3c371b442e9473a85ad45aed5861259194c1c1d48dac929d60019d4b040f751afb32caced1aa094086d07d098b6 SHA512 ec8a4116d1ad2f15b2dad0148f912da9123d937cd724eaac00ff20541d64b7ac37190f617b8e82376c571a47cb6b886fc269a477c2c6b4aaa0859204f716add9
diff --git a/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch b/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch
deleted file mode 100644
index 0e75022145cb..000000000000
--- a/games-roguelike/hengband/files/hengband-1.6.2-added_faq.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-diff -Naur hengband-1.6.2-orig/lib/help/faq.txt hengband-1.6.2-fixed/lib/help/faq.txt
---- hengband-1.6.2-orig/lib/help/faq.txt	1970-01-01 03:00:00.000000000 +0300
-+++ hengband-1.6.2-fixed/lib/help/faq.txt	2004-12-07 08:12:53.000000000 +0300
-@@ -0,0 +1,147 @@
-+
-+=========  Hengband FAQ  ==========
-+
-+
-+Q. I want to play as an Android, Balrog, Golem, Skeleton, Zombie,
-+   Spectre, or Ent.  But I can't find any scroll of satisfy hunger.
-+   And Berserkers no longer have racial ability of satisfy hunger.
-+   How do I avoid starvation?
-+
-+A. Scroll of Satisfy Hunger and Berserker's ability of Satisfy Hunger
-+   are obsoleted.  And races which previously relyed on Satisfy Hunger
-+   have new sources of nutrition now; Android can quaff oil.  Balrogs
-+   can sacrifice human corpse using the 'E'at command.  Golems,
-+   Skeletons, Zombies, and Spectres can absorb mana from staves and
-+   wands using the 'E'at command.  Ents can gain enough nutrition from
-+   potions.
-+
-+
-+Q. I got through the Yeek cave and I headed into the wilderness....and
-+   I'm still there searching endlessly down one road after another
-+   looking for a town.  Where are other towns and dungeons?
-+
-+A. You need to use the global wilderness map (press the < key on the
-+   ground level).  This gives you a larger map of the world, where you
-+   can travel to other towns and dungeons.  By the way, you should
-+   read the readme_eng.txt and the on-line help.
-+
-+
-+Q. I'm playing as a berserker, and cannot read scrolls.  How do I
-+   remove curse?
-+
-+A. You can simply 't'ake off cursed equipments.  Since cursed
-+   equipments are strongly sticking, you need to try 't'ake off
-+   command many times.
-+
-+
-+Q. I know Berserkers cannot use scrolls, and rods.  How do I recall
-+   from dungeon?  Maybe I need to travel completely on foot?!!
-+
-+A. Berserkers gain a class power 'Recall' at level 10.  Press the
-+   'U'(original keyset) or 'O'(Roguelike keyset) to use class power.
-+
-+
-+Q. Why Ninja have Iron Spikes at the start?
-+
-+A. Ninja can use Iron Spikes as shuriken; they can throw it as good
-+   missile weapon.  Simply use 'v' command.
-+
-+
-+Q. I'm at normal speed (+0). But normal speed monsters sometimes do
-+   double or even triple move!
-+
-+A. On Hengband, amount of energy needed for a move is somewhat
-+   randomized.  This method of speed system is an important feature of
-+   Hengband, and is simulating real fighting.  So always expect that
-+   your enemy can get two or three move.  Don't fight when your HP is
-+   low, if you don't want to get instakill!
-+
-+
-+Q. I tried to dual wield two weapons.  But I couldn't hit anything!
-+
-+A. You need to practice your dual wielding skill(proficiency level)
-+   and your weapon skills.  Hitting high level monsters many times
-+   will improve your skills.  Note that the information command '~'
-+   reveals your proficiency levels.
-+
-+
-+Q. How do skills(proficiency levels) work?
-+
-+A. Weapon proficiency levels and dual wielding proficiency levels
-+   increase your to-hit bonus.  Spell proficiency levels decrease fail
-+   rate and mana consumption rate of spells.  Riding proficiency level
-+   gives you more speed when you are riding on a high speed monster,
-+   and decreases risk of falling from your mount.
-+
-+
-+Q. How do I increase proficiency level?
-+
-+A. Proficiency level of a weapon will increase when you hit a monster
-+   whose level is high enough compared with your character level.
-+   Proficiency level of a spell will increase when you cast the spell
-+   at the dungeon level deep enough compared with the spell level.
-+   Needed condition to increase riding proficiency level is rather
-+   complex;  Generally, you need to hit a monster whose level is high
-+   enough compared with current riding proficiency level or to shoot a
-+   monster when ride on high level mount.
-+
-+
-+Q. How do I ride on a monster?
-+
-+A. At first, summon, charm or capture some suitable monster. Then use
-+   pet menu command 'p'.
-+
-+
-+Q. How to use Capture Ball?
-+
-+A. Just equip it and activate 'A' to a dying monster.
-+
-+
-+Q. I cannot hold a weapon and a shield without losing control of my
-+   horse.  My horse runs aimlessly!
-+
-+A. You cannot directly control your mount unless you use one hand to
-+   control your mount.  But you can command your mount.  Just use 'p'
-+   command, and give your mount a target.  The horse which was given a
-+   target will no longer run around aimlessly.
-+
-+
-+Q. Where is the score server?  And how do I register my character
-+   dumps?
-+
-+A. Here;'http://hengband.sourceforge.jp/en/score.html'.
-+   When you die, Hengband will ask you as 'Do you send score to the
-+   world score sever?'.  And if you answer 'y', Hengband will
-+   automatically register your character dump and screen shot.
-+
-+
-+Q. Are there spoiler for more details?
-+
-+A. Yes. Henkma is writing spoiler page for Hengband;
-+   'http://www.kmc.gr.jp/~henkma/heng-e/index.html'
-+
-+
-+Q. Who wrote Hengband?
-+
-+A. Hengband is mainly based on ZAngband 2.2.8 Japanese version.
-+   ZAngband 2.2.8 Japanese version was developed by Mitsuhiro Itakura,
-+   based on both ZAngband 2.2.8 and Angband 2.8.3 Japanese version,
-+   and has some original features, for example, Auto-picker, in
-+   addition to simple translation.
-+
-+   Hengband also includes codes from many other variants including
-+   ToME, OAngband, etc...  Mr.Hoge wrote the first original part of
-+   Hengband.  And currently, it is maintained by Hengband Development
-+   Team including Mr.Hoge, Habu, Henkma, iks, Kuwa, Mogami and nsk.
-+
-+
-+Q. Where is Hengband?
-+
-+A. Here: http://hengband.sourceforge.jp/en/
-+
-+
-+
-+ Hengband FAQ written by Mogami
-+
-+--
-+Updated    : Hengband 1.5.4
-diff -Naur hengband-1.6.2-orig/lib/help/Makefile.am hengband-1.6.2-fixed/lib/help/Makefile.am
---- hengband-1.6.2-orig/lib/help/Makefile.am	2002-10-31 17:12:08.000000000 +0300
-+++ hengband-1.6.2-fixed/lib/help/Makefile.am	2005-11-22 11:59:58.000000000 +0300
-@@ -4,7 +4,7 @@
- 	attack.hlp attack.txt birth.hlp birth.txt \
- 	bldg.txt raceclas.hlp raceclas.txt command.hlp \
- 	command.txt commdesc.hlp commdesc.txt defend.hlp \
--	defend.txt dungeon.hlp dungeon.txt gambling.txt \
-+	defend.txt dungeon.hlp dungeon.txt faq.txt gambling.txt \
- 	general.hlp general.txt help.hlp helpinfo.txt \
- 	j_general.txt j_item1.txt j_item2.txt j_trans.txt \
- 	jattack.hlp jattack.txt jbirth.hlp jbirth.txt \
diff --git a/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch b/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch
deleted file mode 100644
index 47bb53cf771a..000000000000
--- a/games-roguelike/hengband/files/hengband-1.6.2-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/effects.c.old	2010-10-28 11:51:31.000000000 +0200
-+++ src/effects.c	2010-10-28 11:51:59.000000000 +0200
-@@ -5191,7 +5191,7 @@
- 			}
- 			else
- 			{
--				char buf[10];
-+				char buf[15];
- 
- 				if (p_ptr->inside_arena)
- #ifdef JP
diff --git a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild b/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
deleted file mode 100644
index 8559444d7075..000000000000
--- a/games-roguelike/hengband/hengband-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools games
-
-DESCRIPTION="An Angband variant, with a Japanese/fantasy theme"
-HOMEPAGE="http://hengband.sourceforge.jp/en/"
-SRC_URI="mirror://sourceforge.jp/hengband/10331/${P}.tar.bz2
-	mirror://gentoo/${P}-mispellings.patch.gz"
-
-KEYWORDS="~x86 ~x86-fbsd"
-LICENSE="Moria"
-SLOT="0"
-IUSE="X l10n_ja"
-
-RDEPEND=">=sys-libs/ncurses-5:0
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-libs/libXt )"
-
-src_prepare() {
-	# Removing Xaw dependency as is not used
-	sed -i \
-		-e '/Xaw/d' src/main-xaw.c \
-		|| die
-	sed -i \
-		-e 's|root\.|root:|' lib/*/Makefile.in \
-		|| die
-	sed -i \
-		-e 's:/games/:/:g' configure.in \
-		|| die
-	epatch \
-		"../${P}"-mispellings.patch	\
-		"${FILESDIR}/${P}"-added_faq.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	use l10n_ja || myconf="--disable-japanese"
-
-	egamesconf \
-		--with-setgid=${GAMES_GROUP} \
-		$(use_with X x) \
-		${myconf}
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	if use l10n_ja ; then
-		dodoc readme.txt autopick.txt readme_eng.txt autopick_eng.txt
-	else
-		newdoc readme_eng.txt readme.txt
-		newdoc autopick_eng.txt autopick.txt
-	fi
-	prepgamesdirs
-	# FIXME: we need to patch around this BS
-	fperms g+w "${GAMES_DATADIR}"/${PN}/lib/{apex,data,save,user}
-}
diff --git a/games-roguelike/hengband/metadata.xml b/games-roguelike/hengband/metadata.xml
deleted file mode 100644
index 4ced683a10c0..000000000000
--- a/games-roguelike/hengband/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge-jp">hengband</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-roguelike/mangband-1.1.3 b/games-roguelike/mangband-1.1.3
new file mode 100644
index 000000000000..3ec2552c6737
--- /dev/null
+++ b/games-roguelike/mangband-1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst setup
+DEPEND=ncurses? ( sys-libs/ncurses:= ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libX11 )
+DESCRIPTION=Online multiplayer real-time roguelike game, derived from Angband.
+EAPI=6
+HOMEPAGE=http://www.mangband.org
+IUSE=ncurses sdl X
+KEYWORDS=~amd64 ~x86
+LICENSE=Moria
+RDEPEND=ncurses? ( sys-libs/ncurses:= ) sdl? ( media-libs/libsdl ) X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=http://www.mangband.org/download/mangband-1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=31b1305314ebebb4602b37279d16b39f
diff --git a/games-roguelike/mangband/Manifest b/games-roguelike/mangband/Manifest
deleted file mode 100644
index 055753970400..000000000000
--- a/games-roguelike/mangband/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX mangband-1.1.3-paths.patch 3029 BLAKE2B d073607fede89e5b244f85c95cf465734aee4b503683ee60cd6331000fe4833fea297bdc56eeb74857dad0525fe9b4eb5534bc518bf68ac2c4537527556e7deb SHA512 3dc510a04e339f06a654d8c5b6b5c7059e451a4d7669a4709d4efbdf9bd667993d67411b8338cbfe837c9b7e4ce9123d72a2eafb0ac86daaa68161bc061483c4
-AUX mangband-1.1.3-strchr.patch 371 BLAKE2B ba51408069784b0fc165b98e1f9da6539955c68bc438cab74175471b924ffb395d30a4c9202e63a2d2420831e77e96642cef835dbfee0b0071b427041e10e740 SHA512 f6bef0974416ff6f2036fe6a08db85b1353234a88f38134bc9ab739d26c44a914150044cd2ca80c141b7fd111c3b3f5f1acca1d111ec5d6c6586ac438bb5dcc3
-DIST mangband-1.1.3.tar.gz 1497078 BLAKE2B 69f00c9ae4d2600dd9705103dbc753d385015a81f7467e44e38c86cd6f3168474a3832a4c9e8efc353ef75b923362d35e50f49da7752adf43c37d4df015c0e18 SHA512 5efda352607953e94a433bf9aabb496419a22c984dc9e054cebc90623682da23a90fb6cb910fcc950010d469571f2af515bfa7740c921add44ac9ea95e723130
-EBUILD mangband-1.1.3.ebuild 2048 BLAKE2B 63d351965b5859dbef83f067b12b9630418d51673fd4dd5a808c7cf275cf416ccf060d5105309f089d0b7e111d29d6880c547a4c9fa92b3af64eb42fef6f2573 SHA512 8f1b2a0afb6f3b600730b64aaf79ed9834397c8ce5d7f85279b5b481a258b0f35493e00258d38880bf0e7c37ba149d5e2765862a1aa4e2469dd0fda66434e4f7
-MISC metadata.xml 338 BLAKE2B 872d2540905bff82e2d594a966e84b47a58c764d38383665740c0aed4e1803b961c6de5a3ec8427a67a9d3bb5b4d144eab71d1ae83bda144354c006b1e5a495b SHA512 4c12708346e37f2b3763b5e5967ba40b572932c1147acc0b5830341fca6107d041750f6b05e5983f9dda8125aac58254fbbedd694f2a15305afad78d9d198abb
diff --git a/games-roguelike/mangband/files/mangband-1.1.3-paths.patch b/games-roguelike/mangband/files/mangband-1.1.3-paths.patch
deleted file mode 100644
index dd9551570196..000000000000
--- a/games-roguelike/mangband/files/mangband-1.1.3-paths.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/src/config.h.in b/src/config.h.in
-index e8efdca..9a6290a 100644
---- a/config.h.in
-+++ a/config.h.in
-@@ -473,6 +473,9 @@
- #ifndef DEFAULT_PATH
- # define DEFAULT_PATH "./lib/"
- #endif
-+#ifndef DEFAULT_PATH_W
-+# define DEFAULT_PATH_W DEFAULT_PATH
-+#endif
- 
- 
- /*
-diff --git a/src/server/externs.h b/src/server/externs.h
-index 249e41b..e1a5c4f 100644
---- a/server/externs.h
-+++ a/server/externs.h
-@@ -644,7 +644,7 @@ extern errr init_e_info_txt(FILE *fp, char *buf);
- extern errr init_r_info_txt(FILE *fp, char *buf);
- 
- /* init.c */
--extern void init_file_paths(char *path);
-+extern void init_file_paths(char *path, char *path2);
- extern void init_some_arrays(void);
- extern void load_server_cfg(void);
- 
-diff --git a/src/server/init2.c b/src/server/init2.c
-index 00d8a01..27fd2b7 100644
---- a/server/init2.c
-+++ a/server/init2.c
-@@ -63,10 +63,11 @@
-  * to succeed even if the strings have not been allocated yet,
-  * as long as the variables start out as "NULL".
-  */
--void init_file_paths(char *path)
-+void init_file_paths(char *path, char *path2)
- {
- 	char *tail;
--
-+	char *tail2;
-+	char *tmp;
- 
- 	/*** Free everything ***/
- 
-@@ -103,6 +104,10 @@ void init_file_paths(char *path)
- 	/* Prepare to append to the Base Path */
- 	tail = path + strlen(path);
- 
-+	tmp = string_make(path2);
-+
-+	/* Prepare to append to the Base Path */
-+	tail2 = path2 + strlen(path2);
- 
- #ifdef VM
- 
-@@ -123,8 +128,8 @@ void init_file_paths(char *path)
- 	/*** Build the sub-directory names ***/
- 
- 	/* Build a path name */
--	strcpy(tail, "data");
--	ANGBAND_DIR_DATA = string_make(path);
-+	strcpy(tail2, "data");
-+	ANGBAND_DIR_DATA = string_make(path2);
- 
- 	/* Build a path name */
- 	strcpy(tail, "edit");
-@@ -147,16 +152,16 @@ void init_file_paths(char *path)
- 	ANGBAND_DIR_PREF = string_make(path);
- #endif
- 	/* Build a path name */
--	strcpy(tail, "save");
--	ANGBAND_DIR_SAVE = string_make(path);
-+	strcpy(tail2, "save");
-+	ANGBAND_DIR_SAVE = string_make(path2);
- 	
- 	/* Build a path name */
- 	strcpy(tail, "text");
- 	ANGBAND_DIR_TEXT = string_make(path);
- 
- 	/* Build a path name */
--	strcpy(tail, "user");
--	ANGBAND_DIR_USER = string_make(path);
-+	strcpy(tail2, "user");
-+	ANGBAND_DIR_USER = string_make(path2);
- #if 0
- 	/* Build a path name */
- 	strcpy(tail, "apex");
-diff --git a/src/server/main.c b/src/server/main.c
-index 4260b8d..7884b2f 100644
---- a/server/main.c
-+++ a/server/main.c
-@@ -142,6 +142,7 @@ extern unsigned _ovrbuffer = 0x1500;
- static void init_stuff(void)
- {
- 	char path[1024];
-+	char path2[1024];
- 
- #if defined(AMIGA) || defined(VM)
- 
-@@ -161,10 +162,16 @@ static void init_stuff(void)
- 	/* Hack -- Add a path separator (only if needed) */
- 	if (!suffix(path, PATH_SEP)) strcat(path, PATH_SEP);
- 
-+	/* Use the angband_path, or a default */
-+	strcpy(path2, tail ? tail : DEFAULT_PATH_W);
-+
-+	/* Hack -- Add a path separator (only if needed) */
-+	if (!suffix(path2, PATH_SEP)) strcat(path2, PATH_SEP);
-+
- #endif /* AMIGA / VM */
- 
- 	/* Initialize */
--	init_file_paths(path);
-+	init_file_paths(path, path2);
- }
- 
- /*
diff --git a/games-roguelike/mangband/files/mangband-1.1.3-strchr.patch b/games-roguelike/mangband/files/mangband-1.1.3-strchr.patch
deleted file mode 100644
index f1fa19e1191e..000000000000
--- a/games-roguelike/mangband/files/mangband-1.1.3-strchr.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/common/h-system.h b/src/common/h-system.h
-index f60bbc1..0294dd3 100644
---- a/common/h-system.h
-+++ a/common/h-system.h
-@@ -104,17 +104,6 @@
- 
- #ifdef SET_UID
- 
--# ifdef USG
--#  include <string.h>
--# else
--#  include <strings.h>
--extern char *strstr();
--extern char *strchr();
--extern char *strrchr();
--# endif
--
--#else
--
- # include <string.h>
- 
- #endif
diff --git a/games-roguelike/mangband/mangband-1.1.3.ebuild b/games-roguelike/mangband/mangband-1.1.3.ebuild
deleted file mode 100644
index 880306d0d6c0..000000000000
--- a/games-roguelike/mangband/mangband-1.1.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Online multiplayer real-time roguelike game, derived from Angband."
-HOMEPAGE="http://www.mangband.org"
-SRC_URI="http://www.mangband.org/download/${P}.tar.gz"
-
-#RESTRICT=nomirror # for ebuild debugging
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ncurses sdl X"
-
-# Remove this once we hit MAngband 1.2:
-S="${WORKDIR}/${P}"/src
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:= )
-	sdl? ( media-libs/libsdl )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-strchr.patch"
-	  "${FILESDIR}/${P}-paths.patch" )
-
-MY_DATADIR=/usr/share/"${PN}"
-MY_STATEDIR=/var/lib/"${PN}"
-MY_SYSCONFDIR=/etc
-
-src_configure() {
-	append-cflags "-DDEFAULT_PATH='\"${MY_DATADIR}\"' -DDEFAULT_PATH_W='\"${MY_STATEDIR}\"'"
-	econf \
-		$(use_with ncurses gcu) \
-		$(use_with X x11) \
-		$(use_with sdl)
-}
-
-pkg_setup() {
-	# mangband server uses own user/group:
-	enewgroup mangband
-	enewuser mangband -1 -1 -1 "mangband"
-}
-
-src_install() {
-# Newer versions of MAngband have "make install", so we could use..
-#    emake DESTDIR="${D}" install
-#    dodoc NEWS README INSTALL AUTHORS
-#..but not yet
-
-	dobin mangband mangclient
-
-	# Read-only data
-	insinto "${MY_DATADIR}"
-	doins -r "${WORKDIR}/${P}"/lib/{edit,file,help,text,xtra,user}
-
-	# Server config
-	insinto "${MY_SYSCONFDIR}"
-	doins "${WORKDIR}/${P}"/mangband.cfg
-
-	# Read-write data
-	insinto "${MY_STATEDIR}"
-	doins -r "${WORKDIR}/${P}"/lib/{data,save,user}
-
-	fowners -R mangband:mangband "${MY_STATEDIR}"/{data,save,user}
-	fperms -R 2664 "${MY_STATEDIR}"/{data,save,user}
-	fperms 2775 "${MY_STATEDIR}"/{data,save,user}
-
-	# Docs
-	#dodoc ${WORKDIR}/${P}/LICENSE
-}
-
-pkg_postinst() {
-	echo
-	elog "Make sure LibDir is either unset in ~/.mangrc or points to"
-	elog " ${MY_DATADIR} for 'mangclient' to pick it up."
-	elog "Server binary is called 'mangband', and must be run under user"
-	elog " mangband, i.e. 'sudo -u mangband mangband' "
-	echo
-}
diff --git a/games-roguelike/mangband/metadata.xml b/games-roguelike/mangband/metadata.xml
deleted file mode 100644
index 3891204b9a67..000000000000
--- a/games-roguelike/mangband/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>flambard@mangband.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/mazesofmonad-1.0.9-r3 b/games-roguelike/mazesofmonad-1.0.9-r3
new file mode 100644
index 000000000000..1496b09e7234
--- /dev/null
+++ b/games-roguelike/mazesofmonad-1.0.9-r3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm setup test
+DEPEND=>=dev-libs/gmp-5:0= virtual/libffi:= >=dev-lang/ghc-7.4.1 >=dev-haskell/cabal-1.6 dev-haskell/hunit dev-haskell/mtl dev-haskell/random dev-haskell/regex-posix dev-haskell/time-locale-compat
+DESCRIPTION=Console-based roguelike Role Playing Game similar to nethack
+EAPI=6
+HOMEPAGE=https://github.com/JPMoresmau/MazesOfMonad http://hackage.haskell.org/package/MazesOfMonad
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=dev-libs/gmp-5:0= virtual/libffi:=
+SLOT=0
+SRC_URI=mirror://hackage/packages/archive/MazesOfMonad/1.0.9/MazesOfMonad-1.0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=f1cb4f8d5b7beba762ddfeca1aa508eb
diff --git a/games-roguelike/mazesofmonad/Manifest b/games-roguelike/mazesofmonad/Manifest
deleted file mode 100644
index 79e4723cb414..000000000000
--- a/games-roguelike/mazesofmonad/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mazesofmonad-1.0.9-time-1.5.patch 968 BLAKE2B 936e9539cd25ff08670c21032320d7eebff85a3aab76bb6774a66363770f5582cd627072d467043adea485a39e139d8bcb6cc7b30e65b62118227866f7d1d5ac SHA512 e93813f3cfd1966fc6ac20d8d651242c0ae3b881ea339de07ebb815db5f7d32f7ca5263c72d68fe2281997abc1a77893a26882e75bed09dd9e3a4a64d012116f
-DIST MazesOfMonad-1.0.9.tar.gz 56342 BLAKE2B 93e2466d76804538b87b601af39916e8c39a853d11added65dc5b3408dcb19b75e50edbb3bc484de1cb6ef01de46814cd95886738025c31d271c5c2d81b80e00 SHA512 a537672907f0bf356574b5c16b9b354cc73133958873e3dfc064f9de2ad7c18bed011f811887edc37c9b40de5529f7954889953946a79da29a255637e81d9612
-EBUILD mazesofmonad-1.0.9-r3.ebuild 822 BLAKE2B 3a4b7eca0fbca1ed23151c008f412d175202755d6045f8711f50d2dd113c91c9a09e6eaa7b099897edf014b0d51e90fd299d18cdea99cab3517b79abd8321ec6 SHA512 3fa0ed0b1a089c86215e956ad305dbd72b8167de81aa79edf79829b68090fcbc87188533c1d87a81127c2545fe3e8ef1ca9da95d07694870ea63cbb3c146ffba
-MISC metadata.xml 971 BLAKE2B 05b96c3bf5c2ac7c39e93b35cb7dd7c949bfcd4ba550100ca6e2d4cf084506c538f595e03a9b427a4a0f006cd0cdeeaf923d2a874036ee741220af26c9a3ba22 SHA512 fc715d7961b2b6421e8dba76a8f81a2f0ce814fdcf9eaae45c5c4a6509e253193f440924c56786f8e291cebaf1bfd5d3dbb6675f0d016c14ea17b97beec12eab
diff --git a/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch b/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch
deleted file mode 100644
index 11ef34ef45f9..000000000000
--- a/games-roguelike/mazesofmonad/files/mazesofmonad-1.0.9-time-1.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/MazesOfMonad.cabal b/MazesOfMonad.cabal
-index db5e5bf..c3b427b 100644
---- a/MazesOfMonad.cabal
-+++ b/MazesOfMonad.cabal
-@@ -34,3 +34,3 @@ Executable mazesofmonad
-     regex-posix, containers, filepath, directory, pretty, 

--    array, mtl, old-locale, time					 

-+    array, mtl, old-locale, time, time-locale-compat 

- 

-diff --git a/src/MoresmauJP/Rpg/Save.hs b/src/MoresmauJP/Rpg/Save.hs
-index 12965b7..238b9b9 100644
---- a/src/MoresmauJP/Rpg/Save.hs
-+++ b/src/MoresmauJP/Rpg/Save.hs
-@@ -10,2 +10,3 @@ import Data.Maybe
- import Data.Time

-+import qualified Data.Time.Locale.Compat as DTLC

- 

-@@ -112,3 +113,3 @@ listGames rs name= do
-       if isJust $ bckGame bs 

--        then return $ Just (dropExtension x,formatTime defaultTimeLocale (iso8601DateFormat $ Just "%R") $ bckDate bs) 

-+        then return $ Just (dropExtension x,formatTime DTLC.defaultTimeLocale (DTLC.iso8601DateFormat $ Just "%R") $ bckDate bs) 

-         else return Nothing

diff --git a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r3.ebuild b/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r3.ebuild
deleted file mode 100644
index b2576b4387b0..000000000000
--- a/games-roguelike/mazesofmonad/mazesofmonad-1.0.9-r3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CABAL_FEATURES="bin"
-inherit eutils haskell-cabal
-
-MY_PN=MazesOfMonad
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Console-based roguelike Role Playing Game similar to nethack"
-HOMEPAGE="https://github.com/JPMoresmau/MazesOfMonad
-	http://hackage.haskell.org/package/MazesOfMonad"
-SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/gmp-5:0=
-	virtual/libffi:="
-DEPEND="${RDEPEND}
-	>=dev-lang/ghc-7.4.1
-	>=dev-haskell/cabal-1.6
-	dev-haskell/hunit
-	dev-haskell/mtl
-	dev-haskell/random
-	dev-haskell/regex-posix
-	dev-haskell/time-locale-compat
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-time-1.5.patch
-)
diff --git a/games-roguelike/mazesofmonad/metadata.xml b/games-roguelike/mazesofmonad/metadata.xml
deleted file mode 100644
index c264aaf1de4f..000000000000
--- a/games-roguelike/mazesofmonad/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<longdescription>
-		MazesOfMonad is a console-based Role Playing Game. You create
-		characters with their strong and weak points, and try to complete
-		mazes that are randomly generated. You can pick up gold and items
-		on the way, meet monsters, and deal with them as you want. You can
-		fight, use magic, bribe, trade, steal... This is only a simple game
-		that I did to see what building a full blown Haskell application
-		is like to develop. Versions 1.0.5 and above are complete
-		and working.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">JPMoresmau/MazesOfMonad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-roguelike/metadata.xml b/games-roguelike/metadata.xml
deleted file mode 100644
index 3d54b3c25841..000000000000
--- a/games-roguelike/metadata.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-roguelike category contains games which resemble Rogue's
-		style.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-roguelike enthält Spiele die sich am Stil von
-		Rogue orientieren (z.B. NetHack).
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-roguelike contiene juegos que recrean el estilo del
-		Rogue.
-	</longdescription>
-	<longdescription lang="ja">
-		games-roguelike カテゴリーにはRogueスタイルに似たゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-roguelike categorie bevat spellen die gebaseerd zijn op de
-		stijl van Rogue, zoals bijvoorbeeld NetHack.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-roguelike chứa các trò chơi dạng Rogue.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-roguelike contiene giochi che ricreano lo stile di Rogue.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-roguelike contém jogos que recriam o estilo
-		de Rogue.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-roguelike zawiera tekstowe gry cRPG podobne do Rogue.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-roguelike/moria-5.5.2 b/games-roguelike/moria-5.5.2
new file mode 100644
index 000000000000..e980791fcc21
--- /dev/null
+++ b/games-roguelike/moria-5.5.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5:0 virtual/pkgconfig
+DESCRIPTION=Rogue-like D&D curses game similar to nethack (BUT BETTER)
+EAPI=5
+HOMEPAGE=http://remarque.org/~grabiner/moria.html
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=Moria
+RDEPEND=>=sys-libs/ncurses-5:0 games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://ftp.greyhelm.com/pub/Games/Moria/source/um5.5.2.tar.Z http://www.funet.fi/pub/unix/games/moria/source/um5.5.2.tar.Z http://www.piratehaven.org/~beej/moria/mirror/Games/Moria/source/um5.5.2.tar.Z http://alge.anart.no/ftp/pub/games/RPG/moria/um5.5.2.tar.Z ftp://kane.evendata.net/pub/moria-extras.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=732bd260f21bbb62bad21fec7391510f
diff --git a/games-roguelike/moria/Manifest b/games-roguelike/moria/Manifest
deleted file mode 100644
index ddb722625a7f..000000000000
--- a/games-roguelike/moria/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 5.5.2-fbsd.patch 6904 BLAKE2B 15e6da2c394bc57e93757fed0e4a4e908a688a6b715993162cd7c8ef09cff6dd912980a157fc65fb030d9733e6e7d490f00078b9ff60e35b4bcce6fd3353afd8 SHA512 ec1c0428bd5223ee2bd5408b482941911fab6650cde1c49ff0c93262ea4203d09502a5bb5fda1ee66588935faccc9c1f0a738c337f8af92a63467238d91f6d8d
-AUX 5.5.2-gentoo-paths.patch 2363 BLAKE2B 415de0a817ed6bac0ee4a260722576b99bccb69176ea8f46d2c21d01488d8000916580b3ca435e9cd7b9be1c066111a3033ab2767578640abd01613539d14a65 SHA512 41789167d9e624e0ca2d800bb87851a5e9628b51cc80cc84ca15c974f394d99101ea9cc6bde361b1c2187a3983b5d2291ca15cdbae04499687fd9785e017c32c
-AUX 5.5.2-glibc.patch 9796 BLAKE2B 73349021d2ebeff5ad946548ab320df211b73d62edefe42a3004a6d1dae103247939274ec7ae5b02ec36af24f8ac7b38ea2cb7eab1e0d4045d76f650ff46bab2 SHA512 834e3b4521ac00e8367abd3c5e5eefe7859f36f0182794911936006224c9fac94b6e4beae1da73c228e1e434d02cf870fc69f6102b981c78916c204a6eea101d
-AUX 5.5.2-hours.patch 1343 BLAKE2B ca82cb17fad83c3be5cf063e0f13c3c635e63c6d8de7777ee454d4057f26ededfcec03aa7115c61a52242f01afc187fe0cfcb7f0b1de2064ea0602804011c3b3 SHA512 2b59e37741664dcfc095a5ae9ac482d6899d71f8221ca0f7d9d1caee594f05ac2ef043a6ff983e5266b904afa725876210d07b02352921066271f35e2efe7047
-AUX 5.5.2-warnings.patch 386 BLAKE2B aabef11e0c2b2869a9f45c538cdbc84389a6a3cbdceb6a6e9697ffe7a010483e740dc5c192ded489620ff7049baf4b58b6a560c75b9843bc63812e00c79c7615 SHA512 64bd3e7a0c613ca3043ea0a4aa4aab83281132af16d73e9ed70f1d5ff979b48cf1f085a030c56f0c17be01bbabb2dd4d9dcbd02d4a204993adec3fd01f03ab5c
-DIST moria-extras.tar.bz2 57324 BLAKE2B 7a885e5595c8c3a3d0a29c65729e03ab1d26ad514b96a1d078a436960c1245283a51544dc54c6a5f225b77da3c3a72f8c7407efeac2b0629d51330b3abf9af49 SHA512 39d04ffdbe779fc070ee72084df5c731f8db25116e9156898d4c78c86e02288cf3560849461f2081209a06a74274789a671b104dc806b63a0d955adad17fd85f
-DIST um5.5.2.tar.Z 910536 BLAKE2B d36d5cbb45992937f8e7c2f98cf2ad568e11e2d2b1af107e77ba98d8cfc23f2f4bcdb43ab9d5a9dd05e0ec45a5ecd298a1c4c7307bc0f75ca629c9c63cf9d3bb SHA512 987bbccb9cb4870ec91704cd20cf19875320d1cfe62c4c5a0063bfc3827732a0e3334a4ea3712137f3262d7418db0ea7e803d724e2dec4d5eb41ebe741f326cc
-EBUILD moria-5.5.2.ebuild 1932 BLAKE2B 3fd63796fddf7bd31bb29b3357b3f30979d41bcac3cdcc561292483d831efa77f1ecacee65588e08ccd6649901b7c15b6d0aa4e8af20c989ff38b3ab16acec9d SHA512 b883196bf18634f9b576e7bb147a0fcaf0fb77823b74ee0ed04a39e7172a97e0d3ada1db9d9f3228f7a59d7b9510b3df73fc04448782834e53b005a69fd7391e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/moria/files/5.5.2-fbsd.patch b/games-roguelike/moria/files/5.5.2-fbsd.patch
deleted file mode 100644
index 4f65b08f567d..000000000000
--- a/games-roguelike/moria/files/5.5.2-fbsd.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-Index: umoria/source/main.c
-===================================================================
---- umoria.orig/source/main.c
-+++ umoria/source/main.c
-@@ -88,6 +88,7 @@
- #include <time.h>
- #endif
- 
-+#ifndef __FreeBSD__
- #ifndef VMS
- #ifndef MAC
- #ifndef GEMDOS
-@@ -98,6 +99,9 @@ long time();
- char *getenv();
- #endif
- #endif
-+#else
-+#include <stdlib.h>
-+#endif
- 
- #ifndef MAC
- #ifndef AMIGA
-@@ -360,7 +364,7 @@ char *argv[];
-   else
-     {	  /* Create character	   */
-       create_character();
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
-       birth_date = time ((time_t *)0);
- #else
-       birth_date = time ((long *)0);
-Index: umoria/source/death.c
-===================================================================
---- umoria.orig/source/death.c
-+++ umoria/source/death.c
-@@ -123,6 +123,7 @@ static void kingly(void);
- #include <stdlib.h>
- #endif
- 
-+#ifndef __FreeBSD__
- #ifndef VMS
- #ifndef MAC
- #if !defined(ATARIST_MWC) && !defined(AMIGA)
-@@ -130,18 +131,19 @@ long time();
- #endif
- #endif
- #endif
-+#endif
- 
- static void date(day)
- char *day;
- {
-   register char *tmp;
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
-   time_t clockvar;
- #else
-   long clockvar;
- #endif
- 
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
-   clockvar = time((time_t *) 0);
- #else
-   clockvar = time((long *) 0);
-Index: umoria/source/io.c
-===================================================================
---- umoria.orig/source/io.c
-+++ umoria/source/io.c
-@@ -13,6 +13,11 @@
- 
- #include "config.h"
- 
-+#ifdef __FreeBSD__
-+#include <sys/ioctl_compat.h>
-+#include <time.h>
-+#endif
-+
- #ifdef HPUX
- #include <sys/bsdtty.h>
- #endif
-@@ -245,7 +250,9 @@ int suspend()
-   struct ltchars lcbuf;
-   struct tchars cbuf;
-   int lbuf;
-+#ifndef __FreeBSD__
-   long time();
-+#endif
- 
-   py.misc.male |= 2;
-   (void) ioctl(0, TIOCGETP, (char *)&tbuf);
-@@ -313,7 +320,7 @@ void init_curses()
- #endif
- 
-   /* PC curses returns ERR */
--#if defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)
-+#if (defined(USG) && !defined(PC_CURSES) && !defined(AMIGA)) || defined(__FreeBSD__)
-   if (initscr() == NULL)
- #else
-   if (initscr() == ERR)
-@@ -331,7 +338,7 @@ void init_curses()
- #if defined(atarist) && defined(__GNUC__)
-   (void) signal (SIGTSTP, (__Sigfunc)suspend);
- #else
--#ifdef  __386BSD__
-+#if defined(__386BSD__) || defined(__FreeBSD__)
-   (void) signal (SIGTSTP, (sig_t)suspend);
- #else
-   (void) signal (SIGTSTP, suspend);
-@@ -757,7 +764,7 @@ void shell_out()
-       msg_print("Fork failed. Try again.");
-       return;
-     }
--#if defined(USG) || defined(__386BSD__)
-+#if defined(USG) || defined(__386BSD__) || defined(__FreeBSD__)
-   (void) wait((int *) 0);
- #else
-   (void) wait((union wait *) 0);
-Index: umoria/source/misc1.c
-===================================================================
---- umoria.orig/source/misc1.c
-+++ umoria/source/misc1.c
-@@ -28,7 +28,7 @@
- #endif
- #endif
- 
--#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA)
-+#if !defined(ATARIST_MWC) && !defined(MAC) && !defined(VMS) && !defined(AMIGA) && !defined(__FreeBSD__)
- long time();
- #endif
- struct tm *localtime();
-@@ -45,7 +45,7 @@ int32u seed;
-   register int32u clock_var;
- 
-   if (seed == 0)
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
-     clock_var = time((time_t *)0);
- #else
-     clock_var = time((long *)0);
-@@ -89,10 +89,14 @@ void reset_seed()
- int check_time()
- {
- #ifdef MORIA_HOU
-+#if defined(MAC) || defined(__FreeBSD__)
-+  time_t clock_var;
-+#else
-   long clock_var;
-+#endif
-   register struct tm *tp;
- 
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
-   clock_var = time((time_t *)0);
- #else
-   clock_var = time((long *)0);
-Index: umoria/source/save.c
-===================================================================
---- umoria.orig/source/save.c
-+++ umoria/source/save.c
-@@ -102,7 +102,7 @@ static void rd_monster();
- #endif
- 
- #if !defined(ATARIST_MWC)
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
- #include <time.h>
- #else
- long time();
-@@ -331,7 +331,7 @@ static int sv_write()
-     }
- 
-   /* save the current time in the savefile */
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
-   l = time((time_t *)0);
- #else
-   l = time((long *)0);
-@@ -1029,7 +1029,7 @@ int *generate;
- 	      || (version_min == 2 && patch_level >= 2))
- 	    rd_long ((int32u *)&birth_date);
- 	  else
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
- 	    birth_date = time((time_t *)0);
- #else
- 	    birth_date = time((long *)0);
-@@ -1253,7 +1253,7 @@ scoreboard; it will not be scored again.
- 	      /* rotate store inventory, depending on how old the save file */
- 	      /* is foreach day old (rounded up), call store_maint */
- 	      /* calculate age in seconds */
--#ifdef MAC
-+#if defined(MAC) || defined(__FreeBSD__)
- 	      start_time = time((time_t *)0);
- #else
- 	      start_time = time((long *)0);
-Index: umoria/source/signals.c
-===================================================================
---- umoria.orig/source/signals.c
-+++ umoria/source/signals.c
-@@ -89,7 +89,7 @@ static int signal_count = 0;
- 
- /*ARGSUSED*/
- #ifndef USG
--#ifdef __386BSD__
-+#if defined(__386BSD__) || defined(__FreeBSD__)
- static void signal_handler(sig, code, scp)
- #else
- static int signal_handler(sig, code, scp)
-@@ -217,7 +217,7 @@ void signals()
- #if defined(atarist) && defined(__GNUC__)
-   (void) signal(SIGTSTP, (__Sigfunc)suspend);
- #else
--#ifdef  __386BSD__
-+#if defined(__386BSD__) || defined(__FreeBSD__)
-   (void) signal(SIGTSTP, (sig_t)suspend);
- #else
-   (void) signal(SIGTSTP, suspend);
-Index: umoria/source/types.h
-===================================================================
---- umoria.orig/source/types.h
-+++ umoria/source/types.h
-@@ -6,11 +6,20 @@
-    not for profit purposes provided that this copyright and statement are
-    included in all such copies. */
- 
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+typedef u_int32_t int32u;
-+typedef int32_t   int32;
-+typedef u_int16_t int16u;
-+typedef int16_t   int16;
-+typedef u_int8_t  int8u;
-+#else
- typedef unsigned long  int32u;
- typedef long	       int32;
- typedef unsigned short int16u;
- typedef short	       int16;
- typedef unsigned char  int8u;
-+#endif
- /* some machines will not accept 'signed char' as a type, and some accept it
-    but still treat it like an unsigned character, let's just avoid it,
-    any variable which can ever hold a negative value must be 16 or 32 bits */
-Index: umoria/unix/unix.c
-===================================================================
---- umoria.orig/unix/unix.c
-+++ umoria/unix/unix.c
-@@ -14,6 +14,10 @@
- /* defines TRUE and FALSE */
- #include <curses.h>
- 
-+#ifdef __FreeBSD__
-+#include <unistd.h>
-+#endif
-+
- #include "config.h"
- #include "constant.h"
- #include "types.h"
-@@ -276,7 +280,9 @@ int getuid();
- void user_name(buf)
- char *buf;
- {
-+#ifndef __FreeBSD__
-   extern char *getlogin();
-+#endif
-   struct passwd *pwline;
-   register char *p;
- 
diff --git a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch b/games-roguelike/moria/files/5.5.2-gentoo-paths.patch
deleted file mode 100644
index 5ce4ce4d2b4d..000000000000
--- a/games-roguelike/moria/files/5.5.2-gentoo-paths.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- umoria/unix/Makefile.orig	2003-12-31 14:52:58.583335976 -0500
-+++ umoria/unix/Makefile	2003-12-31 14:51:54.621059720 -0500
-@@ -3,6 +3,7 @@
- # LIBDIR must be the same directory defined in config.h
- # OWNER is who you want the game to be chown to.
- # GROUP is who you wnat the game to be chgrp to.
-+STATEDIR = /var/lib
- BINDIR = /home/zariski/grabiner/moria
- LIBDIR = /home/zariski/grabiner/moria/files
- OWNER = grabiner
-@@ -65,12 +66,11 @@
- 	chmod 4711 $(BINDIR)/moria
- 	chmod 711 $(LIBDIR)
- 	(cd files; cp $(LIBFILES) $(LIBDIR))
--	(cd $(LIBDIR); chmod 444 $(LIBFILES))
--	(cd $(LIBDIR); touch scores; chmod 644 scores)
-+	(cd $(STATEDIR); touch moriascores; chmod 664 moriascores; chown $(OWNER) moriascores; chgrp $(GROUP) moriascores)
- 	chown $(OWNER) $(BINDIR)/moria
- 	chgrp $(GROUP) $(BINDIR)/moria
--	(cd $(LIBDIR); chown $(OWNER) $(LIBFILES) scores)
--	(cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES) scores)
-+	(cd $(LIBDIR); chown $(OWNER) $(LIBFILES))
-+	(cd $(LIBDIR); chgrp $(GROUP) $(LIBFILES))
- # If you are short on disk space, or aren't interested in debugging moria.
- #	strip $(BINDIR)/moria
- 
---- umoria/source/config.h.orig	2003-12-31 15:19:48.893531616 -0500
-+++ umoria/source/config.h	2003-12-31 15:21:09.584264760 -0500
-@@ -199,17 +199,18 @@
- #else
- 
- /* This must be unix; change MORIA_LIB as appropriate.  */
--#define MORIA_SAV	"moria.save"
--#define MORIA_LIB(xxx)  "/home/math/grabiner/moria/files/xxx"
--#define MORIA_HOU	MORIA_LIB(hours)
--#define MORIA_MOR	MORIA_LIB(news)
--#define MORIA_TOP	MORIA_LIB(scores)
--#define MORIA_HELP	MORIA_LIB(roglcmds.hlp)
--#define MORIA_ORIG_HELP	MORIA_LIB(origcmds.hlp)
--#define MORIA_WIZ_HELP	MORIA_LIB(rwizcmds.hlp)
--#define MORIA_OWIZ_HELP	MORIA_LIB(owizcmds.hlp)
--#define MORIA_WELCOME	MORIA_LIB(welcome.hlp)
--#define MORIA_VER	MORIA_LIB(version.hlp)
-+#define MORIA_SAV	".moria.save"
-+#define MORIA_LIB(xxx)  "GENTOO_DATADIR/" xxx
-+#define MORIA_STATE(xxx) "GENTOO_STATEDIR/" xxx
-+#define MORIA_HOU	MORIA_LIB("hours")
-+#define MORIA_MOR	MORIA_LIB("news")
-+#define MORIA_TOP	MORIA_STATE("moriascores")
-+#define MORIA_HELP	MORIA_LIB("roglcmds.hlp")
-+#define MORIA_ORIG_HELP	MORIA_LIB("origcmds.hlp")
-+#define MORIA_WIZ_HELP	MORIA_LIB("rwizcmds.hlp")
-+#define MORIA_OWIZ_HELP	MORIA_LIB("owizcmds.hlp")
-+#define MORIA_WELCOME	MORIA_LIB("welcome.hlp")
-+#define MORIA_VER	MORIA_LIB("version.hlp")
- 
- #endif
- #endif
diff --git a/games-roguelike/moria/files/5.5.2-glibc.patch b/games-roguelike/moria/files/5.5.2-glibc.patch
deleted file mode 100644
index 55e4e5de2b14..000000000000
--- a/games-roguelike/moria/files/5.5.2-glibc.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-diff -Naur common-orig/Makefile umoria/unix/Makefile
---- common-orig/Makefile	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/unix/Makefile	2003-12-09 10:07:12.000000000 -0500
-@@ -14,9 +14,9 @@
- CFLAGS = -O
- 
- # For BSD Systems
--CURSES = -lcurses -ltermcap
-+# CURSES = -lcurses -ltermcap
- # For SYS V Systems
--# CURSES = -lcurses
-+CURSES = `pkg-config ncurses --libs`
- # For XENIX, some XENIX systems may need -ltinfo
- # CURSES = -ltcap -ltermcap -lx
- 
-diff -Naur common-orig/death.c umoria/source/death.c
---- common-orig/death.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/source/death.c	2003-12-09 10:06:56.000000000 -0500
-@@ -175,10 +175,12 @@
- /* The following code is provided especially for systems which		-CJS-
-    have no flock system call. It has never been tested.		*/
- 
-+#ifndef LOCK_EX
- #define LOCK_EX	1
- #define LOCK_SH	2
- #define LOCK_NB	4
- #define LOCK_UN	8
-+#endif
- 
- /* An flock HACK.  LOCK_SH and LOCK_EX are not distinguished.  DO NOT release
-    a lock which you failed to set!  ALWAYS release a lock you set! */
-diff -Naur common-orig/io.c umoria/source/io.c
---- common-orig/io.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/source/io.c	2003-12-09 10:06:56.000000000 -0500
-@@ -62,6 +62,7 @@
- 
- 
- #include <ctype.h>
-+#include <termios.h>
- 
- #if defined(SYS_V) && defined(lint)
- /* for AIX, prevent hundreds of unnecessary lint errors, must define before
-@@ -334,7 +335,9 @@
- #ifdef  __386BSD__
-   (void) signal (SIGTSTP, (sig_t)suspend);
- #else
--  (void) signal (SIGTSTP, suspend);
-+  /* (void) signal (SIGTSTP, suspend); */
-+  /* libc6 defaults to BSD, this expects SYSV */
-+  (void) sysv_signal (SIGTSTP, suspend);
- #endif
- #endif
- #endif
-diff -Naur common-orig/misc3.c umoria/source/misc3.c
---- common-orig/misc3.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/source/misc3.c	2003-12-09 10:06:56.000000000 -0500
-@@ -1249,8 +1249,7 @@
- {
-   int i;
-   register inven_type *i_ptr;
--  vtype prt2;
--  bigvtype prt1;
-+  bigvtype prt1, prt2;
- #ifdef ATARIST_MWC
-   int32u holder;
- #endif
-diff -Naur common-orig/misc4.c umoria/source/misc4.c
---- common-orig/misc4.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/source/misc4.c	2003-12-09 10:06:56.000000000 -0500
-@@ -33,7 +33,7 @@
- void scribe_object()
- {
-   int item_val, j;
--  vtype out_val, tmp_str;
-+  bigvtype out_val, tmp_str;
- 
-   if (inven_ctr > 0 || equip_ctr > 0)
-     {
-diff -Naur common-orig/moria1.c umoria/source/moria1.c
---- common-orig/moria1.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/source/moria1.c	2003-12-09 10:06:56.000000000 -0500
-@@ -332,8 +332,8 @@
- 	{
- 	  objdes(tmp_val, &inventory[i], TRUE);
- 	  tmp_val[lim] = 0;	 /* Truncate if too long. */
--	  (void) sprintf(out_val[i], "  %c) %s", 'a'+i, tmp_val);
--	  l = strlen(out_val[i]);
-+	  (void) sprintf(out_val[i], "%c) %s", 'a'+i, tmp_val);
-+	  l = strlen(out_val[i]) + 2;
- 	  if (weight)
- 	    l += 9;
- 	  if (l > len)
-@@ -352,9 +352,12 @@
- 	{
- 	  /* don't need first two spaces if in first column */
- 	  if (col == 0)
--	    prt(&out_val[i][2], current_line, col);
--	  else
- 	    prt(out_val[i], current_line, col);
-+	  else
-+	    {
-+	      put_buffer("  ", current_line, col);
-+	      prt(out_val[i], current_line, col+2);
-+	    }
- 	  if (weight)
- 	    {
- 	      total_weight = inventory[i].weight*inventory[i].number;
-@@ -466,9 +469,9 @@
- 	    }
- 	  objdes(prt2, &inventory[i], TRUE);
- 	  prt2[lim] = 0; /* Truncate if necessary */
--	  (void) sprintf(out_val[line], "  %c) %-14s: %s", line+'a',
--			 prt1, prt2);
--	  l = strlen(out_val[line]);
-+	  (void) sprintf(out_val[line], "%c) %-14s: %s", line+'a',
-+	    prt1, prt2);
-+	  l = strlen(out_val[line]) + 2;
- 	  if (weight)
- 	    l += 9;
- 	  if (l > len)
-@@ -488,9 +491,12 @@
- 	{
- 	  /* don't need first two spaces when using whole screen */
- 	  if (col == 0)
--	    prt(&out_val[line][2], line+1, col);
--	  else
- 	    prt(out_val[line], line+1, col);
-+	  else
-+	    {
-+	      put_buffer("  ", line+1, col);
-+	      prt(out_val[line], line+1, col+2);
-+	    }
- 	  if (weight)
- 	    {
- 	      total_weight = i_ptr->weight*i_ptr->number;
-diff -Naur common-orig/signals.c umoria/source/signals.c
---- common-orig/signals.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/source/signals.c	2003-12-09 10:06:56.000000000 -0500
-@@ -113,7 +113,11 @@
-   if(error_sig >= 0)	/* Ignore all second signals. */
-     {
-       if(++signal_count > 10)	/* Be safe. We will die if persistent enough. */
-+#ifdef __FreeBSD__
- 	(void) signal(sig, SIG_DFL);
-+#else
-+	(void) sysv_signal(sig, SIG_DFL);
-+#endif
-       return;
-     }
-   error_sig = sig;
-@@ -126,7 +126,11 @@
-       )
-     {
-       if (death)
-+#ifdef __FreeBSD__
- 	(void) signal(sig, SIG_IGN);		/* Can't quit after death. */
-+#else
-+	(void) sysv_signal(sig, SIG_IGN);		/* Can't quit after death. */
-+#endif
-       else if (!character_saved && character_generated)
- 	{
- 	  if (!get_check("Really commit *Suicide*?"))
-@@ -137,7 +137,11 @@
- 	      put_qio();
- 	      error_sig = -1;
- #ifdef USG
-+#ifdef __FreeBSD__
- 	      (void) signal(sig, signal_handler);/* Have to restore handler. */
-+#else
-+	      (void) sysv_signal(sig, signal_handler);/* Have to restore handler. */
-+#endif
- #else
- 	      (void) sigsetmask(smask);
- #endif
-@@ -179,7 +179,11 @@
-   restore_term();
- #if !defined(MSDOS) && !defined(AMIGA) && !defined(ATARIST_TC)
-   /* always generate a core dump */
-+#ifdef __FreeBSD__
-   (void) signal(sig, SIG_DFL);
-+#else
-+  (void) sysv_signal(sig, SIG_DFL);
-+#endif
-   (void) kill(getpid(), sig);
-   (void) sleep(5);
- #endif
-@@ -199,7 +199,11 @@
- #if defined(atarist) && defined(__GNUC__)
-   (void) signal(SIGTSTP, (__Sigfunc)SIG_IGN);
- #else
-+#ifdef __FreeBSD__
-   (void) signal(SIGTSTP, SIG_IGN);
-+#else
-+  (void) sysv_signal(SIGTSTP, SIG_IGN);
-+#endif
- #endif
- #ifndef USG
-   mask = sigsetmask(0);
-@@ -220,7 +220,11 @@
- #ifdef  __386BSD__
-   (void) signal(SIGTSTP, (sig_t)suspend);
- #else
-+#ifdef __FreeBSD__
-   (void) signal(SIGTSTP, suspend);
-+#else
-+  (void) sysv_signal(SIGTSTP, suspend);
-+#endif
- #endif
- #endif
- #ifndef USG
-@@ -237,7 +237,11 @@
- {
- #if !defined(ATARIST_MWC) && !defined(ATARIST_TC)
-   /* No signals for Atari ST compiled with MWC or TC.  */
-+#ifdef __FreeBSD__
-   (void) signal(SIGINT, signal_handler);
-+#else
-+  (void) sysv_signal(SIGINT, signal_handler);
-+#endif
- 
- #if defined(atarist) && defined(__GNUC__)
-   /* Atari ST compiled with GNUC has most signals, but we need a cast
-@@ -259,8 +259,13 @@
- 
- #else
-   /* Everybody except the atari st.  */
-+#ifdef __FreeBSD__
-   (void) signal(SIGINT, signal_handler);
-   (void) signal(SIGFPE, signal_handler);
-+#else
-+  (void) sysv_signal(SIGINT, signal_handler);
-+  (void) sysv_signal(SIGFPE, signal_handler);
-+#endif
- 
- #if defined(MSDOS)
-   /* many fewer signals under MSDOS */
-@@ -278,30 +278,61 @@
- 
-   /* Everybody except Atari, MSDOS, and Amiga.  */
-   /* Ignore HANGUP, and let the EOF code take care of this case. */
-+#ifdef __FreeBSD__
-   (void) signal(SIGHUP, SIG_IGN);
-   (void) signal(SIGQUIT, signal_handler);
-   (void) signal(SIGILL, signal_handler);
-   (void) signal(SIGTRAP, signal_handler);
-   (void) signal(SIGIOT, signal_handler);
-+#else
-+  (void) sysv_signal(SIGHUP, SIG_IGN);
-+  (void) sysv_signal(SIGQUIT, signal_handler);
-+  (void) sysv_signal(SIGILL, signal_handler);
-+  (void) sysv_signal(SIGTRAP, signal_handler);
-+  (void) sysv_signal(SIGIOT, signal_handler);
-+#endif
- #ifdef SIGEMT  /* in BSD systems */
-   (void) signal(SIGEMT, signal_handler);
- #endif
- #ifdef SIGDANGER /* in SYSV systems */
-   (void) signal(SIGDANGER, signal_handler);
- #endif
-+#ifdef __FreeBSD__
-   (void) signal(SIGKILL, signal_handler);
-   (void) signal(SIGBUS, signal_handler);
-   (void) signal(SIGSEGV, signal_handler);
-+#else
-+  (void) sysv_signal(SIGKILL, signal_handler);
-+  (void) sysv_signal(SIGBUS, signal_handler);
-+  (void) sysv_signal(SIGSEGV, signal_handler);
-+#endif
- #ifdef SIGSYS
-+#ifdef __FreeBSD__
-   (void) signal(SIGSYS, signal_handler);
-+#else
-+  (void) sysv_signal(SIGSYS, signal_handler);
-+#endif
- #endif
-+#ifdef __FreeBSD__
-   (void) signal(SIGTERM, signal_handler);
-   (void) signal(SIGPIPE, signal_handler);
-+#else
-+  (void) sysv_signal(SIGTERM, signal_handler);
-+  (void) sysv_signal(SIGPIPE, signal_handler);
-+#endif
- #ifdef SIGXCPU	/* BSD */
-+#ifdef __FreeBSD__
-   (void) signal(SIGXCPU, signal_handler);
-+#else
-+  (void) sysv_signal(SIGXCPU, signal_handler);
-+#endif
- #endif
- #ifdef SIGPWR /* SYSV */
-+#ifdef __FreeBSD__
-   (void) signal(SIGPWR, signal_handler);
-+#else
-+  (void) sysv_signal(SIGPWR, signal_handler);
-+#endif
- #endif
- #endif
- #endif
-@@ -314,7 +314,11 @@
- #if !defined(ATARIST_MWC)
-   (void) signal(SIGINT, SIG_IGN);
- #ifdef SIGQUIT
-+#ifdef __FreeBSD__
-   (void) signal(SIGQUIT, SIG_IGN);
-+#else
-+  (void) sysv_signal(SIGQUIT, SIG_IGN);
-+#endif
- #endif
- #endif
- }
-@@ -324,7 +324,11 @@
- #if !defined(ATARIST_MWC)
-   (void) signal(SIGINT, SIG_DFL);
- #ifdef SIGQUIT
-+#ifdef __FreeBSD__
-   (void) signal(SIGQUIT, SIG_DFL);
-+#else
-+  (void) sysv_signal(SIGQUIT, SIG_DFL);
-+#endif
- #endif
- #endif
- }
-@@ -335,13 +335,21 @@
- #if defined(atarist) && defined(__GNUC__)
-   (void) signal(SIGINT, (__Sigfunc)signal_handler);
- #else
-+#ifdef __FreeBSD__
-   (void) signal(SIGINT, signal_handler);
-+#else
-+  (void) sysv_signal(SIGINT, signal_handler);
-+#endif
- #endif
- #ifdef SIGQUIT
- #if defined(atarist) && defined(__GNUC__)
-   (void) signal(SIGQUIT, (__Sigfunc)signal_handler);
- #else
-+#ifdef __FreeBSD__
-   (void) signal(SIGQUIT, signal_handler);
-+#else
-+  (void) sysv_signal(SIGQUIT, signal_handler);
-+#endif
- #endif
- #endif
- #endif
-diff -Naur common-orig/unix.c umoria/unix/unix.c
---- common-orig/unix.c	2003-12-09 10:06:19.000000000 -0500
-+++ umoria/unix/unix.c	2003-12-09 10:06:56.000000000 -0500
-@@ -261,7 +261,7 @@
- #endif
- 
- #ifdef USG
--unsigned short getuid();
-+/* unsigned short getuid(); */
- #else
- #ifndef SECURE
- #ifdef BSD4_3
diff --git a/games-roguelike/moria/files/5.5.2-hours.patch b/games-roguelike/moria/files/5.5.2-hours.patch
deleted file mode 100644
index 3d1c329d9b9b..000000000000
--- a/games-roguelike/moria/files/5.5.2-hours.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ru umoria.orig/source/files.c umoria/source/files.c
---- umoria.orig/source/files.c	1994-07-21 21:47:22.000000000 -0400
-+++ umoria/source/files.c	2010-05-05 14:51:44.334588483 -0400
-@@ -130,19 +130,19 @@
- 	if (strlen(in_line) > 3)
- 	  {
- 	    if (!strncmp(in_line, "SUN:", 4))
--	      (void) strcpy(days[0], in_line);
-+	      (void) snprintf(days[0], sizeof(days[0]), "%s", in_line);
- 	    else if (!strncmp(in_line, "MON:", 4))
--	      (void) strcpy(days[1], in_line);
-+	      (void) snprintf(days[1], sizeof(days[0]), "%s", in_line);
- 	    else if (!strncmp(in_line, "TUE:", 4))
--	      (void) strcpy(days[2], in_line);
-+	      (void) snprintf(days[2], sizeof(days[0]), "%s", in_line);
- 	    else if (!strncmp(in_line, "WED:", 4))
--	      (void) strcpy(days[3], in_line);
-+	      (void) snprintf(days[3], sizeof(days[0]), "%s", in_line);
- 	    else if (!strncmp(in_line, "THU:", 4))
--	      (void) strcpy(days[4], in_line);
-+	      (void) snprintf(days[4], sizeof(days[0]), "%s", in_line);
- 	    else if (!strncmp(in_line, "FRI:", 4))
--	      (void) strcpy(days[5], in_line);
-+	      (void) snprintf(days[5], sizeof(days[0]), "%s", in_line);
- 	    else if (!strncmp(in_line, "SAT:", 4))
--	      (void) strcpy(days[6], in_line);
-+	      (void) snprintf(days[6], sizeof(days[0]), "%s", in_line);
- 	  }
-       (void) fclose(file1);
-     }
diff --git a/games-roguelike/moria/files/5.5.2-warnings.patch b/games-roguelike/moria/files/5.5.2-warnings.patch
deleted file mode 100644
index 33a2762b99d0..000000000000
--- a/games-roguelike/moria/files/5.5.2-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru umoria.orig/unix/unix.c umoria/unix/unix.c
---- umoria.orig/unix/unix.c	2014-11-01 02:45:07.375535783 -0400
-+++ umoria/unix/unix.c	2014-11-01 02:45:58.575820065 -0400
-@@ -315,7 +315,7 @@
- 
- 	  user[0] = '\0';
- 	  file++;
--	  while (*file != '/' && i < sizeof(user))
-+	  while (*file != '/' && i < sizeof(user) - 1)
- 	    user[i++] = *file++;
- 	  user[i] = '\0';
- 	  if (i == 0)
diff --git a/games-roguelike/moria/metadata.xml b/games-roguelike/moria/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-roguelike/moria/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/moria/moria-5.5.2.ebuild b/games-roguelike/moria/moria-5.5.2.ebuild
deleted file mode 100644
index e135a2f7d915..000000000000
--- a/games-roguelike/moria/moria-5.5.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs games
-
-DESCRIPTION="Rogue-like D&D curses game similar to nethack (BUT BETTER)"
-HOMEPAGE="http://remarque.org/~grabiner/moria.html"
-SRC_URI="ftp://ftp.greyhelm.com/pub/Games/Moria/source/um${PV}.tar.Z
-	http://www.funet.fi/pub/unix/games/moria/source/um${PV}.tar.Z
-	http://www.piratehaven.org/~beej/moria/mirror/Games/Moria/source/um${PV}.tar.Z
-	http://alge.anart.no/ftp/pub/games/RPG/moria/um${PV}.tar.Z
-	ftp://kane.evendata.net/pub/${PN}-extras.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=sys-libs/ncurses-5:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/umoria
-
-src_prepare() {
-	local f
-
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo-paths.patch \
-		"${FILESDIR}"/${PV}-glibc.patch \
-		"${FILESDIR}"/${PV}-fbsd.patch \
-		"${FILESDIR}"/${PV}-hours.patch \
-		"${FILESDIR}"/${PV}-warnings.patch
-
-	for f in source/* unix/* ; do
-		ln -s ${f} $(basename ${f})
-	done
-
-	sed -i \
-		-e "s:David Grabiner:root:" \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
-		-e "s:GENTOO_STATEDIR:${GAMES_STATEDIR}:" \
-		config.h || die
-	{
-		echo "#include <stdlib.h>"
-		echo "#include <stdio.h>"
-	} >> config.h || die
-	sed -i \
-		-e "/^STATEDIR =/s:=.*:=\$(DESTDIR)${GAMES_STATEDIR}:" \
-		-e "/^BINDIR = /s:=.*:=\$(DESTDIR)${GAMES_BINDIR}:" \
-		-e "/^LIBDIR = /s:=.*:=\$(DESTDIR)${GAMES_DATADIR}/${PN}:" \
-		-e "/^CFLAGS = /s:=.*:=${CFLAGS}:" \
-		-e "/^OWNER = /s:=.*:=${GAMES_USER}:" \
-		-e "/^GROUP = /s:=.*:=${GAMES_GROUP}:" \
-		-e "/^CC = /s:=.*:=$(tc-getCC):" \
-		-e '/^LFLAGS = /s:=.*:= $(LDFLAGS):' \
-		Makefile || die
-	mv doc/moria.6 "${S}" || die
-}
-
-src_install() {
-	dodir "${GAMES_BINDIR}" "${GAMES_DATADIR}/${PN}" "${GAMES_STATEDIR}"
-	emake DESTDIR="${D}" install
-
-	doman moria.6
-	dodoc README doc/* "${WORKDIR}"/${PN}-extras/*
-
-	prepgamesdirs
-}
diff --git a/games-roguelike/nethack-3.6.0-r3 b/games-roguelike/nethack-3.6.0-r3
new file mode 100644
index 000000000000..905143bae66c
--- /dev/null
+++ b/games-roguelike/nethack-3.6.0-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare setup
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt ) virtual/pkgconfig X? ( x11-base/xorg-proto x11-apps/bdftopcf x11-apps/mkfontdir )
+DESCRIPTION=The ultimate old-school single player dungeon exploration game
+EAPI=6
+HOMEPAGE=https://www.nethack.org/
+IUSE=experimental X
+KEYWORDS=~amd64 ~arm ~hppa ~x86 ~x86-fbsd
+LICENSE=nethack
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt )
+SLOT=0
+SRC_URI=mirror://sourceforge/nethack/nethack-360-src.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=69ad774bf522f78dc0757234d1787b2b
diff --git a/games-roguelike/nethack/Manifest b/games-roguelike/nethack/Manifest
deleted file mode 100644
index b9e46217d4d6..000000000000
--- a/games-roguelike/nethack/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX nethack-3.6.0-hint-tty 258 BLAKE2B f8a00f5a238bb9a1a5a7f94c3a9ef71c7fed0b3e17c7ae09b0ea9922963f66579bea155c83fa881a48c9086c001e5219d1e6d77f2d81b1d298f3802e855d293d SHA512 112769bd68cb65f26604c084a0820eb9ab006a84f3bc754d43122d084b731746238b23beadff0bbd0dcaf39bfe009d466d3d355aeee7ad53939dc1974fe54531
-AUX nethack-3.6.0-hint-x11 412 BLAKE2B 466e716dc691dd99624196addf2d14a4ee7296d55f83093b17a9603f986b7b2ecfebdcda24db6c8d800245ac0175df34a5a6a185c767ffc8b2e1bb5eea39ecfb SHA512 7046791f17f5abc066b378af69f49d045f7533f794337e238400b98b5b5e6b518bb89d86dfe14828b54d0744d5cdd2ff5435fa7f1cacad92f3dd7caf643243ed
-AUX nethack-3.6.0-nethackrc 2458 BLAKE2B a051f476ffed8fb1598c65f243df3aa412a4bb35e904ba1d38059313491e3c36eb87c72a985a2b391760c0be72cd064cd4fef37a393c4dab9baa152b54e92c21 SHA512 9aae0d8ea3352b6335339fe91f5e52eb597f82e8fe50e0a52270e918123a02629610dda173419f6fc6e8f1e68358364bc5d8450e185b64c96d790790b68dddb9
-AUX nethack-3.6.0-recover.patch 3238 BLAKE2B 648e7ab4210efd8465477e6e576f9f0b972743c7ce1dd651661fe1b0e88fc774d613acb97941a7acdf2becd6bd2055c84f3eb2bb5c94e0eb8522b761fbf38831 SHA512 613b33757c1dabf897da77b53a26eb57318387462ff4d34f06411b2aef06d812c730db0ec4fb15b2895266bd914bd8ac11fa91334430834541b8d465c2a484ec
-AUX nethack-3.6.0-x11-color.patch 6828 BLAKE2B 4e8f502b8180e042fed9e829d7bdd3c8a89aa679929aa22e209ae85a9e94ed25c6463b378ae1f9a1649bace9020b638279805f2ac2b846b7434fefc2187514b4 SHA512 074fb2db8962f918f605404d2810bc78c27ea461255bc6ad26ad24bbe65346b27868d9558a9486b334be29bbcc6896a95fafa2e4446045f316201754ea4bdab8
-DIST nethack-360-src.tgz 4261282 BLAKE2B 7be22b8bdc7b5124418fa904aa3776d77440f67ec18782b878e037b989a18092ed88ca192224c7bc1eaa3cb438823188035c3e6d2aa85d13a7aa1e86c8527d32 SHA512 92370a3c60a4f6861b9c0f1e1320fc23d91cedc1615d0d09e06a0ee3e13c9c8c0cd931389bfd7a25845ed07ef966d19d9e46e77ae07084a941685dc67f49c813
-EBUILD nethack-3.6.0-r3.ebuild 3998 BLAKE2B b6bb7165f57fa23fd7414bdd077abb65dfbab6d57c2e740c2b80c697a1bd957bd94347a35f5195e13633c6995866e2c62a9d8955de8569d6d07769d9381d052e SHA512 6d9baf22fa180eafb53460e21353be11ae45964a81a608f930052dafd93481dca9bf8002da65c4b84a191d2ad6dc4387e2363693694cc68f1d28a3ec9f09e152
-MISC metadata.xml 545 BLAKE2B a29d97fd41c3cce54fa206a2be25296be467499011ed128ed20ed9dcb99efe9fd429fd816fccd07805065831c348ee6479c93ad1e0bba2f98c5b6b50b738ee73 SHA512 30c9a569c25853311dd579749d4193f8a1a45c5a5dd0e7899c2b3c63a39718c0ff8a4633620fdcbb3964e714b62718bfd4089c7438e5707f24457b6ace4dc783
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-hint-tty b/games-roguelike/nethack/files/nethack-3.6.0-hint-tty
deleted file mode 100644
index 3c250e7e719c..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-hint-tty
+++ /dev/null
@@ -1,19 +0,0 @@
-#-PRE
-
-LINK=$(CC)
-
-WINSRC = $(WINTTYSRC)
-WINOBJ = $(WINTTYOBJ)
-WINLIB = $(WINTTYLIB)
-
-GAMEPERM = 02755
-VARDIRPERM = 0770
-VARFILEPERM = 0660
-CHOWN = true
-CHGRP = true
-
-
-#-POST
-
-# needed for external pager, bug #57410
-DATNODLB = $(VARDATND) license $(DATHELP)
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-hint-x11 b/games-roguelike/nethack/files/nethack-3.6.0-hint-x11
deleted file mode 100644
index d0d1a8d4cd42..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-hint-x11
+++ /dev/null
@@ -1,23 +0,0 @@
-#-PRE
-
-LINK=$(CC)
-
-VARDATND = x11tiles NetHack.ad pet_mark.xbm pilemark.xbm rip.xpm
-
-WINSRC = $(WINTTYSRC) $(WINX11SRC)
-WINOBJ = $(WINTTYOBJ) $(WINX11OBJ)
-WINLIB = $(WINTTYLIB) $(WINX11LIB)
-
-GAMEPERM = 02755
-VARDIRPERM = 0770
-VARFILEPERM = 0660
-CHOWN = true
-CHGRP = true
-
-
-#-POST
-
-# needed for external pager, bug #57410
-DATNODLB = $(VARDATND) license $(DATHELP)
-
-WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 -lXpm
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-nethackrc b/games-roguelike/nethack/files/nethack-3.6.0-nethackrc
deleted file mode 100644
index 33c98064341f..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-nethackrc
+++ /dev/null
@@ -1,103 +0,0 @@
-## This is an example nethackrc file (courtesy of nethack.alt.org).
-##
-## You should edit it to suit your needs.
-## Please read the Guidebook in /usr/share/doc/nethack or at www.nethack.org.
-##
-## Options which are enabled by default (like autoopen) can be disabled
-## by prefixing them with a !
-
-## If USE=X is enabled, this can be changed to x11
-#OPTIONS=windowtype:tty
-
-## Custom fruit and pet names
-#OPTIONS=fruit:mango
-#OPTIONS=dogname:Izchak
-#OPTIONS=catname:Chun-Li
-#OPTIONS=horsename:Marlon
-
-## Colored output
-#OPTIONS=color
-
-## Automatically dig if you are wielding a digging tool and moving
-## into a place that can be dug
-#OPTIONS=autodig
-
-## Walking into a door attempts to open it
-#OPTIONS=autoopen
-
-## Automatically pick up stuff
-#OPTIONS=autopickup
-
-## Only use autopickup for these item types
-#OPTIONS=pickup_types:$!?/"=
-
-## Allow saving and loading bones files.
-#OPTIONS=bones
-
-## Show out-of-sight areas of lit rooms
-#OPTIONS=dark_room
-
-## Use inverse for pets
-#OPTIONS=hilite_pet
-
-## Use inverse for piles of items
-#OPTIONS=hilite_pile
-
-## Show experience
-#OPTIONS=showexp
-
-## Show elapsed game time (in turns)
-#OPTIONS=time
-
-## How recalled messages (ctrl-p) are displayed.
-#OPTIONS=msg_window:reversed
-
-## use IBMgraphics or DECgraphics
-#OPTIONS=symset:DECgraphics
-#OPTIONS=symset:IBMgraphics
-
-## If you don't like some default glyphs, these can be changed
-#SYMBOLS=S_boulder:0
-#SYMBOLS=S_lava:~
-#SYMBOLS=S_pool:~
-#SYMBOLS=S_water:~
-#SYMBOLS=S_ghost:8
-#SYMBOLS=S_golem:7
-
-## Sort items by name. One of "none", "loot", or "full"
-#OPTIONS=sortloot:full
-
-## Require explicit yes for some prompts
-#OPTIONS=paranoid_confirmation:Confirm quit attack pray wand Remove
-
-## Conducts
-#OPTIONS=nudist
-#OPTIONS=blind
-
-
-## Colored menus. Regular expressions allowed.
-#OPTIONS=menucolors
-#MENUCOLOR=" blessed "=green
-#MENUCOLOR=" holy "=green
-#MENUCOLOR=" cursed "=red
-#MENUCOLOR=" unholy "=red
-#MENUCOLOR=" cursed .* (being worn)"=orange&underline
-
-
-## Messagetypes
-
-## displacing pets. hide the message.
-#MSGTYPE=hide "You swap places with your .*"
-
-## items on floor. don't repeat the message.
-#MSGTYPE=norep "You see here a .*"
-#MSGTYPE=norep "You see here an .*"
-
-## delayed instadeaths. always prompt for -more-
-#MSGTYPE=stop "You are slowing down."
-#MSGTYPE=stop "You find it hard to breathe."
-#MSGTYPE=stop "You are turning a little .*"
-
-## moving up or down stairs
-#MSGTYPE=hide "You descend .*"
-#MSGTYPE=hide "You (climb|fly) (up|down) .*"
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-recover.patch b/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
deleted file mode 100644
index c7e8ab3dca08..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-recover.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From c15cf56e61c908ce756d698a8afa3064030761b3 Mon Sep 17 00:00:00 2001
-From: Luis Ressel <aranea@aixah.de>
-Date: Fri, 18 Dec 2015 23:16:56 +0100
-Subject: [PATCH] doc: Rename recover to recover-nethack
-
----
- doc/recover.6 | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/doc/recover.6 b/doc/recover.6
-index 4c9f509..edd05e3 100644
---- a/doc/recover.6
-+++ b/doc/recover.6
-@@ -1,10 +1,10 @@
--.TH RECOVER 6 "9 January 1993"
-+.TH RECOVER-NETHACK 6 "9 January 1993"
- .\" NetHack 3.6  recover.6	$NHDT-Date: 1432512786 2015/05/25 00:13:06 $  $NHDT-Branch: master $:$NHDT-Revision: 1.6 $
- .UC 4
- .SH NAME
--recover \- recover a NetHack game interrupted by disaster
-+recover-nethack \- recover a NetHack game interrupted by disaster
- .SH SYNOPSIS
--.B recover
-+.B recover-nethack
- [
- .B \-d
- .I directory
-@@ -22,7 +22,7 @@ so such games can be recovered at the point of the last level change.
- The
- .I base
- options tell
--.I recover
-+.I recover-nethack
- which files to process.
- Each base option specifies recovery of a separate game.
- .PP
-@@ -72,47 +72,47 @@ by a user number to avoid conflicts,
- or "xlock" if the number of concurrent players is being limited.
- It may be necessary to look in the playground to find the correct
- base name of the interrupted game.
--.I recover
-+.I recover-nethack
- will transform these level files into a save file of the same name as
- .I nethack
- would have used.
- .PP
- Since
--.I recover
-+.I recover-nethack
- must be able to read and delete files from the playground
- and create files in the save directory,
- it has interesting interactions with game security.
- Giving ordinary players access to
--.I recover
-+.I recover-nethack
- through setuid or setgid is tantamount to leaving the playground
- world-writable,
- with respect to both cheating and messing up other players.
- For a single-user system, this of course does not change anything,
- so some of the microcomputer ports install
--.I recover
-+.I recover-nethack
- by default.
- .PP
- For a multi-user system,
- the game administrator may want to arrange for all .0 files in the
--playground to be fed to recover when the host machine boots,
-+playground to be fed to recover-nethack when the host machine boots,
- and handle game crashes individually.
- If the user population is sufficiently trustworthy,
--.I recover
-+.I recover-nethack
- can be installed with the same permissions the
- .I nethack
- executable has.
- In either case,
--.I recover
-+.I recover-nethack
- is easily compiled from the distribution utility directory.
- .SH NOTES
- .PP
- Like
- .I nethack
- itself,
--.I recover
-+.I recover-nethack
- will overwrite existing savefiles of the same name.
- Savefiles created by
--.I recover
-+.I recover-nethack
- are uncompressed;
- they may be compressed afterwards if desired,
- but even a compression-using
-@@ -122,11 +122,11 @@ will find them in the uncompressed form.
- nethack(6)
- .SH BUGS
- .PP
--.I recover
-+.I recover-nethack
- makes no attempt to find out if a base name specifies a game in progress.
- If multiple machines share a playground, this would be impossible to
- determine.
- .PP
--.I recover
-+.I recover-nethack
- should be taught to use the nethack playground locking mechanism to
- avoid conflicts.
--- 
-2.6.4
-
diff --git a/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch b/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
deleted file mode 100644
index d34ca029d51a..000000000000
--- a/games-roguelike/nethack/files/nethack-3.6.0-x11-color.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From f92bf2b495450d323e157eb41130c79a3d369239 Mon Sep 17 00:00:00 2001
-From: PatR <rankin@nethack.org>
-Date: Mon, 8 Feb 2016 19:01:26 -0800
-Subject: [PATCH] fix #H4237 - color ignored for X11 text map
-
-Color was only being tracked for locations that had the pile of
-objects flag set.  And hilite_pile made a monster on a pile take
-on the color of the top object of the pile.
-
-This restores the tracking of color for the whole map, and makes
-highlighted piles be drawn in inverse like highligted pets.  The
-drawing routine doesn't know the difference (but could tell, if
-necessary, by testing whether the glyph is an object or a monster).
-
-Also, variables 'inbuf', 'inptr', and 'incount' were global; limit
-their scope to winmap.c.
----
- win/X11/winmap.c | 68 +++++++++++++++++++++++++++-----------------------------
- 1 file changed, 33 insertions(+), 35 deletions(-)
-
-diff --git a/win/X11/winmap.c b/win/X11/winmap.c
-index 93f5dd6..523e13d 100644
---- a/win/X11/winmap.c
-+++ b/win/X11/winmap.c
-@@ -102,6 +102,7 @@ int bkglyph UNUSED;
-         int color, och;
-         unsigned special;
- #ifdef TEXTCOLOR
-+        int colordif;
-         register unsigned char *co_ptr;
- #endif
- 
-@@ -116,24 +117,22 @@ int bkglyph UNUSED;
- 
-         /* Only update if we need to. */
-         ch_ptr = &map_info->text_map.text[y][x];
--
--#ifdef TEXTCOLOR
--        co_ptr = &map_info->text_map.colors[y][x];
--        if (*ch_ptr != ch || *co_ptr != color)
--#else
--        if (*ch_ptr != ch)
--#endif
--        {
-+        if (*ch_ptr != ch) {
-             *ch_ptr = ch;
-+            if (!map_info->is_tile)
-+                update_bbox = TRUE;
-+        }
- #ifdef TEXTCOLOR
--            if ((special & MG_PET) && iflags.hilite_pet)
--                color += CLR_MAX;
--            if ((special & MG_OBJPILE) && iflags.hilite_pile)
--            *co_ptr = color;
--#endif
-+        co_ptr = &map_info->text_map.colors[y][x];
-+        colordif = (((special & MG_PET) && iflags.hilite_pet)
-+                    || ((special & MG_OBJPILE) && iflags.hilite_pile))
-+                      ? CLR_MAX : 0;
-+        if (*co_ptr != (uchar) (color + colordif)) {
-+            *co_ptr = (uchar) (color + colordif);
-             if (!map_info->is_tile)
-                 update_bbox = TRUE;
-         }
-+#endif
-     }
- 
-     if (update_bbox) { /* update row bbox */
-@@ -844,7 +843,8 @@ Font font;
-     set_color_gc(CLR_BRIGHT_CYAN, XtNbright_cyan);
-     set_color_gc(CLR_WHITE, XtNwhite);
- #else
--    set_gc(wp->w, font, XtNforeground, bgpixel, &map_info->text_map.copy_gc,
-+    set_gc(wp->w, font, XtNforeground, bgpixel,
-+           &map_info->text_map.copy_gc,
-            &map_info->text_map.inv_copy_gc);
- #endif
- }
-@@ -943,17 +943,17 @@ struct xwindow *wp;
- 
-     map_all_stone(map_info);
-     (void) memset((genericptr_t) map_info->text_map.text, ' ',
--                  sizeof(map_info->text_map.text));
-+                  sizeof map_info->text_map.text);
- #ifdef TEXTCOLOR
-     (void) memset((genericptr_t) map_info->text_map.colors, NO_COLOR,
--                  sizeof(map_info->text_map.colors));
-+                  sizeof map_info->text_map.colors);
- #endif
- 
-     /* force a full update */
-     (void) memset((genericptr_t) map_info->t_start, (char) 0,
--                  sizeof(map_info->t_start));
-+                  sizeof map_info->t_start);
-     (void) memset((genericptr_t) map_info->t_stop, (char) COLNO - 1,
--                  sizeof(map_info->t_stop));
-+                  sizeof map_info->t_stop);
-     display_map_window(wp);
- }
- 
-@@ -978,8 +978,8 @@ struct xwindow *wp;
- #ifdef VERBOSE
-     printf("Font information:\n");
-     printf("fid = %ld, direction = %d\n", fs->fid, fs->direction);
--    printf("first = %d, last = %d\n", fs->min_char_or_byte2,
--           fs->max_char_or_byte2);
-+    printf("first = %d, last = %d\n",
-+           fs->min_char_or_byte2, fs->max_char_or_byte2);
-     printf("all chars exist? %s\n", fs->all_chars_exist ? "yes" : "no");
-     printf("min_bounds:lb=%d rb=%d width=%d asc=%d des=%d attr=%d\n",
-            fs->min_bounds.lbearing, fs->min_bounds.rbearing,
-@@ -990,8 +990,8 @@ struct xwindow *wp;
-            fs->max_bounds.width, fs->max_bounds.ascent,
-            fs->max_bounds.descent, fs->max_bounds.attributes);
-     printf("per_char = 0x%lx\n", (unsigned long) fs->per_char);
--    printf("Text: (max) width = %d, height = %d\n", text_map->square_width,
--           text_map->square_height);
-+    printf("Text: (max) width = %d, height = %d\n",
-+           text_map->square_width, text_map->square_height);
- #endif
- 
-     if (fs->min_bounds.width != fs->max_bounds.width)
-@@ -1002,9 +1002,9 @@ struct xwindow *wp;
-  * keyhit buffer
-  */
- #define INBUF_SIZE 64
--int inbuf[INBUF_SIZE];
--int incount = 0;
--int inptr = 0; /* points to valid data */
-+static int inbuf[INBUF_SIZE];
-+static int incount = 0;
-+static int inptr = 0; /* points to valid data */
- 
- /*
-  * Keyboard and button event handler for map window.
-@@ -1249,8 +1249,8 @@ boolean inverted;
-     }
- 
- #ifdef VERBOSE_UPDATE
--    printf("update: [0x%x] %d %d %d %d\n", (int) wp->w, start_row, stop_row,
--           start_col, stop_col);
-+    printf("update: [0x%x] %d %d %d %d\n",
-+           (int) wp->w, start_row, stop_row, start_col, stop_col);
- #endif
-     win_start_row = start_row;
-     win_start_col = start_col;
-@@ -1273,8 +1273,8 @@ boolean inverted;
-                 src_y = (tile / TILES_PER_ROW) * tile_height;
-                 XCopyArea(dpy, tile_pixmap, XtWindow(wp->w),
-                           tile_map->black_gc, /* no grapics_expose */
--                          src_x, src_y, tile_width, tile_height, dest_x,
--                          dest_y);
-+                          src_x, src_y, tile_width, tile_height,
-+                          dest_x, dest_y);
- 
-                 if (glyph_is_pet(glyph) && iflags.hilite_pet) {
-                     /* draw pet annotation (a heart) */
-@@ -1412,10 +1412,8 @@ Dimension cols, rows;
-     }
- 
-     num_args = 0;
--    XtSetArg(args[num_args], XtNwidth, wp->pixel_width);
--    num_args++;
--    XtSetArg(args[num_args], XtNheight, wp->pixel_height);
--    num_args++;
-+    XtSetArg(args[num_args], XtNwidth, wp->pixel_width); num_args++;
-+    XtSetArg(args[num_args], XtNheight, wp->pixel_height); num_args++;
-     XtSetValues(wp->w, args, num_args);
- }
- 
-@@ -1426,10 +1424,10 @@ struct xwindow *wp;
-     struct map_info_t *map_info = wp->map_information;
-     struct text_map_info_t *text_map = &map_info->text_map;
- 
--    (void) memset((genericptr_t) text_map->text, ' ', sizeof(text_map->text));
-+    (void) memset((genericptr_t) text_map->text, ' ', sizeof text_map->text);
- #ifdef TEXTCOLOR
-     (void) memset((genericptr_t) text_map->colors, NO_COLOR,
--                  sizeof(text_map->colors));
-+                  sizeof text_map->colors);
- #endif
- 
-     get_char_info(wp);
--- 
-2.7.1
-
diff --git a/games-roguelike/nethack/metadata.xml b/games-roguelike/nethack/metadata.xml
deleted file mode 100644
index b4c23c3cf2d8..000000000000
--- a/games-roguelike/nethack/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>aranea@aixah.de</email>
-		<name>Luis Ressel</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">nethack</remote-id>
-	</upstream>
-	<use>
-		<flag name="experimental">Enable experimental features (showscore and status_hilite)</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild b/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
deleted file mode 100644
index fa9302932cb1..000000000000
--- a/games-roguelike/nethack/nethack-3.6.0-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs flag-o-matic user
-
-MY_PV=${PV//.}
-DESCRIPTION="The ultimate old-school single player dungeon exploration game"
-HOMEPAGE="https://www.nethack.org/"
-SRC_URI="mirror://sourceforge/nethack/${PN}-${MY_PV}-src.tgz"
-
-LICENSE="nethack"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86 ~x86-fbsd"
-IUSE="experimental X"
-
-RDEPEND="sys-libs/ncurses:0=
-	X? (
-		x11-libs/libXaw
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	X? (
-		x11-base/xorg-proto
-		x11-apps/bdftopcf
-		x11-apps/mkfontdir
-	)"
-
-BINDIR="/usr/bin"
-STATEDIR="/var/games/${PN}"
-
-NETHACK_GROUP="gamestat"
-
-pkg_setup() {
-	HACKDIR="/usr/$(get_libdir)/${PN}"
-
-	enewgroup gamestat 36
-}
-
-src_prepare() {
-	eapply "${FILESDIR}/${P}-recover.patch"
-	eapply "${FILESDIR}/${P}-x11-color.patch"
-	eapply_user
-
-	cp "${FILESDIR}/${P}-hint-$(usex X x11 tty)" hint || die "Failed to copy hint file"
-	sys/unix/setup.sh hint || die "Failed to run setup.sh"
-}
-
-src_compile() {
-	append-cflags -I../include -DDLB -DSECURE -DLINUX -DTIMED_DELAY -DVISION_TABLES
-	append-cflags '-DCOMPRESS=\"/bin/gzip\"' '-DCOMPRESS_EXTENSION=\".gz\"'
-	append-cflags "-DHACKDIR=\\\"${HACKDIR}\\\"" "-DVAR_PLAYGROUND=\\\"${STATEDIR}\\\""
-	append-cflags "-DDEF_PAGER=\\\"${PAGER}\\\""
-	append-cflags -DSYSCF "-DSYSCF_FILE=\\\"/etc/nethack.sysconf\\\""
-
-	use X && append-cflags -DX11_GRAPHICS -DUSE_XPM
-	use experimental &&
-		append-cflags -DSTATUS_VIA_WINDOWPORT -DSTATUS_HILITES -DSCORE_ON_BOTL
-
-	makeopts=(
-		CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-		WINTTYLIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
-		HACKDIR="${HACKDIR}" INSTDIR="${D}/${HACKDIR}"
-		SHELLDIR="${D}/${BINDIR}" VARDIR="${D}/${STATEDIR}"
-		)
-
-	emake "${makeopts[@]}" nethack recover Guidebook spec_levs
-
-	# Upstream still has some parallel compilation bugs
-	emake -j1 "${makeopts[@]}" all
-}
-
-src_install() {
-	emake "${makeopts[@]}" install
-
-	exeinto "${BINDIR}"
-	newexe util/recover recover-nethack
-	rm "${D}/${HACKDIR}/recover" || die "Failed to remove HACKDIR/recover"
-
-	doman doc/nethack.6
-	newman doc/recover.6 recover-nethack.6
-	dodoc doc/Guidebook.txt
-
-	insinto /etc
-	newins sys/unix/sysconf nethack.sysconf
-
-	insinto /etc/skel
-	newins "${FILESDIR}/${P}-nethackrc" .nethackrc
-
-	if use X ; then
-		cd "${S}/win/X11" || die "Failed to enter win/X11 directory"
-
-		# copy nethack x application defaults
-		insinto /etc/X11/app-defaults
-		newins NetHack.ad NetHack
-		rm "${D}/${HACKDIR}/NetHack.ad" || die "Failed to remove NetHack.ad"
-
-		newicon nh_icon.xpm nethack.xpm
-		make_desktop_entry ${PN} Nethack
-
-		# install nethack fonts
-		bdftopcf -o nh10.pcf nh10.bdf || die "Converting fonts failed"
-		bdftopcf -o ibm.pcf ibm.bdf || die "Converting fonts failed"
-		insinto "${HACKDIR}/fonts"
-		doins *.pcf
-		cd "${D}/${HACKDIR}/fonts" || die "Failed to enter fonts directory"
-		mkfontdir || die "The action mkfontdir ${HACKDIR}/fonts failed"
-	fi
-
-	rm -r "${D}/${STATEDIR}" || die "Failed to clean STATEDIR"
-	keepdir "${STATEDIR}/save"
-
-	fowners -R "root:${NETHACK_GROUP}" "${STATEDIR}"
-	fperms 770 "${STATEDIR}" "${STATEDIR}/save"
-
-	fowners "root:${NETHACK_GROUP}" "${HACKDIR}/nethack"
-	fperms g+s "${HACKDIR}/nethack"
-}
-
-pkg_postinst() {
-	cd "${ROOT}/${STATEDIR}" || die "Failed to enter ${STATEDIR} directory"
-
-	touch logfile perm record xlogfile || die "Failed to create log files"
-
-	chown -R root:"${NETHACK_GROUP}" . &&
-	chmod -R 660 . &&
-	chmod 770 . save ||
-	die "Adjustment of file permissions in ${ROOT}/${STATEDIR} failed"
-
-	touch -c bones* save/*  # non-critical
-
-	elog "A minimal default .nethackrc has been placed in /etc/skel/"
-	elog "The sysconf file is at /etc/nethack.sysconf"
-
-	if has_version "<${CATEGORY}/${PN}-3.6.0" ; then
-		elog
-		elog "Nethack 3.6 includes many new features."
-		elog "You might want to review your options and local patchset."
-		elog "Have a look at http://www.nethack.org/v360/release.html"
-	fi
-}
diff --git a/games-roguelike/powder-117-r1 b/games-roguelike/powder-117-r1
new file mode 100644
index 000000000000..820316d65aa9
--- /dev/null
+++ b/games-roguelike/powder-117-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=media-libs/libsdl[video]
+DESCRIPTION=A game in the genre of Rogue, Nethack, and Diablo. Emphasis is on tactical play
+EAPI=6
+HOMEPAGE=http://www.zincland.com/powder/
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-Sampling-Plus-1.0
+RDEPEND=media-libs/libsdl[video]
+SLOT=0
+SRC_URI=http://www.zincland.com/powder/release/powder117_src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b5f1981cca7b0ea15f14ec12f09f65e6
diff --git a/games-roguelike/powder/Manifest b/games-roguelike/powder/Manifest
deleted file mode 100644
index aba5190d8a2b..000000000000
--- a/games-roguelike/powder/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX powder-117-gcc6.patch 354 BLAKE2B 5cc277bc2f7e59ecf4893716c2947d5a208bc61f1e2db2eede236b5b9e307e258404b86c06fc56fca3053a27dd1ef1b4dac200e9d18e28e3de3dc44eb51cca5a SHA512 7d486a29bad2b389cd6e772c44227b2475dce7630e8fd2932bbafb0f52ba3f3ae3af1eaccdd69e3c3742cec1a9d80b98d9d8527591dd14383e70131620270db6
-DIST powder117_src.tar.gz 1891043 BLAKE2B fbed7f94142f9f01bb235886825e94ccb1b110db70b8fb53d4476747a2cd7863b1af31a775f1cbaa4579cd6d0574c7a41cd2e2aaf90dbec3f1a1b419582c02d8 SHA512 cdbf67d6d582af39c40cc0872411725d0c296326b21cf8efbe7c7ccd11cd3c831ad129e5e91fb661f938a399ac799509e5123653494f54398c55750026bc6736
-EBUILD powder-117-r1.ebuild 919 BLAKE2B 24990d3ee0dd55a6cd42489f96f5afeadc898e808e8a8d45d5e48561b897ca3c4a06f3172ad95757a27563e07e0ef3bed0abdcab9dd28cdbf4c02f3ac748639f SHA512 592244d7bf3452a1c4cc5cb4db8f88e8c849346dbe95ce0ec9f85b21b40440bbf5ec8999d738cb8836a4c08d2bde92f7fa635c93a1ac007525f9e03373bb1bef
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/powder/files/powder-117-gcc6.patch b/games-roguelike/powder/files/powder-117-gcc6.patch
deleted file mode 100644
index 3a9b7f2af541..000000000000
--- a/games-roguelike/powder/files/powder-117-gcc6.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Bug: https://bugs.gentoo.org/598928
-
---- a/source.txt
-+++ b/source.txt
-@@ -13400,13 +13400,13 @@
- 
- BRANCH MAIN
- {
--    symbol	'\\207'
-+    symbol	static_cast<u8>('\\207')
-     welcome	"%U <return> to the main dungeon."
- }
- 
- BRANCH TRIDUDE
- {
--    symbol	'\\211'
-+    symbol	static_cast<u8>('\\211')
-     welcome	"%U <enter> a cave made of metal."
- }
- 
diff --git a/games-roguelike/powder/metadata.xml b/games-roguelike/powder/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-roguelike/powder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/powder/powder-117-r1.ebuild b/games-roguelike/powder/powder-117-r1.ebuild
deleted file mode 100644
index e7c6acc40057..000000000000
--- a/games-roguelike/powder/powder-117-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-MY_P=${P/-/}_src
-
-DESCRIPTION="A game in the genre of Rogue, Nethack, and Diablo. Emphasis is on tactical play"
-HOMEPAGE="http://www.zincland.com/powder/"
-SRC_URI="http://www.zincland.com/powder/release/${MY_P}.tar.gz"
-
-LICENSE="CC-Sampling-Plus-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-117-gcc6.patch )
-
-src_compile() {
-	append-cxxflags -DCHANGE_WORK_DIRECTORY
-	emake -C port/linux premake
-	emake -C port/linux powder
-}
-
-src_install() {
-	dobin port/linux/${PN}
-	dodoc README.TXT CREDITS.TXT
-}
-
-pkg_postinst() {
-	elog "While the highscore is kept, save games are never preserved between"
-	elog "versions. Please wait until your current character dies before upgrading."
-}
diff --git a/games-roguelike/rogue-5.4.4 b/games-roguelike/rogue-5.4.4
new file mode 100644
index 000000000000..238857482c0c
--- /dev/null
+++ b/games-roguelike/rogue-5.4.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=sys-libs/ncurses[-tinfo]
+DESCRIPTION=The original graphical adventure game that spawned an entire genre
+EAPI=5
+HOMEPAGE=http://rogue.rogueforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses[-tinfo] games-misc/games-envd
+SLOT=0
+SRC_URI=http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.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_=79505edab5ca8bc8183f38ffb0202d98
diff --git a/games-roguelike/rogue/Manifest b/games-roguelike/rogue/Manifest
deleted file mode 100644
index 4a6b81669ba1..000000000000
--- a/games-roguelike/rogue/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rogue5.4.4-src.tar.gz 209839 BLAKE2B 307b2d81e42fd076ba1a2541987e25113a52aa24adfb9a63b05860c87d7bd26159f699bc7b8b73f3d3cbd6fd93f57c008a7c6682784bdd5ea04d840adc37e91f SHA512 d83f6f953ca8e18630cd8e459b7219393969ab1d6b56c2c0d1fd18d5e2a48e3964300916bcf968d52700973bab60811b73183df1ec89b4e37145a0848586402f
-EBUILD rogue-5.4.4.ebuild 640 BLAKE2B cddb66327e500f63b4cf374d37d932006ec7ba5a3f704b2c9afcbca178d8ec4b1a36b644683f04ffd73599c0357c2b2243b76f1072f566e7c5870540aec86da6 SHA512 74acbc5bbb92cf14b0cd3177a1a729e12bc6f2bc1e3c575a2d561d4f93ae8c7e78e7caea2f66467d203018a9ea2db3165fefed5c56963f8760c029e697ee79fe
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/rogue/metadata.xml b/games-roguelike/rogue/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-roguelike/rogue/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/rogue/rogue-5.4.4.ebuild b/games-roguelike/rogue/rogue-5.4.4.ebuild
deleted file mode 100644
index d82f677b1104..000000000000
--- a/games-roguelike/rogue/rogue-5.4.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P=${PN}${PV}
-DESCRIPTION="The original graphical adventure game that spawned an entire genre"
-HOMEPAGE="http://rogue.rogueforge.net/"
-SRC_URI="http://rogue.rogueforge.net/files/rogue5.4/${MY_P}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/ncurses[-tinfo]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	egamesconf \
-		--enable-scorefile="${GAMES_STATEDIR}/${PN}/${PN}.scr" \
-		--docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-roguelike/scourge-0.21.1-r1 b/games-roguelike/scourge-0.21.1-r1
new file mode 100644
index 000000000000..7862cf537a1f
--- /dev/null
+++ b/games-roguelike/scourge-0.21.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=media-libs/freetype:2 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf virtual/libintl virtual/opengl virtual/glu sys-devel/gettext 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 graphical rogue-like adventure game
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/scourge/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freetype:2 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf virtual/libintl virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/scourge/scourge-0.21.1.src.tar.gz mirror://sourceforge/scourge/scourge-0.21.1.data.tar.gz
+_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	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=26355791f04bf0f908f96a7201a275fd
diff --git a/games-roguelike/scourge/Manifest b/games-roguelike/scourge/Manifest
deleted file mode 100644
index 309f169a6bf7..000000000000
--- a/games-roguelike/scourge/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX scourge-0.21.1-automake-1.13.patch 288 BLAKE2B e9e9673b357b9ba5b52f5404d7587dfad3eac5bc714a201c9d94cbe6a113cfcd9ef58fc40a34d48c49cd6bfd3cb781a0000f5d00d18b9fe0e3e623d9940e2195 SHA512 24b212c1053fa3445507cc6808abd37cabf43997275f003eb929d7c0671663919b984c2491dc33083d20a09cd67d8e695140ff6957e662ba66f43ddbaf167394
-AUX scourge-0.21.1-freetype_pkgconfig.patch 1083 BLAKE2B a65038dfb1fb031e7566317236c3de2d2b9d50e7903013d92c793420b8c006f3677071ced8361c04c85b717f45c03b7cd2388b18d44801515b7b39a341eef3af SHA512 22dede3318061683ee3fcc2d1b5cb910cb7657d356c14ea7fffaa19921a3393364c9c4b9d12ccb0e0149599dcebeef2abf9127a47c6987cd77d9090b8961f590
-AUX scourge-0.21.1-gcc47.patch 517 BLAKE2B 30a3d2ebec5e25ce4ca9757821996d2a4e8155573b93ec76b2cded90ab4ec102e5796e21854524d3405b10ed798ddca064a2d3c6b11542ddfe2867fe30aae7f8 SHA512 69bca46c3bfad70e42736119da38d7dafba6c589231bdac5ef2591e617ea516337ebf4ed8a547e8da52412711d0eb84f2abae5652ffc19a882fea69f48a4b880
-AUX scourge-0.21.1-gcc6.patch 601 BLAKE2B 78114f97ac4258cde239926c7012568f76b33c7b0fe3e6a52fc0550910f547e6e70e262ab70ecb89052d126406f94a693432ec2c9a9dd05d828c461b9d822ea8 SHA512 521f5ab76423925cef7f2ead25c947fb042bda67d82c6ccdcf55757d9412c017a8eb3ca7ecb09ffd369cd69fcac919c5ed6928b5c1d16149d64b0b03a70a2104
-DIST scourge-0.21.1.data.tar.gz 142093436 BLAKE2B 68e4cc0bfb40e9a92bc38b3db75f36df665974595ba4978cc34e077901522ece9ec5e15203ad9ab5044a61484d6850367306eb60a0da5d168a33e03130fe5774 SHA512 3701aba0f70d71aeb0e185e808e34cea62a637809a9b4c14fd19bdfbf91d36cf8dafa2a4cfddc3ee493827b40eea657fcdddc8277c57a635bc8ca8e3286376be
-DIST scourge-0.21.1.src.tar.gz 8146157 BLAKE2B ed48b29a54df1b8c7444ac2985ad069f82568b1e7a5aa98e922fb4fcf10c48840c2c38361a4bf15044c71547cd41d06fdd270b379ae0827b9b5f8063b92c1d18 SHA512 e530a8f7bddc1969a02a8b9a8b272f6f60d2c4830d23d96fc671cb79a2c4097fb9c5c0c262004a8157448b601bf58f9bbff95dd6d98275a28d3d404c339ce2ad
-EBUILD scourge-0.21.1-r1.ebuild 1430 BLAKE2B 253248fbd84dd5ffdbdd468bf703e53f08e0dcf948bd62b59dd6c4ab6ae082d95d3ec8ec16a2ad44e45626c2a1f19d689f54f4e94fcb086c49ff8d736e0c049d SHA512 2a17aaa637feff2d8a5b511c6b7fc2a982b21a6357256ae32d7bcc2193212e93669e036873386cdfdd64b4d45627c067967247cf61060cdea00eabf72d8e39a7
-MISC metadata.xml 330 BLAKE2B 126bd0ac9b4d619acfe8978859d29f75e84e445fef6c96117d18d8fc93ad58e69c55096ed3c0e47e1907354bffe3f9e08ce105eedd183c65afe70ea7ce3dec46 SHA512 d47d4afa0adafc93aa43d05190f0a65ac486b6ad4aee54bac96b2f99da7c4a55c6df99b512e4c113c2b4232b8ae294f58966b06081eb89d31fc20b8d9de2e07b
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch b/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
deleted file mode 100644
index 5c2bc202f384..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -4,7 +4,7 @@
- dnl Process this file with autoconf to produce a configure script.
- AC_INIT(src/scourge.h)
- AM_INIT_AUTOMAKE(scourge, "0.21")
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- 
- dnl internationalization macros
- AC_GNU_SOURCE
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch b/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
deleted file mode 100644
index d41ee1a44439..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: scourge/configure.in
-===================================================================
---- scourge/configure.in	(revision 3411)
-+++ scourge/configure.in	(working copy)
-@@ -56,6 +56,7 @@
- # Set up binreloc (for a relocatable autopackage file)
- AM_BINRELOC
- 
-+PKG_PROG_PKG_CONFIG
- dnl --------------------------------------------------------------------------
- dnl General options
- dnl --------------------------------------------------------------------------
-@@ -413,19 +414,9 @@
-   FREETYPE_LIBS=`/sw/lib/freetype2/bin/freetype-config --libs`
-   have_FREETYPE=yes
- else
--AC_MSG_CHECKING([for freetype-config library])
--
--AC_PATH_PROG(FREETYPE, freetype-config, no)
--
--if test "$FREETYPE" = "no"; then
--  AC_MSG_ERROR(Cannot find freetype2: Is freetype-config in path?)
--  have_FREETYPE=no
--else
--  FREETYPE_CFLAGS=`freetype-config --cflags`
--  FREETYPE_LIBS=`freetype-config --libs`
--  have_FREETYPE=yes
-+  PKG_CHECK_MODULES(FREETYPE, freetype2, have_FREETYPE=yes, 
-+    AC_MSG_ERROR(Cannot find freetype2))
- fi
--fi
- 
- LIBS="$saved_LIBS"
- TR_LIBS="$TR_LIBS $FREETYPE_LIBS"
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
deleted file mode 100644
index 6f3f7b3e2a65..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc47.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/squirrel/squtils.h	2012-08-30 18:06:43.474037926 +0200
-+++ b/src/squirrel/squtils.h	2012-08-30 18:14:13.300261523 +0200
-@@ -8,6 +8,9 @@
- #define SQ_FREE(__ptr,__size) sq_vm_free(__ptr,__size);
- #define SQ_REALLOC(__ptr,__oldsize,__size) sq_vm_realloc(__ptr,__oldsize,__size);
- 
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+
- //sqvector mini vector class, supports objects by value
- template<typename T> class sqvector
- {
diff --git a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch b/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
deleted file mode 100644
index fed15f45ed7e..000000000000
--- a/games-roguelike/scourge/files/scourge-0.21.1-gcc6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Bug: https://bugs.gentoo.org/610492
-Upstream ticket: https://sourceforge.net/p/scourge/patches/3/
-
---- a/src/equip.cpp
-+++ b/src/equip.cpp
-@@ -595,7 +595,7 @@
- 		}
- 	}
- 	if ( !found ) {
--		specialSkill = false;
-+		specialSkill = NULL;
- 		canvas->setTooltip( "" );
- 	}
- 	glDisable( GL_BLEND );
---- a/src/render/map.cpp
-+++ b/src/render/map.cpp
-@@ -3154,7 +3154,7 @@
- 			if ( shape )
- 				return shape;
- 		}
--		return false;
-+		return NULL;
- 	}
- 	if ( y1 == y2 ) {
- 		if ( x1 > x2 ) SWAP( x1, x2 );
-@@ -3163,7 +3163,7 @@
- 			if ( shape )
- 				return shape;
- 		}
--		return false;
-+		return NULL;
- 	}
- 
- 
diff --git a/games-roguelike/scourge/metadata.xml b/games-roguelike/scourge/metadata.xml
deleted file mode 100644
index ea7a44ebb6c5..000000000000
--- a/games-roguelike/scourge/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scourge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild b/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
deleted file mode 100644
index 5eeec7c52315..000000000000
--- a/games-roguelike/scourge/scourge-0.21.1-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop wxwidgets
-
-DESCRIPTION="A graphical rogue-like adventure game"
-HOMEPAGE="https://sourceforge.net/projects/scourge/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz
-	mirror://sourceforge/${PN}/${P}.data.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/freetype:2
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	virtual/libintl
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-	"${FILESDIR}"/${P}-automake-1.13.patch
-	"${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	# bug #257601
-	sed -i \
-		-e '/AC_CHECK_HEADERS.*glext/ s:):, [#include <GL/gl.h>] ):' \
-		configure.in || die
-	sed -i \
-		-e '/snprintf/s/tmp, 256/tmp, sizeof(tmp)/' \
-		src/scourgehandler.cpp || die
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-data-dir=/usr/share/${PN}
-		--localedir=/usr/share/locale
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	insinto /usr/share/${PN}
-	doins -r ../scourge_data/*
-	doicon assets/scourge.png
-	make_desktop_entry scourge S.C.O.U.R.G.E.
-}
diff --git a/games-roguelike/stone-soup-0.20.1 b/games-roguelike/stone-soup-0.20.1
new file mode 100644
index 000000000000..baf0fe57352b
--- /dev/null
+++ b/games-roguelike/stone-soup-0.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup
+DEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl sys-devel/flex virtual/pkgconfig virtual/yacc tiles? ( sys-libs/ncurses:0 ) >=sys-apps/sed-4
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=6
+HOMEPAGE=http://crawl.develz.org/wordpress/
+IUSE=debug luajit ncurses test +tiles
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crawl.develz.org/release/0.20/stone_soup-0.20.1.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fea45cc7fc1ff707f4363e7c84242bed
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
deleted file mode 100644
index 8336a777257a..000000000000
--- a/games-roguelike/stone-soup/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX stone-soup-0.20.1-rltiles-ldflags-libs.patch 1376 BLAKE2B 86c9408973b1f0f8684281e60f891b3597f4cfa6521e5599243628a15acb5a264f2138712e0ccb71f2ed4ece3e2d2f22f357e866e575c7fd40387c0414f4a68c SHA512 ad139978d67df1d824a772f70d331779ed56cf2cce30c4022804740afd77b6d8b22badd9d20af47b4df0a60499a914f749a3520a5ea76ae3e14795d2bf07affa
-DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
-DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.20.1.tar.xz 28372712 BLAKE2B c12a76afcaf1691a74f23bc2b2927ac2573cb83c602a50aab1567b9e2077c6f12f0847c8c27f17c45941660ab0fac1c28b2531c176c1fc0d4e946b84456d4e75 SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a
-EBUILD stone-soup-0.20.1.ebuild 3567 BLAKE2B 0a0bff0d0242dedb2189853a937d0d4366b78cdf457639a0d7bcf42757404fdf5bb250f69a4fce91b844f551ff2ab2810fd33618c906aaf13843598183ee8bcf SHA512 f796f07117afbc7f2051e1423c8192939aa3edbcf427be5ca0bb86d12f377280fc10b13850420505a423ad1f8a8153ac72800bbfee31441c25183b2ced45f137
-MISC metadata.xml 1546 BLAKE2B f7af831bd9db76d5d95e88db7651c81fc2838f010daa6ff473ea55f82797fb989f2a99e640fea915da87be7255e112f9e4f5766195ad74ec807118908840690e SHA512 7531275c7d11591b8eb8ba4b490a5357bb65d12369b504639b54d3681c364ead0bce2356549028d3a02d06934a3c04ccc57204ee17702b1e7a8866e7960c768b
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
deleted file mode 100644
index 010c729b92eb..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
- 
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
-   endif
- 
-   CFLAGS += $(PNG_INCLUDE)
--  LDFLAGS += $(PNG_LIB)
-+  LIBS += $(PNG_LIB)
- 
-   CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
- 
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
- 
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
- 	$(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
- 
- $(TILEGEN): $(OBJECTS)
--	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+	$(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
- 
- .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
deleted file mode 100644
index 68e84b34cc48..000000000000
--- a/games-roguelike/stone-soup/metadata.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<doc lang="en">http://crawl.develz.org/wordpress/documentation</doc>
-		<bugs-to>https://crawl.develz.org/mantis/main_page.php</bugs-to>
-		<remote-id type="sourceforge">crawl-ref</remote-id>
-	</upstream>
-	<use>
-		<flag name="tiles">Enable for graphical (tiled) build.
-			(can be enabled on top of ncurses)
-		</flag>
-		<flag name="ncurses">Enable for console (uses ncurses) based build.
-			(can be enabled on top of tiles)
-		</flag>
-	</use>
-	<longdescription lang="en">
-		Dungeon Crawl Stone Soup is a free roguelike game of exploration
-		and treasure-hunting in dungeons filled with dangerous and
-		unfriendly monsters in a quest for the mystifyingly fabulous Orb
-		of Zot.
-
-		Dungeon Crawl Stone Soup has diverse species and many different
-		character backgrounds to choose from, deep tactical game-play,
-		sophisticated magic, religion and skill systems, and a grand
-		variety of monsters to fight and run from, making each game
-		unique and challenging.
-
-		Dungeon Crawl Stone Soup can be played offline, or online on a
-		public telnet/ssh server thanks to the good folks at
-		crawl.akrasiac.org (CAO) and crawl.develz.org (CDO). These public
-		servers allow you to meet other players’ ghosts, watch other people
-		playing, and, in general, have a blast!
-	</longdescription>
-</pkgmetadata>
diff --git a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
deleted file mode 100644
index 6046f53ae7e5..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## TODO
-# add sound support (no sound files)
-
-EAPI=6
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils toolchain-funcs versionator
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="
-	https://crawl.develz.org/release/$(get_version_component_range 1-2)/${PN/-/_}-${PV}.tar.xz
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
-	https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
-"
-
-# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
-# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-# Public Domain|CC0: most of tiles
-# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
-LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug luajit ncurses test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-RDEPEND="
-	dev-db/sqlite:3
-	luajit? ( >=dev-lang/luajit-2.0.0 )
-	sys-libs/zlib
-	!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
-	ncurses? ( sys-libs/ncurses:0 )
-	tiles? (
-		media-fonts/dejavu
-		media-libs/freetype:2
-		media-libs/libpng:0
-		media-libs/libsdl2[X,opengl,video]
-		media-libs/sdl2-image[png]
-		virtual/glu
-		virtual/opengl
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/flex
-	virtual/pkgconfig
-	virtual/yacc
-	tiles? (
-		sys-libs/ncurses:0
-	)"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
-)
-
-pkg_setup() {
-	if use !ncurses && use !tiles ; then
-		ewarn "Neither ncurses nor tiles frontend"
-		ewarn "selected, choosing ncurses only."
-		ewarn "Note that you can also enable both."
-	fi
-}
-
-src_prepare() {
-	default
-
-	rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
-}
-
-src_compile() {
-	export HOSTCXX=$(tc-getBUILD_CXX)
-
-	# leave DATADIR at the top
-	myemakeargs=(
-		$(usex debug "FULLDEBUG=y DEBUG=y" "")
-		$(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled
-		AR="$(tc-getAR)"
-		CFOPTIMIZE=''
-		CFOTHERS="${CXXFLAGS}"
-		DATADIR="/usr/share/${PN}"
-		GCC="$(tc-getCC)"
-		GXX="$(tc-getCXX)"
-		LDFLAGS="${LDFLAGS}"
-		MAKEOPTS="${MAKEOPTS}"
-		PKGCONFIG="$(tc-getPKG_CONFIG)"
-		RANLIB="$(tc-getRANLIB)"
-		SAVEDIR="~/.crawl"
-		STRIP=touch
-		USE_LUAJIT=$(usex luajit "yes" "")
-		V=1
-		prefix="/usr"
-	)
-
-	if use ncurses || (use !ncurses && use !tiles) ; then
-		emake "${myemakeargs[@]}"
-		# move it in case we build both variants
-		use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
-	fi
-
-	if use tiles ; then
-		emake clean
-		emake "${myemakeargs[@]}" "TILES=y"
-	fi
-}
-
-src_install() {
-	emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
-	[[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
-
-	# don't relocate docs, needed at runtime
-	rm -rf "${D}/usr/share/${PN}"/docs/license
-
-	# icons and menu for graphical build
-	if use tiles ; then
-		doicon -s 48 "${DISTDIR}"/${PN}.png
-		doicon -s scalable "${DISTDIR}"/${PN}.svg
-		make_desktop_entry crawl
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if use tiles && use ncurses ; then
-		elog "Since you have enabled both tiles and ncurses frontends"
-		elog "the ncurses binary is called 'crawl-ncurses' and the"
-		elog "tiles binary is called 'crawl'."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/tome-2.3.5 b/games-roguelike/tome-2.3.5
new file mode 100644
index 000000000000..1966ef4d6d85
--- /dev/null
+++ b/games-roguelike/tome-2.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5:0 X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw ) sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) virtual/pkgconfig x11-misc/makedepend
+DESCRIPTION=save the world from Morgoth and battle evil (or become evil ;])
+EAPI=5
+HOMEPAGE=http://t-o-m-e.net/
+IUSE=X Xaw3d gtk sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=Moria
+RDEPEND=>=sys-libs/ncurses-5:0 X? ( x11-libs/libX11 ) Xaw3d? ( x11-libs/libXaw ) sdl? ( media-libs/sdl-ttf media-libs/sdl-image media-libs/libsdl ) gtk? ( >=x11-libs/gtk+-2.12.8:2 ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://t-o-m-e.net/dl/src/tome-235-src.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=13cd9b49f2c9b7303795d99d3cadb70d
diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
deleted file mode 100644
index 64535c326611..000000000000
--- a/games-roguelike/tome/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 2.3.5-gentoo-paths.patch 1172 BLAKE2B d51e277eac8d270815a8b48a18bd943489036643d53b80d4adab147a7510e4b41f1f9ff1062327f7b441c2aea9e3d6509a1dffa69b60dca32fe36f73a639f8c9 SHA512 1d3f053abcbfee4f2fb1acc2911927b4a51881b0ce50da72d4d617207411b9cdba42cf70324c47535e9e560ee8878f3d0f51d4471dcc2bcfaffb136700c6fd0f
-AUX tome-2.3.5-format.patch 2925 BLAKE2B f9d186937649bfc3d409a73cf6a8f067784628374de2c5da656e2f871ba71c3f6edd1837bec79972ecea985f3002374f9edd8184aff3d1c101de25e20cd901a9 SHA512 e8e245e6374ac63effc8f3e1341357f137cd8b4fb378a464e2bd3692d50e5cbd54b7b42b8605346c2d617e1dbb95e42bc9f79a36cc378d07881c73136d603ddb
-AUX tome-2.3.5-noX.patch 453 BLAKE2B 4ec72b20f50593b871990d7b65aec1cd51fe5c25c5de29350b7cf1a77063e13d393962efbadc1380aec97ec1889c645faff54470def7c5200be5050c5c7a87c0 SHA512 9c3fe5a8a9fa0e1e1b0e1ffb4ca8a089eda401a04bc6fe14aba8866090cd96ad13f5fac501ae18ce937f13a94439c8c1ebaa80c7fc07d1c4da9c3c8fa80f67c2
-DIST tome-235-src.tar.bz2 2951227 BLAKE2B 7a9a6c608873062f9d6deae38c7e39244ca25d2bbb553d338014078c86b9decc36869c2f39f875425f9c3bb26784d3e460a225c5dabd197437781488f3e15d74 SHA512 f456aa91d18397297c213fa67dd14a4d29e024525be99f83b22cbe42f4d426b57fe6115a7124e3ec34de8f351117de525eab996ba7a2a230119e43639c4c9205
-EBUILD tome-2.3.5.ebuild 3632 BLAKE2B 934ccc63c844f796f064bdf7bed82514c5e849dc0d858ab4d39fd22a11a1ab942a0acfe2f4cc9ae77249bf2a0b86c92591fbf0e09f0aa0c9184f93d91eca5a7a SHA512 bd0335cf3229759ff8e8570e6e3ca84414956d3057aa2c4c134d665d6a5cc9b7945ec6eba588e16075a50428d03833be5489edb5758483e1c6343ba2da0ca100
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch b/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
deleted file mode 100644
index d171a1cf540f..000000000000
--- a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
---- tome-225-src.orig/src/files.c	2004-01-14 11:17:02.423263360 -0500
-+++ tome-225-src/src/files.c	2004-01-14 11:17:50.074019344 -0500
-@@ -5670,3 +5670,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -5748,3 +5748,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -5846,3 +5846,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-@@ -6296,3 +6296,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
-diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
---- tome-225-src.orig/src/init2.c	2004-01-14 11:17:02.473255760 -0500
-+++ tome-225-src/src/init2.c	2004-01-14 11:17:58.286770816 -0500
-@@ -6686,3 +6686,3 @@
- 	/* Build the filename */
--	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
-+	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
- 
diff --git a/games-roguelike/tome/files/tome-2.3.5-format.patch b/games-roguelike/tome/files/tome-2.3.5-format.patch
deleted file mode 100644
index f3ce1cc96faf..000000000000
--- a/games-roguelike/tome/files/tome-2.3.5-format.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- dungeon.c.old	2016-02-07 20:12:39.258150130 +0100
-+++ dungeon.c	2016-02-07 20:12:58.239805610 +0100
-@@ -1489,7 +1489,7 @@
- 	{
- 		char buf[20];
- 
--		sprintf(buf, get_day(bst(YEAR, turn) + START_YEAR));
-+		sprintf(buf, "%s", get_day(bst(YEAR, turn) + START_YEAR));
- 		cmsg_format(TERM_L_GREEN,
- 		            "Today it is %s of the %s year of the third age.",
- 		            get_month_name(bst(DAY, turn), wizard, FALSE), buf);
---- files.c.old	2016-02-07 20:15:07.736451417 +0100
-+++ files.c	2016-02-07 20:15:27.595089867 +0100
-@@ -4856,7 +4856,7 @@
- 
- 	/* Terminate */
- 	tmp[k] = '\0';
--	sprintf(player_base, tmp);
-+	sprintf(player_base, "%s", tmp);
- 
- 	/* Require a "base" name */
- 	if (!player_base[0]) strcpy(player_base, "PLAYER");
---- lua_bind.c.old	2016-02-07 20:09:29.071592178 +0100
-+++ lua_bind.c	2016-02-07 20:10:48.094164373 +0100
-@@ -490,7 +490,7 @@
- /* Files */
- void lua_print_hook(cptr str)
- {
--	fprintf(hook_file, str);
-+	fprintf(hook_file, "%s", str);
- }
- 
- 
---- plots.c.old	2016-02-07 20:11:35.389308152 +0100
-+++ plots.c	2016-02-07 20:12:19.247513152 +0100
-@@ -93,7 +93,7 @@
- 	{
- 		MAKE(new, hooks_chain);
- 		new->hook = hook;
--		sprintf(new->name, name);
-+		sprintf(new->name, "%s", name);
- #ifdef DEBUG_HOOK
- 		if (wizard) cmsg_format(TERM_VIOLET, "HOOK ADD: %s", name);
- 		if (take_notes) add_note(format("HOOK ADD: %s", name), 'D');
---- spells1.c.old	2016-02-07 20:15:47.277731397 +0100
-+++ spells1.c	2016-02-07 20:16:03.373438169 +0100
-@@ -7312,7 +7312,7 @@
- 
- 	if (who == -2)
- 	{
--		sprintf(killer, t_name + t_info[cave[p_ptr->py][p_ptr->px].t_idx].name);
-+		sprintf(killer, "%s", t_name + t_info[cave[p_ptr->py][p_ptr->px].t_idx].name);
- 	}
- 
- 	/* Analyze the damage */
---- squeltch.c.old	2016-02-07 20:13:11.872558078 +0100
-+++ squeltch.c	2016-02-07 20:13:42.707997918 +0100
-@@ -399,7 +399,7 @@
- 
- 				if (!max) continue;
- 
--				sprintf(name, string_exec_lua(format("return __rules[%d].table.args.name", sel)));
-+				sprintf(name, "%s", string_exec_lua(format("return __rules[%d].table.args.name", sel)));
- 				if (input_box("New name?", hgt / 2, wid / 2, name, 15))
- 				{
- 					exec_lua(format("auto_aux:rename_rule(%d, '%s')", sel, name));
---- util.c.old	2016-02-07 20:14:22.786269296 +0100
-+++ util.c	2016-02-07 20:16:44.227693551 +0100
-@@ -4468,7 +4468,7 @@
- 		{
- 			char buf2[20];
- 
--			sprintf(buf2, get_day(day + 1));
-+			sprintf(buf2, "%s", get_day(day + 1));
- 			if (full) sprintf(buf, "%s (%s day)", month_name[i], buf2);
- 			else sprintf(buf, "%s", month_name[i]);
- 			break;
-@@ -4479,8 +4479,8 @@
- 			char buf2[20];
- 			char buf3[20];
- 
--			sprintf(buf2, get_day(day + 1 - month_day[i]));
--			sprintf(buf3, get_day(day + 1));
-+			sprintf(buf2, "%s", get_day(day + 1 - month_day[i]));
-+			sprintf(buf3, "%s", get_day(day + 1));
- 
- 			if (full) sprintf(buf, "%s day of %s (%s day)", buf2, month_name[i], buf3);
- 			else if (compact) sprintf(buf, "%s day of %s", buf2, month_name[i]);
diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch
deleted file mode 100644
index 5c5982fe730d..000000000000
--- a/games-roguelike/tome/files/tome-2.3.5-noX.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.old	2012-05-28 14:02:44.787705444 +0200
-+++ makefile	2012-05-28 14:03:44.520524011 +0200
-@@ -458,7 +458,7 @@
- 	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- $(TOLUA): $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
--	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c $(LIBS)
-+	$(CC) $(CFLAGS) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(TOLUAOBJS) lua/tolua.c lua/tolualua.c
- 
- #
- # An install rule.
diff --git a/games-roguelike/tome/metadata.xml b/games-roguelike/tome/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-roguelike/tome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
deleted file mode 100644
index cdb3c58fefd5..000000000000
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_PV=${PV//./}
-DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])"
-HOMEPAGE="http://t-o-m-e.net/"
-SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X Xaw3d gtk sdl"
-
-RDEPEND=">=sys-libs/ncurses-5:0
-	X? ( x11-libs/libX11 )
-	Xaw3d? ( x11-libs/libXaw )
-	sdl? (
-		media-libs/sdl-ttf
-		media-libs/sdl-image
-		media-libs/libsdl )
-	gtk? ( >=x11-libs/gtk+-2.12.8:2 ) "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-misc/makedepend"
-
-S=${WORKDIR}/tome-${MY_PV}-src/src
-
-src_prepare() {
-	mv makefile.std makefile
-	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-noX.patch
-	sed -i -e '/^CC =/d' makefile || die
-	sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die
-	sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
-
-	find .. -name .cvsignore -exec rm -f \{\} +
-	find ../lib/edit -type f -exec chmod a-x \{\} +
-}
-
-src_compile() {
-	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$(pkg-config ncurses --libs)"
-	if use sdl || use X || use gtk || use Xaw3d; then
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
-			-DSUPPORT_GAMMA"
-	fi
-	if use sdl || use X || use Xaw3d; then
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK "
-	fi
-	if use sdl; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)"
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL "
-		GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf"
-	fi
-	if use X; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 "
-		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 "
-	fi
-	if use Xaw3d; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW "
-		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 "
-	fi
-	if use gtk; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(pkg-config gtk+-2.0 --cflags)"
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK2 "
-		GENTOO_LIBS="${GENTOO_LIBS} $(pkg-config gtk+-2.0 --libs) "
-		GTK_SRC_FILE="main-gtk2.c"
-		GTK_OBJ_FILE="main-gtk2.o"
-	else
-		GTK_SRC_FILE=""
-		GTK_OBJ_FILE=""
-	fi
-	if use amd64; then
-		GENTOO_DEFINES="${GENTOO_DEFINES} -DLUA_NUM_TYPE=int "
-	fi
-	GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I."
-	GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA"
-	emake -j1 \
-		INCLUDES="${GENTOO_INCLUDES}" \
-		DEFINES="${GENTOO_DEFINES}" \
-		depend
-	emake ./tolua
-	emake \
-		COPTS="${CFLAGS}" \
-		INCLUDES="${GENTOO_INCLUDES}" \
-		DEFINES="${GENTOO_DEFINES}" \
-		LIBS="${GENTOO_LIBS} -lm" \
-		BINDIR="${GAMES_BINDIR}" \
-		LIBDIR="${GAMES_DATADIR}/${PN}" \
-		GTK_SRC_FILE="${GTK_SRC_FILE}" \
-		GTK_OBJ_FILE="${GTK_OBJ_FILE}"
-}
-
-src_install() {
-	emake -j1 \
-		DESTDIR="${D}" \
-		OWNER="${GAMES_USER}" \
-		BINDIR="${GAMES_BINDIR}" \
-		LIBDIR="${GAMES_DATADIR}/${PN}" install
-	cd ..
-	dodoc *.txt
-
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}/${PN}-scores.raw"
-	prepgamesdirs
-	fperms g+w "${GAMES_STATEDIR}/${PN}-scores.raw"
-	#FIXME: something has to be done about this.
-	fperms g+w "${GAMES_DATADIR}/${PN}/data"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions."
-	echo
-	ewarn "If you have older save files and you wish to continue those games,"
-	ewarn "you'll need to remerge the version of ToME with which you started"
-	ewarn "those save-games."
-}
diff --git a/games-roguelike/tomenet-4.6.1a b/games-roguelike/tomenet-4.6.1a
new file mode 100644
index 000000000000..8e4da1f82923
--- /dev/null
+++ b/games-roguelike/tomenet-4.6.1a
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=sys-libs/ncurses:0 !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) virtual/pkgconfig !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) ) >=sys-apps/sed-4
+DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
+EAPI=5
+HOMEPAGE=https://www.tomenet.eu
+IUSE=dedicated server +sound X
+KEYWORDS=~amd64 ~x86
+LICENSE=Moria
+RDEPEND=sys-libs/ncurses:0 !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) games-misc/games-envd
+SLOT=0
+SRC_URI=https://www.tomenet.eu/downloads/tomenet-4.6.1a.tar.bz2
+_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_=2f8388de6589771553614df081f22df9
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
deleted file mode 100644
index cee0246edf36..000000000000
--- a/games-roguelike/tomenet/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX tomenet-4.6.1a-makefile.patch 2699 BLAKE2B 480333d83f89c557bbec4bfdbfe0146b2607c8c50269fe365b304575fd92c3948ba00e6b87dfa42a446c92a0830d267b052719b20e0a789c2454a78ab1064de7 SHA512 89e72ec53f43770b3fea6e4d99838eed37c1f537238e7b6c7a16edadcf3755e7611256435702802809575f988238f5f529c4b962994d5d13b34f77b8520cb25d
-AUX tomenet-server-wrapper 105 BLAKE2B 3b23750806b3bb3a6b5fa9c99aca0f2dbbcce2852bcb80296fd97b36ffb6fa0896939636fce6938f0874ece0b30abe800d10479431eac2cf6d883332d2b432e9 SHA512 9f509cdcc694fe47eed4cfdcb14f0ab3ea7006c202e7f4d8798012e62b89f34cc26834131412e18d2f0edba4237b6c66f4743ff6b780e3080a52e9da992d8cc3
-AUX tomenet-wrapper 446 BLAKE2B 8fbad2e539cbe8a66eb85acbe5a6f941b5b9519b0832a96091c104638cfc0c0b3909e0b8ee00fcfeeadd70cc2e7b17514ec0b311a4a3986dc665669d167a218d SHA512 f148ad2fb52c060ada829810edc46d3aee6bd6c5229489a52b6af080b38b164c0417157bb8ec21294e16903b3e8328329fbb86645ab57a0f0a4407875844c5a2
-DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
-EBUILD tomenet-4.6.1a.ebuild 2143 BLAKE2B 5d8d8090b9ee296683e037a2d84d4d0a0fbc02173fb7450bffa6495e041c268e88dba9bd6835d5de171b892f66924e71d712782b79ba5e109befab2760c23065 SHA512 6534f48ea79938264a95c05062ae10d29757b27b83241f73e2e23c6d3e83eda610c3f079c70f981a341335ac2aa2140c8e4e8d4ce3b9afeb20cf307927955c72
-MISC metadata.xml 795 BLAKE2B 61b39e7ecb9d7bee7c9488ba16b75354b92b99fcd6157f8b249406557fb93b7bdb9d476c264b4aec5501bfe73987667e94b21db81d0a6aefea0fac7b76a4d418 SHA512 4e7b25ba67a044e76013a5d2c88979d5f082872e785576b37647face2e0cff9056d138df0cd16db23b5b79328156d110d7adf667ba2481c089569fb02b18a0f1
diff --git a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
deleted file mode 100644
index c78a55cebd94..000000000000
--- a/games-roguelike/tomenet/files/tomenet-4.6.1a-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ru tomenet-4.6.1a.orig/src/makefile tomenet-4.6.1a/src/makefile
---- tomenet-4.6.1a.orig/src/makefile	2015-12-31 07:05:21.000000000 -0500
-+++ tomenet-4.6.1a/src/makefile	2016-02-10 01:42:12.958344532 -0500
-@@ -203,7 +203,7 @@
- #
- # This is my compiler of choice, it seems to work most everywhere
- #
--CC = gcc
-+CC ?= gcc
- 
- # For allowing #if..#else..#endif constructs in LUA files - C. Blue
- # Note: The flags must contain
-@@ -215,16 +215,26 @@
- # need to use the gcc invocation below instead.
- #
- # cpp variant:
--CPP = cpp
--CPPFLAGS = -C -P
-+#CPP = cpp
-+#CPPFLAGS = -C -P
- # gcc variant:
--#CPP = gcc
--#CPPFLAGS = -x c -E -Wp,-C,-P
-+CPP ?= gcc
-+CPPFLAGS = -x c -E -Wp,-C,-P
- 
- 
- # For variations with X11
- X11BASE = /usr/X11R6
- 
-+# defines
-+ifdef USE_SDL
-+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
-+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
-+endif
-+
-+ifdef USE_X
-+CFLAGS += -I${X11BASE}/include -DUSE_X11
-+LIBS += -L${X11BASE}/lib -lX11
-+endif
- 
- ##
- ## Standard version -- supports X11 (main-x11.c)
-@@ -237,6 +247,11 @@
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
- ##
-+
-+CFLAGS += -Wall
-+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
-+
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
- #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm
-@@ -256,8 +271,8 @@
- # attempt to "guess" at many of these flags based on your system.
- #
- ## With SDL
--CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
--LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
-+#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
-+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
- ##
- ## Without SDL
- #CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
-@@ -357,10 +372,6 @@
- # Compile a client with 'test client' version/tag
- tomenet.test: CFLAGS += -DTEST_CLIENT -O0
- 
--# Normal release build
--tomenet: CFLAGS += -O2
--
--
- # Lua
- SRCS += $(LUASRCS)
- SRCS += $(CLI_LUASRCS)
diff --git a/games-roguelike/tomenet/files/tomenet-server-wrapper b/games-roguelike/tomenet/files/tomenet-server-wrapper
deleted file mode 100644
index 831fbfb76ed8..000000000000
--- a/games-roguelike/tomenet/files/tomenet-server-wrapper
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TOMENET_PATH="@LIBDIR@"
-export TOMENET_PATH
-cd "${TOMENET_PATH}"
-exec tomenet.server.bin "$@"
diff --git a/games-roguelike/tomenet/files/tomenet-wrapper b/games-roguelike/tomenet/files/tomenet-wrapper
deleted file mode 100644
index 2ca29b862176..000000000000
--- a/games-roguelike/tomenet/files/tomenet-wrapper
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-if [ ! -e ~/.tomenet/.gentoo ]; then
-	LIBDIR="@LIBDIR@"
-	[ -e ~/.tomenet ] || mkdir ~/.tomenet
-
-	ln -s "${LIBDIR}"/game ~/.tomenet/game
-	ln -s "${LIBDIR}"/text ~/.tomenet/text
-	cp -R "${LIBDIR}"/user "${LIBDIR}"/scpt "${LIBDIR}"/xtra ~/.tomenet/
-	[ -e ~/.tomenetrc ] || cp "${LIBDIR}"/.tomenetrc ~/.tomenetrc
-
-	touch ~/.tomenet/.gentoo
-fi
-
-TOMENET_PATH="${HOME}/.tomenet"
-export TOMENET_PATH
-cd "${TOMENET_PATH}"
-exec tomenet.bin "$@"
diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
deleted file mode 100644
index 9d9cd998599c..000000000000
--- a/games-roguelike/tomenet/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="server">Compile server support</flag>
-	</use>
-	<longdescription lang="en">
-		TomeNET is a multiplayer fantasy dungeon exploration game based on
-		the	works of J.R.R. Tolkien. It is a game that emphasizes intricate,
-		challenging, and varied gameplay over graphics. Hundreds of
-		different monsters in randomly-generated,
-		unpredictable dungeons will strive to slay you by various means,
-		and you counter - if you survive - by developing the skills of your
-		choice and wielding mighty 
-		artifacts.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild b/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
deleted file mode 100644
index ec80992655ca..000000000000
--- a/games-roguelike/tomenet/tomenet-4.6.1a.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs games
-
-DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
-HOMEPAGE="https://www.tomenet.eu"
-SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated server +sound X"
-
-RDEPEND="sys-libs/ncurses:0
-	!dedicated? (
-		X? (
-			x11-libs/libX11
-		)
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis,smpeg,mp3]
-		)
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
-
-	sed \
-		-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-		"${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
-
-	if use server || use dedicated ; then
-		sed \
-			-e "s#@LIBDIR@#${GAMES_DATADIR}/${PN}#" \
-			"${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
-	fi
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
-	emake \
-		$(usex dedicated "" "$(usex X "USE_X=1" "")") \
-		$(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
-		-f makefile \
-		${mytargets[@]}
-}
-
-src_install() {
-	dodoc ../TomeNET-Guide.txt
-
-	if ! use dedicated ; then
-		newgamesbin ${PN} ${PN}.bin
-		dogamesbin "${T}"/${PN}
-
-		doicon -s 48 client/tomenet4.png
-		make_desktop_entry ${PN} ${PN} ${PN}4
-	fi
-
-	if use server || use dedicated ; then
-		newgamesbin tomenet.server tomenet.server.bin
-		dogamesbin "${T}"/${PN}.server accedit
-	fi
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r ../lib/*
-	doins ../.tomenetrc
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	if use sound; then
-		elog "You can get soundpacks from here:"
-		elog '  http://tomenet.net/downloads.php'
-		elog "They must be placed inside ~/.tomenet directory."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-roguelike/wrogue-0.8.0b-r1 b/games-roguelike/wrogue-0.8.0b-r1
new file mode 100644
index 000000000000..ecc564559842
--- /dev/null
+++ b/games-roguelike/wrogue-0.8.0b-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libsdl[video] app-arch/unzip
+DESCRIPTION=Gothic science fantasy roguelike game
+EAPI=6
+HOMEPAGE=https://freecode.com/projects/wrogue
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl[video]
+SLOT=0
+SRC_URI=mirror://gentoo/wrogue-0.8.0b.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dd9c2693c2d91e8c95d1a6777f4bf25f
diff --git a/games-roguelike/wrogue/Manifest b/games-roguelike/wrogue/Manifest
deleted file mode 100644
index b2e0547f6179..000000000000
--- a/games-roguelike/wrogue/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wrogue-0.8.0b-ldflags.patch 677 BLAKE2B df5466af213d598171c5439aacacbe5c1698ea27ce15a19b0e931ed6af644c8e7a3fcac27a255f976e04979558833144159594f9c14df6d77966fbe2cc616aa3 SHA512 7ab086f4ee1f41ef6bad9dcb3e936b17389beadcbfcb451312c57ab1539992198795844264a56a5d9ef3afcc031e46d5b3e97714891723c0fe1185ba15a2d498
-DIST wrogue-0.8.0b.zip 433553 BLAKE2B 9a634fe3b20497aab3431824e86b5905eeff90d757d15118227f9e2ffd8e5db9e81c12c43140b8dcd4b4a459f4c6b1b76ff54cf3be1d92dbfc8db5ab23a49fe2 SHA512 f8da3ccc26e36723bbf7654023cdd73747c2ffcb45420b77cc66495b596cc82ca9d90a2d239b12ea95c1185b11bad332cf41fe1b278ee34af6ff1479eb6e4d81
-EBUILD wrogue-0.8.0b-r1.ebuild 1019 BLAKE2B 4a8be6cdb1425e65714b2b644dfdc643b65fc6cc5feacbc03bfdbecd104d0a79ef638fff3eef7989391e13a726d9ce0f461dc2b4c128a7bf39409603d802d824 SHA512 456e58aef2c6b2e10ae47a98b082eba1a1cc51adabcedcb1eaa1c46d7207582b009432f911f34285d124789d1c48b62b47137208b9f07e6e9db0a55a78a95ac3
-MISC metadata.xml 508 BLAKE2B 7de11c7aab57d63ea14d970499459d6d9e9293532b5d87766a2e7b4c26716599ae536aa6d4ecb640684ce917c358a5caceeb15703692fc28043a704b372a0960 SHA512 f4e516bfae05e77bc60eacecaba362ee1709b6d787271df4fa302a438ce682725cb22d7f7b81d3531d0bff548774626ce6b14ac4225e73a4057a505750ae214f
diff --git a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch b/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch
deleted file mode 100644
index d3ec216b4c13..000000000000
--- a/games-roguelike/wrogue/files/wrogue-0.8.0b-ldflags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/linux.mak	2010-10-14 11:07:22.000000000 +0200
-+++ b/src/linux.mak	2010-10-14 11:08:00.000000000 +0200
-@@ -19,7 +19,7 @@
- # common compiler/linker flags

- #

- CFLAGS=-I./include -I./lib -std=c89 `sdl-config --cflags`

--LDFLAGS=-lm `sdl-config --libs`

-+LDLIBS=-lm `sdl-config --libs`

- 

- 

- SRC=\

-@@ -40,7 +40,7 @@
- #

- .PHONY: release

- release: CFLAGS += -pipe -O2 -fomit-frame-pointer -march=i686

--release: LDFLAGS += -Wl,-O1

-+release: LDLIBS += -Wl,-O1

- release: STRIP_BINARY = yes

- release: build

- 

-@@ -94,7 +94,7 @@
- 	@$(CC) $(CFLAGS) -o $@ -c $<

- 

- $(EXE): $(OBJ)

--	@$(CC) $(OBJ) $(LDFLAGS) -o $@

-+	$(CC) $(LDFLAGS) $(OBJ) $(LDLIBS) -o $@

- 

- 

- 

diff --git a/games-roguelike/wrogue/metadata.xml b/games-roguelike/wrogue/metadata.xml
deleted file mode 100644
index c73918db6255..000000000000
--- a/games-roguelike/wrogue/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Warp Rogue is a gothic science fantasy roguelike game. It features RPG-like game
-mechanics, recruitable NPCs, and a consistent theme.
-</longdescription>
-	<upstream>
-		<remote-id type="freecode">wrogue</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild b/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
deleted file mode 100644
index 074880df4a8e..000000000000
--- a/games-roguelike/wrogue/wrogue-0.8.0b-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Gothic science fantasy roguelike game"
-HOMEPAGE="https://freecode.com/projects/wrogue"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[video]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/AppData\[0\]/ s:AppData.*:strcpy(AppData, \"/usr/share/${PN}/\");:" \
-		src/lib/appdir.c \
-		|| die "sed failed"
-}
-
-src_compile() {
-	local myCPPFLAGS="-std=c99 -Iinclude -Ilib -Iui -Igenerate"
-	local myCFLAGS="$(sdl-config --cflags) ${CFLAGS}"
-	emake -C src -f linux.mak STRIP_BINARY=NO \
-		CFLAGS="${myCPPFLAGS} ${myCFLAGS}" release
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r data
-	dodoc changes.txt
-
-	newicon data/ui/icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} "Warp Rogue" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-roguelike/zangband-2.7.4c b/games-roguelike/zangband-2.7.4c
new file mode 100644
index 000000000000..5e0e6e6b7efd
--- /dev/null
+++ b/games-roguelike/zangband-2.7.4c
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= ) x11-libs/libXaw x11-base/xorg-proto >=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 enhanced version of the Roguelike game Angband
+EAPI=5
+HOMEPAGE=http://www.zangband.org/
+IUSE=tk
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=Moria
+RDEPEND=tk? ( dev-lang/tcl:0= dev-lang/tk:0= ) x11-libs/libXaw games-misc/games-envd
+SLOT=0
+SRC_URI=ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-2.7.4c.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0b053f02d9403dc758a4739035d532d2
diff --git a/games-roguelike/zangband/Manifest b/games-roguelike/zangband/Manifest
deleted file mode 100644
index 689c0b875046..000000000000
--- a/games-roguelike/zangband/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX zangband-2.7.4c-configure.patch 1506 BLAKE2B a1fe4d0c0f1ce58e9487b282d9a0b5e363016c8df93141c6ef3fd63636693e696ad08d2e57242e2b62670257a395f623c795983dc646981f9bec0df99c244a26 SHA512 a5f0e8265aa05da7881b0e194bd4b1cc07d1376ad14d20bb4707d08ba1042a919d57f5ec7a8c990fd1d7f13d9dd8e5f147c1816eb99f2589dfdf0d399161c3ea
-AUX zangband-2.7.4c-makefile.patch 631 BLAKE2B 0266dbb4b40ef515ac6ab0c1f807fe56ea7f5254f43803900330dfe4e573283b484c88c1e3d953a6e11beec2e12b4ddf7c87495bf8e11a996ed3f2ffe4ab4620 SHA512 c6453d867336a7974757b1240a28715fd0e801d59f61fed23d053be86c7cdf6ea07bc874415b860076a4e5fd08537eff17793f0caa52a2bdb219514a7b8d1fd8
-AUX zangband-2.7.4c-rng.patch 285 BLAKE2B fa32ebcf9ce2e2da9f004d6973c19355e9ba813d870a5e309084f008ea014452f0d1597d6f92a370f46b29a2571b2914d6519c31b4af506daf6c5ef27271c31c SHA512 ff6e63d15c8d6243b24fc580c8e21c556edf578b5c31b6c0af62db8f096e4e47ebe50d201811d834ba32af678e5c6775b4d4426295dd3d87dbd8ce798d13528c
-AUX zangband-2.7.4c-tk85.patch 1405 BLAKE2B 082065c1549874160c348d534167a440ef57ee1d74a4f1fc3f290360216ab58a19e2717d4e8f387d925dc8e67dffd7245ea1309d55d2b4888e6f37d16356f182 SHA512 358edb61b0703dabbe780a2fdca284b80c1fd68dba16e1b70de42b96c7407e5eaf6d9304789c2a37098c1ed2c10690731c9ad10002995f82c6289c1657d2e2c3
-DIST zangband-2.7.4c.tar.gz 2821355 BLAKE2B 5d541ad0e24d61000194beb6d5139b3ff5236de3e48ace9861716c953303f5b37c855c933e7aaab711ff7389a7f81e644654535f88f83cd999484d3e4254f4ad SHA512 491dfeb72b6eb34f7feaa45d5360014da8eaeccd173dd75b3f7a1c2034e4fb634817493957b75babc0d9600077a80d88529cf2e86769948fc86d05e59958356e
-EBUILD zangband-2.7.4c.ebuild 1587 BLAKE2B c1696398fe6e4447110bbdd1f0f1960601af60cf39c7b2f13b9b784e7e5fecf979ad7e0d8e460b24f0d43361485edefe3cef648ff1a081b0760fbda546e7e7a5 SHA512 56a411b47d93d89f7dc779d768af1dc0efe39a209064d78aec2047556e85405764eaa75c6e2b3e75165074c3ecb2bee3db3288cdeca7dbb72f2b3abef3c45601
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch b/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
deleted file mode 100644
index 756ea757845c..000000000000
--- a/games-roguelike/zangband/files/zangband-2.7.4c-configure.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- configure.in.orig
-+++ configure.in
-@@ -236,48 +236,5 @@
- AC_CHECK_FUNCS([Tk_SetClassProcs TkpSync])
- AC_CHECK_FUNCS([mkstemp usleep getpwuid getpwnam shmget])
- 
--dnl A nice function to test compiler options (like warnings)
--AC_DEFUN(AC_CHECK_CC_OPT,
--[FLAG=`echo zangband_cv_cflag_$1 | sed s/-/_/g`
--AC_CACHE_CHECK([whether ${CC-cc} accepts $1],
--[$FLAG],
--[echo 'void f(void); void f(){}' > conftest.c
--if test -z "`${CC-cc} -c ${CFLAGS} $1 conftest.c 2>&1`"; then
--  eval $FLAG=yes
--else
--  eval $FLAG=no
--fi])
--if test ${!FLAG} = yes ; then
--  CFLAGS="$1 $CFLAGS"
--fi
--])
--
--dnl Check for lots of extra warning options
--AC_CHECK_CC_OPT(-pedantic)
--AC_CHECK_CC_OPT(-W)
--AC_CHECK_CC_OPT(-Wall)
--AC_CHECK_CC_OPT(-Wmissing-prototypes)
--AC_CHECK_CC_OPT(-Wmissing-declarations)
--AC_CHECK_CC_OPT(-Wno-long-long)
--AC_CHECK_CC_OPT(-Wwrite-strings)
--AC_CHECK_CC_OPT(-Wpointer-arith)
--AC_CHECK_CC_OPT(-Wbad-function-cast)
--AC_CHECK_CC_OPT(-Waggregate-return)
--AC_CHECK_CC_OPT(-Wstrict-prototypes)
--AC_CHECK_CC_OPT(-Wredundant-decls)
--dnl AC_CHECK_CC_OPT(-Wunreachable-code)
--AC_CHECK_CC_OPT(-Wchar-subscripts)
--AC_CHECK_CC_OPT(-Wimplicit)
--AC_CHECK_CC_OPT(-Wparentheses)
--AC_CHECK_CC_OPT(-Wsequence-point)
--AC_CHECK_CC_OPT(-Wreturn-type)
--AC_CHECK_CC_OPT(-Wswitch)
--AC_CHECK_CC_OPT(-Wunused)
--AC_CHECK_CC_OPT(-Wuninitialized)
--AC_CHECK_CC_OPT(-Wundef)
--AC_CHECK_CC_OPT(-Wnested-externs)
--AC_CHECK_CC_OPT(-Wdeclaration-after-statement)
--AC_CHECK_CC_OPT(-Wsign-compare)
--
- AC_CONFIG_FILES([makefile])
- AC_OUTPUT
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch b/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
deleted file mode 100644
index bae74904cf02..000000000000
--- a/games-roguelike/zangband/files/zangband-2.7.4c-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- makefile.in.orig
-+++ makefile.in
-@@ -111,17 +111,6 @@
- %.o: %.c
- 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $< -c -o $@ $(DEFS)
- 
--##
--## Hack - make sure the build system is consistant.
--##
--makefile: configure makefile.in
--	$(CONFIGURE)
--	
--configure: configure.in
--	aclocal
--	autoheader
--	autoconf
--
- dirs:
- 	-mkdir $(DESTDIR)
- 	-mkdir $(addprefix $(DESTDIR),$(filter-out $(srcdirlist), $(dirlist)))
-@@ -205,7 +194,7 @@
- 	@echo $(srcdirlist) $(srcfiles)
- 
- # Hack to remake files depending on DEFAULT_PATH
--.default_path: makefile
-+.default_path: 
- 	@if [ ! -r .default_path ]; then \
- 		echo "$(DESTDIR)" > .default_path; \
- 	fi
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-rng.patch b/games-roguelike/zangband/files/zangband-2.7.4c-rng.patch
deleted file mode 100644
index 4ac1b101dc8c..000000000000
--- a/games-roguelike/zangband/files/zangband-2.7.4c-rng.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zangband/src/z-rand.c
-+++ zangband/src/z-rand.c
-@@ -168,7 +168,7 @@
- 			r = (Rand_state[j] += Rand_state[Rand_place]);
- 
- 			/* Hack -- extract a 28-bit "random" number */
--			r = (r >> 4) / n;
-+			r = ((r >> 4) & 0x0FFFFFFF) / n;
- 
- 			/* Advance the index */
- 			Rand_place = j;
diff --git a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch b/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
deleted file mode 100644
index 73ea2ab5f9dc..000000000000
--- a/games-roguelike/zangband/files/zangband-2.7.4c-tk85.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.orig
-+++ configure.in
-@@ -141,12 +141,12 @@
- ])
- 
- if test "x$with_tcltk" != "xno" ; then
--	AC_SEARCH_LIBS([Tcl_Init], [tcl84 tcl8.4 tcl83 tcl8.3],
--	AC_SEARCH_LIBS([Tk_Init], [tk84 tk8.4 tk83 tk8.3],
--	    [AC_SEARCH_HEADERS(/usr/local/include/tcl.h /usr/local/include/tcl/tcl.h /usr/include/tcl.h /usr/include/tcl8.4/tcl.h /usr/local/include/tcl8.4/tcl.h /usr/include/tcl8.3/tcl.h /usr/local/include/tcl8.3/tcl.h
-+	AC_SEARCH_LIBS([Tcl_Init], [tcl86 tcl8.6 tcl85 tcl8.5 tcl84 tcl8.4 tcl83 tcl8.3],
-+	AC_SEARCH_LIBS([Tk_Init], [tk86 tk8.6 tk85 tk8.5 tk84 tk8.4 tk83 tk8.3],
-+	    [AC_SEARCH_HEADERS(/usr/local/include/tcl.h /usr/local/include/tcl/tcl.h /usr/include/tcl.h /usr/include/tcl8.5/tcl.h /usr/include/tcl8.4/tcl.h /usr/local/include/tcl8.4/tcl.h /usr/include/tcl8.3/tcl.h /usr/local/include/tcl8.3/tcl.h
- 		    ,BASE_TCL_DIR)
- 		
--		AC_SEARCH_HEADERS("$BASE_TCL_DIR/tk.h" /usr/local/include/tk.h /usr/local/include/tcl/tk.h /usr/include/tk.h /usr/include/tk8.4/tk.h /usr/local/include/tk8.4/tk.h /usr/include/tk8.3/tk.h /usr/local/include/tk8.3/tk.h
-+		AC_SEARCH_HEADERS("$BASE_TCL_DIR/tk.h" /usr/local/include/tk.h /usr/local/include/tcl/tk.h /usr/include/tk.h /usr/include/tk8.6/tk.h /usr/include/tk8.5/tk.h /usr/include/tk8.4/tk.h /usr/local/include/tk8.4/tk.h /usr/include/tk8.3/tk.h /usr/local/include/tk8.3/tk.h
- 		    ,BASE_TK_DIR)
- 		
-         dnl Checks for libraries.
diff --git a/games-roguelike/zangband/metadata.xml b/games-roguelike/zangband/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-roguelike/zangband/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-roguelike/zangband/zangband-2.7.4c.ebuild b/games-roguelike/zangband/zangband-2.7.4c.ebuild
deleted file mode 100644
index 90b697ebbc8a..000000000000
--- a/games-roguelike/zangband/zangband-2.7.4c.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils games
-
-DESCRIPTION="An enhanced version of the Roguelike game Angband"
-HOMEPAGE="http://www.zangband.org/"
-SRC_URI="ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/${P}.tar.gz"
-
-LICENSE="Moria"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="tk"
-
-RDEPEND="
-	tk? (
-		dev-lang/tcl:0=
-		dev-lang/tk:0=
-		)
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-tk85.patch \
-		"${FILESDIR}"/${P}-rng.patch \
-		"${FILESDIR}"/${P}-configure.patch \
-		"${FILESDIR}"/${P}-makefile.patch
-	mv configure.in configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	egamesconf \
-		--datadir="${GAMES_DATADIR_BASE}" \
-		--with-setgid="${GAMES_GROUP}" \
-		--without-gtk \
-		$(use_with tk tcltk)
-}
-
-src_install() {
-	# Keep some important dirs we want to chmod later
-	keepdir "${GAMES_DATADIR}"/${PN}/lib/{apex,user,save,bone,info,xtra/help,xtra/music}
-
-	# Install the basic files but remove unneeded crap
-	emake DESTDIR="${D}/${GAMES_DATADIR}"/${PN}/ installbase
-	rm "${D}${GAMES_DATADIR}"/${PN}/{angdos.cfg,readme,z_faq.txt,z_update.txt}
-
-	# Install everything else and fix the permissions
-	dogamesbin zangband
-	dodoc readme z_faq.txt z_update.txt
-	find "${D}${GAMES_DATADIR}/zangband/lib" -type f -exec chmod a-x \{\} +
-
-	prepgamesdirs
-	# All users in the games group need write permissions to
-	# some important dirs
-	fperms -R g+w "${GAMES_DATADIR}"/zangband/lib/{apex,data,save,user}
-}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 37a901ac4d4a..49d34aa1c4f3 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/adonthell-0.3.5-r2 b/games-rpg/adonthell-0.3.5-r2
new file mode 100644
index 000000000000..1f8ab50e9722
--- /dev/null
+++ b/games-rpg/adonthell-0.3.5-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freetype media-libs/libogg media-libs/libsdl:0[X,video,sound] media-libs/libvorbis media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib nls? ( virtual/libintl ) dev-lang/swig virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=roleplaying game engine
+EAPI=6
+HOMEPAGE=http://adonthell.nongnu.org/
+IUSE=doc nls python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freetype media-libs/libogg media-libs/libsdl:0[X,video,sound] media-libs/libvorbis media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf sys-libs/zlib nls? ( virtual/libintl )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=09f13c61477b8cdf7b1c4017559d55dc
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
deleted file mode 100644
index 71027757e66c..000000000000
--- a/games-rpg/adonthell/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX adonthell-0.3.5-configure.in.patch 3314 BLAKE2B 8361ee19dae579666d6adc585a6ac3da1b0059fdf70f446c0db9a75ee34df86f26f781624ed736f1b23c598e30359b2a6d4e006fb7da9b619c51ed9ad7518cd9 SHA512 4bd82920dac28c28b96b4ec0e5251c3627a3284ebe6e55eb889e542494ba44b13de8e24210b229e9f37f2259c941743792133d0e9a4b91219b6dc366584d16ed
-AUX adonthell-0.3.5-format.patch 320 BLAKE2B c73d15a7aefc3b15df17740c3db7bfa9eabf0d5e322cf5db040d1a202c8a17b5fed6e485815a797eca3b1a98fce1c05d893c5c61231cb38196d6efacf5a1e2d0 SHA512 901d0cc307b1fbf78708a2d6cd8e6d6284ee66c9ac23bed64b1bd0685bc5adc113a8816bca80c44999d5558e6b6e635bd58c1d1894d8e8631fa97da6309b554f
-AUX adonthell-0.3.5-freetype_pkgconfig.patch 422 BLAKE2B 302dd008224d1e5a48bbd7a450c0b9dfcf533c3e75dfdcf5b170a91c16ad27c23553484ad652dfbbbc623ca7bd40fa55ed690b1a43093b2dd1545dd4bc95c1f8 SHA512 027d2b6ddd9448e305b5a2fea80a345d9af578fe37361501e8653e9647acb4b046887438f8dee7c2c38c371f6b001e3d2fcb0662e61d049876c4425954af4bcf
-AUX adonthell-0.3.5-gcc46.patch 432 BLAKE2B 66706aea9dbcd8827dd3a7054242066a49546e742ff3c2b8edc6262a786230f1269cb1f7f552373af5da95ee3b8136a6fbba490ffeda60ea56236ed992c073d6 SHA512 57d23fc4ef209b6e07b5e9d039db257c564e874914d0b9d9abda5d62608b9f6b32252667fa4638e9dfc7632111cafec5fad634992dce7b76309d177450fb0404
-AUX adonthell-0.3.5-glibc-2.10.patch 792 BLAKE2B 26a724ff84b31a66f6a8ed2dfdc917b220dc1083a017b4a2311c7a91d8ed5b493ca4ba3ac507c2e243980dd18dd1f9fffb434ad38968bb950a3747a5fb16b812 SHA512 6aaf6eced04b777804271dbee082c3ac0d39381e079065ff714bbb66b3ac8be96094e37bfa5e5f986ef91ffe6902f91f8ca7777ae7f3b277c56db37562958aff
-DIST adonthell-src-0.3.5.tar.gz 877439 BLAKE2B 995102c30b5557aaa02ab463a9c609251175b1a590e8bc89b457feead74391dc3756c8c06bba580a5f2b02cbe4cd87f27249364be3355409e3507269fb653094 SHA512 bf970b809b22a8563b196d6817553dd58dc9cb09b3bd99eb99d5c8e6f0828cf59965633acd4fdf7835dd9cb732cbb3290d3663521201ece7569cad2f494fb15d
-EBUILD adonthell-0.3.5-r2.ebuild 1499 BLAKE2B 2c786671b7f8dfdebe8d861f1e665134e3c50395cf36b7e99f4087e6863fddc1a8192401c2ed232b8c82709f512e5144af393219030b9ecc5cb0d3d8f926ff2e SHA512 2b5c22570ee96b127f89fb85640e61b6a46ec7d213fe28a16bfb7ed5f3ea21da18599924d3f2a450f88932c86ffbcc2db4522c6fd6dce5f91c7345c856588dd9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild b/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
deleted file mode 100644
index f8dc851093b5..000000000000
--- a/games-rpg/adonthell/adonthell-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-single-r1
-
-DESCRIPTION="roleplaying game engine"
-HOMEPAGE="http://adonthell.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	media-libs/freetype
-	media-libs/libogg
-	media-libs/libsdl:0[X,video,sound]
-	media-libs/libvorbis
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-lang/swig
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${PV/a/}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-configure.in.patch
-		"${FILESDIR}"/${P}-format.patch
-		"${FILESDIR}"/${P}-gcc46.patch
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "/AC_PATH_PROGS/s:python:${EPYTHON}:" \
-		configure.in || die "sed failed"
-	rm -f ac{local,include}.m4
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-py-debug \
-		$(use_enable nls) \
-		$(use_enable doc)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir /usr/share/${PN}/games
-	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
-}
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch b/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
deleted file mode 100644
index 8aaad58894b7..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-configure.in.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -13,7 +13,7 @@
- AM_INIT_AUTOMAKE([])
- AM_CONFIG_HEADER(config.h)
- 
--CFLAGS="-g -Wall -fno-exceptions"
-+CXXFLAGS="$CXXFLAGS -Wall -fno-exceptions"
- CPPFLAGS=""
- DEFS=""
- 
-@@ -163,10 +163,8 @@
- 
-    dnl Extract the version using Python, check against 2.2+
- 
--   changequote(<<, >>)
--   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'`
--   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'`
--   changequote([, ])
-+   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'`
-+   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'`
- 
-    if test $PYTHON_VERSION -lt 22; then
- 	echo "Sorry, you need to have Python 2.2+ installed - update your version!"
-@@ -176,9 +174,7 @@
-    dnl Find the Python.h header file
- 
-    AC_MSG_CHECKING(for Python header files)
--   changequote(<<, >>)
--   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'`
--   changequote([, ])
-+   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'`
- 
-    if test -r "$PYINCLUDE/Python.h"; then
-       PY_CFLAGS="-I$PYINCLUDE"
-@@ -191,10 +187,8 @@
-    dnl Find the Python library
-    AC_MSG_CHECKING(for Python library)
-    PYLIB=""
--   changequote(<<, >>)
-    PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'`
--   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'`
--   changequote([, ])
-+   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'`
- 
-    dnl look for a framework build of python first
-    fw=`echo "$PYPREFIX" | sed 's/.*\(Python\.framework\).*/\1/;'`
-@@ -233,19 +227,9 @@
-    fi
-    dnl Get the libraries that python depends on
- 
--   AC_PATH_PROG(haveldd, ldd)
-    AC_MSG_CHECKING(for Python's dependencies)
- 
--   if test x$haveldd != x ; then
--       changequote(<<, >>)
--       py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'`
--       for py_lib in $py_deps ; do
--         if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then
--            PY_DEPS="$PY_DEPS $py_lib"
--         fi
--      done
--      changequote([, ])
--   fi
-+   PY_DEPS="$PY_DEPS `python-config --libs` -lutil"
- 
-    case $target in
-        *-sun-solaris*)
-@@ -293,11 +277,9 @@
- if test "$P_SWIG" != "no" ; then
-     $P_SWIG -version &> swig.ver
- 
--    changequote(<<, >>)
--    swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'`
--    swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'`
--    swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'`
--    changequote([, ])
-+    swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'`
-+    swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'`
-+    swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'`
- 
-     rm -f swig.ver
- 
-@@ -387,7 +369,7 @@
- dnl Generate our compiler arguements
- dnl ********************************
- 
--CXXFLAGS="$CFLAGS $DEFS $INCLUDES"
-+CXXFLAGS="$CXXFLAGS $DEFS $INCLUDES"
- 
- AC_SUBST(CXX) 
- AC_SUBST(CXXFLAGS) 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch b/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
deleted file mode 100644
index fa85d7858109..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/py_adonthell_wrap.cc	2014-10-20 14:21:57.495642785 +0200
-+++ b/src/py_adonthell_wrap.cc	2014-10-20 14:22:35.019293237 +0200
-@@ -867,7 +867,7 @@
-     Py_DECREF(old_str);
-     Py_DECREF(value);
-   } else {
--    PyErr_Format(PyExc_RuntimeError, mesg);
-+    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
-   }
- }
- 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch b/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
deleted file mode 100644
index ff11ffa96f5f..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- adonthell-0.3.5/configure.in
-+++ adonthell-0.3.5/configure.in
-@@ -17,6 +17,8 @@
- CPPFLAGS=""
- DEFS=""
- 
-+PKG_PROG_PKG_CONFIG
-+
- dnl ********************
- dnl Checks for programs.
- dnl ********************
-@@ -144,8 +146,7 @@
- dnl Check for FreeType2
- dnl *******************
- 
--AC_CHECK_FT2(6.0.0,
--    :,
-+PKG_CHECK_MODULES(FT2, freetype2 >= 6.0.0,,
-     AC_MSG_ERROR([*** Freetype version >= 6.0.0 not found!])
- )
- 
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch b/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
deleted file mode 100644
index 7e54ec5ee03a..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/win_event.cc	2011-04-18 08:24:16.000000000 +0200
-+++ b/src/win_event.cc	2011-04-18 08:25:18.000000000 +0200
-@@ -34,8 +34,9 @@
- 	
- 	    case DESTROY:
- 	    {
-+		Functor0wRet<bool> func0ret;
- 	        set_callback_destroy (
--	        makeFunctor (&Functor0wRet<bool>(), *callback, &py_callback::callback_func0ret));
-+	        makeFunctor (&func0ret, *callback, &py_callback::callback_func0ret));
- 	        break;
- 	    }
- 	
diff --git a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch b/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
deleted file mode 100644
index 7aec808cd5f1..000000000000
--- a/games-rpg/adonthell/files/adonthell-0.3.5-glibc-2.10.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naurp adonthell-0.3.4-orig/src/dialog.cc adonthell-0.3.4/src/dialog.cc
---- adonthell-0.3.4-orig/src/dialog.cc	2005-03-10 12:39:41.000000000 -0600
-+++ adonthell-0.3.4/src/dialog.cc	2009-07-26 15:57:01.410882131 -0600
-@@ -265,7 +265,8 @@ string dialog::scan_string (const char *
- {
-     u_int32 begin, end, len;
-     PyObject *result;
--    char *tmp, *start, *mid, *str = NULL;
-+    const char *start;
-+    char *tmp, *mid, *str = NULL;
-     character *the_player = data::the_player;
-     string newstr (s); 
- 
-@@ -318,7 +319,7 @@ string dialog::scan_string (const char *
- 
-         // Error!
-         cout << "\n*** Error, unknown macro " << start << flush;
--        start[0] = ' ';
-+        newstr[newstr.length () - strlen (start)] = ' ';
-     }
-     
-     // execute python functions
diff --git a/games-rpg/adonthell/metadata.xml b/games-rpg/adonthell/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/adonthell/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/arx-fatalis-data-1.21-r4 b/games-rpg/arx-fatalis-data-1.21-r4
new file mode 100644
index 000000000000..b88c5d487cf0
--- /dev/null
+++ b/games-rpg/arx-fatalis-data-1.21-r4
@@ -0,0 +1,16 @@
+DEFINED_PHASES=install nofetch pretend setup unpack
+DEPEND=app-arch/innoextract cdinstall? ( app-arch/cabextract )
+DESCRIPTION=Arx Fatalis data files
+EAPI=5
+HOMEPAGE=https://www.arkane-studios.com/uk/arx.php
+IUSE=gog cdinstall
+KEYWORDS=~amd64 ~x86
+LICENSE=cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=games-rpg/arx-libertatis
+REQUIRED_USE=^^ ( cdinstall gog )
+RESTRICT=binchecks mirror gog? ( fetch )
+SLOT=0
+SRC_URI=cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe ) gog? ( setup_arx_fatalis_2.0.0.7.exe )
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=58ce7c26e30b70096fffb5dc61ffa0ee
diff --git a/games-rpg/arx-fatalis-data/Manifest b/games-rpg/arx-fatalis-data/Manifest
deleted file mode 100644
index ee19c2b54f9e..000000000000
--- a/games-rpg/arx-fatalis-data/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ArxFatalis_1.21_MULTILANG.exe 9064611 BLAKE2B 42a81491ff470843a80bd6f801a1d8d5b1295603c3b6ec759f545d6fed9530b64ca684b772735f92187eb4eb613b12f68ce7d0491a157123578476b835bb40eb SHA512 885260c6173ee5f2d6d6072bcfd14d085f11b997a0ce45cbdee9a347612e96da13477ef7d71b9c015fb02f2e47bdfb968a2aa89b0c92e9327abbd75b724e47c2
-DIST setup_arx_fatalis_2.0.0.7.exe 525046992 BLAKE2B 558bffc8f4a0096761a9b1c8003b8127480bf03b1198b943dfe3c0bc8c6b9642275f86f5f4e9c6bbc2211bf48e38bebef634b24196b48d1d5520abf75254033f SHA512 08be7870d02ed6da8cedceb652906ea169eedcb44497a4517ef6a42d9db37403b5146b9e5a3a628a465f23088b0c09d958719e05454dcbb5ac12225c32d35942
-EBUILD arx-fatalis-data-1.21-r4.ebuild 2744 BLAKE2B ae9e493f0c251a118593bf5df93604f108ab221deb91d5eee16bf50b54d5b36968b437a3fbbf4dc6c76bf3a66cf971d8a5f9b80c2f6e7b8ad64c4195fb81d4d0 SHA512 38259961c0613a2e7eb349f5fecaf9fdb609070cd8613506945c6fcd41c7fabe0b687055404ef50183561398c51a50a576873e5046282d8ecfb725fc0715b810
-MISC metadata.xml 568 BLAKE2B df7b3692077bfc0e63f920d5bdb61072498ec1de1de6add84d2756ccf384930f2552aa5f5ee50f1732e7030a9d266c6888ee5bf1fe91098e550cef16e50b970d SHA512 a4fd63f6c3ce3eb957694c1a2e61fa13783a09b7072832371c6ac8dd65490d0cc9206467fb88c494a864ae6e1df1d530a52f38b663df9f601feeeba8df5f0555
diff --git a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild b/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
deleted file mode 100644
index e8f9d5770890..000000000000
--- a/games-rpg/arx-fatalis-data/arx-fatalis-data-1.21-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CDROM_OPTIONAL="yes"
-inherit eutils cdrom check-reqs
-
-DESCRIPTION="Arx Fatalis data files"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="cdinstall? ( http://download.zenimax.com/arxfatalis/patches/1.21/ArxFatalis_1.21_MULTILANG.exe )
-	gog? ( setup_arx_fatalis_2.0.0.7.exe )"
-
-LICENSE="cdinstall? ( ArxFatalis-EULA-JoWooD ) gog? ( GOG-EULA )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gog"
-REQUIRED_USE="^^ ( cdinstall gog )"
-RESTRICT="binchecks mirror gog? ( fetch )"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/innoextract
-	cdinstall? ( app-arch/cabextract )"
-
-CHECKREQS_DISK_BUILD="621M"
-CHECKREQS_DISK_USR="617M"
-
-S=${WORKDIR}
-
-detect_language() {
-	speech_checksum=$(find '.' -iname "speech.pak" \
-		-exec md5sum -b '{}' \; | sed "s/ .*//g")
-	if [[ -z $speech_checksum ]] ; then
-		speech_checksum=$(find '.' -iname "speech_default.pak" \
-			-exec md5sum -b '{}' \; | sed "s/ .*//g")
-	fi
-
-	# check if the checksum is of a known localisation and set data_lang to
-	# the language string to be used with the 1.21 patch installer
-	case "$speech_checksum" in
-		'4c3fdb1f702700255924afde49081b6e') data_lang='german' ;;
-		# Bundled version of AF included with NVIDIA card
-		'ab8a93161688d793a7c78fbefd7d133e') data_lang='german' ;;
-		'4e8f962d8204bcfd79ce6f3226d6d6de') data_lang='english' ;;
-		'2f88c67ae1537919e69386d27583125b') data_lang='spanish' ;;
-		'4edf9f8c799190590b4cd52cfa5f91b1') data_lang='french' ;;
-		'81f05dea47c52d43f01c9b44dd8fe962') data_lang='italian' ;;
-		'677163bc319cd1e9aa1b53b5fb3e9402') data_lang='russian' ;;
-		'') eerror "speech*.pak not found"
-			die "speech*.pak not found" ;;
-		*) eerror "unsupported data language - speech*.pak checksum:" \
-		        "$speech_checksum" \
-				"please file a gentoo bug"
-			die "unsupported data language, file a gentoo bug" ;;
-	esac
-}
-
-pkg_nofetch() {
-	einfo "Please download ${A} from your GOG.com account after buying Arx Fatalis"
-	einfo "and put it into ${DISTDIR}."
-}
-
-src_unpack() {
-	local data_lang
-
-	if use cdinstall ; then
-		cdrom_get_cds bin/Arx.ttf
-		find "${CDROM_ROOT}" -iname "setup*.cab" -exec cabextract '{}' \;
-		detect_language
-	else
-		# gog only offers english
-		data_lang="english"
-	fi
-
-	einfo "Data language: $data_lang"
-	innoextract --lowercase --language=${data_lang} \
-		"${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	insinto /usr/share/arx
-	doins -r app/{graph,misc}
-	find . -iname "*.pak" -exec doins '{}' \;
-
-	dodoc app/{manual,map}.pdf
-
-	# convert to lowercase
-	cd "${D}"
-	find . -type f -exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-}
diff --git a/games-rpg/arx-fatalis-data/metadata.xml b/games-rpg/arx-fatalis-data/metadata.xml
deleted file mode 100644
index 5890880ff15c..000000000000
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>daniel@constexpr.org</email>
-		<name>Daniel Scharrer</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="gog">Extract the data from the GOG.com installer.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/arx-fatalis-demo-0 b/games-rpg/arx-fatalis-demo-0
new file mode 100644
index 000000000000..9ca063371f37
--- /dev/null
+++ b/games-rpg/arx-fatalis-demo-0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst preinst prepare setup unpack
+DEPEND=app-arch/cabextract app-arch/unzip
+DESCRIPTION=Arx Fatalis demo
+EAPI=4
+HOMEPAGE=https://www.arkane-studios.com/uk/arx.php
+KEYWORDS=~amd64 ~x86
+LICENSE=ArxFatalisDemo
+RDEPEND=games-rpg/arx-libertatis games-misc/games-envd
+RESTRICT=fetch
+SLOT=0
+SRC_URI=arx_demo_english.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c4e62dc54be25cd597cd6cabb75b6dcd
diff --git a/games-rpg/arx-fatalis-demo/Manifest b/games-rpg/arx-fatalis-demo/Manifest
deleted file mode 100644
index c39d62a34cdc..000000000000
--- a/games-rpg/arx-fatalis-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST arx_demo_english.zip 160545354 BLAKE2B 2693bdd2546c8788eb8c9fc303065f880c3995cfa1d75ca613b8ebb32238a3852dd7eeb20731f7c685521b669c47df45bcf22842772227be5cc3483ec3869c77 SHA512 0cbf0d6da1a373ed29edc49c65ed431117c868ec7bcab04166abd59f5d799460faec506baf191c83fa7c61372888009abb260d8a50e28507a5ec8ab7913a9ad7
-EBUILD arx-fatalis-demo-0.ebuild 1289 BLAKE2B 0936a3355f2ae853783df034db76246b0a953b6315b1e46b173c9337d00609111eccdf43094ec7741444c9e74b32494f94ad1c9e9edc2182454ae738464af955 SHA512 99a20d0f550aff284c062c5c7da2444ec9b713fd0ee610e406d55f9d8eee7f0b2857ddc16e3515a7143daf0538d69b53045044e1695c2ebc26b5833f676a73c5
-MISC metadata.xml 481 BLAKE2B 3200a8ff8937163cf8132a3387d21516b532df01bddcdd377eaf84b3c43ba54b766f2c8def173b2ef4bc32d660b022282295207918809437d3daa85d28b3bf7a SHA512 25957616a3defb79f4ffe4ea925d7eea8f121995bbef149ad8176735eba4597b05d0467457834387ebab951a7b205ff7a1dfd5b272de36aa2ab783553d649e18
diff --git a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild b/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
deleted file mode 100644
index b3c07e2abd36..000000000000
--- a/games-rpg/arx-fatalis-demo/arx-fatalis-demo-0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils games
-
-DESCRIPTION="Arx Fatalis demo"
-HOMEPAGE="https://www.arkane-studios.com/uk/arx.php"
-SRC_URI="arx_demo_english.zip"
-
-LICENSE="ArxFatalisDemo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch"
-
-RDEPEND="games-rpg/arx-libertatis"
-DEPEND="app-arch/cabextract
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-pkg_nofetch() {
-	einfo "Please find and download ${SRC_URI} and put it into ${DISTDIR}."
-	einfo "There is a list of possible download locations at"
-	einfo "http://wiki.arx-libertatis.org/Getting_the_game_data#Demo"
-}
-
-src_unpack() {
-	unpack ${A}
-	cabextract Setup1.cab || die "cabextract failed"
-	cabextract Setup2.cab || die "cabextract failed"
-	cabextract Setup3.cab || die "cabextract failed"
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r *.pak bin/*.pak
-	insinto "${GAMES_DATADIR}/${PN}/misc"
-	doins bin/Logo.bmp bin/Arx.ttf
-
-	# convert to lowercase
-	cd "${D}"
-	find . -type f -exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-	make_desktop_entry "arx --data-dir=${GAMES_DATADIR}/arx-fatalis-demo" \
-		"Arx Fatalis Demo" arx-libertatis
-
-	prepgamesdirs
-}
diff --git a/games-rpg/arx-fatalis-demo/metadata.xml b/games-rpg/arx-fatalis-demo/metadata.xml
deleted file mode 100644
index a1d60835a707..000000000000
--- a/games-rpg/arx-fatalis-demo/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>daniel@constexpr.org</email>
-		<name>Daniel Scharrer</name>
-	</maintainer>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/arx-libertatis-1.1.2-r1 b/games-rpg/arx-libertatis-1.1.2-r1
new file mode 100644
index 000000000000..0b1442c577da
--- /dev/null
+++ b/games-rpg/arx-libertatis-1.1.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) dev-libs/boost virtual/pkgconfig static? ( media-libs/glew[static-libs] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Cross-platform port of Arx Fatalis, a first-person role-playing game
+EAPI=5
+HOMEPAGE=http://arx-libertatis.org/
+IUSE=c++0x debug +unity-build crash-reporter static tools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/freetype media-libs/libsdl[X,video,opengl] media-libs/openal sys-libs/zlib virtual/opengl crash-reporter? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtwidgets:5 ) !static? ( media-libs/glew ) crash-reporter? ( sys-devel/gdb ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/arx/arx-libertatis-1.1.2/arx-libertatis-1.1.2.tar.xz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c5ab8bdff03c9405726e7029f35a503
diff --git a/games-rpg/arx-libertatis/Manifest b/games-rpg/arx-libertatis/Manifest
deleted file mode 100644
index bab50e20be0b..000000000000
--- a/games-rpg/arx-libertatis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX arx-libertatis-1.1.2-cmake-3.5.patch 888 BLAKE2B 4294247d6ee5f24c7619e9b4cdfafa3efa5d5caf89d5c639a7083b4d408debfa985b95985eb0adfa680d4e2dd49f5afce0f295219eb31fe3762eca8487bff223 SHA512 c1da4981c407bc94ce87b520e2b6288fd6bac437a14dc3b54e8c2c7b01cbda0938b6995581938a2381d1f035ace95df58f3d894e8f7c6070986a5bc43f5e54c2
-DIST arx-libertatis-1.1.2.tar.xz 970608 BLAKE2B 1d4cef400db8223a930d1ff7b3bffbdcd46e47836d99f0c4545ad1bfc575b2b0ed972c9962272c043830be75a54be7992a70429d2692e5811865786370c35d6d SHA512 d4cb8187e7f63934408e38a51a44b7da03c8628820d43139507ff97ebd463b9cd7baf6cc4e85a3d4191d6e5f56850d77d07cfffc33d8f5a51378dfb41f719fb8
-EBUILD arx-libertatis-1.1.2-r1.ebuild 2475 BLAKE2B d97ee646fc453258b83ff90305887e429321cb85c41e8b8b3690afe344a85cb22b9d2cf846d36f30e7088073b1422d74af75ee0e952ee9dd988aa88a395b5797 SHA512 5bd56b938de00f8864194a3575bc7a43afe81315e2728f0e138ccbf273d7a2acafd7f035262c1dbec0912f28b34c542b4841014c360e5073e24be565f0ed51dd
-MISC metadata.xml 2564 BLAKE2B 13a668c7bbdb5a7184dbc3334a49d7e342c6400c39af01945ec9fb25ce001faa5267ef874237bafdca399acd38e322ea49f0fcf2a1b5c5eb4089a5be2decb2e3 SHA512 c34718413d4e273abffb224a307075529a3845ac3ceeef7bd38157e16ba0b222c77a2d4b7de2508901a6e0c6602462d907e269d8b83f1554639e97e3dc7133cb
diff --git a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild b/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
deleted file mode 100644
index 6d505c464f01..000000000000
--- a/games-rpg/arx-libertatis/arx-libertatis-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_WARN_UNUSED_CLI=yes
-inherit eutils cmake-utils gnome2-utils games
-
-DESCRIPTION="Cross-platform port of Arx Fatalis, a first-person role-playing game"
-HOMEPAGE="http://arx-libertatis.org/"
-SRC_URI="mirror://sourceforge/arx/${P}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="c++0x debug +unity-build crash-reporter static tools"
-
-COMMON_DEPEND="
-	media-libs/freetype
-	media-libs/libsdl[X,video,opengl]
-	media-libs/openal
-	sys-libs/zlib
-	virtual/opengl
-	crash-reporter? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5[ssl]
-		dev-qt/qtwidgets:5
-	)
-	!static? ( media-libs/glew )"
-RDEPEND="${COMMON_DEPEND}
-	crash-reporter? ( sys-devel/gdb )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-	static? ( media-libs/glew[static-libs] )"
-
-DOCS=( README.md AUTHORS CHANGELOG )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake-3.5.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# editor does not build
-	local mycmakeargs=(
-		$(cmake-utils_use_build crash-reporter CRASHREPORTER)
-		-DBUILD_EDITOR=OFF
-		$(cmake-utils_use_build tools TOOLS)
-		-DCMAKE_INSTALL_DATAROOTDIR="${GAMES_DATADIR_BASE}"
-		-DCMAKE_INSTALL_PREFIX="${GAMES_PREFIX}"
-		$(cmake-utils_use debug DEBUG)
-		-DGAMESBINDIR="${GAMES_BINDIR}"
-		-DICONDIR=/usr/share/icons/hicolor/128x128/apps
-		-DINSTALL_SCRIPTS=ON
-		-DSET_OPTIMIZATION_FLAGS=OFF
-		-DSTRICT_USE=ON
-		$(cmake-utils_use unity-build UNITY_BUILD)
-		$(cmake-utils_use_use c++0x CXX11)
-		-DUSE_NATIVE_FS=ON
-		-DUSE_OPENAL=ON
-		-DUSE_OPENGL=ON
-		-DUSE_SDL=ON
-		$(usex crash-reporter "-DUSE_QT5=ON" "")
-		$(cmake-utils_use_use static STATIC_LIBS)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  games-rpg/arx-fatalis-data (from CD or GOG)"
-	elog "  games-rpg/arx-fatalis-demo (free demo)"
-	elog
-	elog "This package only installs the game binary."
-	elog "You need the demo or full game data. Also see:"
-	elog "http://wiki.arx-libertatis.org/Getting_the_game_data"
-	elog
-	elog "If you have already installed the game or use the STEAM version,"
-	elog "run \"${GAMES_BINDIR}/arx-install-data\""
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch b/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
deleted file mode 100644
index d085afafe393..000000000000
--- a/games-rpg/arx-libertatis/files/arx-libertatis-1.1.2-cmake-3.5.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c4262bc600dc01d3ddbacc7811132b29ea46ad3b Mon Sep 17 00:00:00 2001
-From: Daniel Scharrer <daniel@constexpr.org>
-Date: Thu, 24 Mar 2016 22:47:44 +0100
-Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
-
-This makes the build system more robust against stray variables
-coming from included CMake scripts provided by the system.
-
-Fixes build with CMake 3.5.
-
-This has been fixed in master with commit 60e43c.
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 93f1ee3..8347544 100755
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -13,6 +13,11 @@ else()
- 	cmake_minimum_required(VERSION 2.8)
- endif()
- 
-+if(POLICY CMP0054)
-+	# CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
-+	cmake_policy(SET CMP0054 NEW)
-+endif()
-+
- 
- # Define configuration options
- 
--- 
-2.7.4
-
diff --git a/games-rpg/arx-libertatis/metadata.xml b/games-rpg/arx-libertatis/metadata.xml
deleted file mode 100644
index 36eb9d054450..000000000000
--- a/games-rpg/arx-libertatis/metadata.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="c++0x">Build ROOT using the C++11 standard.</flag>
-		<flag name="crash-reporter">Build a <pkg>dev-qt/qtgui</pkg>-based
-			tool that allows to submit crash information to the upstream
-			backtracker.</flag>
-		<flag name="debug">Enable asserts and debug logging.</flag>
-		<flag name="static">Link libraries statically, currently only
-			<pkg>media-libs/glew</pkg></flag>
-		<flag name="tools">Build tools that can extract the game's data and
-			save files.</flag>
-		<flag name="unity-build">Build everything in one big source file,
-			allowing for faster build times and better optimizations at
-			the cost of higher memory usage.</flag>
-	</use>
-	<longdescription lang="en">
-		Arx Libertatis is a cross-platform, open source port of
-		Arx Fatalis, a 2002 first-person role-playing game/dungeon crawler
-		developed by Arkane Studios.
-		Arx Fatalis features crafting, melee and ranged combat, as well
-		as a unique casting system where the player draws runes in real
-		time to effect the desired spell.
-		Arx Libertatis updates and improves Arx Fatalis by supporting
-		modern systems, porting the game to new systems as well as
-		eliminating bugs and limitations.
-	</longdescription>
-	<longdescription lang="de">
-		Arx Libertatis ist eine cross-platform, open source Portierung
-		von Arx Fatalis, ein Rollenspiel/Dungeon Crawler in Ego-Perspektive
-		aus dem Jahr 2002, entwickelt von Arkane Studios.
-		Arx Fatalist umfasst das Herstellen von Gegenständen,
-		Nah- und Fernkampf, sowie ein einzigartiges Magiesystem,
-		in dem der Spieler Runen in Echtzeit zeichnen muss, um einen
-		Zauberspruch auszusprechen.
-		Arx Libertatis aktualisiert und verbessert Arx Fatalis, indem
-		es moderne Systeme unterstützt, das Spiel auch zu neuen Systemen
-		portiert und bugs und Beschränkungen behebt.
-	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>daniel@constexpr.org</email>
-			<name>Daniel Scharrer</name>
-		</maintainer>
-		<bugs-to>https://bugs.arx-libertatis.org/</bugs-to>
-		<changelog>
-			http://wiki.arx-libertatis.org/Changelog
-		</changelog>
-		<doc lang="en">http://wiki.arx-libertatis.org/</doc>
-		<remote-id type="github">arx/ArxLibertatis</remote-id>
-		<remote-id type="sourceforge">arx</remote-id>
-		<remote-id type="freecode">arx-libertatis</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/avadon-1.0.4_p1331768904 b/games-rpg/avadon-1.0.4_p1331768904
new file mode 100644
index 000000000000..b636197d7302
--- /dev/null
+++ b/games-rpg/avadon-1.0.4_p1331768904
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Epic fantasy role-playing adventure in an enormous and unique world
+EAPI=6
+HOMEPAGE=https://www.spiderwebsoftware.com/avadon
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl[opengl,video] media-libs/openal
+RESTRICT=fetch bindist
+SLOT=0
+SRC_URI=avadon-linux-1331768904-bin.txt
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=44169fc12698c64934c3591e9094a3a3
diff --git a/games-rpg/avadon/Manifest b/games-rpg/avadon/Manifest
deleted file mode 100644
index 439eefa10167..000000000000
--- a/games-rpg/avadon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST avadon-linux-1331768904-bin.txt 109767395 BLAKE2B ba89e4cc9d7374b4c140f36860bb3e2682bc8639503500d0371a7783c0ce7fc1b40ac2c552285f03d564ecae21d5f887f822e6785a30034fdeaba9d0837ee6eb SHA512 7c1acbb1ce3bbfb33052454c9b93060fa97b13fbf4202ee2bb0d70fb59423efc05dfe0bca07cce1e711af9f2757b79c590f237dea5f92aa11aa5979c35d018a7
-EBUILD avadon-1.0.4_p1331768904.ebuild 1237 BLAKE2B 9b10a153d3e102359b91971cfbb4696ca89f10d867c746154c92ca02e28afb4e550fb3c66cc714e0423cf9ab67fa9e301043408dee520e2e337327221bdaa216 SHA512 a43fd6f3b37e3decf7c510e160b2a6fbe43f9a74bc0abe3bc04f808530a7f962d890ae64263e6196c528f3c99875a53e9168c555ab3b6c2aaa37531ea54ff2c7
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild b/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
deleted file mode 100644
index 4a9ff4f3cecd..000000000000
--- a/games-rpg/avadon/avadon-1.0.4_p1331768904.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils unpacker
-
-DESCRIPTION="Epic fantasy role-playing adventure in an enormous and unique world"
-HOMEPAGE="https://www.spiderwebsoftware.com/avadon"
-SRC_URI="avadon-linux-${PV#*_p}-bin.txt" # .txt is odd but that's what Humble Bundle sends.
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist"
-
-QA_PREBUILT="opt/${PN}/Avadon"
-
-RDEPEND="media-libs/libsdl[opengl,video]
-	media-libs/openal"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/data"
-
-pkg_nofetch() {
-	einfo "Please buy and download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your distfiles directory."
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	insinto "${dir}"
-	doins -r "avadon files" icon.bmp
-
-	exeinto "${dir}"
-	newexe Avadon-$(usex amd64 amd64 x86) Avadon
-	dosym "../..${dir}"/Avadon /usr/bin/${PN}
-
-	newicon -s 512 Avadon.png ${PN}.png
-	make_desktop_entry ${PN} "Avadon: The Black Fortress"
-
-	dodoc README-linux.txt
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/avadon/metadata.xml b/games-rpg/avadon/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-rpg/avadon/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/games-rpg/baldurs-gate-ee-2.3.67.3-r1
new file mode 100644
index 000000000000..799d561b1279
--- /dev/null
+++ b/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Baldur's Gate: Enhanced Edition
+EAPI=6
+HOMEPAGE=https://www.baldursgate.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GOG-EULA
+RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/openssl:0[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=950b4ff1dc9efd8e56a582ed75ff0daf
diff --git a/games-rpg/baldurs-gate-ee/Manifest b/games-rpg/baldurs-gate-ee/Manifest
deleted file mode 100644
index 6cf7823e0ea6..000000000000
--- a/games-rpg/baldurs-gate-ee/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh 2877124067 BLAKE2B 244e93ae089703c9fae3dcfcad4fb9c1eb32695e7288f7a05b3f2996887f90d6912e745e9b47a93ba45ee3ddda8363e69d22e62c57258ee54c24c47f07b2f619 SHA512 56d4796a959658f29cabef6e7339db5ba9fa792d9fd899ebc375c9b5cf94305b6d11c21d41a8809fcb1cbe38ecb4bc7152158ef19c87395374ab9060f48756a6
-EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1370 BLAKE2B c250d9d87cf58a4906b8a6933d32ace06730fdf5e8b092baac03bfcfb9e688216723b7633818d8977b94575d1a86f751e5d30b77d055e79ecf8da7f620981aa7 SHA512 853b672a76099fd98ad78d368ab9c484ad39c4e323d1a893c7cd433daa8c6e0562c454e38dcea7fb852c4036509a2af1be03feb716a2b9f36a460f0414b06915
-MISC metadata.xml 784 BLAKE2B e6527c6d760208259a31037ffb51533b2fa07d40be2f62bd3c08c63acf1418841abf657b678cfff42650430f75b1430a5f9bcf849e8688af57b853fa911aebb1 SHA512 d92e2613876c7c8840f640ba778f1cbdb62d2e65caf38a1e931bd7ffe6ab3bcacf6093155b01036f1cb3f18583842761242105019fbf1e72df34e096d7f5bbde
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
deleted file mode 100644
index 4e3bf5f6ec9a..000000000000
--- a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils unpacker
-
-DESCRIPTION="Baldur's Gate: Enhanced Edition"
-HOMEPAGE="https://www.baldursgate.com/"
-SRC_URI="gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist fetch"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/expat[abi_x86_32(-)]
-	dev-libs/json-c[abi_x86_32(-)]
-	dev-libs/openssl:0[abi_x86_32(-)]
-	media-libs/openal[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]"
-
-QA_PREBUILT="/opt/${PN}/BaldursGate"
-
-S="${WORKDIR}/data/noarch"
-
-pkg_nofetch() {
-	einfo "Please buy and download \"${SRC_URI}\" from"
-	einfo "https://www.gog.com/game/baldurs_gate_enhanced_edition"
-	einfo "and copy it to \"${DISTDIR}\""
-}
-
-src_unpack() {
-	unpack_zip "${DISTDIR}/${SRC_URI}"
-}
-
-src_install() {
-	local ABI="x86"
-	local dir="/opt/${PN}"
-
-	dodoc -r "game/Manuals/."
-	rm -r "game/Manuals" || die "rm failed"
-
-	insinto "${dir}"
-	doins -r "game/."
-	fperms +x "${dir}/BaldursGate"
-
-	dodir "${dir}/lib"
-	dosym "../../../usr/$(get_libdir)/libjson-c.so" "${dir}/lib/libjson.so.0"
-
-	newicon "support/icon.png" "${PN}.png"
-	make_wrapper ${PN} "./BaldursGate" "${dir}" "${dir}/lib"
-	make_desktop_entry "${PN}" "Baldur's Gate: Enhanced Edition" "${PN}" "Game;RolePlaying"
-}
diff --git a/games-rpg/baldurs-gate-ee/metadata.xml b/games-rpg/baldurs-gate-ee/metadata.xml
deleted file mode 100644
index 09145c6cdfdd..000000000000
--- a/games-rpg/baldurs-gate-ee/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		Baldur's Gate: Enhanced Edition is a remake of the role-playing video
-		game Baldur's Gate. It takes place in the Forgotten Realms, a high
-		fantasy campaign setting, using a modified version of the Advanced
-		Dungeons &amp; Dragons (AD&amp;D) 2nd edition rules.
-	</longdescription>
-	<upstream>
-		<bugs-to>https://support.baldursgate.com/projects/bg-ee-bugs/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/bass-1.3 b/games-rpg/bass-1.3
new file mode 100644
index 000000000000..5e5e468be682
--- /dev/null
+++ b/games-rpg/bass-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=games-engines/scummvm-0.5.0 app-arch/unzip
+DESCRIPTION=Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future
+EAPI=6
+HOMEPAGE=https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=bass
+RDEPEND=>=games-engines/scummvm-0.5.0
+SLOT=0
+SRC_URI=http://downloads.sourceforge.net/scummvm/BASS-Floppy-1.3.zip mirror://gentoo/bass.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a1e0c4752dae783a1f46b73b33ab9125
diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
deleted file mode 100644
index 41e1a22e01a4..000000000000
--- a/games-rpg/bass/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX scummvmGetLang.sh 358 BLAKE2B 9d3490611c16757979cc57901d178e616e9739cfc80bad26a9b2150610c3555159854e8b42446f570e33accd26f215b1b5be9b05f7eca1d37b64fb6703a2bfb5 SHA512 9fc219a8096f0aa0182d752fb362796bacd3837b7368e1132c570d28757f316393163088b790b386211cf9a17cf21302cba0812940afd927e0123b10ad2cd23d
-DIST BASS-Floppy-1.3.zip 7675813 BLAKE2B dbe6e110c4901ba6f1b055208b796b71ef1ab879a0266273765c8f9544065715e0535f41ecaa1cde7e02499ac5e90624eb5a42d1b82dbeee52ddba90bd1dcdd9 SHA512 d220f84448b50e1464329e204f876acc4a9eda24b319577ed74aec8e1a0316e2df268f8768ac9267b90a29a857b010bdae71e2f3c77428987f299bec3dc1ce15
-DIST bass.png 27613 BLAKE2B 1bc440055d4cfd3115e3b2768f5b88fa49eaed3f3d957b436e1e0df236fb0bc968ced18962ff9833962a1ab8a8b544e57ea10c679eb6d434c633f27956fdc489 SHA512 c0f62257f025970f51f32a7f3284cf117a091d40bbcd6c7503e8f0e8e98954cf96e35a04a4e633a04a721ff01beb7a6e0f4c883e286e477c3e065d411db4c87e
-EBUILD bass-1.3.ebuild 881 BLAKE2B 3c2d8e1087f23b318561942517baf20c741af2a0967ebf6c8077a80f463f7967a7563dab361a0e7463a14e118f163ff3b06934e8630b077137fb1f5e23071bcf SHA512 ef3ec8e97db581584c41ee1289afbfec81bc1be6931d51b4d2d98ef0d3afafb2ad2afc4f14ce4ac1220ae30274b771f9d8bbf8ad2fd82a8f2f37be17c96c78b2
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/bass/bass-1.3.ebuild b/games-rpg/bass/bass-1.3.ebuild
deleted file mode 100644
index 4ca16f0ae141..000000000000
--- a/games-rpg/bass/bass-1.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop eutils
-
-DESCRIPTION="Beneath a Steel Sky: a SciFi thriller set in a bleak vision of the future"
-#HOMEPAGE="http://www.revgames.com/_display.php?id=16"
-HOMEPAGE="https://en.wikipedia.org/wiki/Beneath_a_Steel_Sky"
-SRC_URI="http://downloads.sourceforge.net/scummvm/BASS-Floppy-${PV}.zip
-	mirror://gentoo/${PN}.png"
-
-LICENSE="bass"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND=">=games-engines/scummvm-0.5.0"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/"
-
-src_install() {
-	make_wrapper bass "scummvm -f -p \"/usr/share/${PN}\" -q\$(scummvmGetLang.sh) sky" .
-	dobin "${FILESDIR}"/scummvmGetLang.sh
-	insinto /usr/share/${PN}
-	doins sky.*
-	dodoc readme.txt
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Beneath a Steel Sky"
-}
diff --git a/games-rpg/bass/files/scummvmGetLang.sh b/games-rpg/bass/files/scummvmGetLang.sh
deleted file mode 100644
index b313cc7d81da..000000000000
--- a/games-rpg/bass/files/scummvmGetLang.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-tmplang="$LANG"
-test "$LC_MESSAGES" != "" && tmplang="$LC_MESSAGES"
-test "$LC_ALL"      != "" && tmplang="$LC_ALL"
-test "$LANGUAGE"    != "" && tmplang="$LANGUAGE"
-
-lang=`echo $tmplang|cut -d "_" -f 1`
-
-case $lang in
-  en)
-    lang=gb
-    echo $tmplang | grep en_US &>/dev/null && lang=en
-  ;;
-  de|fr|it|pt|es|se)
-  ;;
-  *)
-    lang=gb
-  ;;
-esac
-echo $lang
diff --git a/games-rpg/bass/metadata.xml b/games-rpg/bass/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/bass/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/bastion-20120620-r1 b/games-rpg/bastion-20120620-r1
new file mode 100644
index 000000000000..bafa8b7306ac
--- /dev/null
+++ b/games-rpg/bastion-20120620-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=An original action role-playing game set in a lush imaginative world
+EAPI=5
+HOMEPAGE=https://supergiantgames.com/games/bastion/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=virtual/opengl media-libs/freealut media-libs/openal media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-net media-libs/sdl-ttf media-libs/smpeg x11-libs/libX11 x11-libs/libXft games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=Bastion-HIB-2012-06-20.sh
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4d4d2da63f503b01a3c5b043bedab20
diff --git a/games-rpg/bastion/Manifest b/games-rpg/bastion/Manifest
deleted file mode 100644
index ee0f5e42375c..000000000000
--- a/games-rpg/bastion/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Bastion-HIB-2012-06-20.sh 1055161705 BLAKE2B 615ff88a3fab37aa70e60d1e692cb0b6a1e03dd90bf6294c65a134cbceb4d59675c341c4fca0b4e08ebda24007df727f09c31adfbe2f5f0e97d8e3b9010af4e1 SHA512 e81b5dfa6f61ec2b35b30693c156a612cd3242c2169f4414b6d66839b7d8cc2e6ea8776f55baae67fa8131ee96bc221e1a15004410612eecaa9f7204dcc673ad
-EBUILD bastion-20120620-r1.ebuild 1739 BLAKE2B 9e9c1c21053d41be2d24e03a363431f5ae7763012356f8e0ab872337c1be3ede525c859f27630fc88e5abfa9abb6f52248009e2709f5c1661dffd6f4aa40ae22 SHA512 e756d62c89e54f8f59f4a14662dc6c996fc97276115bd93bf2955b43062eeb0946151b415d44c13a1df34f05230960d039a8864ed1dd45e6edd311fedcc5b93e
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/bastion/bastion-20120620-r1.ebuild b/games-rpg/bastion/bastion-20120620-r1.ebuild
deleted file mode 100644
index 4cb7738a2de0..000000000000
--- a/games-rpg/bastion/bastion-20120620-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnome2-utils check-reqs unpacker games
-
-TIMESTAMP=${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="An original action role-playing game set in a lush imaginative world"
-HOMEPAGE="https://supergiantgames.com/games/bastion/"
-SRC_URI="Bastion-HIB-${TIMESTAMP}.sh"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/Bastion.bin*
-	${MYGAMEDIR#/}/lib/*
-	${MYGAMEDIR#/}/lib64/*"
-
-# mono shit: vague dependencies
-RDEPEND="
-	virtual/opengl
-	media-libs/freealut
-	media-libs/openal
-	media-libs/sdl-gfx
-	media-libs/sdl-image
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	media-libs/smpeg
-	x11-libs/libX11
-	x11-libs/libXft"
-
-CHECKREQS_DISK_BUILD="2400M"
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	myarch=$(usex amd64 "x86_64" "x86")
-
-	unpack_makeself
-
-	mv instarchive_all{,.tar.lzma} || die
-	mv instarchive_linux_${myarch}{,.tar.lzma} || die
-
-	mkdir ${P} || die
-	cd ${P} || die
-
-	unpack ./../instarchive_{all,linux_${myarch}}.tar.lzma
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r *
-
-	newicon -s 256 Bastion.png ${PN}.png
-	make_desktop_entry ${PN}
-	games_make_wrapper ${PN} "./Bastion.bin.${myarch}" "${MYGAMEDIR}" "${MYGAMEDIR}/$(get_libdir)"
-
-	fperms +x "${MYGAMEDIR}"/Bastion.bin.${myarch}
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/bastion/metadata.xml b/games-rpg/bastion/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/bastion/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/coe2-2007-r1 b/games-rpg/coe2-2007-r1
new file mode 100644
index 000000000000..60d2b12225d0
--- /dev/null
+++ b/games-rpg/coe2-2007-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[sound,video] app-arch/unzip
+DESCRIPTION=Precursor to the Dominions series
+EAPI=5
+HOMEPAGE=http://www.shrapnelgames.com/Illwinter/CoE2/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/libsdl[sound,video] games-misc/games-envd
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://download.shrapnelgames.com/downloads/coe2_2007.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=96d93772d6ea882e3d75cfb87895b8e9
diff --git a/games-rpg/coe2/Manifest b/games-rpg/coe2/Manifest
deleted file mode 100644
index eb07effea12a..000000000000
--- a/games-rpg/coe2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST coe2_2007.zip 4937222 BLAKE2B 4640e7819d0e000b3e355f20f364f84d0cc899acd27e33bae95cece843a724918b8a3cc6a538d39478cf5070fd71658637dbc127534d5182a914f6d0f56faff0 SHA512 db0d4ee2016ef3cf7159c227c494346fa0a0e9f9b20a6b520b67899570e3135a4286d6ada2f85d7ea7b55a1baeada41654d4fab29f5996357608f0d2d654b2ed
-EBUILD coe2-2007-r1.ebuild 1359 BLAKE2B b2ac31682fcd65a302900ef3d1dd987ad3def14eeeab0c0115ddc3e2d954fd52d555da200e3ca91ccc6574be012bb3910eb24ade456d7338a7c794f894a829ec SHA512 c8cb4c13e277a8ef6d7fefbf1ef2569ef0fc95aba94496787bf9d1042036306e7c67f9b65a9bb103fa83e30fc112a95cf09702dce85397c1abfc1b11a7feb8c7
-MISC metadata.xml 1166 BLAKE2B 344379ff270c13113da4d40e916e8c16505653451d93fdc82ccbb9e0c39585863056030959579f310cb6ab9a01e058d929abc3c28f9886f32d086074dfe874d6 SHA512 60a33d86c244ce321427d325d4f1fb56846940a1ab2b6c965afb317c497b142644574b94bc715fd0d602628d8b07ba9690f5d0addad626163273cc1584ada370
diff --git a/games-rpg/coe2/coe2-2007-r1.ebuild b/games-rpg/coe2/coe2-2007-r1.ebuild
deleted file mode 100644
index d4070f0433ac..000000000000
--- a/games-rpg/coe2/coe2-2007-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Precursor to the Dominions series"
-HOMEPAGE="http://www.shrapnelgames.com/Illwinter/CoE2/"
-SRC_URI="http://download.shrapnelgames.com/downloads/${PN}_${PV}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="media-libs/libsdl[sound,video]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/coe
-
-# bug #430026
-QA_PREBUILT="${GAMES_PREFIX_OPT}/coe2/coe_linux"
-
-src_prepare() {
-	rm -r *.{dll,exe} old || die
-	if use amd64 ; then
-		mv -f coe_linux64bit coe_linux || die
-	fi
-}
-
-src_install() {
-	insinto "${GAMES_PREFIX_OPT}/${PN}"
-	doins *.{bgm,smp,trp,trs,wrl}
-	dodoc history.txt manual.txt readme.txt
-	exeinto "${GAMES_PREFIX_OPT}/${PN}"
-	doexe coe_linux
-
-	games_make_wrapper ${PN} "./coe_linux" "${GAMES_PREFIX_OPT}/${PN}"
-	make_desktop_entry ${PN} "Conquest of Elysium 2"
-
-	# Slots for saved games.
-	# The game shows e.g. "EMPTY SLOT 0?", but it works.
-	local f slot state_dir=${GAMES_STATEDIR}/${PN}
-	dodir "${state_dir}"
-	for slot in {0..4} ; do
-		f=save${slot}
-		dosym "${state_dir}/save${slot}" "${GAMES_PREFIX_OPT}/${PN}/${f}"
-		echo "empty slot ${slot}" > "${D}${state_dir}/${f}" || die
-		fperms 660 "${state_dir}/${f}"
-	done
-
-	prepgamesdirs
-}
diff --git a/games-rpg/coe2/metadata.xml b/games-rpg/coe2/metadata.xml
deleted file mode 100644
index 59ce22e6b4f8..000000000000
--- a/games-rpg/coe2/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Originally released in 1997, Conquest of Elysium II is a turn-based fantasy
-strategy game, and the precursor to the wildly popular Dominions series. As one
-of up to eight players (human, computer controlled, or a mixture) your goal, as
-suggested in the title, is very simple: total subjugation of all that do not fly
-your banner!
-
-Choose your leader from twenty distinct character classes, including brutal
-barbarians, insane necromancers, mighty maharajas, sinister shamans, and even
-the Agarthan king from Dominions 3! Each character allows new strategies for the
-player to explore. The Priestess of Baal can summon demonic creatures, change
-the weather, and sacrifice the innocent. An Enchanter can create constructs out
-of corpses, lakes, forests, and more. Barons can build siege towers, raise
-levies, and keep his subjects in line, even in times of high taxation.
-</longdescription>
-</pkgmetadata>
diff --git a/games-rpg/comi-1 b/games-rpg/comi-1
new file mode 100644
index 000000000000..06ac132bce24
--- /dev/null
+++ b/games-rpg/comi-1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Curse of Monkey Island, the third game in the series
+EAPI=6
+HOMEPAGE=https://en.wikipedia.org/wiki/The_Curse_of_Monkey_Island
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=comi
+PROPERTIES=interactive
+RDEPEND=>=games-engines/scummvm-0.4.0
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/comi.jpg
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=880fdf64e1414578c5f0968cc5df5625
diff --git a/games-rpg/comi/Manifest b/games-rpg/comi/Manifest
deleted file mode 100644
index 83dfbda879a2..000000000000
--- a/games-rpg/comi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST comi.jpg 5320 BLAKE2B 4729546c766536a5bb937c1e7eb3cd231ec44146fabda41326f5dbf0a3cb13b57f119a0d28283b1664bcd11ffb652606f0ee2f658d5a0701e5ad15f70a9e8b01 SHA512 b8042241b0badc6950cac8bf0eae7f5e138d5f3fc96f9d3a2108cd3bc69d972bbb12e8f3a416273f0763a1ecfee9b66daff69e211889cd93468439a3036817af
-EBUILD comi-1.ebuild 1476 BLAKE2B 82ff554800ab8b74301d6bca430ba057c62e10cfba4ea8fc2711c37a3144e121f55188fbfcec795323fce82a743d2f345a0b863ef94ec4c2481cc1b092d30059 SHA512 44851095403c5903cb2294617dcfb7c56f7536c00a53d2cb537392bfea7015a5cb82de67f093ee4cf41fef11c0c49ea605d99584ccc46838d3cb2665aa009b4b
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/comi/comi-1.ebuild b/games-rpg/comi/comi-1.ebuild
deleted file mode 100644
index 91a25419df7f..000000000000
--- a/games-rpg/comi/comi-1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cdrom estack eutils xdg
-
-DESCRIPTION="The Curse of Monkey Island, the third game in the series"
-HOMEPAGE="https://en.wikipedia.org/wiki/The_Curse_of_Monkey_Island"
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${PN}.jpg"
-LICENSE="${PN}"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="bindist"
-
-RDEPEND=">=games-engines/scummvm-0.4.0"
-
-S="${WORKDIR}"
-
-dotar() {
-	cd "${CDROM_ABSMATCH%/*}" || die
-	eshopts_push -s nocaseglob nullglob
-
-	# Lowercase
-	# Documentation into doc
-	# Remainder into data
-	# Avoid copying files twice
-
-	tar c \
-		--mode=u+w \
-		--ignore-case \
-		--xform='s:^[^a-z]+$:\L\0:x' \
-		--xform='s:.*:data/\0:x' \
-		--xform='s:.*\.(pdf|txt)$:doc/\0:x' \
-		--xform='s:^doc/data/:doc/:x' \
-		--exclude="$(use doc || echo '*.pdf')" \
-		--exclude-from=<(find "${WORKDIR}"/data -type f -printf "%P\n" 2>/dev/null) \
-		*.{txt,pdf} *.la[0-9] resource*/ \
-		| tar x -C "${WORKDIR}"
-
-	assert "tar failed"
-	eshopts_pop
-
-	# Don't prevent CD ejection.
-	cd "${WORKDIR}" || die
-}
-
-src_unpack() {
-	cdrom_get_cds comi.la1 comi.la2
-	dotar
-
-	cdrom_load_next_cd
-	dotar
-}
-
-src_install() {
-	insinto /usr/share/games/scummvm/games/comi
-	doins -r data/*
-
-	# Documentation may be missing.
-	[[ -d doc ]] && dodoc doc/*
-
-	doicon "${DISTDIR}"/${PN}.jpg
-	make_wrapper ${PN} "scummvm comi"
-	make_desktop_entry ${PN} "The Curse of Monkey Island" ${PN}.jpg
-}
diff --git a/games-rpg/comi/metadata.xml b/games-rpg/comi/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/comi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/daimonin-client-0.10.8 b/games-rpg/daimonin-client-0.10.8
new file mode 100644
index 000000000000..ac4a67b91f57
--- /dev/null
+++ b/games-rpg/daimonin-client-0.10.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-games/physfs media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] net-misc/curl sys-libs/zlib:= app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A graphical 2D tile-based MMORPG
+EAPI=6
+HOMEPAGE=http://daimonin.sourceforge.net/
+IUSE=debug music
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/libsdl[sound,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] net-misc/curl sys-libs/zlib:=
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/daimonin-client-0.10.8.zip music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bea47b5cf9149467e07298144f07bb94
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
deleted file mode 100644
index 73c0b39cbdf7..000000000000
--- a/games-rpg/daimonin-client/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX daimonin-client-0.10.5-datadir.patch 983 BLAKE2B 810f36eed097c19a0d77ea89d60a4ac9acc83e2fe74d4563d77789fbfbdd5d9823c0e9271bcd113c00e6f6044c910338596c967d3fd68304863d0f9008da3324 SHA512 eb4748894c0722ee112efc3953a14784eb13237919813c057afddc09104f250f346c29a1a224bd3ce8a44b22af4fa2b59f826aa5eb96fb45a51f276f743fa3fa
-AUX daimonin-client-0.10.5-nozlib.patch 1094 BLAKE2B d617dbee2d2a23eff6b6330c59c2fe7501ec06437d5d179611ea9ab50a2e15bacc7e948d3cd114bf1745d6649e80f503b8e364752c9f689c4f95170d3ebf74bb SHA512 31ef58b81c669f7a8c685355dfb37d85383891db4534c3b62b0d9f5beaed6cb6d4be34657acd109287dc85d83a6c81950322667729b36552394c17a9b0bfc989
-AUX daimonin-client-0.10.8-fix-build-system.patch 2538 BLAKE2B 1eb570088a9bd44489ce63eeef445a3d9b27f421abb28cad9f83eb622b7da33ed94ec9265f0c0d59744521367dd82d6bc4ba7001e1fd938629b3ec4bb0f9f8ee SHA512 baf333aad05a662bf38e6579cb6f8bfcb0b1fbf2a48191df28a96fe3d20585f7a2ad211d96107a3f99245bc99b877ca140b450111e7466d866e07d32199c737d
-DIST daimonin-client-0.10.8.zip 51894462 BLAKE2B 9803b0e597134fa605ffc4e38b2f6f58cd76d45141bb0d5c5387e9b507c4b80b4a566d266b622df7ea38b3e9eb00e839981bcb999ac2d14e59a8cff37340f6fa SHA512 f4f5891697f96a60a8ee79973b0172b544cbae25b2d8787e0a4e9113d95be3b41b8c29c80ba5cbaf7548055e4c847456fa364346489f4d6ad165b984cfd64531
-DIST daimoninMusicLQ20100827.zip 24293301 BLAKE2B 35ee421c0db8f0ff29768b58af8fbc1d804d24534b8558631c97cf36b624999d0e5f422cd32e4a13bc09765b183bfd52270b33f2614023202211399e3d5da484 SHA512 f24bba24c0e9a79469511315c608c464568f3ee0dc05b3d83c791512fa51eae07669dc175e7672cc8b31764a7bdff5c975ac2b13e2d7b0e5287717e188f1d439
-EBUILD daimonin-client-0.10.8.ebuild 1483 BLAKE2B c67064029f915a15e5be0ce393275a05163ccd6ca9d16f1fc73fa9ae153b2ce85b55c2d6bb255b0f149bc60d75c2c902f1476859eac6b10bf92d29f2482bca6c SHA512 46898d7d1b725f963ceaf4e12ea8833feb37ae7e294f589789b87a1c51fd0bb5d404a6442a799ac59e061689ff6752482f3d623477cd1a27a6ffd7e4b1683a31
-MISC metadata.xml 408 BLAKE2B d816c7d0cd53dc68147f8a23d89d46da21defb09e0b9717b777b23881189ec61ae82ed3bb42dbccadd94a34421c6b92755bb20cdb60bd2a17826dcc128332930 SHA512 039f6849c28f9c21b7e2854314fcd0ff9b356b3983e68c0a4a2eb8e96893475e4333f7408c233f8f9651c4613a2683a63a4f5da58d11555d34712f9ebe0a2f6b
diff --git a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild b/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
deleted file mode 100644
index 3ee1bd720d75..000000000000
--- a/games-rpg/daimonin-client/daimonin-client-0.10.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A graphical 2D tile-based MMORPG"
-HOMEPAGE="http://daimonin.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.zip
-	music? ( mirror://sourceforge/daimonin/daimoninMusicLQ20100827.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug music"
-
-RDEPEND="
-	dev-games/physfs
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[vorbis]
-	net-misc/curl
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/daimonin-code-8183-trunk/client/make/linux
-
-src_unpack() {
-	unpack ${P}.zip
-	if use music; then
-		rm -f daimonin-code-8183-trunk/client/media/* || die
-		cd daimonin-code-8183-trunk/client || die
-		unpack daimoninMusicLQ20100827.zip
-	fi
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${PN}-0.10.5-nozlib.patch
-	eapply "${FILESDIR}"/${PN}-0.10.8-fix-build-system.patch
-
-	pushd ../../src >/dev/null || die
-		eapply "${FILESDIR}"/${PN}-0.10.5-datadir.patch
-	popd >/dev/null || die
-
-	eapply_user
-
-	# remove bundled zlib
-	rm ../../src/include/z{lib,conf}.h || die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-simplelayout \
-		$(use_enable debug)
-}
-
-src_install() {
-	default
-
-	cd ../.. || die
-	dodoc README*
-	newicon bitmaps/pentagram.png "daimonin.png"
-	make_desktop_entry "daimonin" "Daimonin" "daimonin" "Game;Amusement"
-}
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
deleted file mode 100644
index f2fc757abd27..000000000000
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/main.c	2010-08-24 19:32:55.000000000 +0200
-+++ b/main.c	2010-09-19 18:49:54.000000000 +0200
-@@ -2386,7 +2386,7 @@
- 
-     /* Add the base dir to the search path. The base dir is where all the
-      * defaults are (or should be). */
--    if (!PHYSFS_addToSearchPath(PHYSFS_getBaseDir(), 1))
-+    if (!PHYSFS_addToSearchPath(SYSPATH, 1))
-     {
-         LOG(LOG_MSG, "%s\n", PHYSFS_getLastError());
-     }
-@@ -2545,13 +2545,13 @@
- 
-     /* Prepend the user dir to the search path. This means files are read from
-      * this location in preference to the defaults. */
--    if (strcmp(PHYSFS_getBaseDir(), home))
--    {
-+    /*if (strcmp(PHYSFS_getBaseDir(), home))
-+    {*/
-         if (!PHYSFS_addToSearchPath(home, 0))
-         {
-             LOG(LOG_ERROR, "%s\n", PHYSFS_getLastError());
-         }
--    }
-+    //}
- 
-     /* Prepend any add-on packs to the search path. This means files are read
-      * from these locations in preference to the defaults and the user dir. */
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
deleted file mode 100644
index 62a6e5fb1302..000000000000
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/Makefile.am	2010-12-01 14:39:11.605648458 -0500
-+++ b/Makefile.am	2010-12-01 14:41:59.875915880 -0500
-@@ -2,23 +2,18 @@
- daimonin_PROGRAMS = daimonin daimonin-updater
- 
- daimonin_SOURCES =  \
--	../../src/adler32.c \
- 	../../src/anim.c \
- 	../../src/book.c \
- 	../../src/buddy.c \
- 	../../src/chatfilter.c \
- 	../../src/client.c \
- 	../../src/commands.c \
--	../../src/crc32.c \
- 	../../src/dialog.c \
- 	../../src/event.c \
- 	../../src/filewrap.c \
- 	../../src/font.c \
- 	../../src/group.c \
- 	../../src/ignore.c \
--	../../src/inffast.c \
--	../../src/inflate.c \
--	../../src/inftrees.c \
- 	../../src/interface.c \
- 	../../src/inventory.c \
- 	../../src/item.c \
-@@ -35,11 +30,9 @@
- 	../../src/sprite.c \
- 	../../src/textwin.c \
- 	../../src/tile_stretcher.c \
--	../../src/uncompr.c \
- 	../../src/wrapper.c \
--	../../src/widget.c \
--	../../src/zutil.c
--daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@
-+	../../src/widget.c
-+daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@ -lz
- daimonin_OBJDIR = objs
- 
- daimonin_updater_SOURCES = \
diff --git a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch b/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch
deleted file mode 100644
index a6171896bfac..000000000000
--- a/games-rpg/daimonin-client/files/daimonin-client-0.10.8-fix-build-system.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,5 +1,5 @@
- daimonindir=$(d_bindir)
--daimonin_PROGRAMS = daimonin daimonin-updater
-+daimonin_PROGRAMS = daimonin
- 
- daimonin_SOURCES =  \
- 	../../src/adler32.c \
-@@ -72,30 +72,30 @@
- #		echo '***'; \
- #		exit 42; \
- #	fi;
--	$(MKDIR) -p $(d_datadir)/sfx
--	$(MKDIR) -p $(d_datadir)/man
--	$(MKDIR) -p $(d_datadir)/media
--	$(MKDIR) -p $(d_datadir)/cache
--	$(MKDIR) -p $(d_datadir)/logs
--	$(MKDIR) -p $(d_datadir)/gfx_user
--	$(MKDIR) -p $(d_datadir)/srv_files
--	$(MKDIR) -p $(d_datadir)/bitmaps
--	$(MKDIR) -p $(d_datadir)/icons
--	$(MKDIR) -p $(d_datadir)/settings
--	$(MKDIR) -p $(d_datadir)/update
--	$(CP) ../../sfx/*.* $(d_datadir)/sfx
--	$(CP) -R ../../man/* $(d_datadir)/man
--	$(CP) ../../media/*.* $(d_datadir)/media
--	$(CP) ../../cache/*.* $(d_datadir)/cache
--	$(CP) ../../bitmaps/* $(d_datadir)/bitmaps
--	$(CP) ../../icons/* $(d_datadir)/icons
--	$(CP) -R ../../settings/*.* $(d_datadir)/settings
--	$(CP) ../../srv_files/*.* $(d_datadir)/srv_files
--	$(CP) ../../update/version $(d_datadir)/update
--	$(CP) ../../gfx_user/*.* $(d_datadir)/gfx_user
--	$(CP) ../../daimonin.p0 $(d_datadir)
--	$(CP) ../../License $(d_datadir)
--	$(CP) ../../archdef.dat $(d_datadir)
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/sfx
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/man
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/media
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/cache
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/logs
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/gfx_user
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/srv_files
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/bitmaps
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/icons
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/settings
-+	$(MKDIR) -p $(DESTDIR)$(d_datadir)/update
-+	$(CP) ../../sfx/*.* $(DESTDIR)$(d_datadir)/sfx
-+	$(CP) -R ../../man/* $(DESTDIR)$(d_datadir)/man
-+	$(CP) ../../media/*.* $(DESTDIR)$(d_datadir)/media
-+	$(CP) ../../cache/*.* $(DESTDIR)$(d_datadir)/cache
-+	$(CP) ../../bitmaps/* $(DESTDIR)$(d_datadir)/bitmaps
-+	$(CP) ../../icons/* $(DESTDIR)$(d_datadir)/icons
-+	$(CP) -R ../../settings/*.* $(DESTDIR)$(d_datadir)/settings
-+	$(CP) ../../srv_files/*.* $(DESTDIR)$(d_datadir)/srv_files
-+	$(CP) ../../update/version $(DESTDIR)$(d_datadir)/update
-+	$(CP) ../../gfx_user/*.* $(DESTDIR)$(d_datadir)/gfx_user
-+	$(CP) ../../daimonin.p0 $(DESTDIR)$(d_datadir)
-+	$(CP) ../../License $(DESTDIR)$(d_datadir)
-+	$(CP) ../../archdef.dat $(DESTDIR)$(d_datadir)
- 	@echo "*** Daimonin client successful installed in $(daimonindir)!"
- 	@echo "*** Enter your install folder and type ./daimonin"
- 	@echo "*** to start the game!"
diff --git a/games-rpg/daimonin-client/metadata.xml b/games-rpg/daimonin-client/metadata.xml
deleted file mode 100644
index 6794421a86c3..000000000000
--- a/games-rpg/daimonin-client/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="music">Install extra music</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">daimonin</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/dear-esther-20130608 b/games-rpg/dear-esther-20130608
new file mode 100644
index 000000000000..c28efda85236
--- /dev/null
+++ b/games-rpg/dear-esther-20130608
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=Ghost story, told using first-person gaming technologies
+EAPI=5
+HOMEPAGE=http://dear-esther.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)] >=media-libs/openal-1.15.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=dearesther-linux-06082013-bin
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=61d9a15b2b61811a7a8750230eefb714
diff --git a/games-rpg/dear-esther/Manifest b/games-rpg/dear-esther/Manifest
deleted file mode 100644
index 817b23221cb3..000000000000
--- a/games-rpg/dear-esther/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dearesther-linux-06082013-bin 1007461686 BLAKE2B 0ffb2387490beef790ad00f110a8393bb69f0fe762799795a655eab748aed08eb8665c199ea0f588c764bafaa68eae3ba6884296614abbd66ecd1b72810b2c88 SHA512 c66a2b068b4caaebfb63e4617102af4a5df153dfe76854d1fa94305fb95b15e4362c9ca5e715ea4b29966916a9a585fa71bfc2b2b33b878f26e3785b7d93722e
-EBUILD dear-esther-20130608.ebuild 1545 BLAKE2B aaef94c15b08c7ffa99809a5f450132b07bfcceb88e379bbebcbe681fbbcc10813f17bc13981508d871e1aa0bf18ac8a1ddecf155b7d9e1046929e58fef45e15 SHA512 63685a6da8d06d0baa6fa377be3532181a677892c612550e9c22658f78cb05b82371ff796175e74c88791d1001e01d4cb9e03aa9310a6533571421fd4af0f46c
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/dear-esther/dear-esther-20130608.ebuild b/games-rpg/dear-esther/dear-esther-20130608.ebuild
deleted file mode 100644
index a7d2c696ccff..000000000000
--- a/games-rpg/dear-esther/dear-esther-20130608.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle libSDL2
-
-EAPI=5
-inherit eutils gnome2-utils unpacker games
-
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
-DESCRIPTION="Ghost story, told using first-person gaming technologies"
-HOMEPAGE="http://dear-esther.com/"
-SRC_URI="dearesther-linux-${TIMESTAMP}-bin"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/dearesther_linux
-	${MYGAMEDIR#/}/bin/*.so*"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r5[abi_x86_32(-)]
-	>=media-libs/openal-1.15.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	insinto "${MYGAMEDIR}"
-	doins -r bin dearesther platform dearesther_linux
-
-	doicon -s 256 dearesther.png
-	make_desktop_entry "${PN}" "Dear Esther" dearesther
-	games_make_wrapper ${PN} "./dearesther_linux -game dearesther" "${MYGAMEDIR}" "${MYGAMEDIR}/bin"
-
-	dodoc README-linux.txt
-
-	fperms +x "${MYGAMEDIR}"/dearesther_linux
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/dear-esther/metadata.xml b/games-rpg/dear-esther/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/dear-esther/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/draci-historie-2012-r1 b/games-rpg/draci-historie-2012-r1
new file mode 100644
index 000000000000..7855b1a4ed0e
--- /dev/null
+++ b/games-rpg/draci-historie-2012-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Bert the little dragon searches for his father
+EAPI=6
+HOMEPAGE=http://www.ucw.cz/draci-historie/index-en.html
+IUSE=l10n_cs l10n_de l10n_en l10n_pl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=games-engines/scummvm-1.1
+SLOT=0
+SRC_URI=l10n_cs? ( http://www.ucw.cz/draci-historie/binary/dh-cz-2012.zip ) l10n_de? ( http://www.ucw.cz/draci-historie/binary/dh-de-2012.zip ) l10n_en? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-pl-2012.zip ) !l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( http://www.ucw.cz/draci-historie/binary/dh-en-2012.zip ) ) ) )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c76305c25b86f236b461de018bf13f56
diff --git a/games-rpg/draci-historie/Manifest b/games-rpg/draci-historie/Manifest
deleted file mode 100644
index 09c53099bf86..000000000000
--- a/games-rpg/draci-historie/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST dh-cz-2012.zip 29293879 BLAKE2B 5f8d4199de6f418d041c409bbc25b383021721b062b1697a29b7be612e05aaa7fd76bade7add8cf662ad58c51028712ce7d5009b4a54df3c4f24b38d0fdb2a55 SHA512 1c7691fe275f662a3a22bdb824965c1e0079a44ddfed5a75596f71dcd32cf3e34d2107480a5df392a2a28aae01cccca6eedf615f362af11bbac30c30dfd89cd2
-DIST dh-de-2012.zip 3316443 BLAKE2B 99a495be5d2add5e6f375904d249bda06f556e5e8ede4b33348d6ee46778de15b704016f9b498ca5b68ad678b3f2bd572034c37bc7dde2dfcd9d46ef2f4b242a SHA512 088f372e8de59cb52555a70cb7918ec14bb4abbb712a3867b40ce9eef80dc3f03b6c28402b9e0c9ee7e02f1938ee5f140abc02aef801716e38af84d66dafd5aa
-DIST dh-en-2012.zip 3310860 BLAKE2B 22c8dc8102f5f1d984a760d51fd8f7f028cca6a28b1a4e0f459c44eec68255e3ecd526ef80426b57f2137c33f6a5ba0d16b2c760b42a67413c2ffa3cec9ec648 SHA512 a9b5ff15305c961f288fdf915f56ca204a2ebe5370dcf56c20a0057cf721c45445a20479a39fe1f5443e79e7c95bd5771abef2115396c418442d2e5e400ce10a
-DIST dh-pl-2012.zip 36041498 BLAKE2B 29f6daeac610aa83f4df4a7698d19540f7c97d3a019a66078e784492010891860fa6af9b3151457c0aefeeb5eb3f90b8336693a1367b64e97592e017a7e9f247 SHA512 627f85a14362e032e00ed36275df696b6a468965734db7c8bb459d689b548c05033fe387ffee9855a83fe634f14b98a5c5ea51aefdf169c7243e9282fa1c19a5
-EBUILD draci-historie-2012-r1.ebuild 2365 BLAKE2B c908bcbfc5b1cb9aefc3eb73d55ff3b50045af923d57ef45857e173ca64ff4a7142897e4e645342aee5b163b8ff5dc6cec759d55dfdb1591cd3a755a9d9359b9 SHA512 a54f1a29806cd8a2f270a0dc232a6ac1b34fad9f76d0843919a0aac2e40fc043dfe0def47887be40d97c68224bb8bbf789a3bb2f74f0bb2d62cd7b2684d533db
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild b/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
deleted file mode 100644
index 3982a8538d15..000000000000
--- a/games-rpg/draci-historie/draci-historie-2012-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Bert the little dragon searches for his father"
-HOMEPAGE="http://www.ucw.cz/draci-historie/index-en.html"
-BASE_URL="http://www.ucw.cz/draci-historie/binary/dh"
-SRC_URI="
-	l10n_cs? ( ${BASE_URL}-cz-${PV}.zip )
-	l10n_de? ( ${BASE_URL}-de-${PV}.zip )
-	l10n_en? ( ${BASE_URL}-en-${PV}.zip )
-	l10n_pl? ( ${BASE_URL}-pl-${PV}.zip )
-	!l10n_cs? ( !l10n_de? ( !l10n_en? ( !l10n_pl? ( ${BASE_URL}-en-${PV}.zip ) ) ) )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_cs l10n_de l10n_en l10n_pl"
-
-RDEPEND=">=games-engines/scummvm-1.1"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		mkdir en || die
-		unpack dh-en-${PV}.zip
-		mv *.{dfw,fon,mid,sam} en/ || die
-	fi
-	if use l10n_cs ; then
-		mkdir cs || die
-		unpack dh-cz-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} cs/ || die
-	fi
-	if use l10n_de ; then
-		mkdir de || die
-		unpack dh-de-${PV}.zip
-		mv *.{dfw,fon,mid,sam} de/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir pl || die
-		unpack dh-pl-${PV}.zip
-		mv *.{dfw,fon,mid,sam,zzz} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -f *.{bat,exe,ins} readme.* || die
-}
-
-src_install() {
-	newicon bert.ico draci-historie.ico
-	insinto /usr/share/${PN}
-	for lingua in $(find * -type d); do
-		doins -r ${lingua}
-	done
-	if use l10n_en || ( ! use l10n_cs && ! use l10n_de && ! use l10n_en && ! use l10n_pl ) ; then
-		make_wrapper draci-historie-en "scummvm -f -p \"/usr/share/${PN}/en\" draci" .
-		make_desktop_entry ${PN}-en "Dračí Historie (English)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_cs ; then
-		make_wrapper draci-historie-cs "scummvm -f -p \"/usr/share/${PN}/cs\" draci" .
-		make_desktop_entry ${PN}-cs "Dračí Historie (Čeština)" /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_de ; then
-		make_wrapper draci-historie-de "scummvm -f -p \"/usr/share/${PN}/de\" draci" .
-		make_desktop_entry ${PN}-de "Dračí Historie (Deutsch)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	if use l10n_pl ; then
-		make_wrapper draci-historie-pl "scummvm -f -p \"/usr/share/${PN}/pl\" draci" .
-		make_desktop_entry ${PN}-pl "Dračí Historie (Polski)"  /usr/share/pixmaps/draci-historie.ico
-	fi
-	einstalldocs
-}
diff --git a/games-rpg/draci-historie/metadata.xml b/games-rpg/draci-historie/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/draci-historie/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/dragonhunt-3.56-r2 b/games-rpg/dragonhunt-3.56-r2
new file mode 100644
index 000000000000..b6d5d04229be
--- /dev/null
+++ b/games-rpg/dragonhunt-3.56-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A simple graphical RPG
+EAPI=6
+HOMEPAGE=http://emhsoft.com/dh.html
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-SA-1.0
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://emhsoft.com/dh/Dragon_Hunt-3.56.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5b7d10bf7501daa244fa0140442f261b
diff --git a/games-rpg/dragonhunt/Manifest b/games-rpg/dragonhunt/Manifest
deleted file mode 100644
index d52401dc489c..000000000000
--- a/games-rpg/dragonhunt/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Dragon_Hunt-3.56.tar.gz 2170718 BLAKE2B 4d5b16921867bb7e0b14991184fc4f7a90ca7dbc6c87f4565a4626fb26d413cd4805099bb4973b45fde3758de4845489898c89b5981d34af7e8d03b2874286a5 SHA512 86ca32436088e8cda8993e21ebe6180f8361eb8bf5e052b3744a1db50073826118d1db657d713c7d75cd78c50c78c940caaf7adc5d31ad895d02a44f82b1e72a
-EBUILD dragonhunt-3.56-r2.ebuild 2110 BLAKE2B dcfe8c5410797eaf81b0e53f6264b916928ec06aaf6701e3cbee8fb27e2a9db8992ed27969f3dee96e98c8ed7ef3fa4fad650abeda8430227788c6a19df20dda SHA512 12562488edba40cbc108d8ebdd956b842be85c17b7e5baeaf3594a5c0fbdc79dfd7b592c862d8a7cebce5a1e32b5e6bfe2b7c429dee69426042c70ce624ba199
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/dragonhunt/dragonhunt-3.56-r2.ebuild b/games-rpg/dragonhunt/dragonhunt-3.56-r2.ebuild
deleted file mode 100644
index e908b7b28145..000000000000
--- a/games-rpg/dragonhunt/dragonhunt-3.56-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-MY_P="Dragon_Hunt-${PV}"
-DESCRIPTION="A simple graphical RPG"
-HOMEPAGE="http://emhsoft.com/dh.html"
-SRC_URI="http://emhsoft.com/dh/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 CC-SA-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/pygame[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Where to look for modules to load.
-	sed -i "s:\.\./modules/:/usr/share/${PN}/:" \
-		code/g.py \
-		code/map_editor.py \
-		code/rpg.py || die
-
-	# Where to look for keybinding
-	sed -i "s:\.\./settings:/etc/${PN}/settings:" \
-		code/g.py || die
-
-	# Save games in ~/.${PN}/.
-	sed -i \
-		-e "s:^\(from os import.*\):\1\, environ:" \
-		-e "s:g.mod_dir.*\"/saves/\?\":environ[\"HOME\"] + \"/.${PN}/\":" \
-		code/g.py code/loadgame.py || die
-
-	# Save maps in ~/.
-	sed -i \
-		-e "s:^\(from os import.*\):\1\, environ:" \
-		-e "s:g.mod_dir.*\"map\.txt\":environ[\"HOME\"]\ +\ \"/dh_map.txt\":" \
-		code/map_editor.py || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r modules/*
-
-	insinto /etc/${PN}
-	doins settings.txt
-
-	insinto /usr/$(get_libdir)/${PN}
-	doins code/*.py
-
-	make_wrapper ${PN} "${EPYTHON} ./rpg.py" /usr/$(get_libdir)/${PN}
-	make_wrapper ${PN}-mapeditor "${EPYTHON} ./map_editor.py" \
-		/usr/$(get_libdir)/${PN}
-
-	newicon modules/default/images/buttons/icon.png ${PN}.png
-	make_desktop_entry ${PN} "Dragon Hunt"
-	make_desktop_entry ${PN}-mapeditor "Dragon Hunt - Editor"
-
-	dodoc README.txt docs/{Changelog,Items.txt,example_map.txt,tiles.txt}
-	dodoc -r docs/*.html
-
-	python_optimize "${ED}/usr/$(get_libdir)"/${PN} \
-		"${ED}/usr/share/${PN}/Dark Ages/data/make_map.py"
-}
-
-pkg_postinst() {
-	echo
-	elog "If you use the map editor then note that maps will be saved as"
-	elog "~/dh_map.txt and must be move to the correct module directory"
-	elog "(within /usr/share/${PN}) by hand."
-	echo
-}
diff --git a/games-rpg/dragonhunt/metadata.xml b/games-rpg/dragonhunt/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/dragonhunt/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/drascula-1.0-r3 b/games-rpg/drascula-1.0-r3
new file mode 100644
index 000000000000..505a592d5300
--- /dev/null
+++ b/games-rpg/drascula-1.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=games-engines/scummvm-0.13.1 app-arch/unzip
+DESCRIPTION=Drascula: The Vampire Strikes Back
+EAPI=6
+HOMEPAGE=http://www.alcachofasoft.com/
+IUSE=l10n_es l10n_de l10n_fr l10n_it +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=drascula
+RDEPEND=>=games-engines/scummvm-0.13.1
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://sourceforge/scummvm/drascula-1.0.zip https://github.com/scummvm/scummvm/raw/v2.0.0/dists/engine-data/drascula.dat -> drascula-2.0.0.dat sound? ( mirror://sourceforge/scummvm/drascula-audio-2.0.zip ) https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png l10n_es? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/drascula-int-1.1.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a358e5c03ec6b98a9759e6724bfffb4
diff --git a/games-rpg/drascula/Manifest b/games-rpg/drascula/Manifest
deleted file mode 100644
index d66ed6751284..000000000000
--- a/games-rpg/drascula/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST drascula-1.0.zip 32842993 BLAKE2B 5033e8e5f66f74c2b049a1246c62dd33b7b32c3d088575a8d031bc505cd3356c0b364efa9308c99e26e524dc58913cad7cc09424ac6ad30fff38175f952a0151 SHA512 74ca773264e1ed611456b230d6265dade8d745a3adb736f3d6583d43ed6820a25f481ec65612b31d4b3076418f6bc696c82fa0f5085ec43edc91761e95361d11
-DIST drascula-2.0.0.dat 219527 BLAKE2B 362cb71aa5c7ec7a391a9e371f7adbfeef7c3d015db562e613ebc5513d0d8661af6880549424c9fff0dde25e8fe3a82bc4658e0bd47eb6b65c071fff0dce9983 SHA512 b57cdde7f686d54b3dd669dc5737e0046c3f38a31c4f78cde1b51dc7dc3a28193a95d5364629716998f958b7c43ed45bdcd0bc32f94ca718e7882d16fea2c015
-DIST drascula-audio-2.0.zip 36531704 BLAKE2B c3426f9c10e1ab5931b6474c1ba5b13a38267db5c8a8b8663e6a9bbea95751d50f4829dc427d962110ec4b0b093f2c5b59a73ca15aedd73c9ceaf1b3b158ec82 SHA512 09018bcfa062e720db6af7b38fa582f1b3674a25e7bb323d894ad767f8bcd449739fc592a10d848f6cac90a8bb51b5148c5c39558f70d29e2a5116b0b196274e
-DIST drascula-int-1.1.zip 34855203 BLAKE2B b37f6ed68d3ef6cc70915d68178a0359ae39e9d2a020f84573e8e905ec4fa946ad9328479590d5510f0b03ec5a422a4204ffd3fb6294711ea7b68f0f19899151 SHA512 f8127d09e19dec9abf75b9129792c67f3d36ea80fa69c70eeaa536f7a76f8f29072c21f041a0f9467d595f214392541c09c7a75caca0318e8d1b587db9d099cf
-DIST drascula.png 34525 BLAKE2B 1d529b02f08079921ab1021a3012fbef89fd4e9e4933727cdf96c5ce52bc3837d3f636e7b32f33cb92d027cbc330d4fc9280202a6b970821741eb8a44a905346 SHA512 e49fc17cad986b8fa42bd5ede30a1b1ef264182a476168d5c197a31d484555552e824f103b9456898940c68c2f0d751f4c2782a7a95ea92c62e3daec1dd1f52a
-EBUILD drascula-1.0-r3.ebuild 1811 BLAKE2B 44b0bf84c4b5dfc0f525ed56e74b3f07ad8348a3317d4b3dcc3c4d880b94f31e907146042c40a1c3ab02447b0cc130b2e9ee613cd1a914327259f1737ebea165 SHA512 1a75811d70d6df3635eb40f138dd5d3ad9acd66fbc183e82b2193262953df84403669b8e4f1f5275234e956a68df1571a6ed4361d605291948cf487634311a47
-MISC metadata.xml 473 BLAKE2B 5c14edc9041dd442f8cdde7cb168b024495d7b5e1ac12438bfb47d4dd533ca7280fe51c6d6dba950e14aa96bca40973faa7a4580f067985afef04202ed4c9374 SHA512 4e247fb0a866b080da09b521cdfa1d8eaf3463e4cc62199dc58f22eec49f41c3843f71981b0f41a0ebbda98f9fd6e02f3a15e63a8b445266630324dbfecbda91
diff --git a/games-rpg/drascula/drascula-1.0-r3.ebuild b/games-rpg/drascula/drascula-1.0-r3.ebuild
deleted file mode 100644
index f058ca3b8da3..000000000000
--- a/games-rpg/drascula/drascula-1.0-r3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-INT_PV="1.1"
-INT_URI="mirror://sourceforge/scummvm/drascula-int-${INT_PV}.zip"
-DAT_PV="2.0.0"
-AUD_PV="2.0"
-
-DESCRIPTION="Drascula: The Vampire Strikes Back"
-HOMEPAGE="http://www.alcachofasoft.com/"
-SRC_URI="mirror://sourceforge/scummvm/drascula-${PV}.zip
-	https://github.com/scummvm/scummvm/raw/v${DAT_PV}/dists/engine-data/drascula.dat -> drascula-${DAT_PV}.dat
-	sound? ( mirror://sourceforge/scummvm/drascula-audio-${AUD_PV}.zip )
-	https://salsa.debian.org/games-team/drascula/raw/master/debian/icons/drascula.png
-	l10n_es? ( ${INT_URI} )
-	l10n_de? ( ${INT_URI} )
-	l10n_fr? ( ${INT_URI} )
-	l10n_it? ( ${INT_URI} )"
-
-LICENSE="drascula"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_es l10n_de l10n_fr l10n_it +sound"
-RESTRICT="mirror"
-
-RDEPEND=">=games-engines/scummvm-0.13.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_es || use l10n_de || use l10n_fr || use l10n_it; then
-		unpack drascula-int-${INT_PV}.zip
-	fi
-	if use sound; then
-		unpack drascula-audio-${AUD_PV}.zip
-	fi
-	unpack drascula-${PV}.zip
-}
-
-src_install() {
-	local lang
-
-	make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" drascula" .
-	for lang in es de fr it; do
-		if use l10n_${lang} ; then
-			make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}\" drascula" .
-			make_desktop_entry ${PN}-${lang} "Drascula: The Vampire Strikes Back (${lang})" ${PN}
-		fi
-	done
-	insinto /usr/share/${PN}
-	find . -name "P*.*" -execdir doins '{}' +
-	newins "${DISTDIR}"/drascula-${DAT_PV}.dat drascula.dat
-	if use sound; then
-		doins audio/*
-	fi
-	dodoc readme.txt drascula.doc
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} "Drascula: The Vampire Strikes Back"
-}
diff --git a/games-rpg/drascula/metadata.xml b/games-rpg/drascula/metadata.xml
deleted file mode 100644
index 4bb899986a01..000000000000
--- a/games-rpg/drascula/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="sound">Install optional audio files</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">scummvm</remote-id>
-    <remote-id type="github">scummvm/scummvm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/dreamweb-1.1-r1 b/games-rpg/dreamweb-1.1-r1
new file mode 100644
index 000000000000..521b2913f44e
--- /dev/null
+++ b/games-rpg/dreamweb-1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Top-down adventure game set in a gritty futuristic/dystopian city
+EAPI=6
+HOMEPAGE=http://wiki.scummvm.org/index.php/Dreamweb
+IUSE=doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it
+KEYWORDS=~amd64 ~x86
+LICENSE=Dreamweb
+RDEPEND=>=games-engines/scummvm-1.7[flac]
+SLOT=0
+SRC_URI=doc? ( mirror://sourceforge/scummvm/dreamweb-manuals-en-highres.zip ) l10n_de? ( mirror://sourceforge/scummvm/dreamweb-cd-de-1.1.zip ) l10n_en? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) l10n_en-GB? ( mirror://sourceforge/scummvm/dreamweb-cd-uk-1.1.zip ) l10n_es? ( mirror://sourceforge/scummvm/dreamweb-cd-es-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/dreamweb-cd-fr-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-it-1.1.zip ) !l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? ( mirror://sourceforge/scummvm/dreamweb-cd-us-1.1.zip ) ) ) ) ) ) http://www.scummvm.org/images/cat-dreamweb.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=43106d26fdb6db352e51bd3b81f17d6e
diff --git a/games-rpg/dreamweb/Manifest b/games-rpg/dreamweb/Manifest
deleted file mode 100644
index 1824827a5c64..000000000000
--- a/games-rpg/dreamweb/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST cat-dreamweb.png 1088 BLAKE2B 9b952c2ab9795d0a29a168436d031de1806926a90e9948d5f75bea7fe11bd4e1ba0b05ed92438764a8cfebc2e7c511091315b5b3c9438e27f9deb12adb8bf181 SHA512 fb2b70e36fc975ca18b77e368bd35b54d5db80a39accc0f4529c6ddd9d556d17bda84f72ad2b5d4621270fffef3218e7f6f4e8f38130d6b45ed3e68f90bdd140
-DIST dreamweb-cd-de-1.1.zip 243874867 BLAKE2B 582a3cf8fcbe58f839425b59faafaa60cfc8fd16609640674fcff25f9b95afa00ca1d7a63ee4ffa028e0678257e7ba818ba6e6dceaa79258a57c1df558938b57 SHA512 30b64b68b22574f29b1b7685ce0df822871e1e641d76d0527d50cc53c4a928a5266033239e44162c30474dd30e5179be88b504c0d820eac5de936145e04c0e9c
-DIST dreamweb-cd-es-1.1.zip 171154186 BLAKE2B 849d7918ef0a9553913540f72931301b640a06cf8666c376151bfed0c232a88211d91ffcf4424cf491dcb440839566fd05a2c82b460133e0eee2c0d5ad2d61cb SHA512 67f6d3c2755c39d1f4c268a5f3a011395de6abdb14d798bdd45116200b1d9ee6597c75004268dd142f3341148b81250f464d271589c52fae3ad3b7a0e8e50af2
-DIST dreamweb-cd-fr-1.1.zip 166468360 BLAKE2B a9055e506e1a116cc5a2fa987124d264e53ddbc613673edf511f9938f86e45d6eba72ccce8f0a43cda71de3f6276d6b0745ac3e761bbb0e2b530d01f017e2a99 SHA512 77183bcb2477c5dd8bcabb0a16d18b23d48b884d452721e49032c9e7e8ac48df3af18a63aa9765d7b0a138bcf6a116d7dabbce147bcff79c37fab39721fc6456
-DIST dreamweb-cd-it-1.1.zip 225726238 BLAKE2B 9f796895b3cf34db4086726044b1688bacce0e2b690b5905f30dee274dd00c60388fd98c2a73f49d8a7cba531ffba7422485b0b9f61cf74696e1e93bf9481aec SHA512 0a9d0227f0ef1e204e447fc3b43ce81bd50fe2999f3b0a79141e8f1b9dfe08161cdee0ce917728d183c99aaea884cf8fa4808ee007bc9bb3062436a7b65fe052
-DIST dreamweb-cd-uk-1.1.zip 226067188 BLAKE2B b0309fb48158256d676198e46d2b7c689ec816baccf4140c0da4bb103c043e0864a1df7f58b2b3a7b754127fe6b1297e971d7e5a0a51ff0c2a88355ec6664208 SHA512 5e3c11f06ab0518a18cf1feffbc7b016363bc258e6e4d282bbdb5aa88f9540d5fdc10e4d59571d626aeab61a4ab6c4266620c73b2944b9c6963c1e5b66eecd9d
-DIST dreamweb-cd-us-1.1.zip 226360597 BLAKE2B 68825cf5683a321aec70e498e2b611d93384e38952468d1c006136ceb4bebd74156baa006c291da29513da5e71b4f4a25e9fc28a29b1057830357e2ecd0a0359 SHA512 cca33b2f4fd373eb0bc6d12df9ad3ba8417e0fd27cc09e1e0a3201ab4567ddeea127529aa1d1742060225888870c892f8dc983078017c5ae9253b6e028171cb8
-DIST dreamweb-manuals-en-highres.zip 186406397 BLAKE2B c394c32e0caaa1251461cd688348d8be9b57c792190cd84991a9a47915ea313456659d72a9db7fdb9f09b4f71e0d9ea932f702eb5cd4f67390992a64328d0c2e SHA512 a67d3eadeb2ea7579d23315cd9c9fbb31d9e7aa88fdd3c4bc8656801e4b064ad94356167cfbf0ee6e18ad02316297dad0d07616b34080aae68467868de421305
-EBUILD dreamweb-1.1-r1.ebuild 3447 BLAKE2B 4fccc989292181ea0c066c1b7faff22b26aa47526cb6a5f378b3f19bc91b1e755d66c785ade84e41753b9827860ffb16469afb2d4390d7472b0c4e53a45c963d SHA512 089c98fd23b8b29468532571eef9126f3635d7e8cd3c3ed3a9f829d9cab22dd33bdcf601b6d36253266bea4f30949d46b9f1447b1c3836c8a34e459d5e8a05e0
-MISC metadata.xml 459 BLAKE2B f764c68b92e4614c49c37cee671b5b69ed25eb3938f4d6efdc1061ff34f2a12d1dd896f2dd9ac9ba91e7cbfa5c77aab9c6437b0ec1d685a930dbe7ca6b96823c SHA512 06373bf69e200ed3a6b86bb7f914147c26ea4d4b00f3592b3235917d878e45ed2b86f33136057a64471bdc711cdc5740a35f80b39a92e7fbe55304d8c98c1474
diff --git a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild b/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
deleted file mode 100644
index 6fd1f4a55baf..000000000000
--- a/games-rpg/dreamweb/dreamweb-1.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Top-down adventure game set in a gritty futuristic/dystopian city"
-HOMEPAGE="http://wiki.scummvm.org/index.php/Dreamweb"
-SRC_URI="doc? ( mirror://sourceforge/scummvm/${PN}-manuals-en-highres.zip )
-	l10n_de? ( mirror://sourceforge/scummvm/${PN}-cd-de-${PV}.zip )
-	l10n_en? ( mirror://sourceforge/scummvm/${PN}-cd-us-${PV}.zip )
-	l10n_en-GB? ( mirror://sourceforge/scummvm/${PN}-cd-uk-${PV}.zip )
-	l10n_es? ( mirror://sourceforge/scummvm/${PN}-cd-es-${PV}.zip )
-	l10n_fr? ( mirror://sourceforge/scummvm/${PN}-cd-fr-${PV}.zip )
-	l10n_it? ( mirror://sourceforge/scummvm/${PN}-cd-it-${PV}.zip )
-	!l10n_de? ( !l10n_en? ( !l10n_en-GB? ( !l10n_es? ( !l10n_fr? ( !l10n_it? \
-		( mirror://sourceforge/scummvm/${PN}-cd-us-${PV}.zip ) ) ) ) ) )
-	http://www.scummvm.org/images/cat-dreamweb.png"
-
-LICENSE="Dreamweb"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc l10n_de l10n_en l10n_en-GB l10n_es l10n_fr l10n_it"
-
-RDEPEND=">=games-engines/scummvm-1.7[flac]"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_de ; then
-		mkdir -p "${S}"/de || die
-		cd "${S}"/de || die
-		unpack ${PN}-cd-de-${PV}.zip
-	fi
-	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
-			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
-		mkdir -p "${S}"/en_US || die
-		cd "${S}"/en_US || die
-		unpack ${PN}-cd-us-${PV}.zip
-	fi
-	if use l10n_en-GB ; then
-		mkdir -p "${S}"/en_GB || die
-		cd "${S}"/en_GB || die
-		unpack ${PN}-cd-uk-${PV}.zip
-	fi
-	if use l10n_es ; then
-		mkdir -p "${S}"/es || die
-		cd "${S}"/es || die
-		unpack ${PN}-cd-es-${PV}.zip
-	fi
-	if use l10n_fr ; then
-		mkdir -p "${S}"/fr || die
-		cd "${S}"/fr || die
-		unpack ${PN}-cd-fr-${PV}.zip
-	fi
-	if use l10n_it ; then
-		mkdir -p "${S}"/it || die
-		cd "${S}"/it || die
-		unpack ${PN}-cd-it-${PV}.zip
-	fi
-	if use doc ; then
-		mkdir -p "${S}"/doc || die
-		cd "${S}"/doc || die
-		unpack ${PN}-manuals-en-highres.zip
-	fi
-}
-
-src_prepare() {
-	default
-	rm -rf */license.txt */*.EXE || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	newicon "${DISTDIR}"/cat-dreamweb.png dreamweb.png
-	if use l10n_de ; then
-		doins -r de
-		make_wrapper dreamweb-de "scummvm -f -p \"/usr/share/${PN}/de\" dreamweb" .
-		make_desktop_entry ${PN}-de "Dreamweb (Deutsch)" dreamweb
-	fi
-	if use l10n_en || ( ! use l10n_de && ! use l10n_en && ! use l10n_en-GB && \
-			! use l10n_es && ! use l10n_fr && ! use l10n_it ) ; then
-		doins -r en_US
-		make_wrapper dreamweb-en_US "scummvm -f -p \"/usr/share/${PN}/en_US\" dreamweb" .
-		make_desktop_entry ${PN}-en_US "Dreamweb (US English)" dreamweb
-	fi
-	if use l10n_en-GB ; then
-		doins -r en_GB
-		make_wrapper dreamweb-en_GB "scummvm -f -p \"/usr/share/${PN}/en_GB\" dreamweb" .
-		make_desktop_entry ${PN}-en_GB "Dreamweb (UK English)" dreamweb
-	fi
-	if use l10n_es ; then
-		doins -r es
-		make_wrapper dreamweb-es "scummvm -f -p \"/usr/share/${PN}/es\" dreamweb" .
-		make_desktop_entry ${PN}-es "Dreamweb (Español)" dreamweb
-	fi
-	if use l10n_fr ; then
-		doins -r fr
-		make_wrapper dreamweb-fr "scummvm -f -p \"/usr/share/${PN}/fr\" dreamweb" .
-		make_desktop_entry ${PN}-fr "Dreamweb (Français)" dreamweb
-	fi
-	if use l10n_it ; then
-		doins -r it
-		make_wrapper dreamweb-it "scummvm -f -p \"/usr/share/${PN}/it\" dreamweb" .
-		make_desktop_entry ${PN}-it "Dreamweb (Italiano)" dreamweb
-	fi
-	use doc && dodoc -r doc/*
-}
diff --git a/games-rpg/dreamweb/metadata.xml b/games-rpg/dreamweb/metadata.xml
deleted file mode 100644
index 1cbcf304b004..000000000000
--- a/games-rpg/dreamweb/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="doc">High-resolution scans of the written material in the original UK game box</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">scummvm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/dungeon-defenders-20130305 b/games-rpg/dungeon-defenders-20130305
new file mode 100644
index 000000000000..9146403a47f2
--- /dev/null
+++ b/games-rpg/dungeon-defenders-20130305
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG
+EAPI=5
+HOMEPAGE=http://dungeondefenders.com/
+IUSE=bundled-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=x11-misc/xdg-utils >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-sound/pulseaudio-5.0[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXScrnSaver[abi_x86_32(-)] x11-libs/libXcursor[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXinerama[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] !bundled-libs? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] ) games-misc/games-envd
+RESTRICT=bindist fetch splitdebug
+SLOT=0
+SRC_URI=dundef-linux-03052013.mojo.run
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b08a2396b9c6542b9eb8eab44b3a80db
diff --git a/games-rpg/dungeon-defenders/Manifest b/games-rpg/dungeon-defenders/Manifest
deleted file mode 100644
index e45bc19fa0ff..000000000000
--- a/games-rpg/dungeon-defenders/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dundef-linux-03052013.mojo.run 5384683543 BLAKE2B 76b4f8b64ffc89f2e53b36a6002b312c6523840d9ac96acacf7ec094271af70302ff26b8a73e2b16828cd90311a3f6b45b930b3e3d8083ea4ee7b8bda2ca27c9 SHA512 911d1691411d870cee62d08b0c559ac80588edc9ba0c9d622c7528f7f8635d86eae962f7a2b1bfed27be1d780c033216374f69072ed7828e8624855e9b0b9aca
-EBUILD dungeon-defenders-20130305.ebuild 2634 BLAKE2B 6e1f4306894c9fd63b0b2b3f71fb446c9360d40e1319ece854057f6ae3a08f0b6c884a013ba6142d584bbd12cc5df2dd2aed85818dc1cd75a2ed53698a347f52 SHA512 eaebd5f69e0a5ec3dbbe1196daa1c3aff8e6cb212995f564a556dd123223008a37a25e07509ff54f0cebbf43abe812a9fb211ffdb36df3e917bb4d109a5707d5
-MISC metadata.xml 355 BLAKE2B 2ebe0923f754bb09445457bb7f266a9fb673682281d31d70b39a05f1cd0beb682fa26e89861c46e9dab0f77428b916f9f99d8324b3780c795f317b6e06efde84 SHA512 78f8cc8f1f1be915da206e4b8be196a21b58a6f209023594755e481136a1b86ee31c8d0dfedd516d756a47db624e89728875b073b71c3b08ac94a5cde8ff3b83
diff --git a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild b/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
deleted file mode 100644
index 45442dfbaf87..000000000000
--- a/games-rpg/dungeon-defenders/dungeon-defenders-20130305.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundle SDL-2 when it gets released
-
-EAPI=5
-inherit check-reqs eutils gnome2-utils unpacker games
-
-TIMESTAMP="${PV:4:2}${PV:6:2}${PV:0:4}"
-MY_PN="DungeonDefenders"
-DESCRIPTION="A hybrid of two hot genres: Tower Defense and cooperative online Action-RPG"
-HOMEPAGE="http://dungeondefenders.com/"
-SRC_URI="dundef-linux-${TIMESTAMP}.mojo.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="bindist fetch splitdebug"
-
-MYGAMEDIR=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${MYGAMEDIR#/}/UDKGame/Binaries/${MY_PN}-x86
-	${MYGAMEDIR#/}/UDKGame/Binaries/libSDL2-2.0.so.0"
-CHECKREQS_DISK_BUILD="5916M"
-
-# linked against pulseaudio
-# without SDL-2 only linkage: opengl, openal
-DEPEND="app-arch/unzip"
-RDEPEND="
-	x11-misc/xdg-utils
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXScrnSaver[abi_x86_32(-)]
-	x11-libs/libXcursor[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXi[abi_x86_32(-)]
-	x11-libs/libXinerama[abi_x86_32(-)]
-	x11-libs/libXrandr[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	!bundled-libs? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] )"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo "Please buy & download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to ${DISTDIR}"
-	einfo
-}
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_prepare() {
-	# https://bugzilla.icculus.org/show_bug.cgi?id=5894
-	sed -i \
-		-e 's/LobbyLevel_Valentines2013.udk/LobbyLevel.udk/' \
-		UDKGame/Config/DefaultDunDef.ini || die
-
-	# Remove the binaries that we're unbundling and unnecessary stuff
-	rm -v UDKGame/Binaries/xdg-open || die
-	if ! use bundled-libs ; then
-		einfo "Removing bundled libs..."
-		rm -v UDKGame/Binaries/libopenal.so.1 || die
-	fi
-}
-
-src_install() {
-	# Move the data rather than copying. The game consumes over 5GB so
-	# a needless copy should really be avoided!
-	dodir "${MYGAMEDIR}"
-	mv -v Engine UDKGame "${D}${MYGAMEDIR}" || die
-
-	# use system xdg-open script, location is hardcoded
-	dosym /usr/bin/xdg-open "${MYGAMEDIR}"/UDKGame/Binaries/xdg-open
-
-	newicon -s 48 DunDefIcon.png ${PN}.png
-	make_desktop_entry "${PN}" "Dungeon Defenders"
-	games_make_wrapper ${PN} "./${MY_PN}-x86" "${MYGAMEDIR}/UDKGame/Binaries"
-
-	dodoc README-linux.txt
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml
deleted file mode 100644
index b878aaa1812d..000000000000
--- a/games-rpg/dungeon-defenders/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">
-			Use the upstream provided bundled libraries.
-		</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/egoboo-2.8.1-r1 b/games-rpg/egoboo-2.8.1-r1
new file mode 100644
index 000000000000..fd93bdc86c21
--- /dev/null
+++ b/games-rpg/egoboo-2.8.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-games/physfs media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-libs/enet:0 virtual/glu virtual/opengl
+DESCRIPTION=A 3d dungeon crawling adventure in the spirit of NetHack
+EAPI=6
+HOMEPAGE=http://egoboo.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/libsdl[joystick,video] media-libs/sdl-image media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf net-libs/enet:0 virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/egoboo/egoboo-2.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bb5b3956e7cc3bc3f3ebcd8870c05127
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
deleted file mode 100644
index 5b2fe184b5cd..000000000000
--- a/games-rpg/egoboo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX egoboo-2.8.1-gentoo.patch 2233 BLAKE2B c2cf8754e956d1032461d9ee1ea6dae42e1969042647ec37bfc65f2fe702863386de406bfa35df76392bd38e65e10a9ec5956c84a83191fda767f53afee22121 SHA512 277e453c95ee908b064987eae732b37a6ee9c2d903532017eb8a8951458a16b5195694f8165ba7146b1ca609be6155e4df20212b8c3cb3b056c4249bc4f3e1f3
-DIST egoboo-2.8.1.tar.gz 150029960 BLAKE2B 582db0f3c033523f7b55e205aec5f7012301e3edb7a4667f49d6c4a26f99572b4652e3cf4b8ed0f9e4c4cf2f6129615a315955d0193f851fc7c16ab7eaf7e482 SHA512 5793a63ba90f461ae99bcb81bf4ddf287b203bc2d401e1f697f1f4f93e1d681954e09b23938eb1a36e7dd535e2d12b8882efd77572cc63392cad5f9462ac3054
-EBUILD egoboo-2.8.1-r1.ebuild 1254 BLAKE2B 93110e7e81f3df2960de016efb1da9b4aafdbf705727d287637b3ae880559561c0e7be806a75f7a395c89cecefce5b07333c95c30ab583c2777cd8d60d1d1990 SHA512 3ba98b1a1ed0a4af22dff6726ebc58e12c5cfca79575bc3f553ee9d196122803f5d870d0c7a93433ed46b6bf9733e4a553d82e9a44b98bf94e2e8d9e41ad5c01
-MISC metadata.xml 329 BLAKE2B e5d902b3bdacb0c6028e113c2617030dc6730c03b278cafc1ca077053ac9c9dc472d39a842fb18a506c979ae4f52dd21c1f4166f9e8f07289b8c66d6344c62a8 SHA512 c3152f5db54eb4ae254c36981adb9556ff0eb37b267cd1dd25efc1428249d826e4c37b6166034acf98229f6f3ac681d7edb9681c69fd2f88e9394dff04fbd5fb
diff --git a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild b/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
deleted file mode 100644
index 108aefdfcecc..000000000000
--- a/games-rpg/egoboo/egoboo-2.8.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
-HOMEPAGE="http://egoboo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	dev-games/physfs
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	net-libs/enet:0
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	edos2unix src/game/platform/file_linux.c \
-		src/game/network.c \
-		src/game/Makefile
-	default
-	sed -i \
-		-e "s:@GENTOO_CONFDIR@:/etc/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		src/game/platform/file_linux.c || die "sed failed"
-	rm -rf src/enet || die
-}
-
-src_compile() {
-	emake -C src/game PROJ_NAME=egoboo-2.x
-}
-
-src_install() {
-	dodoc BUGS.txt Changelog.txt doc/*.txt doc/*.pdf
-
-	insinto /usr/share/${PN}
-	doins -r basicdat modules
-	insinto /etc/${PN}
-	doins -r controls.txt setup.txt
-
-	newbin src/game/egoboo-2.x ${PN}
-
-	newicon basicdat/icon.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Egoboo /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch b/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
deleted file mode 100644
index 2f1205a45118..000000000000
--- a/games-rpg/egoboo/files/egoboo-2.8.1-gentoo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/game/platform/file_linux.c	2012-04-29 21:45:29.627419281 +0200
-+++ b/src/game/platform/file_linux.c	2012-04-29 21:45:29.628419211 +0200
-@@ -79,9 +79,9 @@
-     strncpy( linux_dataPath,   PREFIX "/share/games/egoboo-2.x", SDL_arraysize( linux_dataPath ) );
- #else
-     // these are read-only directories
--    strncpy( linux_configPath, "/etc/egoboo-2.x/",         SDL_arraysize( linux_configPath ) );
-+    strncpy( linux_configPath, "@GENTOO_CONFDIR@",         SDL_arraysize( linux_configPath ) );
-     strncpy( linux_binaryPath, "/games/",                  SDL_arraysize( linux_binaryPath ) );
--    strncpy( linux_dataPath,   "/share/games/egoboo-2.x/", SDL_arraysize( linux_dataPath ) );
-+    strncpy( linux_dataPath,   "@GENTOO_DATADIR@", SDL_arraysize( linux_dataPath ) );
- #endif
- 
-     // the log file cannot be started until there is a user data path to dump the file into
---- a/src/game/network.c	2012-04-29 20:14:31.482179973 +0200
-+++ b/src/game/network.c	2012-04-29 20:14:52.077730184 +0200
-@@ -37,7 +37,7 @@
- #include "egoboo_setup.h"
- #include "egoboo.h"
- 
--#include "enet/enet.h"
-+#include <enet/enet.h>
- #include "file_common.h"
- 
- #include <stdarg.h>
---- a/src/game/Makefile	2012-04-29 20:17:09.303070070 +0200
-+++ b/src/game/Makefile	2012-04-29 20:18:21.047023847 +0200
-@@ -33,8 +33,7 @@
- # the compiler options
- 
--CC      := gcc
--INC     := -I. -I.. -I../enet/include ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
--LDFLAGS := ${SDLCONF_L} -L../enet/lib -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet
-+INC     := -I. -I.. ${SDLCONF_I} -I./extensions -I./file_formats -I./platform
-+LDLIBS := ${SDLCONF_L} -lSDL_ttf -lSDL_mixer -lGL -lGLU -lSDL_image -lphysfs -lenet -lm
- 
- # use different options if the environmental variable PREFIX is defined
- ifdef ($(PREFIX),"")
-@@ -43,7 +43,7 @@
- 	OPT := -Os -Wall -DPREFIX=\"${PREFIX}\" -D_NIX_PREFIX
- endif
- 
--CFLAGS  := ${OPT} ${INC}
-+CFLAGS  += ${INC} -DENET11
- 
- #------------------------------------
- # definitions of the target projects
-@@ -52,7 +52,7 @@
- all: ${EGO_BIN}
- 
- ${EGO_BIN}: ${EGO_OBJ} 
--	${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS}
-+	${CC} -o $@ $^ ${LDFLAGS} ${CFLAGS} ${LDLIBS}
- 
- clean:
- 	rm -f ${ENET_OBJ} ${EGO_OBJ} ${EGO_BIN}
diff --git a/games-rpg/egoboo/metadata.xml b/games-rpg/egoboo/metadata.xml
deleted file mode 100644
index d8a2d5fe278b..000000000000
--- a/games-rpg/egoboo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">egoboo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/eschalon-book-1-demo-106-r1 b/games-rpg/eschalon-book-1-demo-106-r1
new file mode 100644
index 000000000000..ba1f47962654
--- /dev/null
+++ b/games-rpg/eschalon-book-1-demo-106-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DESCRIPTION=A classic role-playing game
+EAPI=6
+HOMEPAGE=http://basiliskgames.com/eschalon-book-i
+KEYWORDS=~amd64 ~x86
+LICENSE=eschalon-book-1-demo
+RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~calchan/distfiles/eschalon-book-1-demo-106.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=acb2fdc373a18946662b7d8adda2294f
diff --git a/games-rpg/eschalon-book-1-demo/Manifest b/games-rpg/eschalon-book-1-demo/Manifest
deleted file mode 100644
index dbbf6a8ef807..000000000000
--- a/games-rpg/eschalon-book-1-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eschalon-book-1-demo-106.tar.gz 83157919 BLAKE2B 71d6cf6d814e871d69b7a3df6549bad7aa3497f6dc6ac546cea8cb009141ee6c4538be5ebd94207b15e5259aa65e50f1c01c31e82a3950773e57dea012aef43d SHA512 7229cb48ad02b1842ac71fec03f5ea3e0df8f895409222a764c8505586a1ceb350dc4b57b4c9eed528ef0984bb60d406f41df26d5b7e8157d0f22b8ded590d66
-EBUILD eschalon-book-1-demo-106-r1.ebuild 870 BLAKE2B 1f2cce9ecee9dbeb9aa4f2e15be8eef437246dc7a49defd5387d556617ad409cfe5e6638a24383a873400054b074e4aad9ef20b6740e8b0b4ac47354c1a93586 SHA512 24c8c3649aa29e9385e911eafdecb599e791dffe7d57f74607022e90faea388c40edd6978f7637f4b24c52ac8025083635c5a5a1c7682b4eb16793a01f514119
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild b/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
deleted file mode 100644
index 62333050eaec..000000000000
--- a/games-rpg/eschalon-book-1-demo/eschalon-book-1-demo-106-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A classic role-playing game"
-HOMEPAGE="http://basiliskgames.com/eschalon-book-i"
-SRC_URI="https://dev.gentoo.org/~calchan/distfiles/${P}.tar.gz"
-
-LICENSE="eschalon-book-1-demo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-QA_PREBUILT="opt/*"
-
-RDEPEND="
-	>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXxf86vm[abi_x86_32(-)]
-	virtual/glu[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S="${WORKDIR}/Eschalon Book I Demo"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r data music sound *pdf *pak help.txt
-
-	exeinto /opt/${PN}
-	doexe "Eschalon Book I Demo"
-
-	make_desktop_entry ${PN} "Eschalon: Book I (Demo)"
-	make_wrapper ${PN} "\"./Eschalon Book I Demo\"" /opt/${PN}
-}
diff --git a/games-rpg/eschalon-book-1-demo/metadata.xml b/games-rpg/eschalon-book-1-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/eschalon-book-1-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/eternal-lands-1.9.3-r2 b/games-rpg/eternal-lands-1.9.3-r2
new file mode 100644
index 000000000000..bc7a5eb4ebcb
--- /dev/null
+++ b/games-rpg/eternal-lands-1.9.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= >=app-eselect/eselect-opengl-1.0.6-r1 app-arch/unzip virtual/pkgconfig doc? ( app-doc/doxygen media-gfx/graphviz ) media-libs/glew >=sys-apps/sed-4
+DESCRIPTION=An online MMORPG written in C and SDL
+EAPI=5
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=debug doc kernel_linux
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=eternal_lands
+RDEPEND=dev-libs/libxml2:= media-libs/cal3d:=[-16bit-indices] media-libs/freealut media-libs/libpng:0= media-libs/libsdl:=[X,opengl,video] media-libs/libvorbis:= media-libs/openal:= media-libs/sdl-image:= media-libs/sdl-net:= >=games-rpg/eternal-lands-data-1.9.3 sys-libs/zlib:=[minizip] virtual/glu virtual/opengl x11-libs/libX11:= x11-libs/libXau:= x11-libs/libXdmcp:= x11-libs/libXext:= games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://gentoo/elc_1.9.3-20120213.tar.bz2 https://dev.gentoo.org/~rich0/distfiles/eternal-lands.png
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35d7d63aa53fcbf45a7c100576a89daa
diff --git a/games-rpg/eternal-lands-bloodsucker-3.0_p20110618 b/games-rpg/eternal-lands-bloodsucker-3.0_p20110618
new file mode 100644
index 000000000000..4648e1931638
--- /dev/null
+++ b/games-rpg/eternal-lands-bloodsucker-3.0_p20110618
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-rpg/eternal-lands-data[bloodsuckermaps]
+DESCRIPTION=Non-official map pack for Eternal Lands
+EAPI=5
+HOMEPAGE=http://maps.el-pl.org/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=CC-BY-NC-SA-3.0
+RDEPEND=games-rpg/eternal-lands-data[bloodsuckermaps] games-misc/games-envd
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~rich0/distfiles/eternal-lands-bloodsucker-3.0_p20110618.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8fba4ec2410050763db06a66ad647015
diff --git a/games-rpg/eternal-lands-bloodsucker/Manifest b/games-rpg/eternal-lands-bloodsucker/Manifest
deleted file mode 100644
index 8ef5acdbdf58..000000000000
--- a/games-rpg/eternal-lands-bloodsucker/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST eternal-lands-bloodsucker-3.0_p20110618.tar.bz2 48324713 BLAKE2B 9977781e197b4ecdcf0dbf8991efc8a301234009257bd13ccde828937f3f9bc2dca97d566027ba5088e3d9d4620df9f852cef70dbebb05232e25fe3a9236e463 SHA512 951083ae5170929d64efa79962a19ab2481df956c316aecc32179478c4d56dd4d23282fa428974865216877b493a8729bdbedb0396b6c11670f6ee094c334fe4
-EBUILD eternal-lands-bloodsucker-3.0_p20110618.ebuild 801 BLAKE2B 36886285e9f15808bce7faede96151a5066c1939aa1d4b853185026ec3c2c508f3cb80cb0944e33a7e7f4647fca324fb4c6928e8bfd67a1450cd523d98f918d0 SHA512 4e36f00309f5e814508aae3337f14cf006503bc3e9cdfffb249bccfe7be6de81187b6f5de8aaa49a5d94824177a49f69e98f626e895bb769f6380e6469ab6ea1
-MISC metadata.xml 495 BLAKE2B bce2303bc9276aa8fa835a445f327e92393af54229d3f8da74d3e85812c0b4ac3a7bd387f1d9e4e306c069033501e6006e7bc9cd882ffb503e1a506f4726dd62 SHA512 5f54f31c6ba0b928da9389da93fe13f64e3ce5df24028f2a876e01c0ff2365e4764279739edbd1bf0f866c8b58ae3ba5d10c44898fbb64401cd6097c4a629fc0
diff --git a/games-rpg/eternal-lands-bloodsucker/eternal-lands-bloodsucker-3.0_p20110618.ebuild b/games-rpg/eternal-lands-bloodsucker/eternal-lands-bloodsucker-3.0_p20110618.ebuild
deleted file mode 100644
index a25ad27fdb7d..000000000000
--- a/games-rpg/eternal-lands-bloodsucker/eternal-lands-bloodsucker-3.0_p20110618.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils games
-
-DESCRIPTION="Non-official map pack for Eternal Lands"
-HOMEPAGE="http://maps.el-pl.org/"
-SRC_URI="https://dev.gentoo.org/~rich0/distfiles/${P}.tar.bz2"
-LICENSE="CC-BY-NC-SA-3.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-
-IUSE=""
-
-DEPEND="games-rpg/eternal-lands-data[bloodsuckermaps]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-src_install() {
-	insopts -m 0660
-	insinto "${GAMES_DATADIR}/eternal-lands"
-	doins -r maps
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "Note that the Bloodsucker Maps are not official maps and are not"
-	elog "supported by the Eternal Lands team."
-	elog "Please do not bother Eternal Lands staff about bugs with the maps."
-}
diff --git a/games-rpg/eternal-lands-bloodsucker/metadata.xml b/games-rpg/eternal-lands-bloodsucker/metadata.xml
deleted file mode 100644
index 87c0e5ac4cf8..000000000000
--- a/games-rpg/eternal-lands-bloodsucker/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>rich0@gentoo.org</email>
-  <name>Rich Freeman</name>
-</maintainer>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>The Bloodsucker Maps are an add-on for Eternal Lands and provide enhanced non-official maps for the game.</longdescription>
-</pkgmetadata>
diff --git a/games-rpg/eternal-lands-data-1.9.3-r1 b/games-rpg/eternal-lands-data-1.9.3-r1
new file mode 100644
index 000000000000..646dbf6df396
--- /dev/null
+++ b/games-rpg/eternal-lands-data-1.9.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst prepare
+DEPEND=app-arch/unzip !bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )
+DESCRIPTION=An online MMORPG written in C and SDL
+EAPI=6
+HOMEPAGE=http://www.eternal-lands.com
+IUSE=bloodsuckermaps music sound
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=eternal_lands
+PDEPEND=bloodsuckermaps? ( >=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )
+SLOT=0
+SRC_URI=http://www.eternal-lands.com/el_linux_193.zip music? ( mirror://gentoo/el_music_full-20060803.zip ) sound? ( http://www.eternallands.co.uk/EL_sound_191.zip )
+_md5_=050f11c1291f2a92e80f143292a748eb
diff --git a/games-rpg/eternal-lands-data/Manifest b/games-rpg/eternal-lands-data/Manifest
deleted file mode 100644
index 0576dca4f609..000000000000
--- a/games-rpg/eternal-lands-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST EL_sound_191.zip 43002046 BLAKE2B 450fd0fbff0fefbbffb1154ecb3e1e97ec8eb447d961e1442900af629c612c5a6f14f673a0c2820f7403b79ae0b4920a17f1e2a1b3457a5cc47daca0deb54bca SHA512 cc4103d6cdafffcf3926f0e90ca2555b09b22d9e00947f9e1790cfa5b7c945cff16f935ede886b498ac86028b77e8f1ead6eecab2d59848100233eed373c1310
-DIST el_linux_193.zip 67104165 BLAKE2B 8e83cc00ef766f829793880952cf852adc7081a095ee3cee4f483c6fff7f9c0a293556483506fe4d09b5681ea7b7c5796e876a92e06f739d92b5fba1e7129f51 SHA512 95de984998bfc27525b7986895d1154a74c6e4dbffb9bf115c1284213acf56a470967b55e0507ed6aacd67f972bce4689aa7cffb9acd16d92bf448f195dc4f0c
-DIST el_music_full-20060803.zip 65511882 BLAKE2B 618fe476473f00371f50f9249a11aaa7b9da28caae41e072f6cf6a5d74d640b58182586f92a770bef45c80f19c1b46408b6ac2625972ba804d4c1967f01546c6 SHA512 dbd24cb20331d3640b3a5891faaf88aa0e71ba0564dfde347f2ea0fcb7e0f2700f1324ee8e988c551efb943183bbc823d4ee0373ed2b1f6d0300df76e25a524c
-EBUILD eternal-lands-data-1.9.3-r1.ebuild 3170 BLAKE2B 0868cf1594d2acf6f0cb853674c9de2de381a09f777cffd798a14f1f7d9d0ee13697fa927a4c5e978bf61c0270a9eaa5bdf73af9e1f76b70819500a270352d6e SHA512 98ed0c7cfa0ef77b571195fce7ac9ddc1d1e749fe12c935101405222800efe5f3b0226f16d4e100b8d21e80acb6ab4290ad7d52bd8919b0debe52b08575d877c
-MISC metadata.xml 707 BLAKE2B 27ac7d1be17ce87ec9f76b8b6613a995a315f775b22b04adc7bfce8af873196145fa32f76557e8b03da3215f1aa8e847072ed7f355aee288820810cbbd515dae SHA512 1128694f4485b282c424ab67e933779dc10265f051078d62fdab077a13c7d95888b55d048402474501a4483dd1d52189295d3c08ef8e298640153d3fbd3261cd
diff --git a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild b/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
deleted file mode 100644
index cdcd0ac6284b..000000000000
--- a/games-rpg/eternal-lands-data/eternal-lands-data-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MUSIC_DATE="20060803"
-
-MY_PV="${PV//_/}"
-MY_PV="${MY_PV//./}"
-MY_PN="${PN%*-data}"
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="http://www.eternal-lands.com/el_linux_193.zip
-		music? ( mirror://gentoo/el_music_full-${MUSIC_DATE}.zip )
-		sound? ( http://www.eternallands.co.uk/EL_sound_191.zip )"
-# WARNING: The music file is held at
-# http://www.eternal-lands.com/page/music.php
-# We only mirror it so that it is versioned by the date we mirrored it
-# AND prefixed with el_ so as not cause any conflicts. Maybe oneday they will
-# version their music, maybe not.
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="bloodsuckermaps music sound"
-
-DEPEND="app-arch/unzip
-	!bloodsuckermaps? ( !games-rpg/eternal-lands-bloodsucker )"
-
-PDEPEND="bloodsuckermaps? ( >=games-rpg/eternal-lands-bloodsucker-3.0_p20110618 )"
-
-# Maybe one day upstream will do things in a consistent way.
-S="${WORKDIR}/el_linux"
-
-src_prepare() {
-	# Move our music files to the correct directory
-	if use music ; then
-		mkdir music || die
-		mv ../*.ogg ../*.pll music || die
-	fi
-
-	# Fix assertion error with >=libxml2-2.9 (see bug #449352)
-	xmllint --noent actor_defs/actor_defs.xml > actor_defs.xml || die "Failed parsing actor_defs.xml"
-	mv actor_defs.xml actor_defs || die
-	eapply_user
-}
-
-src_install() {
-	# These are provided by eternal-lands ebuild
-
-	rm license.txt
-	rm commands.lst
-
-	# don't install maps if using alternate maps
-	if use bloodsuckermaps ; then
-		rm maps/anitora.dds maps/cave1.dds maps/cont2map10.dds
-		rm maps/cont2map11.dds maps/cont2map12.dds maps/cont2map13.dds
-		rm maps/cont2map14.dds maps/cont2map15.dds maps/cont2map16.dds
-		rm maps/cont2map17.dds maps/cont2map18.dds maps/cont2map19.dds
-		rm maps/cont2map1.dds maps/cont2map20.dds maps/cont2map21.dds
-		rm maps/cont2map22.dds maps/cont2map23.dds maps/cont2map24.dds
-		rm maps/cont2map2.dds maps/cont2map3.dds maps/cont2map4.dds
-		rm maps/cont2map5.dds maps/cont2map6.dds maps/cont2map7.dds
-		rm maps/cont2map8.dds maps/cont2map9.dds maps/irilion.dds
-		rm maps/legend.dds maps/map11.dds maps/map12.dds
-		rm maps/map13.dds maps/map14f.dds maps/map15f.dds
-		rm maps/map2.dds maps/map3.dds maps/map4f.dds
-		rm maps/map5nf.dds maps/map6nf.dds maps/map7.dds
-		rm maps/map8.dds maps/map9f.dds maps/seridia.dds
-		rm maps/startmap.dds
-	fi
-
-	insopts -m 0660
-	insinto /usr/share/games/eternal-lands
-	doins -r 2dobjects 3dobjects actor_defs animations maps meshes \
-		particles skeletons shaders textures languages shaders skybox \
-		*.lst 3dobjects.txt *.xml \
-		|| die "doins failed"
-
-	if use music ; then
-		doins -r music
-	fi
-
-	# Removed sound from above - need to handle sound support
-
-	cd "${WORKDIR}"
-	if use sound ; then
-	   doins -r sound
-	fi
-}
-
-pkg_postinst() {
-	# Ensure that the files are writable by the game group for auto
-	# updating.
-	chmod -R g+rw "${EROOT}"usr/share/games/eternal-lands || die
-
-	# Make sure new files stay in games group
-	find "${EROOT}"usr/share/games/eternal-lands -type d -exec chmod g+sx {} \; || die
-}
diff --git a/games-rpg/eternal-lands-data/metadata.xml b/games-rpg/eternal-lands-data/metadata.xml
deleted file mode 100644
index 35a82f4ea804..000000000000
--- a/games-rpg/eternal-lands-data/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-		<name>Rich Freeman</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
-	</longdescription>
-	<use>
-		<flag name="bloodsuckermaps">Will install Bloodsucker's Maps in place of the official map files</flag>
-		<flag name="music">Enables in-game music</flag>
-		<flag name="sound">Enables in-game sound effects</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
deleted file mode 100644
index 2773c00f1671..000000000000
--- a/games-rpg/eternal-lands/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX eternal-lands-1.9.3-build.patch 16222 BLAKE2B c7da08215575f6a39fd586842f6a872706356f8c203abdb8865de325651d5e9e9e2976da5720cbe05144cc49bf9908667ce910b09bbc32e8a32e6ec82bd2b287 SHA512 b268c0f1dab0f86bfcea3d13122983c4efdbf9941d1851618a01986b2fc36139350e830c6838c229f7ffbb69fd51a46d06277eb43167a47e192b86db710dcfc7
-AUX eternal-lands-1.9.3-glbuild.patch 581 BLAKE2B 448e86a18de71390225c4bacb5d824da63db9c0213629c618856de0634d7b9fca97c22558031d79c2a7f69c273b7e68d02fde04c82d2d42b339227ebd7e5b35c SHA512 583b306f98975e8d86314519cfd0034870d07a2d908de9ac2fae9eba50ce90acc7f8949fbe40379a13308ebfdf33379f5801ccfe83d67c318b8edc3ddc0a9ed5
-AUX eternal-lands-1.9.3-minizip.patch 2142 BLAKE2B 6b3e12d4cfe47f5e808c7218b72f1f3ce571cacc5e916951068f1e589d8f00056add853d0d45ad72d060cd787f25c0d5f839359c39dbffc29ebfe7ef1a92c759 SHA512 2a560c99504a649de7d01d08bb4d92cdd803e6c91b2ef2d1e82449268e8248b468fb8bb855e8e73396e8d4e5e2def44bda9df07f654b730bb25b509550d0f826
-DIST elc_1.9.3-20120213.tar.bz2 2401172 BLAKE2B 496315a0d09d0b7cb99a77c77965d3d85a675659ae1970dc2c7c7560146b165a48a35f6dfd7eb461d4347ee2023df91ba47c05120957f52f777ea530e868b8d9 SHA512 3580d3ceb94094443ef25f6e4880c9ffe3fff256c8d8e6657b4e0683a05184da9e6a76264557d2065a8187e3d36febd9d30ff5adff83a17607b1e478be90fabc
-DIST eternal-lands.png 9955 BLAKE2B 376f6826bab88e798c39d79f00bd8c8758798b70beb980d44bfcdf0c4afb696ea15f58177267ddf189ce53ef6c2c33efdcf507f5135ccc000b56ca28de078f80 SHA512 c77571c949bb43fa7f95ae58f863ed972cfc76e184de5d0fa0a3599e4f7539f6334b843233b61fc807c90ef270d87cd57494510ce559427b592d255c198729bf
-EBUILD eternal-lands-1.9.3-r2.ebuild 2853 BLAKE2B 4431c51b3390d8b9bbe525d3c5a246ba3ca87a35e1a1d0fd0c54a83e81dd535062d693bd34b526e86502499d14a91a44ec9f302ed4d2e1e278a5ac4c5c30eb49 SHA512 d67cbfb1b521709f783ddb4429de88500efe327c89cf1a9c37043efa8a86fa28877621c158cd867a600b9b7e93818fc5b78aefa3cb967cb631d76321ec37bfcf
-MISC metadata.xml 482 BLAKE2B c0d2df678bcef1eb71b0a5f8824c90cd8d0f0b2fe5edf05db77e37d916b9a313dad3cdcbb64b08f793aef403dd6b79023a83584ce79073f7428a553da787e1dd SHA512 cb16ba8f0737fc26263d31d90e70d7468df8cb3fb09f7777f8c59b198f0f47d2139d5fc81597f7c63bff1afa242b60ab009f645c9269092ddc40dad2f2c62e1f
diff --git a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
deleted file mode 100644
index 02a7b89440be..000000000000
--- a/games-rpg/eternal-lands/eternal-lands-1.9.3-r2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic gnome2-utils games
-
-DESCRIPTION="An online MMORPG written in C and SDL"
-HOMEPAGE="http://www.eternal-lands.com"
-SRC_URI="mirror://gentoo/elc_1.9.3-20120213.tar.bz2
-	https://dev.gentoo.org/~rich0/distfiles/${PN}.png"
-
-LICENSE="eternal_lands"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="debug doc kernel_linux"
-
-RDEPEND="dev-libs/libxml2:=
-	media-libs/cal3d:=[-16bit-indices]
-	media-libs/freealut
-	media-libs/libpng:0=
-	media-libs/libsdl:=[X,opengl,video]
-	media-libs/libvorbis:=
-	media-libs/openal:=
-	media-libs/sdl-image:=
-	media-libs/sdl-net:=
-	>=games-rpg/eternal-lands-data-1.9.3
-	sys-libs/zlib:=[minizip]
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11:=
-	x11-libs/libXau:=
-	x11-libs/libXdmcp:=
-	x11-libs/libXext:="
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-opengl-1.0.6-r1
-	app-arch/unzip
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		media-gfx/graphviz )
-	media-libs/glew"
-
-S="${WORKDIR}/elc"
-
-src_prepare() {
-	local BROWSER="firefox"
-
-	sed -i \
-		-e 's/#browser/browser/g' \
-		-e "s/browser = mozilla/#browser = ${BROWSER}/g" \
-		-e "s@#data_dir = /usr/local/games/el/@#data_dir = ${GAMES_DATADIR}/${PN}/@g" \
-		el.ini || die "sed failed"
-
-	# Finally, update the server
-	sed -i -e '/#server_address =/ s/.*/#server_address = game.eternal-lands.com/' \
-		el.ini || die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-1.9.3-glbuild.patch"
-	epatch "${FILESDIR}/${PN}-1.9.3-build.patch"
-	epatch "${FILESDIR}/${PN}-1.9.3-minizip.patch"
-
-	# remove bundled minizip
-	rm io/{crypt,ioapi,unzip,zip}.h || die
-	rm io/{ioapi,unzip,zip}.c || die
-
-	cp Makefile.linux Makefile
-}
-
-src_compile() {
-	emake \
-		DEBUG="$(usex debug)" \
-		BSD_KERNEL="$(usex !kernel_linux)" \
-		DATADIR="${GAMES_DATADIR}/${PN}/"
-
-	if use doc; then
-		emake docs
-		mv ./docs/html/ ../client || die "Failed to move documentation directory"
-	fi
-}
-
-src_install() {
-	dogamesbin el
-	make_desktop_entry el "Eternal Lands"
-
-	insopts -m 0660
-	insinto "${GAMES_DATADIR}/${PN}"
-
-	doins -r *.ini *.txt commands.lst
-
-	if use doc ; then
-		dohtml -r "${WORKDIR}"/client/*
-	fi
-
-	doicon -s 64 "${DISTDIR}/${PN}.png"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	elog "Auto Update is now enabled in Eternal Lands"
-	elog "If an update occurs then the client will suddenly exit"
-	elog "Updates only happen when the game first loads"
-	elog "Please don't report this behaviour as a bug"
-
-	# Ensure that the files are writable by the game group for auto
-	# updating.
-	chmod -R g+rw "${ROOT}/${GAMES_DATADIR}/${PN}"
-
-	# Make sure new files stay in games group
-	find "${ROOT}/${GAMES_DATADIR}/${PN}" -type d -exec chmod g+sx {} \;
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
deleted file mode 100644
index 989bf2700d88..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-build.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 13:32:38 UTC 2012
-Subject: build system
-
-respect all flags
-respect compiler
-add options for DATADIR, BSD_KERNEL and DEBUG
-use proper pkgconfig calls
-remove needless build types
-rename EXE to "el"
-
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -3,16 +3,54 @@
- -include make.conf
- 
- # basic compiling and linking - rarely changed
--OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
--CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
--
--PNG_SCREENSHOT_LIBS = -lpng
--LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
--_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
-+CC ?= gcc
-+CXX ?= g++
-+
-+# some options
-+DATADIR ?= /usr/share/games/eternal-lands
-+
-+CPPFLAGS += -DDATA_DIR=\"$(DATADIR)\" \
-+	    -DLINUX \
-+	    -DELC \
-+	    $(foreach FEATURE, $(EL_FEATURES), -D$(FEATURE)) \
-+	    -D_7ZIP_ST
-+
-+ifeq ($(BSD_KERNEL),yes)
-+CPPFLAGS += -DBSD
-+endif
-+
-+ifeq ($(DEBUG),yes)
-+CPPFLAGS += -DMEMORY_DEBUG
-+endif
-+
-+CFLAGS += $(shell sdl-config --cflags) \
-+	  $(shell xml2-config --cflags) \
-+	  -fno-strict-aliasing \
-+	  $(EXTRA_INCLUDES)
-+
-+CXXFLAGS += $(shell sdl-config --cflags) \
-+	    $(shell xml2-config --cflags) \
-+	    -fno-strict-aliasing \
-+	    $(EXTRA_INCLUDES)
-+
-+LIBS += $(shell pkg-config --libs x11) \
-+	$(shell sdl-config --libs) \
-+	$(shell xml2-config --libs) \
-+	$(shell pkg-config --libs SDL_net) \
-+	$(shell pkg-config --libs SDL_image) \
-+	$(shell pkg-config --libs openal) \
-+	$(shell pkg-config --libs freealut) \
-+	$(shell pkg-config --libs gl) \
-+	$(shell pkg-config --libs glu) \
-+	$(shell pkg-config --libs cal3d) \
-+	$(shell pkg-config --libs libpng) \
-+	$(shell pkg-config --libs vorbis) \
-+	$(shell pkg-config --libs vorbisfile) \
-+	$(shell pkg-config --libs zlib) \
-+	-lm \
-+	$(EXTRA_LIBS) \
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-+	-lstdc++
- 
- # This works on Ubuntu 8.04 (LTS) at least
- # Install these packages in addition to those required for a standard build
-@@ -59,7 +97,7 @@
- 	xz/CpuArch.o xz/Delta.o xz/LzFind.o xz/Lzma2Dec.o xz/Lzma2Enc.o	\
- 	xz/LzmaDec.o xz/LzmaEnc.o xz/Sha256.o xz/Xz.o xz/XzCrc64.o xz/XzDec.o	\
- 	xz/XzEnc.o	\
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_COBJ))
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_COBJ))
- 	
- CXXOBJS=actor_init.o cal3d_wrapper.o context_menu.o optimizer.o sendvideoinfo.o	\
- 	exceptions/extendedexception.o xml/xmlhelper.o quest_log.o	\
-@@ -80,7 +118,7 @@
- 	eye_candy/effect_mines.o eye_candy/effect_missile.o \
- 	eye_candy/orbital_mover.o eye_candy/kepler_orbit.o	\
- 	eye_candy/effect_staff.o \
--	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_CXXOBJ))
-+	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_CXXOBJ))
- 
- OBJS=$(COBJS) $(CXXOBJS)
- HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
-@@ -89,24 +127,13 @@
- DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
- #(shell echo $OBJ |sed s/\.o/\.P/))
- 
--EXE=el.x86.linux.bin
--
--ifndef CC
--CC=gcc
--endif
--ifndef CXX
--CXX=g++
--endif
--ifndef LINK
--LINK=gcc
--endif
-+EXE=el
- 
- all: $(EXE)
- 
- # the compile targets
- $(EXE): $(OBJS)
--	@echo "  LINK $(EXE)"
--	@$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
-+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(EXE) $(OBJS) $(LIBS)
- 
- #recompile on Makefile or conf change
- #.depend $(OBJS): Makefile.linux make.conf
-@@ -114,25 +141,19 @@
- DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
- 
- $(COBJS): %.o: %.c Makefile.linux make.conf
--	@echo "  CC   $@"
--	@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+	@echo "$(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+	@if $(CC) $(CFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
- $(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
--	@echo "  CXX  $@"
--	@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
-+	@echo "$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
-+	@if $(CXX) $(CXXFLAGS) $(CPPFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
- 		mv ".deps/$@.pp" ".deps/$@.P"; \
- 	else rm -f ".deps/$@.pp"; exit 1; \
- 	fi
- 
--release:
--	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)'
--
--static:
--	@$(MAKE) -f Makefile.linux 'CFLAGS=$(_CFLAGS)' 'CXXFLAGS=$(_CXXFLAGS)' 'LDFLAGS=$(_LDFLAGS)' 'OBJS=$(OBJS) $(STATICLIBS)'
--
- clean:
- 	rm -f $(OBJS) $(EXE) 
- 
-@@ -140,8 +161,8 @@
- 	cd docs && doxygen Doxyfile
- 
- .depend: $(foreach HEADER_DIR, $(HEADER_DIRS), $(wildcard $(HEADER_DIR)/*.h))
--	$(CC) $(CFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
--	$(CXX) $(CXXFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.c, $(COBJS)) >.depend
-+	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MM $(patsubst %.o, %.cpp, $(CXXOBJS)) >>.depend
- 
- make.conf: make.defaults
- 	@if (test -f $@ -a '$(UPDATE_CONF)' != 'yes'); \
-@@ -161,7 +182,7 @@
- 	echo "\t#endinput" >> $@; \
- 	echo "#endif" >> $@; \
- 	echo "#define _features_included" >> $@; \
--	for feature in $(FEATURES); do \
-+	for feature in $(EL_FEATURES); do \
- 		echo "#define $$feature" >> $@; \
- 	done
- 
---- elc/make.defaults
-+++ elc/make.defaults
-@@ -1,71 +1,82 @@
- # set this to "no" if you don't want this file to be overwritten
- UPDATE_CONF=yes
- 
-+# set to 'yes' for BSD support
-+BSD_KERNEL=no
-+
-+# set to 'yes' to enable debug support
-+DEBUG=no
-+
- # tune these for your setup & compile options
- # IMPORTANT: if you are using a linker that needs libraries in correct order, make sure you list EYE_CANDY before PNG_SCREENSHOT if you use both
- 
- ### Current release default options ###
--FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
--FEATURES += CUSTOM_LOOK			# allows you to customize your look.
--FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
--FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
--FEATURES += NEW_SOUND			# Enables extended sound effects system
--FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
--FEATURES += TEXT_ALIASES		# Text aliases
--FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
-+EL_FEATURES += CLUSTER_INSIDES		# Group objects into separate clusters for clipping on inside maps
-+EL_FEATURES += CUSTOM_LOOK			# allows you to customize your look.
-+EL_FEATURES += CUSTOM_UPDATE		# allows autoupdating of custom look information
-+EL_FEATURES += FUZZY_PATHS			# Makes Tab Map walking not always follow exaclty the same path
-+EL_FEATURES += NEW_SOUND			# Enables extended sound effects system
-+EL_FEATURES += PNG_SCREENSHOT		# make screenshots in W3C's PNG format in game, requires libpng
-+EL_FEATURES += TEXT_ALIASES		# Text aliases
-+EL_FEATURES += USE_INLINE			# enable some optimizations to use inline functions instead of pure function calls
- # new for 1.9.0 release
--FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
-+EL_FEATURES += BANDWIDTH_SAVINGS		# enable bandwidth saving changes for message protocol
- # new for 1.9.2 release
--FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
--FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
--FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
--FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
--FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
-+EL_FEATURES += ANIMATION_SCALING		# Adds support for animation scaling, depending on the number of animation commands in the actor queue.
-+EL_FEATURES += ENCYCL_NAVIGATION		# Adds context menus to encyclopedia windows with search and bookmark functions
-+EL_FEATURES += FSAA			# Adds support for full screen anti-aliasing using OpenGL multisampling.
-+EL_FEATURES += NEW_NEW_CHAR_WINDOW		# Use the new character creation window; controls always on-screen
-+EL_FEATURES += NEW_TEXTURES		# Enables the new texture loading and caching system (http://www.eternal-lands.com/forum/index.php?showtopic=54756)
- # new for 1.9.3 release
--FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
--FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
--FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
-+EL_FEATURES += FASTER_MAP_LOAD		# Enables optimizations to speed up the process of switching between maps
-+EL_FEATURES += FASTER_STARTUP		# An attempt to reduce the startup time of EL somewhat
-+EL_FEATURES += MIDDLE_MOUSE_PASTE	# Paste using the middle mouse button from the primary buffer on X systems
- 
- ### Testing options (these options are possible for the next release and should be tested) ###
--#FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
--#FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
--#FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
--#FEATURES += NEW_ALPHA			# (undocumented)
--#FEATURES += USE_SIMD			# Enables usage of simd instructions
-+#EL_FEATURES += ANTI_ALIAS			# allows to enable/disable anti-aliasing in el.ini
-+#EL_FEATURES += DYNAMIC_ANIMATIONS		# (appears broken) Synchronizes animation to FPS instead of a fixed timer
-+#EL_FEATURES += EXT_ACTOR_DICT		# Removes remaining hard-coded actor def dictionaries - requires updated actor defs files (http://el.grug.redirectme.net/actor_defs.zip)
-+#EL_FEATURES += NEW_ALPHA			# (undocumented)
-+#EL_FEATURES += USE_SIMD			# Enables usage of simd instructions
- 
- ### Machine specific options (fixes or performance enhancements) ###
--#FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
--#FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
--#FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
-+#EL_FEATURES += EL_BIG_ENDIAN		# Enable big-endian code (automatically detected for OSX)
-+#EL_FEATURES += NO_PF_MACRO		# Use a function instead of a macro for pf_get_tile()
-+#EL_FEATURES += SIMPLE_LOD			# enable a simplistic distance culling to improve performance
- 
- 
- ### Debug options ###
--#FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
--#FEATURES += DEBUG			# (undocumented)
--#FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
--#FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
--#FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
--#FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
--#FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
--#FEATURES += EXTRA_DEBUG		# (undocumented)
--#FEATURES += MEMORY_DEBUG		# gather information about memory allocation and freeing
--#FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
--#FEATURES += MUTEX_DEBUG		# (undocumented)
--#FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
--#FEATURES += TIMER_CHECK		# (undocumented)
--#FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
-+#EL_FEATURES += CONTEXT_MENUS_TEST		# Enable "#cmtest" command to help test/demo the context menu code
-+#EL_FEATURES += DEBUG			# (undocumented)
-+#EL_FEATURES += DEBUG_XML			# Enables missing (optional) XML string property messages
-+#EL_FEATURES += DEBUG_POINT_PARTICLES	# (undocumented)
-+#EL_FEATURES += DEBUG_TIME			# Fakes the acceleration of time for use in debugging shadows and the like.
-+#EL_FEATURES += DEBUG_MAP_SOUND		# Adds (some??) map boundary areas to tab maps and additional logging to stdout
-+#EL_FEATURES += ECDEBUGWIN			# press ctrl-alt-c to open the Eye Candy debug window: trigger most effects without casting spells or server side events
-+#EL_FEATURES += EXTRA_DEBUG		# (undocumented)
-+
-+# gather information about memory allocation and freeing
-+ifeq ($(DEBUG),yes)
-+EL_FEATURES += MEMORY_DEBUG
-+endif
-+
-+#EL_FEATURES += MISSILES_DEBUG		# Enables debug for missiles feature. It will create a file missiles_log.txt file in your settings directory.
-+#EL_FEATURES += MUTEX_DEBUG		# (undocumented)
-+#EL_FEATURES += OPENGL_TRACE		# make far more frequent checks for OpenGL errors (requires -DDEBUG to be of any use). Will make error_log.txt a lot larger.
-+#EL_FEATURES += TIMER_CHECK		# (undocumented)
-+#EL_FEATURES += _EXTRA_SOUND_DEBUG		# Enable debug for sound effects
- 
- 
- ### Other options (Experimental, unfinished, defunct or otherwise unknown) ###
--#FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
--#FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
--#FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
--#FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
--#FEATURES += USE_BOOST
--#FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
--#FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
--#FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
--#FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
-+#EL_FEATURES += NEW_CURSOR			# New coloured cursors made by Emajekral (Experimental) Extract http://users.on.net/~gingerman/sky_cursor-textures.zip into datadir/textures/
-+#EL_FEATURES += PAWN			# Experimental, not for release, will need server support to function properly. This *will* eat your cat. You've been warned. Enables the Pawn abstract machine.
-+#EL_FEATURES += UID			# use unique ID sent from server for custom looks. (INCOMPLETE)
-+#EL_FEATURES += USE_ACTORS_OPTIMIZER	# Enables actor optimizations
-+#EL_FEATURES += USE_BOOST
-+#EL_FEATURES += USE_TR1			# Needs tr1 version of c++ stl, used for NEW_FILE_IO
-+#EL_FEATURES += WRITE_XML			# dangerous to use, will wipe out some XML files that are part of the main game download
-+#EL_FEATURES += ZLIBW			# Enables being able to write gzip compressed files, requires -lzlib/-lz needed for map_editor
-+#EL_FEATURES += OLD_MISC_OBJ_DIR		# if not defined, ./3dobjects/misc_objects/ paths becomes ./3dobjects/
- 
- 
- 
-@@ -86,7 +97,3 @@
- #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
- #EXTRA_LIBS=-lz
- #EXTRA_STATICLIBS=libs/zlib.a
--
--CC=gcc
--CXX=g++
--LINK=gcc
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
deleted file mode 100644
index 972abd9b0d2b..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-glbuild.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gl_init.c	2012-02-13 22:01:54.000000000 -0500
-+++ gl_init.c	2012-12-02 18:09:41.274014922 -0500
-@@ -27,6 +27,8 @@
- #include "fsaa/fsaa.h"
- #endif	/* FSAA */
- 
-+#define APIENTRY
-+
- Uint32 flags;
- 
- int window_width=640;
---- platform.h	2012-02-13 22:01:54.000000000 -0500
-+++ platform.h	2012-12-02 17:32:46.017627957 -0500
-@@ -87,9 +87,10 @@
-  #define APIENTRYP *
- #elif !defined(BSD)
-  #define GL_GLEXT_LEGACY
-+ #include <GL/glew.h>
-  #include <GL/gl.h>
-  #include <GL/glu.h>
-- #include "glext.h"
-+ #include <GL/glext.h>
- #else // BSD
-  #include <GL/gl.h>
-  #include <GL/glu.h>
diff --git a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch b/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
deleted file mode 100644
index 9edb22254502..000000000000
--- a/games-rpg/eternal-lands/files/eternal-lands-1.9.3-minizip.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Jun 24 16:33:08 UTC 2012
-Subject: unbundle minizip
-
-https://bugs.gentoo.org/show_bug.cgi?id=423327
-applied on top of eternal-lands-1.9.3-build.patch
-
---- elc/new_update.c
-+++ elc/new_update.c
-@@ -5,8 +5,8 @@
- #include <string.h>
- #include "md5.h"
- #include "elc_private.h"
--#include "io/zip.h"
--#include "io/unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- #include "io/ziputil.h"
- #include "io/fileutil.h"
- #include "io/elfilewrapper.h"
---- elc/io/ziputil.h
-+++ elc/io/ziputil.h
-@@ -8,8 +8,8 @@
- 
- #include <SDL.h>
- #include "../md5.h"
--#include "zip.h"
--#include "unzip.h"
-+#include <zip.h>
-+#include <unzip.h>
- 
- #ifdef __cplusplus
- extern "C"
---- elc/io/elfilewrapper.c
-+++ elc/io/elfilewrapper.c
-@@ -1,5 +1,5 @@
- #include "elfilewrapper.h"
--#include "unzip.h"
-+#include <unzip.h>
- #include "elpathwrapper.h"
- #include "fileutil.h"
- #include <sys/stat.h>
---- elc/Makefile.linux
-+++ elc/Makefile.linux
-@@ -25,11 +25,13 @@
- 
- CFLAGS += $(shell sdl-config --cflags) \
- 	  $(shell xml2-config --cflags) \
-+	  $(shell pkg-config --cflags minizip) \
- 	  -fno-strict-aliasing \
- 	  $(EXTRA_INCLUDES)
- 
- CXXFLAGS += $(shell sdl-config --cflags) \
- 	    $(shell xml2-config --cflags) \
-+	    $(shell pkg-config --cflags minizip) \
- 	    -fno-strict-aliasing \
- 	    $(EXTRA_INCLUDES)
- 
-@@ -47,6 +49,7 @@
- 	$(shell pkg-config --libs vorbis) \
- 	$(shell pkg-config --libs vorbisfile) \
- 	$(shell pkg-config --libs zlib) \
-+	$(shell pkg-config --libs minizip) \
- 	-lm \
- 	$(EXTRA_LIBS) \
- 	$(foreach FEATURE, $(EL_FEATURES), $($(FEATURE)_LIBS)) \
-@@ -80,7 +83,7 @@
- 	gamewin.o gl_init.o hud.o help.o highlight.o	\
- 	ignore.o init.o interface.o items.o io/fileutil.o	\
- 	io/e3d_io.o io/elc_io.o	io/map_io.o io/elpathwrapper.o io/xmlcallbacks.o \
--	io/half.o io/normal.o io/elfilewrapper.o io/unzip.o io/ioapi.o io/zip.o io/ziputil.o	\
-+	io/half.o io/normal.o io/elfilewrapper.o io/ziputil.o	\
- 	keys.o knowledge.o langselwin.o lights.o list.o load_gl_extensions.o loginwin.o loading_win.o	\
- 	main.o manufacture.o map.o mapwin.o memory.o	\
- 	md5.o mines.o minimap.o misc.o missiles.o multiplayer.o	\
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
deleted file mode 100644
index 3a16e77fe8ea..000000000000
--- a/games-rpg/eternal-lands/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>rich0@gentoo.org</email>
-		<name>Richard Freeman</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-		Eternal Lands is a FREE MMORPG (massively multiplayer online role playing game)
-	</longdescription>
-</pkgmetadata>
diff --git a/games-rpg/freedink-108.4-r1 b/games-rpg/freedink-108.4-r1
new file mode 100644
index 000000000000..5079df856b3b
--- /dev/null
+++ b/games-rpg/freedink-108.4-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure prepare
+DEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 dev-libs/check virtual/pkgconfig sys-devel/gettext
+DESCRIPTION=Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=media-libs/fontconfig-2.4 >=media-libs/libsdl-1.2[X,sound,joystick,video] >=media-libs/sdl-gfx-2.0 >=media-libs/sdl-image-1.2 >=media-libs/sdl-mixer-1.2[midi,vorbis,wav] >=media-libs/sdl-ttf-2.0.9 games-rpg/freedink-data
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-108.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4dfcdcf0eb321f7c65f39bf7313fadce
diff --git a/games-rpg/freedink-data-1.08.20140901-r1 b/games-rpg/freedink-data-1.08.20140901-r1
new file mode 100644
index 000000000000..83ddde8a9778
--- /dev/null
+++ b/games-rpg/freedink-data-1.08.20140901-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedink game data
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB CC-BY-SA-3.0 CC-BY-3.0 FreeArt GPL-2 GPL-3 WTFPL-2 OAL-1.0.1 public-domain
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-data-1.08.20140901.tar.gz
+_md5_=d4d7ad4de5190e01896c21682fba95dc
diff --git a/games-rpg/freedink-data-1.08.20170409 b/games-rpg/freedink-data-1.08.20170409
new file mode 100644
index 000000000000..a2ed4e332357
--- /dev/null
+++ b/games-rpg/freedink-data-1.08.20170409
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Freedink game data
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB CC-BY-SA-3.0 CC-BY-3.0 FreeArt GPL-2 GPL-3 WTFPL-2 OAL-1.0.1 public-domain
+SLOT=0
+SRC_URI=mirror://gnu/freedink/freedink-data-1.08.20170409.tar.gz
+_md5_=3c19a69e2a994a4244cc9f9945eca270
diff --git a/games-rpg/freedink-data/Manifest b/games-rpg/freedink-data/Manifest
deleted file mode 100644
index 5b2e93b46124..000000000000
--- a/games-rpg/freedink-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST freedink-data-1.08.20140901.tar.gz 51303165 BLAKE2B 28c225cf12b2bdcf0cf4cccb773e39055c756f0d031d851e697b2a47b8d82781b43ac31ae88245e67582be74fed8a67b20498d8e61231bb4106cc1a679b9ac18 SHA512 cdaa50610ed7e365967f6a84f6d540295ccc85bf4d11b882b49c6b97abe2b375be9880afc1e8ea31cdf22a24365d09861b9f4d1d522cc1ae685f7a8b6b4cad82
-DIST freedink-data-1.08.20170409.tar.gz 53030350 BLAKE2B cf7eb210ed908aed185b2c3d450492ef4265600ee8a058a4d13396de21ec543b619bca4d1a684edec69c913459489db2f1fe868b51306e52ffdf081d7245cd7d SHA512 8ce6bd0de33da0edd42722c2a7d02aae54a3e8e81fc8e0a4c97d9b2b696e58eb41e05e12b3fc1cd4be72be7bcf799988d50affb3689f3fec8e2e78c878cd4afc
-EBUILD freedink-data-1.08.20140901-r1.ebuild 480 BLAKE2B af2dd511e91fc3befa1e7ca9d5af8906e751610c7f7418dbc1f5e579a928c16e53b20728289e76ed0dd9c352e279e3018310bb20d1576ff9585c8eaec361089e SHA512 0d1b688d5c8cab12bd4c3123583f8d20686a65f275b510b97664935b452ba5b76604639e51d9307edf2f5101e4dbdba4c049793936ff1a154a3dbcdbe0f869c9
-EBUILD freedink-data-1.08.20170409.ebuild 472 BLAKE2B 3cf16f3b121aefee27b7d147d7596aa3c4aa545a42d67f6d5fc3a5293798a5576d8c42c6a145da14f376c3a7569a21ebb74e63700ea33773decde06f967a6f0f SHA512 13c954cb0697375126de07de9851f6175705e18d85ed649ac841889af2df779de148cf54aaa20dbc7af2adc4a58f51dc5428f8702f4d527a73b93b8fcbf2fcab
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
deleted file mode 100644
index 3a8d887e4ddb..000000000000
--- a/games-rpg/freedink-data/freedink-data-1.08.20140901-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Freedink game data"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="ZLIB
-	CC-BY-SA-3.0
-	CC-BY-3.0
-	FreeArt
-	GPL-2
-	GPL-3
-	WTFPL-2
-	OAL-1.0.1
-	public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="/usr/share" install
-	dodoc README.txt README-REPLACEMENTS.txt
-}
diff --git a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild b/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
deleted file mode 100644
index 61874259e09a..000000000000
--- a/games-rpg/freedink-data/freedink-data-1.08.20170409.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Freedink game data"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="ZLIB
-	CC-BY-SA-3.0
-	CC-BY-3.0
-	FreeArt
-	GPL-2
-	GPL-3
-	WTFPL-2
-	OAL-1.0.1
-	public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_install() {
-	emake DESTDIR="${D}" DATADIR="/usr/share" install
-	dodoc README.txt README-REPLACEMENTS.txt
-}
diff --git a/games-rpg/freedink-data/metadata.xml b/games-rpg/freedink-data/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/freedink-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/freedink/Manifest b/games-rpg/freedink/Manifest
deleted file mode 100644
index 8e9f5064bd39..000000000000
--- a/games-rpg/freedink/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX freedink-108.4-no-windres.patch 733 BLAKE2B 165eb162877e49b4d2785ca394da2eb092171ae02f46da822d39405a037f40d28553fb46f5900b4b50f84a3e1abe499ae65198e4b21e7d2bb8771e6ce97cfd67 SHA512 f771f54e93d0ce4233d8f895dba91cfe637abae47d1fccefeb5fea615845c107710b1f7c7ccf30dc2a1ef6bc4ec7ee73ff7bc7914387ca5e97de229457c18802
-DIST freedink-108.4.tar.gz 1897701 BLAKE2B b26129f3e5d17895a08cac9564973e31d6e8e2458ac9a2ed4b00f53cd1b8004073022a8e3f4cf8ded2e44cc4bb73909f021a7c960d219e78aec47b4c4ce7c18e SHA512 1496b6a7826bf694a2919add22a8b4b08a4967d8a7fdebf2d599bd99c7a7ce67de6c2b11124423c7aa1f0feb2e7c03ce1cf00252070182936e7481791dafee61
-EBUILD freedink-108.4-r1.ebuild 1064 BLAKE2B 51675813c9d58c44da48884bd47b6f51373a7f9d05f8118e7ff35ccd582c87cc3326baf3329668b30ab98dfa80f3b746ef66913f45a1e47b88d406ae08123891 SHA512 29b4f5d78125577e2790e6a46b922b2fcf13099c275898f8ee685be2adda84e6d125daafc650f5dd04473e09d3fe744cc332a058664fe21a705a3dd1efbe4a11
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/freedink/files/freedink-108.4-no-windres.patch b/games-rpg/freedink/files/freedink-108.4-no-windres.patch
deleted file mode 100644
index 81c72e00dae0..000000000000
--- a/games-rpg/freedink/files/freedink-108.4-no-windres.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -226,7 +226,7 @@
- 	update_frame.h
- am_freedink_OBJECTS = $(am__objects_3) freedink.$(OBJEXT) \
- 	update_frame.$(OBJEXT)
--@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
-+#@HAVE_WINDRES_TRUE@am__objects_4 = woeres.$(OBJEXT)
- nodist_freedink_OBJECTS = $(am__objects_4)
- freedink_OBJECTS = $(am_freedink_OBJECTS) $(nodist_freedink_OBJECTS)
- freedink_LDADD = $(LDADD)
-@@ -1143,7 +1143,7 @@
- @HAVE_WINDRES_FALSE@WOERES = 
- 
- # How do we handle resources embedded in the executable binary?
--@HAVE_WINDRES_TRUE@WOERES = woeres.rc
-+#@HAVE_WINDRES_TRUE@WOERES = woeres.rc
- 
- # Other projects that use Autotools and support MinGW
- # http://sourceforge.net/projects/chocolate-doom (Doom port)
diff --git a/games-rpg/freedink/freedink-108.4-r1.ebuild b/games-rpg/freedink/freedink-108.4-r1.ebuild
deleted file mode 100644
index 743ce07e7546..000000000000
--- a/games-rpg/freedink/freedink-108.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Dink Smallwood is an adventure/role-playing game, similar to Zelda (2D top view)"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=media-libs/fontconfig-2.4
-	>=media-libs/libsdl-1.2[X,sound,joystick,video]
-	>=media-libs/sdl-gfx-2.0
-	>=media-libs/sdl-image-1.2
-	>=media-libs/sdl-mixer-1.2[midi,vorbis,wav]
-	>=media-libs/sdl-ttf-2.0.9
-"
-RDEPEND="${DEPEND}
-	games-rpg/freedink-data
-"
-DEPEND="${DEPEND}
-	dev-libs/check
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-108.4-no-windres.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's#^datarootdir =.*$#datarootdir = /usr/share#' \
-		share/Makefile.in || die
-	# seems like the code is fragile (bug #559548)
-	filter-flags
-	replace-flags -O? -O0
-}
-
-src_configure() {
-	econf \
-		--disable-embedded-resources \
-		--localedir="/usr/share/locale"
-}
diff --git a/games-rpg/freedink/metadata.xml b/games-rpg/freedink/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/freedink/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/freedroid-1.0.2-r1 b/games-rpg/freedroid-1.0.2-r1
new file mode 100644
index 000000000000..b9f3c1b9ad50
--- /dev/null
+++ b/games-rpg/freedroid-1.0.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] media-libs/libvorbis media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] sys-libs/zlib
+DESCRIPTION=Freedroid - a Paradroid clone
+EAPI=6
+HOMEPAGE=http://freedroid.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[joystick,sound,video] media-libs/libvorbis media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[mod,vorbis] sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/freedroid/freedroid-1.0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f174b0ac79e60dbb79ac38369045afa2
diff --git a/games-rpg/freedroid/Manifest b/games-rpg/freedroid/Manifest
deleted file mode 100644
index 505b0ebe770c..000000000000
--- a/games-rpg/freedroid/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX freedroid-1.0.2-format.patch 762 BLAKE2B ec8021ac592995cfa5bfde3e134e432b67d74980c9bbdf733ad9938ce9d11e665e2e21695400cc7ff333d65561420917e6e8c15bd807fdb887524c67c3d9d242 SHA512 cc2a49a22bfd8e574ee466ef837e1c4a32e7529a6275c0abab507e46291c63abbf641975fc08297f63b4a6204c4436a18b053231aeaed0ee40ed86b01217cf47
-DIST freedroid-1.0.2.tar.gz 4819173 BLAKE2B 9548cc350010eff47ca13b8b4fd6b1082f16e1fe41bad5c2359aecd7834ef22b27adc90d1d33564edc63a592ffa6934224a0ee16784cf736b98fcb56d287229a SHA512 cfafa4af86a2007fcf761b51e6c7dcc6dc40f4513057413901fede41b7a436b9c8cf7c3e5c29130e5410fab640ffbdc8100043a442555e862acffe9f33086be1
-EBUILD freedroid-1.0.2-r1.ebuild 841 BLAKE2B f7e5c35d2aed93408c84fe25345ee88e02ff155163ed378f25de4334f546efc437749004f20cfb732bddfaf8077d4785e6c335d15ebf4afbf14da5bbc06bc848 SHA512 43ca7bdbdde0e3284d3e76bc7af73002675b1d5d73be26c562c3322ce7a1464f0a04ff3b3bbb577a530e82c613e276bed99a0d1df79dc66d9a8e7ee90c54eb6b
-MISC metadata.xml 332 BLAKE2B ef2f4517b0f8c02b4e6703dc065c71280ad5b06e03293977118662f2a754ec15d4a1c18980ae945018e7315bf387a49f100e7b5a48d3391f9bd8f617d8f8f3a7 SHA512 4fe0371b423de98a48fb21ec25d0fc34e393ce7c2f497e815c2f991f65507b2762b1cb68c87742bd2f3714a063828d8764ea2a815e33cba086b102d5ad672932
diff --git a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch b/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
deleted file mode 100644
index 4dbf96bda3f0..000000000000
--- a/games-rpg/freedroid/files/freedroid-1.0.2-format.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/init.c	2015-10-24 17:37:24.431514375 +0200
-+++ b/src/init.c	2015-10-24 17:37:43.057157826 +0200
-@@ -554,13 +554,13 @@
- 	   * following gnu-coding standards for command line interfaces */
- 	case 'v':
- 	  printf ("\n%s %s  \n", PACKAGE, VERSION); 
--	  printf (copyright);
-+	  printf ("%s", copyright);
- 	  exit (0);
- 	  break;
- 
- 	case 'h':
- 	case '?':
--	  printf (usage_string);
-+	  printf ("%s", usage_string);
- 	  exit (0);
- 	  break;
- 
---- a/src/misc.c	2015-10-24 17:37:54.368941282 +0200
-+++ b/src/misc.c	2015-10-24 17:38:10.202638172 +0200
-@@ -889,7 +889,7 @@
-   if (db_level <= debug_level)
-     {
-       vsnprintf (buffer, 5000, fmt, args);
--      fprintf (stderr, buffer);
-+      fprintf (stderr, "%s", buffer);
-       fflush (stderr);
-     }
- 
diff --git a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild b/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
deleted file mode 100644
index e6eb377ac6db..000000000000
--- a/games-rpg/freedroid/freedroid-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Freedroid - a Paradroid clone"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod,vorbis]
-	sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	default
-	find "${D}" -name "Makefile*" -exec rm -f '{}' + || die
-	rm -rf "${D}/usr/share/${PN}/"{freedroid.6,mac-osx} || die
-	newicon graphics/paraicon.bmp ${PN}.bmp
-	make_desktop_entry freedroid Freedroid /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-rpg/freedroid/metadata.xml b/games-rpg/freedroid/metadata.xml
deleted file mode 100644
index ca95edad2177..000000000000
--- a/games-rpg/freedroid/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">freedroid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/freedroidrpg-0.16-r1 b/games-rpg/freedroidrpg-0.16-r1
new file mode 100644
index 000000000000..0879751c084a
--- /dev/null
+++ b/games-rpg/freedroidrpg-0.16-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[opengl?,sound?,video] >=media-libs/sdl-gfx-2.0.21 media-libs/sdl-image[jpeg,png] nls? ( virtual/libintl ) opengl? ( virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] ) x11-libs/libX11 || ( >=dev-lang/python-2.7.5-r2:2.7 ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=A modification of the classical Freedroid engine into an RPG
+EAPI=6
+HOMEPAGE=http://freedroid.sourceforge.net/
+IUSE=nls opengl sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=virtual/jpeg:0 media-libs/libpng:0 media-libs/libsdl[opengl?,sound?,video] >=media-libs/sdl-gfx-2.0.21 media-libs/sdl-image[jpeg,png] nls? ( virtual/libintl ) opengl? ( virtual/opengl ) sound? ( media-libs/libogg media-libs/libvorbis media-libs/sdl-mixer[vorbis] ) x11-libs/libX11
+SLOT=0
+SRC_URI=ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-0.16//freedroidRPG-0.16.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a75a0f47bdfceed9541bc55c787704a9
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
deleted file mode 100644
index 2e13858b90e8..000000000000
--- a/games-rpg/freedroidrpg/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST freedroidRPG-0.16.tar.gz 225570013 BLAKE2B ad87ad3d368c94eb1f3dae2d4c3df97b9bc88acccbec4cbcd31e42b411bb96506faac23f8de9b0317a1ab926b34bd01196adce617ab7b731354049d3fb010643 SHA512 039ee4bfcd58e29a3cfa26ae7f2bc8aed7c289119476bb8f8486006910cf6a2127ba49f7526fac887392ca9e5320fb1a59ba068834e162348905423908b0755a
-EBUILD freedroidrpg-0.16-r1.ebuild 1781 BLAKE2B 4ab53881ba87e23fd60353a9f303eb321ca9cfddec398c5e43dd1c51d4939803c0ce60491389c62304efa7159ce2c7452d25de27241a9131275425741c8a255b SHA512 2f4df51a1208eb76f03d830d671f8433bdb2a0c03ed99c06fb1af4e1be8e6e4c09dd566f7bf6faddf6dbf81c1c6c20e80087fbd7cd2e3fe51fbacb0d02fa90ec
-MISC metadata.xml 2288 BLAKE2B e60e49e0140a270511938adc92ee1d0498590c0daff8fc26ab1451a29bb1ede358991da211f821b04d9432c6792335e18c328aeb8c6613b9b3a87954ba8b2c8d SHA512 196a3711abe685277462235c912a41b46dc8fa5122d611f4f864300262ae888611951451162db87e75eafa7720d662a1fc51e4441b0d9fb730109f6c2c4aadca
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild
deleted file mode 100644
index cdde16dcc8f2..000000000000
--- a/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils gnome2-utils python-any-r1
-
-DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${PV}//freedroidRPG-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl sound"
-
-RDEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[opengl?,sound?,video]
-	>=media-libs/sdl-gfx-2.0.21
-	media-libs/sdl-image[jpeg,png]
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	sound? (
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/sdl-mixer[vorbis] )
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^dist_doc_DATA/d' \
-		-e '/-pipe/d' \
-		-e '/^SUBDIRS/s/pkgs//' \
-		Makefile.am || die
-	python_fix_shebang src sound
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fastmath \
-		--with-embedded-lua \
-		--localedir=/usr/share/locale \
-		$(use_enable nls) \
-		$(use_enable opengl) \
-		$(use_enable sound)
-}
-
-src_install() {
-	local i
-
-	default
-	for i in 48 64 96 128
-	do
-		doicon -s ${i} pkgs/freedesktop/icons/hicolor/${i}x${i}/apps/freedroidRPG.png
-	done
-	doicon -s scalable pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg
-	make_desktop_entry freedroidRPG "Freedroid RPG" freedroidRPG
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
-	ewarn "${P} is not compatible with old save games."
-	ewarn "Please start a new character."
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/freedroidrpg/metadata.xml b/games-rpg/freedroidrpg/metadata.xml
deleted file mode 100644
index d9e96aa7715a..000000000000
--- a/games-rpg/freedroidrpg/metadata.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <longdescription>
-Hello, and welcome to the Freedroid page.
-
-THE CLASSICAL FREEDROID: Freedroid is a clone of the classic game
-"Paradroid" on Commodore 64 with some improvements and extensions to
-the classic version. 
-
-In this game, you control a robot, depicted by a small white ball with
-a few numbers within an interstellar spaceship consisting of several
-decks connected by elevators. 
-
-The aim of the game is to destroy all enemy robots, depicted by small
-black balls with a few numbers, by either shooting them or seizing
-control over them by creating connections in a short subgame of
-electric circuits. 
-
-Development of this game is now complete.  The final version came out
-in august 2003 and runs on Linux, Mac OSX, Sharp Zaurus and even that
-strange Windows wannabe of an operating system.  Thanks to all who 
-helped.
-Minor fixes and maintainance will of course still continue though...
-
-FREEDROID RPG:  The Freedroid RPG is an extension/modification of the
-classical freedroid engine into an RPG.  The main differences to the
-classical version are as follows: 
-* The Tux is the main character of the rpg.  He is not displayed as a
-   ball like in Freedroid but rather as an animated character, while
-   other droids and humans in the game are still represented as the balls
-   with some number or code in them. 
-* Dialogs and chatting with friendly droids and humans:
-   Multiple-choice menus and voice samples (with subtitles for those
-   without sound). 
-* Melee weapons, armour and other items to be equipped have been
-   added. 
-* An automap feature was added.
-* Saving and loading of games.
-* A shop to trade things.
-* Controls are different:  Mouse can be used to do everything.
-   Joystick is not supported for moving around any more. 
-* The archive size (including sound samples) is about 10 times as big
-   as for the classical version.  I'd like to appologize to all 56K modem
-   owners at this point. 
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">freedroid</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/grimrock-20150707 b/games-rpg/grimrock-20150707
new file mode 100644
index 000000000000..238ee257d7fa
--- /dev/null
+++ b/games-rpg/grimrock-20150707
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst unpack
+DEPEND=app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine
+EAPI=6
+HOMEPAGE=http://www.grimrock.net/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=media-libs/freeimage media-libs/freetype:2 media-libs/openal media-libs/libsdl2[opengl,sound,video] media-libs/libvorbis sys-libs/zlib[minizip] virtual/opengl x11-libs/libX11
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=Grimrock-Linux-2015-07-07.sh
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=12024eb42c3c4c92346ceaba63e6ee04
diff --git a/games-rpg/grimrock/Manifest b/games-rpg/grimrock/Manifest
deleted file mode 100644
index f98afb3eae90..000000000000
--- a/games-rpg/grimrock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Grimrock-Linux-2015-07-07.sh 316846242 BLAKE2B 5d8123b3e2dedf4d6b2ae6f43c9ebe5427e63205b7ff53dc0fba26b0b3a8a1f164b79a3a10776c751aa0fbe29c7ef715412bff826476894eec6aa545da4adec3 SHA512 c90203a747564223281fb61ffcc7ac90f772990f33bb8345aff68c65fbc371f0f1a611645e952a75bd9dbca9e760398c0411eb9adade9c58e525a5b1c4e186db
-EBUILD grimrock-20150707.ebuild 1555 BLAKE2B 11b0bc03dd1b01614dd3899b1d6b615fc34d32b02162b7e750a37da21b12e3b49cd9fce9a155f2c85e9edaba9d19841755bd4afa2acdf29118a69d5837b83a2f SHA512 d46f2401d3daac6767a535175fde51167c8bbf946c4e8ba4608cbad2b6d4da0b3f076c3ff1e9594cb1b802bcd30ea18072ddf252f29f36b35e9946ca2d5992e4
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/grimrock/grimrock-20150707.ebuild b/games-rpg/grimrock/grimrock-20150707.ebuild
deleted file mode 100644
index 03275c50c9a5..000000000000
--- a/games-rpg/grimrock/grimrock-20150707.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils unpacker
-
-TIMESTAMP="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PN="Grimrock"
-DESCRIPTION="Legend of Grimrock: The ultimate dungeon crawling RPG + modding engine"
-HOMEPAGE="http://www.grimrock.net/"
-SRC_URI="Grimrock-Linux-${TIMESTAMP}.sh"
-
-SLOT="0"
-LICENSE="all-rights-reserved"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="/opt/${PN}/${MY_PN}.bin"
-
-RDEPEND="media-libs/freeimage
-	media-libs/freetype:2
-	media-libs/openal
-	media-libs/libsdl2[opengl,sound,video]
-	media-libs/libvorbis
-	sys-libs/zlib[minizip]
-	virtual/opengl
-	x11-libs/libX11"
-
-DEPEND="app-arch/xz-utils"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	einfo "Please buy and download ${SRC_URI} from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move it to your distfiles directory."
-}
-
-src_unpack() {
-	myarch=$(usex amd64 x86_64 x86)
-	unpack_makeself
-
-	local i
-	for i in subarch instarchive_all instarchive_linux_${myarch}; do
-		ln -snf "${i}" "${i}.tar.xz" || die
-		unpack ./"${i}.tar.xz"
-	done
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	insinto "${dir}"
-	doins ${PN}.{dat,png}
-
-	exeinto "${dir}"
-	newexe ${MY_PN}.bin{.${myarch},}
-	dosym "../..${dir}"/${MY_PN}.bin /usr/bin/${PN}
-
-	doicon -s 256 ${PN}.png
-	newicon -s 64 ${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} "Legend of ${MY_PN}"
-
-	dodoc README.linux
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-rpg/grimrock/metadata.xml b/games-rpg/grimrock/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-rpg/grimrock/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/gwiz-0.8-r1 b/games-rpg/gwiz-0.8-r1
new file mode 100644
index 000000000000..2e9bffcbba7e
--- /dev/null
+++ b/games-rpg/gwiz-0.8-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-image-1.2.1-r1[png] >=media-libs/sdl-ttf-2.0.4
+DESCRIPTION=clone of old-school Wizardry(tm) games by SirTech
+EAPI=6
+HOMEPAGE=http://icculus.org/gwiz/
+KEYWORDS=~alpha ~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.3[joystick,video] >=media-libs/sdl-image-1.2.1-r1[png] >=media-libs/sdl-ttf-2.0.4
+SLOT=0
+SRC_URI=http://icculus.org/gwiz/gwiz-0.8.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=847a400a1b7f0db12e2f2b7f9dc9636d
diff --git a/games-rpg/gwiz/Manifest b/games-rpg/gwiz/Manifest
deleted file mode 100644
index 81457d7774d8..000000000000
--- a/games-rpg/gwiz/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gwiz-0.8-buffer.patch 653 BLAKE2B 1041deef28648a2cee73bd1b0ac458bbb290bed152588fb6400e6b305c3c702472612bea5015adb52da8533af1fd80325fd17ca6e855f6b98e88ee6d4714ebb7 SHA512 127bf8b442f437fa1ad373f203aaa388f28e59f570257a6ea44906997ed069c379f7b96879c95a198e420a86653331e73a0d2f54fbb55731383f22f274d5b4ba
-DIST gwiz-0.8.tar.bz2 1141667 BLAKE2B 60c28da8caa2b54c1b193b6bc0e8173fea525394c9467beae74ccef69ab21d5c8d259d0e5a1c6d2b557114c8405643bf5c2d74ab6ba01ee92252a350ee5a80e2 SHA512 3c18cc7e905dd87eab7dbf332b985600bbcc8c2992fbc79d992fb0f00c3095c502f416166f0e3320f18b9e011c26675c42e79375f44225b61aba415509837f20
-EBUILD gwiz-0.8-r1.ebuild 774 BLAKE2B 6a5ccaf7f6be75580df34d3c2cefe5940aff9295c79c0f0a03e1f72dd2e7d02af1d96e38fdaa0106d2443e52909bab88e191dd1235acf2d1f2585a7d77c4e7e3 SHA512 9e305c35a0d2efa22c409ffc4898859624644cd4a34a897ba8dcadd640653e5160fd0c4ae95f6efe6c42fe2e890bd9b56e9f4514d39e0fc4f96c98de21b67626
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/gwiz/files/gwiz-0.8-buffer.patch b/games-rpg/gwiz/files/gwiz-0.8-buffer.patch
deleted file mode 100644
index 44ee9aec15fb..000000000000
--- a/games-rpg/gwiz/files/gwiz-0.8-buffer.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/equip.c
-+++ b/src/equip.c
-@@ -120,7 +120,7 @@
- 	    return (i);
- 
-     /* if we get this far, there are no equippable items before the current */
--    for (i = 8; i > offset; i--)
-+    for (i = 7; i > offset; i--)
- 	if (pawn->item[i].usage & USAGE_EQUIPPABLE)
- 	    return (i);
-     return (-1);
---- a/src/shop.c
-+++ b/src/shop.c
-@@ -290,8 +290,7 @@
- 
- 		SDL_BlitSurface (name, NULL, area, &dest);
- 
--		snprintf (price, sizeof(char)*8, "%d", pawn->item[i].sellfor);
--		price[9] = '\0';
-+		snprintf (price, sizeof(price), "%d", pawn->item[i].sellfor);
- 		profit = GwizRenderText (price);
- 		dest.x = area->w - profit->w;
- 		dest.w = profit->w;
diff --git a/games-rpg/gwiz/gwiz-0.8-r1.ebuild b/games-rpg/gwiz/gwiz-0.8-r1.ebuild
deleted file mode 100644
index f7a462a9a302..000000000000
--- a/games-rpg/gwiz/gwiz-0.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="clone of old-school Wizardry(tm) games by SirTech"
-HOMEPAGE="http://icculus.org/gwiz/"
-SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.2.3[joystick,video]
-	>=media-libs/sdl-image-1.2.1-r1[png]
-	>=media-libs/sdl-ttf-2.0.4"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buffer.patch
-)
-
-src_prepare() {
-	default
-
-	append-cflags -std=gnu89 # build with gcc5 (bug #572532)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog README doc/HOWTO-PLAY" \
-		default
-	newicon pixmaps/gwiz_icon.xpm ${PN}.xpm
-	make_desktop_entry gwiz Gwiz
-}
diff --git a/games-rpg/gwiz/metadata.xml b/games-rpg/gwiz/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/gwiz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/kqlives-0.99-r1 b/games-rpg/kqlives-0.99-r1
new file mode 100644
index 000000000000..e72d7d9f1d3a
--- /dev/null
+++ b/games-rpg/kqlives-0.99-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-lang/lua:0 >=gnome-base/libglade-2.4 media-libs/aldumb media-libs/allegro:0 >=x11-libs/gtk+-2.8:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=A console-style role playing game
+EAPI=6
+HOMEPAGE=http://kqlives.sourceforge.net/
+IUSE=cheats nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/lua:0 >=gnome-base/libglade-2.4 media-libs/aldumb media-libs/allegro:0 >=x11-libs/gtk+-2.8:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/kqlives/kq-0.99.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f08a082cde4cde5c69d62f9c67f6a132
diff --git a/games-rpg/kqlives/Manifest b/games-rpg/kqlives/Manifest
deleted file mode 100644
index 822922ec5520..000000000000
--- a/games-rpg/kqlives/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX kqlives.xpm 1404 BLAKE2B f2aae7268857f5c5e4e9a724a2b3a97a930741bf051bbd59cb6e36e4dabe09c29cc17d5b010c1c1ffb0cfaf9f2440e2350cca88adbea76d7429be176b74b6caf SHA512 32aeaa6e80c906f894773a12fa3bfdd2c52f15b11fe00bd99020d1577441a13573abb02a1fb0f11bb875fc1c61bfdc56285b805a5fd423d9ecc42ceb32eb8e66
-DIST kq-0.99.tar.gz 3642143 BLAKE2B 7279d3ab2808caab77c08283cc6aaab84fcef3814c3c259528320d6516fa8937a62d033b899aaaca4b562affed113faab5fac443ed3487565796377092df0f90 SHA512 fa343561679baf2201fb7107153ca07b715c1e56c9a4cb17db0f04759dd859436e8daa6a364d62ad57d138dbb5d8c680e35cafecea1a8f7f217ec190bfdd7918
-EBUILD kqlives-0.99-r1.ebuild 866 BLAKE2B 2f57b51fd1bf7a548e7f967a9f1e46092fa9a180387973c70f6743de4bb78258561a63496975602f43318874e08982371f9e1cf4c57039eac0397f68e3291774 SHA512 91d23559953cbc02bb30f50f62a5467b8cf3e90347501fbaf9abc8c73292eb8730fa6dde2d59fd4d627db7b4c300d1287b2d34e41d1008ab0326eecc0af616a0
-MISC metadata.xml 409 BLAKE2B 9429ac5342781ed6109743d9b39da1e2094276c6464b7ad982cdbd5d30d8634400890edbb70abbd8c709b3a8c3def37e09a17d60df37e1ce8caeda41ff3869e7 SHA512 d341ddc4a801b649ae83022f3ea04480f59569b2cf91c106ace77735d1d7902fd10a739f41014c1928aae05f66643826390bdfc7917fbfa7106b3656a286edbc
diff --git a/games-rpg/kqlives/files/kqlives.xpm b/games-rpg/kqlives/files/kqlives.xpm
deleted file mode 100644
index 58baadb615ed..000000000000
--- a/games-rpg/kqlives/files/kqlives.xpm
+++ /dev/null
@@ -1,48 +0,0 @@
-/* XPM */
-static char *kq__[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 10 1",
-"  c #000000",
-". c #800000",
-"X c #808000",
-"o c #000080",
-"O c #0000FF",
-"+ c #008080",
-"@ c #00FFFF",
-"# c #808080",
-"$ c #C0C0C0",
-"% c None",
-/* pixels */
-"%%$$%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"%%$$$%%%%%%%%%%%%%%%%%%%%%%%%$#%",
-"%%%#$$$%%%%%%%%%%%%%%%%%%%%$$#$%",
-"%%%%$$$#$%%%%%%%%%%%%%%%%$$$$%%%",
-"%%%%%#$$$#$%%%%%%%%%%%%$$$$#$%%%",
-"%%%%%%$$$$#$$%%%%%%%%%$$$$$%%%%%",
-"%%%%%%%##$$##$$$$$$%$##$$#$%%%%%",
-"%%%%%%%%$####$$$$$$######%%%%%%%",
-"%%%%%%%%%##$%$$####$$###$%%%%%%%",
-"%%%%%%%%%%$%$oOOOOO##$#%%%%%%%%%",
-"%%%%%%%%%#$##OO+++OOo$#%%%%%%%%%",
-"%%%%%%%%%%%oo++++++OO$$%%%%%%%%%",
-"%%%%%%%%%$$OO++@@++OO$$%%%%%%%%%",
-"%%%%%%%%%$$OO++@@++OO%$%%%%%%%%%",
-"%%%%%%%%%#$ooO+++++Oo%%%%%%%%%%%",
-"%%%%%%%%%##$#OOOOOOo#%$%%%%%%%%%",
-"%%%%%%%%%##$$##ooo#%%#$%%%%%%%%%",
-"%%%%%%%$$####$$$$$%%$$$$$%%%%%%%",
-"%%%%%%%##$%%%###$$$#$$###%%%%%%%",
-"%%%%%$#$$%%%%##$#$$#$%%$##$%%%%%",
-"%%%%%$$%%%%%%###$###$%%%%##%%%%%",
-"%%%%%%%%%%%%%##$$$##$%%%%%%%%%%%",
-"%%%%%%%%%%%%%##$$$$ #%%%%%%%%%%%",
-"%%%%%%%%%%%%%##$$$$ #%%%%%%%%%%%",
-"%%%%%%%%%%%%%##$$$# #%%%%%%%%%%%",
-"%%%%%%%%%%%%%$#XXXX$%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$.XXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$.XXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%$XXXX%%%%%%%%%%%%%"
-};
diff --git a/games-rpg/kqlives/kqlives-0.99-r1.ebuild b/games-rpg/kqlives/kqlives-0.99-r1.ebuild
deleted file mode 100644
index f743549a0f44..000000000000
--- a/games-rpg/kqlives/kqlives-0.99-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P=${P/lives}
-
-DESCRIPTION="A console-style role playing game"
-HOMEPAGE="http://kqlives.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cheats nls"
-
-RDEPEND="
-	dev-lang/lua:0
-	>=gnome-base/libglade-2.4
-	media-libs/aldumb
-	media-libs/allegro:0
-	>=x11-libs/gtk+-2.8:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	econf \
-		$(use_enable cheats) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	local x
-	for x in diff draw draw2 dump; do
-		mv -vf "${D}/etc"/map${x} "${D}/etc"/kq-map${x}
-	done
-
-	doicon "${FILESDIR}"/${PN}.xpm
-	make_desktop_entry kq KqLives ${PN}
-}
diff --git a/games-rpg/kqlives/metadata.xml b/games-rpg/kqlives/metadata.xml
deleted file mode 100644
index 6cc3c22df52e..000000000000
--- a/games-rpg/kqlives/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="cheats">Enable cheating mode</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">kqlives</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-rpg/lure-1.1-r1 b/games-rpg/lure-1.1-r1
new file mode 100644
index 000000000000..7ed5a72cb852
--- /dev/null
+++ b/games-rpg/lure-1.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=games-engines/scummvm-0.13.1 app-arch/unzip
+DESCRIPTION=Lure of the Temptress
+EAPI=6
+HOMEPAGE=http://www.revolution.co.uk/_display.php?id=10
+IUSE=l10n_en l10n_es l10n_de l10n_fr l10n_it
+KEYWORDS=~amd64 ~x86
+LICENSE=lure
+RDEPEND=>=games-engines/scummvm-0.13.1
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://raw.githubusercontent.com/scummvm/scummvm/266aef932a8a052df897e4d79b4572e5d169916f/dists/engine-data/lure.dat -> lure-0.13.1.dat !l10n_en? ( !l10n_es? ( !l10n_fr? ( !l10n_de? ( !l10n_it? ( mirror://sourceforge/scummvm/lure-1.1.zip -> lure-en-1.1.zip ) ) ) ) ) l10n_en? ( mirror://sourceforge/scummvm/lure-1.1.zip -> lure-en-1.1.zip ) l10n_es? ( mirror://sourceforge/scummvm/lure-es-1.1.zip ) l10n_fr? ( mirror://sourceforge/scummvm/lure-fr-1.1.zip ) l10n_de? ( mirror://sourceforge/scummvm/lure-de-1.1.zip ) l10n_it? ( mirror://sourceforge/scummvm/lure-it-1.1.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c8e854ee42c09253eb368d099839a458
diff --git a/games-rpg/lure/Manifest b/games-rpg/lure/Manifest
deleted file mode 100644
index 67ff13b53fc2..000000000000
--- a/games-rpg/lure/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST lure-0.13.1.dat 637824 BLAKE2B 92fd78cd968fe10a9a379ee243f03be35c5c4a50404b7399eba58e5fc93cd6484b5fc5a21feb7f856ece48e076e12dc9bd83ed8fbbff7ed220a9c7609f185c82 SHA512 2e9c3f049a0d77d94ec1f6b231cf2ee04df148115dd2daa8bc8faf717d509843949964bbed990b804bde5788ab20460ce109f166a936ed176797a093b8973f73
-DIST lure-de-1.1.zip 3717138 BLAKE2B c239e8b89c26e1de212a50ffa22eda12b4fc14f9dabd7d79e4738a92f682eda7c11fafcfc4ba75c1250d5b76958fb1cd47f5a5bc0419551b5ccd82d703450ab8 SHA512 67a0bebe62d343492316351fcf51d928a2323038b915b228322882a98988bdd60dcbce3b39d50c75fb675acc16fd87efbfc4d2a747ba0c6a43b246a689383767
-DIST lure-en-1.1.zip 5678861 BLAKE2B 60dffd497db6291f030fc74065846fe9e95b0479bbc92ea23389ecdea383749573e61c3b2b70bcacf905a4b86f38e9165acaa291d65f93912bb08d0695889013 SHA512 9c178b0df178cf70c3d912300911972589e3ecd44ad478393d423f646da79a6084dc76496dfef740f961ff0d6991d7e5cfb6d9c39e2cf1920c9276386403e281
-DIST lure-es-1.1.zip 2176970 BLAKE2B 61cb1a36d1033bac293b5cab30840f992581cb77fb38464dad80f31feea18cb5bd6906356c9d56207970f04f47344ada17c24b97430badbe4d22ef3f78877c1c SHA512 744a8d9443a8e4c41c0a07383c7143ff0423702b0893e9e3200b5c8a002d76231c48d9dd7d7076eabcf68c50b1755d2ba71f505122d1cf6a42aae8a825e2db29
-DIST lure-fr-1.1.zip 3583274 BLAKE2B d6cf52139bf728ec15a10fd6e7d06e62e8a64f3acfcf9f2c79c217eb6618d756c3787ef04a296ee8829da5f5fd20312a342a961b06796b2658a6376701420f64 SHA512 d2972d1c19da2ff74f72e54290f53e4af89a96b9e647ef6d50c686fd1ff8433020eac78ab24613551be8343b854c80c61a1140fc2ccda3e20dd05f22c6fc7f4a
-DIST lure-it-1.1.zip 4718011 BLAKE2B ba04504dd9d35ac767de9933bd2c9b9629fb0fd0ff5a36044a81639657e87a2ae4041e5195c65853e9ea7a48f8f9977ed1b732fc05901d64582bb875b8587b16 SHA512 1af90c8867f6426983fd3eb22651f0f2ab425b1a74110bda0277339ad82c7cffcc9ba9d9790909f5120f8a4d5c2cd82ed1ef9555511fc4c4064dd1563ec75abf
-EBUILD lure-1.1-r1.ebuild 2738 BLAKE2B 6f8513605c1cef2fb69cf69c24a3172e5fcb203f7c6d1136941ce21dd73df5938307253fc6131ed161577d87820a49583462e4b49cd9e802e44b85e0df3efb72 SHA512 ecfbcf36866feb2b13a301e3a4833f1ed42023434564fd9892e5d8ca5e629b57a0099442f3af3434863ae8e139612d94917406947105cddd95740c0c50623249
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/lure/lure-1.1-r1.ebuild b/games-rpg/lure/lure-1.1-r1.ebuild
deleted file mode 100644
index 0cfadea6e171..000000000000
--- a/games-rpg/lure/lure-1.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DAT_PV=0.13.1
-DESCRIPTION="Lure of the Temptress"
-HOMEPAGE="http://www.revolution.co.uk/_display.php?id=10"
-SRC_URI="
-	https://raw.githubusercontent.com/scummvm/scummvm/266aef932a8a052df897e4d79b4572e5d169916f/dists/engine-data/lure.dat -> lure-${DAT_PV}.dat
-	!l10n_en? ( !l10n_es? ( !l10n_fr? ( !l10n_de? ( !l10n_it?
-		( mirror://sourceforge/scummvm/${P}.zip -> ${PN}-en-${PV}.zip ) ) ) ) )
-	l10n_en? ( mirror://sourceforge/scummvm/${P}.zip  -> ${PN}-en-${PV}.zip )
-	l10n_es? ( mirror://sourceforge/scummvm/${PN}-es-${PV}.zip )
-	l10n_fr? ( mirror://sourceforge/scummvm/${PN}-fr-${PV}.zip )
-	l10n_de? ( mirror://sourceforge/scummvm/${PN}-de-${PV}.zip )
-	l10n_it? ( mirror://sourceforge/scummvm/${PN}-it-${PV}.zip )"
-
-LICENSE="lure"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS_IUSE="l10n_en l10n_es l10n_de l10n_fr l10n_it"
-IUSE=${LANGS_IUSE}
-RESTRICT="mirror"
-
-RDEPEND=">=games-engines/scummvm-0.13.1"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-any_l10n() {
-	use l10n_en || use l10n_es || use l10n_de || use l10n_fr || use l10n_it
-}
-
-src_unpack() {
-	local lang
-
-	if any_l10n ; then
-		for lang in ${LANGS_IUSE}
-		do
-			use ${lang} && unpack ${PN}-${lang/l10n_}-${PV}.zip
-		done
-		mv lure lure-en 2> /dev/null
-	else
-		unpack ${PN}-en-${PV}.zip
-	fi
-}
-
-src_prepare() {
-	local lang f
-
-	default
-
-	find . \
-		\( -iname "*exe" \
-		-o -iname "*ega" \
-		-o -iname LICENSE.txt \) \
-		-exec rm -f '{}' +
-	mkdir docs
-	if any_l10n ; then
-		for lang in ${LANGS_IUSE}
-		do
-			mkdir docs/${lang}
-			find lure-${lang/l10n_} \
-				\( -iname "*pdf" \
-				-o -iname README \
-				-o -iname "*txt" \) \
-				-exec mv '{}' docs/${lang} \; 2> /dev/null
-		done
-	else
-		find lure \
-			\( -iname "*pdf" \
-			-o -iname README \
-			-o -iname "*txt" \) \
-			-exec mv '{}' docs \; 2> /dev/null
-	fi
-	for f in $(find docs -type f)
-	do
-		mv ${f} ${f%.*}.$(echo ${f#*.} | tr '[[:upper:]]' '[[:lower:]]') 2> /dev/null
-	done
-}
-
-src_install() {
-	local lang
-
-	if any_l10n ; then
-		for lang in ${LANGS_IUSE}
-		do
-			if use ${lang} ; then
-				lang=${lang/l10n_}
-				insinto "/usr/share/${PN}-${lang}"
-				newins "${DISTDIR}"/lure-${DAT_PV}.dat lure.dat
-				doins -r ${PN}-${lang}/*
-				make_wrapper ${PN}-${lang} "scummvm -q ${lang} -f -p \"/usr/share/${PN}-${lang}\" lure" .
-				make_desktop_entry ${PN}-${lang} "Lure of the Temptress (${lang})" ${PN}
-				docinto l10n_${lang}
-				dodoc docs/l10n_${lang}/*
-			fi
-		done
-	else
-		insinto "/usr/share/${PN}"
-		newins "${DISTDIR}"/lure-${DAT_PV}.dat lure.dat
-		doins -r ${PN}/*
-		make_wrapper ${PN} "scummvm -f -p \"/usr/share/${PN}\" lure" .
-		make_desktop_entry ${PN} "Lure of the Temptress"
-	fi
-}
diff --git a/games-rpg/lure/metadata.xml b/games-rpg/lure/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/lure/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/manaplus-1.8.2.17 b/games-rpg/manaplus-1.8.2.17
new file mode 100644
index 000000000000..9d639c54ae18
--- /dev/null
+++ b/games-rpg/manaplus-1.8.2.17
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+SRC_URI=http://download.evolonline.org/manaplus/download/1.8.2.17/manaplus-1.8.2.17.tar.xz
+_md5_=fc0eb614533c862571c73fb2fbe383c1
diff --git a/games-rpg/manaplus-1.8.4.14 b/games-rpg/manaplus-1.8.4.14
new file mode 100644
index 000000000000..7ca7b10bc30a
--- /dev/null
+++ b/games-rpg/manaplus-1.8.4.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+SRC_URI=http://download.evolonline.org/manaplus/download/1.8.4.14/manaplus-1.8.4.14.tar.xz
+_md5_=fc0eb614533c862571c73fb2fbe383c1
diff --git a/games-rpg/manaplus-9999 b/games-rpg/manaplus-9999
new file mode 100644
index 000000000000..29bc2f2e18a5
--- /dev/null
+++ b/games-rpg/manaplus-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare test unpack
+DEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
+EAPI=6
+HOMEPAGE=http://manaplus.evolonline.org
+IUSE=mumble nls opengl pugixml +sdl2 test
+LICENSE=GPL-2+
+RDEPEND=>=dev-games/physfs-1.0.0 media-fonts/dejavu media-fonts/liberation-fonts media-fonts/mplus-outline-fonts media-fonts/wqy-microhei media-libs/libpng:0= net-misc/curl sys-libs/zlib x11-apps/xmessage x11-libs/libX11 x11-misc/xdg-utils mumble? ( media-sound/mumble ) nls? ( virtual/libintl ) opengl? ( virtual/opengl ) pugixml? ( dev-libs/pugixml ) !pugixml? ( dev-libs/libxml2 ) sdl2? ( media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf ) !sdl2? ( media-libs/libsdl[X,opengl?,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf )
+SLOT=0
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=609f04dc4da4d8458f5de2321e909951
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
deleted file mode 100644
index cfa37efc0ce3..000000000000
--- a/games-rpg/manaplus/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST manaplus-1.8.2.17.tar.xz 14982240 BLAKE2B 8ed41c0af49ed3c3bfce69e4c29fc4a3a555fbda1cb05f2c3fb6395c74cdca4d22e890422137573a6b308d3cfe09416892bc6850f11469a267d9419a44b112a8 SHA512 b67a7e5986b5aa9716e4ae4ee651e63445f11e7efe258726d8f7c5245ebc9e5da9b4b65fb561023bfcca492098f3a6da9cac77e5ace27a4b7b0a7245e38ac08d
-DIST manaplus-1.8.4.14.tar.xz 14991068 BLAKE2B d4d075230fa65ec480576521808d380781262a420783c838b5986f1a747ef672344efb684a90cbe2fea757f8256940a29250756d48cdcfc40c99466a40407bb4 SHA512 81ed9a7de09aa03f8585361a205fac97b604fbd39c78e584d2d9808fb72a789b33fc4e6bde9bedd6e0b1a53308c9299777d1434d5e81ce13e4c09ef9118f4b40
-EBUILD manaplus-1.8.2.17.ebuild 3230 BLAKE2B c91d5ddf5dcb75dc455e260bffd57942ab7b669a76b5f97d8eddb4b50fe0f2f95caef66e85ef7aefa2c88152c65f202ca9cd40f37ddd6426d2414e2f7033a276 SHA512 761173492ccbd58b39041b73b732c4e383010907bb103717ea03cfdf8a7b10046975776c93ff2ea5f2e2217ad3d42db6e94b3ab425a74795d8e1a10777cec979
-EBUILD manaplus-1.8.4.14.ebuild 3230 BLAKE2B c91d5ddf5dcb75dc455e260bffd57942ab7b669a76b5f97d8eddb4b50fe0f2f95caef66e85ef7aefa2c88152c65f202ca9cd40f37ddd6426d2414e2f7033a276 SHA512 761173492ccbd58b39041b73b732c4e383010907bb103717ea03cfdf8a7b10046975776c93ff2ea5f2e2217ad3d42db6e94b3ab425a74795d8e1a10777cec979
-EBUILD manaplus-9999.ebuild 3230 BLAKE2B f52d143d1d65408977c51e11cef63dda60d907bac57f5a818897274ae1819bea37b602acbfaea8a84269165ad9993bf00f1938f64fd0a78f886efe81ab4d76e4 SHA512 4db1f628715e6978cdd6d7a59e739ac1b339ff90a18fdf08649f7a68157abbb934efc4fae0e047151a8c9f0979aba6cfe23c8e8c4ad46d52cf1adbdebd6c75aa
-MISC metadata.xml 501 BLAKE2B 2fbdeba8c61dc321a8e89eae7580ffbed4c528f8f8cc367482aa7e344b666322414a5a0c9cf5d4b017e8bd4ed4d5e703fc719c86affe74c40acae4d52c47a424 SHA512 12cc5fda141e141100145ccdf97f56b4dfd5e9941348598e88f13b6524133585dcb9c9ee66c74660c6ab1b8c497d5d943ae59547d5e4ed9272c352ed6e4bb1f5
diff --git a/games-rpg/manaplus/manaplus-1.8.2.17.ebuild b/games-rpg/manaplus/manaplus-1.8.2.17.ebuild
deleted file mode 100644
index 0008d1923b6b..000000000000
--- a/games-rpg/manaplus/manaplus-1.8.2.17.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/manaplus-1.8.4.14.ebuild b/games-rpg/manaplus/manaplus-1.8.4.14.ebuild
deleted file mode 100644
index 0008d1923b6b..000000000000
--- a/games-rpg/manaplus/manaplus-1.8.4.14.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/manaplus-9999.ebuild b/games-rpg/manaplus/manaplus-9999.ebuild
deleted file mode 100644
index 2d5897b5d6f1..000000000000
--- a/games-rpg/manaplus/manaplus-9999.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-[[ ${PV} == 9999 ]] && inherit autotools git-r3
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/ManaPlus/ManaPlus.git"
-else
-	SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="mumble nls opengl pugixml +sdl2 test"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	media-fonts/wqy-microhei
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	x11-apps/xmessage
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	mumble? ( media-sound/mumble )
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	pugixml? ( dev-libs/pugixml )
-	!pugixml? ( dev-libs/libxml2 )
-	sdl2? (
-		media-libs/libsdl2[X,opengl?,video]
-		media-libs/sdl2-gfx
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-mixer[vorbis]
-		media-libs/sdl2-net
-		media-libs/sdl2-ttf
-	)
-	!sdl2? (
-		media-libs/libsdl[X,opengl?,video]
-		media-libs/sdl-gfx
-		media-libs/sdl-image[png]
-		media-libs/sdl-mixer[vorbis]
-		media-libs/sdl-net
-		media-libs/sdl-ttf
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--localedir=/usr/share/locale
-		--without-internalsdlgfx
-		$(use_with mumble)
-		$(use_enable nls)
-		$(use_with opengl)
-		--enable-libxml=$(usex pugixml pugixml libxml)
-		$(use_with sdl2)
-		$(use_enable test unittests)
-	)
-	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	local destpath="/usr/share/${PN}"
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${destpath}"/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${destpath}"/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${destpath}"/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${destpath}"/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed-Bold.ttf "${destpath}"/data/fonts/dejavuserifcondensed-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSerifCondensed.ttf "${destpath}"/data/fonts/dejavuserifcondensed.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${destpath}"/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${destpath}"/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${destpath}"/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${destpath}"/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${destpath}"/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${destpath}"/data/fonts/mplus-1p-regular.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${destpath}"/data/fonts/wqy-microhei.ttf
-}
-
-src_test() {
-	make check
-}
diff --git a/games-rpg/manaplus/metadata.xml b/games-rpg/manaplus/metadata.xml
deleted file mode 100644
index 474048077e6d..000000000000
--- a/games-rpg/manaplus/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
-		<flag name="pugixml">Use <pkg>dev-libs/pugixml</pkg> for XML parsing isntead of <pkg>dev-libs/libxml2</pkg></flag>
-		<flag name="mumble">Enable support for voice chat</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/metadata.xml b/games-rpg/metadata.xml
deleted file mode 100644
index 69a2c2a773bf..000000000000
--- a/games-rpg/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-rpg category contains role-playing games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-rpg enthält Rollenspiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-rpg contiene juegos de rol.
-	</longdescription>
-	<longdescription lang="ja">
-		games-rpgカテゴリーにはロール・プレイング・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-rpg categorie bevat rollenspellen (Role-Playing Games).
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-rpg chứa các trò chơi dạng chơi theo lượt (role-playing - RPG).
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-rpg contiene giochi di ruolo.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-rpg contém jogos de RPG (Role-Playing Games).
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-rpg zawiera gry RPG.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-rpg/openglad-0.98-r1 b/games-rpg/openglad-0.98-r1
new file mode 100644
index 000000000000..8c486f870432
--- /dev/null
+++ b/games-rpg/openglad-0.98-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image media-libs/sdl-mixer
+DESCRIPTION=An SDL clone of Gladiator, a classic RPG game
+EAPI=6
+HOMEPAGE=http://snowstorm.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[joystick,sound,video] media-libs/sdl-image media-libs/sdl-mixer
+SLOT=0
+SRC_URI=mirror://sourceforge/snowstorm/openglad-0.98.tar.gz mirror://gentoo/openglad.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a0f2dd61f3213a983f9bc8784d116b5c
diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
deleted file mode 100644
index 920a954af436..000000000000
--- a/games-rpg/openglad/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 0.98-gladpack.c.patch 511 BLAKE2B 57434e5edd25f0757e18f2c2c73198236fa069eb09e30fd4c314232db1d1448aa5b190f5a2c9d600419c37b6301e5760af2c7a7803f23026a9fd3b0d49a731af SHA512 ea9fca36e2fef7157a2d2b81541d8fd7be1cad6087349927874aa3950001e3e02f2d21ce3793cd5c600236b21e64e0ed86839c41a39e5ba458c1714220ad2f01
-AUX openglad-0.98-gcc43.patch 205 BLAKE2B 05dac9336eac12434d51ebe1322387ec1c32d77bda52f654312075260f1add0a24d4d5834e2d72d6c8208851f583b245147595a8df2e9a9b6e72bf72dcc1421c SHA512 c7f6b4602234f7119dea119a6fd7c2edd07af856dd711195a942d291063912c46a202f446db8183eb62cc0a2aea3586bb3a2b8e1140d4d915be1fd6e166eb4d1
-AUX openglad-0.98-ovfl.patch 381 BLAKE2B 28a7d1dabbacaf665f01f1b238c904855706921b9ae33e09802104734c3456889aa409cdc38bc12e076d609df0909f6ecab7a02be15933d90c4ec8fba11abb00 SHA512 00ac89d9cf223ac8db111b30ce7838b892f318ac8c8a93522afa719a98887c386eb95c788a912c4bfce99ef804a8395b3c2260b9ec22454651e6f2539d1833e8
-DIST openglad-0.98.tar.gz 724106 BLAKE2B 6cd9df5fd260af9902997bc0708c8285e48081e52fff7af05f432ae94f2f6fdbfba162c664ac4f531796a0372f1be3be064843dad75163e68b7e324b9b6d506d SHA512 3f9165fbf8fff081a862bfe81401a3b2ac227da58b84409beee8b0441f88b1a6deb3d24a1af6e71bd3a3484fc90de5574950fd54be82d837021a07f06302f0e1
-DIST openglad.png 5593 BLAKE2B 1fbc5a32861dc4cc5bb4aae4b1b42e92411756618ccfa4172e1494c4f98eb527f6bd36273a250cd7ce721baa76ba80548d75ec1e89b3da134c78d0a7b415b6bd SHA512 27419fcbbbf8640718968304a4824101860736c2091f494defcd111b5cc252856b5373c0e7a2bca1c79f9c7551012b0ba04577f9ed97769e436637ee25f5caeb
-EBUILD openglad-0.98-r1.ebuild 868 BLAKE2B 70f20201f2cbf7f82701e2d4d6058213121bd8d2c05fcfe3c1f0230410901feea5c82954933c3dfc30c5d852d574facccada3157571a4b07f36151f1ad052f4a SHA512 20fc6585c53de645d5a0b12858819cd28a2174a4f67518f245d33a8c6a8647ef69ccee4954df15365966ffa613a7c3bc3fe92b1e16b7cd5789c9af0e9bb7555e
-MISC metadata.xml 332 BLAKE2B 29e8535bbe3b4ccd5225fdee9e19b41afba42751a9926226375f47e320cb743944b4fb81eb1b665ea9782df581eba22db602e4515b2cd723ca319ef90bfa86ff SHA512 b751058cb6393309c0635329d5fd5236b013d2e07d5e2e2a7fdffcb50ee8dd60e8b0157d161ba498e01140106f91f3b2052a43737be12214f7f065ebd9f6d07d
diff --git a/games-rpg/openglad/files/0.98-gladpack.c.patch b/games-rpg/openglad/files/0.98-gladpack.c.patch
deleted file mode 100644
index b4f5de9e3995..000000000000
--- a/games-rpg/openglad/files/0.98-gladpack.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- openglad-0.98/util/gladpack.c	2002-09-14 18:37:50.000000000 +1000
-+++ openglad-0.98/util/gladpack.c	2003-12-06 12:42:31.393812945 +1100
-@@ -9,8 +9,8 @@
- 
- int main(int argc, char **argv)
- {
--	if (argc > 1 && !strcmp(argv[1], "p")) pack(argc, argv);
--	else if (argc > 1 && !strcmp(argv[1], "u")) unpack(argc, argv);
-+	if (argc > 1 && !strcmp(argv[1], "p")) return pack(argc, argv);
-+	else if (argc > 1 && !strcmp(argv[1], "u")) return unpack(argc, argv);
- 	else
- 	{
- 		printf("Usage: gladpack (p|u) ...\n");
diff --git a/games-rpg/openglad/files/openglad-0.98-gcc43.patch b/games-rpg/openglad/files/openglad-0.98-gcc43.patch
deleted file mode 100644
index 9f46ce8e5b95..000000000000
--- a/games-rpg/openglad/files/openglad-0.98-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/parser.cpp
-+++ b/src/parser.cpp
-@@ -23,6 +23,8 @@
- #include <iostream>
- #include <fstream>
- #include <string>
-+#include <cstring>
-+#include <cstdlib>
- #include "parser.h"
- 
- using namespace std;
diff --git a/games-rpg/openglad/files/openglad-0.98-ovfl.patch b/games-rpg/openglad/files/openglad-0.98-ovfl.patch
deleted file mode 100644
index 8ec89d22559d..000000000000
--- a/games-rpg/openglad/files/openglad-0.98-ovfl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/screen.cpp	2011-07-23 21:35:34.385063301 +0200
-+++ b/src/screen.cpp	2011-07-23 21:35:59.948063312 +0200
-@@ -2383,7 +2383,7 @@
- 	short listsize;
- 	short i;
- 	walker * new_guy;
--	char newgrid[12] = "grid.pix";  // default grid
-+	char newgrid[13] = "grid.pix";  // default grid
- 	char new_scen_type; // read the scenario type
- 	char oneline[80];
- 	char numlines, tempwidth;
diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
deleted file mode 100644
index b093b0fee1ec..000000000000
--- a/games-rpg/openglad/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">snowstorm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/openglad/openglad-0.98-r1.ebuild b/games-rpg/openglad/openglad-0.98-r1.ebuild
deleted file mode 100644
index 8d38d5ca0ff0..000000000000
--- a/games-rpg/openglad/openglad-0.98-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="An SDL clone of Gladiator, a classic RPG game"
-HOMEPAGE="http://snowstorm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libsdl[joystick,sound,video]
-	media-libs/sdl-image
-	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
-
-PATCHES=(
-		"${FILESDIR}"/${P}-gcc43.patch
-		"${FILESDIR}"/${PV}-gladpack.c.patch
-		"${FILESDIR}"/${P}-ovfl.patch
-)
-
-src_configure() {
-	econf \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=/usr/share/${PN}
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		docdir="${D}"/usr/share/doc/${PF}
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry openglad OpenGladiator
-}
diff --git a/games-rpg/pcgen-6.04.01-r1 b/games-rpg/pcgen-6.04.01-r1
new file mode 100644
index 000000000000..0c38ef9e4708
--- /dev/null
+++ b/games-rpg/pcgen-6.04.01-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=D&D character generator
+EAPI=6
+HOMEPAGE=http://pcgen.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 OGL-1.0a
+RDEPEND=>=virtual/jre-1.6
+SLOT=0
+SRC_URI=mirror://sourceforge/pcgen/pcgen-6.04.01-full.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fb8ad46c75f6fe3315784346e56ce4b5
diff --git a/games-rpg/pcgen/Manifest b/games-rpg/pcgen/Manifest
deleted file mode 100644
index 9b2cefe9d8e1..000000000000
--- a/games-rpg/pcgen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pcgen-6.04.01-full.zip 68679438 BLAKE2B e9afa6b9937804988425d8d18cfed7728197ecc303f586ed899491e4d500eb0e6ddc0ae92aef1d4bfef7ff3fb987cca34af95246c83ebe71e089e3e5e91aa9dd SHA512 37e76e9bca3defe803459f898d3c51015cb4c4f69905c4179b78b1b26977b7d720ef413b3f5b2ef4252aa98f732075b9567c4f4822c61d169a5a0a6e2c78c0d4
-EBUILD pcgen-6.04.01-r1.ebuild 842 BLAKE2B d5d84e121027a78a3f4a61f86ada0ad7131364351afa76037824accdb759b98ea52e1fee918b14fb6dbaa134afe058f79b8e0c516e37703007bfa8314b6a45d8 SHA512 03ee28a1f12050b8cbbc1498a9f218983955ab6ecb2d5b10a60880bef6eb45eeb4032462b7afb733bcab705f18ffdcf68e5896a7d47b65d745b16665eb9800b6
-MISC metadata.xml 328 BLAKE2B 45ace1f30157cc4450f9dc90a24a7a6112a09fe61c1a17dca06b87d32fdbce9c7f704b36bb217da0371f71a8ff9b2ecdccbb63ad7b981587f61c33a3c4ef6adb SHA512 cd3e9ca2c51782031b89444cc5c3eda37537c04467753e9a6bd5c2e5357d5ba3077ed6aee0adeac6dd91c829c7fded3077fb8d39ab8e80d87e3dc62af5605cb7
diff --git a/games-rpg/pcgen/metadata.xml b/games-rpg/pcgen/metadata.xml
deleted file mode 100644
index e2b2929d7fb9..000000000000
--- a/games-rpg/pcgen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pcgen</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild b/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
deleted file mode 100644
index 45e32d2039b7..000000000000
--- a/games-rpg/pcgen/pcgen-6.04.01-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="D&D character generator"
-HOMEPAGE="http://pcgen.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pcgen/${P}-full.zip"
-
-LICENSE="LGPL-2.1 OGL-1.0a"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	rm -vf *.bat || die
-	sed "/dirname/ c\cd \"\/usr\/share\/${PN}\"" pcgen.sh > "${T}"/${PN} || die
-}
-
-src_install() {
-	dobin "${T}"/${PN}
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon -s 128 system/sponsors/pcgen/pcgen_128x128.png ${PN}.png
-	make_desktop_entry ${PN} PCGen
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/queen-1-r1 b/games-rpg/queen-1-r1
new file mode 100644
index 000000000000..5bc0a0447784
--- /dev/null
+++ b/games-rpg/queen-1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install unpack
+DEPEND=l10n_de? ( games-engines/scummvm[vorbis] ) l10n_en? ( games-engines/scummvm[mp3?] ) l10n_fr? ( games-engines/scummvm[vorbis] ) l10n_he? ( games-engines/scummvm[vorbis] ) l10n_it? ( games-engines/scummvm[vorbis] ) l10n_de? ( app-arch/unzip ) l10n_en? ( mp3? ( app-arch/unzip ) ) l10n_fr? ( app-arch/unzip ) l10n_he? ( app-arch/unzip ) l10n_it? ( app-arch/unzip )
+DESCRIPTION=Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s
+EAPI=6
+HOMEPAGE=http://scummvm.sourceforge.net/
+IUSE=mp3 l10n_de +l10n_en l10n_fr l10n_he l10n_it
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=queen
+RDEPEND=l10n_de? ( games-engines/scummvm[vorbis] ) l10n_en? ( games-engines/scummvm[mp3?] ) l10n_fr? ( games-engines/scummvm[vorbis] ) l10n_he? ( games-engines/scummvm[vorbis] ) l10n_it? ( games-engines/scummvm[vorbis] )
+REQUIRED_USE=|| ( l10n_de l10n_en l10n_fr l10n_he l10n_it )
+SLOT=0
+SRC_URI=l10n_de? ( mirror://sourceforge/scummvm/FOTAQ_Ger_talkie-1.0.zip http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) l10n_en? ( mp3? ( mirror://sourceforge/scummvm/FOTAQ_Talkie-1.1.zip ) !mp3? ( http://www.lysator.liu.se/~zino/scummvm/queen/queen.1.bz2 http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) ) l10n_fr? ( mirror://sourceforge/scummvm/FOTAQ_Fr_Talkie_1.0.zip ) l10n_he? ( mirror://sourceforge/scummvm/FOTAQ_Heb_talkie.zip http://www.lysator.liu.se/~zino/scummvm/queen/readme.txt -> queen-readme.txt ) l10n_it? ( mirror://sourceforge/scummvm/FOTAQ_It_Talkie_1.0.zip ) http://www.scummvm.org/images/cat-queen.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4dd867ef6ff08929f6191b45dd339901
diff --git a/games-rpg/queen/Manifest b/games-rpg/queen/Manifest
deleted file mode 100644
index 8ddf6b94c23e..000000000000
--- a/games-rpg/queen/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-DIST FOTAQ_Fr_Talkie_1.0.zip 64531589 BLAKE2B b78af1adcf19d726ce0348a4b26bdf1d88833e7f7b5b00abfb3d6c112fddd5e4266f2dcf792b06c8828f308e50328d67d5c550b1ddf15dccd027c60d83cfccb0 SHA512 c53180eabb797e5a857ef97d0e70f880a0c729fbbf6443e67ea21ec6af36f69e7039b8341b21c1e998064cfdae916f6a799bce7b38038e83bc91aee16737f797
-DIST FOTAQ_Ger_talkie-1.0.zip 75938507 BLAKE2B fe88beb385fa74854b3f84bdac76d6382266e0be74a56a6b9c07cbd48849c04dc9065d051185f840a1bffc73fd4cbaabfc588f7482a9ecdd383ab3f13c18f67f SHA512 65b6ae3fec052d616b52efb9eb74017587e39c0aa27a96f46b733b5caf2039193e6e1a99b873cdd8efe9d67b70fb0c48067731ba2d146350ed2fcf4551963837
-DIST FOTAQ_Heb_talkie.zip 66213122 BLAKE2B d739899f64bdda23726a35ad1f9959c931378dab45afe6ef887dd0fcb963fdb85844ba1d50dbcb4b641b6f02062294df414aad1ce340375e169c47731d3344aa SHA512 497c4b9a08dbb1abb3eec69f540ec06a4b66c681fe9c032e58307e7fe1fb31391eb6f1001fe0e0b429542c512f43786e518d101912c97cef33d2deda35c1670e
-DIST FOTAQ_It_Talkie_1.0.zip 65091076 BLAKE2B 4f4ee3a4f4ef6f2f3375d5cfa7fd67c17f0bea7b9a6758bbfee865f2a39ec921f145a80b9356b15745a4b2564c56ff152d2083ddb0e032247e73ecf71971b93e SHA512 01ce230232d0288fed5af55c2cb7f06cf31e89cabcb6547ba6f284eee794beaafbeb3182bc391bf209ce5d58189b82afbca126d167a9f986db4b4816fc69b90e
-DIST FOTAQ_Talkie-1.1.zip 33744817 BLAKE2B bd6edb28de6c4bede38b3d41365a27ba75373a51753a1853f136107a0abb20d8c8c694b268e551c3a4aad0c5a33780128903a3a0c700efeda1b22e722a66d0ad SHA512 b543c863b557de24250adde78badc7b12a0de5aabb484f50d6b682c3ec7f710e991614254d2cfae960280f984ba2889703d42d51d20746080a9b7bb2996063b1
-DIST cat-queen.png 1099 BLAKE2B 4035d73ccecc0bf91c4411d6018682d11f3fb8a246718d3762b216d44e299e9c0f3c9325206e4ab2f454f3005af0197b027dbb85c6f772631c823ed032c6f040 SHA512 009f30e2f9abbc803cd47314d8ff53009898640c12a26cb155b7e0b29c0a2bdaa06cf97fca6ca6f8b428300d63ca8200f627695a3f0b71585374a4a2b63ed2df
-DIST queen-readme.txt 5351 BLAKE2B 8b1859540668102a1ac25019f824084393440dee080528aa98a92b205bc8bdba45649c062d7ad88f3c82645e186ed98c4628719295d0d8efb8147c095166999a SHA512 ed2b5bc18896f9eeadea7526a70ad0a115bda229d1074d8c3a5a64228a7089cc20c6e296d82dc482634ab9bde06a07635d10ee68f47420f00625e0f5c29ef6ad
-DIST queen.1.bz2 90404210 BLAKE2B d854e0d7b82cf06551ebef5dd8b44f99e4a924cdd5721894e1b09698e2bc790f591906bcaa5208e37f8f05773152c1da4edf3186080b5a1f279276b8dd112b45 SHA512 f931584c141403019dcd91c43c8610c23cf39b37272440517c75cd4946da005d7fabcdd76fce2ec7504f35ec02727bede7d6a98381bd4f0c6a8d65b3c4363278
-EBUILD queen-1-r1.ebuild 3342 BLAKE2B f75eb1f99e88f69de8616166d2f505c57cf782d2cbe7ff91a2b9294bc6f0d4ed1f563fae03bb94710a52d17dd57c52dca20b70c6119926cf3905f40c493e9806 SHA512 d12b85b68198bf5523e527b08ed8a9fbc7af92f07c8cbb020ace978bdcf48040ce20139c8b8ece65e0455b4631c24aad51d142fe4f96abded31b68941c0e2e0a
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/queen/metadata.xml b/games-rpg/queen/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/queen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/queen/queen-1-r1.ebuild b/games-rpg/queen/queen-1-r1.ebuild
deleted file mode 100644
index e9e011cf3398..000000000000
--- a/games-rpg/queen/queen-1-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Flight of the Amazon Queen - 2D point-and-click adventure game set in the 1940s"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SF_BASE_URL="mirror://sourceforge/scummvm/"
-LYS_BASE_URL="http://www.lysator.liu.se/~zino/scummvm/queen/"
-FILE_DE="FOTAQ_Ger_talkie-1.0.zip"
-FILE_EN="FOTAQ_Talkie-1.1.zip"
-FILE_FR="FOTAQ_Fr_Talkie_1.0.zip"
-FILE_HE="FOTAQ_Heb_talkie.zip"
-FILE_IT="FOTAQ_It_Talkie_1.0.zip"
-SRC_URI="
-	l10n_de? (
-		${SF_BASE_URL}${FILE_DE}
-		${LYS_BASE_URL}readme.txt -> queen-readme.txt
-	)
-	l10n_en? (
-		mp3? ( ${SF_BASE_URL}${FILE_EN} )
-		!mp3? (
-			${LYS_BASE_URL}queen.1.bz2
-			${LYS_BASE_URL}readme.txt -> queen-readme.txt
-		)
-	)
-	l10n_fr? ( ${SF_BASE_URL}${FILE_FR} )
-	l10n_he? (
-		${SF_BASE_URL}${FILE_HE}
-		${LYS_BASE_URL}readme.txt -> queen-readme.txt
-	)
-	l10n_it? ( ${SF_BASE_URL}${FILE_IT} )
-	http://www.scummvm.org/images/cat-queen.png
-"
-
-LICENSE="queen"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="mp3 l10n_de +l10n_en l10n_fr l10n_he l10n_it"
-REQUIRED_USE="|| ( l10n_de l10n_en l10n_fr l10n_he l10n_it )"
-
-RDEPEND="
-	l10n_de? ( games-engines/scummvm[vorbis] )
-	l10n_en? ( games-engines/scummvm[mp3?] )
-	l10n_fr? ( games-engines/scummvm[vorbis] )
-	l10n_he? ( games-engines/scummvm[vorbis] )
-	l10n_it? ( games-engines/scummvm[vorbis] )
-"
-DEPEND="${RDEPEND}
-	l10n_de? ( app-arch/unzip )
-	l10n_en? ( mp3? ( app-arch/unzip ) )
-	l10n_fr? ( app-arch/unzip )
-	l10n_he? ( app-arch/unzip )
-	l10n_it? ( app-arch/unzip )
-"
-
-S=${WORKDIR}
-
-src_unpack() {
-	if use l10n_de ; then
-		mkdir de
-		unpack ${FILE_DE}
-		mv queen.1c de/queen.1c
-		rm COPYING
-		cp "${DISTDIR}"/queen-readme.txt de/readme.txt
-	fi
-	if use l10n_en ; then
-		mkdir en
-		if use mp3 ; then
-			unpack ${FILE_EN}
-			mv queen.1c en/queen.1c
-			mv readme.txt en/readme.txt
-		else
-			unpack queen.1.bz2
-			mv queen.1 en/queen.1
-			cp "${DISTDIR}"/queen-readme.txt en/readme.txt
-		fi
-	fi
-	if use l10n_fr ; then
-		mkdir fr
-		unpack ${FILE_FR}
-		mv queen.1c fr/queen.1c
-		mv readme.txt fr/readme.txt
-	fi
-	if use l10n_he ; then
-		mkdir he
-		unpack ${FILE_HE}
-		mv queen.1c he/queen.1c
-		rm COPYING
-		cp "${DISTDIR}"/queen-readme.txt he/readme.txt
-	fi
-	if use l10n_it ; then
-		mkdir it
-		unpack ${FILE_IT}
-		mv queen.1c it/queen.1c
-		mv readme.txt it/readme.txt
-	fi
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon "${DISTDIR}"/cat-queen.png queen.png
-	if use l10n_de ; then
-		make_wrapper queen-de "scummvm -f -p \"/usr/share/${PN}/de\" queen" .
-		make_desktop_entry ${PN}-de "Flight of the Amazon Queen (German)" queen
-	fi
-	if use l10n_en ; then
-		make_wrapper queen-en "scummvm -f -p \"/usr/share/${PN}/en\" queen" .
-		make_desktop_entry ${PN}-en "Flight of the Amazon Queen (English)" queen
-	fi
-	if use l10n_fr ; then
-		make_wrapper queen-fr "scummvm -f -p \"/usr/share/${PN}/fr\" queen" .
-		make_desktop_entry ${PN}-fr "Flight of the Amazon Queen (French)" queen
-	fi
-	if use l10n_he ; then
-		make_wrapper queen-he "scummvm -f -p \"/usr/share/${PN}/he\" queen" .
-		make_desktop_entry ${PN}-he "Flight of the Amazon Queen (Hebrew)" queen
-	fi
-	if use l10n_it ; then
-		make_wrapper queen-it "scummvm -f -p \"/usr/share/${PN}/it\" queen" .
-		make_desktop_entry ${PN}-it "Flight of the Amazon Queen (Italian)" queen
-	fi
-}
diff --git a/games-rpg/runescape-launcher-2.2.4-r2 b/games-rpg/runescape-launcher-2.2.4-r2
new file mode 100644
index 000000000000..9918309ed6f8
--- /dev/null
+++ b/games-rpg/runescape-launcher-2.2.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info >=sys-apps/sed-4
+DESCRIPTION=Official RuneScape NXT client launcher
+EAPI=6
+HOMEPAGE=http://www.runescape.com
+IUSE=kde
+KEYWORDS=-* ~amd64
+LICENSE=RuneScape-EULA
+RDEPEND=media-libs/libpng:1.2 >=media-libs/libsdl2-2.0.2 media-libs/glew:1.10 >=media-libs/libvorbis-1.3.2 >=net-misc/curl-7.35.0
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=http://content.runescape.com/downloads/ubuntu/pool/non-free/r/runescape-launcher/runescape-launcher_2.2.4_amd64.deb
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f3653bae47f573ec76a265f1a67ba374
diff --git a/games-rpg/runescape-launcher/Manifest b/games-rpg/runescape-launcher/Manifest
deleted file mode 100644
index 4addaa5c6a13..000000000000
--- a/games-rpg/runescape-launcher/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST runescape-launcher_2.2.4_amd64.deb 3014372 BLAKE2B 9ac215ff5f4b50a432fe14924d9bd7b8891d488cac05c6e2e657b97df68446e3d6a71c5c8330ff2ee995eddbfa63f885915a0c26413546845edeb219c2e56ac4 SHA512 47a3d757f2719474767ba95346f7e2d51a41612c8287656e78a958c68f62a26abcffc187b21d6cb7584bc94b2b5583d55dde4f27cfc18174e917864a7002c518
-EBUILD runescape-launcher-2.2.4-r2.ebuild 1598 BLAKE2B b95abd705ca66db473dd163822aecaaf36204fa8113d114fa05d0a5106df5b3f4f5791a17c23987625583ed1021dc3f3273f910e7ffbf6ad54231cf7129a176b SHA512 0bd6b875e864fe88081d6a6effa28421b2bd746e1f5162ede3b66a6e5b9e866234a74ef0cbbc6af0918207baec9fad6c473d8dc2077f362cd0da18a7ea72ce6c
-MISC metadata.xml 363 BLAKE2B 6ab4a2ef28cdbe1f2872fd2e354e1a16af1d6d23f78f8852c38737050c114adc33c916fb8ee1f2dc5d48460e2e76ab7c9e5fc16509f1afe01d259c0897289658 SHA512 c0b7f88e26968ff9cc1657152682755bdcdcd5dbe2490c54ca871f166e50cfff171b8a9a96c7fe09c97b39311c5be826ac5561d64a48152f0b4e4d1fa585e9df
diff --git a/games-rpg/runescape-launcher/metadata.xml b/games-rpg/runescape-launcher/metadata.xml
deleted file mode 100644
index d030cf30027d..000000000000
--- a/games-rpg/runescape-launcher/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jscinoz@jscinoz.so</email>
-		<name>Jack Coulter</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/runescape-launcher/runescape-launcher-2.2.4-r2.ebuild b/games-rpg/runescape-launcher/runescape-launcher-2.2.4-r2.ebuild
deleted file mode 100644
index 19f039b0e8f3..000000000000
--- a/games-rpg/runescape-launcher/runescape-launcher-2.2.4-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker xdg gnome2-utils
-
-DESCRIPTION="Official RuneScape NXT client launcher"
-HOMEPAGE="http://www.runescape.com"
-
-SRC_URI="http://content.runescape.com/downloads/ubuntu/pool/non-free/r/${PN}/${PN}_${PV}_amd64.deb"
-
-QA_PREBUILT="/opt/runescape-launcher/runescape"
-
-SLOT="0"
-
-IUSE="kde"
-
-KEYWORDS="-* ~amd64"
-
-LICENSE="RuneScape-EULA"
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-RDEPEND="
-	media-libs/libpng:1.2
-	>=media-libs/libsdl2-2.0.2
-	media-libs/glew:1.10
-	>=media-libs/libvorbis-1.3.2
-	>=net-misc/curl-7.35.0
-"
-DEPEND=""
-
-src_prepare() {
-	# Fix path in launcher script
-	sed -i "s:/usr/share/games/$PN:/opt/$PN:" usr/bin/$PN || die
-
-	# Add missing trailing semicolon to .desktop MimeType entry
-	sed -i '/MimeType=/{/;$/!{s/$/;/}}' usr/share/applications/${PN}.desktop || die
-
-	# Fix path to launcher script
-	sed -i "s:/usr/bin/$PN:/opt/bin/$PN:" usr/share/applications/${PN}.desktop || die
-
-	xdg_src_prepare
-
-	eapply_user
-}
-
-src_install() {
-	into /opt
-	dobin usr/bin/$PN
-	dodoc usr/share/doc/$PN/*
-
-	exeinto /opt/$PN
-	doexe usr/share/games/$PN/runescape
-
-	insinto /usr/share/applications
-	doins usr/share/applications/${PN}.desktop
-
-	insinto /usr/share/icons
-	doins -r usr/share/icons/hicolor
-
-	if use kde ; then
-		insinto /usr/share/kde4
-		doins -r usr/share/kde4/services
-	fi
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/soltys-1.0-r2 b/games-rpg/soltys-1.0-r2
new file mode 100644
index 000000000000..9227d2158bc1
--- /dev/null
+++ b/games-rpg/soltys-1.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Classic adventure game
+EAPI=6
+HOMEPAGE=http://wiki.scummvm.org/index.php/Soltys
+IUSE=l10n_en l10n_es l10n_pl
+KEYWORDS=~amd64 ~x86
+LICENSE=Soltys
+RDEPEND=>=games-engines/scummvm-1.5
+SLOT=0
+SRC_URI=l10n_en? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) l10n_es? ( mirror://sourceforge/scummvm/soltys-es-v1.0.zip ) l10n_pl? ( mirror://sourceforge/scummvm/soltys-pl-v1.0.zip ) !l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/soltys-en-v1.0.zip ) ) ) http://www.scummvm.org/images/cat-soltys.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0fb84a6001163ec73fd35fc521159215
diff --git a/games-rpg/soltys/Manifest b/games-rpg/soltys/Manifest
deleted file mode 100644
index be517d7221a3..000000000000
--- a/games-rpg/soltys/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST cat-soltys.png 1917 BLAKE2B c33be51239b1df521b117c44ad2a6e427c26b64a37a1c72331aacfa797913e6d9a83b87689cccaa1e28fef44f47f7ffbc5f712a47b7488f4a237eb121f8297e1 SHA512 c2df23275372582300d3d87d2b629548dabf61ad9d031cb352f4167d956d5126926efee41b24f48040390177b6f28e1b432ff5049bb66858316cce37106aaca8
-DIST soltys-en-v1.0.zip 3484518 BLAKE2B 04d49de79af0d18a5e35ee618de18c0c70b0d9670f9533ce29759aae34542038d31d9b096b25f7d7ee830bea6d0933df9d782b705b7dcaa46144023b9d88a037 SHA512 92637d760033c044b3979dfe21f617db0b2cf98c48587e058910f877b38e0887fed8102782f1dfac85bc8eefa68d3791d7ff2d6074396bea2728a128e37cee1d
-DIST soltys-es-v1.0.zip 3527349 BLAKE2B ac567c7727c8150b75d681e8f416aab859725a665c8e0b6ec628c7a0f101b0ffcf9fb2822d0dafbbd252c1a92f01bcb43f05c8f39447ef8dcf4a591afa441b8a SHA512 eac3aa60e274720f65504ffe5bc18f99401a24c5775c3bc6eb893aef2af7e02055eb52e3da162f124babe5b611f93ff5444aca6e2ea26e5baa98a2131dd49da0
-DIST soltys-pl-v1.0.zip 3483638 BLAKE2B 35269130a2d4699cd709deaeaf96cd95786dcb3b4ceb77b00682f865ab796245e7830805ff4989d4298e54bcc963c45ef8e58ef2200376b41722df33a82b41b5 SHA512 b8c04366d360eb4b7f296718ae46a2e417b676f9bddd6fb8555069d8972ae2ff1706c67fc473a52a5009cb433ff58db377e5f02ff6b27e68e35d2a89c8108f24
-EBUILD soltys-1.0-r2.ebuild 1819 BLAKE2B ea89b54fd17e3dabcfe84994b373ba26ffd06fc149797eea9134f6ae9e12ae279811087e87c1d7ce3635d0d6b4ccd4f660cf3dcdca7bec93da74c468728984e4 SHA512 19504fc8f85901d85d07d57f9d85b9cec7f7101fdc691851904ee0824cd006add695531ff0cf0ef3a54bdaa1536b3f5cee215f063eebfef85f3e19a118a8711f
-MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-rpg/soltys/metadata.xml b/games-rpg/soltys/metadata.xml
deleted file mode 100644
index 801e2cc48963..000000000000
--- a/games-rpg/soltys/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scummvm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/soltys/soltys-1.0-r2.ebuild b/games-rpg/soltys/soltys-1.0-r2.ebuild
deleted file mode 100644
index f3e8b8ccb22a..000000000000
--- a/games-rpg/soltys/soltys-1.0-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Classic adventure game"
-HOMEPAGE="http://wiki.scummvm.org/index.php/Soltys"
-SRC_URI="l10n_en? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip )
-	l10n_es? ( mirror://sourceforge/scummvm/${PN}-es-v${PV}.zip )
-	l10n_pl? ( mirror://sourceforge/scummvm/${PN}-pl-v${PV}.zip )
-	!l10n_en? ( !l10n_es? ( !l10n_pl? ( mirror://sourceforge/scummvm/${PN}-en-v${PV}.zip ) ) )
-	http://www.scummvm.org/images/cat-soltys.png"
-
-LICENSE="Soltys"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="l10n_en l10n_es l10n_pl"
-
-RDEPEND=">=games-engines/scummvm-1.5"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		mkdir -p en || die
-		unpack ${PN}-en-v${PV}.zip
-		mv vol.{cat,dat} en/ || die
-	fi
-	if use l10n_es ; then
-		mkdir -p es || die
-		unpack ${PN}-es-v${PV}.zip
-		mv soltys-es-v1-0/vol.{cat,dat} es/ || die
-	fi
-	if use l10n_pl ; then
-		mkdir -p pl || die
-		unpack ${PN}-pl-v${PV}.zip
-		mv vol.{cat,dat} pl/ || die
-	fi
-}
-
-src_prepare() {
-	default
-	rm -rf license.txt soltys-es-v1-0
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r *
-	newicon "${DISTDIR}"/cat-soltys.png soltys.png
-	if use l10n_en || ( ! use l10n_en && ! use l10n_es && ! use l10n_pl ) ; then
-		make_wrapper soltys-en "scummvm -f -p \"/usr/share/${PN}/en\" soltys" .
-		make_desktop_entry ${PN}-en "Soltys (English)" soltys
-	fi
-	if use l10n_es ; then
-		make_wrapper soltys-es "scummvm -f -p \"/usr/share/${PN}/es\" soltys" .
-		make_desktop_entry ${PN}-es "Soltys (Español)" soltys
-	fi
-	if use l10n_pl ; then
-		make_wrapper soltys-pl "scummvm -f -p \"/usr/share/${PN}/pl\" soltys" .
-		make_desktop_entry ${PN}-pl "Soltys (Polski)" soltys
-	fi
-}
diff --git a/games-rpg/sumwars-0.5.8-r1 b/games-rpg/sumwars-0.5.8-r1
new file mode 100644
index 000000000000..56ce5f6f1a1c
--- /dev/null
+++ b/games-rpg/sumwars-0.5.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-lang/lua-5.1:0 >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=a multi-player, 3D action role-playing game
+EAPI=6
+HOMEPAGE=http://sumwars.org
+IUSE=+tools debug l10n_de l10n_en l10n_it l10n_pl l10n_pt l10n_ru l10n_uk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 CC-BY-SA-3.0
+RDEPEND=>=dev-games/cegui-0.8[ogre] >=dev-games/ogre-1.7.4-r1[freeimage,opengl] dev-games/ois dev-games/physfs >=dev-lang/lua-5.1:0 >=dev-libs/tinyxml-2.6.2-r2 media-libs/freealut media-libs/openal media-libs/libogg media-libs/libvorbis >=net-libs/enet-1.3.0 x11-libs/libX11 x11-libs/libXrandr tools? ( dev-libs/boost )
+SLOT=0
+SRC_URI=mirror://sourceforge/sumwars/sumwars-0.5.8-src.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=02713299c5a36aaf0dd3480e5acfb65a
diff --git a/games-rpg/sumwars/Manifest b/games-rpg/sumwars/Manifest
deleted file mode 100644
index e2ea4f79992a..000000000000
--- a/games-rpg/sumwars/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sumwars-0.5.8-src.tar.bz2 107811288 BLAKE2B d7eef29ae9ba91d7a368730169d49c4b84e5db5cdbd4be7aa183e91baa50fd45be2b91928903e9cb17d947c2a4947094138c65efe076cdc85f14fbfacadddbd1 SHA512 ccf156f4484b0aeb8984631321d6691dc180ad63fdfa59d92aaa05ada3e871fc10656f32f9ba1b65abe7342e1481e14ca01f025ffc0ec5797cd8e91d97240cf1
-EBUILD sumwars-0.5.8-r1.ebuild 1917 BLAKE2B 270f82d9eb275df0f211ffdf752e8278190d37a1f9b5954406d2e33c094e6fd684f6a4f9be68b7f9ad17d570f95a12bf0c636a72a45aa0730ad06a354c0bda18 SHA512 35ec46e0888370d1d896c154089e9d65dba0a86ff81decbc6dc2bb6c0478b1bc6b45e2062586d3b272ad7d20a2925189755a0ffe64ba708182a98fa93224eb73
-MISC metadata.xml 521 BLAKE2B 773a7729ffb1deb23e15e7ad061596099bfce5e590fd6a4dd04014527df7ab7a91384b86429221960e54331ab094472277e0f23a9ea8e61f1b02a869437a57a7 SHA512 8ff8a6777a1d50900f210f97c22a80c68491d452c550550578cd0481653d4dbc52e3e88ae40dfcd547c62f0f43ad15c5d766330522e04a096c59a93265a470c0
diff --git a/games-rpg/sumwars/metadata.xml b/games-rpg/sumwars/metadata.xml
deleted file mode 100644
index ee9203d83eb5..000000000000
--- a/games-rpg/sumwars/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://sumwars.org/mantis/changelog_page.php</changelog>
-		<bugs-to>https://sumwars.org/mantis/index.php</bugs-to>
-		<remote-id type="sourceforge">sumwars</remote-id>
-	</upstream>
-	<use>
-		<flag name="tools">Builds editor tools</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild b/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild
deleted file mode 100644
index caba1802db8a..000000000000
--- a/games-rpg/sumwars/sumwars-0.5.8-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="a multi-player, 3D action role-playing game"
-HOMEPAGE="http://sumwars.org"
-SRC_URI="mirror://sourceforge/sumwars/${P//_/-}-src.tar.bz2"
-
-LICENSE="GPL-3 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+tools debug"
-
-LANGS="de en it pl pt ru uk"
-for L in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${L}"
-done
-unset L
-
-RDEPEND="
-	>=dev-games/cegui-0.8[ogre]
-	>=dev-games/ogre-1.7.4-r1[freeimage,opengl]
-	dev-games/ois
-	dev-games/physfs
-	>=dev-lang/lua-5.1:0
-	>=dev-libs/tinyxml-2.6.2-r2
-	media-libs/freealut
-	media-libs/openal
-	media-libs/libogg
-	media-libs/libvorbis
-	>=net-libs/enet-1.3.0
-	x11-libs/libX11
-	x11-libs/libXrandr
-	tools? ( dev-libs/boost )"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/${PN}-${PV%_*}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	use debug && CMAKE_BUILD_TYPE=Debug
-
-	local l langs
-	for l in ${LANGS}; do
-		if use l10n_${l}; then
-			langs="${langs} ${l}"
-		fi
-	done
-
-	[[ -z "${langs}" ]] && langs="en"
-
-	# configure sumwars with cmake
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX=""
-		-DSUMWARS_BUILD_TOOLS="$(usex tools)"
-		-DSUMWARS_DOC_DIR="/usr/share/doc/${PF}"
-		-DSUMWARS_EXECUTABLE_DIR="/usr/bin"
-		-DSUMWARS_LANGUAGES="${langs}"
-		-DSUMWARS_NO_ENET=ON
-		-DSUMWARS_NO_TINYXML=ON
-		-DSUMWARS_PORTABLE_MODE=OFF
-		-DSUMWARS_POST_BUILD_COPY=OFF
-		-DSUMWARS_RANDOM_REGIONS=ON
-		-DSUMWARS_SHARE_DIR="/usr/share/${PN}"
-		-DSUMWARS_STANDALONE_MODE=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 128 share/icon/SumWarsIcon_128x128.png ${PN}.png
-	make_desktop_entry ${PN} "Summoning Wars"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/to-the-moon-0 b/games-rpg/to-the-moon-0
new file mode 100644
index 000000000000..60c2c858d306
--- /dev/null
+++ b/games-rpg/to-the-moon-0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Two doctors traversing the memories of a dying man to fulfill his last wish
+EAPI=5
+HOMEPAGE=http://freebirdgames.com/games/to-the-moon
+IUSE=bundled-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )
+RDEPEND=!bundled-libs? ( dev-libs/libsigc++:2 >=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video] media-libs/openal media-libs/sdl2-image[png] media-libs/sdl2-ttf ) sys-libs/zlib virtual/opengl games-misc/games-envd
+RESTRICT=fetch bindist splitdebug
+SLOT=0
+SRC_URI=ToTheMoon_linux_1389114090.sh
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c7a3717724637ef1e92dee8278c882c9
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
deleted file mode 100644
index eed3a69bd4fd..000000000000
--- a/games-rpg/to-the-moon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ToTheMoon_linux_1389114090.sh 75823678 BLAKE2B de63a8c5eff7d99f5af4fbc85c8e416c7bd7a07fad03dfb0424bf43f410bdbc9a0d064c8892dbb6c9fdc637391f2b2ef6ef40c72c501790ffec0aac8448add21 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a
-EBUILD to-the-moon-0.ebuild 2492 BLAKE2B bc3017c2c0e28f78d084a6bbea466ceb3e3411db3a0b5134a8e4bccdc5acfcd7fc00b80e5db0083fdc60320d1c7b75a09968bb3e2e68febbdafa72a147f47883 SHA512 940033be5a9114f29d9e0f8f6dca75e9b68b3d5a0980710a02159cc66ab1f01fab2e208223a3492ed70103052680b86c52dfbc88ef5409d654b512f1f0e475ce
-MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-rpg/to-the-moon/metadata.xml b/games-rpg/to-the-moon/metadata.xml
deleted file mode 100644
index 451145245bfb..000000000000
--- a/games-rpg/to-the-moon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="bundled-libs">Use bundled libraries</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-rpg/to-the-moon/to-the-moon-0.ebuild b/games-rpg/to-the-moon/to-the-moon-0.ebuild
deleted file mode 100644
index 7560ad283a8c..000000000000
--- a/games-rpg/to-the-moon/to-the-moon-0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: unbundling sdl-sound breaks the game
-
-EAPI=5
-
-inherit eutils unpacker gnome2-utils games
-
-MY_PN=ToTheMoon
-DESCRIPTION="Two doctors traversing the memories of a dying man to fulfill his last wish"
-HOMEPAGE="http://freebirdgames.com/games/to-the-moon"
-SRC_URI="${MY_PN}_linux_1389114090.sh"
-
-LICENSE="all-rights-reserved bundled-libs? ( LGPL-2 LGPL-2.1 ZLIB )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="bundled-libs"
-RESTRICT="fetch bindist splitdebug"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin*"
-if [[ ${ARCH} == "amd64" ]] ; then
-	QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib64/*"
-else
-	QA_PREBUILT="${QA_PREBUILT} ${GAMES_PREFIX_OPT}/${PN}/lib/*"
-fi
-
-RDEPEND="
-	!bundled-libs? (
-		dev-libs/libsigc++:2
-		>=media-libs/libsdl2-2.0.1[X,joystick,opengl,sound,threads,video]
-		media-libs/openal
-		media-libs/sdl2-image[png]
-		media-libs/sdl2-ttf
-	)
-	sys-libs/zlib
-	virtual/opengl"
-
-S=${WORKDIR}/data
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy & download \"${SRC_URI}\" from:"
-	einfo "  ${HOMEPAGE}"
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-}
-
-src_unpack() {
-	# mojo stuff inside makeself archive, unpack_makeself fails
-	local lastline=$(( $(grep -a -h -n -m 1 -F -e "Extra newline, because in very rare cases (OpenSolaris) stub is directly added after script" "${DISTDIR}/${A}" | cut -d':' -f1) + 1 ))
-	[[ ${lastline} ]] || die "no last line"
-	local offset=$(head -n ${lastline} "${DISTDIR}/${A}" | wc -c)
-	[[ ${offset} ]] || die "no offset"
-	dd ibs=${offset} skip=1 if="${DISTDIR}/${A}" of="${T}"/moon.zip || die
-	unpack_zip "${T}"/moon.zip
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-	local libsuffix=$(usex amd64 "64" "")
-	local arch=$(usex amd64 "x86_64" "x86")
-
-	insinto "${dir}"
-	doins -r noarch/{Audio,Data,Fonts,Graphics,Game.ini,mkxp.conf,ToTheMoon.png}
-
-	exeinto "${dir}"
-	doexe ${arch}/${MY_PN}.bin.${arch}
-
-	exeinto "${dir}/lib${libsuffix}"
-	if use bundled-libs ; then
-		doexe ${arch}/lib${libsuffix}/*
-	else
-		doexe ${arch}/lib${libsuffix}/libSDL_sound-1.0.so.1
-	fi
-
-	games_make_wrapper ${PN} "./${MY_PN}.bin.${arch}" "${dir}" "${dir}/lib${libsuffix}"
-	make_desktop_entry ${PN} "To the Moon"
-	newicon -s 32 noarch/${MY_PN}.png ${PN}.png
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/twclone-0.14-r1 b/games-rpg/twclone-0.14-r1
new file mode 100644
index 000000000000..1e2aeb07a9da
--- /dev/null
+++ b/games-rpg/twclone-0.14-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=Clone of BBS Door game Trade Wars 2002
+EAPI=6
+HOMEPAGE=http://twclone.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/twclone/twclone-source-0.14.tar.gz
+_md5_=af9a8d88ecd7a2c68a198bd130bb8f85
diff --git a/games-rpg/twclone/Manifest b/games-rpg/twclone/Manifest
deleted file mode 100644
index 3a6a08ed143b..000000000000
--- a/games-rpg/twclone/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX twclone-0.14-format.patch 2700 BLAKE2B 35c25983f3d8544405ecb4095c52866b7b3043aca6b32c1dedd25f3e5c8e7c22e0343bb1c1f7f4d662304a12abdf0c2380a55ce53a4f39c9e76229b00ee511de SHA512 ee5f7aebe920270194bb28ff9d788d040c50c3dffcfc4f2b05ccb05c61e8e1bef53b6e030cd1be9291121ad33e6345cbcb99c02f79d7eccc7a5c009556a636b3
-DIST twclone-source-0.14.tar.gz 163065 BLAKE2B 58d5fb13c5d6dc6bb5f73d2f4da8eace8aad7625a464b45099bd21d9cd8c3d29b25714f73e505d895b7fd8815c0dd3227a289009b7298ebaf83b0ada58deff73 SHA512 66a63e2cc5fe82fb5a5b1f887c9eb3bf8b89044f7f7d489b67e5bb15a21426a5a0eb27b53ab59c05c784fc6fb7ffaadcfc5453fc55943959db859a053adb7843
-EBUILD twclone-0.14-r1.ebuild 556 BLAKE2B 243f28a30624aa42dd70d4b0d1389cf9a5192b7aa25a5de583ce1c433e3f6a2cbbb65496825041c00fca762f04b66cc036924220748072bdbd26a238c43892a6 SHA512 18f5be3eb6e6d0fef5eddfccf4f7b2344aeb2dae7cec2a05160da1ae785a2ec43578f21547ff71c7b6aac9a9457ca7702c2edcb3af90d68d3532cc7007121d32
-MISC metadata.xml 687 BLAKE2B bdfc645799af71efafb6ab5c399dd7243f60584ec3be6333f40830cfdbf21618358eb210abcbd8c8d2c6cbfefdf8735886892781b4e9a7587c7f4f7f3eb21e53 SHA512 376bb763d716ad1cb9513b72f9b301b013339aad3d3df02124d14e653275b322dc18ff4c7d87899a424b2d75cb09f090b516845d6e3e7f46f91e98273abf7320
diff --git a/games-rpg/twclone/files/twclone-0.14-format.patch b/games-rpg/twclone/files/twclone-0.14-format.patch
deleted file mode 100644
index d9d1a1c52516..000000000000
--- a/games-rpg/twclone/files/twclone-0.14-format.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- a/bigbang.c	2015-10-27 09:21:51.172611109 +0100
-+++ b/bigbang.c	2015-10-27 09:25:41.117233447 +0100
-@@ -530,13 +530,11 @@
-     planetfile = fopen ("./planets.data", "w");
-     for (loop = 1; loop <= 299 - strlen(terraInfo); loop++)
-         strcat(terraInfo, " ");
--    strcat(terraInfo, "\n");
--    fprintf (planetfile, terraInfo);
-+    fprintf (planetfile, "%s\n", terraInfo);
-     sprintf (ferrinfo, "%d:%d:Ferringhi:1:-2:Unknown:1000:1000:1000:0:0:0:0:3:100000:20:30:10:0:0:0:0:", 2, ferringhiSector);
-     for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
-         strcat(ferrinfo, " ");
--    strcat(ferrinfo, "\n");
--    fprintf(planetfile, ferrinfo);
-+    fprintf(planetfile, "%s\n", ferrinfo);
-     randomPlanetInfo = malloc (sizeof (strNameLength));
-     if (numRandomPlanets > 0)
-     {
-@@ -552,8 +550,7 @@
-                      , c, tempint, randomname (randomPlanetInfo), randomnum(1,5));
-             for (loop = 1; loop <= 299 - strlen(ferrinfo); loop++)
-                 strcat(ferrinfo, " ");
--            strcat(ferrinfo, "\n");
--            fprintf(planetfile, ferrinfo);
-+            fprintf(planetfile, "%s\n", ferrinfo);
- 
-             c++;
-         }
-@@ -616,10 +613,9 @@
-         fileline = strcat (fileline, ":");
-         if (sectorlist[x]->nebulae != NULL)
-             fileline = strcat (fileline, sectorlist[x]->nebulae);
--        fileline = strcat (fileline, ":\n");
-         /*  Later put in whitespace buffer for saving */
-         /*  Not needed until user created beacons put in */
--        fprintf (file, fileline);
-+        fprintf (file, "%s:\n", fileline);
-     }
-     fclose (file);
-     free (fileline);
-@@ -646,8 +642,7 @@
-         len = (int) strlen (fileline);
-         for (y = 0; y <= 99 - len; y++)
-             strcat (fileline, " ");
--        strcat (fileline, "\n");
--        fprintf (file, fileline);
-+        fprintf (file, "%s\n", fileline);
-     }
-     fclose (file);
- 
---- a/config.c	2015-10-27 09:30:00.091283678 +0100
-+++ b/config.c	2015-10-27 09:30:25.068806593 +0100
-@@ -140,9 +140,8 @@
- 
-   for (loop=0; loop < 199 - strlen(buffer); loop++)
- 		strcat(buffer, " ");
--  strcat(buffer, "\n");
- 
--  fprintf(configfile, buffer);
-+  fprintf(configfile, "%s\n", buffer);
- 
-   fclose(configfile);
-   free(buffer);
---- a/planet.c	2015-10-27 09:31:44.867282757 +0100
-+++ b/planet.c	2015-10-27 09:32:17.083667674 +0100
-@@ -59,8 +59,7 @@
- 		addint(stufftosave, planets[index]->citdl->upgradestart, ':', BUFF_SIZE);
- 		for (loop=0; loop< 399 - strlen(stufftosave); loop++)
- 			strcat(stufftosave, " ");
--		strcat(stufftosave, "\n");
--		fprintf(planetfile, stufftosave);
-+		fprintf(planetfile, "%s\n", stufftosave);
- 		}
- 	}
- 	fclose(planetfile);
diff --git a/games-rpg/twclone/metadata.xml b/games-rpg/twclone/metadata.xml
deleted file mode 100644
index 56bd9d00cd1f..000000000000
--- a/games-rpg/twclone/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-How many of you remeber the BBS days back in the late 80's and early 90's? 
-Back when you would call in play games and go on with your life? Well I'm 
-trying to duplicate one of those old games. It was called Trade Wars 
-2002(Created by Martech Software). So I decided to make a game similar to it 
-that runs in Linux.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">twclone</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/twclone/twclone-0.14-r1.ebuild b/games-rpg/twclone/twclone-0.14-r1.ebuild
deleted file mode 100644
index 95f7c5550971..000000000000
--- a/games-rpg/twclone/twclone-0.14-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-source-${PV}"
-DESCRIPTION="Clone of BBS Door game Trade Wars 2002"
-HOMEPAGE="http://twclone.sourceforge.net/"
-SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-format.patch
-)
-
-src_install() {
-	DOCS="AUTHORS ChangeLog PROTOCOL README TODO" \
-		default
-	cd "${D}/usr/bin"
-	for f in * ; do
-		mv {,${PN}-}${f}
-	done
-}
diff --git a/games-rpg/vendetta-online-bin-1.8.296-r1 b/games-rpg/vendetta-online-bin-1.8.296-r1
new file mode 100644
index 000000000000..5c60e614d490
--- /dev/null
+++ b/games-rpg/vendetta-online-bin-1.8.296-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=dev-util/patchelf
+DESCRIPTION=Space-based MMORPG
+EAPI=6
+HOMEPAGE=https://www.vendetta-online.com
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=guild
+RDEPEND=virtual/opengl x11-libs/gtk+:2
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh -> vendetta-online-bin-1.8.296-amd64.sh ) x86? ( http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh -> vendetta-online-bin-1.8.296-x86.sh )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ecd9b8cd52f2cda7ce97600d0114510a
diff --git a/games-rpg/vendetta-online-bin/Manifest b/games-rpg/vendetta-online-bin/Manifest
deleted file mode 100644
index 63f3e0072b7e..000000000000
--- a/games-rpg/vendetta-online-bin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX vendetta 113 BLAKE2B 7f4afc48107ced2af51cb691d2c64229b717016bc81b997bbd6326d5e41f858202b713fb0c87b68938debefd593c56a52024d2827feec11c55c0126c876984fb SHA512 a6b21095a87585ce9e96e87941f651ce3a6bbb123bff7d49d3c00a9b7dbab9864151a00adcae168d9949a28e83a4057916091516278245cfa925111197096a95
-DIST vendetta-online-bin-1.8.296-amd64.sh 235822235 BLAKE2B d5b3218a6928da2f6b0ad8e12d7dbf7052140bb194aceee948ab89d019b59d361c8ddc7eff6d97cf361a9b9b99a7f1b1b8af91339245201203b9aa6d3c4a60ee SHA512 f57b8da6b2364df7ca78c0a8df66cadbc568927376548f95b49da5d641d49a155315583d4323599f59e982b0569b972311fa4717e11dab48e4da95ab235d05a4
-DIST vendetta-online-bin-1.8.296-x86.sh 235890404 BLAKE2B cb59204f54a60a42639e542527a7b07019c4d9873bd7b4027abede84f6e2ca321449dabdacb082d7fd3fce343de1db5039d4da8f230ee52a2c0d64b5d5c41cc0 SHA512 909e4960fe85c7bc71cf1530cd8fd9fa096b28c9ba621e3c16e14d1264858939e859fad182e76301322eb45b7c451bd21d87a90274eefb9e71e1fd1eb1f498b0
-EBUILD vendetta-online-bin-1.8.296-r1.ebuild 1452 BLAKE2B 16c5233d83ab3714e198e6b825de32691761f4e51aeca9af65cf7b6f1393f8d5836e563ee77f54e95fb40414301bcafa363adab5bfaf1165f3bd4c8ca56a0391 SHA512 191fe6b63415d0ab26176793a61d29568e630b1bd3cd3b62904a474e0767d38c0263ebf838a035b745d3296bb05dbe74405273ffdcc4f366e8cf4bf97ae6faae
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/vendetta-online-bin/files/vendetta b/games-rpg/vendetta-online-bin/files/vendetta
deleted file mode 100644
index 113f5d0925b1..000000000000
--- a/games-rpg/vendetta-online-bin/files/vendetta
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ ! -e ~/.vendetta ] ; then
-	cp -vR "DATADIR"/install ~/.vendetta
-fi
-
-exec "DATADIR"/vendetta "$@"
diff --git a/games-rpg/vendetta-online-bin/metadata.xml b/games-rpg/vendetta-online-bin/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/vendetta-online-bin/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild b/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
deleted file mode 100644
index fc3e5e7afad7..000000000000
--- a/games-rpg/vendetta-online-bin/vendetta-online-bin-1.8.296-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit eutils unpacker
-
-DESCRIPTION="Space-based MMORPG"
-HOMEPAGE="https://www.vendetta-online.com"
-SRC_URI="amd64? (
-		http://mirror.cle.vendetta-online.com/vendetta-linux-amd64-installer.sh
-			-> ${P}-amd64.sh
-	)
-	x86? (
-		http://mirror.cle.vendetta-online.com/vendetta-linux-ia32-installer.sh
-			-> ${P}-x86.sh
-	)"
-
-LICENSE="guild"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-DEPEND="dev-util/patchelf"
-RDEPEND="virtual/opengl
-	x11-libs/gtk+:2"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_prepare() {
-	# Won't do much good since this is a -bin, but there's no bin_prepare :)
-	default
-
-	# scanelf: rpath_security_checks(): Security problem with relative DT_RPATH '.'
-	for file in install/drivers/{gkvc.so,soundbackends/libalsa_linux_amd64.so,soundbackends/libpulseaudio_linux_amd64.so}
-	do
-		patchelf --set-rpath '$ORIGIN' $file || die
-	done
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	insinto "${dir}"
-	doins -r * || die "doins failed"
-	fperms +x "${dir}"/{vendetta,install/{media.rlb,update.rlb,vendetta}} \
-		|| die "fperms failed"
-
-	sed \
-		-e "s:DATADIR:${dir}:" \
-		"${FILESDIR}"/vendetta > "${T}"/vendetta \
-		|| die "sed failed"
-
-	dobin "${T}"/vendetta
-	newicon install/manual/images/ships.valkyrie.jpg ${PN}.jpg
-	make_desktop_entry vendetta "Vendetta Online" /usr/share/pixmaps/${PN}.jpg
-}
diff --git a/games-rpg/wasteland2-1.9.0.13 b/games-rpg/wasteland2-1.9.0.13
new file mode 100644
index 000000000000..3ee1ab6d38f0
--- /dev/null
+++ b/games-rpg/wasteland2-1.9.0.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout
+EAPI=5
+HOMEPAGE=https://wasteland.inxile-entertainment.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] virtual/opengl games-misc/games-envd
+RESTRICT=bindist fetch mirror
+SLOT=0
+SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=59d5f4594800a80ee26d0c8a165a76ef
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
deleted file mode 100644
index 499c27eec031..000000000000
--- a/games-rpg/wasteland2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 BLAKE2B 8a82a608b3530fd2000ebe689b337529630da3c81ac4fc9369d9dd210b48b842658770b16ea451f3eedd63fcc682ad0c898fcff895d119ab4395fad32c04e9c4 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929
-EBUILD wasteland2-1.9.0.13.ebuild 2051 BLAKE2B a8762193eec699034a3bbfef566c23c81b638730d02ec1409565d5c85a7f866df3817a9ba270bdac5b45614ce5825906d7696eabe9588afdb30caf2f170c7ea5 SHA512 158bfcb7eaeb02efbb2fac3a31f25d2f1b1f221de81f62252a00f33b1b7a5569cfe320a9c7622fb72d20987b81c2b1d9a02a16ec8ad4e50bc8588b4e5f6e7166
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-rpg/wasteland2/metadata.xml b/games-rpg/wasteland2/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-rpg/wasteland2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
deleted file mode 100644
index c457367707b7..000000000000
--- a/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils gnome2-utils check-reqs games
-
-DESCRIPTION="Sequel to 1988 Wasteland, post-apocalyptic computer RPG inspiration for Fallout"
-HOMEPAGE="https://wasteland.inxile-entertainment.com/"
-SRC_URI="gog_wasteland_2_${PV}.tar.gz"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist fetch mirror"
-
-QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/*"
-
-RDEPEND="
-	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
-	>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
-	>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
-	>=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)]
-	>=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)]
-	>=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)]
-	>=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)]
-	>=x11-libs/pango-1.36.5[abi_x86_32(-)]
-	>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-	>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
-	>=virtual/glu-9.0-r1[abi_x86_32(-)]
-	virtual/opengl
-"
-
-S="${WORKDIR}/Wasteland 2"
-
-CHECKREQS_DISK_BUILD="22000M"
-CHECKREQS_DISK_USR="21600M"
-
-pkg_nofetch() {
-	einfo
-	einfo "Please buy Wasteland 2"
-	einfo "from https://www.gog.com/ and"
-	einfo "download \"${SRC_URI}\""
-	einfo "and move/link it to \"${DISTDIR}\""
-	einfo
-	einfo "This ebuild was tested with the CLASSICAL edition."
-	einfo "If it works with the deluxe edition too, please"
-	einfo "open a bug report. If not, open a bug report too."
-	einfo
-}
-
-src_install() {
-	local dir=${GAMES_PREFIX_OPT}/${PN}
-
-	# over 20GB of data
-	dodir "${dir}"
-	mv game/WL2_Data "${D%/}${dir}"/ || die
-	exeinto "${dir}"
-	doexe game/WL2
-
-	games_make_wrapper ${PN} ./WL2 "${dir}"
-	newicon -s 256 support/gog-wasteland-2.png ${PN}.png
-	make_desktop_entry ${PN} "Wasteland 2"
-
-	dodoc docs/*.pdf
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/wastesedge-0.3.5-r1 b/games-rpg/wastesedge-0.3.5-r1
new file mode 100644
index 000000000000..ad434087ba06
--- /dev/null
+++ b/games-rpg/wastesedge-0.3.5-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=games-rpg/adonthell-0.3.5-r2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=role playing game to showcase the adonthell engine
+EAPI=6
+HOMEPAGE=http://adonthell.linuxgames.com/
+IUSE=nls python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=games-rpg/adonthell-0.3.5-r2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] nls? ( virtual/libintl )
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=userpriv
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4958f7b5f934a283ae2eeb3e487a0689
diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
deleted file mode 100644
index 2dcf1deb2deb..000000000000
--- a/games-rpg/wastesedge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wastesedge-src-0.3.5.tar.gz 10749912 BLAKE2B ec4cd1135cd09c92937c8749905872b635e72575662bb7c1e188281e47ec0a285045aced378659fed20942c4bc7e67f11fa95e1cf0fe220c0be0f3b6527aa754 SHA512 d4c77eb1bde2c28002e4f56a6bfa5f816ea53de7061b5e60635f15c670ff45c3a18e3316b92007f74033a62538503f14b67e1175cf22c718c22ca1021dc7af3b
-EBUILD wastesedge-0.3.5-r1.ebuild 926 BLAKE2B eaa70de34e663ce856473f2a4ab44613e48ecf15cc0092ed12e4221508494660a8b1498ada6bd73e186671c6c7e8fa317a8bc8f7dda4937e8c4a8a88536dc452 SHA512 d150ce0a36aafd7b5e304b2c24e38ced6fc20734512aa9c6f2aaa9b3906a8d9be2df36854bcc6be86bf52b722644b235a87f3e3eab0e2285a01c4d73d20a2cf8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-rpg/wastesedge/metadata.xml b/games-rpg/wastesedge/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-rpg/wastesedge/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
deleted file mode 100644
index 2f28fcfac7b9..000000000000
--- a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-DESCRIPTION="role playing game to showcase the adonthell engine"
-HOMEPAGE="http://adonthell.linuxgames.com/"
-SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="userpriv"
-
-RDEPEND="${PYTHON_DEPS}
-	>=games-rpg/adonthell-0.3.5-r2[${PYTHON_USEDEP}]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_configure(){
-	econf \
-		$(use_enable nls) \
-		--with-adonthell-binary="/usr/bin/adonthell"
-}
-
-src_install(){
-	emake DESTDIR="${D}" pixmapdir=/usr/share/pixmaps install
-	dodoc AUTHORS ChangeLog NEWS PLAYING README
-	make_desktop_entry adonthell-wastesedge "Waste's Edge" wastesedge_32x32
-}
diff --git a/games-rpg/xu4-0.9-r1 b/games-rpg/xu4-0.9-r1
new file mode 100644
index 000000000000..8e0690760e63
--- /dev/null
+++ b/games-rpg/xu4-0.9-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-libs/libxml2 media-libs/libsdl[sound,video] media-libs/sdl-mixer[timidity] app-arch/unzip
+DESCRIPTION=A remake of the computer game Ultima IV
+EAPI=6
+HOMEPAGE=http://xu4.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 media-libs/libsdl[sound,video] media-libs/sdl-mixer[timidity]
+SLOT=0
+SRC_URI=mirror://sourceforge/xu4/xu4-0.9.tar.gz mirror://sourceforge/xu4/ultima4-1.01.zip mirror://sourceforge/xu4/u4upgrad.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9ff4bee37f837705458a8fdb1ce4c28d
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
deleted file mode 100644
index bfb57e535012..000000000000
--- a/games-rpg/xu4/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 0.9-savegame.patch 1716 BLAKE2B fc0fb7a9fac04bb9a386b52de0dc44719ad24f17b9cb086651803169a1a43a0a01129d3c5ecaad1bfa056355a488e9bbd743820b5a7716a3c599f63febb58c96 SHA512 b6484a2abc6b32933157cf3e7875d2863473bc863076efa3c4398dbd28cc037cbac2e376c5ce4bbd6c7fabdb2c0bc907be872e2167f6a00f4ca311ea8301ad77
-AUX xu4-0.9-ldflags.patch 1721 BLAKE2B 99181c971612b6ef1c929743612a0cbf8c0a7b90c4269dfe665e0909b3d1fcf7ae92a242b803474442e7f3aa7999799163089417e0a2efd4b22cc5a65420997d SHA512 1e0c3b8f6595f9b9f7fecda9264460cd67e289a7a0ba19fc181473546e3db4b2cadde825be46f27fdfec9b872fb6cb6ea8e474a890f25677b49b85093ffa957c
-AUX xu4-0.9-warnings.patch 454 BLAKE2B fb8c8b32013893e4db0aa7c20a39ceba9077b1fe64e10df5a4d0e2b7356bfedf9122a1d900b2527dc292054d827a1ed2237d16f18536045bc6113afb81c7189e SHA512 0a92b7510789a55c712f8d9a2130ac4d9cdf6e2403201c258d24c121fdae6e0d932504677715bea062652ee6aff7b27ec6419c578cb5fe56406b1965c387b361
-AUX xu4-0.9-zip.patch 4980 BLAKE2B 761a3251b23a22c3b1bc445a6cdc5a90f5ebe374dabd2ffebdf27c255250508db2010a514b256c07d8e94a6dfcf1fa50d4224b7d675360fa02e3394452453a44 SHA512 b531fd545f1827cff61eec4f5b60bb9b98e4b907c02a9477c269f75e3cccaf1741189abe47a1dcac6205c3fffadff7b13e57bfd80e2ac771f38546ef7c21a85c
-DIST u4upgrad.zip 632072 BLAKE2B 3691f1cbac940021ef6043dd5e2ee26dcee5f8d7181ed525179211a6984f5ab498b84533d28146129c3e747f0af8946f7d691b7cb817a5a4ecb39e71e2df7b9a SHA512 4832d8cfd266d3ccc5eab5184bd2b6b9acd4c0203478873fb5e11704d95104dd9285a7752bad77f873d4f8603673184ae9421964509b948ec69944a4ceadd083
-DIST ultima4-1.01.zip 537487 BLAKE2B 9af5c934e57d3b0151a575efc3ed34fa25f81ed2c43e2cb95ee200afb1b2f49365634199e066787de3d20c4c97903f918de2a4d4f2e9aeeb361ee585e59fbbc1 SHA512 c86c29d51e21b93992316552fbaaec948e7e8048fea484f003f43ac82211f82fa587fb15db991cddf744f2c3ff0fc4d411cd51cc7650e13a5b520c4dc620518c
-DIST xu4-0.9.tar.gz 320090 BLAKE2B 298a97edd2c42edcc2f63ec99656e76f3c541fce13f01a0767f02f63223e0d842a33ee1012742b7cd5bdefa7c66cddba6799130f539a8bb306c87ece8585ea62 SHA512 6c0b27472074d96a5f76e024c800bed89c57c29dbd760278c819ad8b024362480bda5f1584eb9fe64fd6f6cae0b3b8d8571c8cf533f25b842471803acd7cea8d
-EBUILD xu4-0.9-r1.ebuild 1664 BLAKE2B b6cdc4c4b22521b2a8892b55965aa5daa74a2654c58aeb718372dc1bfd27eb9d036ba5c855947dc0d911a1bfacf8c5ff4922524e0912e6b4ce64eedc8a2f2cd2 SHA512 558b73be5403e28590790461f416cd7179dd57ea6303a5cc55de678eaefb9bb40f394a04bc1e836219f165eb172f6fddff15213fb17b344ff52032c635bb12c1
-MISC metadata.xml 326 BLAKE2B c34bb1f21e6b7a60bb30b7bb3196af118f53137fcfd6508c3bc84c6abd1f62d53c1f43e72a1816c86f982f6f49b7dfa774647d1f42fc6ab696479b1ad645f9a9 SHA512 cdeb23df21e2a0ad4994adffe0ecf7fdca9fb886b6afc13483a80ffd481c9a031c2039894c86693b1ecf9652f882c2816e7091a3d6dd9ad76013b563e8780ec3
diff --git a/games-rpg/xu4/files/0.9-savegame.patch b/games-rpg/xu4/files/0.9-savegame.patch
deleted file mode 100644
index 96d16360f37c..000000000000
--- a/games-rpg/xu4/files/0.9-savegame.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/src/savegame.c.
-+++ b/src/savegame.c
-@@ -21,23 +21,24 @@
- char *partySavFilename() {
-     char *fname;
-     
--#if defined(MACOSX)
-     char *home;
- 
-     home = getenv("HOME");
-     if (home && home[0]) {
-         fname = (char *) malloc(strlen(home) + 
-+#if defined(MACOSX)
- strlen(MACOSX_USER_FILES_PATH) +
-+#endif
-+strlen("/.u4/") +
- strlen(PARTY_SAV_BASE_FILENAME) + 2);
-         strcpy(fname, home);
-+#if defined(MACOSX)
-         strcat(fname, MACOSX_USER_FILES_PATH);
--        strcat(fname, "/");
-+#endif
-+        strcat(fname, "/.u4/");
-         strcat(fname, PARTY_SAV_BASE_FILENAME);
-     } else
-         fname = strdup(PARTY_SAV_BASE_FILENAME);
--#else
--    fname = strdup(PARTY_SAV_BASE_FILENAME);
--#endif
-     
-     return fname;
- }
-@@ -45,24 +45,24 @@
- char *monstersSavFilename() {
-     char *fname;
-     
--#if defined(MACOSX)
-     char *home;
- 
-     home = getenv("HOME");
-     if (home && home[0]) {
-         fname = (char *) malloc(strlen(home) + 
-+#if defined(MACOSX)
- strlen(MACOSX_USER_FILES_PATH) +
-+#endif
-+strlen("/.u4/") +
- strlen(MONSTERS_SAV_BASE_FILENAME) + 2);
-         strcpy(fname, home);
-+#if defined(MACOSX)
-         strcat(fname, MACOSX_USER_FILES_PATH);
--        strcat(fname, "/");
-+#endif
-+        strcat(fname, "/.u4/");
-         strcat(fname, MONSTERS_SAV_BASE_FILENAME);
-     } else
-         fname = strdup(MONSTERS_SAV_BASE_FILENAME);
--#else
--    fname = strdup(MONSTERS_SAV_BASE_FILENAME);
--#endif
--    
-     return fname;
- }
-     
---- a/src/u4.c
-+++ b/src/u4.c
-@@ -38,6 +38,10 @@
-     osxInit(argv[0]);
- #endif
- 
-+    if (getenv("HOME")) {
-+    	chdir(getenv("HOME"));
-+	mkdir(".u4", 0777);
-+    }
-     settingsRead();
- 
-     for (i = 1; i < (unsigned int)argc; i++) {
diff --git a/games-rpg/xu4/files/xu4-0.9-ldflags.patch b/games-rpg/xu4/files/xu4-0.9-ldflags.patch
deleted file mode 100644
index 7f1e5cd922d7..000000000000
--- a/games-rpg/xu4/files/xu4-0.9-ldflags.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/src/Makefile.common
-+++ b/src/Makefile.common
-@@ -68,25 +68,25 @@
- mkutils::  dumpsavegame$(EXEEXT) lzwenc$(EXEEXT) lzwdec$(EXEEXT) rleenc$(EXEEXT) rledec$(EXEEXT) tlkconv$(EXEEXT)
- 
- $(MAIN): $(OBJS)
--	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
- 
- dumpsavegame$(EXEEXT) : util/dumpsavegame.o savegame.o io.o names.o
--	$(CC) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o dumpsavegame util/dumpsavegame.o savegame.o io.o names.o
- 
- lzwenc$(EXEEXT) : util/lzwenc.o lzw/hash.o util/pngconv.o
--	$(CC) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o lzwenc util/lzwenc.o lzw/hash.o util/pngconv.o -lpng -lz
- 
- lzwdec$(EXEEXT) : util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o
--	$(CC) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o lzwdec util/lzwdec.o lzw/lzw.o lzw/u4decode.o lzw/hash.o util/pngconv.o -lpng -lz
- 
- rleenc$(EXEEXT) : util/rleenc.o util/pngconv.o
--	$(CC) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o rleenc util/rleenc.o util/pngconv.o -lpng -lz
- 
- rledec$(EXEEXT) : util/rledec.o rle.o util/pngconv.o
--	$(CC) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o rledec util/rledec.o rle.o util/pngconv.o -lpng -lz
- 
- tlkconv$(EXEEXT) : util/tlkconv.o
--	$(CC) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o tlkconv util/tlkconv.o $(shell xml2-config --libs)
- 
- clean:: cleanutil
- 	rm -rf *~ */*~ $(OBJS) $(MAIN)
diff --git a/games-rpg/xu4/files/xu4-0.9-warnings.patch b/games-rpg/xu4/files/xu4-0.9-warnings.patch
deleted file mode 100644
index e52b610e61d4..000000000000
--- a/games-rpg/xu4/files/xu4-0.9-warnings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/u4.c
-+++ b/src/u4.c
-@@ -3,6 +3,8 @@
-  */
- 
- #include <stdio.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
---- a/u4.desktop
-+++ b/u4.desktop
-@@ -1,9 +1,8 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Ultima 4
- Comment=Ultima 4 (xu4)
- Exec=u4
--Icon=u4.png
--Terminal=0
-+Icon=u4
-+Terminal=false
- Type=Application
--Categories=Application;Game;RolePlaying;
-+Categories=Game;RolePlaying;
diff --git a/games-rpg/xu4/files/xu4-0.9-zip.patch b/games-rpg/xu4/files/xu4-0.9-zip.patch
deleted file mode 100644
index a8d2c58971c9..000000000000
--- a/games-rpg/xu4/files/xu4-0.9-zip.patch
+++ /dev/null
@@ -1,144 +0,0 @@
---- a/src/unzip.c
-+++ b/src/unzip.c
-@@ -493,7 +493,7 @@
- /*
-   Get Info about the current file in the zipfile, with internal only info
- */
--local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-+local int unzlocal_GetCurrentFileInfoInternal _Z_OF((unzFile file,
-                                                   unz_file_info *pfile_info,
-                                                   unz_file_info_internal 
-                                                   *pfile_info_internal,
---- a/src/unzip.h
-+++ b/src/unzip.h
-@@ -8,7 +8,7 @@
-    Encryption and multi volume ZipFile (span) are not supported.
-    Old compressions used by old PKZip 1.x are not supported
- 
--   THIS IS AN ALPHA VERSION. AT THIS STAGE OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-+   THIS IS AN ALPHA VERSION. AT THIS STAGE _Z_OF DEVELOPPEMENT, SOMES API OR STRUCTURE
-    CAN CHANGE IN FUTURE VERSION !!
-    I WAIT FEEDBACK at mail info@winimage.com
-    Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-@@ -111,7 +111,7 @@
-     tm_unz tmu_date;
- } unz_file_info;
- 
--extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-+extern int ZEXPORT unzStringFileNameCompare _Z_OF ((const char* fileName1,
- 												 const char* fileName2,
- 												 int iCaseSensitivity));
- /*
-@@ -124,7 +124,7 @@
- */
- 
- 
--extern unzFile ZEXPORT unzOpen OF((const char *path));
-+extern unzFile ZEXPORT unzOpen _Z_OF((const char *path));
- /*
-   Open a Zip file. path contain the full pathname (by example,
-      on a Windows NT computer "c:\\zlib\\zlib111.zip" or on an Unix computer
-@@ -135,14 +135,14 @@
- 	   of this unzip package.
- */
- 
--extern int ZEXPORT unzClose OF((unzFile file));
-+extern int ZEXPORT unzClose _Z_OF((unzFile file));
- /*
-   Close a ZipFile opened with unzipOpen.
-   If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-     these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-   return UNZ_OK if there is no problem. */
- 
--extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalInfo _Z_OF((unzFile file,
- 					unz_global_info *pglobal_info));
- /*
-   Write info about the ZipFile in the *pglobal_info structure.
-@@ -150,7 +150,7 @@
-   return UNZ_OK if there is no problem. */
- 
- 
--extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-+extern int ZEXPORT unzGetGlobalComment _Z_OF((unzFile file,
- 										   char *szComment,
- 					   uLong uSizeBuf));
- /*
-@@ -163,20 +163,20 @@
- /***************************************************************************/
- /* Unzip package allow you browse the directory of the zipfile */
- 
--extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-+extern int ZEXPORT unzGoToFirstFile _Z_OF((unzFile file));
- /*
-   Set the current file of the zipfile to the first file.
-   return UNZ_OK if there is no problem
- */
- 
--extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-+extern int ZEXPORT unzGoToNextFile _Z_OF((unzFile file));
- /*
-   Set the current file of the zipfile to the next file.
-   return UNZ_OK if there is no problem
-   return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
- */
- 
--extern int ZEXPORT unzLocateFile OF((unzFile file, 
-+extern int ZEXPORT unzLocateFile _Z_OF((unzFile file, 
- 				     const char *szFileName,
- 				     int iCaseSensitivity));
- /*
-@@ -189,7 +189,7 @@
- */
- 
- 
--extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-+extern int ZEXPORT unzGetCurrentFileInfo _Z_OF((unzFile file,
- 					     unz_file_info *pfile_info,
- 					     char *szFileName,
- 					     uLong fileNameBufferSize,
-@@ -215,20 +215,20 @@
-    from it, and close it (you can close it before reading all the file)
-    */
- 
--extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzOpenCurrentFile _Z_OF((unzFile file));
- /*
-   Open for reading data the current file in the zipfile.
-   If there is no error, the return value is UNZ_OK.
- */
- 
--extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-+extern int ZEXPORT unzCloseCurrentFile _Z_OF((unzFile file));
- /*
-   Close the file in zip opened with unzOpenCurrentFile
-   Return UNZ_CRCERROR if all the file was read but the CRC is not good
- */
- 
- 												
--extern int ZEXPORT unzReadCurrentFile OF((unzFile file, 
-+extern int ZEXPORT unzReadCurrentFile _Z_OF((unzFile file, 
- 					  voidp buf,
- 					  unsigned len));
- /*
-@@ -242,17 +242,17 @@
-     (UNZ_ERRNO for IO error, or zLib error for uncompress error)
- */
- 
--extern z_off_t ZEXPORT unztell OF((unzFile file));
-+extern z_off_t ZEXPORT unztell _Z_OF((unzFile file));
- /*
-   Give the current position in uncompressed data
- */
- 
--extern int ZEXPORT unzeof OF((unzFile file));
-+extern int ZEXPORT unzeof _Z_OF((unzFile file));
- /*
-   return 1 if the end of file was reached, 0 elsewhere 
- */
- 
--extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-+extern int ZEXPORT unzGetLocalExtrafield _Z_OF((unzFile file,
- 											 voidp buf,
- 											 unsigned len));
- /*
diff --git a/games-rpg/xu4/metadata.xml b/games-rpg/xu4/metadata.xml
deleted file mode 100644
index 4bc2f4a79c26..000000000000
--- a/games-rpg/xu4/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xu4</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/xu4/xu4-0.9-r1.ebuild b/games-rpg/xu4/xu4-0.9-r1.ebuild
deleted file mode 100644
index 69fd4ed87d0b..000000000000
--- a/games-rpg/xu4/xu4-0.9-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A remake of the computer game Ultima IV"
-HOMEPAGE="http://xu4.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xu4/${P}.tar.gz
-	mirror://sourceforge/xu4/ultima4-1.01.zip
-	mirror://sourceforge/xu4/u4upgrad.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[timidity]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/u4
-
-src_unpack() {
-	# xu4 will read the data files right out of the zip files
-	# but we want the docs from the original.
-	unpack ${P}.tar.gz
-	cp "${DISTDIR}"/{ultima4-1.01.zip,u4upgrad.zip} . || die
-	cd "${WORKDIR}" || die
-	mv ultima4-1.01.zip ultima4.zip || die
-	mkdir u4-dos || die
-	cd u4-dos || die
-	unzip -q ../ultima4.zip || die
-}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-	"${FILESDIR}/${PV}-savegame.patch"
-	"${FILESDIR}/${P}-warnings.patch"
-	"${FILESDIR}/${P}-zip.patch"
-)
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/lib/u4:/usr/$(get_libdir)/u4:" src/u4file.c \
-		|| die
-	sed -i \
-		-e 's:-Wall:$(E_CFLAGS):' src/Makefile \
-		|| die
-}
-
-src_compile() {
-	emake -C src \
-		DEBUGCFLAGS= \
-		E_CFLAGS="${CFLAGS}" \
-		bindir="/usr/bin" \
-		datadir="/usr/share" \
-		libdir="/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake -C src \
-		DEBUGCFLAGS= \
-		E_CFLAGS="${CFLAGS}" \
-		bindir="${D}/usr/bin" \
-		datadir="${D}/usr/share" \
-		libdir="${D}/usr/$(get_libdir)" \
-		install
-	dodoc AUTHORS README doc/*txt "${WORKDIR}/u4-dos/ULTIMA4/"*TXT
-	insinto "/usr/$(get_libdir)/u4"
-	doins "${WORKDIR}/"*zip
-}
diff --git a/games-rpg/zsdx-1.9.0-r1 b/games-rpg/zsdx-1.9.0-r1
new file mode 100644
index 000000000000..5da5740f6c4d
--- /dev/null
+++ b/games-rpg/zsdx-1.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-arch/zip sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A free 2D Zelda fangame
+EAPI=6
+HOMEPAGE=http://www.solarus-games.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved CC-BY-SA-3.0 GPL-3
+RDEPEND=>=games-engines/solarus-1.3.0 <games-engines/solarus-1.4.0
+RESTRICT=mirror
+SLOT=0
+SRC_URI=http://www.zelda-solarus.com/downloads/zsdx/zsdx-1.9.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d1b2186d0dfb0437248eb489ef2ee36
diff --git a/games-rpg/zsdx/Manifest b/games-rpg/zsdx/Manifest
deleted file mode 100644
index e486a3865c69..000000000000
--- a/games-rpg/zsdx/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zsdx-1.9.0.tar.gz 20757184 BLAKE2B 392aa36cfddaa82367cd3aa6769ffeb95f5e7235b5574d2793af629f289da107a67b70bfc2ad7d86651d2145a3f956bc000102919ca65ee18a1d83eac282d119 SHA512 2fc540d19856734050674945dd4903f254b325cab08ae0199722ae014447523ad9e979b54ddfd59d5cbc290b783481c79d5e155115c90f24feab5587d52804ee
-EBUILD zsdx-1.9.0-r1.ebuild 1130 BLAKE2B 24034d6b972196710ca4d9921c941bc661e0c05ece6dc5680e181ef884d225c1c1694843131c9c2cd2c0ebc792052d2e4dcb96d828fca5d6296ceff3427a5115 SHA512 29d003036632b3ac85d49db00ba01667ec31e20400d99bb49a67c6bb0743edf9ccac64972556b0b492ce064216d6e47d64b9f3b68948a39d3c1fcbb21ad62735
-MISC metadata.xml 333 BLAKE2B 34c8b3d3b3ef4c78241d40bd05613959e3d541561f6973c47c57489b0eea0e84ef21909fcb21102bdb4b5eaf0b8051c075a9649fe0975ead3c4cd1ff4c1471f7 SHA512 8135204b08f68188a8dc178b3083600e01a860b043cbc26415a111f6b23030cc067754dff74d77ac476e757caece3d44688f12126e81c17eaff74e4840f59ec9
diff --git a/games-rpg/zsdx/metadata.xml b/games-rpg/zsdx/metadata.xml
deleted file mode 100644
index 733429dcbd22..000000000000
--- a/games-rpg/zsdx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">christopho/zsdx</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild b/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
deleted file mode 100644
index dc00fda49542..000000000000
--- a/games-rpg/zsdx/zsdx-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils eutils gnome2-utils
-
-DESCRIPTION="A free 2D Zelda fangame"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror"
-
-RDEPEND="
-	>=games-engines/solarus-1.3.0
-	<games-engines/solarus-1.4.0
-"
-DEPEND="app-arch/zip"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
-		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
-	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
-
-	# install proper wrapper script
-	rm -f "${ED}"/usr/bin/${PN}
-	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\""
-
-	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus DX"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/zsxd-1.9.0-r1 b/games-rpg/zsxd-1.9.0-r1
new file mode 100644
index 000000000000..d95170de04e3
--- /dev/null
+++ b/games-rpg/zsxd-1.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=app-arch/zip >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A free 2D Zelda fangame parody
+EAPI=6
+HOMEPAGE=http://www.solarus-games.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved CC-BY-SA-3.0 GPL-3
+RDEPEND=>=games-engines/solarus-1.3.1-r1 <games-engines/solarus-1.4.0
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.zelda-solarus.com/downloads/zsxd/zsxd-1.9.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cabde41eadc75aa46f1e664920268d31
diff --git a/games-rpg/zsxd/Manifest b/games-rpg/zsxd/Manifest
deleted file mode 100644
index b730b625bc28..000000000000
--- a/games-rpg/zsxd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zsxd-1.9.0.tar.gz 3706125 BLAKE2B 3d83fff945bfecc387b79126628e3d1f45a461ae7b58b702dbe0c0f1799d6b57c53ecd4b1bfeb7a9ccebd279a3b299da8c328a2aca3126bea09f4865e1bfea1e SHA512 cecb8b4ff40b7129bb516cf71e9bbbc92e10ace944c735eb2885dbf0e0b8adef80491c1874ee91efb2c9779b819d0217639fe85f9e3a085c980af6a2972e571e
-EBUILD zsxd-1.9.0-r1.ebuild 1221 BLAKE2B 522806ed5eeb62fb95c5f59b79ef96f5995b4b877398bd1da3c80bcc7a65b29ca8f6c4ca3c6b17a7f24663d97f5c202e6b75715933a2546084307abe34767a21 SHA512 8ad18d02ef616549686d705f085f3d2145f37c03330e01e5021a6b4df6e57e1bf62cf815c1652429318d0adc1b1eef408e27335a66fb9acf35799682f9ae4f1f
-MISC metadata.xml 333 BLAKE2B 81d8a164a8319a24109c072f73e7959380cee2aef798b0ccceb6100825abfe51a6267f1e4f44da5c5ad4ec8881a36e09ac0a38187d936924e0ee85ebe59ee274 SHA512 bb078fd150a98e9326870e54347db0f9962d1f00707d7dcae5814808946e1ca673c45073d9bf886d6cb1d456e3ece9a236c6bb1b8448c3b9d9ef583acdf731f4
diff --git a/games-rpg/zsxd/metadata.xml b/games-rpg/zsxd/metadata.xml
deleted file mode 100644
index 742803c605cd..000000000000
--- a/games-rpg/zsxd/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">christopho/zsxd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild b/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
deleted file mode 100644
index 76a8fc0fe7f1..000000000000
--- a/games-rpg/zsxd/zsxd-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils cmake-utils
-
-DESCRIPTION="A free 2D Zelda fangame parody"
-HOMEPAGE="http://www.solarus-games.org/"
-SRC_URI="http://www.zelda-solarus.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="all-rights-reserved CC-BY-SA-3.0 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND=">=games-engines/solarus-1.3.1-r1
-	<games-engines/solarus-1.4.0"
-DEPEND="app-arch/zip"
-
-DOCS=( ChangeLog readme.txt )
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSOLARUS_INSTALL_DATAROOTDIR="/usr/share"
-		-DSOLARUS_INSTALL_BINDIR="/usr/bin"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-	newicon -s 48 build/icons/${PN}_icon_48.png ${PN}.png
-	newicon -s 256 build/icons/${PN}_icon_256.png ${PN}.png
-
-	# install proper wrapper script
-	rm -f "${ED%/}/usr/bin/${PN}
-	make_wrapper ${PN} "solarus \"/usr/share/solarus/${PN}\"
-
-	make_desktop_entry "${PN}" "Zelda: Mystery of Solarus XD"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 2414af966efd..e39d67bb0e02 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bf1942-lnxded-1.61-r1 b/games-server/bf1942-lnxded-1.61-r1
new file mode 100644
index 000000000000..acc87e15b5a3
--- /dev/null
+++ b/games-server/bf1942-lnxded-1.61-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=dedicated server for Battlefield 1942
+EAPI=6
+HOMEPAGE=http://www.battlefield.com/battlefield-1942
+KEYWORDS=~x86
+LICENSE=bf1942-lnxded
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=http://ftp.games.skynet.be/pub/misc/bf1942_lnxded-1.6-rc2.run http://ftp.games.skynet.be/pub/misc/bf1942-update-1.61.tar.gz
+_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_=1bce5670f9811ab9f9fdffd0e3901ec3
diff --git a/games-server/bf1942-lnxded/Manifest b/games-server/bf1942-lnxded/Manifest
deleted file mode 100644
index 5e6c56b6e62c..000000000000
--- a/games-server/bf1942-lnxded/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bf1942-update-1.61.tar.gz 7768635 BLAKE2B 14427516f4c1d0ce8777f51cd09cef8392a255f5695043e67d961c54a8161bccd4f0b24719bc80f46f725e98efa6e708b3556371a4f0c3499c4e13149ea09d59 SHA512 041c1ad03daab592b799dec1560e15156e1da583919aa270220d53d308b5c1b8e7da771176eea6e3e1558407dbad37388d480199847c68ecf94b58f29d64a26b
-DIST bf1942_lnxded-1.6-rc2.run 108138508 BLAKE2B b59bad9c2ae15ea30974de376f8809dd43cfa6f7a01aa81c7a3b603d8c6308ff022ff7af3cf15d5825e9959d09e750d38b6bdd767ffd062cfc880d4942be1570 SHA512 9171eb8f729bd36fc76133563201332d91e434aa6a54813eb0ec5278f04e7132d4e5b74c92d69ad1e542c37a586aae6ee8d12b2e92d5a853d2682de530ad1db1
-EBUILD bf1942-lnxded-1.61-r1.ebuild 947 BLAKE2B d1d1b0c4c23eccebd7e63e7126b86aaae96f6e44a16e6928b111a86ea36f1ab31c32117b3ea0c016f62d00cd1424e7147437d612f476cab7598449d75f118918 SHA512 b0c2ef2b8854c5118588e3ce765bdde6b3a697bf3c428c6a034835d9138043aba106c0ee943828412333524955ab378a69ca883b2ad308acd4a451a08a6930bf
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/bf1942-lnxded/bf1942-lnxded-1.61-r1.ebuild b/games-server/bf1942-lnxded/bf1942-lnxded-1.61-r1.ebuild
deleted file mode 100644
index 3d83028ae7d5..000000000000
--- a/games-server/bf1942-lnxded/bf1942-lnxded-1.61-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-DESCRIPTION="dedicated server for Battlefield 1942"
-HOMEPAGE="http://www.battlefield.com/battlefield-1942"
-SRC_URI="http://ftp.games.skynet.be/pub/misc/${PN/-/_}-1.6-rc2.run
-	http://ftp.games.skynet.be/pub/misc/bf1942-update-${PV}.tar.gz"
-
-LICENSE="bf1942-lnxded"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-S=${WORKDIR}
-
-dir="/opt/bf1942"
-Ddir="${D}/${dir}"
-
-QA_PREBUILT="${dir}/*.so ${dir}/bf1942_lnxded.*"
-
-src_unpack() {
-	mkdir bf1942 || die
-	pushd bf1942 || die
-	unpack_makeself ${PN/-/_}-1.6-rc2.run
-	popd || die
-	unpack bf1942-update-${PV}.tar.gz
-}
-
-src_install() {
-	dodir "${dir}"
-	mv -f "${S}"/bf1942/* "${S}" || die
-	rm -rf "${S}"/bf1942 || die
-
-	mv "${S}"/* "${Ddir}" || die
-	dosym bf1942_lnxded.dynamic "${dir}"/bf1942_lnxded
-	make_wrapper ${PN} ./bf1942_lnxded "${dir}"
-}
diff --git a/games-server/bf1942-lnxded/metadata.xml b/games-server/bf1942-lnxded/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-server/bf1942-lnxded/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-server/crossfire-server-1.71.0-r1 b/games-server/crossfire-server-1.71.0-r1
new file mode 100644
index 000000000000..9584e4e3377b
--- /dev/null
+++ b/games-server/crossfire-server-1.71.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0= )
+DESCRIPTION=Server for the crossfire clients
+EAPI=6
+HOMEPAGE=http://crossfire.real-time.com/
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-misc/curl X? ( x11-libs/libXaw media-libs/libpng:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.maps.tar.bz2 mirror://sourceforge/crossfire/crossfire-server/1.71.0/crossfire-1.71.0.arch.tar.bz2
+_md5_=e4b5af9428a46b8df5740eb3ca1df58c
diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest
deleted file mode 100644
index 64faf9f2c84f..000000000000
--- a/games-server/crossfire-server/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX crossfire-server-1.71.0-format.patch 1115 BLAKE2B 7bce8fa52889ec1f1ca636c48995ac5110f5fc62965b0e7a8db01f37df8f6339756b290028425fbbe3e93b559126e8571d619ffe55f119007b3416abe5ae71eb SHA512 3d1cf04cc787177776f8f65afbe585ebe5982687313219a6cc64797bf4a992c1b6077ad2ad75b1f7c3372041c9cb0eaadbebee3fb27a25ff5664a8adb48e986f
-DIST crossfire-1.71.0.arch.tar.bz2 3462161 BLAKE2B 4f2c7e9619ceca3aafea03a681e59c04e31c954c91b94e4065a6446d537c6f039fe58c04f50fd5eddb8290b9cb93533772c6c7963b526c537bf297f469ad5bb5 SHA512 f9707dc5dab24d0ba74654c6433e016a58ab4e99da5dade6614491eca00736965bb7fd9a24db4188c3409a0479a88bb0ea55282e519ffcbabf23d82e6a5b975e
-DIST crossfire-1.71.0.maps.tar.bz2 19463076 BLAKE2B a6b1935985d82b53ef1dfd76b91e8d9417f03dceeddbc69154799703597d14d3ffb3dba8cec809345b62e99294ed3adec66cb2c9fae52fface96db8ba75daa7d SHA512 c3940b0a48f1badc14eb81610cfcd4241d140b666b5cb123845dca6ad742a18977ad7ada1d75d738f15f44374896c4dd6047989122257d7cd87362a3af0f97e8
-DIST crossfire-1.71.0.tar.bz2 6712638 BLAKE2B 91957fab3f19e52839eadfcb015a2fd8dfc551230fa55dd00254f39608ffbb8648227f3d2a244a609538ee2e426675e6b58dac73cf565554611ccb40d2839873 SHA512 d867f3393cb18ed78158c9a724d386dd642f0193ace86fef592e7bdc80885b7f7ce3c37be34b77d73b31c939d41e533029f2e7dea405c00d7a67aa3baebd146d
-EBUILD crossfire-server-1.71.0-r1.ebuild 1106 BLAKE2B f6578eae5e58dfe4bec3c20545d4e54ecc5900c8e4a3193f0c0bca83dacb4ede455747e412837c7b204f42d4f83c4e0fc4f8f88a338c3da2edec0ee8c5f716b6 SHA512 2bb94adc5f86a6f38f41b6907855a24e22886befde4f4dd07c4aeb0ae495acc8c928ef8adb3fee3f6f2eae56b763ad58b6bd5430701da62ca507a3fe42e8679b
-MISC metadata.xml 332 BLAKE2B b2b20adc6daa1c491850292a929df2b67738519b81cbab2cd2c2d278176daf4e895a10bc712213abcb41714f27bb0c9e2b1731f970b7381cbf9ffefe6c393666 SHA512 cf046be69b614cd43deba574e8fbd23b566507c694b9f7cbda92d7009d727ac4087de411bf63463561beb3160ecfe7f9fb685574b018466b473535184529ccf7
diff --git a/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild b/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild
deleted file mode 100644
index 3012afe88c9b..000000000000
--- a/games-server/crossfire-server/crossfire-server-1.71.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/-server/}"
-DESCRIPTION="Server for the crossfire clients"
-HOMEPAGE="http://crossfire.real-time.com/"
-SRC_URI="mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.tar.bz2
-	mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.maps.tar.bz2
-	mirror://sourceforge/crossfire/${PN}/${PV}/${MY_P}.arch.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-RESTRICT="test"
-
-RDEPEND="
-	net-misc/curl
-	X? (
-		x11-libs/libXaw
-		media-libs/libpng:0=
-	)
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	rm -f "${WORKDIR}"/maps/Info/combine.pl # bug #236205
-	ln -s "${WORKDIR}/arch" "${S}/lib" || die
-	eapply "${FILESDIR}"/${P}-format.patch
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_compile() {
-	# work around the collect.pl locking
-	emake -j1 -C lib
-	emake
-}
-
-src_install() {
-	default
-	keepdir /var/lib/crossfire/{account,datafiles,maps,players,template-maps,unique-items}
-	insinto /usr/share/crossfire
-	doins -r "${WORKDIR}/maps"
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch b/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch
deleted file mode 100644
index afed04da57f4..000000000000
--- a/games-server/crossfire-server/files/crossfire-server-1.71.0-format.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/server/c_chat.c.old	2015-12-15 21:35:30.024866220 +0100
-+++ b/server/c_chat.c	2015-12-15 21:36:58.479266312 +0100
-@@ -483,7 +483,7 @@
-     { "You spit over your left shoulder.", "%s spits over his left shoulder." },
-     { "Strut your stuff.", "%s struts proudly." },
-     { NULL, NULL },
--    { "%s patiently twiddles his thumbs.", "You patiently twiddle your thumbs." },
-+    { "You patiently twiddle your thumbs.", "%s patiently twiddles his thumbs." },
-     { "You wave.", "%s waves happily." },
-     { "You whistle appreciatively.", "%s whistles appreciatively." },
-     { "Have you got something in your eye?", "%s winks suggestively." },
-@@ -645,7 +645,7 @@
- 
-     if (*params == '\0') {
-         if (emotion > EMOTE_FIRST && emotion < EMOTE_LAST && single_emotes[emotion - 1][0] != NULL) {
--            snprintf(buf, sizeof(buf), single_emotes[emotion - 1][0]);
-+            snprintf(buf, sizeof(buf), "%s", single_emotes[emotion - 1][0]);
-             snprintf(buf2, sizeof(buf2), single_emotes[emotion - 1][1], op->name);
-         } else {
-             snprintf(buf, sizeof(buf), "You are a nut.");
diff --git a/games-server/crossfire-server/metadata.xml b/games-server/crossfire-server/metadata.xml
deleted file mode 100644
index baf8c3afc277..000000000000
--- a/games-server/crossfire-server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">crossfire</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-server/etqw-ded-1.5-r1 b/games-server/etqw-ded-1.5-r1
new file mode 100644
index 000000000000..5335f2c61d7a
--- /dev/null
+++ b/games-server/etqw-ded-1.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Enemy Territory: Quake Wars dedicated server
+EAPI=6
+HOMEPAGE=https://www.splashdamage.com/content/et-quake-wars-standalone-server-linux
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=ETQW
+RDEPEND=sys-libs/glibc
+RESTRICT=fetch strip
+SLOT=0
+SRC_URI=ETQW-server-1.5-full.x86.run
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=807e11c9862e2ddd21dc0c1171540ef9
diff --git a/games-server/etqw-ded/Manifest b/games-server/etqw-ded/Manifest
deleted file mode 100644
index c880d448a81e..000000000000
--- a/games-server/etqw-ded/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ETQW-server-1.5-full.x86.run 452679053 BLAKE2B 01721b7a288671873a87164e438cb4bf3483f86fe282fc0a306043bb44e18bf126736e57f6ee5ec0880057b7f53119e1b2f6c9ddd625f9083a01f3e12c613bef SHA512 8daa5f192330be09b476d9633af79085f8b45d64e99fb50f6dc2ded085171f3d310218308b813bc7fc9a56b5fb34d52d72248a1e926a0e499ce096690407b0cd
-EBUILD etqw-ded-1.5-r1.ebuild 908 BLAKE2B b7bfcc57a72ed9c1fb1937ab71fea699990f237a5b93a41f14baf12a313811e78d8cf479d104540993cf6b3deededcf1e21f2b87116798fe98cd5a040d7d77d7 SHA512 bbdb0fe8518e1caea50c0dca89a8aa24962fa8bfc28a937434ea3327b26b7c810a28174912124c2ef67e771808dda6b92d22164296b1b0451704b8c16043fe38
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild b/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
deleted file mode 100644
index 6c08c5bc17c2..000000000000
--- a/games-server/etqw-ded/etqw-ded-1.5-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Enemy Territory: Quake Wars dedicated server"
-HOMEPAGE="https://www.splashdamage.com/content/et-quake-wars-standalone-server-linux"
-SRC_URI="ETQW-server-${PV}-full.x86.run"
-
-LICENSE="ETQW"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="fetch strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/glibc"
-
-S=${WORKDIR}/data
-dir=/opt/${PN}
-
-QA_PREBUILT="${dir:1}/pb/*.so
-	${dir:1}/*.x86
-	${dir:1}/*.so*"
-
-pkg_nofetch() {
-	einfo "Please download ${A} from ${HOMEPAGE} and copy it to ${DISTDIR}"
-}
-
-src_unpack() {
-	tail -c +194885 "${DISTDIR}"/${A} > ${A}.zip || die
-	unpack ./${A}.zip
-	rm -f ${A}.zip || die
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r base pb *.txt
-	exeinto "${dir}"
-	doexe etqwded.x86 *.so*
-	make_wrapper ${PN} ./etqwded.x86 "${dir}" "${dir}"
-}
diff --git a/games-server/etqw-ded/metadata.xml b/games-server/etqw-ded/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-server/etqw-ded/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-server/mednafen-server-0.5.2-r1 b/games-server/mednafen-server-0.5.2-r1
new file mode 100644
index 000000000000..eb52488e0165
--- /dev/null
+++ b/games-server/mednafen-server-0.5.2-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Server for Mednafen emulator
+EAPI=6
+HOMEPAGE=http://mednafen.fobby.net/releases/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://mednafen.fobby.net/releases/files/mednafen-server-0.5.2.tar.gz
+_md5_=2fde62915ef59ddab55484dce9a1cb67
diff --git a/games-server/mednafen-server/Manifest b/games-server/mednafen-server/Manifest
deleted file mode 100644
index fb1eecc30b0a..000000000000
--- a/games-server/mednafen-server/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mednafen-server-0.5.2.tar.gz 149237 BLAKE2B e3143c68fcf9b3f1e110be776354d5b806add52cf0f486f2ec7e753fc4c7805cf893e48e945f410c75d02e06061abb5ffaccc0a360bdaf36daae09977616ec2f SHA512 7ca094c7123e147bfaaedc254958fa664b7d71b141f8409b251bb646e04a7a6a5bc7f01ecac049b3895334a09a02e7449ac90e6db1d469322dba44f7281edf15
-EBUILD mednafen-server-0.5.2-r1.ebuild 647 BLAKE2B b7cc9e2ada9afc52859a02976e1226525b9db1fdc7082ca12a4281fbeba7aeed7a075563257211d1cf75f62d12824ca5359b57e6088c27fdcc15f154817160a8 SHA512 20e5dc6ebfa90f1aa50d9b70247e6558c5061195a1f42c9e5ed971c4fd285c190ed22379bd45c7ac05d15a7c40acd12adc277594ca183ca527c867d5b0828818
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-server/mednafen-server/mednafen-server-0.5.2-r1.ebuild b/games-server/mednafen-server/mednafen-server-0.5.2-r1.ebuild
deleted file mode 100644
index 5e29146befce..000000000000
--- a/games-server/mednafen-server/mednafen-server-0.5.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Server for Mednafen emulator"
-HOMEPAGE="http://mednafen.fobby.net/releases/"
-SRC_URI="http://mednafen.fobby.net/releases/files/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	default
-
-	mv standard.conf standard.conf.example || die
-	mv run.sh run.sh.example || die
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc README *.example
-}
-
-pkg_postinst() {
-	einfo "Example config file and run file can be found in"
-	einfo "/usr/share/doc/${PF}/"
-}
diff --git a/games-server/mednafen-server/metadata.xml b/games-server/mednafen-server/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-server/mednafen-server/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-server/metadata.xml b/games-server/metadata.xml
deleted file mode 100644
index 65ad0509b916..000000000000
--- a/games-server/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-server category contains game servers.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-server enthält Spieleserver.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-server contiene servidores de juegos.
-	</longdescription>
-	<longdescription lang="ja">
-		games-serverカテゴリーにはゲーム・サーバーが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-server categorie bevat spelservers.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-server chứa các game server.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-server contiene server per i giochi multigiocatore.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-server contém servidores de jogos.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-server zawiera serwery gier.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-server/minecraft-server-1.12.2 b/games-server/minecraft-server-1.12.2
new file mode 100644
index 000000000000..90036a3f960d
--- /dev/null
+++ b/games-server/minecraft-server-1.12.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst setup unpack
+DESCRIPTION=The official server for the sandbox video game Minecraft
+EAPI=6
+HOMEPAGE=https://www.minecraft.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=Mojang
+RDEPEND=app-misc/screen virtual/jre
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://s3.amazonaws.com/Minecraft.Download/versions/1.12.2/minecraft_server.1.12.2.jar -> minecraft-server-1.12.2.jar
+_eclasses_=user	8bc2845510e2109af75e3eeac607ec81
+_md5_=04a52257e0588b2d98e9d66ad2f76e10
diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
deleted file mode 100644
index 518f357e2ab2..000000000000
--- a/games-server/minecraft-server/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX minecraft-server.confd 318 BLAKE2B c4ae9a7e68e0db71f9cf648aeab10030264a544927f697d005016662a402bd1d64ea02779eb6b645c16845cec6b22842cf08c51734d608f90eb0d45f6c786a67 SHA512 bad9df2874a862f28a2a34f70509c34086ab5d63e6bfda79905f4058a029141ada592dc435d9773b6aa6332447c875675d68e7152ddf18b55a6157b81ed82f95
-AUX minecraft-server.initd 1421 BLAKE2B a59a6ab1270fb8110ec0ede580a52373626ffa2c42a75f63dc7508fc07b6f4e05ee85d04777d3f1a04a23229632f4de088164121bc351d7a38ea076b7e463e28 SHA512 6ef9df7d33cebb60981fc4fb4cbf1c4d737f3d957902effd02f8a278a6d4cedddd38fd89ecec0ac3ff5e25f236fcf484715fe3583d0f8865a83a1ae673775aee
-DIST minecraft-server-1.12.2.jar 30222121 BLAKE2B 91733822789405dbec5d335fc67e47d3278138929280c4fdcf6053fb0824651474c8e2310c342862fc1aefdf74f55d0a21d78b3c34f32484ec8196b7c5921d72 SHA512 327196bfb833160ae6fb7d12b7d372d031bc0ffbac3455481c1635b01e00f0d5502d4698fbc4f8e7ee59cc3902d56c41261c45d1f1c8f3972e192631f504a0fc
-EBUILD minecraft-server-1.12.2.ebuild 1865 BLAKE2B 5392b409ac7db38a997d5c4218f1de34120215b9732bec6aad610029ac548ffae220d328c98319911d6d89b173daa5296e841499015a94e417fb6baa5e6f462a SHA512 686219de7fecbf02b4f2d4957d5dc048d05aefe4f7ef1aec303896e9184ff1f1c6e4177194436a06a701bd7858816a33855501ec74939d9765f5dad705e8bb5d
-MISC metadata.xml 614 BLAKE2B 78e166781dd7310c6e8a148ba0bc1e36c8e6a21a64587d65b5239f43e7dda4b494b77b254b420e3c1317390debad03ec35847eadbf345aec3c0ba1a6d759f546 SHA512 0deb2afc6cfcfc57351b210f21506ffb5dca43e51aeda268a92781640d8940ce71024ed71a8de249b4ac135da92fd5e741bd8be5e5c00cf0d4b26100b838ac10
diff --git a/games-server/minecraft-server/files/minecraft-server.confd b/games-server/minecraft-server/files/minecraft-server.confd
deleted file mode 100644
index 700498e5aead..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Java options for your started server
-# You should at least define some memory settings (-Xms, -Xmx),
-# for maximum memory, as the java default is far to low for Minecraft
-MINECRAFT_OPTS="-Xms1024m -Xmx1024m"
diff --git a/games-server/minecraft-server/files/minecraft-server.initd b/games-server/minecraft-server/files/minecraft-server.initd
deleted file mode 100644
index 630c88871d76..000000000000
--- a/games-server/minecraft-server/files/minecraft-server.initd
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "minecraft-server" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#minecraft-server.}"
-fi
-
-java="${JAVA_HOME-/usr}"/bin/java
-minecraft_jar="/usr/share/games/minecraft-server/minecraft-server.jar"
-minecraft_logs="/var/log/minecraft-server"
-minecraft_path="/var/lib/minecraft-server/${instance}"
-name="Minecraft Server (World: ${instance})"
-pidfile="/run/minecraft-server.${instance}.pid"
-screen_name="minecraft-server.${instance}"
-start_stop_daemon_args="--chdir ${minecraft_path}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${java} ${MINECRAFT_OPTS} -jar ${minecraft_jar}"
-command_background="true"
-command_group="minecraft"
-command_user="minecraft"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_path}"
-
-	checkpath -f -o "${command_user}:${command_group}" -q "${minecraft_path}"/eula.txt
-	echo "eula=true" > "${minecraft_path}"/eula.txt
-
-	checkpath -d -o "${command_user}:${command_group}" -q "${minecraft_logs}"/"${instance}"
-
-	if [ ! -L "${minecraft_path}"/logs ]; then
-		cd "$minecraft_path}" && ln -s ../../../log/minecraft-server/"${instance}" logs
-	fi
-
-	if [ -z ${MINECRAFT_OPTS} ]; then
-		eerror "You must define MINECRAFT_OPTS in /etc/conf.d/minecraft.${SVCNAME}!"
-		return 1
-	fi
-
-	return 0
-}
diff --git a/games-server/minecraft-server/metadata.xml b/games-server/minecraft-server/metadata.xml
deleted file mode 100644
index 45b32f4be812..000000000000
--- a/games-server/minecraft-server/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		Minecraft is a sandbox video game created and designed
-		by Swedish game designer Markus "Notch" Persson,
-		and later fully developed and published by Mojang.
-		This is the headless server for Minecraft.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild b/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
deleted file mode 100644
index 5b0f749a4556..000000000000
--- a/games-server/minecraft-server/minecraft-server-1.12.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user
-
-DESCRIPTION="The official server for the sandbox video game Minecraft"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://s3.amazonaws.com/Minecraft.Download/versions/${PV}/minecraft_server.${PV}.jar -> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-misc/screen
-	virtual/jre"
-
-RESTRICT="bindist mirror strip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	enewgroup minecraft
-	enewuser minecraft -1 -1 /var/lib/minecraft-server minecraft
-}
-
-src_unpack() {
-	# Don't unpack that jar, just copy it to WORKDIR
-	cp "${DISTDIR}"/${A} "${WORKDIR}" || die
-}
-
-src_install() {
-	insinto /usr/share/games/minecraft-server
-	insopts -o minecraft -g minecraft
-	newins minecraft-server-${PV}.jar minecraft-server.jar
-
-	newinitd "${FILESDIR}"/minecraft-server.initd minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd minecraft-server
-
-	diropts -o minecraft -g minecraft
-	keepdir /var/lib/minecraft-server
-	keepdir /var/log/minecraft-server
-}
-
-pkg_postinst() {
-	elog "This package provides an init script and a conf file."
-	elog "You don't have to modify those files directly,"
-	elog "but instead you can make a symlink of that init script"
-	elog "and a copy of that conf file."
-	elog "You would do this for every server, you want to setup."
-	elog ""
-	elog "For example, you wan't to setup an world called 'gentoo',"
-	elog "you would do:"
-	elog ""
-	elog "cd /etc/init.d"
-	elog "ln -s minecraft-server minecraft-server.gentoo"
-	elog ""
-	elog "cd /etc/conf.d"
-	elog "cp minecraft-server minecraft-server.gentoo"
-	elog ""
-	elog "After that, make your settings in"
-	elog "/etc/conf.d/minecraft-server.gentoo."
-	elog ""
-	elog "If you don't make a symlink, but use the default scripts,"
-	elog "your world will be called 'main'"
-}
diff --git a/games-server/monopd-0.10.2-r1 b/games-server/monopd-0.10.2-r1
new file mode 100644
index 000000000000..f88896d18660
--- /dev/null
+++ b/games-server/monopd-0.10.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=systemd? ( sys-apps/systemd ) >=dev-cpp/muParser-2 dev-libs/utfcpp >=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 virtual/pkgconfig
+DESCRIPTION=server for atlantik games
+EAPI=6
+HOMEPAGE=http://gtkatlantic.gradator.net/
+IUSE=systemd
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/gtkatlantic/monopd/monopd-0.10.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d5cc60ef3baa2a58ce0ab3f243e1a803
diff --git a/games-server/monopd/Manifest b/games-server/monopd/Manifest
deleted file mode 100644
index e7f9cdedc1c4..000000000000
--- a/games-server/monopd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX monopd.in 391 BLAKE2B 8bf1681e070ef5240ced7cf15dae52ee2c690f93f9dd5c94ba4ae3390fe9b79c2084d83129d1add3e24ee05a81a54bd8de8315f170b448e48d8ade9d5c513805 SHA512 55b9fd625039b72032b4d0ea6769c2b5a2690ede1f5445e72900a4d423a2ea51c768cdc1f08f69577f7776f9638983d23a1e0f5afe20a174ccc2d44ef77271ab
-DIST monopd-0.10.2.tar.gz 180317 BLAKE2B a2955149963b63d4839cc65be464c8989f2816bccf8e122833cd5be8be9ded7789e72f59c5f3bb6e2c20d4565cb3553e64dfd2670b003fc5868c40da02948731 SHA512 f47d9623e110a98d9d32b522484944998fb6e7e8644e1f2b439428a1e12b3b514b902e52e7135150135a3e3251aa38604434347d06533f3cf3ffb28a2a81ede3
-EBUILD monopd-0.10.2-r1.ebuild 902 BLAKE2B 3b9f048fe4b746d28729294015c427f376e72ab7ad8d8deb6e11c7acbdebced153d7659c04b84c01e20c08acec59ded82ff425096ce2c123ece9720e752c8a44 SHA512 db67b071b77926d6f9dece68fa2f0e83579d221dad71c4de843c6f272273c9e2e39a8d7300ac6cc1038d633d08f367fde589ccf0f0593cb19f47431a662db6b2
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/monopd/files/monopd.in b/games-server/monopd/files/monopd.in
deleted file mode 100644
index 9a0fbda55ffb..000000000000
--- a/games-server/monopd/files/monopd.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-    use net
-}
-
-start() {
-    ebegin "Starting monopd server"
-    start-stop-daemon --start -q -b --exec GENTOO_DIR/monopd
-    eend $?
-}
-
-stop() {
-    ebegin "Stopping monopd server"
-    start-stop-daemon --stop -q --exec GENTOO_DIR/monopd
-    eend $?
-}
diff --git a/games-server/monopd/metadata.xml b/games-server/monopd/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-server/monopd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-server/monopd/monopd-0.10.2-r1.ebuild b/games-server/monopd/monopd-0.10.2-r1.ebuild
deleted file mode 100644
index c0776e83d646..000000000000
--- a/games-server/monopd/monopd-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils systemd
-
-DESCRIPTION="server for atlantik games"
-HOMEPAGE="http://gtkatlantic.gradator.net/"
-SRC_URI="http://download.tuxfamily.org/gtkatlantic/monopd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd"
-
-RDEPEND="systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	>=dev-cpp/muParser-2
-	dev-libs/utfcpp"
-
-src_prepare() {
-	default
-
-	sed "s:GENTOO_DIR:\"/usr/bin\":" \
-		"${FILESDIR}"/monopd.in > "${T}"/monopd || die
-	sed -i \
-		-e "s:/usr/sbin:/usr/bin:" \
-		doc/systemd/monopd.service || die
-	sed -i \
-		-e '/C_SUBST(CXXFLAGS/s/CFLAGS/CXXFLAGS/' \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with systemd systemd-daemon)
-}
-
-src_install() {
-	default
-	doinitd "${T}"/monopd
-	systemd_dounit doc/systemd/monopd.s*
-}
diff --git a/games-server/mtavc-0.5-r1 b/games-server/mtavc-0.5-r1
new file mode 100644
index 000000000000..4329d9ad5d3a
--- /dev/null
+++ b/games-server/mtavc-0.5-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=dedicated server for GTA3 multiplayer
+EAPI=6
+HOMEPAGE=http://mtavc.com/
+KEYWORDS=-* ~x86
+LICENSE=MTA-0.5
+RDEPEND=virtual/libstdc++
+SLOT=0
+SRC_URI=http://files.gonnaplay.com/201/MTAServer0_5-linux.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_=1a92061454b06373acbdfff4584ca408
diff --git a/games-server/mtavc/Manifest b/games-server/mtavc/Manifest
deleted file mode 100644
index 95fb83d4ff6e..000000000000
--- a/games-server/mtavc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX mtavc 46 BLAKE2B 0f35cd14bac92c2f761a152b1f9b895de9ca4b8c86cca34c982e1cfd3d0d8205d4eefdd5e0c9a188311db207201f1b6db385ec3341b2146b36921d792dc7056a SHA512 e71aed1a05ade048665c9ffd4c272a8a9eb74a14b05ff95baa4ac61cd53d5d67d0c6dd7a1d0798cd89ff70cf12f7153e7dbf31e9f10df55e773f01313458430e
-DIST MTAServer0_5-linux.tar.gz 229056 BLAKE2B d46784a532046bfe28bb2110470ad8c07dc2c9d1f68366663bdce519f3214bcf74bf4975495a4013b8f9c104921a52a42fe7d6599bf6a012171a1d120e6678b1 SHA512 eed0ec109427c53c9627826f1977b4a2454be0130d445b2ff7288e3f93b93d76d21b22ffdb706d306009baffd37bd317f9573a9650477e25146ff5d3b49f9c1f
-EBUILD mtavc-0.5-r1.ebuild 900 BLAKE2B 5aee94a7d2298c23d46c54f094706424842e0a845ec59e758245a4c4541b14300d4f6f67b439e401b0bb40269b9ed9e72fdfa38bf8eda985bd1b49bc29469916 SHA512 71e78638954ffc8d0c2afe63a5ee43bca34f5325c24419aa886c281f7097844a5d8afcb246e460e0aed39c77059f59397315a706aebe0413bd7b8efaf4ed0e8f
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/mtavc/files/mtavc b/games-server/mtavc/files/mtavc
deleted file mode 100644
index 00b76f9d6f18..000000000000
--- a/games-server/mtavc/files/mtavc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd GENTOO_DIR
-exec ./MTAServer "$@"
diff --git a/games-server/mtavc/metadata.xml b/games-server/mtavc/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-server/mtavc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-server/mtavc/mtavc-0.5-r1.ebuild b/games-server/mtavc/mtavc-0.5-r1.ebuild
deleted file mode 100644
index 773e87124012..000000000000
--- a/games-server/mtavc/mtavc-0.5-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="dedicated server for GTA3 multiplayer"
-HOMEPAGE="http://mtavc.com/"
-SRC_URI="http://files.gonnaplay.com/201/MTAServer0_5-linux.tar.gz"
-
-LICENSE="MTA-0.5"
-SLOT="0"
-KEYWORDS="-* ~x86"
-IUSE=""
-
-RDEPEND="virtual/libstdc++"
-DEPEND=""
-
-S=${WORKDIR}
-
-QA_PREBUILT="/opt/${PN}/MTAServer"
-QA_EXECSTACK="/opt/${PN}/MTAServer"
-
-src_prepare() {
-	default
-
-	sed -i 's:NoName:Gentoo:' mtaserver.conf || die
-}
-
-src_install() {
-	local dir=/opt/${PN}
-	local files="banned.lst motd.txt mtaserver.conf"
-	local f
-
-	dobin "${FILESDIR}"/mtavc
-	sed -i -e "s:GENTOO_DIR:${dir}:" "${D}/usr/bin"/mtavc
-
-	exeinto "${dir}"
-	newexe MTAServer${PV} MTAServer
-	insinto /etc/${PN}
-	doins ${files}
-	dodoc README CHANGELOG
-	for f in ${files} ; do
-		dosym /etc/${PN}/${f} "${dir}"/${f}
-	done
-}
diff --git a/games-server/nwn-ded-1.69-r1 b/games-server/nwn-ded-1.69-r1
new file mode 100644
index 000000000000..38a459cd89d3
--- /dev/null
+++ b/games-server/nwn-ded-1.69-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Neverwinter Nights Dedicated server
+EAPI=6
+HOMEPAGE=http://nwn.bioware.com/downloads/standaloneserver.html
+IUSE=l10n_en
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=NWN-EULA
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer1.69.zip l10n_en? ( http://files.bioware.com/neverwinternights/dialog//english/NWNEnglish1.69dialog.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f59fdb65c6eb0bd6407a57c84a4b44c6
diff --git a/games-server/nwn-ded/Manifest b/games-server/nwn-ded/Manifest
deleted file mode 100644
index fc835790f181..000000000000
--- a/games-server/nwn-ded/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST NWNDedicatedServer1.69.zip 606293816 BLAKE2B f5e9f49bcaf76329310eee092328ef6cfc7d825409d66369ec18a8b2f881a6f6232a0a63d89d23f755165c1e13e6140575549875b55e80a0002f85b7af2b98ee SHA512 0f91ab8d03d040389d9ad7ccc7d50079057d62d542fecfb2164a726511718ba982f7b2f9878bc1143f2c61b3ef7ab8f92e5e4007b515ad6aff51216c5b602ffd
-DIST NWNEnglish1.69dialog.zip 3200987 BLAKE2B 8d0864ce22b39862a72291afca3e4ea8ff7ae35cee0dd38cb1424d7f767aeb4df82e4a6c53a1d59c2e670e3af05c8e6ff1984e6f1065d7e71f70ead97d0a369e SHA512 8c3214a3bcf137ea3b4b59d89055b7e22d15b8ab8d6007d81a9e70e156f8af611a8032ce5cf5c42ecd8c5af7eebe95f012a3f91723f273efa42701fd036482be
-EBUILD nwn-ded-1.69-r1.ebuild 1787 BLAKE2B cddcef0e76a4d35888cacc73e12ab2e20e1715752e8aaec3d792bde67c3543e73ca50fbb69e0290885383e079a52e5dd918388486541f77e64d05ab33929e915 SHA512 fffe02b765fef007cd04230fb6d6c218c351a904b8f332cc7522fcc5990a9f049ab13278df7cfaea4db2632a87bb3d618a5730bf5da39997069111b3e21245fc
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/nwn-ded/metadata.xml b/games-server/nwn-ded/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-server/nwn-ded/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild b/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild
deleted file mode 100644
index 21ee32df32f6..000000000000
--- a/games-server/nwn-ded/nwn-ded-1.69-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-LANGUAGES="l10n_en"
-DIALOG_URL_BASE=http://files.bioware.com/neverwinternights/dialog/
-
-DESCRIPTION="Neverwinter Nights Dedicated server"
-HOMEPAGE="http://nwn.bioware.com/downloads/standaloneserver.html"
-SRC_URI="http://files.bioware.com/neverwinternights/updates/windows/server/NWNDedicatedServer${PV}.zip
-	l10n_en? ( ${DIALOG_URL_BASE}/english/NWNEnglish${PV}dialog.zip )"
-
-LICENSE="NWN-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="${LANGUAGES}"
-RESTRICT="mirror strip"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-dir="/opt/${PN}"
-QA_PREBUILT="${dir:1}/common/nwserver"
-
-src_unpack() {
-	mkdir common || die
-	cd common || die
-	unpack NWNDedicatedServer${PV}.zip
-	tar -zxf linuxdedserver${PV/./}.tar.gz || die
-	rm -f *dedserver*.{tar.gz,sit,zip} *.exe *.dll || die
-	cd ..
-	local currentlocale=""
-	local a
-	for a in ${A}
-	do
-		if [ -z "${a/*dialog*/}" ] ; then
-			if [ -z "${a/*English*/}" ]; then currentlocale="en"; fi
-			if [ -z "${a/*French*/}" ]; then currentlocale="fr"; fi
-			if [ -z "${a/*German*/}" ]; then currentlocale="de"; fi
-			if [ -z "${a/*Italian*/}" ]; then currentlocale="it"; fi
-			if [ -z "${a/*Spanish*/}" ]; then currentlocale="es"; fi
-			if [ -z "${a/*Japanese*/}" ]; then currentlocale="ja"; fi
-			mkdir ${currentlocale} || die
-			cd ${currentlocale} || die
-			cp -rfl ../common/* . || die
-			unpack "${a}"
-			cd ..
-		fi
-	done
-}
-
-src_install() {
-	dodir ${dir}
-
-	local currentlocale
-	for currentlocale in * ; do
-		if [[ ${currentlocale} != "common" ]]
-		then
-			make_wrapper nwserver-${currentlocale} ./nwserver "${dir}/${currentlocale}" "${dir}/${currentlocale}"
-		fi
-	done
-
-	mv * "${D}/${dir}"/ || die
-
-	chmod -R g+w "${D}/${dir}"
-}
diff --git a/games-server/pvpgn-1.8.5-r1 b/games-server/pvpgn-1.8.5-r1
new file mode 100644
index 000000000000..45f38c423d9f
--- /dev/null
+++ b/games-server/pvpgn-1.8.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] )
+DESCRIPTION=A gaming server for Battle.Net compatible clients
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/pvpgn.berlios/
+IUSE=mysql postgres
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql[server] ) games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/pvpgn.berlios/pvpgn-1.8.5.tar.bz2 mirror://sourceforge/pvpgn.berlios/pvpgn-support-1.3.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_=05af2e401e2dbf0c109df93a0c2eabb9
diff --git a/games-server/pvpgn/Manifest b/games-server/pvpgn/Manifest
deleted file mode 100644
index e49946d2f576..000000000000
--- a/games-server/pvpgn/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pvpgn-1.8.5-fhs.patch 11549 BLAKE2B 7776e8df3d97238084664f6b3edca525445d7d4aafa3049897fbe2b4b069e768acbab9daf474f8ffcbd4e5375e2fcfca4b8bea0ec42ab62f557c08c708033933 SHA512 9842120682df08c34eada97712246b3c492be66e3e3bd10dfe744896f7c1c461da530ea90c819dff2de436017836bf4b107d46b0960d928e00004ab6381dbbd1
-AUX pvpgn.rc 885 BLAKE2B c0739177a13a2bddbe3cc82ad7bf87ff313faf0882159f7475c223ec76ef164ba572b048d05683bd02756d121e97efb04ec34fbd53ad856a54f6c23663fec6a3 SHA512 4b0a5d52e50bfde317ab3d9689aef6491b0dc8e3e94576c8ee7376c2118e3a315555a66b2aecb086914aec055011b7687eb1bdfea266423071098ac1151d0cdf
-DIST pvpgn-1.8.5.tar.bz2 982931 BLAKE2B 73c84278c5a7a13b781541f49a77af45d05950f0e378237ec0bfce3b4a55a94f91cfc2f994f56046e76c3dfb5d390427ee9cecbc21d1da048d2c503bfa21cf7b SHA512 7cbe141efe03efa4ce0fc1cc3b4e15afe2e85e3c83a27afdf36fec9e2dadf1c7b9aca1773e6a3e6566b62f5a7999cc040c9517786ca70eeb70f86eea84e9218e
-DIST pvpgn-support-1.3.tar.gz 123805 BLAKE2B dc051265c6d4c5a2ab69379f7ac4a57f402d25e8898020217f2ae5f12cb2ca4db860df47efe38ed6494eb040cbd52a7ed495bc3dab59c9e9e48a8e1386500d6e SHA512 9002fcdb7da92e84af97319b9f1e38f5cf97466aef88549b1fe81b9070643f321011adf674424e2c4acc22f847c7fc61ca2cbf2da0223842e9b9e6c8f1427d76
-EBUILD pvpgn-1.8.5-r1.ebuild 2505 BLAKE2B 05a0f7f8e3f9072c1ea4708b25311f861ffa30440cdf0e0cb1fe43a14668937c55d01409068f7f1f96c2822ad71612385c68da9ee8588da5acb6a2e0a5a651ba SHA512 8e8f4be487eccd49de8bc23d9b3d563ca4977377d6a643ffbbcb67812fb5b588333e248bcf291c92b59b384aa8f10f9e79bde2d636abbbd929a4b5475eb063d7
-MISC metadata.xml 336 BLAKE2B c11b3fef92305d55a4881dddeb386549100c4e7b74227b12a19f59c720fe502e4ff4e55681150d5b24471ed1a27230c2e8fe5162ffda30812f66195ae541c5f0 SHA512 5f28f8c449006d87effadc3d9e8dc234fede927b9487dc1efa5c9912913b23c752fb7e7589dc3f466cdd91894a5d5b7ca8d155460e73f0ac9280ddaf011412aa
diff --git a/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch b/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
deleted file mode 100644
index d1450b3ad178..000000000000
--- a/games-server/pvpgn/files/pvpgn-1.8.5-fhs.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-diff -ruN pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in pvpgn-1.8.0rc2/conf/bnetd.conf.in
---- pvpgn-1.8.0rc2.orig/conf/bnetd.conf.in	2005-09-19 08:17:50.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/bnetd.conf.in	2006-08-16 23:34:10.000000000 -0400
-@@ -50,22 +50,22 @@
- # - "prefix" : prefix to use for all pvpgn tables (default "")               #
- #                                                                            #
- # Examples:                                                                  #
--# storage_path = file:mode=plain;dir=/usr/local/var/users;clan=/usr/local/var/clans;team=/usr/local/var/teams;default=/usr/local/etc/bnetd_default_user.plain
--# storage_path = file:mode=cdb;dir=/usr/local/var/userscdb;clan=/usr/local/var/clans;team=/usr/local/var/teams;default=/usr/local/etc/bnetd_default_user.cdb
-+# storage_path = file:mode=plain;dir=%statedir%/users;clan=%statedir%/clans;team=%statedir%/teams;default=%confdir%/bnetd_default_user.plain
-+# storage_path = file:mode=cdb;dir=%statedir%/userscdb;clan=%statedir%/clans;team=%statedir%/teams;default=%confdir%/bnetd_default_user.cdb
- # storage_path = sql:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn_
- # storage_path = sql:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn_
--# storage_path = sql:mode=sqlite3;name=/usr/local/var/users.db;default=0;prefix=pvpgn_
-+# storage_path = sql:mode=sqlite3;name=%statedir%/users.db;default=0;prefix=pvpgn_
- # storage_path = sql:mode=odbc;name=PVPGN;prefix=pvpgn_
- #
- # WARNING!! you MUST change "DBlayoutfile" bellow configuration directive to 
- # sql_DB_layout2.conf to be able to use "sql2" !!!
- # storage_path = sql2:mode=mysql;host=127.0.0.1;name=PVPGN;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn2_
- # storage_path = sql2:mode=pgsql;host=127.0.0.1;name=pvpgn;user=pvpgn;pass=pvpgnrocks;default=0;prefix=pvpgn2_
--# storage_path = sql2:mode=sqlite3;name=/usr/local/var/users.db;default=0;prefix=pvpgn2_
-+# storage_path = sql2:mode=sqlite3;name=%statedir%/users.db;default=0;prefix=pvpgn2_
- # storage_path = sql2:mode=odbc;name=PVPGN;prefix=pvpgn2_
- #----------------------------------------------------------------------------#
- 
--storage_path = file:mode=plain;dir=/usr/local/var/users;clan=/usr/local/var/clans;team=/usr/local/var/teams;default=/usr/local/etc/bnetd_default_user.plain
-+storage_path = file:mode=plain;dir=%statedir%/users;clan=%statedir%/clans;team=%statedir%/teams;default=%confdir%/bnetd_default_user.plain
- 
- #                                                                            #
- ##############################################################################
-@@ -76,35 +76,35 @@
- # Use absolute paths in these lines to avoid problems!                       #
- #----------------------------------------------------------------------------#
- 
--filedir     = /usr/local/var/files
--reportdir   = /usr/local/var/reports
--chanlogdir  = /usr/local/var/chanlogs
--motdfile    = /usr/local/etc/bnmotd.txt
--issuefile   = /usr/local/etc/bnissue.txt
--channelfile = /usr/local/etc/channel.conf
--newsfile    = /usr/local/etc/news.txt
--adfile      = /usr/local/etc/ad.conf
--topicfile   = /usr/local/etc/topics.conf
--ipbanfile   = /usr/local/etc/bnban.conf
--helpfile    = /usr/local/etc/bnhelp.conf
--mpqfile     = /usr/local/etc/autoupdate.conf
--logfile     = /usr/local/var/bnetd.log
--realmfile   = /usr/local/etc/realm.conf
--maildir     = /usr/local/var/bnmail
--versioncheck_file = /usr/local/etc/versioncheck.conf
--mapsfile    = /usr/local/etc/bnmaps.conf
--xplevelfile = /usr/local/etc/bnxplevel.conf
--xpcalcfile  = /usr/local/etc/bnxpcalc.conf
--#pidfile    = /usr/local/var/bnetd.pid
--ladderdir   = /usr/local/var/ladders
--command_groups_file = /usr/local/etc/command_groups.conf
--tournament_file = /usr/local/etc/tournament.conf
--statusdir   = /usr/local/var/status
--aliasfile   = /usr/local/etc/bnalias.conf
--anongame_infos_file = /usr/local/etc/anongame_infos.conf
--DBlayoutfile = /usr/local/etc/sql_DB_layout.conf
--supportfile = /usr/local/etc/supportfile.conf
--transfile   = /usr/local/etc/address_translation.conf
-+filedir     = %datadir%
-+reportdir   = %statedir%/reports
-+chanlogdir  = %statedir%/chanlogs
-+motdfile    = %confdir%/bnmotd.txt
-+issuefile   = %confdir%/bnissue.txt
-+channelfile = %confdir%/channel.conf
-+newsfile    = %confdir%/news.txt
-+adfile      = %confdir%/ad.conf
-+topicfile   = %confdir%/topics.conf
-+ipbanfile   = %confdir%/bnban.conf
-+helpfile    = %confdir%/bnhelp.conf
-+mpqfile     = %confdir%/autoupdate.conf
-+logfile     = %logdir%/bnetd.log
-+realmfile   = %confdir%/realm.conf
-+maildir     = %statedir%/bnmail
-+versioncheck_file = %confdir%/versioncheck.conf
-+mapsfile    = %confdir%/bnmaps.conf
-+xplevelfile = %confdir%/bnxplevel.conf
-+xpcalcfile  = %confdir%/bnxpcalc.conf
-+#pidfile    = /var/run/bnetd/bnetd.pid
-+ladderdir   = %confdir%/ladders
-+command_groups_file = %confdir%/command_groups.conf
-+tournament_file = %confdir%/tournament.conf
-+statusdir   = %statedir%/status
-+aliasfile   = %confdir%/bnalias.conf
-+anongame_infos_file = %confdir%/anongame_infos.conf
-+DBlayoutfile = %confdir%/sql_DB_layout.conf
-+supportfile = %confdir%/supportfile.conf
-+transfile   = %confdir%/address_translation.conf
- 
- fortunecmd  = /usr/games/fortune
- 
-diff -ruN pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in pvpgn-1.8.0rc2/conf/d2cs.conf.in
---- pvpgn-1.8.0rc2.orig/conf/d2cs.conf.in	2005-09-29 01:37:33.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/d2cs.conf.in	2006-08-16 23:35:43.000000000 -0400
-@@ -86,16 +86,16 @@
- # Use absolute paths in these lines to avoid problems!				#
- #-------------------------------------------------------------------------------#
- #										#
--logfile			=	/usr/local/var/d2cs.log
--charsavedir		=	/usr/local/var/charsave
--charinfodir		=	/usr/local/var/charinfo
--bak_charsavedir		=	/usr/local/var/bak/charsave
--bak_charinfodir		=	/usr/local/var/bak/charinfo
--ladderdir		=	/usr/local/var/ladders
--newbiefile		=	/usr/local/var/files/newbie.save
--transfile		=	/usr/local/etc/address_translation.conf
--d2gsconffile		=	/usr/local/etc/d2server.ini
--#pidfile		=	/usr/local/var/d2cs.pid
-+logfile			=	%logdir%/d2cs.log
-+charsavedir		=	%statedir%/charsave
-+charinfodir		=	%statedir%/charinfo
-+bak_charsavedir		=	%statedir%/bak/charsave
-+bak_charinfodir		=	%statedir%/bak/charinfo
-+ladderdir		=	%statedir%/ladders
-+newbiefile		=	%statedir%/files/newbie.save
-+transfile		=	%confdir%/address_translation.conf
-+d2gsconffile		=	%confdir%/d2server.ini
-+#pidfile		=	/var/run/bnetd/d2cs.pid
- 
- #										#
- #################################################################################
-diff -ruN pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in pvpgn-1.8.0rc2/conf/d2dbs.conf.in
---- pvpgn-1.8.0rc2.orig/conf/d2dbs.conf.in	2005-08-24 23:58:18.000000000 -0400
-+++ pvpgn-1.8.0rc2/conf/d2dbs.conf.in	2006-08-16 23:36:58.000000000 -0400
-@@ -49,14 +49,14 @@
- # File and Path section								#
- # Use absolute paths in these lines to avoid problems!				#
- #-------------------------------------------------------------------------------#
--logfile		=	/usr/local/var/d2dbs.log
--logfile-gs	=	/usr/local/var/d2dbs-gs.log
--charsavedir	=	/usr/local/var/charsave
--charinfodir	=	/usr/local/var/charinfo
--ladderdir	=	/usr/local/var/ladders
--bak_charsavedir	=	/usr/local/var/bak/charsave
--bak_charinfodir	=	/usr/local/var/bak/charinfo
--#pidfile	=	/usr/local/var/d2dbs.pid
-+logfile		=	%logdir%/d2dbs.log
-+logfile-gs	=	%logdir%/d2dbs-gs.log
-+charsavedir	=	%statedir%/charsave
-+charinfodir	=	%statedir%/charinfo
-+ladderdir	=	%statedir%/ladders
-+bak_charsavedir	=	%statedir%/bak/charsave
-+bak_charinfodir	=	%statedir%/bak/charinfo
-+#pidfile	=	/var/run/bnetd/d2dbs.pid
- 
- #										#
- #################################################################################
- 
-diff -ruN pvpgn-1.8.0rc2.orig/src/Makefile.in pvpgn-1.8.0rc2/src/Makefile.in
---- pvpgn-1.8.0rc2.orig/src/Makefile.in	2005-07-29 02:11:38.000000000 +0600
-+++ pvpgn-1.8.0rc2/src/Makefile.in	2005-09-23 15:10:02.968342144 +0600
-@@ -23,22 +23,23 @@
- bindir		= @bindir@
- sbindir		= @sbindir@
- mandir		= @mandir@
--confdir		= @sysconfdir@
--sharedir	= @localstatedir@
--filesdir	= @localstatedir@/files
--usersdir	= @localstatedir@/users
--userscdbdir	= @localstatedir@/userscdb
--clandir		= @localstatedir@/clans
--teamdir		= @localstatedir@/teams
--bnmaildir	= @localstatedir@/bnmail
--reportsdir	= @localstatedir@/reports
--chanlogsdir	= @localstatedir@/chanlogs
--charinfodir     = @localstatedir@/charinfo
--charsavedir     = @localstatedir@/charsave
--ladderdir       = @localstatedir@/ladders
--statusdir       = @localstatedir@/status
--bak_charsavedir = @localstatedir@/bak/charsave
--bak_charinfodir = @localstatedir@/bak/charinfo
-+confdir		= @sysconfdir@/pvpgn
-+statedir	= @localstatedir@/pvpgn
-+filesdir	= @datadir@/pvpgn
-+usersdir	= @localstatedir@/pvpgn/users
-+userscdbdir	= @localstatedir@/pvpgn/userscdb
-+clandir		= @localstatedir@/pvpgn/clans
-+bnmaildir	= @localstatedir@/pvpgn/bnmail
-+reportsdir	= @localstatedir@/pvpgn/reports
-+chanlogsdir	= @localstatedir@/pvpgn/chanlogs
-+charinfodir	= @localstatedir@/pvpgn/charinfo
-+charsavedir	= @localstatedir@/pvpgn/charsave
-+ladderdir	= @localstatedir@/pvpgn/ladders
-+statusdir	= @localstatedir@/pvpgn/status
-+bak_charsavedir	= @localstatedir@/pvpgn/bak/charsave
-+bak_charinfodir	= @localstatedir@/pvpgn/bak/charinfo
-+logdir		= @localstatedir@/pvpgn/log
-+
- 
- SRC_SRCDIR	= @srcdir@
- SRC_BINDIR	= @srcdir@/../bin
-@@ -677,7 +678,8 @@
- 
- .PHONY: install-share
- install-share:
--	${INSTALL_DIRS} ${DESTDIR}/${sharedir} ${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \
-+	${INSTALL_DIRS} ${DESTDIR}/${datadir} ${DESTDIR}/${statedir} \
-+	${DESTDIR}/${filesdir} ${DESTDIR}/${usersdir} ${DESTDIR}/${userscdbdir} ${DESTDIR}/${bnmaildir} ${DESTDIR}/${reportsdir} \
- 	${DESTDIR}/${chanlogsdir} ${DESTDIR}/${charinfodir} ${DESTDIR}/${charsavedir} ${DESTDIR}/${bak_charsavedir} \
- 	${DESTDIR}/${bak_charinfodir} ${DESTDIR}/${ladderdir} ${DESTDIR}/${statusdir} \
- 	${DESTDIR}/${clandir} ${DESTDIR}/${teamdir}
-@@ -728,21 +730,21 @@
- .PHONY: uninstall-share
- uninstall-share:
- 	@list='${SHARES}'; for p in $$list; do \
--	  ${ECHO} "  ${RMF} ${sharedir}/$$p"; \
--	  ${RMF} ${sharedir}/$$p; \
-+	  ${ECHO} "  ${RMF} ${filesdir}/$$p"; \
-+	  ${RMF} ${filesdir}/$$p; \
- 	done
- 
- ${SRC_CONFDIR}/bnetd.conf: ${SRC_CONFDIR}/bnetd.conf.in ${SRC_SRCDIR}/config.status
- 	@${RMF} $@
--	${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/bnetd.conf.in > $@
-+	${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/bnetd.conf.in > $@
- 
- ${SRC_CONFDIR}/d2cs.conf: ${SRC_CONFDIR}/d2cs.conf.in ${SRC_SRCDIR}/config.status
- 	@${RMF} $@
--	${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/d2cs.conf.in > $@
-+	${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/d2cs.conf.in > $@
- 
- ${SRC_CONFDIR}/d2dbs.conf: ${SRC_CONFDIR}/d2dbs.conf.in ${SRC_SRCDIR}/config.status
- 	@${RMF} $@
--	${SED} -e "s@/usr/local/var/@${sharedir}/@g" -e "s@/usr/local/etc/@${confdir}/@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@
-+	${SED} -e "s@%datadir%@${filesdir}/@g" -e "s@%confdir%@${confdir}/@g" -e "s@%statedir%@${statedir}@g" -e "s@%logdir%@${logdir}@g" ${SRC_CONFDIR}/d2dbs.conf.in > $@
- 
- ${SRC_ACDIR}/ansi2knr: ${SRC_ACDIR}/ansi2knr.o
- 	@${RMF} $@
diff --git a/games-server/pvpgn/files/pvpgn.rc b/games-server/pvpgn/files/pvpgn.rc
deleted file mode 100644
index 83da55a62c15..000000000000
--- a/games-server/pvpgn/files/pvpgn.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [[ ! -f /etc/games/pvpgn/NAME.conf ]] ; then
-	    eerror "You must have a NAME.conf configuration file to start NAME"
-	    return 1
-	fi
-}
-
-start() {
-	checkconfig || return 1
-	ebegin "Starting PvPGN NAME"
-	start-stop-daemon --background --start --quiet \
-		--make-pidfile \
-		--pidfile /var/run/NAME.pid \
-		--exec GAMES_BINDIR/NAME -c GAMES_USER:GAMES_GROUP -- -f
-	eend $? "Failed to start NAME"
-}
-
-stop() {
-	ebegin "Stopping PvPGN NAME"
-	start-stop-daemon --stop --quiet --retry 20 \
-		--pidfile /var/run/NAME.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Rehashing configuration for PvPGN NAME"
-	start-stop-daemon --stop --signal HUP --oknodo \
-	    --pidfile /var/run/NAME.pid
-	eend $?
-}
diff --git a/games-server/pvpgn/metadata.xml b/games-server/pvpgn/metadata.xml
deleted file mode 100644
index a7406f387a17..000000000000
--- a/games-server/pvpgn/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pvpgn.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild b/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild
deleted file mode 100644
index 2ec880c5c21c..000000000000
--- a/games-server/pvpgn/pvpgn-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-SUPPORTP="${PN}-support-1.3"
-DESCRIPTION="A gaming server for Battle.Net compatible clients"
-HOMEPAGE="https://sourceforge.net/projects/pvpgn.berlios/"
-SRC_URI="mirror://sourceforge/pvpgn.berlios/${PN}-${PV/_/}.tar.bz2
-	mirror://sourceforge/pvpgn.berlios/${SUPPORTP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql[server] )"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fhs.patch"
-}
-
-src_configure() {
-	cd src
-	# everything in GAMES_BINDIR (bug #63071)
-	egamesconf \
-		--sbindir="${GAMES_BINDIR}" \
-		$(use_with mysql) \
-		$(use_with postgres pgsql)
-}
-
-src_compile() {
-	emake -C src
-}
-
-src_install() {
-	local f
-
-	dodoc README README.DEV CREDITS BUGS TODO UPDATE version-history.txt
-	docinto docs
-	dodoc docs/*
-
-	emake -C src DESTDIR="${D}" install
-
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins "${WORKDIR}/${SUPPORTP}/"*
-
-	# GAMES_USER_DED here instead of GAMES_USER (bug #65423)
-	for f in bnetd d2cs d2dbs ; do
-		newinitd "${FILESDIR}/${PN}.rc" ${f}
-		sed -i \
-				-e "s:NAME:${f}:g" \
-				-e "s:GAMES_BINDIR:${GAMES_BINDIR}:g" \
-				-e "s:GAMES_USER:${GAMES_USER_DED}:g" \
-				-e "s:GAMES_GROUP:${GAMES_GROUP}:g" \
-				"${D}/etc/games/${PN}/${f}.conf" \
-				"${D}/etc/init.d/${f}" || die
-	done
-
-	keepdir $(find "${D}${GAMES_STATEDIR}"/${PN} -type d -printf "${GAMES_STATEDIR}/${PN}/%P ") "${GAMES_STATEDIR}"/${PN}/log
-	prepgamesdirs
-
-	chown -R ${GAMES_USER_DED}:${GAMES_GROUP} "${D}${GAMES_STATEDIR}/${PN}"
-	fperms 0775 "${GAMES_STATEDIR}/${PN}/log"
-	fperms 0770 "${GAMES_STATEDIR}/${PN}"
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "If this is a first installation you need to configure the package by"
-	elog "editing the configuration files provided in ${GAMES_SYSCONFDIR}/${PN}"
-	elog "Also you should read the documentation in /usr/share/docs/${PF}"
-	elog
-	elog "If you are upgrading you MUST read UPDATE in /usr/share/docs/${PF}"
-	elog "and update your configuration accordingly."
-	if use mysql ; then
-		elog
-		elog "You have enabled MySQL storage support. You will need to edit"
-		elog "bnetd.conf to use it. Read README.storage from the docs directory."
-	fi
-	if use postgres ; then
-		elog
-		elog "You have enabled PostgreSQL storage support. You will need to edit"
-		elog "bnetd.conf to use it. Read README.storage from the docs directory."
-	fi
-}
diff --git a/games-server/steamcmd-1.0 b/games-server/steamcmd-1.0
new file mode 100644
index 000000000000..4e4ca6962022
--- /dev/null
+++ b/games-server/steamcmd-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst setup
+DESCRIPTION=This is the command-line version of the Steam client for dedicated servers
+EAPI=6
+HOMEPAGE=https://developer.valvesoftware.com/wiki/SteamCMD
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ Steam
+RDEPEND=app-misc/screen
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> steamcmd-1.0.tar.gz
+_eclasses_=readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=14926e225a9d6373a9fea2e2f865c2e7
diff --git a/games-server/steamcmd/Manifest b/games-server/steamcmd/Manifest
deleted file mode 100644
index 1152900288e5..000000000000
--- a/games-server/steamcmd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX README.gentoo 1420 BLAKE2B 470f3a40acf5eb150c583697a5dc2b80b6a8d1814b8c4e2c74757479e24540c5f38297b27096e8edd57b685fa0458f5175d75e34d08bd2acf45f4d7aa2c12fa8 SHA512 103ebd60a5e8c9bce0ba742ed945734d19330f5567e738317a0d8e37b2625b852c6606678487c8aa27937c7cd25a05680a7d165cc8f33a0044a993d801e5a65d
-AUX steamcmd.confd 570 BLAKE2B fc2fb283a9cfa8786d46c7c5820decdb6c939912bb09d5d7619f229d44994c191e97c869a79a04f9579f90f7496d38e5a026eb20377b01c39dc388dcca3633ed SHA512 223cc5890669911047ee30d97551004d3023c423d5566bf70393f6601c60b8300ccd5049bd5149b2d629dbb35861a331d43aaabc2d10c945aab4327e9435366a
-AUX steamcmd.initd 814 BLAKE2B bdf07f0a14751d7d94d65e567f741f73388277dd7a2d084e1ad696f23e1f1081188ec6008c06a078a0850c7a096a0a5a6566d455cad7d333b8a27c334f0e1d4d SHA512 591302e570e01de27684e6abef8e89716b211b48e3993bef323e17b351f07834435acf4abfae7fedc44669ab002847657794db2aada65385b1d8fb347b6d633d
-DIST steamcmd-1.0.tar.gz 2428561 BLAKE2B c51dbb8c7731222eb748508b8a84a4cbda55168c85116078074bd0da85018a344ca088b7af41a07a96c15e64d0aeb28fb90cd85d99f444e9425f5a326c1823fe SHA512 b37debfa45e5578cc065924770258a026adad339aae86da1a66e71ac4ee80d2ddbca9060ca4c734affd2c6902635e7b32e2b3efe11bb600969654b3abeb3839e
-EBUILD steamcmd-1.0.ebuild 1176 BLAKE2B b3523614535721626b77a03189b3f20a23b1f9ee1fc57956d807b01a58739ddd0ae572287457b9b331dc390129db1ea47951c07792250ebf7e017963de3f4a2c SHA512 3e07ad7ae9e51dbaa52443ac781fd51a5a2c30247b684945758ec3437085056a6e2ec7c267dd66d85fcee9f043c860d6825d0b61bb4ff541845758794c9d4b3a
-MISC metadata.xml 754 BLAKE2B 0e5610ae928ebb8324f903b6a4429e53c503f604400f09cf40faf721c9187536e1b9412dcbbfa5b79d44ac6f2efa2bc87ba7dc5f54ccf87388691c287ab7478c SHA512 eac3fb10da1a2b27986c75465b5e7ff7e2c74ca09b396053715d9e403ad6bb190eb7747c65dee54b6555e4ae8a014574a26bd7eb10a047e00ee733a90b3b217a
diff --git a/games-server/steamcmd/files/README.gentoo b/games-server/steamcmd/files/README.gentoo
deleted file mode 100644
index 70f027bb8044..000000000000
--- a/games-server/steamcmd/files/README.gentoo
+++ /dev/null
@@ -1,42 +0,0 @@
-Before you can start installing your favourite dedicated server,
-you must let SteamCMD do update itself.
-You can do this, by running SteamCMD itself:
-
-cd /opt/steamcmd
-runuser -l steamcmd -c './steamcmd.sh' -s /bin/bash
-
-On the first run, you will see, that SteamCMD starts updating itself.
-After that, SteamCMD is ready to go
-for installing your favourite dedicated server.
-
-Please keep in mind: You should not run SteamCMD as root!
-
-This package provides an init script and a conf file.
-Don't modify those files directly,
-but instead make a symlink of that init script
-and a copy of that conf file.
-You would do this for every server, you want to setup.
-
-For example, you wan't to setup an old Counter-Strike 1.6 server,
-you would do:
-
-cd /etc/init.d
-ln -s steamcmd steamcmd.cstrike
-
-cd /etc/conf.d
-cp steamcmd steamcmd.cstrike
-
-After that, make your settings in /etc/conf.d/steamcmd.cstrike
-
-In order to install with SteamCMD a dedicated server,
-for example CS 1.6, please run:
-
-cd /opt/steamcmd
-./steamcmd.sh +login anonymous +force_install_dir /opt/steamcmd/hlds +app_set_config 90 mod cstrike +app_update 90 validate +quit
-
-While you can use any path for '+force_install_dir', it's recommended to use:
-'/opt/steamcmd/hlds' for older HL1 based mods.
-'/opt/steamcmd/srcds' for newer HL2 based mods.
-
-For more information, please visit the Valve Developer Community:
-https://developer.valvesoftware.com/wiki/SteamCMD
diff --git a/games-server/steamcmd/files/steamcmd.confd b/games-server/steamcmd/files/steamcmd.confd
deleted file mode 100644
index dcaf8036b88a..000000000000
--- a/games-server/steamcmd/files/steamcmd.confd
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Specifies, which server binary is used.
-# This could be 'hlds_run' or 'srcds_run', depending on your game.
-STEAMCMD_BINARY="hlds_run"
-
-# Path to the files of your started server.
-# It's recommended to use:
-# '/opt/steamcmd/hlds' for older HL1 based mods.
-# '/opt/steamcmd/srcds' for newer HL2 based mods.
-STEAMCMD_PATH="/opt/steamcmd/hlds"
-
-# Options for your server binary.
-STEAMCMD_OPTS="-game valve +ip 127.0.0.1 +maxplayers 32 +map crossfire -pingboost 3"
diff --git a/games-server/steamcmd/files/steamcmd.initd b/games-server/steamcmd/files/steamcmd.initd
deleted file mode 100644
index fecd30e3079b..000000000000
--- a/games-server/steamcmd/files/steamcmd.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "steamcmd" ]; then
-	instance="main"
-else
-	instance="${SVCNAME#steamcmd.}"
-fi
-
-name="SteamCMD (Mod: ${instance})"
-pidfile="/run/steamcmd.${instance}.pid"
-screen_name="steamcmd.${instance}"
-start_stop_daemon_args="--chdir ${STEAMCMD_PATH}"
-
-command="screen"
-command_args="-DmUS ${screen_name} ${STEAMCMD_PATH}/${STEAMCMD_BINARY} ${STEAMCMD_OPTS}"
-command_background="true"
-command_group="steamcmd"
-command_user="steamcmd"
-
-depend() {
-	use net
-}
-
-start_pre() {
-	if [ -z "$STEAMCMD_BINARY" ] || [ -z "$STEAMCMD_PATH" ] || [ -z "$STEAMCMD_OPTS" ]; then
-		eerror "One or more STEAMCMD_* variables in /etc/conf.d/steamcmd.${SVCNAME} are not set!"
-		return 1
-	fi
-	return 0
-}
diff --git a/games-server/steamcmd/metadata.xml b/games-server/steamcmd/metadata.xml
deleted file mode 100644
index 7b05247dc78f..000000000000
--- a/games-server/steamcmd/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
-		<name>Conrad Kostecki</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
-		The Steam Console Client or SteamCMD is a command-line version of the Steam client.
-		Its primary use is to install and update various dedicated servers available on Steam
-		using a command-line interface. It works with games that use the SteamPipe content system.
-		All games have been migrated from the deprecated HLDSUpdateTool to SteamCMD.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-server/steamcmd/steamcmd-1.0.ebuild b/games-server/steamcmd/steamcmd-1.0.ebuild
deleted file mode 100644
index 0d2067a30692..000000000000
--- a/games-server/steamcmd/steamcmd-1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1 user
-
-DESCRIPTION="This is the command-line version of the Steam client for dedicated servers"
-HOMEPAGE="https://developer.valvesoftware.com/wiki/SteamCMD"
-SRC_URI="https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+ Steam"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="app-misc/screen"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/steamcmd/linux32/libstdc++.so.6
-	opt/steamcmd/linux32/steamcmd"
-
-pkg_setup() {
-	enewgroup steamcmd
-	enewuser steamcmd -1 -1 /opt/steamcmd steamcmd
-}
-
-src_install() {
-	diropts -o steamcmd -g steamcmd
-	dodir /opt/steamcmd
-	keepdir /opt/steamcmd/{.steam,.steam/sdk32,linux32}
-
-	exeopts -o steamcmd -g steamcmd
-	exeinto /opt/steamcmd
-	doexe steamcmd.sh
-
-	exeopts -o steamcmd -g steamcmd
-	exeinto /opt/steamcmd/linux32
-	doexe linux32/steamcmd linux32/libstdc++.so.6
-
-	newinitd "${FILESDIR}"/steamcmd.initd steamcmd
-	newconfd "${FILESDIR}"/steamcmd.confd steamcmd
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/ut2003-ded-2225-r2 b/games-server/ut2003-ded-2225-r2
new file mode 100644
index 000000000000..6eb76cd68aba
--- /dev/null
+++ b/games-server/ut2003-ded-2225-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Unreal Tournament 2003 Linux Dedicated Server
+EAPI=5
+HOMEPAGE=http://www.ut2003.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+RDEPEND=games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://www.agaland.it/misc/ut2003/ut2003-lnxded-2225.tar.bz2 mirror://gentoo/UT2003CrashFix.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_=a6dc165bebf38b28765f35497be3c816
diff --git a/games-server/ut2003-ded/Manifest b/games-server/ut2003-ded/Manifest
deleted file mode 100644
index 9fe56def4ed7..000000000000
--- a/games-server/ut2003-ded/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST UT2003CrashFix.zip 2764 BLAKE2B 697c35a02f447d0d436fc32bebdeafbca55ef644d951e92085c33f7597108625770b76e027f31287cd2ac66607692ff8c908f6971f936a134d58d0effc2586fc SHA512 24fdaac873b08a0860c23f66b9bd93922fc4f64486adbe9bfefeb340f9d9374778b5e7bacd0e12cc79d819fb340e007ab2a7f1f45c9e4f27ab3ab6b11033d444
-DIST ut2003-lnxded-2225.tar.bz2 304132056 BLAKE2B 3d3beb840eaa33b1bed4ca8b0c95c1a872b893275c404572f76a97764d09e4b8947f36b102559c1d344e6bbf4f013b9b202a47bc41083dd6c3f15da6759df62c SHA512 33ea560fe2583c2c82d0d1499e5ad16fcd70efdede27e088cb9e5a14cf6ce72f57fad8783e4b5a3fe2dbfc9277fc4d0094d6ad854a1a2150a9d04d967516fee4
-EBUILD ut2003-ded-2225-r2.ebuild 1728 BLAKE2B 6d48911ca99a886c7a63fc0e6bdfa7bce3485fe0b064255bdd4991677d83b9136c5cc4100fedcceb6dc4bd10ba363b38009ec9f515fd2f6e605bb85c566bb9a2 SHA512 7bb2b3d86ec194877c6c8b7d12acab42c9552832cbf7f3a1bc50066f324b2862f54dece16680490fb13cd7f48120afdf432d79f2f3e857001fecbf62181afb58
-MISC metadata.xml 636 BLAKE2B 85e9b947b17ef728ba3a405135e2e3f4eb6062267353766ed1fda515dec0d3bb04d5ea625476a5a8bebb414a53b8675815f8f6140ff9ec91766d932c7cbd1aa8 SHA512 79558fd6169771f018ba03a8b2b7c0919813c063abbd42a05b4687338625f9b05b5855c22ea0591ec0ff860d488985d005b2cc3e844568e960d9caf5cb7512a8
diff --git a/games-server/ut2003-ded/metadata.xml b/games-server/ut2003-ded/metadata.xml
deleted file mode 100644
index 5a21e7d7ec39..000000000000
--- a/games-server/ut2003-ded/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2003 is a first-person 3-D shooter and sequel to the 1999 Game of the Year, Unreal Tournament.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This is the dedicated server portion of the game and does not require the retail discs to use.
-</longdescription>
-</pkgmetadata>
diff --git a/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild b/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild
deleted file mode 100644
index 6ed8f2d43974..000000000000
--- a/games-server/ut2003-ded/ut2003-ded-2225-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-DESCRIPTION="Unreal Tournament 2003 Linux Dedicated Server"
-HOMEPAGE="http://www.ut2003.com/"
-SRC_URI="http://www.agaland.it/misc/ut2003/ut2003-lnxded-${PV}.tar.bz2
-	mirror://gentoo/UT2003CrashFix.zip"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-QA_PREBUILT="${dir:1}/System/*"
-
-src_unpack() {
-	unpack ut2003-lnxded-${PV}.tar.bz2
-	unzip "${DISTDIR}"/UT2003CrashFix.zip || die
-}
-
-src_install() {
-	einfo "This will take a while ... go get a pizza or something"
-
-	dodir "${dir}"
-	mv "${S}"/ut2003_dedicated/* "${Ddir}"
-
-	# Here we apply DrSiN's crash patch
-	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System
-
-	ed "${Ddir}"/System/Default.ini >/dev/null 2>&1 <<EOT
-$
-?Engine.GameInfo?
-a
-AccessControlClass=crashfix.iaccesscontrolini
-.
-w
-q
-EOT
-
-	# Here we apply fix for bug #54726
-	sed -i \
-		-e "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
-		"${D}${dir}"/System/Default.ini || die
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "NOTE: To have your server authenticate properly, you"
-	ewarn "      MUST visit the following site and request a key."
-	ewarn "http://ut2003.epicgames.com/ut2003server/cdkey.php"
-	echo
-	ewarn "If you are not installing for the first time and you plan on running"
-	ewarn "a server, you will probably need to edit your"
-	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
-	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
-	ewarn "[Engine.GameInfo] section to close a security issue."
-}
diff --git a/games-server/ut2004-ded-3369.3-r1 b/games-server/ut2004-ded-3369.3-r1
new file mode 100644
index 000000000000..f8696a44ba46
--- /dev/null
+++ b/games-server/ut2004-ded-3369.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip app-arch/p7zip
+DESCRIPTION=Unreal Tournament 2004 Linux Dedicated Server
+EAPI=5
+HOMEPAGE=http://www.unrealtournament.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=ut2003
+RDEPEND=sys-libs/glibc !games-fps/ut2004[dedicated] games-fps/ut2004-bonuspack-ece games-fps/ut2004-bonuspack-mega games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=mirror://3dgamers/unrealtourn2k4/dedicatedserver3339-bonuspack.zip http://files.chaoticdreams.org/UT2004/DedicatedServer3339-BonusPack.zip -> dedicatedserver3339-bonuspack.zip http://downloads.unrealadmin.org/UT2004/Server/dedicatedserver3339-bonuspack.zip http://sonic-lux.net/data/mirror/ut2004/dedicatedserver3339-bonuspack.zip mirror://3dgamers/unrealtourn2k4/ut2004-lnxpatch3369-2.tar.bz2 http://downloads.unrealadmin.org/UT2004/Patches/Linux/ut2004-lnxpatch3369-2.tar.bz2 http://sonic-lux.net/data/mirror/ut2004/ut2004-lnxpatch3369-2.tar.bz2 mirror://gentoo/ut2004-v3369-3-linux-dedicated.7z
+_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_=f2feb693af1c3af9d31a50c07134d014
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
deleted file mode 100644
index a157bc10833f..000000000000
--- a/games-server/ut2004-ded/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ut2004-ded.confd 228 BLAKE2B 18e5f0d823b266a4463cc5b83c4982fc662c4bdfb4b8f9f9e6ae22256d0ac2d463d0987db2fdf419dbcc9b3fbda777511adbf6ac7d0ad34a09184a08fc28f6b1 SHA512 f304c134139a29e43f6a297969462d8ca667071be898bf0b5495785eba7b0042e7103b5df2dc2c1fa333f4c16f75efcfdcd8ddc2dc88bf46d93cf8a9739eb300
-AUX ut2004-ded.initd 561 BLAKE2B a30dfd055e00d42df3b5214c7429203fb1188617ac469e1cb9e3fa66c99df3ed3691eff0a1d932b0cf1a44f300623d720e8c87ce47e8999d5607f969c883f7c9 SHA512 0d5be8488cdbb357ab10223c4a5c6a3f302622782c0432d28e0a5ec7c38e886a44ea2931cde82403db807225bf6cf2ebcbb7f3abf62b8ea6bfd8ffb41c316c58
-DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
-DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
-EBUILD ut2004-ded-3369.3-r1.ebuild 3273 BLAKE2B fc052f2618f8b77af31011463c30cdd2b7e681afd036bac582f7dc1e5bea4508456d8558ac7236eddaffea27a659dd70c142c5527f1716267b6d21ca8886b93a SHA512 840a3b1b7294e5007e04dbed8803cba6f209b43013e7a7fca3637cbc4f3bec8299cff1ad26ef08befbadc2f5e469d8eae07d2b4da8e3788f472969bee04c7c16
-MISC metadata.xml 641 BLAKE2B 6f4b33ffb4810e9161f185859d8a822bf655f70f40220968a1638398072506486a72180065d2f1589446f09d61416b2cc379bdfafd540162bf8b817834002849 SHA512 637588c313e117912d01da6345324d455f7c1c658e413d936b60f1fcceff88d8ecae084e11727479c8cf72438f14412336d9c81d94cccc1ffb54a5ec2d69ebc7
diff --git a/games-server/ut2004-ded/files/ut2004-ded.confd b/games-server/ut2004-ded/files/ut2004-ded.confd
deleted file mode 100644
index a485b12d221e..000000000000
--- a/games-server/ut2004-ded/files/ut2004-ded.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# User and group the server should run as
-ut2004_ded_user="@USER@"
-ut2004_ded_group="@GROUP@"
-
-# Directory to use for HOME
-ut2004_ded_home="@HOME@"
-
-# Any extra options you want to pass to the server
-ut2004_ded_opts="DM-Deck17"
diff --git a/games-server/ut2004-ded/files/ut2004-ded.initd b/games-server/ut2004-ded/files/ut2004-ded.initd
deleted file mode 100644
index fe323a9e00ee..000000000000
--- a/games-server/ut2004-ded/files/ut2004-ded.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting ut2004-ded"
-	start-stop-daemon --start --quiet --background --make-pidfile \
-		--pidfile /var/run/ut2004-ded.pid \
-		--chuid ${ut2004_ded_user}:${ut2004_ded_group} \
-		--env HOME="${ut2004_ded_home}" \
-		--exec "@DIR@/ut2004-ded" \
-		-- ${ut2004_ded_opts}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ut2004-ded"
-	start-stop-daemon --stop \
-		--pidfile /var/run/ut2004-ded.pid
-	eend $?
-}
diff --git a/games-server/ut2004-ded/metadata.xml b/games-server/ut2004-ded/metadata.xml
deleted file mode 100644
index 6c7217507290..000000000000
--- a/games-server/ut2004-ded/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Unreal Tounament 2004 is a first-person 3-D shooter and sequel to the 2003 Game of the Year, Unreal Tournament 2003.  The game was ported to Linux by Ryan "icculus" Gordon under contract from Epic Games and the Linux installer was released in the retail box.  This is the dedicated server portion of the game and does not require the retail discs to use.
-</longdescription>
-</pkgmetadata>
diff --git a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild b/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
deleted file mode 100644
index 218fe1616d96..000000000000
--- a/games-server/ut2004-ded/ut2004-ded-3369.3-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-BONUSPACK_P="dedicatedserver3339-bonuspack.zip"
-PATCH_P="ut2004-lnxpatch${PV%.*}-2.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 Linux Dedicated Server"
-HOMEPAGE="http://www.unrealtournament.com/"
-SRC_URI="mirror://3dgamers/unrealtourn2k4/${BONUSPACK_P}
-	http://files.chaoticdreams.org/UT2004/DedicatedServer3339-BonusPack.zip -> ${BONUSPACK_P}
-	http://downloads.unrealadmin.org/UT2004/Server/${BONUSPACK_P}
-	http://sonic-lux.net/data/mirror/ut2004/${BONUSPACK_P}
-	mirror://3dgamers/unrealtourn2k4/${PATCH_P}
-	http://downloads.unrealadmin.org/UT2004/Patches/Linux/${PATCH_P}
-	http://sonic-lux.net/data/mirror/ut2004/${PATCH_P}
-	mirror://gentoo/ut2004-v${PV/./-}-linux-dedicated.7z"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-DEPEND="app-arch/unzip
-	app-arch/p7zip"
-RDEPEND="sys-libs/glibc
-	!games-fps/ut2004[dedicated]
-	games-fps/ut2004-bonuspack-ece
-	games-fps/ut2004-bonuspack-mega"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-
-src_prepare() {
-	cp -rf UT2004-Patch/* . || die
-	rm -rf System/{ucc-bin*,ut2004-bin*,*.dll,*.exe} UT2004-Patch
-	if use amd64 ; then
-		mv -f ut2004-ucc-bin-09192008/ucc-bin-linux-amd64 System/ucc-bin || die
-	else
-		mv -f ut2004-ucc-bin-09192008/ucc-bin System/ || die
-	fi
-	rm -rf ut2004-ucc-bin-09192008
-	# Owned by ut2004-bonuspack-ece
-	rm -f Animations/{MetalGuardAnim,ONSBPAnimations,NecrisAnim,MechaSkaarjAnims}.ukx
-	rm -f Help/BonusPackReadme.txt
-	rm -f Maps/{ONS-Adara,ONS-IslandHop,ONS-Tricky,ONS-Urban}.ut2
-	rm -f Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm -f StaticMeshes/{HourAdara,BenMesh02,BenTropicalSM01,ONS-BPJW1,PC_UrbanStatic}.usx
-	rm -f System/{ONS-IslandHop,ONS-Tricky,ONS-Adara,ONS-Urban,OnslaughtBP}.int
-	rm -f System/xaplayersl3.upl
-	rm -f Textures/{ONSBPTextures,BonusParticles,HourAdaraTexor,BenTex02,BenTropical01,PC_UrbanTex,AW-2k4XP,ONSBP_DestroyedVehicles,UT2004ECEPlayerSkins,CicadaTex,Construction_S}.utx
-	# Owned by ut2004-bonuspack-mega
-	rm -f System/{Manifest.ini,Manifest.int,Packages.md5}
-}
-
-src_install() {
-	einfo "This will take a while... go get a pizza or something"
-
-	games_make_wrapper ${PN} "./ucc-bin server" "${dir}"/System
-
-	insinto "${dir}"
-	doins -r *
-	fperms +x "${dir}"/System/ucc-bin
-
-	sed \
-		-e "s:@USER@:${GAMES_USER_DED}:" \
-		-e "s:@GROUP@:${GAMES_GROUP}:" \
-		-e "s:@HOME@:${GAMES_PREFIX}:" \
-		"${FILESDIR}"/${PN}.confd > "${T}"/${PN}.confd || die
-	newconfd "${T}"/${PN}.confd ${PN}
-
-	sed \
-		-e "s:@DIR@:${GAMES_BINDIR}:g" \
-		"${FILESDIR}"/${PN}.initd > "${T}"/${PN}.initd || die
-	newinitd "${T}"/${PN}.initd ${PN}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	ewarn "You should take the time to edit the default server INI."
-	ewarn "Consult the INI Reference at http://www.unrealadmin.org/"
-	ewarn "for assistance in adjusting the following file:"
-	ewarn "${dir}/System/Default.ini"
-	ewarn
-	ewarn "To have your server authenticate properly to the"
-	ewarn "central server, you MUST visit the following site"
-	ewarn "and request a key. This is not required if you"
-	ewarn "want an unfindable private server. [DoUplink=False]"
-	ewarn
-	ewarn "http://unreal.epicgames.com/ut2004server/cdkey.php"
-}
diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index a029f91f6fae..d0e603b2870a 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/bcs-demo-1.3-r1 b/games-simulation/bcs-demo-1.3-r1
new file mode 100644
index 000000000000..d738523a751f
--- /dev/null
+++ b/games-simulation/bcs-demo-1.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=design and build bridges and then stress test them with trains
+EAPI=6
+HOMEPAGE=http://www.chroniclogic.com/pontifex2.htm
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=BCS
+RDEPEND=media-libs/libsdl[abi_x86_32(-)] sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[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/bcs/bcsdemo_v1_3.sh.bin http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz
+_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_=54f632376d84748ea2f2658d1fe3fa73
diff --git a/games-simulation/bcs-demo/Manifest b/games-simulation/bcs-demo/Manifest
deleted file mode 100644
index dbf41fd88123..000000000000
--- a/games-simulation/bcs-demo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST bcsdemo_v1_3.sh.bin 5965217 BLAKE2B ba69858933c5ff1fbd966cc5038ecf891abea70cb6a7f09e40e698da495a7f3578460f90e033c1455918f7d188e37839ae0f140be8c419911d520e4cef13cd48 SHA512 b3916ac72d21e80a09b80a406ea18ab4365d9c1b8139eec848f2e5d697d3d5afb6f27de5dac31c6b6fd860e3b406a3eae8a28aac0e00134629dbd5906bde816d
-DIST openal-alan-hack-0.0.1.tar.gz 86168 BLAKE2B 77ab97ef9b31b4c3ab00c89afaad7094b6ecc388e296b31969bfbbe3953b812036c1cb4a04a09ad0ca986941d2508469c40f5ab7d458c1ceb5fa78b1f9ca7c81 SHA512 1794461cb917dcf2130977bd0ac9f09bf93cd235dd742d29e50a3e2666e6db60865bacd1927fc4607a4b308dcdf421fa2a186ad2a06eea778069ce712a89d943
-EBUILD bcs-demo-1.3-r1.ebuild 1380 BLAKE2B 7d91114725777944c45b43c6051b27473a7000a708bb8a84ab67d87c9cb7b0c7c8fdf4d7d1a22e5a13d5b716f899d8675372147bc197c99ced40f0c9dd902941 SHA512 a0073df4c848a2c33827072348d1ad2c7de3fdaf5a2b9f3270dae3eadd8fdf2a9ff832b7e32b3ff53a834af4ecf3dcda35250100543834fa81918dbbf3048b5d
-MISC metadata.xml 1473 BLAKE2B 98ce5cff21aaefe1ebe09f390be6e01780902ef652e3f0ddee815b0018652678719c061ef7a88dae81824170f2bdc7fa8b7b024227a2c71f03f04f783d831504 SHA512 2813c65cdae4aa2f8e0d0cb15e3b45af6d842e2ad02bc45783d3eb9fc8acbbd8467241ce7af2fa420bedc39b7c449b398f339cdc868fb6e45e0b5cec68b538c2
diff --git a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild b/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
deleted file mode 100644
index 106a657357f5..000000000000
--- a/games-simulation/bcs-demo/bcs-demo-1.3-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-DESCRIPTION="design and build bridges and then stress test them with trains"
-HOMEPAGE="http://www.chroniclogic.com/pontifex2.htm"
-SRC_URI="ftp://ggdev-1.homelan.com/bcs/bcsdemo_v${PV/./_}.sh.bin
-	http://www.highprogrammer.com/alan/pfx2/openal-alan-hack-0.0.1.tar.gz"
-
-LICENSE="BCS"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="
-	media-libs/libsdl[abi_x86_32(-)]
-	sys-libs/glibc
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[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}/*"
-
-src_unpack() {
-	unpack_makeself bcsdemo_v${PV/./_}.sh.bin
-	unpack openal-alan-hack-0.0.1.tar.gz
-}
-
-src_install() {
-	dodir "${dir}"
-
-	tar -zxf bcsdemo.tar.gz -C "${Ddir}" || die
-	rm -f "${Ddir}"/bcs-linux-openal-fixer.sh || die
-
-	exeinto "${dir}"
-#	doexe bin/Linux/x86/rungame.sh
-#	exeinto ${dir}/lib
-	mv "${Ddir}"/bcs "${Ddir}"/bcs-bin
-	newexe libopenal.so.0.0.6 libopenal.so.0
-	echo '#!/bin/bash' >> "${Ddir}"/bcs
-	echo 'LD_PRELOAD="./libopenal.so.0" ./bcs-bin' >> "${Ddir}"/bcs
-	fperms 755 "${dir}"/bcs
-	make_wrapper bcs-demo ./bcs "${dir}" "${dir}"
-
-	insinto "${dir}"
-	doins *.cfg
-	dodoc readme*
-}
diff --git a/games-simulation/bcs-demo/metadata.xml b/games-simulation/bcs-demo/metadata.xml
deleted file mode 100644
index 6955d95241d3..000000000000
--- a/games-simulation/bcs-demo/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Building a bridge that doesn't break is what its all about, although watching 
-your bridge creation break and plunge a train into the watery depths below can be 
-half the fun. In the Bridge Construction Set you design and build bridges and 
-then stress test them to see how your creations hold up under pressure. If when 
-test vehicles pass over your bridge they make it safely across you know you've
-succeeded. If they plummet into the river you know you need to go back to the 
-drawing board.
-
-The robust physics deployed in the Bridge Construction Set let you build a wide 
-variety of bridges that can span the river. The 3D graphics allow you to view 
-your bridge from any angle including a first person train view - its like being 
-strapped to the front of the train when your bridge is first tested (if this 
-happened in real life I think we might have engineers checking all their bridges 
-in a simulator).
-
-The Bridge Construction Set includes many types of bridge building levels in 
-varying degrees of difficulty from simple to complex with a tutorial secition to 
-get you started. A Level Editor is also included so you can create your own 
-levels and trade them with others.
-</longdescription>
-</pkgmetadata>
diff --git a/games-simulation/cannonsmash-0.6.6-r1 b/games-simulation/cannonsmash-0.6.6-r1
new file mode 100644
index 000000000000..8f2240aed789
--- /dev/null
+++ b/games-simulation/cannonsmash-0.6.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=3D tabletennis game
+EAPI=6
+HOMEPAGE=http://cannonsmash.sourceforge.net/
+IUSE=vorbis nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/libsdl[sound,video] media-libs/sdl-mixer[vorbis?] media-libs/sdl-image[jpeg,png] x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/cannonsmash/csmash-0.6.6.tar.gz vorbis? ( http://nan.p.utmc.or.jp/danslatristesse2-48.ogg )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=f362e4c841491dc21b6796281ae71a30
diff --git a/games-simulation/cannonsmash/Manifest b/games-simulation/cannonsmash/Manifest
deleted file mode 100644
index c7b4c1f1960b..000000000000
--- a/games-simulation/cannonsmash/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX cannonsmash-0.6.6-flags.patch 524 BLAKE2B 5a85b73b59c1dcbc097df325e2b94701cef5629bd929c3c22f43fe65d259c22cdf5949b82a14e2e87f190952ce554947b465403e058aa3564a27f6ef1c5bff38 SHA512 38f6edfc9f6c434496ae9b5f45fa7f42df8c8156bd7507efce7d9d5c0f6950b3178200d863b6d75552caf1a0206fd75b61328ce4ca96eb59d84b7006f5b44fb6
-AUX cannonsmash-0.6.6-gcc41.patch 594 BLAKE2B 392ceebbba587580c9ddc8511c7139aa68d0c881f372c362ef0c068119060f593462b999514340d81075bbecc1d0a11c617c0ab4ec8ac2180350bd9cfd046a1e SHA512 a9bbadb4d6ff279eb368be17ff6326b2ddcdcd3231ace4fe2a4368bd82ece6cd11cbcf6c2464ad9e79d41ad099e66b8c4ab5efea4995bdd7beabfefb5b92c3ca
-AUX cannonsmash-0.6.6-sizeof-cast.patch 362 BLAKE2B 1a7dbf4c921497c2209c078e9453f6ff1106f4a3baca52e57f1778022763a7f8f79259f443f88d74c0b412aef223fd948c93e0c79158df25bea2cf6cbcc0209e SHA512 9e38b5ef20529587dbcf86ecd4712e9e4b751ec4fd2d735f3924a03afbcd56345f738b65e37525e90e1717117160dd175e0bacdb2cf39dfa8b2d5d09690ffdc4
-AUX cannonsmash-0.6.6-x-inc.patch 309 BLAKE2B efcd58b83b9433065efbde3aa4356b48b8fb0bba4462fb2e92c28368e3610c995060ffc0dd7a76d5ef994341e154716c1d5b3b09869396314002e04029479767 SHA512 d6f6139014782eee11965595e0ea61e53a773be3be5edcaba2ebc602983b9dd2f0178298c34507ebf722a868c0f43535adae519cbebdd2a7e3da730e4f54c0ab
-DIST csmash-0.6.6.tar.gz 1989943 BLAKE2B 723b7accd9a899f6d80df07573f8583684606c6b5bf8f11753902f4db196a9a2738cd11899e0a3b4e5637b04553173d75701edbed6e2d800b7b18edb82b2a10f SHA512 e8406eb17adf6c6cc4454b7d0a432ad1b071e1f72d9867fd46e458ade2d1dc1e927a7f2a336c80988b97051b9d188c3027dd8207f89f7e1fa60e1d0a6a5e8916
-DIST danslatristesse2-48.ogg 1070787 BLAKE2B 91bb5b552a45349d6b34d459f2d5071498b6def76c9b7e7ce1538c29af762698708d4ad6fe780e087f14b6ca42dad258c8ed2a7cd368027a5080aab52d02575a SHA512 5cbc457d511bdc736f3b359a8ddd3a514bd0d14418f2dbd68409394baadfcd9fd7630b228e4e9654b14b513e158e9a46b67bc58c5c04bfe382ee6e624dd16834
-EBUILD cannonsmash-0.6.6-r1.ebuild 1401 BLAKE2B dd927348ecc38a65865bb53769886b571c5c8543b4fc9f8f1e7ee5c2e8048c38a4ba0e12b7bb643abe9948c278781ee4f04356cd81f4fa690f4ef74322dc5e1d SHA512 d73328460d50c06230d130e8a18cabae84335f748cfe2116257eac522852e6254072eaff232aa4d7b00328a8d57b3731052c9fd903ff718b3a52db302424a638
-MISC metadata.xml 334 BLAKE2B 7143d65b7fa8567c3598adc245e6a6f8148074d8775f23c06eff18b0e94cb3e570c3c483a1c44df49f148c6150271172150dcf870873e4fb796be0d08c718663 SHA512 feb36e586e7e460e47a342dccf7cc812319860809033b31a8597c8df12f7c09e725af4e5536933a50341e22e921009557600801bcf64d9bf13e88b24d4b53e34
diff --git a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild b/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
deleted file mode 100644
index 8da30598da0c..000000000000
--- a/games-simulation/cannonsmash/cannonsmash-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_OGG=danslatristesse2-48.ogg
-DESCRIPTION="3D tabletennis game"
-HOMEPAGE="http://cannonsmash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/csmash-${PV}.tar.gz
-	vorbis? ( http://nan.p.utmc.or.jp/${MY_OGG} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vorbis nls"
-
-RDEPEND="
-	virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer[vorbis?]
-	media-libs/sdl-image[jpeg,png]
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/csmash-${PV}"
-
-src_unpack() {
-	unpack csmash-${PV}.tar.gz
-}
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-x-inc.patch \
-		"${FILESDIR}"/${P}-sizeof-cast.patch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-flags.patch
-	if use vorbis ; then
-		sed -i \
-			-e "s:${MY_OGG}:/usr/share/csmash/games/${MY_OGG}:" ttinc.h \
-			|| die "sed failed"
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--datadir="/usr/share"
-}
-
-src_compile() {
-	emake \
-		localedir="/usr/share"
-}
-
-src_install() {
-	default
-	if use vorbis ; then
-		insinto /usr/share/games/csmash
-		doins "${DISTDIR}"/${MY_OGG}
-	fi
-	newicon win32/orange.ico ${PN}.ico
-	make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
-}
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
deleted file mode 100644
index c7b3b561d2d1..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.old	2010-10-18 15:05:02.000000000 +0200
-+++ b/configure	2010-10-18 15:05:31.000000000 +0200
-@@ -5516,12 +5516,12 @@
- 
- 
- if test "x$x_includes" != "x"; then
--  CFLAGS="-I $x_includes"
--else
--  CFLAGS=""
--fi
--LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
--CXXFLAGS="$CFLAGS -Wall"
-+  CFLAGS="${CFLAGS} -I $x_includes"
-+else
-+  CFLAGS="${CFLAGS}"
-+fi
-+LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
-+CXXFLAGS="${CXXFLAGS} -Wall"
- 
- 
- echo "$as_me:$LINENO: checking for main in -lXmu" >&5
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
deleted file mode 100644
index 6602c2f09304..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/BallView.h.old	2006-04-11 00:10:37.000000000 +0200
-+++ b/BallView.h	2006-04-11 00:10:53.000000000 +0200
-@@ -32,7 +32,7 @@
- 
-   static GLuint m_number[10];
- private:
--  void BallView::DrawTargetCircle();
-+  void DrawTargetCircle();
-   GLUquadricObj *m_quad;
- 
-   void DrawBall();
---- a/matrix.old	2006-04-11 00:13:18.000000000 +0200
-+++ b/matrix	2006-04-11 00:19:34.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- /* __BEGIN__BEGIN__ */
- //__NAMESPACE_BEGIN(ese);
--#if (!defined __GNUG__) || (__GNUC__ == 3)
-+#if (!defined __GNUG__) || (__GNUC__ >= 3)
- template<typename T>
- void swap(T& a, T& b)
- {
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
deleted file mode 100644
index ead10c90400b..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Don't typecast otherwise C++ will fail to match on some arches.
-
-http://bugs.gentoo.org/84187
-
---- a/loadparts.cpp
-+++ b/loadparts.cpp
-@@ -247,3 +247,3 @@
-             // concat next line(s)
--	    int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
-+	    int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
- 	    fgets(&line[l-2], bufsize, fp);
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
deleted file mode 100644
index e56b51e0b92a..000000000000
--- a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch by Jason Bucata.
-http://bugs.gentoo.org/84187
-
---- a/configure
-+++ b/configure
-@@ -5515,7 +5515,11 @@
- fi
- 
- 
--CFLAGS="-I $x_includes"
-+if test "x$x_includes" != "x"; then
-+  CFLAGS="-I $x_includes"
-+else
-+  CFLAGS=""
-+fi
- LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
- CXXFLAGS="$CFLAGS -Wall"
- 
diff --git a/games-simulation/cannonsmash/metadata.xml b/games-simulation/cannonsmash/metadata.xml
deleted file mode 100644
index a7e14e54406d..000000000000
--- a/games-simulation/cannonsmash/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cannonsmash</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/crashtest-1.1-r1 b/games-simulation/crashtest-1.1-r1
new file mode 100644
index 000000000000..432758f029ce
--- /dev/null
+++ b/games-simulation/crashtest-1.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-games/ode media-libs/alsa-lib media-libs/freeglut x11-libs/fltk:1[opengl] virtual/opengl virtual/glu >=media-libs/plib-1.8.4
+DESCRIPTION=Educational car crash simulator
+EAPI=6
+HOMEPAGE=http://www.stolk.org/crashtest/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/ode media-libs/alsa-lib media-libs/freeglut x11-libs/fltk:1[opengl] virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=http://www.stolk.org/crashtest/crashtest-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2cd696473405b9e16a97a46117816f1c
diff --git a/games-simulation/crashtest/Manifest b/games-simulation/crashtest/Manifest
deleted file mode 100644
index f688984c9769..000000000000
--- a/games-simulation/crashtest/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX crashtest-1.1-gentoo.patch 2907 BLAKE2B 5d99f7943f568877d31a1d3cadcbb670487db8923275d44384d9e4a2897320b7c963c59163cb7076ff995617f11d8b1c3482a0cca4b02cc28a5ff5b4ce7e7f9f SHA512 6b657329db9eba28de9dcbf33bfd46002e89e0a5a348a9109742cfa6b0ab6a431a8c5edd880201b40ab0dcc4cc5b27be16dc5e38e16621596ec62ea07676c716
-DIST crashtest-1.1.tar.gz 134769 BLAKE2B 16c7be2723d705bbcfc4457a0d7bb545ddaacfb9009cc184c849c59a1c356c67d0151bd7bbb0d1909efb89d24e18657038fe0dd66e218e0c7ed24c67ba82089b SHA512 f361b5f202cdcdca871357eb2a2158af2958f4058b6754c63dc5a20c3e08e2ef532e984596d0daac073f2321b2db02e3f8c2a0a4998450fc953c1661d712d59c
-EBUILD crashtest-1.1-r1.ebuild 831 BLAKE2B b57fac9716e9a510d5971ad00a16493c3594ceb018e180fbcc62090cb75ca4187587ce7863ecbbe06a17ce91354b26656f62d0c0c08e7eec9a9de5861f9eb6f6 SHA512 312efd5ef21b25f35c8f78e1088d909afdf8ec56beb7dc2c3c043c5db18c3d68b726ca9590fd4e484299fe508c7b9e6f0eb6c898becd8c49cc2f7be607346112
-MISC metadata.xml 562 BLAKE2B ae31c43ea940ab17bf1295a254c715d4c3a9460a38617deeb7e41e075b04cc20ad2c7710fa66ffc124c9441d00787902ca423537a494c4eaed57c933abf23cb2 SHA512 94005d1dd7a8f13dc37e0c81290486eb34dfda05a2808eb9b4908b5ba7ba722e0435acdde3d2da082e61a70e60eb2e6df70cd0d59589ccb913a6e6e87b81bc55
diff --git a/games-simulation/crashtest/crashtest-1.1-r1.ebuild b/games-simulation/crashtest/crashtest-1.1-r1.ebuild
deleted file mode 100644
index 1faed8379238..000000000000
--- a/games-simulation/crashtest/crashtest-1.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="Educational car crash simulator"
-HOMEPAGE="http://www.stolk.org/crashtest/"
-SRC_URI="http://www.stolk.org/crashtest/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/ode
-	media-libs/alsa-lib
-	media-libs/freeglut
-	x11-libs/fltk:1[opengl]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	>=media-libs/plib-1.8.4"
-
-S=${WORKDIR}/${P}/src-${PN}
-
-PATCHES=(
-	"${FILESDIR}/${P}"-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		-e "s:@GENTOO_BINDIR@:/usr/bin:" \
-		Makefile ${PN}.cxx || die
-	append-cppflags -DHAVE_ISNANF
-}
-
-src_install() {
-	default
-	make_desktop_entry ${PN} Crashtest
-}
diff --git a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch b/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
deleted file mode 100644
index b384c87278c2..000000000000
--- a/games-simulation/crashtest/files/crashtest-1.1-gentoo.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff -ru a/Makefile b/Makefile
---- a/Makefile	2009-02-15 17:11:31.000000000 -0500
-+++ b/Makefile	2009-10-14 01:00:13.900627555 -0400
-@@ -1,34 +1,12 @@
--# EDIT THESE SETTINGS
--
--PLIBPREFIX=/usr
--ODEPREFIX=/usr
--CXX=g++
--
--#PLIBPREFIX=$(HOME)
--#ODEPREFIX=$(HOME)
--#CXX=g++-4.0
--
--# END OF CUSTOM SETTINGS
--
--CXXFLAGS=\
--  -I$(ODEPREFIX)/include \
--  -I$(PLIBPREFIX)/include \
--  -I../src-common \
--  -O2 -g -Wall
--
--LFLAGS=\
--  -L$(PLIBPREFIX)/lib \
--  -L/usr/X11R6/lib
--
- OBJS=staticworldobject.o crashtest.o dynamicobject.o cartobject.o
-+CXXFLAGS+=-I `fltk-config --includedir` `ode-config --cflags`
- 
--LIBS= $(ODEPREFIX)/lib/libode.a -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL `fltk-config --use-gl --use-images --ldflags`
--
-+LIBS= `ode-config --libs` -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul -lGLU -lGL -lasound `fltk-config --use-gl --use-images --ldflags` -lglut
- 
- all: crashtest
- 
- crashtest: $(OBJS)
--	$(CXX) -o crashtest $(OBJS) $(LFLAGS) $(LIBS)
-+	$(CXX) -o crashtest $(OBJS) $(LDFLAGS) $(LIBS)
- 
- staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
- 	$(CXX) -c $(CXXFLAGS) ../src-common/staticworldobject.cxx
-@@ -37,10 +14,10 @@
- 	$(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx
- 
- cartobject.o: cartobject.cxx cartobject.h
--	$(CXX) -c $(CXXFLAGS) cartobject.cxx
-+	$(CXX) -c $(CXXFLAGS) -I../src-common cartobject.cxx
- 
- crashtest.o: crashtest.cxx crashworld.h ../src-common/modelmap.h cartobject.h bipedobject.h ../src-common/brickwall.h ../src-common/stereocontext.h ../src-common/usercam.h
--	$(CXX) -c $(CXXFLAGS) crashtest.cxx
-+	$(CXX) -c $(CXXFLAGS) -I../src-common crashtest.cxx
- 
- 
- 
-@@ -48,13 +25,13 @@
- 	PLODE_DATADIR=`pwd` ./crashtest
- 
- 
--GAMEDIR=$(DESTDIR)/usr/share/games/crashtest
-+GAMEDIR=$(DESTDIR)@GENTOO_DATADIR@
- install: crashtest
- 	# Directories
--	mkdir -p $(DESTDIR)/usr/games/
-+	mkdir -p $(DESTDIR)@GENTOO_BINDIR@
- 	mkdir -p $(GAMEDIR)/models/
- 	# Binary
--	install crashtest $(DESTDIR)/usr/games/crashtest
-+	install crashtest $(DESTDIR)@GENTOO_BINDIR@
- 	# Models
- 	install -m 644 models/testground.3ds $(GAMEDIR)/models/testground.3ds
- 	install -m 644 models/biped_torso.3ds $(GAMEDIR)/models/biped_torso.3ds
-diff -ru a/crashtest.cxx b/crashtest.cxx
---- a/crashtest.cxx	2009-02-15 17:08:24.000000000 -0500
-+++ b/crashtest.cxx	2009-10-14 01:01:25.822753522 -0400
-@@ -615,13 +615,7 @@
- 
- int main(int argc, char *argv[]) 
- {
--  char *bindirname  = dirname(argv[0]);
--  if (!strcmp(bindirname,"."))
--    dirprefix="/usr/share/games/crashtest";
--  else
--  {
--    dirprefix = dirname(bindirname) + std::string("/share/games/crashtest");
--  }
-+  dirprefix="@GENTOO_DATADIR@";
-   if (getenv("PLODE_DATADIR"))
-     dirprefix = getenv("PLODE_DATADIR");
-   modelmap = new ModelMap(dirprefix);
-@@ -745,4 +739,3 @@
-   Fl::add_idle(idle, &simwin);
-   Fl::run();
- }
--
diff --git a/games-simulation/crashtest/metadata.xml b/games-simulation/crashtest/metadata.xml
deleted file mode 100644
index 3dc7fa0644b5..000000000000
--- a/games-simulation/crashtest/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Crashtest simulates car crashes. This is an educational tool that can be used to
-acquire much insight into this complex process. The user can learn about the
-relation between speed, reaction-time and stopping distance. Also, many physical
-properties can be studied.
-</longdescription>
-</pkgmetadata>
diff --git a/games-simulation/crrcsim-0.9.13 b/games-simulation/crrcsim-0.9.13
new file mode 100644
index 000000000000..bd087d8f4820
--- /dev/null
+++ b/games-simulation/crrcsim-0.9.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal portaudio? ( media-libs/portaudio ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.10* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=model-airplane flight simulation program
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/crrcsim/
+IUSE=portaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/plib sci-mathematics/cgal portaudio? ( media-libs/portaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/crrcsim/crrcsim-0.9.13.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_=81d854cb129648e1cdb00374596f566b
diff --git a/games-simulation/crrcsim/Manifest b/games-simulation/crrcsim/Manifest
deleted file mode 100644
index dedc0191769e..000000000000
--- a/games-simulation/crrcsim/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX crrcsim-0.9.13-buildsystem.patch 2183 BLAKE2B 2f1fb768f93e7d3db1fbd7a2a30c8244c14f6a2701d8a8e80679723aeac11882d7801aaba3f4433036fa078c3f199d7c4fc01a6e8ce2363db37519cb205386aa SHA512 9b28fe63ea4bd3d21559306bd110eaa2c518dc933a572a93dc21182464ee4f95bf7d8bc3f21ebe78addbcc2e432fcd2992587925f97d633270ce9d47ff2e228b
-AUX crrcsim-0.9.13-gcc6.patch 461 BLAKE2B 7e2016db5781e0158e27d999fb1d88d07dc6294740466c736a2e42eb46547fdb35ac112b6c8e93a5571103d28d6037a6acdb2be752bfb2650cc349538e72c3f4 SHA512 34bda65c0791622adb8436d08b60e6a877c2a3bbb12f93379686c39c2c572364c0fa265011bbc788229fa2ddaa3bfa3be8397d2ff98ea967f423fa3cd48465e9
-AUX crrcsim-cgal_gmp.patch 352 BLAKE2B 1a9cf7250753c1a0099dd07b5020b7c5af89dffa8387d68f71c51e21a7803ecb2395144de65915ce84cf077b522fecc5790d26190abf9673fef687d1e16f0d6b SHA512 1b8302f71e220df54b73819988f866a7e35ec6b11d271a6a57ad886372fba4eb1a02367ab9942030baf04fbeb5fa093d23e38de2614c39c2c75e76795ec69274
-DIST crrcsim-0.9.13.tar.gz 8337392 BLAKE2B ccaaf3a4255b2082fc52712d49302c7de1347b87e9489c6d859662365f1cd5af538fe76cee232aed61b0c1b68138c47a2e34e128071c3e098e20f1d51c1c409c SHA512 b687837e07abc07606404d920288984abe7e304afb69158fd840d83bcfe1e9acc4afd8462c0c759df67d50a15ca3753eaf48c4526b201e64a2d641fa3aa8c1ab
-EBUILD crrcsim-0.9.13.ebuild 1232 BLAKE2B ccf89f098cff67e93ee091af11464fd63878c32b052218acb944c0b22934fc27be1d89c45fbcecdb2c616d4fc30c8c4cc460c6085a41868104bd28dc1dbcc5d4 SHA512 ab16d675e3135e65b649ab7cc9a912c84e4d90881042531b89a06e9ce25cfa44fd5e23f525a6b41396c2b907c25db867e7329e96f0f015bc8c0b1c85098c5adb
-MISC metadata.xml 434 BLAKE2B fee01c09cd762a25d96338cf574d37a09240069d6c4eac694fdcb84bf819310a55c89790902b97f9bb7b58e199106bbfd1e5a89ce2a061e0af91285419d461f6 SHA512 bb752783e5e310b3a0f321dda5ffb813df1b54c9dbd4b062f3a42ab41466751d4029f02bd56eb70d025b6087487782eee4e2b0aedd683d13e99336b512b2cbec
diff --git a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild b/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
deleted file mode 100644
index ef5b5ce752df..000000000000
--- a/games-simulation/crrcsim/crrcsim-0.9.13.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WANT_AUTOMAKE="1.10"
-inherit autotools eutils gnome2-utils
-
-DESCRIPTION="model-airplane flight simulation program"
-HOMEPAGE="https://sourceforge.net/projects/crrcsim/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portaudio"
-
-RDEPEND="media-libs/libsdl[X,sound,joystick,opengl,video]
-	media-libs/plib
-	sci-mathematics/cgal
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-buildsystem.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_prepare() {
-	default
-
-	if has_version "sci-mathematics/cgal[gmp(+)]" ; then
-		eapply "${FILESDIR}"/${PN}-cgal_gmp.patch
-	fi
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--datadir="/usr/share" \
-		--datarootdir="${EPREFIX%/}/usr/share" \
-		--docdir="${EPREFIX%/}/usr/share/doc/${PF}" \
-		$(use_with portaudio)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS HISTORY NEWS README
-	doicon -s 32 packages/icons/${PN}.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-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
deleted file mode 100644
index 396fd573ec90..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-0.9.13-buildsystem.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -79,8 +79,12 @@
- dnl Default is: no portaudio present
- portaudio=0
- 
-+AC_ARG_WITH([portaudio], AS_HELP_STRING([--without-portaudio], [Build without portaudio library (default: test)]))
-+
-+AS_IF([test "x$with_portaudio" != "xno"], [
- dnl Check for the Portaudio header file
- AC_CHECK_HEADER([portaudio.h])
-+])
- 
- if  (test "x$ac_cv_header_portaudio_h" = "xyes"); then 
-   dnl Check for Portaudio 18
---- crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-+++ crrcsim-0.9.13/src/mod_misc/filesystools.cpp
-@@ -113,8 +113,8 @@
-   // $USERPROFILE/.crrcsim                (WIN32)
-   // $HOME/.crrcsim                       (LINUX)
-   // CRRC_DATA_PATH                       (LINUX)
--  // /usr/local/share/games/crrcsim       (LINUX)
--  // /usr/share/games/crrcsim             (LINUX)
-+  // /usr/local/share/crrcsim             (LINUX)
-+  // /usr/share/crrcsim                   (LINUX)
- 
-   // cwd
-   if (dirname != "")
-@@ -154,13 +154,13 @@
-     s.append(dirname);
-     pathlist.push_back(s);
-     #endif
--    s = "/usr/local/share/games/" + appname + "/";
-+    s = "/usr/local/share/" + appname + "/";
-     if (s != data_path)    // avoid adding this path twice
-     {
-       s.append(dirname);
-       pathlist.push_back(s);
-     }
--    s = "/usr/share/games/" + appname + "/";
-+    s = "/usr/share/" + appname + "/";
-     if (s != data_path)    // avoid adding this path twice
-     {
-       s.append(dirname);
-@@ -172,13 +172,13 @@
-     #ifdef CRRC_DATA_PATH
-     pathlist.push_back(data_path);
-     #endif
--    if (data_path != "/usr/local/share/games/" + appname)  // avoid adding this path twice
-+    if (data_path != "/usr/local/share/" + appname)  // avoid adding this path twice
-     {
--      pathlist.push_back("/usr/local/share/games/" + appname);
-+      pathlist.push_back("/usr/local/share/" + appname);
-     }
--    if (data_path != "/usr/share/games/" + appname)  // avoid adding this path twice
-+    if (data_path != "/usr/share/" + appname)  // avoid adding this path twice
-     {
--      pathlist.push_back("/usr/share/games/" + appname);
-+      pathlist.push_back("/usr/share/" + appname);
-     }
-   }
-   #endif
diff --git a/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch b/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
deleted file mode 100644
index b11550f3dff6..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-0.9.13-gcc6.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Bug: https://bugs.gentoo.org/610560
-Upstream commit: https://sourceforge.net/p/crrcsim/code/ci/28ed9ba57011371cab8b637550acc716b973c47d
-
---- a/src/mod_video/crrc_animation.cpp
-+++ b/src/mod_video/crrc_animation.cpp
-@@ -84,7 +84,7 @@
-       else
-       {
-         std::cerr << "createAnimation: unknown animation type \'"
--                  << type << "\'" << std::cerr;
-+                  << type << "\'" << std::endl;
-       }
-       
-       if (anim != NULL)
diff --git a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch b/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
deleted file mode 100644
index 10d6bff6b769..000000000000
--- a/games-simulation/crrcsim/files/crrcsim-cgal_gmp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- crrcsim-0.9.11/configure.ac
-+++ crrcsim-0.9.11/configure.ac
-@@ -229,7 +229,7 @@
-       has_CGAL="yes  (found CGAL v3)"
-     fi   
-     CGAL_CFLAGS=-frounding-math
--    CGAL_LIBS=-lCGAL
-+    CGAL_LIBS="-lCGAL -lgmp"
-     AC_DEFINE([WINDDATA3D], [1], [Import code for wind data, needs CGAL, 0 to disable])
- else
-     has_CGAL="no   (CGAL not found)"
diff --git a/games-simulation/crrcsim/metadata.xml b/games-simulation/crrcsim/metadata.xml
deleted file mode 100644
index 9bc28cff4765..000000000000
--- a/games-simulation/crrcsim/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">crrcsim</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/dangerdeep-0.3.0 b/games-simulation/dangerdeep-0.3.0
new file mode 100644
index 000000000000..74083ca5f138
--- /dev/null
+++ b/games-simulation/dangerdeep-0.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl virtual/glu sci-libs/fftw:3.0 media-libs/libsdl[joystick,opengl,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-net app-arch/unzip dev-util/scons[python_targets_python2_7]
+DESCRIPTION=a World War II German submarine simulation
+EAPI=5
+HOMEPAGE=http://dangerdeep.sourceforge.net/
+IUSE=cpu_flags_x86_sse debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-NC-ND-2.0
+RDEPEND=virtual/opengl virtual/glu sci-libs/fftw:3.0 media-libs/libsdl[joystick,opengl,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[jpeg,png] media-libs/sdl-net games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/dangerdeep/dangerdeep-0.3.0.tar.gz mirror://sourceforge/dangerdeep/dangerdeep-data-0.3.0.zip
+_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_=970ef0bb5c86bd8edfd4f055ee9f7ea4
diff --git a/games-simulation/dangerdeep/Manifest b/games-simulation/dangerdeep/Manifest
deleted file mode 100644
index 2f26e5705f7d..000000000000
--- a/games-simulation/dangerdeep/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX dangerdeep-0.3.0-build.patch 1516 BLAKE2B 93b222884db5be518c122a1ca790943894bd39e1eeb9b53eb19091877123e191e0b2b99f9cf44f7097c50502749ffb2db3f6c531ff55ee9e984d58fe05db71ce SHA512 074e520d59fb483d4f15301fbae4bce7776a24f12d5522db1b1239177433095e663a5839ac2663ac2b6f4090e5d9e779ba1249607bbd47be9f7ddc6bd326318b
-AUX dangerdeep-0.3.0-gcc43.patch 1704 BLAKE2B 3f028a40abc3cffa81939d9941e2102e7630b91b352ac2be0d1436916128169d278a1e74128627a4d7c91b923c522a453bdea259d6d811cb1c48cfcd89d63964 SHA512 aa3c26e08475d1a6262712caceb25839bb86c18d23d7fb1a14c84fbe960c0596440f6b20e7a1921dc1c04c6adba44c317e4aeac1b13a80e21ecc44a513efc05f
-AUX dangerdeep-0.3.0-gcc44.patch 339 BLAKE2B 62a9868ddb6c723529e0a3bcb29fed4a4879d77708652fa18df6e46070c57bbcb56c8ae6a9fa4267699584914ece2601ce35cd2c1bf336f549ba9974bc9acd75 SHA512 3a17a8e577e9e3e6ac66a14e1c55a612e567286a6a7141592399a8f914999adb16c346ad9b7e4366e41885f4af4887795644e92e3796f522844d90651ea9128e
-AUX dangerdeep-0.3.0-gcc47.patch 311 BLAKE2B 982f3f9b20689da95be99b117abce3308509bd545ca1df272831759300a5c6a0ad858a9caad0e2f2ef56d6474252a64384c4feafae3f798bb6a47510e09a9832 SHA512 f071856eec5c1643e1915e48f68175ca61ce7447f3801dd859476b0e7d400ffdfd1a359851f176d971565d480405395566c330348acf9b7b5f6af202cad3a649
-AUX dangerdeep-0.3.0-gcc6.patch 898 BLAKE2B f5def500c096c65cc4b4e1b89a039d168b3ce6d8622d814f70f5f52b61ccbd5662b76eae109f5a1e47205ec7225bfb3500d9d7cb887c798af016e6b18d56fa36 SHA512 4bd3d6e9077ae408feaf38de6f0b9c484f345e87bc79bdcebfb7d8a73c4686dafabc4617b08a1532fdb2fe6ca2afb2a8932f486f54134c891972ef1882650fb3
-DIST dangerdeep-0.3.0.tar.gz 1100972 BLAKE2B 5f0de6c1e37759a480a8d6f835efb6dba96321697fb5a15559d35cb27a35356c4a307bf1138c237af1722365f18a9d341cf6cab122c8ebe4f1bacc088abc666a SHA512 97d47654d6d3728365ec0f7955f360a35ad105442663f5dd05f0a37ae6ae67216eb33f183df788c3cd0ba9878dbef22d607ddac86bf43159e87ef1c2429b7f87
-DIST dangerdeep-data-0.3.0.zip 61914764 BLAKE2B a727364509e8dc166338bb0c587d48f0b2ffbf406fde94aecae7435b8b1707af128ec80b6c74f04de46eb56d48189f7b7149f20f6a1836e4547fa30aa4c2eb42 SHA512 c6d7de055abc77c1c61d0f999d885f44121934d66f89c8e4e55231cc20605ef679cd278bebadc879862e3da07d46bae3ab02f97d3ee4179762efd895e8f91b3e
-EBUILD dangerdeep-0.3.0.ebuild 1387 BLAKE2B f2f69d9b85e6d7abd23a5c1fbefdaee115bf35a3dc56a90226ff347b8a54a6bc0925b12a583d944be64d8212121bba5f57b5a06fe0a42c8a247221c234fd3ea9 SHA512 66d73dfbdb733b363aa12ef7acdef7b2c05dab25ca825c053f5b4db2946f7784b9def2b4a1cf1b21e9da48cc74173c5fd4bbe97fa4b1df28dba99a080c139dfa
-MISC metadata.xml 333 BLAKE2B 80892da67439a3879df882ea5ef0b52e8e40e63857d86f78411a7da3178d07f944cd632fefd9a062c301f584d3a32cbaab2e5792d49510ca60f014166fd84259 SHA512 399d1439cce706aad93bcaf11f84e4e0481e104549468b007c09c8592c9ebe4309a12293724f622bd44c7812f77ba21b85571636ff9559ae0bae77a6cae1acc1
diff --git a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild b/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
deleted file mode 100644
index 44122c119cf3..000000000000
--- a/games-simulation/dangerdeep/dangerdeep-0.3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils games
-
-DESCRIPTION="a World War II German submarine simulation"
-HOMEPAGE="http://dangerdeep.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${PN}-data-${PV}.zip"
-
-LICENSE="GPL-2 CC-BY-NC-ND-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse debug"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	sci-libs/fftw:3.0
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-net"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc47.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-gcc6.patch
-	sed -i -e "/console_log.txt/ s:fopen.*:stderr;:" src/system.cpp || die
-}
-
-src_compile() {
-	local sse=-1
-
-	if use cpu_flags_x86_sse ; then
-		use amd64 && sse=3 || sse=1
-	fi
-
-	escons \
-		usex86sse=${sse} \
-		datadir="${GAMES_DATADIR}"/${PN} \
-		$(use_scons debug)
-}
-
-src_install() {
-	dogamesbin build/linux/${PN}
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r ../data/*
-
-	newicon dftd_icon.png ${PN}.png
-	make_desktop_entry ${PN} "Danger from the Deep"
-
-	dodoc ChangeLog CREDITS README
-	doman doc/man/${PN}.6
-
-	prepgamesdirs
-}
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
deleted file mode 100644
index 367db1cfbb96..000000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- SConstruct
-+++ SConstruct
-@@ -119,6 +119,7 @@
- 
- else:
- 	print "Compiling for Unix/Posix/Linux Environment"
-+	SConsignFile()
- 	env = Environment(ENV = os.environ)
- 	env.Append(CPPPATH = ['/usr/include/SDL', '/usr/include/GL'])
- 	libpath = ['/usr/X11R6/lib']
-@@ -126,13 +127,18 @@
- 	sdllibs = ['SDL', 'SDL_image']
- 	ccflags = '-Wall `sdl-config --cflags` `pkg-config --cflags x11`'
- 	env.Append(LINKFLAGS = '`pkg-config --libs-only-L x11`')
-+	if os.environ.has_key('CXX'):
-+		env['CXX'] = os.environ['CXX']
-+	if os.environ.has_key('CXXFLAGS'):
-+		ccflags += os.environ['CXXFLAGS']
-+	if os.environ.has_key('LDFLAGS'):
-+		env.Append(LINKFLAGS = os.environ['LDFLAGS'])
- 	if (debug >= 3):
- 		ccflags += ' -g -pg -O3'	# profiling
- 	elif (debug == 2):
- 		ccflags += ' -g -O0'
- 		env.Append(CPPDEFINES = ['DEBUG'])
- 	elif (debug == 1):
--		ccflags += ' -g -O1'
- 		env.Append(CPPDEFINES = ['DEBUG'])
- 	elif (debug == -1):
- 		ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow'
-@@ -140,8 +144,6 @@
- 		ccflags += ' -g -O3 -march=athlon-xp -mfpmath=sse -mmmx -msse -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
- 	elif (debug == -3):	# special g++4.0+ auto vectorization
- 		ccflags += ' -g -O3 -march=athlon64 -mfpmath=sse -mmmx -msse -msse2 -m3dnow -ftree-vectorize -ftree-vectorizer-verbose=2'
--	else:
--		ccflags += ' -g -O2' # debug symbols will be stripped by the linker for a debian package
- 	# choose specific architecture if requested
- 	if archflag != '':
- 		ccflags += ' -march=' + archflag
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
deleted file mode 100644
index 1588b0bbae07..000000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc43.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- src/bspline_test.cpp
-+++ src/bspline_test.cpp
-@@ -1,6 +1,7 @@
- // some test code for the 2d bsplines!
- #include "bspline.h"
- #include <fstream>
-+#include <cstdlib>
- using namespace std;
- 
- double rnd() { return double(rand())/RAND_MAX; }
---- src/convoy.h
-+++ src/convoy.h
-@@ -27,6 +27,7 @@
- #include "vector2.h"
- #include <new>
- #include <list>
-+#include <memory>
- class ship;
- 
- ///\brief Grouping of ships and other objects with central control.
---- src/date.cpp
-+++ src/date.cpp
-@@ -21,6 +21,7 @@
- // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE
- 
- #include <iomanip>
-+#include <cstdlib>
- #include "date.h"
- #include "texts.h"
- 
---- src/ocean_wave_generator.h
-+++ src/ocean_wave_generator.h
-@@ -29,6 +29,7 @@
- #include "environment.h"
- #include <complex>
- #include <vector>
-+#include <cstdlib>
- 
- // use float fftw (faster) or double (default) ?
- #ifdef WITH_FLOAT_FFTW
---- src/ptrlist.h
-+++ src/ptrlist.h
-@@ -25,6 +25,7 @@
- 
- #include <list>
- #include <stdexcept>
-+#include <memory>
- 
- // same as std::list regarding the interface (partly), but handles pointers.
- template <class T>
---- src/ptrvector.h
-+++ src/ptrvector.h
-@@ -25,6 +25,7 @@
- 
- #include <vector>
- #include <stdexcept>
-+#include <memory>
- 
- // same as std::vector regarding the interface, but handles pointers.
- template <class T>
---- src/sea_object.h
-+++ src/sea_object.h
-@@ -27,6 +27,7 @@
- #include "ptrvector.h"
- #include <new>
- #include <stdexcept>
-+#include <memory>
- 
- #include "vector3.h"
- #include "angle.h"
---- src/widget.cpp
-+++ src/widget.cpp
-@@ -32,6 +32,7 @@
- #include "datadirs.h"
- #include <set>
- #include <sstream>
-+#include <algorithm>
- using std::vector;
- using std::list;
- using std::string;
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
deleted file mode 100644
index 23d3c470c900..000000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/date.cpp
-+++ src/date.cpp
-@@ -22,6 +22,7 @@
- 
- #include <iomanip>
- #include <cstdlib>
-+#include <cstdio>
- #include "date.h"
- #include "texts.h"
- 
---- src/filehelper.cpp
-+++ src/filehelper.cpp
-@@ -23,6 +23,7 @@
- #include "filehelper.h"
- #include "error.h"
- #include <vector>
-+#include <cstdio>
- using namespace std;
- 
- #ifdef WIN32
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
deleted file mode 100644
index 54adcec10daf..000000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc47.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/faulthandler.h.old	2012-07-25 14:37:32.000000000 +0200
-+++ src/faulthandler.h	2012-07-25 14:38:16.000000000 +0200
-@@ -50,6 +50,7 @@
- #include <signal.h>
- #include <string>
- #include <sstream>
-+#include <unistd.h>
- 
- // Note: use --export-dynamic as linker option or you won't get function names here.
- 
diff --git a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch b/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
deleted file mode 100644
index 1634aa763e4c..000000000000
--- a/games-simulation/dangerdeep/files/dangerdeep-0.3.0-gcc6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Bug: https://bugs.gentoo.org/show_bug.cgi?id=610654
-Upstream Ticket: https://sourceforge.net/p/dangerdeep/patches/26/
-
---- a/src/system.cpp
-+++ b/src/system.cpp
-@@ -178,7 +178,7 @@
- 	instance = this;
- }
- 
--system::~system()
-+system::~system() DTOR_NOEXCEPT
- {
- 	if (!instance) {
- 		SDL_Quit();
---- a/src/system.h
-+++ b/src/system.h
-@@ -52,6 +52,12 @@
- #define ASSERT(a,...)
- #endif
- 
-+#if __cplusplus >= 201103L
-+#define DTOR_NOEXCEPT noexcept(false)
-+#else
-+#define DTOR_NOEXCEPT
-+#endif
-+
- class font;
- class texture;
- 
-@@ -61,7 +67,7 @@
- public:
- 	enum button_type { left_button=0x1, right_button=0x2, middle_button=0x4, wheel_up=0x8, wheel_down=0x10 };
- 	system(double nearz_, double farz_, unsigned res_x=1024, unsigned res_y=768, bool fullscreen=true);
--	~system();
-+	~system() DTOR_NOEXCEPT;
- 	void set_video_mode(unsigned res_x_, unsigned res_y_, bool fullscreen);
- 	void swap_buffers();
- 
diff --git a/games-simulation/dangerdeep/metadata.xml b/games-simulation/dangerdeep/metadata.xml
deleted file mode 100644
index 461e3ba8e89b..000000000000
--- a/games-simulation/dangerdeep/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dangerdeep</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/flightgear-2018.1.1 b/games-simulation/flightgear-2018.1.1
new file mode 100644
index 000000000000..a300f7506bcb
--- /dev/null
+++ b/games-simulation/flightgear-2018.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Open Source Flight Simulator
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.1.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.1.1
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.1.1.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	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_=6e0fd50a2fe96d27c794fc34dadca527
diff --git a/games-simulation/flightgear-2018.2.1 b/games-simulation/flightgear-2018.2.1
new file mode 100644
index 000000000000..aa89a41cfc90
--- /dev/null
+++ b/games-simulation/flightgear-2018.2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.2.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Open Source Flight Simulator
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-2018.2.1[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-2018.2.1
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/flightgear-2018.2.1.tar.bz2
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	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_=7dfb2ebb2fe6cdfcedf805df9067c84b
diff --git a/games-simulation/flightgear-9999 b/games-simulation/flightgear-9999
new file mode 100644
index 000000000000..d21b38adcd19
--- /dev/null
+++ b/games-simulation/flightgear-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
+DEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) >=dev-libs/boost-1.44 >=media-libs/plib-1.8.5 utils? ( x11-libs/libXi x11-libs/libXmu ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Open Source Flight Simulator
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+IUSE=dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax
+LICENSE=GPL-2
+RDEPEND=dev-db/sqlite:3 >=dev-games/openscenegraph-3.2.0[jpeg,png] ~dev-games/simgear-9999[gdal=] media-libs/openal >=media-libs/speex-1.2.0:0 media-libs/speexdsp:0 media-sound/gsm sys-libs/zlib virtual/glu x11-libs/libX11 dbus? ( >=sys-apps/dbus-1.6.18-r1 ) gdal? ( >=sci-libs/gdal-2.0.0:0 ) qt5? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 ) udev? ( virtual/udev ) utils? ( media-libs/freeglut media-libs/freetype:2 media-libs/glew:0 media-libs/libpng:0 virtual/opengl qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 ) ) ~games-simulation/flightgear-data-9999
+SLOT=0
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05a9d8e1182024bb3594b8b29e122bf8
diff --git a/games-simulation/flightgear-data-2018.1.1 b/games-simulation/flightgear-data-2018.1.1
new file mode 100644
index 000000000000..2fa65586faa0
--- /dev/null
+++ b/games-simulation/flightgear-data-2018.1.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=FlightGear data files
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<games-simulation/flightgear-2.10.0
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/FlightGear-2018.1.1-data.tar.bz2
+_md5_=6d1392d5134baed3cb4d88f3ec7e4527
diff --git a/games-simulation/flightgear-data-2018.2.1 b/games-simulation/flightgear-data-2018.2.1
new file mode 100644
index 000000000000..e790985c93b7
--- /dev/null
+++ b/games-simulation/flightgear-data-2018.2.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=FlightGear data files
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!<games-simulation/flightgear-2.10.0
+SLOT=0
+SRC_URI=mirror://sourceforge/flightgear/FlightGear-2018.2.1-data.tar.bz2
+_md5_=7d7bcb03b285aa0d1ee17c420ba0631f
diff --git a/games-simulation/flightgear-data-9999 b/games-simulation/flightgear-data-9999
new file mode 100644
index 000000000000..6ff62a323d05
--- /dev/null
+++ b/games-simulation/flightgear-data-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install unpack
+DEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=FlightGear data files
+EAPI=6
+HOMEPAGE=http://www.flightgear.org/
+LICENSE=GPL-2
+RDEPEND=!<games-simulation/flightgear-2.10.0
+SLOT=0
+_eclasses_=git-r3	8f6de46b0aa318aea0e8cac62ece098b
+_md5_=bde9fe5b13b85f270b9a654f588685c0
diff --git a/games-simulation/flightgear-data/Manifest b/games-simulation/flightgear-data/Manifest
deleted file mode 100644
index 114cc3e21bb6..000000000000
--- a/games-simulation/flightgear-data/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST FlightGear-2018.1.1-data.tar.bz2 1576049981 BLAKE2B cfcf028ca04ed785ba7c65979e6566ab773d8af869a9b62050969295eafecf7d1f5b6162f498af96786fa23a46e886390f240b56c83e7107473f59552a1155a5 SHA512 022f102f95c9cd8b153d991dad55ecd182e71aa0f3ecfe1502a35d6dcda0746a1fd183f808e59aba8c7f3a0cc9ae1f2f91ff49565bff4c7bc5a1c4889fcc127f
-DIST FlightGear-2018.2.1-data.tar.bz2 1624676603 BLAKE2B baecea2002fc3c256205e70c6692102f9bccd04c839902353b0e6d803a97221479e8b54095530dc7af366d842c487d04447f0fd775527e6f5ea0ac32ed602dd6 SHA512 93690703965dd83b610ea0ba67938c0d3fb2d5f6d8c842851a979f352387431eacafb4d181a56dad6def474b2ab84f412cf5531570ce18c1ec80076fe92e4d05
-EBUILD flightgear-data-2018.1.1.ebuild 518 BLAKE2B afd977b91675529215c7c72fb939a8a2c1be99b5af682a86cfd06175b9a9386c6fe665b31fe8e2e5102fba0f33f0d28bed2c150e614758f6b758738b9c53c86d SHA512 02ea5407ec76fadeb0230b3567e9c83445d562a49853681c1b5418dc4ccd7e97e582e4776bef02347fed25270ab2637fb8b530beca6ebfa1d19b805209d4192f
-EBUILD flightgear-data-2018.2.1.ebuild 518 BLAKE2B b28ff44f4d60306ee8edd3d1cc1af8659891ec4d358aa677112d3489584f3d79abc4d093b84795750894ce8f6bbffefaaa219df6b6467189aa445dfe7d05fde0 SHA512 6c2c9171b3d91fd9eeb5c3b2f6cfbdd5cc5a6fe6ab3ec5cb8fbc9bbf6b311f69e43d269fdff725a4eb1e081e72aab191ab544f890954fdec4fd99088be881ddc
-EBUILD flightgear-data-9999.ebuild 546 BLAKE2B ea1647fcbee2eee6a213ad67e6fa6ca22ee66d8a7ed4cc6928a75a9e2852b9befbba63aa5032921da37aa83cbb22d3d6433d459faa5787d80cdd33678215125c SHA512 92dae00bd54b164590c4c9cd66f3797a8f39211a66773c6cb710ecfff4d47f1d65d03861ec9648a8165a823f038f3d19b54dbd2b9b145147d29696569b4ae508
-MISC metadata.xml 445 BLAKE2B a66be5a62283a2a7c8c086ad4d0cfbce8e1c7bdcd890e39fef504821b8eb01facc32f36afcdc4c62544bbc1b5c5b49e8a752f8b42dcbcf7adeb50b0cb5fd7afc SHA512 d68eedacc672f04b42ec6d6a9e0e8302dbe09283f73484945b9c8c277a1c65c02c19c1187dc18d4c9e68d56a26cd989d04df83e74ff44d48977fe3c24fb81466
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild
deleted file mode 100644
index f835ef53253b..000000000000
--- a/games-simulation/flightgear-data/flightgear-data-2018.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
-S=${WORKDIR}/fgdata
-
-src_install() {
-	insinto /usr/share/flightgear
-	rm -fr .git
-	doins -r *
-}
diff --git a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild b/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
deleted file mode 100644
index f364395e8473..000000000000
--- a/games-simulation/flightgear-data/flightgear-data-2018.2.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/FlightGear-${PV}-data.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
-S=${WORKDIR}/fgdata
-
-src_install() {
-	insinto /usr/share/flightgear
-	rm -fr .git
-	doins -r *
-}
diff --git a/games-simulation/flightgear-data/flightgear-data-9999.ebuild b/games-simulation/flightgear-data/flightgear-data-9999.ebuild
deleted file mode 100644
index 3e99ac372dbe..000000000000
--- a/games-simulation/flightgear-data/flightgear-data-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="FlightGear data files"
-HOMEPAGE="http://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/flightgear/fgdata
-	git://mapserver.flightgear.org/fgdata"
-EGIT_BRANCH="next"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-# data files split to separate package since 2.10.0
-RDEPEND="
-	!<games-simulation/flightgear-2.10.0
-"
-
-src_install() {
-	insinto /usr/share/flightgear
-	rm -fr .git
-	doins -r *
-}
diff --git a/games-simulation/flightgear-data/metadata.xml b/games-simulation/flightgear-data/metadata.xml
deleted file mode 100644
index 40aacc328d8e..000000000000
--- a/games-simulation/flightgear-data/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">flightgear</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/flightgear/Manifest b/games-simulation/flightgear/Manifest
deleted file mode 100644
index 6d5c731446e3..000000000000
--- a/games-simulation/flightgear/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
-AUX flightgear-2018.2.1-cmake.patch 364 BLAKE2B fd191b13792a4a9846dfc1a1f3875e13cd0641f3caf9572498d841ada6b20036610ff667d66781990d71a34f0e7bca893c403e6988c903066abd305aa47be4a8 SHA512 522e4f3cb8f1e0d8f4b44d4454d5652ba545841b9d8f8f180bc45a059274580ed64b11ab64fd2e5214100f85dbf4b8de365478d367115f242f46ce2ae789141c
-AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
-DIST flightgear-2018.1.1.tar.bz2 8158999 BLAKE2B 5d7ca65c0b2627c7b34681e0af8e060f67cbed80d7e313c056fb92f026bc2355af66bbb6b377573db32f5101c63f1fa04521ba7fdffd584a56ae1049d1bcce83 SHA512 962be602a8c294081109ee1893383ac22dd83a0511fdb600d24d5dc9eca24d19687eaeed545695259502431e6d8c8bcdafe26846636ad40be28f5c2e4b0cfe93
-DIST flightgear-2018.2.1.tar.bz2 8344999 BLAKE2B fc5fbd43bcc2e40ed3245aa5059b0e5a40918a707cbddc8383de191e29f6cdfaa6960f6cfffb201b20ad10f5da0f343a693768d38be2788fd2582f7b5dc2419c SHA512 d308eebf6d6017794c086d534f6543c03a54e55bd7f48caf8359d5a84776406eac8cd8f32252efb2cd8bbb82c9c15fe4d7e3229ff2483e7a9772bd532331be03
-EBUILD flightgear-2018.1.1.ebuild 3675 BLAKE2B 3b5f1278f9d30def22ce34477f0a014de7aded6c8065758f518040211ddb5df5d834d4eeec3eb70c34705117cc8cd4541e80b37781d6e5fcc27932aec4c476a4 SHA512 b6854ea8183ff5674935a33c223c881e181fc71999e0af93d3af5a9104bc03630b25cb50d7dc019360efb70056fd53f5a2debfb507bff59d2ca08d094eee7c3b
-EBUILD flightgear-2018.2.1.ebuild 3864 BLAKE2B 2cf1d7735e1b5395f00580b83d32518eabc3468cc9992836bc7ab084a5b157e7ff94504f61282a25dd8dbd86ea7dc2d9b3faee58fad80e4b2377146e835ca37c SHA512 67f6547445806bab8e6c57ae727784a7f7c82a3784d3cfd532ecf26b9e19accda55fd0bd265ef18fdb01ee49e5559a2f13bdd73f23a2f855157eebeb14fb2c13
-EBUILD flightgear-9999.ebuild 3725 BLAKE2B 433c07af5de569f1add5ed24527745d40b2f65bdf1e9e9fc611f1bd22159559c778b7b6b4181acd2055ebf4b3c6d6c27298f55979b03f42466ad4ea1435d4c90 SHA512 88412936aa8b2a16fb9501952345185f66d8952c8727422250f17868a3b70639e23da2cb82d2640d80d6183bcc30c1d9cf6baf782cf6da0a8cc1a048c97e3066
-MISC metadata.xml 867 BLAKE2B b6bb892bffffec9fa00677768455fc49dd49164fae26b1c6ae70ac905feeaca79d670f4041294fb94e7c11d741a68bc6e3205e34aba5caf36da77fc808fdff8c SHA512 645a952785a101a8400be7a2608e7c71007c093c8f7cdbd0fab36f21b64ea1bbeb67e8f30404ab63841d41e5709a30570223732ebb586c780727ab0cfed0d943
diff --git a/games-simulation/flightgear/files/ac3d.vim b/games-simulation/flightgear/files/ac3d.vim
deleted file mode 100644
index 6477d949b762..000000000000
--- a/games-simulation/flightgear/files/ac3d.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufRead,BufNewFile *.ac set filetype=ac3d
diff --git a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch b/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
deleted file mode 100644
index eca04212833a..000000000000
--- a/games-simulation/flightgear/files/flightgear-2018.2.1-cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ruN flightgear-2018.2.1/CMakeLists.txt my/CMakeLists.txt
---- flightgear-2018.2.1/CMakeLists.txt	2018-06-03 09:47:23.000000000 +0200
-+++ my/CMakeLists.txt	2018-06-07 01:09:14.621303443 +0200
-@@ -596,4 +596,6 @@
- 
- 
- # The test suite.
--add_subdirectory(test_suite EXCLUDE_FROM_ALL)
-+if(ENABLE_TESTS)
-+    add_subdirectory(test_suite EXCLUDE_FROM_ALL)
-+endif()
diff --git a/games-simulation/flightgear/files/nasal.vim b/games-simulation/flightgear/files/nasal.vim
deleted file mode 100644
index 65a2ed17fc26..000000000000
--- a/games-simulation/flightgear/files/nasal.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufRead,BufNewFile *.nas set filetype=nasal
diff --git a/games-simulation/flightgear/flightgear-2018.1.1.ebuild b/games-simulation/flightgear/flightgear-2018.1.1.ebuild
deleted file mode 100644
index f32f93c30b98..000000000000
--- a/games-simulation/flightgear/flightgear-2018.1.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	>=dev-games/openscenegraph-3.2.0[jpeg,png]
-	~dev-games/simgear-${PV}[gdal=]
-	media-libs/openal
-	>=media-libs/speex-1.2.0:0
-	media-libs/speexdsp:0
-	media-sound/gsm
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
-	gdal? ( >=sci-libs/gdal-2.0.0:0 )
-	qt5? (
-		>=dev-qt/qtcore-5.7.1:5
-		>=dev-qt/qtdeclarative-5.7.1:5
-		>=dev-qt/qtgui-5.7.1:5
-		>=dev-qt/qtnetwork-5.7.1:5
-		>=dev-qt/qtwidgets-5.7.1:5
-	)
-	udev? ( virtual/udev )
-	utils? (
-		media-libs/freeglut
-		media-libs/freetype:2
-		media-libs/glew:0
-		media-libs/libpng:0
-		virtual/opengl
-		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
-	)
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-	>=media-libs/plib-1.8.5
-	utils? (
-		x11-libs/libXi
-		x11-libs/libXmu
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	~games-simulation/${PN}-data-${PV}
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
-		-DENABLE_FGCOM=$(usex utils)
-		-DENABLE_FGELEV=$(usex utils)
-		-DENABLE_FGJS=$(usex utils)
-		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
-		-DENABLE_FGVIEWER=$(usex utils)
-		-DENABLE_FLITE=OFF
-		-DENABLE_GDAL=$(usex gdal)
-		-DENABLE_GPSSMOOTH=$(usex utils)
-		-DENABLE_HID_INPUT=$(usex udev)
-		-DENABLE_JS_DEMO=$(usex utils)
-		-DENABLE_JSBSIM=ON
-		-DENABLE_LARCSIM=ON
-		-DENABLE_METAR=$(usex utils)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PROFILE=OFF
-		-DENABLE_QT=$(usex qt5)
-		-DENABLE_RTI=OFF
-		-DENABLE_TERRASYNC=$(usex utils)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRAFFIC=$(usex utils)
-		-DENABLE_UIUC_MODEL=ON
-		-DENABLE_YASIM=ON
-		-DEVENT_INPUT=$(usex udev)
-		-DFG_BUILD_TYPE=Release
-		-DFG_DATA_DIR=/usr/share/${PN}
-		-DJSBSIM_TERRAIN=ON
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-		-DSP_FDMS=ON
-		-DSYSTEM_FLITE=ON
-		-DSYSTEM_HTS_ENGINE=ON
-		-DSYSTEM_SPEEX=ON
-		-DSYSTEM_GSM=ON
-		-DSYSTEM_SQLITE=ON
-		-DUSE_AEONWAVE=OFF
-		-DUSE_DBUS=$(usex dbus)
-		-DWITH_FGPANEL=$(usex utils)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install bash completion (TODO zsh)
-	# Uncomment below when scripts stops writing files...
-#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
-#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
-#	newbashcomp scripts/completion/fg-completion.bash ${PN}
-
-	# Install examples and other misc files
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins -r scripts/java scripts/perl scripts/python
-		insinto /usr/share/doc/"${PF}"/examples/c++
-		doins -r scripts/example/*
-		insinto /usr/share/doc/"${PF}"/tools
-		doins -r scripts/atis scripts/tools/*
-	fi
-
-	# Install nasal script syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/syntax/{ac3d,nasal}.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		doins "${FILESDIR}"/{ac3d,nasal}.vim
-	fi
-}
-
-pkg_postinst() {
-	einfo "Please note that data files location changed to /usr/share/flightgear"
-	if use qt5; then
-		einfo "To use launcher, run fgfs with '--launcher' parameter"
-	fi
-}
diff --git a/games-simulation/flightgear/flightgear-2018.2.1.ebuild b/games-simulation/flightgear/flightgear-2018.2.1.ebuild
deleted file mode 100644
index 15be88e6c57e..000000000000
--- a/games-simulation/flightgear/flightgear-2018.2.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1 toolchain-funcs
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
-SRC_URI="mirror://sourceforge/flightgear/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	>=dev-games/openscenegraph-3.2.0[jpeg,png]
-	~dev-games/simgear-${PV}[gdal=]
-	media-libs/openal
-	>=media-libs/speex-1.2.0:0
-	media-libs/speexdsp:0
-	media-sound/gsm
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
-	gdal? ( >=sci-libs/gdal-2.0.0:0 )
-	qt5? (
-		>=dev-qt/qtcore-5.7.1:5
-		>=dev-qt/qtdeclarative-5.7.1:5
-		>=dev-qt/qtgui-5.7.1:5
-		>=dev-qt/qtnetwork-5.7.1:5
-		>=dev-qt/qtwidgets-5.7.1:5
-	)
-	udev? ( virtual/udev )
-	utils? (
-		media-libs/freeglut
-		media-libs/freetype:2
-		media-libs/glew:0
-		media-libs/libpng:0
-		virtual/opengl
-		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
-	)
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-	>=media-libs/plib-1.8.5
-	utils? (
-		x11-libs/libXi
-		x11-libs/libXmu
-	)
-	test? ( dev-util/cppunit )
-"
-RDEPEND="${COMMON_DEPEND}
-	~games-simulation/${PN}-data-${PV}
-"
-
-PATCHES=("${FILESDIR}/${P}-cmake.patch")
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_AUTOTESTING=OFF
-		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
-		-DENABLE_FGCOM=$(usex utils)
-		-DENABLE_FGELEV=$(usex utils)
-		-DENABLE_FGJS=$(usex utils)
-		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
-		-DENABLE_FGVIEWER=$(usex utils)
-		-DENABLE_FLITE=OFF
-		-DENABLE_GDAL=$(usex gdal)
-		-DENABLE_GPSSMOOTH=$(usex utils)
-		-DENABLE_HID_INPUT=$(usex udev)
-		-DENABLE_JS_DEMO=$(usex utils)
-		-DENABLE_JSBSIM=ON
-		-DENABLE_LARCSIM=ON
-		-DENABLE_METAR=$(usex utils)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
-		-DENABLE_PROFILE=OFF
-		-DENABLE_QT=$(usex qt5)
-		-DENABLE_RTI=OFF
-		-DENABLE_TERRASYNC=$(usex utils)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRAFFIC=$(usex utils)
-		-DENABLE_UIUC_MODEL=ON
-		-DENABLE_YASIM=ON
-		-DEVENT_INPUT=$(usex udev)
-		-DFG_BUILD_TYPE=Release
-		-DFG_DATA_DIR=/usr/share/${PN}
-		-DJSBSIM_TERRAIN=ON
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-		-DSP_FDMS=ON
-		-DSYSTEM_CPPUNIT=ON
-		-DSYSTEM_FLITE=ON
-		-DSYSTEM_HTS_ENGINE=ON
-		-DSYSTEM_SPEEX=ON
-		-DSYSTEM_GSM=ON
-		-DSYSTEM_SQLITE=ON
-		-DUSE_AEONWAVE=OFF
-		-DUSE_DBUS=$(usex dbus)
-		-DWITH_FGPANEL=$(usex utils)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install bash completion (TODO zsh)
-	# Uncomment below when scripts stops writing files...
-#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
-#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
-#	newbashcomp scripts/completion/fg-completion.bash ${PN}
-
-	# Install examples and other misc files
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins -r scripts/java scripts/perl scripts/python
-		insinto /usr/share/doc/"${PF}"/examples/c++
-		doins -r scripts/example/*
-		insinto /usr/share/doc/"${PF}"/tools
-		doins -r scripts/atis scripts/tools/*
-	fi
-
-	# Install nasal script syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/syntax/{ac3d,nasal}.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		doins "${FILESDIR}"/{ac3d,nasal}.vim
-	fi
-}
-
-pkg_postinst() {
-	einfo "Please note that data files location changed to /usr/share/flightgear"
-	if use qt5; then
-		einfo "To use launcher, run fgfs with '--launcher' parameter"
-	fi
-}
diff --git a/games-simulation/flightgear/flightgear-9999.ebuild b/games-simulation/flightgear/flightgear-9999.ebuild
deleted file mode 100644
index 10e2e7113b34..000000000000
--- a/games-simulation/flightgear/flightgear-9999.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils bash-completion-r1 toolchain-funcs git-r3
-
-DESCRIPTION="Open Source Flight Simulator"
-HOMEPAGE="http://www.flightgear.org/"
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/${PN}
-	git://mapserver.flightgear.org/${PN}"
-EGIT_BRANCH="next"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-SLOT="0"
-IUSE="dbus debug examples gdal openmp qt5 test +udev +utils vim-syntax"
-
-# zlib is some strange auto-dep from simgear
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	>=dev-games/openscenegraph-3.2.0[jpeg,png]
-	~dev-games/simgear-${PV}[gdal=]
-	media-libs/openal
-	>=media-libs/speex-1.2.0:0
-	media-libs/speexdsp:0
-	media-sound/gsm
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/libX11
-	dbus? ( >=sys-apps/dbus-1.6.18-r1 )
-	gdal? ( >=sci-libs/gdal-2.0.0:0 )
-	qt5? (
-		>=dev-qt/qtcore-5.7.1:5
-		>=dev-qt/qtdeclarative-5.7.1:5
-		>=dev-qt/qtgui-5.7.1:5
-		>=dev-qt/qtnetwork-5.7.1:5
-		>=dev-qt/qtwidgets-5.7.1:5
-	)
-	udev? ( virtual/udev )
-	utils? (
-		media-libs/freeglut
-		media-libs/freetype:2
-		media-libs/glew:0
-		media-libs/libpng:0
-		virtual/opengl
-		qt5? ( >=dev-qt/qtwebsockets-5.7.1:5 )
-	)
-"
-# libXi and libXmu are build-only-deps according to FindGLUT.cmake
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/boost-1.44
-	>=media-libs/plib-1.8.5
-	utils? (
-		x11-libs/libXi
-		x11-libs/libXmu
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	~games-simulation/${PN}-data-${PV}
-"
-
-DOCS=(AUTHORS ChangeLog NEWS README Thanks)
-
-pkg_pretend() {
-	use openmp && tc-check-openmp
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEMCONVERT=$(usex gdal && usex utils)
-		-DENABLE_FGCOM=$(usex utils)
-		-DENABLE_FGELEV=$(usex utils)
-		-DENABLE_FGJS=$(usex utils)
-		-DENABLE_FGQCANVAS=$(usex qt5 && usex utils)
-		-DENABLE_FGVIEWER=$(usex utils)
-		-DENABLE_FLITE=OFF
-		-DENABLE_GDAL=$(usex gdal)
-		-DENABLE_GPSSMOOTH=$(usex utils)
-		-DENABLE_HID_INPUT=$(usex udev)
-		-DENABLE_JS_DEMO=$(usex utils)
-		-DENABLE_JSBSIM=ON
-		-DENABLE_LARCSIM=ON
-		-DENABLE_METAR=$(usex utils)
-		-DENABLE_OPENMP=$(usex openmp)
-		-DENABLE_PROFILE=OFF
-		-DENABLE_QT=$(usex qt5)
-		-DENABLE_RTI=OFF
-		-DENABLE_TERRASYNC=$(usex utils)
-		-DENABLE_TESTS=$(usex test)
-		-DENABLE_TRAFFIC=$(usex utils)
-		-DENABLE_UIUC_MODEL=ON
-		-DENABLE_YASIM=ON
-		-DEVENT_INPUT=$(usex udev)
-		-DFG_BUILD_TYPE=Nightly
-		-DFG_DATA_DIR=/usr/share/${PN}
-		-DJSBSIM_TERRAIN=ON
-		-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
-		-DSP_FDMS=ON
-		-DSYSTEM_FLITE=ON
-		-DSYSTEM_HTS_ENGINE=ON
-		-DSYSTEM_SPEEX=ON
-		-DSYSTEM_GSM=ON
-		-DSYSTEM_SQLITE=ON
-		-DUSE_AEONWAVE=OFF
-		-DUSE_DBUS=$(usex dbus)
-		-DWITH_FGPANEL=$(usex utils)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Install bash completion (TODO zsh)
-	# Uncomment below when scripts stops writing files...
-#	sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
-#		-i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
-#	newbashcomp scripts/completion/fg-completion.bash ${PN}
-
-	# Install examples and other misc files
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins -r scripts/java scripts/perl scripts/python
-		insinto /usr/share/doc/"${PF}"/examples/c++
-		doins -r scripts/example/*
-		insinto /usr/share/doc/"${PF}"/tools
-		doins -r scripts/atis scripts/tools/*
-	fi
-
-	# Install nasal script syntax
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins scripts/syntax/{ac3d,nasal}.vim
-		insinto /usr/share/vim/vimfiles/ftdetect/
-		doins "${FILESDIR}"/{ac3d,nasal}.vim
-	fi
-}
-
-pkg_postinst() {
-	einfo "Please note that data files location changed to /usr/share/flightgear"
-	if use qt5; then
-		einfo "To use launcher, run fgfs with '--launcher' parameter"
-	fi
-}
diff --git a/games-simulation/flightgear/metadata.xml b/games-simulation/flightgear/metadata.xml
deleted file mode 100644
index 2f0f827b8840..000000000000
--- a/games-simulation/flightgear/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="dbus">Enable screensaver DBus interaction</flag>
-		<flag name="gdal">Enable alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag>
-		<flag name="qt5">Build Qt5 launcher application</flag>
-		<flag name="udev">Enable event-based Input devices through <pkg>virtual/udev</pkg></flag>
-		<flag name="utils">Build various utilities (fgpanel, fgviewer among others)</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">flightgear</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/gl117-1.3.2-r1 b/games-simulation/gl117-1.3.2-r1
new file mode 100644
index 000000000000..3a08702cb702
--- /dev/null
+++ b/games-simulation/gl117-1.3.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=media-libs/freeglut media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-mixer[mod] virtual/glu virtual/opengl
+DESCRIPTION=An action flight simulator
+EAPI=6
+HOMEPAGE=http://www.heptargon.de/gl-117/gl-117.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-mixer[mod] virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/gl-117/gl-117-1.3.2-src.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_=71c1f2ff0d2a03776d811719b300d350
diff --git a/games-simulation/gl117/Manifest b/games-simulation/gl117/Manifest
deleted file mode 100644
index 1a6914d62f08..000000000000
--- a/games-simulation/gl117/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gl117-1.3.2-mode.patch 394 BLAKE2B ee932b73f82100910bea6466edeb4a8a0d5782ac64baac4b64872cb95b3018391bd66550c5a2ff7575aff7449aa01e856769aabd0e4f9ef51bed71c4de7349e6 SHA512 b6bdfa938f19481dff3f4d275826f1308aea99c1a2fc78df6f2b49096ecabce6c476cbf7de64afd0ac0903ea0ac3b5d84e43a876ae333bd0db20b39a0085ca11
-DIST gl-117-1.3.2-src.tar.bz2 2411075 BLAKE2B efd2c7b9dd3f71bf0b8b1aac79f90dcc6286301997913346f8ee536b3f5981564438e6a805c658678b5ae0402f84da762b60472ddc553cab49f9ffb421d69993 SHA512 1d2382576c6399d8c84d56ddc7eb2b11b9e1e3ffeebcc1bd30e258ef231626d15d1be649f8c791f30e4f2f78aca2b4290c5d08036c5f482eef01eda8f4f48b5f
-EBUILD gl117-1.3.2-r1.ebuild 790 BLAKE2B 9e0539a943ce93f7db7bb0481a6c9baf4cf0642ff3fc13300a60e43825dfad17e3299d9fc8dd5644c35bb2af1c2595efbd19d8cdf5dec56b0637aa22c9fc2a96 SHA512 dfa801635069584401af3e9b7fed23ed79cd54217dfffe1a5f3666704d666a11fd470adfd437fe02d05e46179477981ab3b9128edacbc6663c635b069faa02f8
-MISC metadata.xml 329 BLAKE2B 69ad3f12c9a48f6cbb1094fb1952d75e5e317060ad8534cd95e1e94bf2e3bb824862ad2a050aa81f55970b0cb0d032197ae86b6336beb09835a9f6c56aba0a0f SHA512 a2756adb5a9afa30e93c7f7726706ed9b435f76631d268685f9fea734a4ef6e643a8f8fdae8f59cc979a1bfcb91e2778496828db50458d6adacd789b3b3763f9
diff --git a/games-simulation/gl117/files/gl117-1.3.2-mode.patch b/games-simulation/gl117/files/gl117-1.3.2-mode.patch
deleted file mode 100644
index d3f13084a96f..000000000000
--- a/games-simulation/gl117/files/gl117-1.3.2-mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/main.cpp	2010-07-13 09:35:18.374122609 +0100
-+++ b/src/main.cpp	2010-07-13 09:35:45.334955120 +0100
-@@ -71,8 +71,7 @@ int mode = 0;
- 
- // pre-defined screen resolutions (x, y, bpp, fullscreen)
- int resolution [4] [4] =
--        { { 1024, 768, 32, 1 },
--          { 800, 600, 32, 1 },
-+        { { 800, 600, 32, 1 },
-           { 640, 480, 32, 1 },
-           { 640, 480, 32, 0 } };
- 
diff --git a/games-simulation/gl117/gl117-1.3.2-r1.ebuild b/games-simulation/gl117/gl117-1.3.2-r1.ebuild
deleted file mode 100644
index f5c52f6068ab..000000000000
--- a/games-simulation/gl117/gl117-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_P="gl-117-${PV}-src"
-DESCRIPTION="An action flight simulator"
-HOMEPAGE="http://www.heptargon.de/gl-117/gl-117.html"
-SRC_URI="mirror://sourceforge/gl-117/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/freeglut
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-mixer[mod]
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-mode.patch
-)
-
-src_install() {
-	DOCS="doc/gl-117.pdf AUTHORS ChangeLog FAQ NEWS README" \
-		default
-	newicon doc/src/falcon.jpg ${PN}.jpg
-	make_desktop_entry gl-117 GL-117 /usr/share/pixmaps/${PN}.jpg
-	doman doc/gl-117.6
-}
diff --git a/games-simulation/gl117/metadata.xml b/games-simulation/gl117/metadata.xml
deleted file mode 100644
index e991eac66f1d..000000000000
--- a/games-simulation/gl117/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gl-117</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/lincity-1.13.1-r1 b/games-simulation/lincity-1.13.1-r1
new file mode 100644
index 000000000000..ef31c0fe28df
--- /dev/null
+++ b/games-simulation/lincity-1.13.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/libpng:0 x11-libs/libSM x11-libs/libXext nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=city/country simulation game for X and Linux SVGALib
+EAPI=6
+HOMEPAGE=http://lincity.sourceforge.net/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libpng:0 x11-libs/libSM x11-libs/libXext nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/lincity/lincity-1.13.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2baf3cdc638f9b0c330bd65d8d5ab9c1
diff --git a/games-simulation/lincity-ng-2.0 b/games-simulation/lincity-ng-2.0
new file mode 100644
index 000000000000..a4c2e816c310
--- /dev/null
+++ b/games-simulation/lincity-ng-2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl sys-libs/zlib dev-libs/libxml2 media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-gfx dev-games/physfs virtual/pkgconfig dev-util/ftjam
+DESCRIPTION=city/country simulation game for X and opengl
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/lincity-ng.berlios/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BitstreamVera
+RDEPEND=virtual/opengl sys-libs/zlib dev-libs/libxml2 media-libs/libsdl[sound,joystick,opengl,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] media-libs/sdl-ttf media-libs/sdl-gfx dev-games/physfs games-misc/games-envd
+RESTRICT=mirror
+SLOT=0
+SRC_URI=mirror://sourceforge/lincity-ng.berlios/lincity-ng-2.0.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9bdba06bbec6f3a9354ae42a8ba06547
diff --git a/games-simulation/lincity-ng/Manifest b/games-simulation/lincity-ng/Manifest
deleted file mode 100644
index 6da303dd5120..000000000000
--- a/games-simulation/lincity-ng/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lincity-ng-2.0-build.patch 886 BLAKE2B b2b7680db28cf2d69352268c007b1ed86dc5e5340e7f48ad7f0f1aabf7da13d7f0c9a7b539c138698079bbad5401cf8c63d15dddd782dedee50350c0c87daa98 SHA512 0ac99a14e61ec3341dbe2d46f5a36e0a4d9e2dca4fceb2ddc8754a901eebdb2a8251c66fac36359688c77a2243ad4388142215bc57d6acd762723aee73c5f3d5
-DIST lincity-ng-2.0.tar.bz2 39475719 BLAKE2B 39992e6a2ef78e53eea1b0e347c968f6828089b5267e6d62dac7405ea91b182335431b1718ef9892b649b1437751959deb9fa407dfd899fd1dfca55145d059f2 SHA512 d85cd398145d1591f8640458c076f2a0b55713c39ede28b67d99adc7b76d38f09b58cd2ec84d9acac11bbaa794f6d97f6200f54efcdd4286315e6b3133284c55
-EBUILD lincity-ng-2.0.ebuild 1106 BLAKE2B 1c2538f2b9b7db2095619ea87ff75d0e8df2c15364d2b0743e6b7d29c2c3cd1c7422cd8fc77c5887d44d5a3dc89df1626d5a33009fbbbf508f17b86ab078aa69 SHA512 2422299580819a493afa66faf3c9df252d7bea336d73406fb06330412099345382a284428850c7a61f67c63d958b54963fed26462f09d5101a6574d88a726007
-MISC metadata.xml 341 BLAKE2B 971b9b371fbe6bbb577214a2fcb2f39948f4f8abe02398fd7f6e86d650434f778bc8e1556a6d08be49149da35f848e7e8a23e56034626823704872e88ada99e5 SHA512 0c2607743dbc1b832fad2d9edf774b51c9e816cca447c5991cd3958f001fded11bfd0fd0b90316ddab7c3371b0ec98d6f4ada27054e5d74e3295cf2cd1beeb90
diff --git a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch b/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
deleted file mode 100644
index ad2f2eeaff8d..000000000000
--- a/games-simulation/lincity-ng/files/lincity-ng-2.0-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Mon Jul 30 07:06:54 UTC 2012
-Subject: build system
-
-arguments to AR would be overwritten if we export AR
-
---- lincity-ng-2.0.orig/lincity-ng.desktop
-+++ lincity-ng-2.0/lincity-ng.desktop
-@@ -1,12 +1,11 @@
- [Desktop Entry]
- Type=Application
- Version=1.0
--Encoding=UTF-8
- Name=Lincity-NG
- GenericName=City Simulation Game
- GenericName[de]=Stadtsimulationsspiel
- Comment=Plan and Build a city and take care of transport, economics, electricityand others.
--Icon=lincity-ng.png
-+Icon=lincity-ng
- Exec=lincity-ng
- Terminal=false
- StartupNotify=false
---- lincity-ng-2.0.orig/mk/jam/unix.jam
-+++ lincity-ng-2.0/mk/jam/unix.jam
-@@ -45,4 +45,10 @@
-     $(LINK) -o $(<) $(>) $(EXTRAOBJECTS) $(NEEDLIBS) $(LIBS)
- }
- 
-+# jam Archive action seems to include the arguments which will break our AR export
-+actions Archive
-+{
-+  $(AR) ru $(<) $(>)
-+}
-+
- 
diff --git a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild b/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
deleted file mode 100644
index 5da88e889d4c..000000000000
--- a/games-simulation/lincity-ng/lincity-ng-2.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multiprocessing games
-
-DESCRIPTION="city/country simulation game for X and opengl"
-HOMEPAGE="https://sourceforge.net/projects/lincity-ng.berlios/"
-SRC_URI="mirror://sourceforge/lincity-ng.berlios/${P}.tar.bz2"
-
-LICENSE="GPL-2 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT=mirror
-
-RDEPEND="virtual/opengl
-	sys-libs/zlib
-	dev-libs/libxml2
-	media-libs/libsdl[sound,joystick,opengl,video]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
-	dev-games/physfs"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/ftjam"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	jam -q -dx -j $(makeopts_jobs) || die "jam failed"
-}
-
-src_install() {
-	jam -sDESTDIR="${D}" \
-		 -sappdocdir="/usr/share/doc/${PF}" \
-		 -sapplicationsdir="/usr/share/applications" \
-		 -spixmapsdir="/usr/share/pixmaps" \
-		 install \
-		 || die "jam install failed"
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	prepgamesdirs
-}
diff --git a/games-simulation/lincity-ng/metadata.xml b/games-simulation/lincity-ng/metadata.xml
deleted file mode 100644
index 7dd75a46b634..000000000000
--- a/games-simulation/lincity-ng/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lincity-ng.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/lincity/Manifest b/games-simulation/lincity/Manifest
deleted file mode 100644
index e8bd15ae11b5..000000000000
--- a/games-simulation/lincity/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lincity-1.13.1-build.patch 2196 BLAKE2B 871577b9ac4b2536b9d46c094c6bd3492eb8e46188f2fc7d8efafa84d6e76914e60a579e30b1294e56daa96f8ab4a2b0247c0ddb5d0ce7d6d9e2180a7b0306cf SHA512 c0590673e7f04e16ffb6c9a25ce0f00d25dcaf689908117647e00989ed6db3a2c5d1db63abeb23e5c9a0f0999219515a53994ed4400f2712a8dea5b6eca5a8b3
-DIST lincity-1.13.1.tar.gz 1064236 BLAKE2B 1172ced3255048f3132f85cd9ae994c7e0558170f7e7a24909af1856669c4ad90d57acd76f330fb556656ed74843dda159005350760fc059c6b184cedf1e9393 SHA512 bc4ee7a1642b1efa25f9edaabd3aeb52d1ca1d016735c5094586f52fda3ec4e9080ff35fe518c1ccbfad9fd54babb370f4b9b6a158b4d2f43b7182155084eefc
-EBUILD lincity-1.13.1-r1.ebuild 946 BLAKE2B f1592d817a747fc1283eaa77e6ce82f452b8949f1292a6c4c28159cf5ff8c40d4234e4dd1abf3c1b9152e12f084fb4dfdb2cf9fde3649130673af7b616b83129 SHA512 7a47b905d33c64cfd627af661a66ab3224e4c508e9857bc6cf054621097089eb3d7d21c138a83786f038ce860e3c4fc4a1d7dd131200fdc4886c530d7ccf6aeb
-MISC metadata.xml 330 BLAKE2B 27e534512b77895bcfea8da8f49e1fa4ce2c9a8df47cf0ce813a8a88893b3c69c03d25083412d22bea3d2d73dfe2baa6a26292b983409c28d6c40bd70e222f6f SHA512 c36fecc06a5c84b3a93dfd25ffeb05bb14a5a96676eb1d7e976903ef7892a10c22ee7afa894c581c0bc3079ce2e30574143cc6b49195b346463c48f3e34ff1c0
diff --git a/games-simulation/lincity/files/lincity-1.13.1-build.patch b/games-simulation/lincity/files/lincity-1.13.1-build.patch
deleted file mode 100644
index f7f41f954baf..000000000000
--- a/games-simulation/lincity/files/lincity-1.13.1-build.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- lincity-1.13.1.orig/intl/Makefile.in
-+++ lincity-1.13.1/intl/Makefile.in
-@@ -32,7 +32,7 @@
- libdir = @libdir@
- includedir = @includedir@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/intl
- aliaspath = $(localedir)
- subdir = intl
---- lincity-1.13.1.orig/mouse.c
-+++ lincity-1.13.1/mouse.c
-@@ -1057,7 +1057,7 @@
-    and set to 1 if the existing transport if the more expensive sort
-    (e.g. GROUP_RAIL when overwriting GROUP_ROAD).
- */
--inline int
-+int
- mt_erase(int x, int y)
- {
-     if (x < 0 || y < 0 || x >= WORLD_SIDE_LEN || y >= WORLD_SIDE_LEN)
---- lincity-1.13.1.orig/pixmap.c
-+++ lincity-1.13.1/pixmap.c
-@@ -390,7 +390,7 @@
- 		  likes it in the file.  Still need to fix this in autoconf,
-                   but for now this will do. */
- #if !defined (WIN32)
--inline int 
-+int 
- pixmap_index (int x, int y)
- {
-     return y*pixmap_width + x;
---- lincity-1.13.1.orig/pixmap.h
-+++ lincity-1.13.1/pixmap.h
-@@ -19,7 +19,7 @@
- void initialize_pixmap (void);
- void resize_pixmap (int new_width, int new_height);
- int pixmap_getpixel (int x, int y);
--inline int pixmap_index (int x, int y);
-+int pixmap_index (int x, int y);
- int pixmap_getpixel (int x, int y);
- void pixmap_setpixel (int x, int y, int col);
- void pixmap_hline (int x1, int y1, int x2, int col);
-@@ -33,7 +33,7 @@
-  * Public Inline Functions
-  * ---------------------------------------------------------------------- */
- #if defined (WIN32)
--inline int 
-+int 
- pixmap_index (int x, int y) {
-     return y*pixmap_width + x;
- }
---- lincity-1.13.1.orig/po/Makefile.in.in
-+++ lincity-1.13.1/po/Makefile.in.in
-@@ -21,7 +21,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = /usr/share/locale
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
---- lincity-1.13.1.orig/readpng.c
-+++ lincity-1.13.1/readpng.c
-@@ -3,6 +3,7 @@
-  * This file is part of lincity (see COPYRIGHT for copyright information).
-  * ---------------------------------------------------------------------- */
- #include <stdlib.h>
-+#include <string.h>
- #include "png.h"
- #include "malloc.h"
- #include "lin-city.h"
diff --git a/games-simulation/lincity/lincity-1.13.1-r1.ebuild b/games-simulation/lincity/lincity-1.13.1-r1.ebuild
deleted file mode 100644
index 02968c06f2ed..000000000000
--- a/games-simulation/lincity/lincity-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic
-
-DESCRIPTION="city/country simulation game for X and Linux SVGALib"
-HOMEPAGE="http://lincity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lincity/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-# dep fix (bug #82318)
-RDEPEND="media-libs/libpng:0
-	x11-libs/libSM
-	x11-libs/libXext
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-
-	append-cflags -std=gnu89 # build with gcc5 (bug #570574)
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--with-gzip \
-		--with-x
-}
-
-src_compile() {
-	# build system logic is severely broken
-	emake
-	emake X_PROGS
-}
-
-src_install() {
-	default
-	dodoc Acknowledgements CHANGES README* TODO
-	make_desktop_entry xlincity Lincity
-	dobin xlincity
-}
diff --git a/games-simulation/lincity/metadata.xml b/games-simulation/lincity/metadata.xml
deleted file mode 100644
index 41975d1ec190..000000000000
--- a/games-simulation/lincity/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lincity</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/metadata.xml b/games-simulation/metadata.xml
deleted file mode 100644
index 9a1d4a49170f..000000000000
--- a/games-simulation/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-simulation category contains simulation games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-simulation enthält Simulatoren.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-simulation contiene juegos de simulación.
-	</longdescription>
-	<longdescription lang="ja">
-		games-simulationカテゴリーにはシミュレーション・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-simulation categorie bevat simulatiespellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-simulation chứa các trò chơi mô phỏng.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-simulation contiene giochi di simulazione.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-simulation contém jogos de simulação.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-simulation zawiera gry symulacyjne.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-simulation/micropolis-1.0-r1 b/games-simulation/micropolis-1.0-r1
new file mode 100644
index 000000000000..4278b92d5851
--- /dev/null
+++ b/games-simulation/micropolis-1.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=media-libs/libsdl media-libs/sdl-mixer x11-libs/libX11 x11-libs/libXpm sys-devel/bison
+DESCRIPTION=Free version of the well-known city building simulation
+EAPI=6
+HOMEPAGE=http://www.donhopkins.com/home/micropolis/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libsdl media-libs/sdl-mixer x11-libs/libX11 x11-libs/libXpm
+SLOT=0
+SRC_URI=http://www.donhopkins.com/home/micropolis/micropolis-activity-source.tgz http://rmdir.de/~michael/micropolis_git.patch
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=92839228573d08da19083c093b8022a4
diff --git a/games-simulation/micropolis/Manifest b/games-simulation/micropolis/Manifest
deleted file mode 100644
index 716b3e095510..000000000000
--- a/games-simulation/micropolis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST micropolis-activity-source.tgz 7676438 BLAKE2B 9415cf2f1980fe5a1f412561c9a53dca86d388f9fb529801af1e6071b3c92bc03daaff84c1ac1f964578d5805a4f2a9f60cfa0c56c0a1032bc0eed686207e538 SHA512 fe65966c43d044e01a63a3cfe3cad48466eb1e5ec8b13c03abb52d582395a8ab527332d4d04454a4f32e85b65e55d72fe5e4d53a3f37b422d90e9208f00d9976
-DIST micropolis_git.patch 83549 BLAKE2B 13cd94f3018ffd23dcbe5c1baf0b948cac7fb9b2f858d42f259003f2697060b156b900fcc8611e560a8b46e0e68fb6ff78d376bfc937cf12b55655067fb13f6d SHA512 9d1801478a27184c48d327094cad8238f7972c2cf3624c7c196375f2dd20c3374575b393d44cb2fb99613e19d66c4cc4fb27ae52df9fddf4e42adb42523bdc17
-EBUILD micropolis-1.0-r1.ebuild 1190 BLAKE2B c5d6f1deb3a01fd50eca19f71f33c176140ab30974a9c5dc328fbab46bd5a6d6a57058a380f443d4639de2e6ea908a1989622a37b4c3d9f76af5f12bd861ac84 SHA512 227c999dffdd95f89123d987d0eaece6672899147db634181e6080399d83fceb2eac6565601e6baa79dacfc0f137b0a3a20a7ee10b1fd5986c87645e573e7574
-MISC metadata.xml 318 BLAKE2B 0a772efef1bdef4bff48d961f943d5075316a69f050f31ffae69a30c8f70ad11b31712ce20cd840d9c6aef7f366ccaba0e2b265f5050a5bdc1c56ec240493e9d SHA512 7dde0fe493b040693af161ef449f7d5bce64988568d7fdf5eae0f9c7e8e404386a498da6aaae768e60ebc84bc948e8a65642cbb6ad8f128bd52163722ba129bc
diff --git a/games-simulation/micropolis/metadata.xml b/games-simulation/micropolis/metadata.xml
deleted file mode 100644
index eac64a74f324..000000000000
--- a/games-simulation/micropolis/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person"><email>hanno@gentoo.org</email></maintainer>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-simulation/micropolis/micropolis-1.0-r1.ebuild b/games-simulation/micropolis/micropolis-1.0-r1.ebuild
deleted file mode 100644
index b6f6a4e58bd3..000000000000
--- a/games-simulation/micropolis/micropolis-1.0-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Free version of the well-known city building simulation"
-HOMEPAGE="http://www.donhopkins.com/home/micropolis/"
-SRC_URI="http://www.donhopkins.com/home/micropolis/${PN}-activity-source.tgz
-	http://rmdir.de/~michael/${PN}_git.patch"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	x11-libs/libX11
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-S=${WORKDIR}/${PN}-activity/
-
-PATCHES=(
-	"${DISTDIR}"/${PN}_git.patch
-)
-
-src_unpack() {
-	unpack ${PN}-activity-source.tgz
-}
-
-src_prepare() {
-	default
-
-	sed -i -e "s:-O3:${CFLAGS}:" \
-		src/tclx/config.mk src/{sim,tcl,tk}/makefile || die
-	sed -i -e "s:XLDFLAGS=:&${LDFLAGS}:" \
-		src/tclx/config.mk || die
-}
-
-src_compile() {
-	emake -C src LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	local dir=/usr/share/${PN}
-
-	exeinto "${dir}/res"
-	doexe src/sim/sim
-	insinto "${dir}"
-	doins -r activity cities images manual res
-
-	make_wrapper micropolis res/sim "${dir}"
-	doicon Micropolis.png
-	make_desktop_entry micropolis "Micropolis" Micropolis
-}
diff --git a/games-simulation/openrct2-0.1.2 b/games-simulation/openrct2-0.1.2
new file mode 100644
index 000000000000..ae16ab6b73f9
--- /dev/null
+++ b/games-simulation/openrct2-0.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) app-arch/unzip test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
+EAPI=6
+HOMEPAGE=https://openrct2.website/
+IUSE=libressl +multiplayer opengl test truetype +twitch
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/OpenRCT2/archive/v0.1.2.tar.gz -> openrct2-0.1.2.tar.gz https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip -> openrct2-title-sequence-v0.1.2.zip
+_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_=685e7bd51588298d881c66ad05b04203
diff --git a/games-simulation/openrct2-9999 b/games-simulation/openrct2-9999
new file mode 100644
index 000000000000..9f6e3d7eeec2
--- /dev/null
+++ b/games-simulation/openrct2-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] ) app-arch/unzip test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=An open source re-implementation of RollerCoaster Tycoon 2
+EAPI=6
+HOMEPAGE=https://openrct2.website/
+IUSE=libressl +multiplayer opengl test truetype +twitch
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/jansson-2.5 >=dev-libs/libzip-1.0 media-libs/libpng:0= media-libs/libsdl2 media-libs/speexdsp multiplayer? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) opengl? ( virtual/opengl ) truetype? ( media-libs/sdl2-ttf media-libs/fontconfig ) twitch? ( net-misc/curl[ssl] )
+SLOT=0
+SRC_URI=https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip -> openrct2-title-sequence-v0.1.2.zip https://github.com/OpenRCT2/objects/releases/download/v1.0/objects.zip -> openrct2-objects-v1.0.zip
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	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_=ebdfdebd0fdd55c1e37ea79eaf8a9192
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
deleted file mode 100644
index 36721103acef..000000000000
--- a/games-simulation/openrct2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-DIST openrct2-0.1.2.tar.gz 6769785 BLAKE2B 0cc6ef6c68c1db6c822dd6038bc2d115f487a52b5891316273ee36db1713913baa2f119dabace88a37c16f87c90b14cf84df75a24b26b22571e98966afd2adbc SHA512 489dac96e1eda1449680f98a4b500eeb7b3f1ffbdaa5a5c701300071eb3a7862c65fa5a81e769083927b95a14914db54307724756a9841cff0c769c9e5471adc
-DIST openrct2-objects-v1.0.zip 2050225 BLAKE2B 52ae6f5ab4de5d4b121cea6a3d6711b04f1c4857795c995f7568e3be2862409104be55e233781ff6708c7e821f49af8e91f9f4c87c037b6a8a77698534747925 SHA512 a125fee04c12c49ffd16880eb5b8722e25c5fb82adae305d9904c3a6251c83e73e4a29c7e3694acee3abf336894759cfbff94018c6b210df4d794ca3ec34dc84
-DIST openrct2-title-sequence-v0.1.2.zip 4073116 BLAKE2B a36fb07e8da62afce129f2224f4cf5cc226922094132a3dc515fda1f02e0f8bbe07c973363f824ae58a54a26f252ad96f3f673bf5f142be5c964f45b6f712ed6 SHA512 7592c5397ceb27347c127ae5c4f8e11d7ef2ff23c97f627b354f941894420f546ffdcff88e2348e42c82d182ccf620e739c745d894a9b5650a0d7d028b68a106
-EBUILD openrct2-0.1.2.ebuild 2325 BLAKE2B 7e7f5b87be6b5182bd64a746ba2e80732309277fc635cea93b0867ba65beff9f10bf13792d3e5b31ef42d3c217a5e58aa9b643a3e6aab811281a1a7628c61839 SHA512 ec94c4ff953d139ba359cabf6c064de04b64bf17bdd9f5230ca8ed39aaf7089828425507ce8f6ad247a1f763c9a6a5b4974dd8bcd773e363eac07f61256c5efa
-EBUILD openrct2-9999.ebuild 2571 BLAKE2B b04b112df994b6ea260407bd396a724c5eb772f06fb58b0e5dc99fdf8e0c3ec792354265123db0b8ff92d6a856f6210c789949d4b4a6ab5c53f5046587fcf93e SHA512 689c71dbc7d1a297fc61e73c6fecdc678b9e800ea557e26a1cc4afbdede49e28c71cf1a3e91b15b4b7cd4ad0ec41cdfdfdedebc7e95f95d54979cc3c9ce6af4c
-MISC metadata.xml 967 BLAKE2B 6dc048c366eb9719d895ab269a207a51f233125ee0861e360bf0d65a2de0d56b8bed7147f71bbf1d8c4b286a843a3542e74e17c8e3231682742435a2b28dfef0 SHA512 874ed9f406c5219bc5c6102b775a53b4e2526ff0f7cfa0dd9b5511717d10ee1fd63012cd19a926904b556195a12a7e2328548de9d1000605afdc471db513198f
diff --git a/games-simulation/openrct2/metadata.xml b/games-simulation/openrct2/metadata.xml
deleted file mode 100644
index e6ebc48e755d..000000000000
--- a/games-simulation/openrct2/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jan@segre.in</email>
-		<name>Jan Segre</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>hendrik@consetetur.de</email>
-		<name>Hendrik v. Raven (lorem_ipsum)</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		An open-source re-implementation of RollerCoaster Tycoon 2. A construction and management simulation video game that simulates amusement park management.
-	</longdescription>
-	<use>
-		<flag name="multiplayer">Enable multiplayer functionality</flag>
-		<flag name="twitch">Enable Twitch support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">OpenRCT2/OpenRCT2</remote-id>
-		<bugs-to>https://github.com/OpenRCT2/OpenRCT2/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/openrct2/openrct2-0.1.2.ebuild b/games-simulation/openrct2/openrct2-0.1.2.ebuild
deleted file mode 100644
index ae25725577a7..000000000000
--- a/games-simulation/openrct2/openrct2-0.1.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.website/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/OpenRCT2-${PV}"
-fi
-
-TSV="${PV}"
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl +multiplayer opengl test truetype +twitch"
-
-RDEPEND="
-	>=dev-libs/jansson-2.5
-	>=dev-libs/libzip-1.0
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/speexdsp
-	multiplayer? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	opengl? ( virtual/opengl )
-	truetype? (
-		media-libs/sdl2-ttf
-		media-libs/fontconfig
-	)
-	twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-cpp/gtest )
-"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	mkdir -p "${S}/data/title" || die
-	pushd "${S}/data/title" || die
-	unpack ${PN}-title-sequence-v${TSV}.zip
-	popd || die
-}
-
-src_prepare() {
-	sed -i CMakeLists.txt -e 's/-Werror//' || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
-		-DDISABLE_NETWORK="$(usex !multiplayer)"
-		-DDISABLE_OPENGL="$(usex !opengl)"
-		-DDISABLE_TTF="$(usex !truetype)"
-		-DWITH_TESTS="$(usex test)"
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DDISABLE_RCT2_TESTS=ON
-		-DSYSTEM_GTEST=ON
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn ""
-		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
-		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
-		ewarn ""
-	fi
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
deleted file mode 100644
index 1058facd68fd..000000000000
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open source re-implementation of RollerCoaster Tycoon 2"
-HOMEPAGE="https://openrct2.website/"
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/OpenRCT2/OpenRCT2.git"
-	EGIT_BRANCH="develop"
-	inherit git-r3
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/OpenRCT2/OpenRCT2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/OpenRCT2-${PV}"
-fi
-
-TSV="0.1.2"
-SRC_URI+=" https://github.com/OpenRCT2/title-sequences/releases/download/v${TSV}/title-sequence-v${TSV}.zip -> ${PN}-title-sequence-v${TSV}.zip "
-
-OBJV="1.0"
-SRC_URI+=" https://github.com/OpenRCT2/objects/releases/download/v${OBJV}/objects.zip -> ${PN}-objects-v${OBJV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="libressl +multiplayer opengl test truetype +twitch"
-
-RDEPEND="
-	>=dev-libs/jansson-2.5
-	>=dev-libs/libzip-1.0
-	media-libs/libpng:0=
-	media-libs/libsdl2
-	media-libs/speexdsp
-	multiplayer? (
-		libressl? ( dev-libs/libressl:0= )
-		!libressl? ( dev-libs/openssl:0= )
-	)
-	opengl? ( virtual/opengl )
-	truetype? (
-		media-libs/sdl2-ttf
-		media-libs/fontconfig
-	)
-	twitch? ( net-misc/curl[ssl] )
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-cpp/gtest )
-"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-
-	mkdir -p "${S}/data/title" || die
-	pushd "${S}/data/title" || die
-	unpack ${PN}-title-sequence-v${TSV}.zip
-	popd || die
-
-	mkdir -p "${S}/data/object" || die
-	pushd "${S}/data/object" || die
-	unpack ${PN}-objects-v${OBJV}.zip
-	popd || die
-}
-
-src_prepare() {
-	sed -i CMakeLists.txt -e 's/-Werror//' || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_HTTP_TWITCH="$(usex !twitch)"
-		-DDISABLE_NETWORK="$(usex !multiplayer)"
-		-DDISABLE_OPENGL="$(usex !opengl)"
-		-DDISABLE_TTF="$(usex !truetype)"
-		-DWITH_TESTS="$(usex test)"
-		-DDOWNLOAD_TITLE_SEQUENCES=OFF
-		-DDOWNLOAD_OBJECTS=OFF
-		-DSYSTEM_GTEST=ON
-		-DBUILD_SHARED_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		ewarn ""
-		ewarn "You need the original RollerCoaster Tycoon 2 files to play this game."
-		ewarn "See: https://github.com/OpenRCT2/OpenRCT2/wiki/Required-RCT2-files#how-to-retrieve"
-		ewarn ""
-	fi
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/games-simulation/openttd-1.7.1-r1 b/games-simulation/openttd-1.7.1-r1
new file mode 100644
index 000000000000..cf1ccc395260
--- /dev/null
+++ b/games-simulation/openttd-1.7.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
+EAPI=6
+HOMEPAGE=http://www.openttd.org/
+IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
+RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://binaries.openttd.org/releases/1.7.1/openttd-1.7.1-source.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_=5c9cda55d3206afaf99f1c3b2df26171
diff --git a/games-simulation/openttd-1.7.2 b/games-simulation/openttd-1.7.2
new file mode 100644
index 000000000000..b288bba14c60
--- /dev/null
+++ b/games-simulation/openttd-1.7.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
+EAPI=6
+HOMEPAGE=http://www.openttd.org/
+IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
+RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://binaries.openttd.org/releases/1.7.2/openttd-1.7.2-source.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_=035f7c35894880d5718b5616f98f2cfb
diff --git a/games-simulation/openttd-1.8.0_rc1 b/games-simulation/openttd-1.8.0_rc1
new file mode 100644
index 000000000000..19cd22f2004e
--- /dev/null
+++ b/games-simulation/openttd-1.8.0_rc1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=OpenTTD is a clone of Transport Tycoon Deluxe
+EAPI=6
+HOMEPAGE=http://www.openttd.org/
+IUSE=aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=!dedicated? ( openmedia? ( games-misc/openmsx games-misc/opensfx ) aplaymidi? ( media-sound/alsa-utils ) !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) ) openmedia? ( >=games-misc/opengfx-0.4.7 )
+RDEPEND=!dedicated? ( media-libs/libsdl[sound,X,video] icu? ( dev-libs/icu-layoutex dev-libs/icu-le-hb >=dev-libs/icu-58.1:= ) truetype? ( media-libs/fontconfig media-libs/freetype:2 sys-libs/zlib ) ) lzo? ( dev-libs/lzo:2 ) iconv? ( virtual/libiconv ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://binaries.openttd.org/releases/1.8.0-RC1/openttd-1.8.0-RC1-source.tar.xz
+_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_=062662c23070ee972c27afdc097d8a2e
diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest
deleted file mode 100644
index 832a962b3258..000000000000
--- a/games-simulation/openttd/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX openttd-1.6.0-cflags.patch 1028 BLAKE2B bc71e2620a834b37f5957d3da885dcd5e692fcca238c7e87949a36e24029677f036da9773d786b44022e4f8d920ea25f881ed782ec107f9c963558e9411b9d98 SHA512 e29ef624562c717b37496ca2e8353c1c065f776548878e3863420df5431743a6dc80f952699c3738f3fa1dbe77c9a6bf457a7c21241c723db5b1f7865afa180f
-AUX openttd.initd 412 BLAKE2B 04a18d4a8cd30a600b2e033792714f2a8bee16e0b9207d6609a3c1ef2101a611cf17d028af23c61fcaef3233c7199e45612b90a5c9af14e992a5d7d74b1695f6 SHA512 eb14a32baa8a6601945e5f0cd844e2dc9620661ee4ab841d5085b75a0fb4a1ea8698b9292a489d63792d1163a13c7843795ef843fe0babdeac0a0468313667a3
-AUX openttd.initd-r1 306 BLAKE2B d36e2f405a1b8808c708edd0c66e23d9976c2f5ef0fc2af3430bb8ba287c237dffe3d11cde6428b8ab668886ac4ff5eb4bc4fe5b39f205da4bf3d7773f66f7ef SHA512 bd04f9d812d5d68eebd953e9a667e5138d8e440139eb9c07f8da089495774b7d45e3b23bfb2af38ed053b333d4ead5f4be5c5fa877ad9f9bb0effee5c4a499dc
-DIST openttd-1.7.1-source.tar.gz 10090311 BLAKE2B 339171cd2895398ee1fedcfd24d1126fbc060b6d4530b267310b3f220448f8e6469a726e71e9882bea117585ea7b9f7271205f576ee2b26de6dec079f57f1620 SHA512 4a0d2ee424374b50fe0d089b86ff16b5de3159848a38143ca6745e349b6126567f1e4beda9afe2e6bc21ffffce1166acf719d3f5c95703a14c1379f8857e83d3
-DIST openttd-1.7.2-source.tar.gz 10097175 BLAKE2B a027b6ca6d3116dc3e6ad6ae43965682107268e367032418200cf1c1e16c5b5dad39c275ea57d923f17564d80cceb0e9909dc5aaf7ee230242f0ce0f46f06b1a SHA512 44d25061c42cb9c81baa67a40ff31a6681dcbb121c61db74c5179a31f189919471a82b7fd3f79c2cdeef02af5b47ec35fdbdc7feed74ca2360c028869fe772e8
-DIST openttd-1.8.0-RC1-source.tar.xz 6520976 BLAKE2B 17d34378ba3aa7a9def9f3ff764c42b890a646946211184660c3af9e252b9a809d481ccdd31421442efd9c7fac86f5c9c6091987070d53d1c913d3ef680f413c SHA512 aff6833934ce875320bdba3410be15a53fc8c233e7efe60628158636eed3b179fea5c8e9f8af2181c16bc173c409eab93477f2165d448100d048959bf63ba3d2
-EBUILD openttd-1.7.1-r1.ebuild 4811 BLAKE2B 0a362bab76f8ffd48b5f565111aeee4517dc0e3b5c6b93e823189dd314ca83649827173611fca36ca529375c60ceebd654c4f5959dc0c959d0c38a5ba684cf40 SHA512 e54396fa54e8e065be21964fea386b1b734c72395e156b343eec1e2789393bf381093e7212e8ff673dfb849d9d36afc4c11bfc70620543dda7462bda9ccc8787
-EBUILD openttd-1.7.2.ebuild 4811 BLAKE2B 1ff782a7493162f1c76b93c45bbe5509c2d5f090d518e41428b0d04adeb3205ca9ced894b85011c92bc65ce67fe6c581b5685da9c7233d03e0e5f291d1d979ad SHA512 586fcfd067dc19abf56d3064fd7478ea2c7cb4cc38a870bee7d79fc615056b8183b420908897d3739686dcd4f5d5054b3e836d8410ca85a8d0cce92228dc86ee
-EBUILD openttd-1.8.0_rc1.ebuild 4886 BLAKE2B 128e9209ab520a6716f8e35b875214186223ee407058d2ddd9033b37719e11dd1da3bb31038e61efa05fd2018b4cec6b0714800023241455327bd54a535f4050 SHA512 337500f620abda29fbdd51cfbe31589cd5f1b73e7ac0f756c0f63c8a282696c0ae2f1228ea952cf56f048cb0fad5ceb5b3967780c785c3939233e5dcacb49369
-MISC metadata.xml 752 BLAKE2B 85476f4dbf68d94a5d95e35cff935edfe35caee4bd2a253c7bad747b0915b80f0f7009bf78e419417a05345210bed17dff8f82ce603480c96781323d7d5a89fd SHA512 ddb1fbbe98d5e0bc1e23385b38502603819b89bd1d9285b0193a55efe2263b8ab6e045c7befdc908303eea27de8c9148dbcc8e7b6c035b267f5c8ff0f16b4b56
diff --git a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch b/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
deleted file mode 100644
index bb7f768b3798..000000000000
--- a/games-simulation/openttd/files/openttd-1.6.0-cflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- openttd-1.4.4/config.lib
-+++ openttd-1.4.4/config.lib
-@@ -1450,12 +1450,6 @@
- 			CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS"
- 			LDFLAGS="$LDFLAGS -noixemul"
- 		fi
--
--		if [ "$enable_profiling" = "0" ]; then
--			# -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible)
--			CFLAGS="-fomit-frame-pointer $CFLAGS"
--		fi
--		CFLAGS="-O2 $CFLAGS"
- 	else
- 		OBJS_SUBDIR="debug"
- 
-@@ -1466,14 +1460,6 @@
- 				CFLAGS="$CFLAGS -G0"
- 			fi
- 		fi
--		if [ $enable_debug -ge 2 ]; then
--			CFLAGS="$CFLAGS -fno-inline"
--		fi
--		if [ $enable_debug -ge 3 ]; then
--			CFLAGS="$CFLAGS -O0"
--		else
--			CFLAGS="$CFLAGS -O2"
--		fi
- 	fi
- 
- 	if [ $enable_debug -le 2 ]; then
-@@ -1498,11 +1484,6 @@
- 		CFLAGS="$CFLAGS -fno-expensive-optimizations"
- 	fi
- 
--	if [ "$enable_profiling" != "0" ]; then
--		CFLAGS="$CFLAGS -pg"
--		LDFLAGS="$LDFLAGS -pg"
--	fi
--
- 	if [ "$with_threads" = "0" ]; then
- 		CFLAGS="$CFLAGS -DNO_THREADS"
- 	fi
diff --git a/games-simulation/openttd/files/openttd.initd b/games-simulation/openttd/files/openttd.initd
deleted file mode 100644
index 7a719587c7d6..000000000000
--- a/games-simulation/openttd/files/openttd.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting OpenTTD dedicated server"
-	start-stop-daemon --start -q --exec /usr/games/bin/openttd -- -D -f > /dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping OpenTTD dedicated server"
-	start-stop-daemon --stop -q -n openttd
-	eend $?
-}
diff --git a/games-simulation/openttd/files/openttd.initd-r1 b/games-simulation/openttd/files/openttd.initd-r1
deleted file mode 100644
index 0bfeefddf6d6..000000000000
--- a/games-simulation/openttd/files/openttd.initd-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-description="OpenTTD dedicated game server"
-pidfile="/run/${SVCNAME}.pid"
-command="/usr/bin/openttd"
-command_args="-D"
-command_background="true"
-
-depend() {
-	need net
-}
diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml
deleted file mode 100644
index a5465cd55c4a..000000000000
--- a/games-simulation/openttd/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="aplaymidi">Enables midi music in game, using aplaymidi as an external player</flag>
-
-		<flag name="openmedia">Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
-		<flag name="lzo">Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
-		<flag name="dedicated">Build only the openttd server, and not the client.</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-simulation/openttd/openttd-1.7.1-r1.ebuild b/games-simulation/openttd/openttd-1.7.1-r1.ebuild
deleted file mode 100644
index f24302009a47..000000000000
--- a/games-simulation/openttd/openttd-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl[sound,X,video]
-		icu? (
-			dev-libs/icu-layoutex
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
-)
-
-src_configure() {
-	local myopts=()
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts+=( --without-allegro )
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=( --without-libtimidity )
-
-	use debug && myopts+=( --enable-debug=3 )
-
-	if use dedicated ; then
-		myopts+=( --enable-dedicated )
-	else
-		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
-		myopts+=(
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl
-		)
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=( --with-zlib )
-	else
-		myopts+=( --without-zlib )
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX%/}/usr" \
-		--binary-dir="bin" \
-		--install-dir="${D}" \
-		--menu-group="Game;Simulation;" \
-		${myopts[@]} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/openttd/openttd-1.7.2.ebuild b/games-simulation/openttd/openttd-1.7.2.ebuild
deleted file mode 100644
index f6e90e926ac5..000000000000
--- a/games-simulation/openttd/openttd-1.7.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl[sound,X,video]
-		icu? (
-			dev-libs/icu-layoutex
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
-)
-
-src_configure() {
-	local myopts=()
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts+=( --without-allegro )
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=( --without-libtimidity )
-
-	use debug && myopts+=( --enable-debug=3 )
-
-	if use dedicated ; then
-		myopts+=( --enable-dedicated )
-	else
-		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
-		myopts+=(
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl
-		)
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=( --with-zlib )
-	else
-		myopts+=( --without-zlib )
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX%/}/usr" \
-		--binary-dir="bin" \
-		--install-dir="${D}" \
-		--menu-group="Game;Simulation;" \
-		${myopts[@]} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/openttd/openttd-1.8.0_rc1.ebuild b/games-simulation/openttd/openttd-1.8.0_rc1.ebuild
deleted file mode 100644
index 6eca8d5fbef6..000000000000
--- a/games-simulation/openttd/openttd-1.8.0_rc1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-MY_PV="${PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe"
-HOMEPAGE="http://www.openttd.org/"
-SRC_URI="http://binaries.openttd.org/releases/${MY_PV}/${MY_P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib"
-RESTRICT="test" # needs a graphics set in order to test
-
-RDEPEND="!dedicated? (
-		media-libs/libsdl[sound,X,video]
-		icu? (
-			dev-libs/icu-layoutex
-			dev-libs/icu-le-hb
-			>=dev-libs/icu-58.1:=
-		)
-		truetype? (
-			media-libs/fontconfig
-			media-libs/freetype:2
-			sys-libs/zlib
-		)
-	)
-	lzo? ( dev-libs/lzo:2 )
-	iconv? ( virtual/libiconv )
-	png? ( media-libs/libpng:0 )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="
-	!dedicated? (
-		openmedia? (
-			games-misc/openmsx
-			games-misc/opensfx
-		)
-		aplaymidi? ( media-sound/alsa-utils )
-		!aplaymidi? ( timidity? ( media-sound/timidity++ ) )
-	)
-	openmedia? ( >=games-misc/opengfx-0.4.7 )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-cflags.patch
-)
-
-src_configure() {
-	local myopts=()
-	# there is an allegro interface available as well as sdl, but
-	# the configure for it looks broken so the sdl interface is
-	# always built instead.
-	local myopts+=( --without-allegro )
-
-	# libtimidity not needed except for some embedded platform
-	# nevertheless, it will be automagically linked if it is
-	# installed. Hence, we disable it.
-	myopts+=( --without-libtimidity )
-
-	use debug && myopts+=( --enable-debug=3 )
-
-	if use dedicated ; then
-		myopts+=( --enable-dedicated )
-	else
-		use aplaymidi && myopts+=( --with-midi='/usr/bin/aplaymidi' )
-		myopts+=(
-			$(use_with truetype freetype)
-			$(use_with icu)
-			--with-sdl
-		)
-	fi
-	if use png || { use !dedicated && use truetype; } || use zlib ; then
-		myopts+=( --with-zlib )
-	else
-		myopts+=( --without-zlib )
-	fi
-
-	# configure is a hand-written bash-script, so econf will not work.
-	# It's all built as C++, upstream uses CFLAGS internally.
-	CFLAGS="" ./configure \
-		--disable-strip \
-		--prefix-dir="${EPREFIX%/}/usr" \
-		--binary-dir="bin" \
-		--install-dir="${D}" \
-		--menu-group="Game;Simulation;" \
-		${myopts[@]} \
-		$(use_with iconv) \
-		$(use_with png) \
-		$(use_with cpu_flags_x86_sse sse) \
-		$(use_with lzo liblzo2) \
-		|| die
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	default
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
-		rm -rf "${ED}"/usr/share/{applications,icons,pixmaps}
-	fi
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	if ! use lzo ; then
-		elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not"
-		elog "required, disabling it does mean that loading old savegames"
-		elog "or scenarios from ancient versions (~0.2) will fail."
-		elog
-	fi
-
-	if use dedicated ; then
-		ewarn "Warning: The init script will kill all running openttd"
-		ewarn "processes when triggered, including any running client sessions!"
-	else
-		if use aplaymidi ; then
-			elog "You have emerged with 'aplaymidi' for playing MIDI."
-			elog "This option is for those with a hardware midi device,"
-			elog "or who have set up ALSA to handle midi ports."
-			elog "You must set the environment variable ALSA_OUTPUT_PORTS."
-			elog "Available ports can be listed by using 'aplaymidi -l'."
-		else
-			if ! use timidity ; then
-				elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'"
-				elog "in USE. Music may or may not work in-game. If you happen"
-				elog "to have timidity++ installed, music will work so long"
-				elog "as it remains installed, but OpenTTD will not depend on it."
-			fi
-		fi
-		if ! use openmedia ; then
-			elog
-			elog "OpenTTD was compiled without the 'openmedia' USE flag."
-			elog
-			elog "In order to play, you must at least install:"
-			elog "games-misc/opengfx, and games-misc/opensfx, or copy the "
-			elog "following 6 files from a version of Transport Tycoon Deluxe"
-			elog "(windows or DOS) to ~/.openttd/data/ or"
-			elog "${GAMES_DATADIR}/${PN}/data/."
-			elog
-			elog "From the WINDOWS version you need: "
-			elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf"
-			elog "OR from the DOS version you need: "
-			elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF"
-			elog
-			elog "File names are case sensitive, but should work either with"
-			elog "all upper or all lower case names"
-			elog
-			elog "In addition, in-game music will be unavailable: for music,"
-			elog "install games-misc/openmsx, or use the in-game download"
-			elog "functionality to get a music set"
-			elog
-		fi
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-simulation/pmars-sdl-0.9.2e-r1 b/games-simulation/pmars-sdl-0.9.2e-r1
new file mode 100644
index 000000000000..4bf6343c4679
--- /dev/null
+++ b/games-simulation/pmars-sdl-0.9.2e-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
+DESCRIPTION=Portable redcode simulator's sdl port for core war
+EAPI=6
+HOMEPAGE=http://corewar.co.uk/pihlaja/pmars-sdl/
+IUSE=sdl X
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2
+RDEPEND=sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses:0= ) )
+SLOT=0
+SRC_URI=http://corewar.co.uk/pihlaja/pmars-sdl/pmars-0.9.2-5.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=86ab54130f1149f89e68ccf344797170
diff --git a/games-simulation/pmars-sdl/Manifest b/games-simulation/pmars-sdl/Manifest
deleted file mode 100644
index e45bc381d418..000000000000
--- a/games-simulation/pmars-sdl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pmars-sdl-0.9.2e-format.patch 1988 BLAKE2B 57e96f71c6dfb6cea7286421acaa2a576ca26d9e5068a0c840b2d00dabd3ea87b2b482fe28253ef0d1b6c667bb13a2b9b8ad53f59cbb54a98f7d4da6ab1f66bf SHA512 1736220e86c762392e7074674d506fe161308a09c682a7c3cccfa7e58be880f6d44738854eae2c2c6dfc22d819c04c8fb5e9a5db632d00c35de09f4b44347014
-DIST pmars-0.9.2-5.tar.gz 200966 BLAKE2B 398323191290a9e3d57cb371c2070585cf78f845ca4cbadfa09f03045abc80f7b3fb71a58c18bbfdf503a3239d25bd0734b10e784d6570766e6b5c0ec606aadf SHA512 197d1967507199ed5eb075fb232a2f15d9bdf4bec03fc6b1d6df5d6259d6627eb40338c5787852ea10d96858029144348128b08e86c7079d96f10fd09dafc315
-EBUILD pmars-sdl-0.9.2e-r1.ebuild 1796 BLAKE2B 4620393a9697e9f68ac759f7a3e5fc01e0508aa82fd0aa9462b87e58f44471e6ccde75197654a3a7756de2dfa978c6ed360ac00269e50a3a175c190b9b43ef2d SHA512 2c831bc2e06429ffc4dd79a41c26c726cdbc1b9a890cd8551c2726839be867e3de2325d990bbcbdeafd640758364c71819ede81761dbee310bd70306375b589e
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch
deleted file mode 100644
index 4e02da8a82a8..000000000000
--- a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- a/src/asm.c.old	2015-10-28 13:23:53.465014342 +0100
-+++ b/src/asm.c	2015-10-28 13:23:10.502813377 +0100
-@@ -652,7 +652,7 @@
-   macputs(str);
- #else
-   if (!inCdb)
--    fprintf(stderr, str);
-+    fprintf(stderr, "%s", str);
- #if defined DOSALLGRAPHX
-   else {
-     if (displayMode == TEXT)
-@@ -833,7 +833,7 @@
- #ifdef __MAC__
-     textout(notEnoughMemErr);
- #else
--    fprintf(stderr, notEnoughMemErr);
-+    fprintf(stderr, "%s", notEnoughMemErr);
- #endif
-     Exit(MEMERR);
-     break;
-@@ -916,7 +916,7 @@
-   }
- 
-   if (ierr >= ERRMAX) {
--    sprintf(outs, tooManyMsgErr);
-+    sprintf(outs, "%s", tooManyMsgErr);
- #ifndef VMS
-     textout(outs);
- #else
---- a/src/cdb.c.old	2015-10-28 13:24:04.669805966 +0100
-+++ b/src/cdb.c	2015-10-28 13:23:10.502813377 +0100
-@@ -2760,7 +2760,7 @@
-       fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName,
-               scrV[idxV[i]]);
-       if (warriors > 2) {
--        fprintf(outp, resultsAre);
-+        fprintf(outp, "%s", resultsAre);
-         for (j = 0; j < warriors; ++j) {
-           fprintf(outp, " %d", warrior[idxV[i]].score[j]);
-         }
---- a/src/clparse.c.old	2015-10-28 13:24:10.648694768 +0100
-+++ b/src/clparse.c	2015-10-28 13:23:10.502813377 +0100
-@@ -289,7 +289,7 @@
-               if (next_input(filep, inputs)) {
-                 if (!strcmp(inputs, "-")) {
-                   newFile = stdin;
--                  fprintf(stderr, readingStdin);
-+                  fprintf(stderr, "%s", readingStdin);
-                 } else {
-                   if ((newFile = fopen(inputs, "r")) == NULL) {
-                     code = FILENAME;        /* command file not found */
-@@ -430,11 +430,11 @@
-     errout(outs);
-     break;
-   case MEMORY:
--    sprintf(outs, outOfMemory);
-+    sprintf(outs, "%s", outOfMemory);
-     errout(outs);
-     break;
-   case FILENAME:
--    sprintf(outs, cannotOpenParameterFile);
-+    sprintf(outs, "%s", cannotOpenParameterFile);
-     errout(outs);
-     break;
-   }
diff --git a/games-simulation/pmars-sdl/metadata.xml b/games-simulation/pmars-sdl/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-simulation/pmars-sdl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
deleted file mode 100644
index b7f96156df97..000000000000
--- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit readme.gentoo-r1 toolchain-funcs
-
-MY_PN="${PN/-sdl/}"
-MY_PV="${PV/e/-5}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Portable redcode simulator's sdl port for core war"
-HOMEPAGE="http://corewar.co.uk/pihlaja/pmars-sdl/"
-SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="sdl X"
-
-RDEPEND="
-	sdl? ( x11-libs/libX11 media-libs/libsdl[video] )
-	X? ( x11-libs/libX11 )
-	!sdl? ( !X? ( sys-libs/ncurses:0= ) )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}"/${P}-format.patch )
-
-DOC_CONTENTS="
-	There are some macros in /usr/share/pmars/macros
-	which you should make accessible to pmars by typing
-	export PMARSHOME=/usr/share/pmars/macros\n
-"
-
-src_compile() {
-	CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE"
-	LFLAGS="-x"
-
-	if use sdl ; then
-		CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`"
-		LIB=`sdl-config --libs`
-	elif use X ; then
-		CFLAGS="${CFLAGS} -DXWINGRAPHX"
-		LIB="-L/usr/X11R6/lib -lX11"
-	else
-		CFLAGS="${CFLAGS} -DCURSESGRAPHX"
-		LIB="-lcurses"
-	fi
-
-	cd src
-
-	SRC="asm.c
-		 cdb.c
-		 clparse.c
-		 disasm.c
-		 eval.c
-		 global.c
-		 pmars.c
-		 sim.c
-		 pos.c
-		 str_eng.c
-		 token.c"
-
-	for x in ${SRC}; do
-		einfo "compiling ${x}"
-		$(tc-getCC) ${CFLAGS} ${x} -c || die
-	done
-
-	echo
-	einfo "linking with LIB: ${LIB}"
-	$(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die
-}
-
-src_install() {
-	dobin src/${MY_PN}
-	doman doc/${MY_PN}.6
-
-	dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref
-	readme.gentoo_create_doc
-
-	insinto "/usr/share/${MY_PN}/warriors"
-	doins warriors/*
-
-	insinto "/usr/share/${MY_PN}/macros"
-	doins config/*.mac
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-simulation/searchandrescue-1.5.0-r1 b/games-simulation/searchandrescue-1.5.0-r1
new file mode 100644
index 000000000000..61e15eea555b
--- /dev/null
+++ b/games-simulation/searchandrescue-1.5.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare unpack
+DEPEND=media-libs/libsdl media-libs/sdl-mixer x11-libs/libICE x11-libs/libSM x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXxf86vm virtual/opengl virtual/glu x11-base/xorg-proto
+DESCRIPTION=Helicopter based air rescue flight simulator
+EAPI=6
+HOMEPAGE=http://searchandrescue.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl media-libs/sdl-mixer x11-libs/libICE x11-libs/libSM x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXxf86vm virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/searchandrescue/SearchAndRescue-1.5.0.tar.gz mirror://sourceforge/searchandrescue/SearchAndRescue-data-1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=dcb0aca3a41417b412da6ffb9fe465e7
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
deleted file mode 100644
index 42a2f5363352..000000000000
--- a/games-simulation/searchandrescue/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX searchandrescue-1.5.0-build.patch 2110 BLAKE2B ce57c8702e1d9eeb44ace585c977a07d058b73eb109c0f22f85669199b5070d6339ae6248a54b8229735094ec8705c195a66e8c272292a738d0f8cd7f30866bd SHA512 9162d53482d1a364ff8991a318aa19322399c939e657b568e8e9d621d8ab9e462db7c14c0f350e03e6f8a6d5059d11f038485a91b92869bb7800aa77640954f8
-DIST SearchAndRescue-1.5.0.tar.gz 1473765 BLAKE2B cf7dcbb4d250a124a5450115e4fa6f016e83ba16a5ba12cbc53a3c3725643f0a0d306853a3239471ae87d4fc5bef16f2fe903601daf24e2c7a8e3dc71b1a1c2f SHA512 72a8e5c375bb2f5d11d1346bb3c81ea4678a9c58c36f53c048e9a16d32a926ff93c3ec9756867f0869aa2a8da5fb0bfe7764f704c4e79519ee0834d225513657
-DIST SearchAndRescue-data-1.3.0.tar.gz 52152370 BLAKE2B e6f19b03f45d971c43cfeb72e3202fbf99c1e3d276acc8e133e6c345b08f19cfdc1ae997fdb3d90e173fe5a6bd46685ac3903b1e1da3eda7fa105fc8d9547c7f SHA512 5419376aeecb0f05570a8d2a0a6f830f3b22ce9d1d34a5e490485767546c6d0d1d2a2a3f37e5dfcef69e271a94a9c7dfc6b592e3c0dd62a8a6c38e4bf7d25ccd
-EBUILD searchandrescue-1.5.0-r1.ebuild 1789 BLAKE2B c7a9c6a252c4e66d774d725d08eade45c683638a5d70b8c0cb4975773b76e79f15413dc96cd6988685afbcae359ba4e7d01d9988cb3d80aa520752e538082944 SHA512 46811d91f1e3de45c3ab17369e636346270c9795944e0e4badea6851b8ee138cae181e95d9ac124e276a5a57816c41f4d1b715797236371f44117cc5700c03d3
-MISC metadata.xml 338 BLAKE2B 75bbcfd013fbf4ea2aea09b64bb19a03e1e3f1490d77f4ed7f07af069ccc9c0643e5e1d0368d4dab289c709a49306645befbb28a087c59779415ab0bee0f6ab6 SHA512 434ce984794eb43c0e4083cefe03dff01118cc3b9aa64d43c7bfbfccaae20212baa111dce95ac79a9b9e94f9fc405e30bd09bd7fc845bba749e5659ae26ce388
diff --git a/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch b/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch
deleted file mode 100644
index 40428bade2d7..000000000000
--- a/games-simulation/searchandrescue/files/searchandrescue-1.5.0-build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- searchandrescue_1.3.0.orig/sar/makefile_append.ini
-+++ searchandrescue_1.3.0/sar/makefile_append.ini
-@@ -3,7 +3,7 @@
- 
- 
- # C++ flags:
--CPPFLAGS = -D__cplusplus -Dc_plusplus
-+CPPFLAGS += -D__cplusplus -Dc_plusplus
- 
- 
- # Source files list:
-@@ -16,14 +16,12 @@
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .c.o:
- 	@echo "Compiling module $*.o"
--	@$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
-+	$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
- .cpp.o:
- 	@echo "Compiling module $*.o"
--	@$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	$(CPP) -c $*.cpp $(INC_DIRS) $(CPPFLAGS)
- 
- # Programs
--LS      = ls
--LSFLAGS = -s -h -c --color=auto
- RM      = rm
- RMFLAGS = -f
- 
-@@ -32,9 +30,8 @@
- 
- modules: $(OBJ_C) $(OBJ_CPP)
- 	@echo -n "Linking modules..."
--	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
-+	$(CPP) $(OBJ_C) $(OBJ_CPP) $(LDFLAGS) -o $(BIN) $(LIBS) $(LIB_DIRS)
- 	@echo -n "   "
--	@-$(LS) $(LSFLAGS) $(BIN)
- 
- prebuild:
- 	@echo "Building program \"$(BIN)\"..."
-@@ -54,5 +51,5 @@
- clean:
- 	@echo "Cleaning program \"$(BIN)\"..."
- 	@echo "Deleting all intermediate files..."
--	@$(RM) $(RMFLAGS) a.out core *.o $(BIN)
-+	$(RM) $(RMFLAGS) a.out core *.o $(BIN)
- 	@echo "Clean done."
---- searchandrescue_1.3.0.orig/sar/platforms.ini
-+++ searchandrescue_1.3.0/sar/platforms.ini
-@@ -102,7 +102,7 @@
-                 FeatureDepend = xf86vidmode-lib
-                         DependType = Library
-                         MustExist = Yes
--                        DependPath = libXxf86vm.a
-+                        DependPath = libXxf86vm.so
-                         DependGrepString = XF86VidModeQueryExtension
-                 FeatureDepend = xf86vidmode-devel
-                         DependType = Header
-@@ -223,7 +223,7 @@
-                 FeatureDepend = xf86vidmode-lib
-                         DependType = Library
-                         MustExist = Yes
--                        DependPath = libXxf86vm.a
-+                        DependPath = libXxf86vm.so
-                         DependGrepString = XF86VidModeQueryExtension
-                 FeatureDepend = xf86vidmode-devel
-                         DependType = Header
diff --git a/games-simulation/searchandrescue/metadata.xml b/games-simulation/searchandrescue/metadata.xml
deleted file mode 100644
index 2ddbf0d5866c..000000000000
--- a/games-simulation/searchandrescue/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">searchandrescue</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild b/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
deleted file mode 100644
index 9213c1144606..000000000000
--- a/games-simulation/searchandrescue/searchandrescue-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs
-
-MY_DATA_PV=1.3.0
-MY_PN=SearchAndRescue
-DESCRIPTION="Helicopter based air rescue flight simulator"
-HOMEPAGE="http://searchandrescue.sourceforge.net/"
-SRC_URI="mirror://sourceforge/searchandrescue/${MY_PN}-${PV}.tar.gz
-	mirror://sourceforge/searchandrescue/${MY_PN}-data-${MY_DATA_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXxf86vm
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}_${PV}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_unpack() {
-	unpack ${MY_PN}-${PV}.tar.gz
-	mkdir data && cd data && \
-		unpack ${MY_PN}-data-${MY_DATA_PV}.tar.gz
-	bunzip2 "${S}"/sar/man/${MY_PN}.6.bz2 || die
-}
-
-src_prepare() {
-	default
-
-	rm pconf/pconf || die
-	sed -i -e '/Wall/s/$/ $(CFLAGS)/' pconf/Makefile || die
-}
-
-src_configure() {
-	emake CC=$(tc-getCC) -C pconf pconf # Needed for the configure script
-
-	append-cppflags -DNEW_GRAPHICS -DHAVE_SDL_MIXER
-	export CPP="$(tc-getCXX)"
-	export CPPFLAGS="${CXXFLAGS}"
-	# NOTE: not an autoconf script
-	./configure Linux --prefix="/usr" || die
-	sed -i -e 's/@\$/$/' sar/Makefile || die
-}
-
-src_compile() {
-	emake -C sar
-}
-
-src_install() {
-	dobin sar/${MY_PN}
-	doman sar/man/${MY_PN}.6
-	dodoc AUTHORS HACKING README
-	doicon sar/icons/SearchAndRescue.xpm
-	newicon sar/icons/SearchAndRescue.xpm ${PN}.xpm
-	dodir /usr/share/games/${PN}
-	cp -r "${WORKDIR}"/data/* "${D}/usr/share/games/${PN}/" || die
-	make_desktop_entry SearchAndRescue "SearchAndRescue" /usr/share/pixmaps/${PN}.xpm
-}
diff --git a/games-simulation/senken-0.3.0-r1 b/games-simulation/senken-0.3.0-r1
new file mode 100644
index 000000000000..8f18061b70a9
--- /dev/null
+++ b/games-simulation/senken-0.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
+DESCRIPTION=city simulation game
+EAPI=6
+HOMEPAGE=https://savannah.nongnu.org/projects/senken/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsdl-1.2.4 media-libs/sdl-image x11-libs/gtk+:2 nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://gentoo/senken-0.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4f6369171bae93c9d1e7a02f1cc08dc8
diff --git a/games-simulation/senken/Manifest b/games-simulation/senken/Manifest
deleted file mode 100644
index 5820deac0110..000000000000
--- a/games-simulation/senken/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX senken-0.3.0-as-needed.patch 947 BLAKE2B 0de09e827bf94bd9a4e2f289a3a685dfcbfa8860e9f2d3f343fb29ff4e345984b88f7c731add1f58a9a179061cee1e93ec3a4ec718e8c3f0dd80a4a4730e79c9 SHA512 6f1f5ae454b9f186624a2ac9d3d5d802c973fadcedf236d83b47020302645c197683ee8765c9b3536866d5281fd37ce94ebdafebde5b5653c1a2188a81fd6a44
-AUX senken-0.3.0-warnings.patch 1099 BLAKE2B 845bca95ba6ef003a751a096e3895386efe7920ac707249c229cfdd5593dd23c44adb96f985890a353233c7fd38f5f705b21a1e31b53b3dc6ae21523a01b2adf SHA512 5e48805adcec08e8deab671df7bf5a8303c29d8d2679bf9ce6608674d225e5acafc3f0f66b07c0362f9da735263773259db8f77dfe7028f268dbe13ce67e6b10
-DIST senken-0.3.0.tar.gz 1391010 BLAKE2B ac55f61c6a1c86ca3a891190f562e91aaed56f19f08dffe2a17016dd8ef5e35a3e1c6188b402506d063c4ee812a43f63bfd45b58e102c4a1199a733ab336a8dc SHA512 df0c15cabf667fb7b56db40baf03fcae6695aa9ec0e42a7db682ff20877a5b89ee67e7799e762b4a78cf0f3fdee7f001419091f0683df74ba1bbe6b9501f0272
-EBUILD senken-0.3.0-r1.ebuild 1060 BLAKE2B 47b7a86ea77ce4ae749c949443251e5ae8351552a4c23623b5e0e453e7c192a25a8ebaf7d628aaf3246e10360343ba0d2b900ee6b6f439b1f318a73136c1740d SHA512 7e472b25ed6b5a45bf287dde998787117a2399b4092669ffef9954c5b401b37ce61d8c5734e9667ddeaf72b7e6f9df82e9bf6ee8226973189015cc9e41d042d8
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-simulation/senken/files/senken-0.3.0-as-needed.patch b/games-simulation/senken/files/senken-0.3.0-as-needed.patch
deleted file mode 100644
index 428cbc9ee4c6..000000000000
--- a/games-simulation/senken/files/senken-0.3.0-as-needed.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru senken-0.3.0.orig/server/Makefile.in senken-0.3.0/server/Makefile.in
---- senken-0.3.0.orig/server/Makefile.in	2003-11-20 02:30:15.000000000 -0500
-+++ senken-0.3.0/server/Makefile.in	2014-10-30 10:58:51.202157036 -0400
-@@ -10,7 +10,7 @@
- 
- DEFS = @DEFS@
- CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@
--LIBS = ../lib/libsenken.a @LIBS@ @LIBINTL@
-+LIBS = ../lib/libsenken.a @LIBS@ @LIBINTL@ -lm
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-diff -ru senken-0.3.0.orig/src/Makefile.in senken-0.3.0/src/Makefile.in
---- senken-0.3.0.orig/src/Makefile.in	2003-11-20 02:30:16.000000000 -0500
-+++ senken-0.3.0/src/Makefile.in	2014-10-30 10:59:05.154704393 -0400
-@@ -8,7 +8,7 @@
- 
- DEFS = @DEFS@
- CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @GTK_CFLAGS@
--LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@
-+LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@ -lm
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
diff --git a/games-simulation/senken/files/senken-0.3.0-warnings.patch b/games-simulation/senken/files/senken-0.3.0-warnings.patch
deleted file mode 100644
index b15565ad0a90..000000000000
--- a/games-simulation/senken/files/senken-0.3.0-warnings.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru senken-0.3.0.orig/server/protocol.c senken-0.3.0/server/protocol.c
---- senken-0.3.0.orig/server/protocol.c	2003-11-20 02:30:15.000000000 -0500
-+++ senken-0.3.0/server/protocol.c	2014-10-30 11:04:39.831848871 -0400
-@@ -294,7 +294,7 @@
-     /*
-      * If transaction active just save this for later
-      */
--    if (connection_txn_active) {
-+    if (connection_txn_active(conn)) {
- 	set_op_t *op = calloc(1, sizeof(set_op_t));
- 	int r;
- 
-diff -ru senken-0.3.0.orig/src/gtkhelp_reports.c senken-0.3.0/src/gtkhelp_reports.c
---- senken-0.3.0.orig/src/gtkhelp_reports.c	2003-11-20 02:30:16.000000000 -0500
-+++ senken-0.3.0/src/gtkhelp_reports.c	2014-10-30 11:06:43.795828908 -0400
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include <gtk/gtk.h>
- #include <gdk/gdk.h>
- 
-diff -ru senken-0.3.0.orig/src/main.c senken-0.3.0/src/main.c
---- senken-0.3.0.orig/src/main.c	2003-11-20 02:30:16.000000000 -0500
-+++ senken-0.3.0/src/main.c	2014-10-30 11:06:28.147336339 -0400
-@@ -25,6 +25,7 @@
- #  include <config.h>
- #endif
- 
-+#include <string.h>
- #include <unistd.h>
- #include <signal.h>
- #include <gtk/gtk.h>
diff --git a/games-simulation/senken/metadata.xml b/games-simulation/senken/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-simulation/senken/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-simulation/senken/senken-0.3.0-r1.ebuild b/games-simulation/senken/senken-0.3.0-r1.ebuild
deleted file mode 100644
index 9b4e0cb1e242..000000000000
--- a/games-simulation/senken/senken-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="city simulation game"
-HOMEPAGE="https://savannah.nongnu.org/projects/senken/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.4
-	media-libs/sdl-image
-	x11-libs/gtk+:2
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-warnings.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/local/share:/usr/share:" \
-		lib/utils.h || die
-}
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	default
-
-	#dodir "${GAMES_DATADIR}"
-	#mv "${D}/${GAMES_PREFIX}/share/senken" "${D}/${GAMES_DATADIR}/" || die
-	#rm -rf "${D}/${GAMES_PREFIX}"/{include,lib,man,share} || die
-
-	insinto /usr/share/senken/img
-	doins img/*.png
-
-	find "${D}/usr/share/" -type f -exec chmod a-x \{\} +
-	find "${D}/usr/share/" -name "Makefile.*" -exec rm -f \{\} +
-}
diff --git a/games-simulation/simutrans-0.120.2.2 b/games-simulation/simutrans-0.120.2.2
new file mode 100644
index 000000000000..c089c694ca24
--- /dev/null
+++ b/games-simulation/simutrans-0.120.2.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=sys-libs/zlib app-arch/bzip2 media-libs/sdl-mixer media-libs/libpng:0 media-libs/libsdl[sound,video] app-arch/unzip
+DESCRIPTION=A free Transport Tycoon clone
+EAPI=6
+HOMEPAGE=http://www.simutrans.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=sys-libs/zlib app-arch/bzip2 media-libs/sdl-mixer media-libs/libpng:0 media-libs/libsdl[sound,video]
+SLOT=0
+SRC_URI=mirror://sourceforge/simutrans/simutrans-src-120-2-2.zip http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip mirror://sourceforge/simutrans/simupak64-120-2.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a1cdedb875dc084508f7825cf7b3bfdc
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
deleted file mode 100644
index 5b83f40f1580..000000000000
--- a/games-simulation/simutrans/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX simutrans-0.120.2.2-Makefile.patch 2015 BLAKE2B 1a3aac151b1ead4355d4206064d1c773813789b0463b2cb90494ce759cfcd31b9ce7db5f8d52c055d9364bd7fec2e8096437e023e1e618f58a53b58666f98cdf SHA512 2d85d4a048a40c6a3581492f50f7d2364cfd36f6d0496fcf89406ed1d7ad091b218700b2e8d1f26e0bdd346b3f449e0c0d30ef4bffed30b351c1e424ce7a4439
-DIST language_pack-Base+texts.zip 1097263 BLAKE2B 08678f36a2425b84bf5f440a546af7ca6507ee17bdcfd3096335c20ce60c23a5375eb133f597806bed28db2d9ed067669e83a4df47443be0cb48bf151ba91ef2 SHA512 015caafaeace03bd5475e66c93bb433d9b07b600c3fcf125a4bda9b2856ba41dc43b923e032920df4a060087ead7180df59092f23ab6dcf12579b580827b1248
-DIST simupak64-120-2.zip 4453079 BLAKE2B 910f7937d5eabe8c97f9b9fb6b1d0a63ffe5c7a897a83d5649581f629c1e6d000442399f3e181c0a6e2b08a6f9948354df1848b84df6c2d37bd65d4c303d1626 SHA512 c7f819142b66c093c8631fcfe8e70c3be667680d745a66eab65e06979f849592d2c09ed18eb33ca2e359b2830f57874ae23d989ab5aa901eece69de83180f357
-DIST simutrans-src-120-2-2.zip 3900947 BLAKE2B 69e9f78883d1b611bc76bbff1dc46ab1a645580ec0114f342aeb5e243c643c0fa4d3684e8102a0196f95320b4f93a0a50a93bb61802e81236f286a2989ac646f SHA512 db9797be132bb1936d8c3192e536523d1249d20a513f3758037097ef46c2bab40d4be8adb68cb21eda2b4820369e89bd0a6e2abc4fe2bbcefe40bb414a3d1ab2
-EBUILD simutrans-0.120.2.2.ebuild 1498 BLAKE2B 9ac5acaa5c8a3181e2e92a8c8c3def5a564bff80de99f1f90e6389480e5e2a6955321259c4504b42b5a5b2f70e289b925e1bb97ded6c8db1967613dd384ec2f0 SHA512 20cbfabc2f86bab1d741d6ccaab13070587e9e668db536cd48bcc1fde86b9b6e43e92da7daa51a77d573abdc345ddb40925660d72a2ac466ae93fc10e4cf0fc7
-MISC metadata.xml 332 BLAKE2B cbfe0465e3d6ce4bdda79fcac0b10b477c384630855de37cb25500225eaaf628a2b8a5bfc95f73d90c5f4b8ed0d213fbb7f8a28ee7e5333c59048d5002cb5886 SHA512 c8e6f7d4963c82a5d993a6edc3d8dfc925ffc9df28fbbadf6d2fa91f5f34c9afb4fc8f821a8a7e2e99522ec9bf2d2bc0a7f620337d2097f13af77016846dad36
diff --git a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
deleted file mode 100644
index f9fb48ab682f..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.120.2.2-Makefile.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/Makefile	2017-03-29 12:04:15.000000000 +0300
-+++ b/Makefile	2017-06-08 01:41:32.605031258 +0300
-@@ -87,8 +87,6 @@
-       CFLAGS += -minline-all-stringops

-     endif

-   endif

--else

--  CFLAGS += -O

- endif

- 

- ifdef DEBUG

-@@ -110,6 +108,7 @@
-   endif

- else

-   CFLAGS += -DNDEBUG

-+  CXXFLAGS += -DNDEBUG

- endif

- 

- ifdef MSG_LEVEL

-@@ -127,6 +126,7 @@
- ifneq ($(MULTI_THREAD),)

-   ifeq ($(shell expr $(MULTI_THREAD) \>= 1), 1)

-     CFLAGS += -DMULTI_THREAD

-+    CXXFLAGS += -DMULTI_THREAD

-     ifneq ($(OSTYPE),haiku)

-       LDFLAGS += -lpthread

-     endif

-@@ -142,11 +142,13 @@
-     endif

-     ifneq ($(REV),)

-       CFLAGS  += -DREVISION="$(REV)"

-+      CXXFLAGS  += -DREVISION="$(REV)"

-     endif

-   endif

- endif

- 

- CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

-+CXXFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)

- CCFLAGS  += -ansi -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64

- 

- 

-@@ -514,6 +516,7 @@
-     endif

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -553,6 +556,7 @@
-     endif

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS)

- endif

- 

-@@ -568,6 +572,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer

- endif

- 

-@@ -594,6 +599,7 @@
-     SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)

-   endif

-   CFLAGS += $(SDL_CFLAGS)

-+  CXXFLAGS += $(SDL_CFLAGS)

-   LIBS   += $(SDL_LDFLAGS) -lglew32

-   ifeq ($(OSTYPE),mingw)

-     LIBS += -lopengl32

-@@ -609,6 +615,7 @@
- endif

- 

- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)

- 

- ifneq ($(findstring $(OSTYPE), cygwin mingw),)

-   SOURCES += simres.rc

-@@ -616,7 +623,6 @@
- endif

- 

- CCFLAGS  += $(CFLAGS)

--CXXFLAGS += $(CFLAGS)

- 

- BUILDDIR ?= build/$(CFG)

- PROGDIR  ?= $(BUILDDIR)

diff --git a/games-simulation/simutrans/metadata.xml b/games-simulation/simutrans/metadata.xml
deleted file mode 100644
index 9d88e43fb074..000000000000
--- a/games-simulation/simutrans/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">simutrans</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild b/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
deleted file mode 100644
index f175a36b9e03..000000000000
--- a/games-simulation/simutrans/simutrans-0.120.2.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic eutils
-
-MY_PV=${PV/0./}
-MY_PV=${MY_PV//./-}
-SIMUPAK="simupak64-${MY_PV%-[0-9]*}.zip"
-
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="http://www.simutrans.com/"
-SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
-	http://simutrans-germany.com/translator/data/tab/language_pack-Base+texts.zip
-	mirror://sourceforge/simutrans/${SIMUPAK}"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib
-	app-arch/bzip2
-	media-libs/sdl-mixer
-	media-libs/libpng:0
-	media-libs/libsdl[sound,video]"
-
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
-)
-
-src_unpack() {
-	unpack simutrans-src-${MY_PV}.zip
-	unpack "${SIMUPAK}"
-
-	# Bundled text files are incomplete, bug #580948
-	cd "${S}/simutrans/text" || die
-	unpack language_pack-Base+texts.zip
-}
-
-src_prepare() {
-	default
-
-	strip-flags # bug #293927
-	printf "BACKEND=mixer_sdl\nCOLOUR_DEPTH=16\nOSTYPE=linux\nVERBOSE=1" \
-		> config.default || die
-
-	# make it look in the install location for the data
-	sed -i \
-		-e "s:argv\[0\]:\"/usr/share/${PN}/\":" \
-		simmain.cc || die
-
-	rm simutrans/*.txt || die
-}
-
-src_install() {
-	newbin build/default/sim ${PN}
-	insinto /usr/share/${PN}
-	doins -r simutrans/*
-	dodoc documentation/*
-	doicon simutrans.ico
-	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
-}
diff --git a/games-simulation/singularity-0.30c-r2 b/games-simulation/singularity-0.30c-r2
new file mode 100644
index 000000000000..0828cab216a7
--- /dev/null
+++ b/games-simulation/singularity-0.30c-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/unzip
+DESCRIPTION=Simulation of a true AI. Go from computer to computer, chased by the whole world
+EAPI=6
+HOMEPAGE=http://www.emhsoft.com/singularity/
+IUSE=+music python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-2.5
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygame[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/sdl-mixer[vorbis]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://endgame-singularity.googlecode.com/files/singularity-0.30c-src.tar.gz music? ( https://endgame-singularity.googlecode.com/files/endgame-singularity-music-006.zip )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=121458a1beaaaae4072cd4e553b07334
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
deleted file mode 100644
index c65c109f4353..000000000000
--- a/games-simulation/singularity/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST endgame-singularity-music-006.zip 28250705 BLAKE2B 62f39536afe12d0928056cca05cccbc7542d79ce5a2acfb23dc99e66ea291eeadc2ae8e771cfed5a96ff69bdc217b69f44b8c5143a323fa5c06fe2d34ac6d425 SHA512 47e489112309cc742c2dcffec004aff25c54488fdf2a5f2dc67b7dcf67ca55996fe8e8403e4a16712fbc4e22289f12e612ad9d4322cd1d1aaab871f0ffb27e19
-DIST singularity-0.30c-src.tar.gz 2265133 BLAKE2B a3f7612ac173ef34183ea500d8bef8b1c823b54d0b0acb6a40bce058497d424f76df5fd51da8f1acfb636a556759cea2114529e0e60b453652d0b04a139b19a1 SHA512 ffca50c179b745561a25e3fb3525abb862d72f63f533f8a41472067d0ce94c8a236486c9c40a5040335d84e903c498805d591dc546a92d0a7651105103fe114f
-EBUILD singularity-0.30c-r2.ebuild 1221 BLAKE2B 308560485eaad449831520685a57dddceeea6ea08905ebfdfc3a101eac98e081646d9f7c86a117e59c21271d65338e9c13c31ce6df05c238cebf88a038291e43 SHA512 4ee050a90784b2241fd09a07c09c4ea755c53cf1558041e694cf89dc74080ca28686d075bbba0168f04db0b2432a4d29157566a00106ab6e0bd9ad4b39498442
-MISC metadata.xml 405 BLAKE2B 5ce059ade56e4080d77172d347c4f22a80c7d0762df1ddb9833fc92455b0bc22aca2263eb217b15ea82f76bfe268d9d1793b169774f2150888652d8aec83a745 SHA512 c32086dbbfce16439635063e3ed94a44a9bff47f5047cc9c078ed59bf4eac0e7e91b86037f4fd19c1e21fdcb4853e794535cc4d1a8ee898f8e292b26bbe7883f
diff --git a/games-simulation/singularity/metadata.xml b/games-simulation/singularity/metadata.xml
deleted file mode 100644
index 3bc51b541a4a..000000000000
--- a/games-simulation/singularity/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="music">Install music files</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">endgame-singularity</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-simulation/singularity/singularity-0.30c-r2.ebuild b/games-simulation/singularity/singularity-0.30c-r2.ebuild
deleted file mode 100644
index 51ceaa93529d..000000000000
--- a/games-simulation/singularity/singularity-0.30c-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-MUSIC=endgame-${PN}-music-006
-DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
-HOMEPAGE="http://www.emhsoft.com/singularity/"
-SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
-	music? ( https://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
-
-LICENSE="GPL-2 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+music"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-mixer[vorbis]"
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -f code/{,*}/*.pyc data/*.html || die # Remove unecessary files
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data ${PN}.py || die
-	python_optimize ${ED%/}/usr/share/${PN}
-
-	if use music ; then
-		doins -r ../${MUSIC}/music || die
-	fi
-
-	make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN}
-	dodoc README.txt TODO Changelog AUTHORS
-}
diff --git a/games-sports/Manifest.gz b/games-sports/Manifest.gz
index 6ded426e1106..9e3f3374a01c 100644
--- a/games-sports/Manifest.gz
+++ b/games-sports/Manifest.gz
diff --git a/games-sports/billardgl-1.75-r2 b/games-sports/billardgl-1.75-r2
new file mode 100644
index 000000000000..5cdc8c11189a
--- /dev/null
+++ b/games-sports/billardgl-1.75-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/freeglut x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu
+DESCRIPTION=an OpenGL billards game
+EAPI=6
+HOMEPAGE=http://www.billardgl.de/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut x11-libs/libXi x11-libs/libXmu virtual/opengl virtual/glu
+SLOT=0
+SRC_URI=mirror://sourceforge/billardgl/BillardGL-1.75.tar.gz mirror://gentoo/billardgl.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c0220795734a95b7f31d58ea214c0281
diff --git a/games-sports/billardgl/Manifest b/games-sports/billardgl/Manifest
deleted file mode 100644
index c55bf4c2d64b..000000000000
--- a/games-sports/billardgl/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST BillardGL-1.75.tar.gz 736295 BLAKE2B 0330d5120b0f49f3a6ddc862cb474e2b8af19bf8218c45986360d3ecace0ff307db214739c2d29929fbe04a27a16cbc75c65761829e3f0fd41fceb91d11f146c SHA512 a81d50aa44f97f06fcafd32c3436709c302f86d37f915b2d63acd9c5d48eef22259858064ff56366c7c1cdff40e4a16ad84abe1b91a0daa408cb05ba728d1e88
-DIST billardgl.png 3212 BLAKE2B 0e3fe631ecae6288a50ec4f7dcc0d28ceac87ef23949e8113c74f49db06a5d2cbdcc814d7198937101aafc354341ae66164f61ac81eab86a2c324ba395e4d3c0 SHA512 d9606d8c6e6f9e2ce820a135aa32a8d3604b619a6ce6626fe742424074e48e71703919c5a1923d1ee6b38670ee70c757c328123d3f3c7f595a3c2fc704bd6f74
-EBUILD billardgl-1.75-r2.ebuild 1164 BLAKE2B 71b3e7adf8429564e3804f65b9d74d8639565f0bc2dc1a42ace39e41e4a5b9fcbb86729c8bab25ac8204e52253e9b0931c789ed0862a7593c83e8fbcfa76932a SHA512 63437aad99cda7b7f1b7d3e0f43afdc908f5627ffefa9494714ed36ad39f16fe9c2ca297a92cfb0fcda75de9d24eef82c685dff7365517657bf70c6054249738
-MISC metadata.xml 332 BLAKE2B 42ee526d8719377927e6d434e744883f5e3087bd6cbd4ddf872c1546ac8e983eda9cd584f587a1fb35827fff6e6ebed5d944733b66f0cdee7c59d14f95a77451 SHA512 332e3ee7d7aef28c4cc13d9e0504c1f93f97b50f7a6e8fd1ba93ff0ecdd4cfe07bf2acca4a5599418af61bfeda824fdfb641715ceeb7aa5aa48ee991263cc921
diff --git a/games-sports/billardgl/billardgl-1.75-r2.ebuild b/games-sports/billardgl/billardgl-1.75-r2.ebuild
deleted file mode 100644
index e71f5aa777d3..000000000000
--- a/games-sports/billardgl/billardgl-1.75-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="an OpenGL billards game"
-HOMEPAGE="http://www.billardgl.de/"
-SRC_URI="mirror://sourceforge/${PN}/BillardGL-${PV}.tar.gz
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	media-libs/freeglut
-	x11-libs/libXi
-	x11-libs/libXmu
-	virtual/opengl
-	virtual/glu"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/BillardGL-${PV}/src
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:/usr/share/BillardGL/:/usr/share/${PN}/:" \
-		Namen.h \
-		|| die "sed Namen.h failed"
-	sed -i \
-		-e '/^LINK/s:g++:$(CXX):' \
-		-e '/^CXX[[:space:]]/d' \
-		-e '/^CC[[:space:]]/d' \
-		-e '/^CXXFLAGS/s:=.*\(-D.*\)-.*:+=\1:' \
-		-e "/^LFLAGS/s:=:=${LDFLAGS}:" \
-		Makefile \
-		|| die "sed Makefile failed"
-	sed -i \
-		-e 's:<iostream.h>:<iostream>:' \
-		-e 's:<fstream.h>:<fstream>\nusing namespace std;:' \
-		bmp.cpp \
-		|| die "sed bmp.cpp failed"
-}
-
-src_install() {
-	newbin BillardGL ${PN}
-	insinto /usr/share/${PN}
-	doins -r lang Texturen
-	dodoc README
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} BillardGL
-}
diff --git a/games-sports/billardgl/metadata.xml b/games-sports/billardgl/metadata.xml
deleted file mode 100644
index d755f0671516..000000000000
--- a/games-sports/billardgl/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">billardgl</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/bygfoot-2.3.2-r1 b/games-sports/bygfoot-2.3.2-r1
new file mode 100644
index 000000000000..ef195b4fd233
--- /dev/null
+++ b/games-sports/bygfoot-2.3.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=app-arch/zip media-libs/freetype:2 x11-libs/gtk+:2 virtual/libintl sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=GTK+2 Soccer Management Game
+EAPI=6
+HOMEPAGE=http://bygfoot.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/zip media-libs/freetype:2 x11-libs/gtk+:2 virtual/libintl
+SLOT=0
+SRC_URI=mirror://sourceforge/bygfoot/bygfoot-2.3.2.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_=6a29c9b1e4f6f26b50f865ec241e48e2
diff --git a/games-sports/bygfoot/Manifest b/games-sports/bygfoot/Manifest
deleted file mode 100644
index 5022abcf7918..000000000000
--- a/games-sports/bygfoot/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bygfoot-2.3.2.tar.bz2 1585550 BLAKE2B c0c874209c4e7d5a291380857bf020542a427ffbac8bdcbda23dd1c33e3087a40aecdb210c96b630ddfbb388c650d6eb939ed83c6d0141b64c68c01f6916553e SHA512 ce93333f50de6696538a494794d469d6768b93332f8cca1c96725259d23a78f64b94fcfff1e6227ddce52e75ae2d1e55ed78f2e94603bf1c06c6fc808f0b9626
-EBUILD bygfoot-2.3.2-r1.ebuild 949 BLAKE2B 001c34c03fb5c895da233c6c1a47ad2c1b7372d9446c7bf861aa857d4d930b0b0fcf87996d6c6fb17b3f77d7de83185fb2623916eb3783c72b96271465451616 SHA512 a3a8ec2b6fc61b9e67bbd3a395bcfb18664d9f40c2ac9c9d311312b66ca72ff176b77f4cba4518c2eb95032478e8fe4dfe88cabc28806325f815243a863fe215
-MISC metadata.xml 330 BLAKE2B a5f84d7f11f3c81bd543e66046fd4fbb6efa723f094ec15747fab5d0430b4b16397a5fac9e9e73f72abfcd718494a5516e27ac1d69d4ea53b4e5074bcc0c4578 SHA512 ab2de414d15e699ff5c054e0684847b55bc8a30915652b69b02a7b38f2da2cc960b5b92ca8da199a2fdb3187e5d47d0472be5c85012bf76925b79bc01e20575d
diff --git a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild b/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
deleted file mode 100644
index ea344fe4a073..000000000000
--- a/games-sports/bygfoot/bygfoot-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="GTK+2 Soccer Management Game"
-HOMEPAGE="http://bygfoot.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/zip
-	media-libs/freetype:2
-	x11-libs/gtk+:2
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:$(gnulocaledir):/usr/share/locale:' \
-		-e '/PACKAGE_LOCALE_DIR/s:\$(prefix)/\$(DATADIRNAME):/usr/share:' \
-		-e '/bygfoot_LDADD/s/$/ -lm/' \
-		po/Makefile.in.in src/Makefile.in || die
-}
-
-src_configure() {
-	econf --disable-gstreamer
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	esvn_clean "${D}"
-	dodoc AUTHORS ChangeLog README TODO UPDATE
-	newicon support_files/pixmaps/bygfoot_icon.png ${PN}.png
-	make_desktop_entry ${PN} Bygfoot
-}
diff --git a/games-sports/bygfoot/metadata.xml b/games-sports/bygfoot/metadata.xml
deleted file mode 100644
index bd5aa766b504..000000000000
--- a/games-sports/bygfoot/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">bygfoot</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/dustrac-1.11.0-r1 b/games-sports/dustrac-1.11.0-r1
new file mode 100644
index 000000000000..3fd86f39aac1
--- /dev/null
+++ b/games-sports/dustrac-1.11.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 media-libs/libvorbis media-libs/openal virtual/opengl dev-qt/linguist-tools:5 dev-qt/qttest:5 virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Tile-based, cross-platform 2D racing game
+EAPI=6
+HOMEPAGE=http://dustrac.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ CC-BY-SA-3.0
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtxml:5 media-libs/libvorbis media-libs/openal virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/dustrac/dustrac-1.11.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=69034f35ee4ee01729a8cc112fa811bf
diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest
deleted file mode 100644
index bfe897b9cf26..000000000000
--- a/games-sports/dustrac/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dustrac-1.11.0-cmake.patch 1194 BLAKE2B d908401bbd0f89ad8dff63628b386642bb27f498fc89f97059c82848de88bda12b98b1e65048d35c0667f46f756b614d65d31aeed47ee18abcc57394a96ae6d4 SHA512 e614de1c2e0fdd8880876831ec39d525c5cd8c9bcc7bb90b95313aa8c394abd1120c139bb3a73691aa168d5e4ac537511227660b5e6b28515aa3a52e36377aba
-DIST dustrac-1.11.0.tar.gz 27505282 BLAKE2B a42de406e388e13f1829e10248899f47cf98333a972eb4ce978116a706d9786840c4c6ec9107403aad25bd538453a7595c35cab33b0643968133710db2a3c66c SHA512 af67b76a815543d41cf8e5681ede11bfd63a2d6be7e4a21986d495d77b2673f5a145bb1c9cd5237d2caf64a4e77f221ae48b97a38a883dcd4e5bb0ef8c55f839
-EBUILD dustrac-1.11.0-r1.ebuild 1406 BLAKE2B af911883ecba1c1aa2d895a1f0e354d5494442feab0c32e53633f918bb83fb0efb48e26603329e125422e5ecfa071dee9ad8c8692a2685a5ede2351b58bd0a4d SHA512 4540337bd03354350b50199ebc4a784f328f1e7dc749f722c886b017fbfeffda0b6a2adc45df23f0a293ee2e657d9098b77464c03dea0cad1f1522241fba99d6
-MISC metadata.xml 682 BLAKE2B 08391e9c66de45fa14889b85c2d52008d7012ddbb2a1685baf6057be4c8faa4cadf863d110826b97745164869556d123544bbfe5391d42fc190cd2406c9d8bca SHA512 355e91033f2e318fbb9163cd6e2eca8babe47ce495aca9c9e0b533284e38cbe51331b194d9a905ee6b056bcdf7ba38bcb6d1b968b8ba801832253f216d41b7de
diff --git a/games-sports/dustrac/dustrac-1.11.0-r1.ebuild b/games-sports/dustrac/dustrac-1.11.0-r1.ebuild
deleted file mode 100644
index 550cbced1e66..000000000000
--- a/games-sports/dustrac/dustrac-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils cmake-utils
-
-DESCRIPTION="Tile-based, cross-platform 2D racing game"
-HOMEPAGE="http://dustrac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz"
-
-LICENSE="GPL-3+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtxml:5
-	media-libs/libvorbis
-	media-libs/openal
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-)
-
-src_configure() {
-	# -DGLES=ON didn't build for me but maybe just need use flags on some QT package?
-	# Maybe add a local gles use flag
-	local mycmakeargs=(
-		-DReleaseBuild=ON
-		-DDATA_PATH="/usr/share/${PN}"
-		-DBIN_PATH="/usr/bin"
-		-DDOC_PATH=/usr/share/doc/${PF}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# FIXME: where should these come from?
-	dosym /usr/share/fonts/ubuntu-font-family/UbuntuMono-B.ttf "/usr/share/${PN}/fonts/UbuntuMono-B.ttf"
-	dosym /usr/share/fonts/ubuntu-font-family/UbuntuMono-R.ttf "/usr/share/${PN}/fonts/UbuntuMono-R.ttf"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch b/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch
deleted file mode 100644
index 6f497e4969ef..000000000000
--- a/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- dustrac-1.11.0.orig/CMakeLists.txt
-+++ dustrac-1.11.0/CMakeLists.txt
-@@ -68,8 +68,7 @@
- endif()
- 
- if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--    add_compile_options(-std=c++11 -W -Wall -O3 -pedantic)
--    add_compile_options(-fomit-frame-pointer -finline-functions -ffast-math)
-+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions")
- elseif(MSVC)
-     add_definitions(-DNOMINMAX)
- endif()
---- dustrac-1.11.0.orig/InstallLinux.cmake
-+++ dustrac-1.11.0/InstallLinux.cmake
-@@ -58,7 +58,7 @@
-     install(FILES data/fonts.conf DESTINATION ${DATA_PATH})
-     install(FILES data/meshes.conf DESTINATION ${DATA_PATH})
-     install(FILES data/surfaces.conf DESTINATION ${DATA_PATH})
--    install(FILES AUTHORS CHANGELOG COPYING README DESTINATION ${DOC_PATH})
-+    install(FILES AUTHORS CHANGELOG README DESTINATION ${DOC_PATH})
-     install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg")
-     install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png")
-     install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk")
diff --git a/games-sports/dustrac/metadata.xml b/games-sports/dustrac/metadata.xml
deleted file mode 100644
index 065d1cf194d5..000000000000
--- a/games-sports/dustrac/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Dust Racing (Dustrac) is a tile-based, cross-platform 2D racing
-		game written in Qt (C++) and OpenGL. Dust Racing comes with a
-		Qt-based level editor for easy level creation. A custom engine,
-		MiniCore, is used for physics modeling. Dust Racing 2D is
-		inspired by Super Cars and Slicks’n Slide.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">dustrac</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/foobillard-3.0a-r1 b/games-sports/foobillard-3.0a-r1
new file mode 100644
index 000000000000..1c3d558399e5
--- /dev/null
+++ b/games-sports/foobillard-3.0a-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut ) 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=8ball, 9ball, snooker and carambol game
+EAPI=6
+HOMEPAGE=http://foobillard.sourceforge.net/
+IUSE=sdl video_cards_nvidia
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9:2 media-libs/libpng:0= sdl? ( media-libs/libsdl[video] ) !sdl? ( media-libs/freeglut )
+SLOT=0
+SRC_URI=mirror://gentoo/foobillard-3.0a.tar.gz
+_eclasses_=autotools	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_=07e8d46b8a1869813987fa8f799cdf00
diff --git a/games-sports/foobillard/Manifest b/games-sports/foobillard/Manifest
deleted file mode 100644
index 5d4851f8fc76..000000000000
--- a/games-sports/foobillard/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX foobillard-3.0a-as-needed.patch 809 BLAKE2B 413b55b273f0f52ff877b926a2e92952559e9ad10bdbac84baef63f957873a5ba007a1429c21a60b0df5117761a931a9b2ecb8b608b47a2a35d51b9fc9b1cbc7 SHA512 331c225bccac11daa57deafee373b3b44ab0ce5dfb3299be331c287ebf04bdcda99be1a72103cac2c65610d0dc8371a3b081bcb3ec0ad95ab146fb2ea5ad30cd
-AUX foobillard-3.0a-fbsd.patch 908 BLAKE2B 59c80d913f6e37c586a6f9d3fc88e60d286c92e208243d39d5d94c0b80c8652e15c02893afa0eaf01e6b69872999569df5c63d4db18471091cbcaa5d9fe852af SHA512 30c96452301ce60b9c42e8816a153724b05edb099e682a3ebaec776accd2e998bc059c2f6993c65a70972aa309b11b73121ff1fe10fe22229b934b21063ae835
-AUX foobillard-3.0a-freetype_pkgconfig.patch 1525 BLAKE2B 9922d7d44e8cd11c46e5007fbf8a85e3ca648699f9410173bf90bd808bc59108053da445bc6f14e86548d0bf66481c2884382c11713b900fbff9ae832eb6fb1a SHA512 6d310cc911e7729a1b0b4a575c83be91924eec994dc254d75cfad764549a47479ed8abb56131543deace6d7f440d210f036dc5263b1b8e8d9dbbb98f6a1cc594
-AUX foobillard-3.0a-gl-clamp.patch 841 BLAKE2B a5a8715e41dbd5426253f2ce2b60724ac7700c6617ad821354ce4821ef7af0d2ce6efd75f34aa7960dd4af5ba9ee5108776329a0eb23074952d710ead194ee45 SHA512 3be3c896f9e789d35236b630e7a587d53112abbfc70e0b5cb32bad1f2b5f0692ed804e14ed7d1f84db89cdb8c34eaccc09801fd5a450efee9d741eb59bd3a3e1
-AUX foobillard-3.0a-no_nvidia.patch 774 BLAKE2B 26cee332da6fefab8dd44cdd74fc392bac04fab70415bfa0b529f5f6e86abea7273aec6be9ba1bed9720d6069a77b12f36f40808a447d547dcfaf4105960890b SHA512 d24dd67aff4b69f9776613ac06289c75feded056f7aadc40b47a25dbaf6518d0e6a1d2d38e33004cea6c3f57ffb6716631ce3d1ead28a40b4de1791f18adc023
-DIST foobillard-3.0a.tar.gz 1138477 BLAKE2B 8abb068ec9deacff9748e199782699fe3df70a4e787ece2e8247086ed35f6260b6389fb8fb3f17ebf815f167b7c3a672740de889537e025160614a67bc734c87 SHA512 6ff85255384a83cb147a9682beefa021658ba34ad00ed7879bf7887fff248d41aeb34d2dbe39148ee10bffc53091ea5f168b4afeddac9b50d577bad7799d59b2
-EBUILD foobillard-3.0a-r1.ebuild 1282 BLAKE2B 125999fc2a626644909d9cba1bb313d71d874ff45f15a17ab25cda6b55c217dfd2a600274ba13c44d4a0c8af36c1f65afb8f8fcea97e80636ad5544d99c3119d SHA512 7f50aafc8d71d5721cd9af80f30c897f9c247ade556a2cee553e7945e5b26034fdc9a7518f86041e86f665541a3e89241a1ebd6206b9ee0833f59abf9d7f3541
-MISC metadata.xml 333 BLAKE2B 0734c0d7cb2cc15deca03ad77aa234c2ede6c95baddca35dd5c07adb2fdf0229f526e664a7b22036257ed16fd86669ab65e6fca819a839f16a698dac90a3739b SHA512 0dd5f539d8dbd30c937ca6a8b67ad9c2d2b62627a0629dffb04b95673635f44f54b99773b0f938ba24b3aec19aa858c5458e9abb121230d9fa7e3652318a9689
diff --git a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch b/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
deleted file mode 100644
index 272f9c711778..000000000000
--- a/games-sports/foobillard/files/foobillard-3.0a-as-needed.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- foobillard-3.0a.old/src/Makefile.am	2004-02-25 07:23:56.000000000 +0100
-+++ foobillard-3.0a/src/Makefile.am	2008-12-06 21:57:03.000000000 +0100
-@@ -83,6 +83,5 @@ AM_CFLAGS = -Wall `freetype-config --cfl
- 
- #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
- #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
--AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS}
- #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
--LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
-+LIBS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS} ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
diff --git a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch b/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
deleted file mode 100644
index 3b7fc953a4de..000000000000
--- a/games-sports/foobillard/files/foobillard-3.0a-fbsd.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: foobillard-3.0a/configure.in
-===================================================================
---- foobillard-3.0a.orig/configure.in
-+++ foobillard-3.0a/configure.in
-@@ -13,7 +13,7 @@ dnl Checks for libraries.
- 
- dnl Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h)
-+AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h endian.h sys/endian.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-Index: foobillard-3.0a/src/billard3d.c
-===================================================================
---- foobillard-3.0a.orig/src/billard3d.c
-+++ foobillard-3.0a/src/billard3d.c
-@@ -24,7 +24,11 @@
- #include <string.h>
- #include <math.h>
- #include <unistd.h>
-+#ifdef HAVE_ENDIAN_H
- #include <endian.h>
-+#elif defined(HAVE_SYS_ENDIAN_H)
-+#include <sys/endian.h>
-+#endif
- 
- #ifndef USE_SDL
- #include <GL/glut.h>
diff --git a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch b/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
deleted file mode 100644
index b01c53ecbc8b..000000000000
--- a/games-sports/foobillard/files/foobillard-3.0a-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- foobillard-3.0a/configure.in
-+++ foobillard-3.0a/configure.in
-@@ -13,7 +13,7 @@
- 
- dnl Checks for header files.
- AC_HEADER_STDC
--AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h ft2build.h)
-+AC_CHECK_HEADERS(limits.h unistd.h math.h stdlib.h stdio.h)
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
---- foobillard-3.0a/src/Makefile.am
-+++ foobillard-3.0a/src/Makefile.am
-@@ -50,7 +50,7 @@
- #CC     = gcc
- #CXXFLAGS = -O6 -s
- #CFLAGS = -DXMESA -Wall -O3 -I$(INCDIR)
--#CFLAGS = -Wall -O3 -I$(INCDIR) `freetype-config --cflags`
-+#CFLAGS = -Wall -O3 -I$(INCDIR) `pkg-config --cflags freetype2`
- if USE_SDL
- SDL_CFLAGS = `sdl-config --cflags` -DUSE_SDL
- SDL_LIBS   = `sdl-config --libs`
-@@ -79,10 +79,10 @@
- SOUND_CFLAGS =
- endif
- 
--AM_CFLAGS = -Wall `freetype-config --cflags` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
-+AM_CFLAGS = -Wall `pkg-config --cflags freetype2` ${SDL_CFLAGS} ${NVIDIA_CFLAGS} ${SOUND_CFLAGS} ${DEBUG_CFLAGS}
- 
- #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
- #LIBS   = -L$(LIBDIR) -lglut -lGLU -lGL -lXext -lXaw -lm -lXi -lpng -lz
--AM_LDFLAGS = ${all_libraries} `freetype-config --libs` ${SDL_LIBS} ${GLUT_LIBS}
-+AM_LDFLAGS = ${all_libraries} `pkg-config --libs freetype2` ${SDL_LIBS} ${GLUT_LIBS}
- #LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz -L/home/floh/nvsdk/OpenGL/lib/ -lnvparse
- LDADD = ${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} -lGL -lGLU -lXaw -lm -lXi -lpng -lz
diff --git a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch b/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
deleted file mode 100644
index 972d14cabb0a..000000000000
--- a/games-sports/foobillard/files/foobillard-3.0a-gl-clamp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur foobillard-3.0a/src/table.c foobillard-3.0a-glclamp/src/table.c
---- foobillard-3.0a/src/table.c	2004-01-11 21:53:02.000000000 +0000
-+++ foobillard-3.0a-glclamp/src/table.c	2011-02-21 09:14:36.000000000 +0000
-@@ -1214,8 +1214,8 @@
-                           GL_UNSIGNED_BYTE, tabletexdata);
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, options_tex_min_filter);
-         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, options_tex_mag_filter);
--        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
--        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-         free( tabletexdata );
-     } else {
-         tabletexbind=0;
diff --git a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch b/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
deleted file mode 100644
index 8a9a33c43ea4..000000000000
--- a/games-sports/foobillard/files/foobillard-3.0a-no_nvidia.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/ball.c.orig	2004-06-02 07:00:57.000000000 -0400
-+++ b/src/ball.c	2004-06-02 07:03:52.000000000 -0400
-@@ -1821,6 +1821,7 @@
-             } else if( options_cuberef && cuberef_binds!=0 ){
-                 glBindTexture(GL_TEXTURE_CUBE_MAP_ARB, cuberef_binds[i]);
- #ifdef GL_VERTEX_PROGRAM_NV
-+#ifdef USE_BALL_FRESNEL
-                 {
-                     myvec cam_pos2;
- //                    cam_pos2=vec_scale(vec_unit(vec_diff(cam_pos,balls.ball[i].r)),BALL_D/2.5);
-@@ -1829,6 +1830,7 @@
-                                            BALL_D/2.0,BALL_D/2.5,0,0 );
-                 }
- #endif
-+#endif
-                 draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
-             }else{
-                 draw_ball(&balls.ball[i],cam_pos,cam_FOV,win_width,0);
diff --git a/games-sports/foobillard/foobillard-3.0a-r1.ebuild b/games-sports/foobillard/foobillard-3.0a-r1.ebuild
deleted file mode 100644
index 4847f1d1ffcd..000000000000
--- a/games-sports/foobillard/foobillard-3.0a-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-DESCRIPTION="8ball, 9ball, snooker and carambol game"
-HOMEPAGE="http://foobillard.sourceforge.net/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="sdl video_cards_nvidia"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libXi
-	virtual/opengl
-	virtual/glu
-	>=media-libs/freetype-2.0.9:2
-	media-libs/libpng:0=
-	sdl? ( media-libs/libsdl[video] )
-	!sdl? ( media-libs/freeglut )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eapply \
-		"${FILESDIR}"/${P}-no_nvidia.patch \
-		"${FILESDIR}"/${P}-freetype_pkgconfig.patch \
-		"${FILESDIR}"/${P}-fbsd.patch \
-		"${FILESDIR}"/${P}-as-needed.patch \
-		"${FILESDIR}"/${P}-gl-clamp.patch
-	mv configure.{in,ac} || die
-	rm aclocal.m4
-
-	eautoreconf
-}
-
-src_configure() {
-	use video_cards_nvidia && append-ldflags -L/usr/$(get_libdir)/opengl/nvidia/lib
-	econf \
-		--enable-sound \
-		$(use_enable sdl SDL) \
-		$(use_enable !sdl glut) \
-		$(use_enable video_cards_nvidia nvidia)
-}
-
-src_install() {
-	default
-	doman foobillard.6
-	newicon data/full_symbol.png foobillard.png
-	make_desktop_entry foobillard Foobillard
-}
diff --git a/games-sports/foobillard/metadata.xml b/games-sports/foobillard/metadata.xml
deleted file mode 100644
index 9a3afbb16c8e..000000000000
--- a/games-sports/foobillard/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">foobillard</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/gracer-0.1.5-r1 b/games-sports/gracer-0.1.5-r1
new file mode 100644
index 000000000000..92779a4c7066
--- /dev/null
+++ b/games-sports/gracer-0.1.5-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=dev-lang/tcl:0 media-libs/freeglut media-libs/giflib media-libs/libpng:0 media-libs/plib x11-libs/libXi x11-libs/libXmu virtual/glu virtual/jpeg:0 virtual/opengl
+DESCRIPTION=3D motor sports simulator
+EAPI=6
+HOMEPAGE=http://gracer.sourceforge.net/
+IUSE=joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/tcl:0 media-libs/freeglut media-libs/giflib media-libs/libpng:0 media-libs/plib x11-libs/libXi x11-libs/libXmu virtual/glu virtual/jpeg:0 virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/gracer/gracer-0.1.5.tar.gz
+_md5_=fef1fffd7c2900c6db1d021fc423d2e2
diff --git a/games-sports/gracer/Manifest b/games-sports/gracer/Manifest
deleted file mode 100644
index 24f299335bc1..000000000000
--- a/games-sports/gracer/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX 0.1.5-gldefs.patch 1066 BLAKE2B 9fe3b38e03a65311d9867d5f68083452112c8000c97a1a130ed4ef176287a2407368374a7c47e3968181cdd7b78718a0e37dd4b9b71c6ba3d9d8fc91ff7135bd SHA512 817bfa44ccdc07366177e1048b47c822313d1509c90c4f7569ec4c6dd423d75053e45e95b52c8986ec23b1300b49be4e8dae3f875c47b168c438996d6fff9e5f
-AUX gracer-0.1.5-as-needed.patch 1134 BLAKE2B 7f1163ceec6c90d3b5d1aa704b75909a74884c44f8be506ae1f71d2a36071da9f32a0928050380043416537683d476a8dfb0509cf4b617d2c7214c43289a0274 SHA512 dc7738a289d8ca9df8548cdf3011e523814ddd8071df0cc73f1ff0a2ce52e679b821608bd91978585f0c3c658e3b9091204ccad58100c190524b6c0326236b85
-AUX gracer-0.1.5-gcc41.patch 414 BLAKE2B 2a26e687f8491568849ffde604447cb24d5e60425f47916d1ef0533af6a2d7dd8dbe14bfece2a6a11b89991890f665037ffd8f8f389ba616c5968d0bd779f866 SHA512 b732fcb3f0dc990f32ea55cddc35e44eb57994989a5f3b1c38b1d89a9e4e1e4c77ffa0244c0eb1b5b1259e396a7d8718289a32cf314ae7b8b2738a3ec0acc8ac
-AUX gracer-0.1.5-giflib.patch 331 BLAKE2B a71d7b71fafeea69ac2728bc7b87d7c8af293975d0cc23095cc9c7dc1b233fc28dd3ac02cf625daf5e8d2a42603de1280775553ab0538bb2c07be2d0b2c0c953 SHA512 56ced23de71bdaeb577b5b006fd2f139f70d681584d4de7b96e33e5199f2f3c6e2a31ece79b9c32eb61ffdac1848a504bc8a1ed9f1bad2a90f41bb2fbeb51b57
-AUX gracer-0.1.5-libpng14.patch 389 BLAKE2B 29b82dd813bb53ab2e24d18eb51962d53e07b03dc05c2a8f838a7bf594bd01062f5ad5de2823107adad591758fe24d1a0aecc26eedf4aa24dc09b2aae672c26f SHA512 8074b990613e2c1957e41e7091289291275dcb5aaf54e89553cdcc333cfc0c226d4ae9af71809f847b541280667f26912711d3eb868ae746952b8dccdaf6519f
-AUX gracer-0.1.5-png15.patch 314 BLAKE2B eee2f0362eeb2d8495b1389324c98b79f520a840c0e180f1678be0ef9c847329b65d5660a2605ea511159de5f19acf06add7425c7d3d4fa9db25684cb0fe6321 SHA512 aa7e16d49084e96ed59068e765103f9f8a73e94a4c457ffa4a5813a4e6fd794bc64385cf81978d399eeac43426c8975d35900eca38c0b5c6613c76dc8e917fc9
-AUX gracer-0.1.5-warnings.patch 433 BLAKE2B 477908392007a988c8d251c5671984fb1115425f902bc06523042fcb7c55657c73e62dfd4fb1b95c2a7b4d2067d5895f0f8c22c0b3b59b1637cbe59255bb49a5 SHA512 a8a1c2ac8b6d38355b48bfb61980f6eee15b0404dd4d8d8a17debe3d69a319f1b9f48aa40e0d00857af8051f1d93d864e6970d2d051791e8e21ffedbb09b2d31
-AUX gracer-gcc-3.4.patch 1755 BLAKE2B 28f5493bad092f9894cda84ff875824ee7d8490a921a74414277f95195949d2b8cdcc1c8d26a0666fb84f767266910c50fe6778fda581baf0045750f0913c44e SHA512 544bb200bb49bf40b798c32f30f24795204c6e3f67a971ad9254f040e7f30a063e17974a6256de54d4550cb347392a4e71fb8aa29fc46f1fbcf92b1cf0ad015c
-DIST gracer-0.1.5.tar.gz 520599 BLAKE2B 1e52fffb3eb609f413e5e8afece0a28ec501f82be0941a8da4ab0bc726f0394b18d676696fe2b02f176c55892f780f9e3786d219c487533d9b4270f43ac8200a SHA512 eb812c517087a955d4b421e5d0e4bc841428162ed3f76dcac1a7a36b67e6ac14e8a6c231cca2a8ba9c60a4a25c79d532983a13dc4e9b9e4b7dfad3e78f1284bc
-EBUILD gracer-0.1.5-r1.ebuild 996 BLAKE2B 7da74c04fd3f6b09bebf9a7684b91ff4939f184b77b1366e154d5e4fa265d88da9bd026a0cc3d587f752767eac56ac9d5f5a6cfc4ba3739e1230350d2e3cb01e SHA512 f7817438fcd36264d1e047161f5ee5fb491d3016530c8864e320563835c5d14ee3d80fe12ed8e575e629f3a0852abe1db9c6a37f9b6430cebed7c89653c02bf1
-MISC metadata.xml 329 BLAKE2B a18bab81346e7fcc2a257edf21cbc4707bdc2fa2133c2274967dd17e7ae052b327a1fdc116b2f008e9705def4300915b1c42e3f40383abf2627d662f32aee4e3 SHA512 c2f7b825c898da8e7ff14e83350c02a880eb2338607f562c42cd7dabd25ddaa938f4202aff742091302b0e609f02d2c4abf5c3b34e24b29262530934ffd2139d
diff --git a/games-sports/gracer/files/0.1.5-gldefs.patch b/games-sports/gracer/files/0.1.5-gldefs.patch
deleted file mode 100644
index 43fe7385dc6e..000000000000
--- a/games-sports/gracer/files/0.1.5-gldefs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/glbind.c	2003-07-30 00:18:37.000000000 -0400
-+++ b/src/glbind.c	2003-07-30 00:19:32.000000000 -0400
-@@ -22,6 +22,8 @@
- #include <unistd.h>
- #include <GL/gl.h>
- #include <GL/glut.h>
-+#undef GL_EXT_texture_object
-+#include <GL/glext.h>
- #include <string.h>
- #include <stdlib.h>
- #include <ctype.h>
---- a/src/glhash.h	2003-07-30 00:20:32.000000000 -0400
-+++ b/src/glhash.h	2003-07-30 00:20:58.000000000 -0400
-@@ -1,4 +1,5 @@
- /* this file is generated automaticaly from GL/gl.h */
-+#undef GL_EXT_paletted_texture
- #include <GL/gl.h>
- 
- glWordList glwordlist[] = {
-@@ -632,13 +632,11 @@
- 
- #ifdef GL_SGIS_multitexture
- 	{"selected_texture_sgis",	GL_SELECTED_TEXTURE_SGIS},
--	{"selected_texture_coord_set_sgis",	GL_SELECTED_TEXTURE_COORD_SET_SGIS},
- 	{"max_textures_sgis",	GL_MAX_TEXTURES_SGIS},
- 	{"texture0_sgis",	GL_TEXTURE0_SGIS},
- 	{"texture1_sgis",	GL_TEXTURE1_SGIS},
- 	{"texture2_sgis",	GL_TEXTURE2_SGIS},
- 	{"texture3_sgis",	GL_TEXTURE3_SGIS},
--	{"texture_coord_set_source_sgis",	GL_TEXTURE_COORD_SET_SOURCE_SGIS},
- #endif
- 
- #ifdef GL_EXT_multitexture
diff --git a/games-sports/gracer/files/gracer-0.1.5-as-needed.patch b/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
deleted file mode 100644
index 1b8b21f1a186..000000000000
--- a/games-sports/gracer/files/gracer-0.1.5-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in	2009-02-11 14:31:56.000000000 +0100
-+++ b/src/Makefile.in	2009-02-11 14:32:29.000000000 +0100
-@@ -109,7 +109,7 @@
- INCLUDES =  	-I$(top_srcdir) 	@X_CFLAGS@ 	@GL_CFLAGS@ 	@GLUT_CFLAGS@ 	@TCL_CFLAGS@ 	@GIF_CFLAGS@ 	@JPEG_CFLAGS@ 	@PNG_CFLAGS@ 	@PLIB_CFLAGS@
- 
- 
--gracer_LDADD =  	@PLIB_LDFLAGS@ 	@GIF_LDFLAGS@ 	@JPEG_LDFLAGS@ 	@PNG_LDFLAGS@ 	@GL_LDFLAGS@ 	@GLUT_LDFLAGS@ 	@X_LDFLAGS@ 	@TCL_LDFLAGS@ 	@TCL_LIBS@ 	@X_LIBS@ 	@GL_LIBS@ 	@GLUT_LIBS@ 	@GIF_LIBS@ 	@JPEG_LIBS@ 	@PNG_LIBS@ 	@SOUND_LIBS@ 	$(top_builddir)/common/libcommon.a
-+gracer_LDADD = $(top_builddir)/common/libcommon.a 	@PLIB_LDFLAGS@ 	@GIF_LDFLAGS@ 	@JPEG_LDFLAGS@ 	@PNG_LDFLAGS@ 	@GL_LDFLAGS@ 	@GLUT_LDFLAGS@ 	@X_LDFLAGS@ 	@TCL_LDFLAGS@ 	@TCL_LIBS@ 	@X_LIBS@ 	@GL_LIBS@ 	@GLUT_LIBS@ 	@GIF_LIBS@ 	@JPEG_LIBS@ 	@PNG_LIBS@ 	@SOUND_LIBS@
- 
- 
- gracer_SOURCES =  		control.h 		glbind.c 		glbind.h 		glutwidgets.c 		glutwidgets.h 		gluttclwidgets.c 		gluttclwidgets.h 		glutgame.c 		glutgame.h 		gr_world.c 		gr_world.h 		glhash.h 		gluthash.h 		vehicle.c 		vehicle.h 		lap.c 		lap.h 		joystick.c 		joystick.h 		tcldefs.h 		sound.h 		sound.cxx 		main.cxx
diff --git a/games-sports/gracer/files/gracer-0.1.5-gcc41.patch b/games-sports/gracer/files/gracer-0.1.5-gcc41.patch
deleted file mode 100644
index 3877e76e577e..000000000000
--- a/games-sports/gracer/files/gracer-0.1.5-gcc41.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common/gr_memory.h	2006-05-23 09:16:21.000000000 +0200
-+++ b/common/gr_memory.h	2006-05-23 09:16:40.000000000 +0200
-@@ -64,7 +64,7 @@
- void	gr_dlist_free			(GrDList *list);
- 
- #define gr_FOREACH(l,p) \
--  for (; (l) != NULL && ((void *)(p) = (l)->data, 1); (l) = (l)->next) 
-+  for (; (l) != NULL && (p = (l)->data, 1); (l) = (l)->next) 
- 
- void	gr_ref_incr			(GrRef *ref);
- void	gr_ref_decr			(GrRef *ref);
diff --git a/games-sports/gracer/files/gracer-0.1.5-giflib.patch b/games-sports/gracer/files/gracer-0.1.5-giflib.patch
deleted file mode 100644
index a5ce023f5734..000000000000
--- a/games-sports/gracer/files/gracer-0.1.5-giflib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gracer-0.1.5/common/gr_texture.c
-+++ gracer-0.1.5/common/gr_texture.c
-@@ -274,7 +274,11 @@
-   int index;
-   int width, height;
- 
-+#if (GIFLIB_MAJOR >= 5&& !(GIFLIB_MAJOR == 5 && GIFLIB_MINOR == 0))
-+  file = DGifOpenFileName (filename, &i);
-+#else
-   file = DGifOpenFileName (filename);
-+#endif
-   if (!file)
-     return -1;
- 
diff --git a/games-sports/gracer/files/gracer-0.1.5-libpng14.patch b/games-sports/gracer/files/gracer-0.1.5-libpng14.patch
deleted file mode 100644
index 618c987a3152..000000000000
--- a/games-sports/gracer/files/gracer-0.1.5-libpng14.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=308885
-
---- a/common/gr_texture.c
-+++ b/common/gr_texture.c
-@@ -419,7 +419,7 @@ read_png_file (GrTexture *texture, char
-   if (fread (header, 1, PNG_BYTES_TO_CHECK, file) != PNG_BYTES_TO_CHECK) {
-     goto ERROR;
-   }
--  if (!png_check_sig (header, PNG_BYTES_TO_CHECK)) {
-+  if (png_sig_cmp (header, 0, PNG_BYTES_TO_CHECK)) {
-     goto ERROR;
-   }
- 
diff --git a/games-sports/gracer/files/gracer-0.1.5-png15.patch b/games-sports/gracer/files/gracer-0.1.5-png15.patch
deleted file mode 100644
index d606c14cd4e2..000000000000
--- a/games-sports/gracer/files/gracer-0.1.5-png15.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/common/gr_texture.c	2011-09-14 14:23:46.820207882 +0200
-+++ b/common/gr_texture.c	2011-09-14 14:24:22.861203604 +0200
-@@ -431,7 +431,7 @@
-   if (!info_ptr) {
-     goto ERROR;
-   }
--  if (setjmp (png_ptr->jmpbuf)) {
-+  if (setjmp (png_jmpbuf(png_ptr))) {
-     goto ERROR;
-   }
-   png_init_io (png_ptr, file);
diff --git a/games-sports/gracer/files/gracer-0.1.5-warnings.patch b/games-sports/gracer/files/gracer-0.1.5-warnings.patch
deleted file mode 100644
index b5ede40e1492..000000000000
--- a/games-sports/gracer/files/gracer-0.1.5-warnings.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gracer-0.1.5/src/glbind.c
-+++ gracer-0.1.5/src/glbind.c
-@@ -142,7 +142,7 @@
-     return NULL;
- 
-   entry = Tcl_FindHashEntry (&cache_hash, key);
--  if (&entry)
-+  if (!entry)
-     return NULL;
- 
-   return Tcl_GetHashValue (entry);
---- gracer-0.1.5/src/joystick.c
-+++ gracer-0.1.5/src/joystick.c
-@@ -20,6 +20,7 @@
-  */
- 
- #include <unistd.h>
-+#include <string.h>
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
diff --git a/games-sports/gracer/files/gracer-gcc-3.4.patch b/games-sports/gracer/files/gracer-gcc-3.4.patch
deleted file mode 100644
index c12cb9a1f0cf..000000000000
--- a/games-sports/gracer/files/gracer-gcc-3.4.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- a/src/glbind.c	2004-11-05 01:15:07.141221016 +0000
-+++ b/src/glbind.c	2004-11-05 01:15:32.808319024 +0000
-@@ -2150,6 +2150,7 @@
-     return 3;
- 
-   default:
-+    ;
-   }
- 
- ERROR:
-@@ -2889,6 +2890,7 @@
-     return 6;
- 
-   default:
-+    ;
-   }
- 
- ERROR:
-@@ -3081,6 +3083,7 @@
-     return 4;
- 
-   default:
-+    ;
-   }
- 
- ERROR:
---- a/src/glutwidgets.c	2004-11-05 01:17:17.941336376 +0000
-+++ b/src/glutwidgets.c	2004-11-05 01:18:42.059548464 +0000
-@@ -255,6 +255,7 @@
- 	widget->width += (width - screen_width);
- 	break;
-       default:
-+        ;
-       }
-       switch (widget->anchor & GR_VERTICAL_MASK) {
-       case GR_BOTTOM:
-@@ -268,6 +269,7 @@
- 	widget->height += (width - screen_height);
- 	break;
-       default:
-+        ;
-       }
-       glut_widget_calc_bbox (widget);
-     }
-@@ -327,6 +329,7 @@
-       break;
- 
-     default:
-+      ;
-     }
-   }
- 
-@@ -504,6 +507,7 @@
-       break;
- 
-     default:
-+      ;
-     }
-   }
- 
-@@ -1299,6 +1303,7 @@
-     break;
- 
-   default:
-+    ;
-   }
- }
- 
-@@ -1571,6 +1576,7 @@
-       break;
- 
-     default:
-+      ;
-     }
- 
-     glColor4fv (widget->fg_color[GR_STATE_NORMAL]);
---- a/src/gr_world.c	2004-11-05 01:19:30.766143936 +0000
-+++ b/src/gr_world.c	2004-11-05 01:19:07.717647840 +0000
-@@ -169,6 +169,7 @@
-       break;
- 
-     default:
-+      ;
-     }
- 
-     tlist = entry->triggers;
---- a/ac2scene/ac2scene.c	2004-11-05 01:13:55.845059680 +0000
-+++ b/ac2scene/ac2scene.c	2004-11-05 01:14:32.526483256 +0000
-@@ -162,6 +162,7 @@
-     break;
- 
-   default:
-+    ;
-   }
- 
-   return 0;
-@@ -234,6 +235,7 @@
-     break;
- 
-   default:
-+    ;
-   }
- 
-   return 0;
-@@ -316,6 +318,7 @@
-     }
-     break;
-   default:
-+    ;
-   }
- 
-   return 0;
-@@ -399,6 +402,7 @@
-       break;
- 
-     default:
-+      ;
-     }
-   }
- 
diff --git a/games-sports/gracer/gracer-0.1.5-r1.ebuild b/games-sports/gracer/gracer-0.1.5-r1.ebuild
deleted file mode 100644
index c604168f2c6c..000000000000
--- a/games-sports/gracer/gracer-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="3D motor sports simulator"
-HOMEPAGE="http://gracer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gracer/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="joystick"
-
-DEPEND="
-	dev-lang/tcl:0
-	media-libs/freeglut
-	media-libs/giflib
-	media-libs/libpng:0
-	media-libs/plib
-	x11-libs/libXi
-	x11-libs/libXmu
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl"
-
-RDEPEND=${DEPEND}
-
-PATCHES=(
-		"${FILESDIR}"/${PV}-gldefs.patch
-		"${FILESDIR}"/${PN}-gcc-3.4.patch
-		"${FILESDIR}/${P}"-gcc41.patch
-		"${FILESDIR}"/${P}-as-needed.patch
-		"${FILESDIR}"/${P}-libpng14.patch
-		"${FILESDIR}"/${P}-png15.patch
-		"${FILESDIR}"/${P}-giflib.patch
-		"${FILESDIR}"/${P}-warnings.patch
-)
-
-src_configure() {
-	econf \
-		--enable-gif \
-		--enable-jpeg \
-		--enable-png \
-		$(use_enable joystick)
-	sed -i \
-		-e 's:-lplibsl:-lplibsl -lplibul:' \
-		$(find -name Makefile) || die
-}
diff --git a/games-sports/gracer/metadata.xml b/games-sports/gracer/metadata.xml
deleted file mode 100644
index f8270e9a0c3b..000000000000
--- a/games-sports/gracer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gracer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/metadata.xml b/games-sports/metadata.xml
deleted file mode 100644
index 370d356069e1..000000000000
--- a/games-sports/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-sports category contains sports games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-sports enthält Sportspiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-sports contiene juegos de deporte.
-	</longdescription>
-	<longdescription lang="ja">
-		games-sportsカテゴリーにはスポーツ・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-sports categorie bevat sportspellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-sports chứa các trò chơi thể thao.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-sports contiene giochi sportivi.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-sports contém jogos de esportes.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-sports zawiera gry sportowe.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-sports/miniracer-1.04 b/games-sports/miniracer-1.04
new file mode 100644
index 000000000000..cd5908eca6be
--- /dev/null
+++ b/games-sports/miniracer-1.04
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm media-libs/libsdl media-libs/sdl-mixer x11-base/xorg-proto
+DESCRIPTION=an OpenGL car racing game, based on ID's famous Quake engine
+EAPI=5
+HOMEPAGE=http://miniracer.sourceforge.net/
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86dga x11-libs/libXxf86vm media-libs/libsdl media-libs/sdl-mixer games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/miniracer/miniracer-1.04.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_=02cc98e4b41b2b8031416bb5c134a8e2
diff --git a/games-sports/miniracer/Manifest b/games-sports/miniracer/Manifest
deleted file mode 100644
index 789cbc6c339e..000000000000
--- a/games-sports/miniracer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX miniracer-1.04-ldflags.patch 1988 BLAKE2B 7b45068bf8aacb9d83b171a4412afa6cd93c0c50e0020076f5ad923e0de8c88b326a01c08bf75a9af16c141de2ced9048b290457c7c09494478a8a8b340f6215 SHA512 d2fd6d9ad5afa5d9269b161892c9b83fc76879fb7ca9f90dc4210c84dc14c99e0a810c6eb9bbef531574e3888563ce561bb588529e3294f181d836c98c6f3237
-AUX miniracer-1.04-nosharedelf.patch 542 BLAKE2B b63eee29f79e0bbedf81c5e47427cfd1c3aa6a49d7c0a53f8f14ec3dff182e3906761fcf133519098626cb428ec2c7f4a529815a2049bd9f088dae56153431e2 SHA512 34b5cfb83287650f2a621c5996cc988d905ad01a703b2f33d6bbcbb0cfb94fe319fda4d0ff00d23959e5c5276f685fc497f31e06844d0cecd4a4f7c8d86e15ac
-DIST miniracer-1.04.tar.gz 5315353 BLAKE2B 8f5081ef4ab323e97e4cdc35a6bf713534c8680b7949a8d47e3b8ef32427c333448d520d8b9cfa75f45819c2b805106f1e98a88704069288aa98b9f2776682d5 SHA512 6dc34371b6ea2d67c4a7d86b1200c9e7c7d56ef6b91af5ec4b0648da11dcfe6e125f6dc401a85e4c5bd3af2980d5a54b322c5466f96b7e21683e85ec4a7b0d6c
-EBUILD miniracer-1.04.ebuild 851 BLAKE2B d919aaa2b4def83c3089a834daa7c68d77f3330fc4f6c5b401db57afae64a69aeaf935f9db5b31cb3631e2bcfc7e748d53057d4716631149d7aae6fe68182303 SHA512 ebcaf43a946f4e86b6866c4fe2d2ab847ab51eff9bc8aa7c210a6bfb0a3730faf4f1ccd30f711a2a10b2c5b0702f3d1d61b5348c697a4729578f4f5661087e1b
-MISC metadata.xml 332 BLAKE2B e5ef5e591415cf1513d3c980e11733f4fb464d605c9fb442ea4ae9b4fa3b95086c6e803d198b18df5e50eee116c6dc2d77e18ee14d6c8788708d24e20d337aae SHA512 ade0aa3bd8cf05a614c929da53b540fa7bdbd1d39c3b5459b6f795ba04f72544bfe5e87918ca605a36ba7941e119b7ba73bb7adf68f95446f243ab3e1a02996a
diff --git a/games-sports/miniracer/files/miniracer-1.04-ldflags.patch b/games-sports/miniracer/files/miniracer-1.04-ldflags.patch
deleted file mode 100644
index 4c37dc9e1aa3..000000000000
--- a/games-sports/miniracer/files/miniracer-1.04-ldflags.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- Makefile.old	2010-10-13 12:41:01.000000000 +0200
-+++ Makefile	2010-10-13 12:56:04.000000000 +0200
-@@ -10,13 +10,12 @@
- 
- BUILDDIR=obj
- 
--CC=gcc
- DEFS=-DVIDMODEXT_GAMMA_RAMP -DSOUND
--INCLUDES= -I. -I/usr/X11R6/include -I/usr/include/SDL
--CFLAGS=$(DEFS) $(INCLUDES) -O3 -march=i486 -ffast-math -fexpensive-optimizations
-+INCLUDES= -I. -I/usr/X11R6/include $(shell sdl-config --cflags)
-+CFLAGS=$(DEFS) $(INCLUDES) @CFLAGS@
- 
- GL_LDFLAGS=-L/usr/X11R6/lib -lGL -lXxf86dga -lXxf86vm -lX11 -lXext -lm
--LDFLAGS=$(GL_LDFLAGS) -ldl -lSDL -lSDL_mixer -lpthread
-+LDLIBS=$(GL_LDFLAGS) -ldl -lSDL_mixer $(shell sdl-config --libs)
- 
- #############################################################################
- # SETUP AND BUILD
-@@ -43,15 +42,16 @@
- build_release: engine.glx
- 
- install:
--	install -d $(DESTDIR)/usr/bin
-+	install -d $(DESTDIR)@GAMES_BINDIR@
- 	install -d $(DESTDIR)/usr/share/man/man6
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -d $(DESTDIR)/usr/share/games/MiniRacer/data/maps
--	install -m 755 engine.glx $(DESTDIR)/usr/share/games/MiniRacer
-+	install -d $(DESTDIR)@GAMES_LIBDIR@
-+	install -m 755 engine.glx $(DESTDIR)@GAMES_LIBDIR@
- 	install -m 644 data/pak0.pak $(DESTDIR)/usr/share/games/MiniRacer/data
- 	install -m 644 data/config.cfg $(DESTDIR)/usr/share/games/MiniRacer/data
--	install -m 755 miniracer $(DESTDIR)/usr/bin/miniracer
-+	install -m 755 miniracer $(DESTDIR)@GAMES_BINDIR@/miniracer
- 	install -m 644 miniracer.6 $(DESTDIR)/usr/share/man/man6
- 	install -m 644 data/maps/*.bsp $(DESTDIR)/usr/share/games/MiniRacer/data/maps
- 	install -m 644 data/maps/maps1.lst $(DESTDIR)/usr/share/games/MiniRacer/data/maps
-@@ -145,7 +145,7 @@
- 	$(CC) $(CFLAGS) $(GLCFLAGS) -o $@ -c $<
- 
- engine.glx : $(GLMR_OBJS)
--	$(CC) $(CFLAGS) -o $@ $(GLMR_OBJS) $(LDFLAGS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(GLMR_OBJS) $(LDLIBS)
- 
- #############################################################################
- # MISC
diff --git a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch b/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
deleted file mode 100644
index 0bb0b5da846e..000000000000
--- a/games-sports/miniracer/files/miniracer-1.04-nosharedelf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- miniracer.old	2010-02-27 21:05:11.000000000 +0100
-+++ miniracer	2010-02-27 21:10:34.000000000 +0100
-@@ -12,10 +12,6 @@
- fi
- 
- #checks for files
--if ! [ -f $HOME/.MiniRacer/engine.glx ]; then
--	ln -s $MINIRACERDIR/engine.glx $HOME/.MiniRacer
--fi
--
- if ! [ -f $HOME/.MiniRacer/data/pak0.pak ]; then
- 	ln -s $MINIRACERDIR/data/pak0.pak $HOME/.MiniRacer/data
- fi
-@@ -35,7 +31,4 @@
- 
- # change directory and start MiniRacer
- cd $HOME/.MiniRacer
--./engine.glx $*
--
--exit 0
--      
-\ No newline at end of file
-+exec @GAMES_LIBDIR@/engine.glx $*
diff --git a/games-sports/miniracer/metadata.xml b/games-sports/miniracer/metadata.xml
deleted file mode 100644
index b948d3db5863..000000000000
--- a/games-sports/miniracer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">miniracer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/miniracer/miniracer-1.04.ebuild b/games-sports/miniracer/miniracer-1.04.ebuild
deleted file mode 100644
index 9b4490f7ca13..000000000000
--- a/games-sports/miniracer/miniracer-1.04.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="an OpenGL car racing game, based on ID's famous Quake engine"
-HOMEPAGE="http://miniracer.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86dga
-	x11-libs/libXxf86vm
-	media-libs/libsdl
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nosharedelf.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:@CFLAGS@:${CFLAGS}:" \
-		-e "s:@GAMES_LIBDIR@:$(games_get_libdir)/${PN}:" \
-		-e "s:@GAMES_BINDIR@:${GAMES_BINDIR}:" \
-		miniracer Makefile || die
-}
-
-src_install() {
-	default
-	prepgamesdirs
-}
diff --git a/games-sports/ski-6.9-r1 b/games-sports/ski-6.9-r1
new file mode 100644
index 000000000000..40eff5bb1c92
--- /dev/null
+++ b/games-sports/ski-6.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+DESCRIPTION=A simple text-mode skiing game
+EAPI=6
+HOMEPAGE=http://www.catb.org/~esr/ski/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.catb.org/~esr/ski/ski-6.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=79aeb9df0d35a75cdf6ae641620ae8d7
diff --git a/games-sports/ski/Manifest b/games-sports/ski/Manifest
deleted file mode 100644
index 495ecd072708..000000000000
--- a/games-sports/ski/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ski-6.9.tar.gz 17543 BLAKE2B aedc697ba636f12a3e180d351d2e0c409debcca2aba1eaa8bd5ecf93503b3903845424f9ed99ea83e26b311841b8287702a3c71730c60dbb3fa8e47eea05ead4 SHA512 bdcd9a267153b23bc1e4b99f0073d9d26ff8a8d670d70ec06cc27b91cd4a3bdaf821507671d73a359b3447261d52e596c61cbf9596eead7191102d1a089178b6
-EBUILD ski-6.9-r1.ebuild 588 BLAKE2B a8eec00145692023794f26f928f73c462e88eb2a86482d357cf0bfb609ba692bea092e6535a07081849020262454f0d401d6149d2fa9e428f9c14edebe10d050 SHA512 37247f23ce3412bba5f93bac1a6e30efaab45fa5b50e0cd077986e8f6025bf52edfd6c4d70f82d5d857503df2d79d647cbea6cde3ab02b6e4690b1aeb6530510
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-sports/ski/metadata.xml b/games-sports/ski/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-sports/ski/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-sports/ski/ski-6.9-r1.ebuild b/games-sports/ski/ski-6.9-r1.ebuild
deleted file mode 100644
index e817d5cc3607..000000000000
--- a/games-sports/ski/ski-6.9-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="A simple text-mode skiing game"
-HOMEPAGE="http://www.catb.org/~esr/ski/"
-SRC_URI="http://www.catb.org/~esr/ski/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dobin ski
-	dodoc NEWS README
-	doman ski.6
-	domenu ski.desktop
-	doicon ski.png
-	python_fix_shebang "${ED}/usr/bin"
-}
diff --git a/games-sports/speed-dreams-1.4.0-r1 b/games-sports/speed-dreams-1.4.0-r1
new file mode 100644
index 000000000000..53ec2b740a3d
--- /dev/null
+++ b/games-sports/speed-dreams-1.4.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/opengl virtual/glu media-libs/freealut media-libs/freeglut >=media-libs/libpng-1.2.40:0 media-libs/openal sys-libs/zlib x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr ) >=media-libs/plib-1.8.3 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXi x11-libs/libXt x11-libs/libXmu x11-libs/libXrender x11-base/xorg-proto >=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 fork of the famous open racing car simulator TORCS
+EAPI=6
+HOMEPAGE=http://speed-dreams.sourceforge.net/
+IUSE=xrandr
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu media-libs/freealut media-libs/freeglut >=media-libs/libpng-1.2.40:0 media-libs/openal sys-libs/zlib x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr )
+SLOT=0
+SRC_URI=mirror://sourceforge/speed-dreams/speed-dreams-1.4.0-r2307-src.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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ce88c46751301f60abacef4f3ce88149
diff --git a/games-sports/speed-dreams/Manifest b/games-sports/speed-dreams/Manifest
deleted file mode 100644
index 1505e710e39d..000000000000
--- a/games-sports/speed-dreams/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX speed-dreams-1.4.0-asneeded.patch 4214 BLAKE2B e0cf81e4bc04dd0a41ca813e2fbd66145bda4ad81b0137d9e09ef8cb0be5c458b7328be75605a3795f7a63f00104a85ebfe4bb34bc5437d58dee709edabb556f SHA512 908ca897a843c5bc1e1a1260adea227f445a2d7a3e09cc2cf7deb1cc85d4163fd89046db95679b8ed1288e2c104585322380765abdd65f2edd10b6027b7b4bab
-AUX speed-dreams-1.4.0-automake.patch 995 BLAKE2B 04280a67277a420108db5ae2675e99d6cdb3461120e9c04313cc6be4f910572cb87b6703d65444cb199d4b5ef2018239a843e1b64cdcb0820e4efdbdb30b0c38 SHA512 2300dd95087d0b7f0aada40041eea70976046085a9d9dc467c86691cf21058855941e642547a7eda26786b5a756d5930867616fb62534a0a2da1301dab3af8f0
-AUX speed-dreams-1.4.0-libpng15.patch 516 BLAKE2B 0464b8a006cc8a35442345d024bb301b0e3a1b4fb16110098aa27422cea35bbb67ccbd2fd689e8cc93b811ca37a4426799c9bd180e4bcca5ae3c20c76462f5b7 SHA512 f945622e791d15020370a1e31d328bc1329e08163a3c4f66fd63987e2dd357e2708338402fcfb5b2e994d4339a3d8d6df7f908b2ecbdff5cb6bd865259d40fa9
-AUX speed-dreams-1.4.0-math-hack.patch 1426 BLAKE2B 9457a89d48dc5fe1e5879ae1ee036ce87fdf51f7042fe7bb0c2213dad2e14d6009d21effc7b7a6a8832a269d0a8ed7c8e6b7e957815a24991fcf01d0a42e64ee SHA512 6187e0948b4b9b29f9934d4a760fb9bfdd81bd083d9f01a119f023fcacfe3f6163f8950934241cde24678ec4e4e081eafe6183263bc09c5f9f4db00c5f90259d
-DIST speed-dreams-1.4.0-r2307-src.tar.bz2 332667666 BLAKE2B 17455c6fc6bbe0cb4b5e00d4217eb49e0f6e39a8aa389f304771e32429c48e2e6bc834d8d0c7a01927376c5b37ae8e7b27399da88784b5f46b9549d46d01222f SHA512 6ae88691f52480351825c20c8bfb3ff54783b84bfbbc385ae2c0578991fa9025b16dcdc4ce136b85246a2a479452f2b209ecbec2be0a7ae85818929ea5fa1195
-EBUILD speed-dreams-1.4.0-r1.ebuild 1778 BLAKE2B 0a178e5f2494b6d4db6e4da48a9a0e8df850bad73020a8af85e881a3f3aff083173fe3b1cf5c803f940df0ef01ea318a0a6e846d20727da0438369c36d7e4460 SHA512 f0ab5162b7396f85cd737b8b4cae8599fa729771e69b708678733706b108481ccec9a94dc844ca71c0945187a23c3c6d3cbdbefc59b74e396f4232d461a17e01
-MISC metadata.xml 435 BLAKE2B d5cf15023cbbcfdb115d16b462337e9545185bd6e827e226965f8fe470c8a9825872fccfbdbdf8c208e2902f4adc4afdb1ff0f880fb0954aa8897115b9d47669 SHA512 d7b7bcb0acec23ac1f3b45f794a99597318194ab58d9b488c21766a8a6c32572b3d62540090a0c06e06a7f90d4330d3f7eb730e4c4a56a0a7a7c2bc94d77ed2f
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch
deleted file mode 100644
index 779119d995b1..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -123,8 +123,7 @@
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"]))
- AC_CHECK_LIB(openal, alEnable,, AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
- AC_CHECK_LIB(alut, alutLoadWAVFile,
--	LDFLAGS="$LDFLAGS -lalut",
--	LDFLAGS="$LDFLAGS")
-+	LIBS="$LIBS -lalut", )
- 
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to speed-dreams-users@lists.sourceforge.net with the subject \"Speed Dreams compilation problem\"]))
-@@ -141,7 +140,7 @@
- AC_CHECK_LIB(glut, glutSwapBuffers,,AC_MSG_ERROR([Can't find libglut. freeglut can be found on http://freeglut.sourceforge.net/]))
- 
- dnl Checks for plib libraries.
--LDFLAGS="$LDFLAGS -lplibjs"
-+AC_CHECK_LIB(plibjs, main,,AC_MSG_ERROR([Can't find libplibjs. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibul, main,,AC_MSG_ERROR([Can't find libplibul. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibsg, main,,AC_MSG_ERROR([Can't find libplibsg. PLIB can be found on http://plib.sourceforge.net/]))
- AC_CHECK_LIB(plibsl, main,,AC_MSG_ERROR([Can't find libplibsl. PLIB can be found on http://plib.sourceforge.net/]))
---- a/Make-default.mk
-+++ b/Make-default.mk
-@@ -402,7 +402,7 @@
- ifdef PROGRAM
- 
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installprogram: ${PROGRAM}
- 	@ createdir="${INSTLIBBASE}" ; \
-@@ -420,14 +420,14 @@
- ifdef LOCALTOOLS
- 
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- endif
- 
- ifdef TOOLS
- 
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installtools: ${TOOLS}
- 	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
-@@ -478,7 +478,7 @@
- ifdef SOLIBRARY
- 
- ${SOLIBRARY}: ${OBJECTS}
--	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/lib" ; \
- 	$(mkinstalldirs) $$createdir ; \
-@@ -509,7 +509,7 @@
- ifdef MODULE
- 
- ${MODULE}: ${OBJECTS}
--	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
- 	$(mkinstalldirs) $$createdir ; \
---- a/src/libs/client/Makefile
-+++ b/src/libs/client/Makefile
-@@ -23,6 +23,8 @@
- SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
- 	    optionmenu.cpp
- 
-+SOLIBS    = -lconfscreens -lraceengine
-+
- LIBS      =  -lplibssg -lplibsg -lplibul
- 
- EXPDIR    = include
---- a/src/libs/Makefile
-+++ b/src/libs/Makefile
-@@ -23,7 +23,7 @@
- 
- TOOLSUBDIRS	= txml
- 
--SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
-+SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
- 			  portability math
- 
- PKGSUBDIRS	= $(SUBDIRS)
---- a/src/libs/raceengineclient/Makefile
-+++ b/src/libs/raceengineclient/Makefile
-@@ -23,6 +23,8 @@
- SOURCES      = singleplayer.cpp raceinit.cpp racemain.cpp racemanmenu.cpp racestate.cpp racegl.cpp \
- 	       raceengine.cpp raceresults.cpp
- 
-+SOLIBS       = -lconfscreens -lrobottools -lracescreens
-+
- EXPDIR       = include
- 
- EXPORTS      = singleplayer.h raceinit.h
---- a/src/libs/tgf/Makefile
-+++ b/src/libs/tgf/Makefile
-@@ -29,6 +29,7 @@
- 		profiler.cpp \
- 		hash.cpp
- 
-+SOLIBS  = -ltxml
- 
- EXPDIR  = include
- 
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
deleted file mode 100644
index 72c755af9ebd..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-automake.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/configure.in	2012-03-13 08:15:34.891163505 +0100
-+++ b/configure.in	2012-03-13 08:18:40.154092687 +0100
-@@ -14,9 +14,10 @@
- #
- ##############################################################################
- 
--AC_INIT(Make-config.in)
-+AC_INIT([speed-dreams], [1.4.0-r2307])
-+AC_CONFIG_SRCDIR([Make-config.in])
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(speed-dreams, 1.4.0-r2307)
-+AC_DEFINE(VERSION, ["1.4.0-r2307"], [Version])
- 
- dnl Checks for programs.
- AC_PROG_CC
---- a/Makefile	2012-03-13 10:43:30.563720337 +0100
-+++ b/Makefile	2012-03-13 10:44:26.339794119 +0100
-@@ -88,17 +88,7 @@
- -include ${MAKE_DEFAULT}
- 
- Make-config: configure Make-config.in
--	rm -f config.status config.log config.cache
- 	./configure
--	rm -f config.status config.log config.cache
--
--configure: configure.in config.h.in aclocal.m4
--	rm -f config.status config.log config.cache
--	autoheader
--	autoconf
--
--aclocal.m4: acinclude.m4
--	aclocal
- 
- distclean: clean
- 	rm -f config.status config.log config.cache
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
deleted file mode 100644
index 6b09ce2a41c8..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-libpng15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libs/tgfclient/img.cpp
-+++ b/src/libs/tgfclient/img.cpp
-@@ -98,7 +98,7 @@
-		return (unsigned char *)NULL;
-	}
-	
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
-	{
-		/* Free all of the memory associated with the png_ptr and info_ptr */
-		png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
-@@ -229,7 +229,7 @@
-		return -1;
-	}
-	
--	if (setjmp(png_ptr->jmpbuf)) {    
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_write_struct(&png_ptr, &info_ptr);
-		fclose(fp);
-		return -1;
diff --git a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch b/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch
deleted file mode 100644
index 32b4f85a2000..000000000000
--- a/games-sports/speed-dreams/files/speed-dreams-1.4.0-math-hack.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://sourceforge.net/p/speed-dreams/tickets/952/
-https://bugs.gentoo.org/580054
-
---- a/src/modules/simu/simuv2/simu.cpp
-+++ b/src/modules/simu/simuv2/simu.cpp
-@@ -61,7 +61,7 @@
-     if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-     if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-     if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
-+    if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0;
- #else
-     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
---- a/src/modules/simu/simuv3/simu.cpp
-+++ b/src/modules/simu/simuv3/simu.cpp
-@@ -61,7 +61,7 @@
-     if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
-     if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
-     if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
--    if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
-+    if (isnan((float)car->ctrl->gear) || isinf((float)car->ctrl->gear)) car->ctrl->gear = 0;
- #else
-     if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
-     if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
diff --git a/games-sports/speed-dreams/metadata.xml b/games-sports/speed-dreams/metadata.xml
deleted file mode 100644
index 7585d6ad4181..000000000000
--- a/games-sports/speed-dreams/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="xrandr">Enable support for the X xrandr extension</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">speed-dreams</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild b/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
deleted file mode 100644
index b8c182a4a903..000000000000
--- a/games-sports/speed-dreams/speed-dreams-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils versionator
-
-DESCRIPTION="A fork of the famous open racing car simulator TORCS"
-HOMEPAGE="http://speed-dreams.sourceforge.net/"
-SRC_URI="mirror://sourceforge/speed-dreams/${P}-r2307-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="xrandr"
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/freealut
-	media-libs/freeglut
-	>=media-libs/libpng-1.2.40:0
-	media-libs/openal
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXxf86vm
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	>=media-libs/plib-1.8.3
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXt
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-base/xorg-proto"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-asneeded.patch
-	"${FILESDIR}"/${P}-automake.patch
-	"${FILESDIR}"/${P}-libpng15.patch
-	"${FILESDIR}"/${P}-math-hack.patch
-)
-
-src_prepare() {
-	default
-
-	# https://sourceforge.net/apps/trac/speed-dreams/ticket/111
-	MAKEOPTS="${MAKEOPTS} -j1"
-
-	sed -i \
-		-e '/ADDCFLAGS/s: -O2::' \
-		configure.in || die
-	sed -i \
-		-e '/COPYING/s:=.*:= \\:' \
-		Makefile || die
-	sed -i \
-		-e '/LDFLAGS/s:-L/usr/lib::' \
-		-e "/^datadir/s:=.*:= /usr/share/games/${PN}:" \
-		Make-config.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
-	[[ -e /dev/dsp ]] && addpredict /dev/dsp
-	econf \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		$(use_enable xrandr)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install datainstall
-
-	find "${D}" -name Makefile -exec rm -f {} +
-
-	dodoc CHANGES README TODO
-
-	newicon icon.svg ${PN}.svg
-	make_desktop_entry ${PN} "Speed Dreams"
-}
diff --git a/games-sports/stormbaancoureur-2.1.6-r1 b/games-sports/stormbaancoureur-2.1.6-r1
new file mode 100644
index 000000000000..15300b6e9ad1
--- /dev/null
+++ b/games-sports/stormbaancoureur-2.1.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=dev-games/ode-0.8 media-libs/alsa-lib media-libs/freeglut >=media-libs/plib-1.8.4 virtual/glu virtual/opengl
+DESCRIPTION=Simulated obstacle course for automobiles
+EAPI=6
+HOMEPAGE=http://www.stolk.org/stormbaancoureur/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-games/ode-0.8 media-libs/alsa-lib media-libs/freeglut >=media-libs/plib-1.8.4 virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=http://www.stolk.org/stormbaancoureur/download/stormbaancoureur-2.1.6.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_=af0b3beed4c941de35e0ebd6902b5fab
diff --git a/games-sports/stormbaancoureur/Manifest b/games-sports/stormbaancoureur/Manifest
deleted file mode 100644
index 63017daa4aad..000000000000
--- a/games-sports/stormbaancoureur/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX stormbaancoureur-2.1.6-gentoo.patch 3705 BLAKE2B 292965ef5bd4492a59bb3a02e7bc22e4cdec90f2e92a703cb63bacd854d140e68139c6236357443d69429e2355adefc8307f2d4baddfb3cdfb26d5941c40e5ef SHA512 a879e05a420cf98760f245c66f60f985e0444bda1be5bde1ec509954d5d3fc184c11d96fb3a199122f6f3a9789ca2ad557e85a7d0380a2ce2e0ca410f820680b
-DIST stormbaancoureur-2.1.6.tar.gz 3976459 BLAKE2B 3dafe0777db4dfec0ec9daf8a41c6cb1aa52ceb60f037fee64af77a7f991ed500234a33a1f5c9cd237a85f464cb5e65709f6d9d4e9417b955c24ea3be8dc0f6b SHA512 af949efc966aa088e75aadae27cd6b7e4e342d3fa00563a756ce6fb90b0ea64071f2e85087644fb6472db81c6a92584b485c5dcc71653cc54d90231e60bafd08
-EBUILD stormbaancoureur-2.1.6-r1.ebuild 846 BLAKE2B 64dfeecefedabb4745edc53f4d9b177c0536427d1f469e7fa4eb56e4eb88cd726f66924a18086c1044588e129234ad6b14d75e56bd24a25684678973ba9555e8 SHA512 50271f9b08e8c4d5912ecf11f4bf28536cf890b3b73352edc5c71f87d4702b26ebcc938500926ad4bc9547debca8a830ba0c5a0735a4780b80e1d76da0fbec69
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-gentoo.patch b/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-gentoo.patch
deleted file mode 100644
index 4523d677e9f8..000000000000
--- a/games-sports/stormbaancoureur/files/stormbaancoureur-2.1.6-gentoo.patch
+++ /dev/null
@@ -1,110 +0,0 @@
---- src-stormbaancoureur/Makefile
-+++ src-stormbaancoureur/Makefile
-@@ -5,21 +5,21 @@
- GLPREFIX=/usr
- PLIBPREFIX=/usr
- ODEPREFIX=/usr
--CXX=g++
- LIBDIRNAME=lib
- 
- # END OF CUSTOM SETTINGS
- 
--CXXFLAGS=\
-+LCXXFLAGS:=\
-   -I$(GLPREFIX)/include \
-   -I$(ODEPREFIX)/include \
-   -I$(PLIBPREFIX)/include \
-   -I../src-common \
-   -I. \
-   -DGAMEVERSION=$(VERSION) \
--  -O2 -g -Wall
-+  $(shell ode-config --cflags) \
-+  $(CXXFLAGS)
- 
--LFLAGS=\
-+LFLAGS= $(LDFLAGS) \
-   -L$(PLIBPREFIX)/$(LIBDIRNAME) \
-   -L/usr/X11R6/$(LIBDIRNAME)
- 
-@@ -39,7 +38,7 @@
- 
- 
- LIBS=\
--  $(ODEPREFIX)/$(LIBDIRNAME)/libode.a \
-+  -lode \
-   -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
-   -lglut -lGLU -lGL -lasound
- 
-@@ -47,41 +46,41 @@
- all: stormbaancoureur
- 
- 
--stormbaancoureur: $(OBJS) $(ODEPREFIX)/$(LIBDIRNAME)/libode.a
-+stormbaancoureur: $(OBJS)
- 	$(CXX) -o stormbaancoureur $(OBJS) $(LFLAGS) $(LIBS)
- 
- staticworldobject.o: ../src-common/staticworldobject.cxx ../src-common/staticworldobject.h ../src-common/worldobject.h
--	$(CXX) -c $(CXXFLAGS) ../src-common/staticworldobject.cxx
-+	$(CXX) -c $(LCXXFLAGS) ../src-common/staticworldobject.cxx
- 
- dynamicobject.o: ../src-common/dynamicobject.cxx ../src-common/dynamicobject.h ../src-common/worldobject.h
--	$(CXX) -c $(CXXFLAGS) ../src-common/dynamicobject.cxx
-+	$(CXX) -c $(LCXXFLAGS) ../src-common/dynamicobject.cxx
- 
- carobject.o: carobject.cxx carobject.h
--	$(CXX) -c $(CXXFLAGS) carobject.cxx
-+	$(CXX) -c $(LCXXFLAGS) carobject.cxx
- 
- controllerpad.o: controllerpad.cxx controller.h ../src-common/joydb.h
--	$(CXX) -c $(CXXFLAGS) controllerpad.cxx
-+	$(CXX) -c $(LCXXFLAGS) controllerpad.cxx
- 
- controllerkey.o: controllerkey.cxx
--	$(CXX) -c $(CXXFLAGS) controllerkey.cxx
-+	$(CXX) -c $(LCXXFLAGS) controllerkey.cxx
- 
- intro.o: intro.cxx intro.h
--	$(CXX) -c $(CXXFLAGS) intro.cxx
-+	$(CXX) -c $(LCXXFLAGS) intro.cxx
- 
- vectortext.o: ../src-common/vectortext.cxx ../src-common/vectortext.h
--	$(CXX) -c $(CXXFLAGS) ../src-common/vectortext.cxx
-+	$(CXX) -c $(LCXXFLAGS) ../src-common/vectortext.cxx
- 
- postscore.o: postscore.cxx postscore.h
--	$(CXX) -c $(CXXFLAGS) postscore.cxx
-+	$(CXX) -c $(LCXXFLAGS) postscore.cxx
- 
- soundenginealsa.o: ../src-common/soundenginealsa.cxx ../src-common/soundenginealsa.h ../src-common/soundfeed.h ../src-common/soundclip.h
--	$(CXX) -c $(CXXFLAGS) ../src-common/soundenginealsa.cxx
-+	$(CXX) -c $(LCXXFLAGS) ../src-common/soundenginealsa.cxx
- 
- ogl.o: ../src-common/ogl.cxx 
--	$(CXX) -c $(CXXFLAGS) ../src-common/ogl.cxx
-+	$(CXX) -c $(LCXXFLAGS) ../src-common/ogl.cxx
- 
- main.o: main.cxx ../src-common/usercam.h ../src-common/trackingcam.h ../src-common/soundenginealsa.h cratewall.h controller.h intro.h plodegui.h doorstand.h carpettrack.h spikejump.h ferriswheel.h turntable.h sturmbahn.h ../src-common/modelmap.h starsky.h carobject.h respawnpoint.h
--	$(CXX) -c $(CXXFLAGS) main.cxx
-+	$(CXX) -c $(LCXXFLAGS) main.cxx
- 
- debugrun: stormbaancoureur
- 	PLODE_DATADIR=`pwd` gdb ./stormbaancoureur
---- src-stormbaancoureur/main.cxx
-+++ src-stormbaancoureur/main.cxx
-@@ -836,15 +836,7 @@
-   fprintf(stderr,"plib is (c) by Steve Baker\n");
-   fprintf(stderr,"OpenDE is (c) by Russel L. Smith\n");
- 
--  char *bindirname  = dirname(argv[0]);
--  if (!strcmp(bindirname,"."))
--    dirprefix="/usr/share/games/stormbaancoureur";
--  else
--  {
--    dirprefix = dirname(bindirname) + std::string("/share/games/stormbaancoureur");
--  }
--  if (getenv("PLODE_DATADIR"))
--    dirprefix = getenv("PLODE_DATADIR");
-+  dirprefix="GENTOODIR";
-   if (getenv("PLODE_DISPLAYMODE"))
-     displaymode = getenv("PLODE_DISPLAYMODE");
-   assert(displaymode == "monoscopic" || displaymode == "quadbufferstereoscopic" || displaymode == "passivestereoscopic");
diff --git a/games-sports/stormbaancoureur/metadata.xml b/games-sports/stormbaancoureur/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-sports/stormbaancoureur/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild b/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild
deleted file mode 100644
index fd84d6d9c602..000000000000
--- a/games-sports/stormbaancoureur/stormbaancoureur-2.1.6-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Simulated obstacle course for automobiles"
-HOMEPAGE="http://www.stolk.org/stormbaancoureur/"
-SRC_URI="http://www.stolk.org/stormbaancoureur/download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-games/ode-0.8
-	media-libs/alsa-lib
-	media-libs/freeglut
-	>=media-libs/plib-1.8.4
-	virtual/glu
-	virtual/opengl"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}/src-${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-
-	sed -ie "s:GENTOODIR:/usr/share/${PN}:" main.cxx || die
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r images/ models/ sounds/ shaders/
-	dodoc JOYSTICKS README TODO
-	make_desktop_entry ${PN} "Stormbaan Coureur"
-}
diff --git a/games-sports/torcs-1.3.6-r1 b/games-sports/torcs-1.3.6-r1
new file mode 100644
index 000000000000..d0e87b5e3a72
--- /dev/null
+++ b/games-sports/torcs-1.3.6-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis:= media-libs/openal >=media-libs/plib-1.8.5 sys-libs/zlib:0= virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr x11-base/xorg-proto >=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=The Open Racing Car Simulator
+EAPI=6
+HOMEPAGE=http://torcs.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FreeArt
+RDEPEND=media-libs/freealut media-libs/freeglut media-libs/libpng:0 media-libs/libvorbis:= media-libs/openal >=media-libs/plib-1.8.5 sys-libs/zlib:0= virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXrandr
+SLOT=0
+SRC_URI=mirror://sourceforge/torcs/torcs-1.3.6.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_=2de540d5ffde3f614d142ce0015108ad
diff --git a/games-sports/torcs/Manifest b/games-sports/torcs/Manifest
deleted file mode 100644
index 240b415007d2..000000000000
--- a/games-sports/torcs/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX torcs-1.3.6-as-needed.patch 4112 BLAKE2B 376469d3cce24429483abb1a363ee35fd160687659492392019a03001f2f57eaaa91177cf0903ee46249aa716e607a9638cc77d027e1dc21e9a14a5c7ce8118b SHA512 8df4f57b470100c123de5868edc471e4233bf7c8e3d23f759a822536ab28e74403375ecdbcbc404ed442d6820260db97d6c76be7d4fabdef7015722600148b2c
-AUX torcs-1.3.6-flags.patch 412 BLAKE2B 40a9336f08209c1bdb7191db05c1e716a337b70573a1f2452b7f037920a19b06481d850ae301b8f9dd8738fb55553d0a1d20b21301b5e517a7b2162e070a7930 SHA512 875ee57815c11b7c12617b6ee7eec08c7759df5d50bf13f52fdc29ffc9d4cec3689368f5eecfd3ae6739dfe1b4031d1335b9dbcf1c5df0472c36f061d031759e
-AUX torcs-1.3.6-format.patch 1012 BLAKE2B 4ae32d78675c84db3a1d53c407cf0d2b6df7986e83aa2aa8281171c9e5b1b2ad4d3be684492840dba5871e13b8c1ebbfa06f5e1285de71f24fe937d4b39352a9 SHA512 6368ab1df79005f5dede537b45db7ccc1943c2c53e0c696ff6b743680f2d48508e29b5ad56b10a373beddf28c82d5f123998d9e794b66ce49e0ea2226f2332aa
-AUX torcs-1.3.6-gcc6.patch 215 BLAKE2B fd9b8158919590038e4b0503a98938ad7bea6b62a4103c18217c27f0bbf158ff27bc4057dfc62d6bc2c2cae079eb4abbad602f3fa391aa6b3f014fc398a8631d SHA512 9c29c78c4a2f6d2ea187f80c4c10337556ec13cf7dbe4380af37bccd0fa09a67a6209caff319a50c65f9e831b7d07c1af2c1ba8c33d9a3addc55713988fc3e46
-AUX torcs-1.3.6-gcc7.patch 338 BLAKE2B 6d77dfc0d2fa18fa453fc6300a522b87587b1cc5ea7f7fb52e82f109cec5e398a8c67a7266b8294ac013f6050381c97035e85bf1e2d4c9637036bc0487c88860 SHA512 f7627973023cc8ade584858d85e698f1d390ec03d0220cdf45b961c6bbb2cda6bd212e7d6118bbf9167a08f143a3151b09e0453ccc17dd4f2b249016baff99e7
-AUX torcs-1.3.6-no-automake.patch 597 BLAKE2B 452100175b2ee325db488149458d911f13cb073785fae3be1cdfb2ecf2835d387485b0a656f5441212a95b75931c7c9a76d000d2ace13216b31bd0ee236c0549 SHA512 ba450b2e4ed438af241d81fdd0e522f960d2e46b81ce1339a08b0238e7000ccd304b8f74e6906e1742839b754963c9bbb7efae959f4bd7ac1bf9b32d9a94d4e1
-AUX torcs-1.3.6-noXmuXt.patch 2107 BLAKE2B cac50b99f6f1400e86daee84c8aa9ea280f3dd20b4febf18e44b53afefb985499d68bc1f0bf046d227ad280d34e42bc715071061045a86ba9d75d460acb34263 SHA512 573e63f49039b40172517bd876a68b0f35ce1abca9f35b1ae68d579c5f758d1466fcc9f59c85c72aabd4672934d0df006fd9ed5a8b626067c76be1034e8d1ddb
-DIST torcs-1.3.6.tar.bz2 477954437 BLAKE2B 294e2775f9d7a88b1781139793fedf1f5e79238ed46ffcda22188bdf9f991180b161ab1057fcfe72205033db43b7a134b9568055e62f2152462de4436b454726 SHA512 4116c920b92ecbf5dcd3f14a137e86685651167f68725f2ad4549b2d3d20e3dc54569685925e08ffff6e7e19e532ecb1a95ec77dfe22a542a26c9e006b0c8c0d
-EBUILD torcs-1.3.6-r1.ebuild 1422 BLAKE2B bc7e2c60c9ef05ff8f6e0dfd631fae5d990b1a894197e7043293d83b2299d8e03c9c1e069fa37ba31062665c6f8921c9273ccceb29ca78a9117206aeeb5d7cf5 SHA512 d6f1d346e4b00843889ce517085d8957b27e02a20c8add3cfd0f67c2023abaaced743cd58cd621444b76b2efabecfcb47570733583f7444b7e633747dd32aad8
-MISC metadata.xml 328 BLAKE2B 1831ecefa86b7037ab920bcb5fec61a126efcf0004ba461c8f1a3fa35f7e3104fcc3c85c5834acf761aaff8d719e23c410a56ea36fc145f8731e884de5e96826 SHA512 f146cbabfd1d356485e94c0811bcdaa29b027bf054e319f6c49d8c9c50f3cb235f34f684dab42f5534ab4bfcffb440c9c8b8a2dc9f7d97316b28656d3ad1c91d
diff --git a/games-sports/torcs/files/torcs-1.3.6-as-needed.patch b/games-sports/torcs/files/torcs-1.3.6-as-needed.patch
deleted file mode 100644
index d848538c07ea..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-as-needed.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- torcs-1.3.6.orig/Make-default.mk
-+++ torcs-1.3.6/Make-default.mk
-@@ -402,7 +402,7 @@
- ifdef PROGRAM
- 
- ${PROGRAM}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${SOLIBS} ${EXT_LIBS} -o $@
-+	${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installprogram: ${PROGRAM}
- 	@ createdir="${INSTLIBBASE}" ; \
-@@ -420,14 +420,14 @@
- ifdef LOCALTOOLS
- 
- ${LOCALTOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- endif
- 
- ifdef TOOLS
- 
- ${TOOLS}: ${OBJECTS} $(subst -l,${EXPORTBASE}/lib/lib, ${LIBS:=.a})
--	${CXX} ${OBJECTS} ${LDFLAGS} ${LIBS} ${EXT_LIBS} ${SOLIBS} -o $@
-+	${CXX} ${LDFLAGS} -o $@ ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 
- installtools: ${TOOLS}
- 	@createdir="${INSTBINBASE}/${TOOLSDIR}" ; \
-@@ -478,7 +478,7 @@
- ifdef SOLIBRARY
- 
- ${SOLIBRARY}: ${OBJECTS}
--	${CXX} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LDFLAGS} ${LIBSPATH} ${LIBS} ${DEBUG_LIBS}
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${SOLIBRARY} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/lib" ; \
- 	$(mkinstalldirs) $$createdir ; \
-@@ -509,7 +509,7 @@
- ifdef MODULE
- 
- ${MODULE}: ${OBJECTS}
--	${CXX} -shared -o ${MODULE} ${OBJECTS} ${LDFLAGS} ${LIBSPATH} ${LIBS} 
-+	${CXX} ${CXXFLAGS} ${LDFLAGS} -shared -o ${MODULE} ${OBJECTS} ${SOLIBS} ${LIBS} ${EXT_LIBS}
- 	@D=`pwd` ; \
- 	createdir="${EXPORTBASE}/${MODULEDIR}" ; \
- 	$(mkinstalldirs) $$createdir ; \
---- torcs-1.3.6.orig/configure.in
-+++ torcs-1.3.6/configure.in
-@@ -123,11 +123,11 @@
- AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
--AC_CHECK_LIB(openal, alEnable, LDFLAGS="$LDFLAGS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
-+AC_CHECK_LIB(openal, alEnable, LIBS="$LIBS -lopenal", AC_MSG_ERROR([Can't find AL/al.h. OpenAL can be found on http://www.openal.org/]))
- AC_CHECK_LIB(alut, alutLoadWAVFile,
--	LDFLAGS="$LDFLAGS -lalut",
--	LDFLAGS="$LDFLAGS")
--AC_CHECK_LIB(vorbisfile, ov_fopen, LDFLAGS="$LDFLAGS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.]))
-+	LIBS="$LIBS -lalut", )
-+AC_CHECK_LIB(vorbisfile, ov_fopen, LIBS="$LIBS -lvorbisfile", AC_MSG_ERROR([Can't find libvorbis.]))
-+
- 
- AC_CHECK_LIB(dl, dlopen)
- AC_CHECK_FUNC(dlopen,,AC_MSG_ERROR([Can't find dlopen function. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
---- torcs-1.3.6.orig/src/libs/Makefile
-+++ torcs-1.3.6/src/libs/Makefile
-@@ -23,7 +23,7 @@
- 
- TOOLSUBDIRS	= txml
- 
--SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient client raceengineclient learning \
-+SUBDIRS		= confscreens racescreens robottools txml tgf tgfclient raceengineclient client learning \
- 			  portability math musicplayer
- 
- PKGSUBDIRS	= $(SUBDIRS)
---- torcs-1.3.6.orig/src/libs/client/Makefile
-+++ torcs-1.3.6/src/libs/client/Makefile
-@@ -23,6 +23,8 @@
- SOURCES   = entry.cpp mainmenu.cpp splash.cpp exitmenu.cpp \
- 	    optionmenu.cpp
- 
-+SOLIBS    = -lconfscreens -lraceengine
-+
- LIBS      =  -lplibssg -lplibsg -lplibul
- 
- EXPDIR    = include
---- torcs-1.3.6.orig/src/libs/tgf/Makefile
-+++ torcs-1.3.6/src/libs/tgf/Makefile
-@@ -29,6 +29,7 @@
- 		profiler.cpp \
- 		hash.cpp
- 
-+SOLIBS  = -ltxml
- 
- EXPDIR  = include
- 
diff --git a/games-sports/torcs/files/torcs-1.3.6-flags.patch b/games-sports/torcs/files/torcs-1.3.6-flags.patch
deleted file mode 100644
index 5f11fd270ef1..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-flags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-respect cflags
-
---- torcs-1.3.6/configure.in
-+++ torcs-1.3.6/configure.in
-@@ -50,8 +50,7 @@
- ADDCFLAGS="-Wall -fPIC -fno-strict-aliasing"
- AC_ARG_ENABLE(debug,
- 	[  --enable-debug          set the debug mode],
--	ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT",
--	ADDCFLAGS="$ADDCFLAGS -O2")
-+	ADDCFLAGS="$ADDCFLAGS -g -DDEBUG -DDEBUG_OUT")
- 
- AC_ARG_ENABLE(xrandr,
- 	[  --disable-xrandr	   reset the XRANDR mode],
diff --git a/games-sports/torcs/files/torcs-1.3.6-format.patch b/games-sports/torcs/files/torcs-1.3.6-format.patch
deleted file mode 100644
index da59c4da4fa0..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-format.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/src/tools/texmapper/maintexmapper.cpp	2015-12-23 20:55:24.874102363 +0100
-+++ b/src/tools/texmapper/maintexmapper.cpp	2015-12-23 20:55:55.071553325 +0100
-@@ -103,7 +103,7 @@
- {
-     int		i, j;
- 
--    printf(title);
-+    printf("%s", title);
-     for (j = 0; j < 4; j ++){
- 	for (i = 0; i < 4; i ++) {
- 	    printf("%.6f  ", m[i][j]);
---- a/src/tools/trackgen/objects.cpp	2015-12-23 20:59:49.671287196 +0100
-+++ b/src/tools/trackgen/objects.cpp	2015-12-23 21:02:21.639523189 +0100
-@@ -234,9 +234,9 @@
- 

- 	ssgLeaf *vt = (ssgLeaf *)ent;

- 	if (vt->getCullFace() == TRUE) {

--		surf = "SURF 0x10\n";

-+		surf = "0x10";

- 	} else {

--		surf = "SURF 0x30\n";

-+		surf = "0x30";

- 	}

- 

- 	int num_verts = vt->getNumVertices();

-@@ -304,7 +304,7 @@
- 	fprintf (save_fd, "numsurf %d\n", num_tris);

- 

- 	for (i = 0; i < num_tris; i++) {

--		fprintf (save_fd, surf);

-+		fprintf (save_fd, "SURF %s\n", surf);

- 		fprintf (save_fd, "mat 0\n");

- 		fprintf (save_fd, "refs 3\n");

- 		fprintf (save_fd, "%d %g %g\n",

diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch b/games-sports/torcs/files/torcs-1.3.6-gcc6.patch
deleted file mode 100644
index 6daf22a81b11..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/drivers/olethros/geometry.cpp
-+++ b/src/drivers/olethros/geometry.cpp
-@@ -27,6 +27,8 @@
- #ifdef WIN32
- #include <float.h>
- #define isnan _isnan
-+#elif __cplusplus >= 201103L
-+using std::isnan;
- #endif
- 
- 
diff --git a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch b/games-sports/torcs/files/torcs-1.3.6-gcc7.patch
deleted file mode 100644
index af139ad509de..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-gcc7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/libs/musicplayer/OpenALMusicPlayer.cpp
-+++ b/src/libs/musicplayer/OpenALMusicPlayer.cpp
-@@ -161,7 +161,7 @@
- {
- 	char pcm[BUFFERSIZE];
- 	int size = 0;
--	const char* error = '\0';
-+	const char* error = "";
- 	
- 	if (!stream->read(pcm, BUFFERSIZE, &size, &error)) {
- 		GfError("OpenALMusicPlayer: Stream read error: %s\n", error);
diff --git a/games-sports/torcs/files/torcs-1.3.6-no-automake.patch b/games-sports/torcs/files/torcs-1.3.6-no-automake.patch
deleted file mode 100644
index 9b47bfb9a64c..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-no-automake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-torcs doesn't use automake, so it shouldn't be calling the macro
-
-http://bugs.gentoo.org/408473
-
---- torcs-1.3.6.orig/configure.in
-+++ torcs-1.3.6/configure.in
-@@ -15,9 +15,12 @@
- #
- ##############################################################################
- 
--AC_INIT(Make-config.in)
-+AC_INIT(torcs, 1.3.6)
- AC_CONFIG_HEADERS(config.h)
--AM_INIT_AUTOMAKE(torcs, 1.3.6)
-+dnl Workaround code using old VERSION instead of new PACKAGE_VERSION
-+VERSION=$PACKAGE_VERSION
-+AC_DEFINE_UNQUOTED([VERSION], "$VERSION", [old VERSION workaround])
-+AC_SUBST(VERSION)
- 
- dnl Checks for programs.
- AC_PROG_CC
diff --git a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch b/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
deleted file mode 100644
index f87fb750d199..000000000000
--- a/games-sports/torcs/files/torcs-1.3.6-noXmuXt.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -116,12 +116,8 @@
- AC_CHECK_LIB(ICE, IceSetIOErrorHandler,,AC_MSG_ERROR([Can't find libICE. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- dnl Replace `main' with a function in -lSM:
- AC_CHECK_LIB(SM, SmsSetErrorHandler,,AC_MSG_ERROR([Can't find libSM. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
--dnl Replace `main' with a function in -lXt:
--AC_CHECK_LIB(Xt, XtDisplay,,AC_MSG_ERROR([Can't find libXt. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- dnl Replace `main' with a function in -lXi:
- AC_CHECK_LIB(Xi, XOpenDevice,,AC_MSG_ERROR([Can't find libXi. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
--dnl Replace `main' with a function in -lXmu:
--AC_CHECK_LIB(Xmu, XmuSimpleErrorHandler,,AC_MSG_ERROR([Can't find libXmu. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xxf86vm, XF86VidModeSetViewPort,,AC_MSG_ERROR([Can't find libXxf86vm. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrender, XRenderSetSubpixelOrder,,AC_MSG_ERROR([Can't find libXrender. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
- AC_CHECK_LIB(Xrandr, XRRQueryVersion,,AC_MSG_ERROR([Can't find libXrandr. Please check config.log and if you can't solve the problem send the file to torcs-users@lists.sourceforge.net with the subject \"torcs compilation problem\"]))
diff --git a/games-sports/torcs/metadata.xml b/games-sports/torcs/metadata.xml
deleted file mode 100644
index dd8247bbc427..000000000000
--- a/games-sports/torcs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">torcs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/torcs/torcs-1.3.6-r1.ebuild b/games-sports/torcs/torcs-1.3.6-r1.ebuild
deleted file mode 100644
index 77612fb8eaa9..000000000000
--- a/games-sports/torcs/torcs-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils multilib
-
-DESCRIPTION="The Open Racing Car Simulator"
-HOMEPAGE="http://torcs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/torcs/${P}.tar.bz2"
-
-LICENSE="GPL-2 FreeArt"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/freealut
-	media-libs/freeglut
-	media-libs/libpng:0
-	media-libs/libvorbis:=
-	media-libs/openal
-	>=media-libs/plib-1.8.5
-	sys-libs/zlib:0=
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXrandr"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-automake.patch
-	"${FILESDIR}"/${P}-as-needed.patch
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-format.patch
-	"${FILESDIR}"/${P}-noXmuXt.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-	ecvs_clean
-}
-
-src_configure() {
-	addpredict $(echo /dev/snd/controlC? | sed 's/ /:/g')
-	[[ -e /dev/dsp ]] && addpredict /dev/dsp
-	econf \
-		--datadir=/usr/share \
-		--x-libraries=/usr/$(get_libdir) \
-		--enable-xrandr
-}
-
-src_compile() {
-	# So ugly... patches welcome.
-	emake -j1
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install datainstall
-	newicon Ticon.png ${PN}.png
-	make_desktop_entry ${PN} TORCS
-	dodoc README doc/history/history.txt
-	doman doc/man/*.6
-	dodoc -r doc/faq/faq.html doc/tutorials doc/userman
-}
diff --git a/games-sports/trigger-0.6.1-r1 b/games-sports/trigger-0.6.1-r1
new file mode 100644
index 000000000000..0d0a2af35fd9
--- /dev/null
+++ b/games-sports/trigger-0.6.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=dev-games/physfs media-libs/freealut media-libs/libsdl media-libs/openal media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer virtual/glu virtual/opengl dev-util/ftjam
+DESCRIPTION=Free OpenGL rally car racing game
+EAPI=6
+HOMEPAGE=http://trigger-rally.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/physfs media-libs/freealut media-libs/libsdl media-libs/openal media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://sourceforge/trigger-rally/trigger-rally-0.6.1.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_=a7c26d8681e366dde151be86688aa28f
diff --git a/games-sports/trigger/Manifest b/games-sports/trigger/Manifest
deleted file mode 100644
index 7d5be34b9946..000000000000
--- a/games-sports/trigger/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX trigger-0.6.1-gcc6.patch 814 BLAKE2B c2fa05b4a3cf8be96a2c581b893c6b05d5e01374e6cf60ed361222d0f50f8d50baeddb5a046a7c15bb1930a57e7c5dad7db6c5f9eb1925183c7c34cdce7191ac SHA512 32e2979f09363010e252f436b04b888c7dc127e7b6817ea53ac400a1859c6d900990c284169a965bcd18388a972c9ed2c7a8e7f1c928147adbfb0007f7f50aa3
-DIST trigger-rally-0.6.1.tar.bz2 61083932 BLAKE2B cc5a291b2177ceba73e2cfdfdf1c3c68fb4704eda3334550740714232229241d1bc0e8573d2786076193513b70ab8e305a8e879e51ee4dc0597654a2f99eac1f SHA512 9f7e57758ffa61002efff6c7ac4d69f53ef4769651bdfdd21b6a8d101f8fd06ba7dc5998a8877146f50e6124896300e3595b4b5fff4decd53b6555e622de85bf
-EBUILD trigger-0.6.1-r1.ebuild 1193 BLAKE2B 7821479ad2bcfbf077e5d7e6cd3b9f632a5baa933106e277147d0cddbf374a883f15df3957d7f44060e053c0024fed679b4afe156e398b1f5d812941110ef2bd SHA512 eb36f809f45f1b446f7c55451a8ed1289a4dab2bffc73f214ba37a11bc83bd599c30434cec762975abccdee01f4d2f6d4302f682bb149310dd7844ff3c41f95b
-MISC metadata.xml 336 BLAKE2B 2d2b4a4ff3f0204a6fd213f3b639cbee3472232c69afe80dd74825bea88b6ac676e1ef2449b06b4dd164dbce45a73b18e0bb72b4f7688e21ee38a89ebac20e14 SHA512 9eb1580903ba730dbe8dd12cd1be749e0dcfbb577c8d2eb7de8e0999c5348f7baa8b5fa13664893b8b3365e6bd0603596097c43821aa40af534fba4818778305
diff --git a/games-sports/trigger/files/trigger-0.6.1-gcc6.patch b/games-sports/trigger/files/trigger-0.6.1-gcc6.patch
deleted file mode 100644
index 38822287c61d..000000000000
--- a/games-sports/trigger/files/trigger-0.6.1-gcc6.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Bug: https://bugs.gentoo.org/617886
-
---- a/src/pengine/tinyxmlparser.cpp
-+++ b/src/pengine/tinyxmlparser.cpp
-@@ -326,14 +326,14 @@
-   if ( !p || !*p )
-   {
-     SetError( TIXML_ERROR_DOCUMENT_EMPTY );
--    return false;
-+    return NULL;
-   }
- 
-     p = SkipWhiteSpace( p );
-   if ( !p )
-   {
-     SetError( TIXML_ERROR_DOCUMENT_EMPTY );
--    return false;
-+    return NULL;
-   }
- 
-   while ( p && *p )
-@@ -541,7 +541,7 @@
-   if ( !p || !*p || *p != '<' )
-   {
-     if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT );
--    return false;
-+    return NULL;
-   }
- 
-   p = SkipWhiteSpace( p+1 );
-@@ -551,7 +551,7 @@
-   if ( !p || !*p )
-   {
-     if ( document )  document->SetError( TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME );
--    return false;
-+    return NULL;
-   }
- 
-     TIXML_STRING endTag ("</");
diff --git a/games-sports/trigger/metadata.xml b/games-sports/trigger/metadata.xml
deleted file mode 100644
index c9f6b92e908a..000000000000
--- a/games-sports/trigger/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">trigger-rally</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/trigger/trigger-0.6.1-r1.ebuild b/games-sports/trigger/trigger-0.6.1-r1.ebuild
deleted file mode 100644
index 0b6083919971..000000000000
--- a/games-sports/trigger/trigger-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-MY_PN=${PN}-rally
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Free OpenGL rally car racing game"
-HOMEPAGE="http://trigger-rally.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/physfs
-	media-libs/freealut
-	media-libs/libsdl
-	media-libs/openal
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer
-	virtual/glu
-	virtual/opengl"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${P}-gcc6.patch )
-
-pkg_setup() {
-	# Otherwise build fails with:
-	# ...skipped trigger for lack of libpengine.a...
-	tc-export AR
-}
-
-src_configure() {
-	econf --datadir=/usr/share/games/${PN}
-}
-
-src_compile() {
-	AR="${AR} cru" jam -dx -qa || die
-
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/games/${PN}
-	doins -r data/*
-	newicon data/textures/life_helmet.png ${PN}.png
-	make_desktop_entry ${PN} Trigger
-	dodoc doc/*.txt
-}
-
-pkg_postinst() {
-	elog "After running ${PN} for the first time, a config file is"
-	elog "available in ~/.trigger/trigger.config"
-}
diff --git a/games-sports/trophy-2.0.3-r1 b/games-sports/trophy-2.0.3-r1
new file mode 100644
index 000000000000..e3f43c4eae79
--- /dev/null
+++ b/games-sports/trophy-2.0.3-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst postrm preinst
+DEPEND=dev-games/clanlib:0.8[opengl] virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=2D Racing Game
+EAPI=6
+HOMEPAGE=http://trophy.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-games/clanlib:0.8[opengl]
+SLOT=0
+SRC_URI=mirror://sourceforge/trophy/trophy-2.0.3.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_=681f23b2bac3ec41c974ba585179f673
diff --git a/games-sports/trophy/Manifest b/games-sports/trophy/Manifest
deleted file mode 100644
index f830b93f5365..000000000000
--- a/games-sports/trophy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST trophy-2.0.3.tar.gz 14780127 BLAKE2B cb61ea3c5e264f8d0435e64a9076c403543dfec4c8e914d6192bbeef91d7db12e430e151df7ab10c367ddbac8f924da931376b1f06f70f55e222580301b28aa6 SHA512 40376c2a27f205421189d5fea3dc154492fae8977b62d1150c986be6fe823d0f718b61a51a2febad851fc96cf4e1b408ab9318ab32e32d685966228f51327b06
-EBUILD trophy-2.0.3-r1.ebuild 532 BLAKE2B aff6ba69fe9fd7d9ab5208d54e5daa137fd8213c59de1b0a8e271e6f0ec81e0a89305dcd1eaa83ac7bb10ca82a580e5de2ba48f7c4635855959ff53b8bc4efd7 SHA512 f088ba3fccbc3c70f4679de5b1705034941d666310d603120852fe15d9ee723a2bfaeb93efed59357948ba52463e1e834cc314001605f3b95faac340fb3a0f29
-MISC metadata.xml 329 BLAKE2B fe1d6e27dea7312a3449f6bc468a9a4eaa39db2176a4a386e2e2dad7b721c7834decfe30d1b796f4ec51b3431c68eb09dd989b32ceba805f697bb7d8c565021f SHA512 2812231691e421c29bae3f29d934cfac14f611190985b785cbecb628091a6a9d774699685cef482d1be47879a4d9938f9e773188178395ca7d68ce9a0e8ac7fa
diff --git a/games-sports/trophy/metadata.xml b/games-sports/trophy/metadata.xml
deleted file mode 100644
index f3c03da7ef8e..000000000000
--- a/games-sports/trophy/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">trophy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/trophy/trophy-2.0.3-r1.ebuild b/games-sports/trophy/trophy-2.0.3-r1.ebuild
deleted file mode 100644
index e038f16088bf..000000000000
--- a/games-sports/trophy/trophy-2.0.3-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnome2-utils
-
-DESCRIPTION="2D Racing Game"
-HOMEPAGE="http://trophy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-games/clanlib:0.8[opengl]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-sports/ultimatestunts-0.7.7-r1 b/games-sports/ultimatestunts-0.7.7-r1
new file mode 100644
index 000000000000..053d4b95b624
--- /dev/null
+++ b/games-sports/ultimatestunts-0.7.7-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=media-libs/freealut media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis >=media-libs/openal-1 media-libs/sdl-image virtual/opengl virtual/glu nls? ( virtual/libintl ) sys-devel/gettext
+DESCRIPTION=Remake of the famous Stunts game
+EAPI=6
+HOMEPAGE=http://www.ultimatestunts.nl/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/freealut media-libs/libsdl[joystick,opengl,video] media-libs/libvorbis >=media-libs/openal-1 media-libs/sdl-image virtual/opengl virtual/glu nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0771.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2468d71908f4ae952a64105f8daea29c
diff --git a/games-sports/ultimatestunts/Manifest b/games-sports/ultimatestunts/Manifest
deleted file mode 100644
index 3fe9b3729506..000000000000
--- a/games-sports/ultimatestunts/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ultimatestunts-0.7.7-gcc-4.7.patch 457 BLAKE2B 0491753a7462b51ff03ffed3e2174638ff2229440eea9a4cb770e8ddcc5305d4700fe03ddc7b290496db4edcfd25c2954deb6076197e27d1712580c3da8c9bb6 SHA512 19fe87b1c4fde66803b299e5db5d8ac6112ba07ea334720cadee59ce5f238564b37af7f863bb4bab7b9ca780169e293ca2ab2defad3ce79f3123c8b956cb6c32
-AUX ultimatestunts-0.7.7-paths.patch 764 BLAKE2B 3f96f5593078269886bcd4a7528803ee55f4969f9c0843645a88bc436548d046e35adab028bc1b279ae2ec2bf54e45dedf96bca8e5f0e361aa9c8247b0243763 SHA512 da896527c8a76fad854270b38219b646689016c03c4800f89800b36f419ca210d8e5d524ef9a95beb9eef342c22edab7f70e0f28e6f14e4cf4b38ef23771080f
-DIST ultimatestunts-srcdata-0771.tar.gz 47449346 BLAKE2B 7d2a82b525eed254424e14e5ab0bffb560f16980f9abf569138f4cba576fc4a823e1e3ca62791acd57b55822d06b0969e5be1d8bfcd7ecc779b5f53150649827 SHA512 c532d1434570775da8e0b8156659f96dcfbdf82890f07aebbe398bdcf2039a11c832ead8106c8522af1a4a847f685727dc6f7739443a99858621995452ce4741
-EBUILD ultimatestunts-0.7.7-r1.ebuild 1088 BLAKE2B 81ff42efb970ac124fcfc663b8082c1b139c6e90a840c149a73a4ed88a006035906b28c8948d22eaafd7f6ba67f4e649d6ee18ea020cc7e6e8079bb85ea4b373 SHA512 8ce6f8df02ff60cc0400aa6d8e84fd929cc16ee516c5c01633423fd8506169ac9f3bb291e931465860684668a592103e6c9ac176aeac590450c993580be4ac7e
-MISC metadata.xml 337 BLAKE2B a22a22cddf032db212de94b79ddcedd11577ca18d0f511b2d78dbfb76e2c9a675fed1fef2cb702b877ad3e257431f0ac00b582afd2537835ae3f5542f42b9642 SHA512 cb7883dede9a55d0894a6a1bd9a944d5458047cff524fdc03ae1a3c6d771fcd77bc82151ff2a9bbf2f47772ee5a46c104c82e694a2649e60d1ed4e46e615f25b
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch
deleted file mode 100644
index f323bce22aa5..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-gcc-4.7.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 14 20:55:35 UTC 2012
-Subject: fix compilation on gcc-4.7
-
-https://bugs.gentoo.org/show_bug.cgi?id=426612
-
---- a/simulation/metaserver.cpp
-+++ b/simulation/metaserver.cpp
-@@ -16,6 +16,7 @@
-  ***************************************************************************/
- #include <cstdio>
- #include <cstdlib>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
diff --git a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-paths.patch b/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-paths.patch
deleted file mode 100644
index c9fd879b1887..000000000000
--- a/games-sports/ultimatestunts/files/ultimatestunts-0.7.7-paths.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- ultimatestunts-srcdata-0771.orig/data/Makefile.in
-+++ ultimatestunts-srcdata-0771/data/Makefile.in
-@@ -358,11 +358,11 @@
- 
- 
- install:
--	$(mkinstalldirs) ${usdatadir}
--	cp -r cars environment lang misc music textures textures.dat tiles tracks ${usdatadir}
--	chmod 644 ${usdatadir}/*.*
--	chmod 644 ${usdatadir}/*/*.*
--	chmod 644 ${usdatadir}/*/*/*.*
-+	$(mkinstalldirs) $(DESTDIR)${usdatadir}
-+	cp -r cars environment lang misc music textures textures.dat tiles tracks $(DESTDIR)${usdatadir}
-+	chmod 644 $(DESTDIR)${usdatadir}/*.*
-+	chmod 644 $(DESTDIR)${usdatadir}/*/*.*
-+	chmod 644 $(DESTDIR)${usdatadir}/*/*/*.*
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/games-sports/ultimatestunts/metadata.xml b/games-sports/ultimatestunts/metadata.xml
deleted file mode 100644
index ad38b6a0fe1b..000000000000
--- a/games-sports/ultimatestunts/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ultimatestunts</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild b/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
deleted file mode 100644
index 53a8f0c1a688..000000000000
--- a/games-sports/ultimatestunts/ultimatestunts-0.7.7-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic versionator
-
-MY_P=${PN}-srcdata-$(replace_all_version_separators)1
-DESCRIPTION="Remake of the famous Stunts game"
-HOMEPAGE="http://www.ultimatestunts.nl/"
-SRC_URI="mirror://sourceforge/ultimatestunts/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	media-libs/freealut
-	media-libs/libsdl[joystick,opengl,video]
-	media-libs/libvorbis
-	>=media-libs/openal-1
-	media-libs/sdl-image
-	virtual/opengl
-	virtual/glu
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-paths.patch
-	"${FILESDIR}"/${P}-gcc-4.7.patch
-)
-
-src_prepare() {
-	default
-
-	esvn_clean
-	append-cppflags $(sdl-config --cflags)
-}
-
-src_configure() {
-	econf \
-		--with-openal \
-		$(use_enable nls)
-}
-
-src_compile() {
-	emake -C trackedit libtrackedit.a
-	emake
-}
-
-src_install() {
-	default
-
-	newicon data/cars/diablo/steer.png ${PN}.png
-	make_desktop_entry ustunts "Ultimate Stunts"
-}
diff --git a/games-sports/vdrift-20120722 b/games-sports/vdrift-20120722
new file mode 100644
index 000000000000..0a987b4e8bd5
--- /dev/null
+++ b/games-sports/vdrift-20120722
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/libarchive media-libs/glew media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/libvorbis net-misc/curl sci-physics/bullet[-double-precision] virtual/opengl virtual/glu dev-cpp/asio dev-libs/boost virtual/pkgconfig dev-util/scons[python_targets_python2_7]
+DESCRIPTION=A driving simulation made with drift racing in mind
+EAPI=5
+HOMEPAGE=http://vdrift.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 ZLIB LGPL-2.1+
+RDEPEND=app-arch/libarchive media-libs/glew media-libs/libsdl[opengl,video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/libvorbis net-misc/curl sci-physics/bullet[-double-precision] virtual/opengl virtual/glu games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/vdrift/vdrift-2012-07-22.tar.bz2 mirror://sourceforge/vdrift/vdrift-2012-07-22c_patch.diff
+_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_=e6038213dfb8ff5feea4c4fd3015815d
diff --git a/games-sports/vdrift/Manifest b/games-sports/vdrift/Manifest
deleted file mode 100644
index 36c2d970f703..000000000000
--- a/games-sports/vdrift/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX vdrift-20120722-build.patch 1199 BLAKE2B 1731b61cdfb74c83e77e7b1fedd4ca970b6e73cf0223c818a79e35ac7869b89862d460066d6ac7608541dbe9bfe735fcfc29786f657bbbb98348fd3cb122a3f4 SHA512 4a12d2c3120d641668263dd7d8a2fb8b455e7f39ca33fabe85945fe6b7439f54d7cd2cf0b1752c7aae29d0b88c727f84f4e7092d3233bf5532c4db278b0eae39
-AUX vdrift-20120722-bullet.patch 3406 BLAKE2B 048d0f47b360bc63d6fc9d1d250b702ae3d452f46c64119076aa3fbcb3ea89af8d18af58215a1919c989203e5194412f94cd6f79bb37b0bd43d113e1b3029806 SHA512 aab973d586ae876b1f8fd528cdff80f97d5082954e616296604bd334694116fd4ce980698219e8a2c9662f50da9c5daf9ca9cc70ddd2a2f6795f0aa9673c7a71
-DIST vdrift-2012-07-22.tar.bz2 589288618 BLAKE2B ccdd6358f7d753a87eb8d9d0603001ab3ca6f5c8572348c300a75961f58eb624f4cd7df18b6d892554e0f6e96982de5d5d8aca4f59d8db7e95926d772a6d963f SHA512 eb6f243fd28e5fe46e856c37cb528c8ec903bdec91b6aa86681add79a333077a3a8874f694255913ae8492b965884f02057a95a98e37027ff67c082a8ca5527e
-DIST vdrift-2012-07-22c_patch.diff 21689 BLAKE2B de7575df09d434f41a4dd02554dd39f7b6ae13d676ae33c692c7aabc49764c25805efdf5cb89e0b5fb016e02b5e33b93977d588df87ff0923421b57cf2796026 SHA512 7b82ba53f3c19ccd01de9ea64e0b7e15224219c0c614a6505b2a3f552ce78565fdedf7781a198c58606d3e9b94e594dee79097d46687e7d4fc763868204b761d
-EBUILD vdrift-20120722.ebuild 1513 BLAKE2B 1d117dc7bd51f5c117533be62ffc40c7dd3defff50a085db0c9df5f7154b7aba26ab429e86f7d75077e9fb1a4208ae1ea10007dae40cae19fb0b27bab5c1cf41 SHA512 bb4b69538e274d9608fa705e5fa7f4e4add537f41e032275c9ec883a87905769fa6805a6eb0bd2509ea59340ea096f57aff19b56b3dc56b192f5531226e8503b
-MISC metadata.xml 329 BLAKE2B a2a266c4cff85fa8d76897b4b13687aa44b8f119aca3814b2646f62bc887acf6af3b18048006119ed374be304dfb8825c95d08852558545d36e44343cdff37f5 SHA512 c669371ccb3d0aee737982574fa3cbadba74d6e559fede3bfbac99d7f4f8c1e8e632a2659460008938c307b0e52dd66af357a3f65752c88d8735cf036046fcc0
diff --git a/games-sports/vdrift/files/vdrift-20120722-build.patch b/games-sports/vdrift/files/vdrift-20120722-build.patch
deleted file mode 100644
index 16b6fe4c9ba1..000000000000
--- a/games-sports/vdrift/files/vdrift-20120722-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- VDrift.orig/SConstruct
-+++ VDrift/SConstruct
-@@ -44,6 +44,7 @@
-         LIBPATH = ['.', '#lib', LOCALBASE + '/lib'],
-         LINKFLAGS = ['-pthread','-lintl'],
-         options = opts)
-+    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-     check_headers = ['GL/gl.h', 'GL/glu.h', 'SDL/SDL.h', 'SDL/SDL_image.h', 'SDL/SDL_rotozoom.h', 'vorbis/vorbisfile.h', 'GL/glew.h', 'bullet/btBulletCollisionCommon.h']
-     check_libs = []
-     if 'CC' in os.environ:
-@@ -380,7 +381,7 @@
- if env['release']:
-     # release build, debugging off, optimizations on
-     if (sys.platform != 'freebsd6') and (sys.platform != 'freebsd7') and (sys.platform != 'freebsd8') and (sys.platform != 'freebsd9') and (sys.platform != 'win32') and (sys.platform != 'cygwin'):
--        env.Append(CCFLAGS = ['-O1', '-pipe'])
-+        env.Append(CCFLAGS = ['-pipe'])
- else:
-     # debug build, lots of debugging, no optimizations
-     env.Append(CCFLAGS = ['-g3'])
-@@ -399,7 +400,6 @@
-     env.Append(CCFLAGS = ['-pg'])
-     env.Append(LINKFLAGS = ['-pg'])
-     env.Append(CCFLAGS = ['-g3'])
--    env.Append(CCFLAGS = ['-O1'])
- 
- #------------------------------------#
- # compile-time efficiency assessment #
-
diff --git a/games-sports/vdrift/files/vdrift-20120722-bullet.patch b/games-sports/vdrift/files/vdrift-20120722-bullet.patch
deleted file mode 100644
index 907433417ee6..000000000000
--- a/games-sports/vdrift/files/vdrift-20120722-bullet.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- src/cardynamics.cpp	Mon Jan 19 23:26:36 1970

-+++ src/cardynamics.cpp	Mon Jan 19 23:26:36 1970

-@@ -1791,23 +1791,29 @@

- 

- bool CARDYNAMICS::WheelContactCallback(

- 	btManifoldPoint& cp,

--	const btCollisionObject* colObj0,

--	int partId0,

-+	const btCollisionObjectWrapper* col0,

-+	int part0,

- 	int index0,

--	const btCollisionObject* colObj1,

--	int partId1,

-+	const btCollisionObjectWrapper* col1,

-+	int part1,

- 	int index1)

- {

--	// cars are fracture bodies, wheel is a cylinder shape

--	const btCollisionShape* shape = colObj0->getCollisionShape();

--	if ((colObj0->getInternalType() & CO_FRACTURE_TYPE) &&

-+#if (BT_BULLET_VERSION < 281)

-+	const btCollisionObject* obj = col0;

-+	const btCollisionShape* shape = obj->getCollisionShape();

-+	const btCollisionShape* rootshape = obj->getRootCollisionShape();

-+#else

-+	const btCollisionObject* obj = col0->getCollisionObject();

-+	const btCollisionShape* shape = col0->getCollisionShape();

-+	const btCollisionShape* rootshape = obj->getCollisionShape();

-+#endif

-+	if ((obj->getInternalType() & CO_FRACTURE_TYPE) &&

- 		(shape->getShapeType() == CYLINDER_SHAPE_PROXYTYPE))

- 	{

--		// is contact within contact patch?

--		const btCompoundShape* car = static_cast<const btCompoundShape*>(colObj0->getRootCollisionShape());

--		const btCylinderShapeX* wheel = static_cast<const btCylinderShapeX*>(shape);

--		btVector3 contactPoint = cp.m_localPointA - car->getChildTransform(cp.m_index0).getOrigin();

--		if (-direction::up.dot(contactPoint) > 0.5 * wheel->getRadius())

-+		const btCompoundShape* carshape = static_cast<const btCompoundShape*>(rootshape);

-+		const btCylinderShapeX* wheelshape = static_cast<const btCylinderShapeX*>(shape);

-+		btVector3 contactPoint = cp.m_localPointA - carshape->getChildTransform(cp.m_index0).getOrigin();

-+		if (-direction::up.dot(contactPoint) > 0.5 * wheelshape->getRadius())

- 		{

- 			// break contact (hack)

- 			cp.m_normalWorldOnB = btVector3(0, 0, 0);

---- src/cardynamics.h	Mon Jan 19 23:26:36 1970

-+++ src/cardynamics.h	Mon Jan 19 23:26:36 1970

-@@ -25,6 +25,12 @@

- class FractureBody;

- class PTree;

- 

-+#if (BT_BULLET_VERSION < 281)

-+#define btCollisionObjectWrapper btCollisionObject

-+#else

-+struct btCollisionObjectWrapper;

-+#endif

-+

- class CARDYNAMICS : public btActionInterface

- {

- friend class PERFORMANCE_TESTING;

-@@ -151,11 +157,11 @@

- 

- 	static bool WheelContactCallback(

- 		btManifoldPoint& cp,

--		const btCollisionObject* colObj0,

--		int partId0,

-+		const btCollisionObjectWrapper* col0,

-+		int part0,

- 		int index0,

--		const btCollisionObject* colObj1,

--		int partId1,

-+		const btCollisionObjectWrapper* col1,

-+		int part1,

- 		int index1);

- 

- protected:

---- src/dynamicsworld.cpp	Mon Jan 19 23:26:36 1970

-+++ src/dynamicsworld.cpp	Mon Jan 19 23:26:36 1970

-@@ -105,7 +105,7 @@

- 	int patch_id = -1;

- 	const BEZIER * b = 0;

- 	const TRACKSURFACE * s = TRACKSURFACE::None();

--	btCollisionObject * c = 0;

-+	const btCollisionObject * c = 0;

- 

- 	MyRayResultCallback ray(origin, p, caster);

- 	rayTest(origin, p, ray);

-@@ -221,6 +221,7 @@

- 

- void DynamicsWorld::fractureCallback()

- {

-+#if (BT_BULLET_VERSION < 281)

- 	m_activeConnections.resize(0);

- 

- 	int numManifolds = getDispatcher()->getNumManifolds();

-@@ -268,4 +269,5 @@

- 		btRigidBody* child = body->updateConnection(con_id);

- 		if (child) addRigidBody(child);

- 	}

-+#endif

- }
\ No newline at end of file
diff --git a/games-sports/vdrift/metadata.xml b/games-sports/vdrift/metadata.xml
deleted file mode 100644
index 873fcd84214e..000000000000
--- a/games-sports/vdrift/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">vdrift</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-sports/vdrift/vdrift-20120722.ebuild b/games-sports/vdrift/vdrift-20120722.ebuild
deleted file mode 100644
index c863bdfbb2ca..000000000000
--- a/games-sports/vdrift/vdrift-20120722.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils scons-utils games
-
-MY_P=${PN}-${PV:0:4}-${PV:4:2}-${PV:6:2}
-DESCRIPTION="A driving simulation made with drift racing in mind"
-HOMEPAGE="http://vdrift.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2
-	mirror://sourceforge/${PN}/${MY_P}c_patch.diff"
-
-LICENSE="GPL-3 ZLIB LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/libarchive
-	media-libs/glew
-	media-libs/libsdl[opengl,video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[png]
-	media-libs/libvorbis
-	net-misc/curl
-	sci-physics/bullet[-double-precision]
-	virtual/opengl
-	virtual/glu"
-DEPEND="${RDEPEND}
-	dev-cpp/asio
-	dev-libs/boost
-	virtual/pkgconfig"
-
-S=${WORKDIR}/VDrift
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-}
-
-src_prepare() {
-	epatch \
-		"${DISTDIR}"/${MY_P}c_patch.diff \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-bullet.patch
-}
-
-src_compile() {
-	escons \
-		force_feedback=1 \
-		destdir="${D}" \
-		bindir="${GAMES_BINDIR}" \
-		datadir="${GAMES_DATADIR}"/${PN} \
-		prefix= \
-		use_binreloc=0 \
-		release=1 \
-		os_cc=1 \
-		os_cxx=1 \
-		os_cxxflags=1 \
-		|| die
-}
-
-src_install() {
-	dogamesbin build/vdrift
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r data/*
-	newicon data/textures/icons/vdrift-64x64.png ${PN}.png
-	make_desktop_entry ${PN} VDrift
-	find "${D}" -name "SCon*" -exec rm \{\} +
-	keepdir "${GAMES_DATADIR}"/${PN}/{music,settings/replays,settings/screenshots}
-	prepgamesdirs
-}
diff --git a/games-sports/xmoto-0.5.11-r2 b/games-sports/xmoto-0.5.11-r2
new file mode 100644
index 000000000000..adf031c4c747
--- /dev/null
+++ b/games-sports/xmoto-0.5.11-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] dev-lang/lua:0[deprecated] dev-libs/libxdg-basedir dev-libs/libxml2 media-fonts/dejavu media-libs/libpng:0 media-libs/libsdl[joystick,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl virtual/jpeg:0 virtual/opengl virtual/glu nls? ( virtual/libintl ) app-arch/xz-utils nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A challenging 2D motocross platform game
+EAPI=6
+HOMEPAGE=http://xmoto.tuxfamily.org
+IUSE=double-precision editor nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 dev-db/sqlite:3 dev-games/ode[double-precision=] dev-lang/lua:0[deprecated] dev-libs/libxdg-basedir dev-libs/libxml2 media-fonts/dejavu media-libs/libpng:0 media-libs/libsdl[joystick,opengl] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf net-misc/curl virtual/jpeg:0 virtual/opengl virtual/glu nls? ( virtual/libintl ) editor? ( media-gfx/inkscape )
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-0.5.11-src.tar.gz mirror://debian/pool/main/x/xmoto/xmoto_0.5.11+dfsg-7.debian.tar.xz editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/0.7.0/inksmoto-0.7.0.tar.gz )
+_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_=a1ff0eaf1835e75ff71c9a385e6e5290
diff --git a/games-sports/xmoto/Manifest b/games-sports/xmoto/Manifest
deleted file mode 100644
index 0f92b75b1172..000000000000
--- a/games-sports/xmoto/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST inksmoto-0.7.0.tar.gz 2628941 BLAKE2B b8469739e6368f7b36b9a5b766522c295de43c001fba00975fb3c761ba6df34bf97e684ddf51aa83a6a41a1b800d64d6d6fe77358cf1244f193d3aad4746c6b5 SHA512 af0ae49ea160a2274f6835abd82ccaa00dc9ff81875b7d4ea29789388c131b519cb77e6da42efeaf51d52b97090c67320af38145204a1d5418781c99cb23a704
-DIST xmoto-0.5.11-src.tar.gz 40785573 BLAKE2B a1c19656ec5b206417ebdf5ac80e134ce7f29258d8a76f47bad4084ce4d2cdaeeecde1cf6cef1254a0832f21c50a49049947c1896681fe2dd8f3531ba22e7627 SHA512 7046745e8f7a045fa2ce1deb3fd75b73b233dc1092f5ecd6dd4e42938f70269a93a3a623a39a1f0520c90643a42dc1ce93c43ad07bf225ff6c50741cc02511f6
-DIST xmoto_0.5.11+dfsg-7.debian.tar.xz 25708 BLAKE2B e4029d9c66b176c6eebbf68c973cb726ef7b2522c6245ce626c7a61c13492f2e599c5a7deff4f2c853bc58d21afb4e53072a0ddc25a4e7bdb8b89b93fd44159a SHA512 d430fa37fdde90ac68e8ff4b7d2707ea5fc73fa8fab241f7a97b27e803a88321f0ea01b094a5f77ac7e43b2202113842b4f69a745e9212eead7ce4a0a5cd220c
-EBUILD xmoto-0.5.11-r2.ebuild 2539 BLAKE2B 2934f3ebb257ef84288d5dd6393c17bf7129b19bdb24302d545208f269e91977febe06ae14d22d3e9a154a80efa67d5442aca6741d1a121a528c1fa425a40414 SHA512 369d36e52803e3a2566710ec863e11cb02c1c8c254300d07690fee90a3deeab89185023ff450b2b2f43f28b805c7200cce356d74017d29ee3e19264ab5dfe70d
-MISC metadata.xml 460 BLAKE2B 785042b620610aec6eebea61013723069e30dc1fd29cd64a74a59c721c55d6590131fd2c99094768b36917bded227c63f7560518e40367e0b295bb4c563956db SHA512 fa39571c69e439d293450292417de087a4f7da52a291b0d105e6c08af0c380b5d0bce20ac29851f837716d92152e77155c41fae58c38d31b941b0700ad0df2f8
diff --git a/games-sports/xmoto/metadata.xml b/games-sports/xmoto/metadata.xml
deleted file mode 100644
index 5b72e0102ede..000000000000
--- a/games-sports/xmoto/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="double-precision">more precise calculations at the expense of speed</flag>
-    <flag name="editor">Depend on inkscape, scripts to convert svg to level (svg2lvl)</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-sports/xmoto/xmoto-0.5.11-r2.ebuild b/games-sports/xmoto/xmoto-0.5.11-r2.ebuild
deleted file mode 100644
index 4b906f8726a4..000000000000
--- a/games-sports/xmoto/xmoto-0.5.11-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-LVL_PV="0.7.0" #they unfortunately don't release both at the same time, why ~ as separator :(
-LVL="inksmoto-${LVL_PV}"
-DEB_PV=7
-DESCRIPTION="A challenging 2D motocross platform game"
-HOMEPAGE="http://xmoto.tuxfamily.org"
-SRC_URI="http://download.tuxfamily.org/xmoto/xmoto/${PV}/${P}-src.tar.gz
-	mirror://debian/pool/main/x/${PN}/${PN}_${PV}+dfsg-${DEB_PV}.debian.tar.xz
-	editor? ( http://download.tuxfamily.org/xmoto/svg2lvl/${LVL_PV}/${LVL}.tar.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="double-precision editor nls"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlite:3
-	dev-games/ode[double-precision=]
-	dev-lang/lua:0[deprecated]
-	dev-libs/libxdg-basedir
-	dev-libs/libxml2
-	media-fonts/dejavu
-	media-libs/libpng:0
-	media-libs/libsdl[joystick,opengl]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	net-misc/curl
-	virtual/jpeg:0
-	virtual/opengl
-	virtual/glu
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	nls? ( sys-devel/gettext )"
-RDEPEND="${RDEPEND}
-	editor? ( media-gfx/inkscape )"
-
-src_prepare() {
-	default
-
-	EPATCH_SOURCE="${WORKDIR}/debian/patches" \
-		epatch $(cat ${WORKDIR}/debian/patches/series)
-	use editor && rm -vf "${WORKDIR}"/extensions/{bezmisc,inkex}.py
-	sed -i \
-		-e '/^gettextsrcdir/s:=.*:= @localedir@/gettext/po:' \
-		po/Makefile.in.in || die
-	mv configure.{in,ac} || die
-	eautoreconf
-
-	rm -r "${S}"/src/ode || die
-}
-
-src_configure() {
-	# bug 653404
-	# due to ICU 59 requiring C++11 now
-	append-cxxflags -std=c++11
-
-	econf \
-		--enable-threads=posix \
-		$(use_enable nls) \
-		--localedir=/usr/share/locale \
-		--with-localesdir=/usr/share/locale \
-		--with-renderer-sdlGfx=0 \
-		--with-renderer-openGl=1
-}
-
-src_install() {
-	default
-
-	rm -f "${D}/usr/share/xmoto"/Textures/Fonts/DejaVu*.ttf
-	dosym ../../../fonts/dejavu/DejaVuSans.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSans.ttf
-	dosym ../../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/xmoto/Textures/Fonts/DejaVuSansMono.ttf
-	doicon extra/xmoto.xpm
-	make_desktop_entry xmoto Xmoto
-
-	if use editor; then
-		insinto /usr/share/inkscape/
-		doins -r "${WORKDIR}"/extensions/
-	fi
-}
-
-pkg_postinst() {
-	if use editor; then
-		elog "If you want to know how to create Xmoto levels"
-		elog "have a look at this Tutorial:"
-		elog "    http://wiki.xmoto.tuxfamily.org/index.php?title=Inksmoto-${LVL_PV}"
-		elog "You can share your levels on the Xmoto homepage."
-	fi
-}
diff --git a/games-strategy/0ad-0.0.22_alpha b/games-strategy/0ad-0.0.22_alpha
new file mode 100644
index 000000000000..39f7dc6eb1a0
--- /dev/null
+++ b/games-strategy/0ad-0.0.22_alpha
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.22_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
+DESCRIPTION=A free, real-time strategy game
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+IUSE=editor +lobby nvtt pch test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
+RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.22_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-build.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c4980d5dc338d15157b618aa8c9dd194
diff --git a/games-strategy/0ad-0.0.23_alpha b/games-strategy/0ad-0.0.23_alpha
new file mode 100644
index 000000000000..69c86eb4cd10
--- /dev/null
+++ b/games-strategy/0ad-0.0.23_alpha
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.23_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools ) || ( >=dev-lang/python-2.7.5-r2:2.7[threads,ssl] ) virtual/pkgconfig test? ( dev-lang/perl ) >=sys-apps/sed-4
+DESCRIPTION=A free, real-time strategy game
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+IUSE=editor +lobby nvtt pch test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB
+RDEPEND=dev-libs/boost:= dev-libs/icu:= dev-libs/libsodium dev-libs/libxml2 dev-libs/nspr ~games-strategy/0ad-data-0.0.23_alpha media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/libvorbis media-libs/openal net-libs/enet:1.3 net-libs/miniupnpc:= net-misc/curl sys-libs/zlib virtual/jpeg:0 virtual/opengl x11-libs/libX11 x11-libs/libXcursor editor? ( x11-libs/wxGTK:3.0[X,opengl] ) lobby? ( >=net-libs/gloox-1.0.20 ) nvtt? ( media-gfx/nvidia-texture-tools )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-build.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abc7af71b215f9d7334e907f192555d5
diff --git a/games-strategy/0ad-data-0.0.22_alpha b/games-strategy/0ad-data-0.0.22_alpha
new file mode 100644
index 000000000000..dbdaa1d2196f
--- /dev/null
+++ b/games-strategy/0ad-data-0.0.22_alpha
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Data files for 0ad
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.22-alpha-unix-data.tar.xz
+_md5_=a2954d2fcc40f833961132970d09815e
diff --git a/games-strategy/0ad-data-0.0.23_alpha b/games-strategy/0ad-data-0.0.23_alpha
new file mode 100644
index 000000000000..7b9579ca0564
--- /dev/null
+++ b/games-strategy/0ad-data-0.0.23_alpha
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Data files for 0ad
+EAPI=6
+HOMEPAGE=https://play0ad.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera
+SLOT=0
+SRC_URI=http://releases.wildfiregames.com/0ad-0.0.23-alpha-unix-data.tar.xz
+_md5_=24409256c806f1dba6c0baf4989b2e64
diff --git a/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
deleted file mode 100644
index 2413f34ee5d1..000000000000
--- a/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
-	insinto /usr/share/0ad
-	doins -r binaries/data/*
-}
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
deleted file mode 100644
index 9b33e87f7945..000000000000
--- a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="0ad-${PV/_/-}"
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
-	insinto /usr/share/0ad
-	doins -r binaries/data/*
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
deleted file mode 100644
index 64e4b07e2854..000000000000
--- a/games-strategy/0ad-data/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 BLAKE2B 2b3fd05919e344136114903706d5ec452d432e1fb839e9324b23a627bd740e1994dd10db0d4345447950807908d0f299c745c7f0b6c3cb3215f5a23147ab3e51 SHA512 ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
-DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B 7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6 SHA512 9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
-EBUILD 0ad-data-0.0.22_alpha.ebuild 532 BLAKE2B ff7e7ac49fd99928ea0f0c67046db9b480a75af2dff228a6db4da328b5862260fb5372bf242b2dbc8d46969c46b3a917b57b1c80f37b444683810c159bad04f0 SHA512 6ab42ff53c6c0f97bc137c7f453a5a341839c02aef5bcd5ae30b31110e318ee3b8cd6731a2686ecb9e4ba08f4eb9083b3166bea4f17691e1ee55a50f0fa7e040
-EBUILD 0ad-data-0.0.23_alpha.ebuild 534 BLAKE2B 3517c0dc476b363aab702a25ef2bc4d19c2fd162b0c6c9ea41995b190215c8ff859d630700db8760cd80514d4197a4d4583cacf991d0b98118b755da1dc55e30 SHA512 d6d9d5de0fa84a76ca80d701de2e0d8340ac8990c83bd6238e66a180a02820112a3c1e20c2c75fa1e03b4fe4671cdde716092841bbe76c71db060b7ceb3452a3
-MISC metadata.xml 330 BLAKE2B 9f9fa8d997d33a71d11d118396fd718f8109e3e44410d5c8c2aeb54cc48b4c979e88922be7e5e9b0009e330b67ce85696fd747c52b2a23b51dc3e8d475c24254 SHA512 55b1c876bea472fc72321364ac95e97c950c675c68e9a32862eb6135b96f7bf7da5c0b787ddd28685b322a33c60dd51dafe1d382eb46e066a5cf8bd15fb5347f
diff --git a/games-strategy/0ad-data/metadata.xml b/games-strategy/0ad-data/metadata.xml
deleted file mode 100644
index 263ee40e5d4f..000000000000
--- a/games-strategy/0ad-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">zero-ad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
deleted file mode 100644
index 1cb088436b4b..000000000000
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use editor && setup-wxwidgets
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-)
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto /usr/share/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.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-strategy/0ad/0ad-0.0.23_alpha.ebuild b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
deleted file mode 100644
index 0e44c4e36fb1..000000000000
--- a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/"
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-libs/icu:=
-	dev-libs/libsodium
-	dev-libs/libxml2
-	dev-libs/nspr
-	~games-strategy/0ad-data-${PV}
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/enet:1.3
-	net-libs/miniupnpc:=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXcursor
-	editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
-	lobby? ( >=net-libs/gloox-1.0.20 )
-	nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use editor && setup-wxwidgets
-}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-)
-
-src_configure() {
-	local myconf=(
-		--with-system-nvtt
-		--with-system-miniupnpc
-		--minimal-flags
-		$(usex nvtt "" "--without-nvtt")
-		$(usex pch "" "--without-pch")
-		$(usex test "" "--without-tests")
-		$(usex editor "--atlas" "")
-		$(usex lobby "" "--without-lobby")
-		--collada
-		--bindir="/usr/bin"
-		--libdir="/usr/$(get_libdir)"/${PN}
-		--datadir="/usr/share/${PN}"
-		)
-
-	# stock premake4 does not work, use the shipped one
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# regenerate scripts.c so our patch applies
-	cd "${S}"/build/premake/premake4 || die
-	"${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
-	# rebuild premake again... this is the most stupid build system
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
-	emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
-	# run premake to create build scripts
-	cd "${S}"/build/premake || die
-	"${S}"/build/premake/premake4/bin/release/premake4 \
-		--file="premake4.lua" \
-		--outpath="../workspaces/gcc/" \
-		--platform=$(usex amd64 "x64" "x32") \
-		--os=linux \
-		"${myconf[@]}" \
-		gmake || die "Premake failed"
-}
-
-src_compile() {
-	tc-export AR
-
-	# build bundled and patched spidermonkey
-	cd libraries/source/spidermonkey || die
-	JOBS="${MAKEOPTS}" ./build.sh || die
-	cd "${S}" || die
-
-	# build 3rd party fcollada
-	emake -C libraries/source/fcollada/src
-
-	# build 0ad
-	emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
-	cd binaries/system || die
-	./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
-	newbin binaries/system/pyrogenesis 0ad
-	use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
-	insinto /usr/share/${PN}
-	doins -r binaries/data/l10n
-
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe binaries/system/libCollada.so
-	doexe libraries/source/spidermonkey/lib/*.so
-	use editor && doexe binaries/system/libAtlasUI.so
-
-	dodoc binaries/system/readme.txt
-	doicon -s 128 build/resources/${PN}.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-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
deleted file mode 100644
index 0ec270713ead..000000000000
--- a/games-strategy/0ad/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0ad-0.0.21_alpha-gentoo.patch 3905 BLAKE2B 265020af1e1df234d0932c6294e0cda9c0f48bc1b311d6770c8347431c17e5e99c68f4c52cf6e1277ffb2e57431a6c237d2dc4f452e563eb343b06f62ab1eede SHA512 592e9fdff6ef6d88efc9c4a5c856e41240845187cc4a4b3d9d6b5c616eb1f664fdf702b7b0a30cdfeedd6d87ac0fab913df477567b84d42e13d2cf2761cfdec8
-DIST 0ad-0.0.22-alpha-unix-build.tar.xz 29199308 BLAKE2B a9204949e4dd669228b2a0e2c2dc5d2ccd4f18767e32c4f772714c61314ca0fb283d41201cb9f0547588a6dbdc20fd9d7d14ff153bc3087003c27f4ec2f6fef9 SHA512 3f917e77c6cc1d3fb585c98950db6eab3f5895ba3db41a8737f8172c769b5582689b436cab31eeafecce0e9639ee456afc7b78ebb03435b06512eb9fe7393771
-DIST 0ad-0.0.23-alpha-unix-build.tar.xz 31907988 BLAKE2B 567b9e1b5cd653206194e042f4f0859cd4f9afe75d52d3f480a328b76fdcdd746254502fbf284f790b4932c912ff31453bbc8c986c879ad76baa3d2a5db802c9 SHA512 4a1c86b19e0d8ec7d9b8bf75428df0255f95e7f991f419734f9b6ddc288a537405a34c5d7081f1a97475155c49013af85dee5c0265c35c7dbc003b46637a03d7
-EBUILD 0ad-0.0.22_alpha.ebuild 3388 BLAKE2B 527f19ac8a3dd38ee3f2d6005223ea45b76a01739640bae7456427c6687518a7a5fe60dd7cc77a13861c0bfd381e59fad8d81084a6245b84566dffa459035e2f SHA512 c7d221e6ee1c8e68686e82c245ba90878acb9a7fe64b1916fefdbba381e479f98419bbe06b0f4f7d3c8308d515ab0f88c97f5d29a299eadbd0d734511e6c1b34
-EBUILD 0ad-0.0.23_alpha.ebuild 3408 BLAKE2B bb6fbd77a2e9a0b27f086b33bb347ac5c5a8c76277b967359dfd8b4c7b6ea4b3f296aa150bacc3b3dd9a1460e5ebda436ad1429c5c1eaefe826a64403417ac1c SHA512 99db5ad39c1e0fe4ec9762df7c27e5ae12a1234007cd5d6e229110471affa705373015bb6e42e23b1f8ace93c5a3bae4afc204d966c5940f810415cd255186bc
-MISC metadata.xml 668 BLAKE2B 9bfa86da2d6e1631217082f88905d8d8be7a2c91248839b9a0f5da9d0c214552b11f4af861eb04072e4645b47505d83d0b93c1313f7a3857b1006f94a699b3b2 SHA512 7aab21c31587f1cce5b4635ace0fbbb5bcdc2a6d811df68494ac1fb251fbfc75911cfa3a9e1a60c28f684f64a919164c6e3504fd3fbba3b0ec05afe8278ae343
diff --git a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch b/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
deleted file mode 100644
index 79549d193683..000000000000
--- a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
+++ /dev/null
@@ -1,88 +0,0 @@
---- 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
-+++ 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
-@@ -26,9 +26,9 @@
-   DEFINES   += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-   INCLUDES  += -I../../src/host/lua-5.1.4/src
-   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
--  CFLAGS    += $(CPPFLAGS) -Wall -Os
--  CXXFLAGS  += $(CPPFLAGS) -Wall -Os
--  LDFLAGS   += -s -rdynamic
-+  CFLAGS    += $(CPPFLAGS) -Wall
-+  CXXFLAGS  += $(CPPFLAGS) -Wall
-+  LDFLAGS   += -rdynamic
-   LIBS      += -lm -ldl 
-   RESFLAGS  += $(DEFINES) $(INCLUDES) 
-   LDDEPS    += 
-@@ -48,8 +48,8 @@
-   DEFINES   += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
-   INCLUDES  += -I../../src/host/lua-5.1.4/src
-   CPPFLAGS  += -MMD -MP $(DEFINES) $(INCLUDES)
--  CFLAGS    += $(CPPFLAGS) -Wall -g
--  CXXFLAGS  += $(CPPFLAGS) -Wall -g
-+  CFLAGS    += $(CFLAGS) $(CPPFLAGS) -Wall
-+  CXXFLAGS  += $(CXXFLAGS) $(CPPFLAGS) -Wall
-   LDFLAGS   += -rdynamic
-   LIBS      += -lm -ldl 
-   RESFLAGS  += $(DEFINES) $(INCLUDES) 
---- 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua
-+++ 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua
-@@ -136,8 +136,6 @@
- 		if not cfg.flags.Symbols then
- 			if cfg.system == "macosx" then
- 				table.insert(result, "-Wl,-x")
--			else
--				table.insert(result, "-s")
- 			end
- 		end
- 	
---- 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile
-+++ 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile
-@@ -9,9 +9,9 @@
- 
- CXX ?= g++
- CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
--CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
--CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
--CXXFLAGS_TEST := -O0 -g -D_DEBUG
-+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
-+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
-+CXXFLAGS_TEST := -D_DEBUG
- LIBS += `pkg-config libxml-2.0 --libs`
- INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
- INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
---- 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh
-+++ 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh
-@@ -93,20 +93,8 @@
- cd js/src
- 
- # Clean up data generated by previous builds that could cause problems
--rm -rf build-debug
- rm -rf build-release
- 
--# We want separate debug/release versions of the library, so we have to change
--# the LIBRARY_NAME for each build.
--# (We use perl instead of sed so that it works with MozillaBuild on Windows,
--# which has an ancient sed.)
--perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build
--mkdir -p build-debug
--cd build-debug
--CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal
--${MAKE} ${MAKE_OPTS}
--cd ..
--
- perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build
- mkdir -p build-release
- cd build-release
-@@ -161,12 +149,9 @@
- mkdir -p ${INCLUDE_DIR_DEBUG}
- mkdir -p ${INCLUDE_DIR_RELEASE}
- cp -R -L ${FOLDER}/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
--cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/
- 
- mkdir -p lib/
--cp -L ${FOLDER}/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_DST_SUFFIX}
- cp -L ${FOLDER}/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs38-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-release${LIB_DST_SUFFIX}
--cp -L ${FOLDER}/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs38-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-debug${DLL_DST_SUFFIX}
- cp -L ${FOLDER}/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs38-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-release${DLL_DST_SUFFIX}
- 
- # On Windows, also copy debugging symbols files
diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml
deleted file mode 100644
index 11542ae7c10a..000000000000
--- a/games-strategy/0ad/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="editor">Include Atlas scenario editor projects</flag>
-		<flag name="lobby">Enable the use of <pkg>net-libs/gloox</pkg>
-			and the multiplayer lobby</flag>
-		<flag name="nvtt">Support for some uncompressed data formats
-			via <pkg>media-gfx/nvidia-texture-tools</pkg>
-			(might be needed for some mods)</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">zero-ad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 2c672c271129..f40c4da18201 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/asc-2.6.0.0-r2 b/games-strategy/asc-2.6.0.0-r2
new file mode 100644
index 000000000000..bcd4289609ca
--- /dev/null
+++ b/games-strategy/asc-2.6.0.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=app-arch/bzip2 dev-games/physfs dev-lang/lua:0 dev-libs/boost dev-libs/expat dev-libs/libsigc++:1.2 media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound media-libs/freetype media-libs/xvid x11-libs/wxGTK:3.0[X] app-arch/zip dev-lang/perl 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=turn based strategy game designed in the tradition of the Battle Isle series
+EAPI=6
+HOMEPAGE=http://www.asc-hq.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2 dev-games/physfs dev-lang/lua:0 dev-libs/boost dev-libs/expat dev-libs/libsigc++:1.2 media-libs/libpng:0 media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-sound media-libs/freetype media-libs/xvid x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/asc-hq/asc-2.6.0.0.tar.bz2 http://www.asc-hq.org/music/frontiers.ogg http://www.asc-hq.org/music/time_to_strike.ogg http://www.asc-hq.org/music/machine_wars.ogg
+_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	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=877b4d7bfeaea4b33788b8fef621e1d8
diff --git a/games-strategy/asc/Manifest b/games-strategy/asc/Manifest
deleted file mode 100644
index 8e4786acd600..000000000000
--- a/games-strategy/asc/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX asc-2.6.0.0-freetype_pkgconfig.patch 1012 BLAKE2B 8e6619f39c1ac5dfcc9e07c0bfd160ed55300aba75eda17aa9d40620d5be4f1da6a3233699f5cdea7a016580f02a8b456143a5c96f6b62f2ed78591d91d3df1c SHA512 f27e02554711bad885a53929f6049607201ea2090fa686b4d680c47470a0f7fec53c84a3f4657341fa46a3ef0369f204246b4bf2d3b25d588953e288edaa8a19
-AUX asc-2.6.0.0-gcc6-nothrow-in-dtors.patch 741 BLAKE2B f74d9e7529433ee86dd3f0406cc79a52ddcd0cca0880749268f5878f1aaacc7c67fce131af1d568c3f19549dfa21c5c20eed8a7116fc7fccefd689dc8bcf05b8 SHA512 d92086128b2b491a6f0c96d0b92f2e5ae9a7d521070405b7971fafa4ab953e6d4996784a6c5837b8cbf2811a18e043481c0278d960f6fe9804d8da68c8afa32d
-DIST asc-2.6.0.0.tar.bz2 42280527 BLAKE2B a2ab8777f36d64924bb12359226792ea6d76a07f306bfe2f7204f50de5c103d524fbb69eb88106c293312650619cf3683a25a6afa6176941e8efb72edca9424c SHA512 e1dea48bf87424fd65772e6d9bad96cf63e4062df5717bbc925562683782afc2d9788ea28e7147d905c3c0f6db3ef7c102a59022988c9fcf8aa6adba91dc5540
-DIST frontiers.ogg 4691844 BLAKE2B 02909247293439b72ca2f94b515abd53ebf931ac4ffbcc7a4d7909cfdcc79cd1411c973f42760e6012197ead5ce2369895d52b8b4fea5107f62e852502f2428d SHA512 8c2ce497519b3842fba2d39b5c6de6194584d64c0375d404535628898cb2e7a82433fc6008781381a80a6cbb24ff49162de3634ebcf28b17b0631c30668fd8af
-DIST machine_wars.ogg 3138308 BLAKE2B 7c1f4e2c652b70dc9e41f313a8428a22844d1f98717b3c59061d462cf6d4a8f30c2ea2f7d2032afd8b6c9d50513286c409d8d21fb78c59bd246bd4cce3255029 SHA512 2c1bab89b9397f52dcf7eedfc0dbc88d49a586ac0474c76a09a87a880712bf0fa408c03a65a5f5d322dee86e3b12cbc66d53cd6728e8fa34fa8f2ee2bbc06cd8
-DIST time_to_strike.ogg 3830679 BLAKE2B ced7de55d8f52177ee5fac6a19a4f76df8b50f70f9d62e42b10d6868608ebf88fe5405e072ee7b1cbc2152f54f4ae66fe3e025c13faf9b57b09a6c117a2c3d13 SHA512 2ed946116cac2ea63d401eb7415d5b3e4e548bc5a5b00b01a6f1c4db6a242895810dfefdf1ace9652f01dc934a70b756aa74d01630cfac97b19ce84a93b772ee
-EBUILD asc-2.6.0.0-r2.ebuild 1777 BLAKE2B 04c24eaf6ed938e37bf6660a91f2ce8ff00ea5b106741436e50c4a6cf26b41c2eb1148903178685849131e51ad02699795d0b581b04cc3d17b0fb840c7426e04 SHA512 5df6fc0a21c2102049456591f00aab405559d9881117eb6bfda6e354c2d66f02d2cdede9598866d3288c3dd7f269880ae9e9c8eb2ffee1f79a2a4c098935268c
-MISC metadata.xml 329 BLAKE2B 0289ce2add055169d9f1b87baa936fe3b1066e11f9cf774fa46c26adfc534c7edc7c16e568000d3ebcb9936849be0c73fa44a2508a6d05c723cda6be1ba05dbd SHA512 1fa38f0da7bfc4cc3f1193758234379a9932c58742b914deebfc2d8101154e6303497b61c018eec7f52d5e8561ea2d7df89ad89f5d1cbe3f8a7732a1c922b051
diff --git a/games-strategy/asc/asc-2.6.0.0-r2.ebuild b/games-strategy/asc/asc-2.6.0.0-r2.ebuild
deleted file mode 100644
index 6f17949ef838..000000000000
--- a/games-strategy/asc/asc-2.6.0.0-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit autotools toolchain-funcs flag-o-matic wxwidgets
-
-DESCRIPTION="turn based strategy game designed in the tradition of the Battle Isle series"
-HOMEPAGE="http://www.asc-hq.org/"
-SRC_URI="mirror://sourceforge/asc-hq/${P}.tar.bz2
-	http://www.asc-hq.org/music/frontiers.ogg
-	http://www.asc-hq.org/music/time_to_strike.ogg
-	http://www.asc-hq.org/music/machine_wars.ogg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-arch/bzip2
-	dev-games/physfs
-	dev-lang/lua:0
-	dev-libs/boost
-	dev-libs/expat
-	dev-libs/libsigc++:1.2
-	media-libs/libpng:0
-	media-libs/libsdl[video]
-	media-libs/sdl-image[gif,jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-sound
-	media-libs/freetype
-	media-libs/xvid
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	dev-lang/perl
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/"/${P}-gcc6-nothrow-in-dtors.patch
-	"${FILESDIR}/"/${P}-freetype_pkgconfig.patch #657998
-)
-
-src_unpack() {
-	local f
-
-	unpack ${P}.tar.bz2
-	for f in ${A}
-	do
-		case ${f} in
-		*ogg)
-			cp "${DISTDIR}/${f}" "${S}/data/music" || die
-			;;
-		esac
-	done
-}
-
-src_prepare() {
-	default
-	# required for freetype_pkgconfig patch
-	eautoreconf
-}
-
-src_configure() {
-	need-wxwidgets unicode
-	# Added --disable-paraguitest for bugs 26402 and 4488
-	# Added --disable-paragui for bug 61154 since it's not really used much
-	# and the case is well documented at http://www.asc-hq.org/
-	if [[ $(gcc-major-version) -eq 4 ]] ; then
-		replace-flags -O3 -O2
-	fi
-	local myeconfargs=(
-		--disable-paraguitest
-		--disable-paragui
-		--datadir="/usr/share"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	dodoc -r doc/*
-}
diff --git a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch b/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
deleted file mode 100644
index a07cd2f86274..000000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/657998
-
---- asc-2.6.0.0/configure.ac
-+++ asc-2.6.0.0/configure.ac
-@@ -401,22 +401,7 @@
-       FREETYPE_CFLAGS="`$ac_cv_path_freetype_config --cflags`"
-       FREETYPE_LIBS="`$ac_cv_path_freetype_config --libs`"
-    else
--      AC_CHECK_LIB(freetype,FT_Init_FreeType,have_freetype=yes)
--      AC_CHECK_HEADER(ft2build.h,have_ft2build=yes)
--      if test "$have_ft2build" != "yes"; then
--         have_freetype="no"
--      elif test "$have_freetype" = "yes"; then
--         FREETYPE_LIBS="-lfreetype"
--         ft2inc="no"
--         AC_MSG_CHECKING(freetype2 include directory)
--         if test -d /usr/local/include/freetype2; then
--            ft2inc="/usr/local/include/freetype2"
--         elif test -d /usr/include/freetype2; then
--            ft2inc="/usr/include/freetype2"
--         fi
--         AC_MSG_RESULT($ft2inc)
--         FREETYPE_CFLAGS="-I$ft2inc"
--      fi
-+      PKG_CHECK_MODULES(FREETYPE, freetype2, have_freetype=yes)
-    fi
- 
-    if test x$have_freetype = xno; then
diff --git a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch b/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
deleted file mode 100644
index e710b22f8c8b..000000000000
--- a/games-strategy/asc/files/asc-2.6.0.0-gcc6-nothrow-in-dtors.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Bug: https://bugs.gentoo.org/612934
-Upstream Bug: https://sourceforge.net/p/asc-hq/patches/2/
-
---- a/source/basestrm.cpp
-+++ b/source/basestrm.cpp
-@@ -1728,7 +1728,6 @@
-       }
-    } catch ( ... ) {
-       displayLogMessage( 9, ASCString("~tn_c_lzw_filestream : caught exception") );
--      throw;
-    }
- }
- 
---- a/source/simplestream.cpp
-+++ b/source/simplestream.cpp
-@@ -43,6 +43,7 @@
-  #endif
- #endif
- 
-+#include "util/messaginghub.h"
- 
- tnbufstream::tnbufstream (  )
- {
-@@ -270,7 +271,7 @@
- 
-    int res = fclose( fp );
-    if ( res != 0 ) 
--      throw  tfileerror ( getDeviceName() + " : " + strerror(errno));
-+      displayLogMessage( 9, ASCString( getDeviceName() + " : " + strerror(errno) ) );
-       
-    _mode = uninitialized;
- 
diff --git a/games-strategy/asc/metadata.xml b/games-strategy/asc/metadata.xml
deleted file mode 100644
index 33170f2a7547..000000000000
--- a/games-strategy/asc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">asc-hq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/boswars-2.7-r2 b/games-strategy/boswars-2.7-r2
new file mode 100644
index 000000000000..bc7c44b06109
--- /dev/null
+++ b/games-strategy/boswars-2.7-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/lua:0 media-libs/libogg media-libs/libpng:0 media-libs/libsdl[opengl,sound,video] media-libs/libtheora media-libs/libvorbis virtual/opengl x11-libs/libX11 dev-util/scons[python_targets_python2_7]
+DESCRIPTION=Futuristic real-time strategy game
+EAPI=6
+HOMEPAGE=https://www.boswars.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/lua:0 media-libs/libogg media-libs/libpng:0 media-libs/libsdl[opengl,sound,video] media-libs/libtheora media-libs/libvorbis virtual/opengl x11-libs/libX11
+SLOT=0
+SRC_URI=https://www.boswars.org/dist/releases/boswars-2.7-src.tar.gz https://dev.gentoo.org/~hasufell/distfiles/boswars-2.7-fixed-images-for-libpng-1.6.tar.xz mirror://gentoo/bos.png
+_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_=1ece430fbc1b56f37ed465b02f58727d
diff --git a/games-strategy/boswars/Manifest b/games-strategy/boswars/Manifest
deleted file mode 100644
index ba8b15347275..000000000000
--- a/games-strategy/boswars/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX boswars-2.7-gentoo.patch 606 BLAKE2B 0945db9d0b236de84676f31727b9974e0d67b1f8cb9f59e46178e0560166a6e506ecc4b555dc52fd4bd935dd253bbdce0ba243325cb1bc88a044c3de7f2e0aee SHA512 d538c1a5cd794b27c7f33989c5b1d3820cbcd7a4195d7cbd18dd92631aac4e5c2a3ab15447e178dcb2e51bcdcb00e939bf29c2f4b70b74a1ac44f841f52f6e98
-AUX boswars-2.7-scons-blows.patch 944 BLAKE2B 3594599a427660be601f21340a2a1ed992762b345988a3b6daffc766022234e455b166253aab35df7f67b6cd6a023268a5e9246e501e9f50117434ac45dcb288 SHA512 45e723feaa282760644e11a3e61e52726b6fffb388f7a6b5a0a47a97319e88341e238b46d8dbbe94cf178d5d18ea4ba8ebc257cd16dd98d8aa3cd5cff8d0eecd
-DIST bos.png 620 BLAKE2B c1759f8be923d8d1e0465a3a51affdab71276c78ec6f771fbb856bf46551e798ddf018d03b49f3a40fef65ea3b379aa63ee64d25f2e99a392507e4ca13934af1 SHA512 6a15a5c82f9cff3462d498620a1dd1c7a2a460119689078157e61b27e7e5243a8ac2da7f01c1848d614167a3a748ca1f3e03c1f218479ede3a1c2c0ae85b3cc3
-DIST boswars-2.7-fixed-images-for-libpng-1.6.tar.xz 552956 BLAKE2B a719fbd72a5f170281efc98441051b8e8740e0cbdd2b4ed147220cacb934794786cb34dd183863f53ddf5b80bf101857f51bda086408b435ca349475c7c1a2c5 SHA512 794addf06cfd5c5bb0ad0988a90337a3a6332789de7bc942807602c84c4fafe4c4b12da63ae210ca220a1be6dcd9677fa9ddb1ae62a7d26a7748af35b07303dc
-DIST boswars-2.7-src.tar.gz 77280735 BLAKE2B 641632faa07251f66cb2fd05efe79c398ba04a51dcbeecc97b3340346889fc6643da285e3976df2ed0ca50557f96a342ad9cc2d00de8cb65a02db65c2ac6c9e3 SHA512 2573c61684e83f356a80292adcf780cc001a4be2a31abba20e6f93ed6deaa38b8eca87f29935a4fe0edc9b4e0fdc3f78ddd709b8132aaaa048ffbcd6c498ec80
-EBUILD boswars-2.7-r2.ebuild 1535 BLAKE2B bf159bb4e1242c9cfded4cf8b479c6460bb38846b81b4efa8d7da1d1656ed5f12ed44ec07e5d0b08e9b5f761305d0435fde10415890c2413ae63ac9ff6aac341 SHA512 27decbfde53aff821aa3501781bbdbd9c5dd95dd0d7dcdcc69ae71157bcb377ea1aaf51303335d583ce277aa96177bef40eb7cc15172d424763d185d862ef3a8
-MISC metadata.xml 514 BLAKE2B 4f6163ce340262a203c22c2aad0c32973d66e3dcc79015ec4833c1c4dcb5decd182dc0643fee09aff12d123359ef9dcddd2d27771228406e8ca433879744fb19 SHA512 d253904f4c25482960a7815a05eccb8ff0c9acae13491713c47c98c90e012ad0cddc3e964529ab008e6db13602fe6b4d60df76a24ee66aac5f13efa13615440b
diff --git a/games-strategy/boswars/boswars-2.7-r2.ebuild b/games-strategy/boswars/boswars-2.7-r2.ebuild
deleted file mode 100644
index 679d91a6ab3b..000000000000
--- a/games-strategy/boswars/boswars-2.7-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils scons-utils
-
-DESCRIPTION="Futuristic real-time strategy game"
-HOMEPAGE="https://www.boswars.org"
-SRC_URI="https://www.boswars.org/dist/releases/${P}-src.tar.gz
-	https://dev.gentoo.org/~hasufell/distfiles/${P}-fixed-images-for-libpng-1.6.tar.xz
-	mirror://gentoo/bos.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/lua:0
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libsdl[opengl,sound,video]
-	media-libs/libtheora
-	media-libs/libvorbis
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}-src
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-scons-blows.patch
-)
-
-src_unpack() {
-	default
-	# bug 475764
-	cp -dRp ${P}-fixed-images-for-libpng-1.6/* ${P}-src/ \
-		|| die "copying fixed images failed!"
-}
-
-src_prepare() {
-	default
-
-	rm -f doc/{README-SDL.txt,guichan-copyright.txt} || die
-
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		engine/include/stratagus.h \
-		|| die
-	sed -i \
-		-e "/-O2/s:-O2.*math:${CXXFLAGS} -Wall:" \
-		SConstruct \
-		|| die
-}
-
-src_compile() {
-	escons || die
-}
-
-src_install() {
-	newbin build/${PN}-release ${PN}
-	insinto /usr/share/${PN}
-	doins -r campaigns graphics intro languages maps patches scripts sounds units
-	newicon "${DISTDIR}"/bos.png ${PN}.png
-	make_desktop_entry ${PN} "Bos Wars"
-	# COPYRIGHT.txt is referenced by the html
-	dodoc CHANGELOG COPYRIGHT.txt README.txt
-	dodoc -r doc/*
-}
diff --git a/games-strategy/boswars/files/boswars-2.7-gentoo.patch b/games-strategy/boswars/files/boswars-2.7-gentoo.patch
deleted file mode 100644
index a005f6f93ad0..000000000000
--- a/games-strategy/boswars/files/boswars-2.7-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru boswars-2.6.1-src/engine/include/stratagus.h boswars-2.6.1-src/engine/include/stratagus.h
---- boswars-2.6.1-src/engine/include/stratagus.h	2010-04-11 08:12:18.000000000 -0400
-+++ boswars-2.6.1-src/engine/include/stratagus.h	2010-05-22 02:33:50.021377764 -0400
-@@ -133,7 +133,7 @@
- --  General
- ----------------------------------------------------------------------------*/
- #ifndef STRATAGUS_LIB_PATH
--#define STRATAGUS_LIB_PATH  "."      /// Where to find the data files
-+#define STRATAGUS_LIB_PATH  "@GENTOO_DATADIR@"      /// Where to find the data files
- #endif
- 
- #ifndef STRATAGUS_HOME_PATH
diff --git a/games-strategy/boswars/files/boswars-2.7-scons-blows.patch b/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
deleted file mode 100644
index 1d2c04cc4f1b..000000000000
--- a/games-strategy/boswars/files/boswars-2.7-scons-blows.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/SConstruct	2010-11-19 21:09:45.724976603 -0500
-+++ b/SConstruct	2010-11-19 21:11:05.723197985 -0500
-@@ -22,6 +22,7 @@
- ##
- 
- import os
-+import SCons.Util
- import sys
- import glob
- from stat import *
-@@ -50,6 +51,16 @@
- 
- opts = DefineOptions("build_options.py", ARGUMENTS)
- env = Environment(ENV = {'PATH':os.environ['PATH']}) # for an unknown reason Environment(options=opts) doesnt work well
-+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'])
-+if os.environ.has_key('CXX'):
-+	env['CXX'] = os.environ['CXX']
-+if os.environ.has_key('CXXFLAGS'):
-+	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+if os.environ.has_key('LDFLAGS'):
-+	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- opts.Update(env) # Needed as Environment(options=opts) doesnt seem to work
- Help(opts.GenerateHelpText(env))
- mingw = env.Clone()
diff --git a/games-strategy/boswars/metadata.xml b/games-strategy/boswars/metadata.xml
deleted file mode 100644
index 242aa2331bb7..000000000000
--- a/games-strategy/boswars/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-Bos Wars is a futuristic real-time strategy game. It is possible to play against
-human opponents over LAN, internet, or against the computer.
-Bos Wars aims to create a completely original and fun open source RTS game.
-</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/colobot-0.1.11 b/games-strategy/colobot-0.1.11
new file mode 100644
index 000000000000..10ec4898119e
--- /dev/null
+++ b/games-strategy/colobot-0.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Colobot is an educational real-time strategy video game featuring 3D graphics
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=devbuild test tools doc +openal
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
+SLOT=0
+SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-0.1.11.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_=ad783f8a596504d8870d77a3fc106d91
diff --git a/games-strategy/colobot-9999 b/games-strategy/colobot-9999
new file mode 100644
index 000000000000..647a88a0823a
--- /dev/null
+++ b/games-strategy/colobot-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Colobot is an educational real-time strategy video game featuring 3D graphics
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=devbuild test tools doc +openal
+LICENSE=GPL-3
+RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad783f8a596504d8870d77a3fc106d91
diff --git a/games-strategy/colobot-data-0.1.11 b/games-strategy/colobot-data-0.1.11
new file mode 100644
index 000000000000..f1aa1bd6e5e9
--- /dev/null
+++ b/games-strategy/colobot-data-0.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/unzip music_flac_convert? ( media-sound/vorbis-tools ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Data package for colobot (Colonize with Bots)
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=+music music_flac_convert +music_ogg
+KEYWORDS=~amd64
+LICENSE=GPL-3
+REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
+SLOT=0
+SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.zip -> colobot-data-0.1.11.zip music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.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_=0dc1f38fe33f9015edb6737df4637e04
diff --git a/games-strategy/colobot-data-9999 b/games-strategy/colobot-data-9999
new file mode 100644
index 000000000000..1f270fa61fed
--- /dev/null
+++ b/games-strategy/colobot-data-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/unzip music_flac_convert? ( media-sound/vorbis-tools ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Data package for colobot (Colonize with Bots)
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=+music music_flac_convert +music_ogg
+LICENSE=GPL-3
+REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
+SLOT=0
+SRC_URI=music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> colobot-data-9999-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> colobot-data-9999-music-flac.tar.gz )
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5116a6f76451c3520f53b789dfbf9de
diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
deleted file mode 100644
index 490a1cdd122b..000000000000
--- a/games-strategy/colobot-data/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-DIST colobot-data-0.1.11-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
-DIST colobot-data-0.1.11-music-ogg.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
-DIST colobot-data-0.1.11.zip 55796087 BLAKE2B 2a1a6fc57bb61423360f89c8bac597754cab872b3154f9b3464bef88555e4dcb9e0296a4b6f85271ef95e71c69d1c31737c8ae3b932a0b64dc8d7cfa8393481b SHA512 2024759af47b4c406325e1d72d119391712ec9d53b4059f3e942e0bd2b3881fdbc9613f79510b9b012cdbc76bebd8a008531da4f94be5d6107887bbcb330417f
-DIST colobot-data-9999-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
-DIST colobot-data-9999-music-ogg.tar.gz 3686106 BLAKE2B c1565dbcf1aab0e29014623c924ade2ac1b5da9ae9d9231afe3299dfedab0678c3d222e58665fe3ac60291972b7c2d763437246d7816ca7c16e69766a52e9490 SHA512 2ec22944857ccc5276b93d0da4684bfd9d2a80ac712e3396cb01ccbf21a582c22d525e8af9d12828e224ee948173bffb5e31f664cc9333b79b6f3062dd2466ac
-EBUILD colobot-data-0.1.11.ebuild 1417 BLAKE2B e7e337a06bcc0f427ca48686a89b7153b1af7a3a50d20d2dc5c9b7a173d3efd3aa21636af625839673d884431eb8cc46b3425bda2493c2d5b73045f0601c6d52 SHA512 7533d79e52f93510df6c96ff8599d852e8c09b7e6a3f8ecc2d327817d7c3f488314ab797df770a27a558dce480f12c6ef878ade5175d02ce924de25dfbd5763f
-EBUILD colobot-data-9999.ebuild 1298 BLAKE2B 2a719b8b29c7d02b569d452baa874506eff9c1140ee44dd239e5777b7c2f1b240da13de87fce3f3692116d17ec84727999fba6ccd354704986e2b9a3ee6f6731 SHA512 8c580974e4bfb3d5a93540cf08b792aa966f934707edacb5825409d88b3133fa2718fac006bf577b4cceb0717e65f0369eda31e2cf4d3c6689d4ed0a29402805
-MISC metadata.xml 517 BLAKE2B 3f7a70c01e3fedb20ce8ae9ea680b5382ac852ed07684348d506c8c402d18a60ed201b314a3f923ac1974d91498543cd68e89460284148bde6876c303706b8d3 SHA512 abf5513f23d51b18ecc3f7c49148734e90eae4d9e3aaf16e35e0837c245313366ec10e2ada0bd5d5f41e4b297f3bb96d1fcf85c26dd812fd83597db1a9379427
diff --git a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
deleted file mode 100644
index b60210f63c30..000000000000
--- a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Data package for colobot (Colonize with Bots)"
-HOMEPAGE="https://colobot.info/"
-SRC_URI="
-	https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.zip -> ${P}.zip
-	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz )
-	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+music music_flac_convert +music_ogg"
-REQUIRED_USE="
-	music? ( ^^ ( music_flac_convert music_ogg ) )
-	music_flac_convert? ( music )
-	music_ogg? ( music )"
-
-DEPEND="
-	app-arch/unzip
-	music_flac_convert? ( media-sound/vorbis-tools )"
-
-S="${WORKDIR}/${PN}-colobot-gold-${PV}-alpha"
-
-src_unpack() {
-	unpack "${P}.zip"
-
-	cd "${S}" || die
-	if use music; then
-		tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music"
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use music; then
-		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMUSIC=$(usex music)
-		-DMUSIC_FLAC=$(usex music_flac_convert)
-		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/games-strategy/colobot-data/colobot-data-9999.ebuild b/games-strategy/colobot-data/colobot-data-9999.ebuild
deleted file mode 100644
index 63f52ef31b0f..000000000000
--- a/games-strategy/colobot-data/colobot-data-9999.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/colobot/colobot-data"
-
-inherit git-r3 cmake-utils
-
-DESCRIPTION="Data package for colobot (Colonize with Bots)"
-HOMEPAGE="https://colobot.info/"
-SRC_URI="
-	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> ${P}-music-ogg.tar.gz )
-	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> ${P}-music-flac.tar.gz )"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+music music_flac_convert +music_ogg"
-REQUIRED_USE="
-	music? ( ^^ ( music_flac_convert music_ogg ) )
-	music_flac_convert? ( music )
-	music_ogg? ( music )"
-
-DEPEND="
-	app-arch/unzip
-	music_flac_convert? ( media-sound/vorbis-tools )"
-
-src_unpack() {
-	git-r3_src_unpack
-
-	if use music; then
-		tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music"
-	fi
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if use music; then
-		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMUSIC=$(usex music)
-		-DMUSIC_FLAC=$(usex music_flac_convert)
-		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml
deleted file mode 100644
index f19541007ed9..000000000000
--- a/games-strategy/colobot-data/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">colobot/colobot-data</remote-id>
-	</upstream>
-	<use>
-		<flag name="music">Enable music support</flag>
-		<flag name="music_flac_convert">Fetch flac music and convert it to ogg</flag>
-		<flag name="music_ogg">Fetch ogg music</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
deleted file mode 100644
index 24574f7a7939..000000000000
--- a/games-strategy/colobot/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e
-EBUILD colobot-0.1.11.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
-EBUILD colobot-9999.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
-MISC metadata.xml 528 BLAKE2B 55374b7caad73e5a5a2a7ecd705dd8631158642fcd6444417d422b1b433d36f92d741ae3fd097748d0cdd80651834bd63281179aece38a8ab6a92bed6fed968b SHA512 112e65009d79a3cee912908358f763c294d2662cd1c8119506c678a9763940f7c323f99bf1cdb8880aecd7fb6df81be9d1ddfb5802a1a87e4a0edc841217e98f
diff --git a/games-strategy/colobot/colobot-0.1.11.ebuild b/games-strategy/colobot/colobot-0.1.11.ebuild
deleted file mode 100644
index 02e4757ef02e..000000000000
--- a/games-strategy/colobot/colobot-0.1.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
-HOMEPAGE="https://colobot.info/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/colobot/colobot"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="devbuild test tools doc +openal"
-
-DEPEND="
-	dev-games/physfs
-	dev-libs/boost:=
-	media-libs/glew:0
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/libsndfile:=
-	media-libs/libvorbis:=
-	media-libs/sdl2-image
-	media-libs/sdl2-ttf
-	media-sound/vorbis-tools
-	sys-devel/gettext
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEV_BUILD=$(usex devbuild)
-		-DTESTS=$(usex test)
-		-DTOOLS=$(usex tools)
-		-DINSTALL_DOCS=$(usex doc)
-		-DOPENAL_SOUND=$(usex openal)
-		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
-		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon -s 256 desktop/colobot.ico
-}
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
deleted file mode 100644
index 02e4757ef02e..000000000000
--- a/games-strategy/colobot/colobot-9999.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
-HOMEPAGE="https://colobot.info/"
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/colobot/colobot"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="devbuild test tools doc +openal"
-
-DEPEND="
-	dev-games/physfs
-	dev-libs/boost:=
-	media-libs/glew:0
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/libsndfile:=
-	media-libs/libvorbis:=
-	media-libs/sdl2-image
-	media-libs/sdl2-ttf
-	media-sound/vorbis-tools
-	sys-devel/gettext
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEV_BUILD=$(usex devbuild)
-		-DTESTS=$(usex test)
-		-DTOOLS=$(usex tools)
-		-DINSTALL_DOCS=$(usex doc)
-		-DOPENAL_SOUND=$(usex openal)
-		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
-		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon -s 256 desktop/colobot.ico
-}
diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml
deleted file mode 100644
index 3816bd533efb..000000000000
--- a/games-strategy/colobot/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">colobot/colobot</remote-id>
-	</upstream>
-	<use>
-		<flag name="devbuild">TODO</flag>
-		<flag name="tools">Build tools</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-strategy/crimson-0.5.3-r1 b/games-strategy/crimson-0.5.3-r1
new file mode 100644
index 000000000000..b8966b5a1ccf
--- /dev/null
+++ b/games-strategy/crimson-0.5.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib ) dev-libs/libxslt test? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxml2 )
+DESCRIPTION=Tactical war game in the tradition of Battle Isle
+EAPI=6
+HOMEPAGE=http://crimson.seul.org/
+IUSE=test zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-net zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=http://crimson.seul.org/files/crimson-0.5.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=44f49e27fa1305345c0db056d701f072
diff --git a/games-strategy/crimson/Manifest b/games-strategy/crimson/Manifest
deleted file mode 100644
index 5b018af99190..000000000000
--- a/games-strategy/crimson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST crimson-0.5.3.tar.bz2 882366 BLAKE2B 6faece818105d29dd2d141b925b332cfd5214dd918f5c07cacd2f6cdfcd6a58c86e6ab1cc2fce396fbf24839f5dded619e92a786f03663e78068926a8d0e6be3 SHA512 9632317c4b258ed5e501ad1d058706ed654fc621b07099f65d93e29fe92e53fc8f6bbffa13c70fc2129f30695d3f10e85174234dc96cc171631b3465d2b7cffc
-EBUILD crimson-0.5.3-r1.ebuild 939 BLAKE2B edc3f30e9e491dd3fe94acd0ef3bafaa153021dd465ca4b63dd4ec8b0b5ee0c25abde13e47b09326eb10f0c0beaad0f019df2744331f02badadadd78e4e1721a SHA512 fe6a679dc47f6297fec3864f2f2f9f6b4abb0bf7a2a2250a4df6b7994fd99dbf2d3838c6e4844f105732950ea4981cd6743675036be7aed675baa047dc0d1e4c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/crimson/crimson-0.5.3-r1.ebuild b/games-strategy/crimson/crimson-0.5.3-r1.ebuild
deleted file mode 100644
index ad228438eb35..000000000000
--- a/games-strategy/crimson/crimson-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Tactical war game in the tradition of Battle Isle"
-HOMEPAGE="http://crimson.seul.org/"
-SRC_URI="http://crimson.seul.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test zlib"
-
-RDEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-ttf
-	media-libs/sdl-net
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	test? (
-		app-text/docbook-xml-dtd:4.2
-		dev-libs/libxml2
-	)
-"
-
-src_configure() {
-	econf \
-		--enable-sound \
-		--enable-network \
-		$(use_with zlib) \
-		--enable-cfed \
-		--enable-bi2cf \
-		--enable-comet \
-		--enable-cf2bmp
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		pixmapsdir="/usr/share/pixmaps" \
-		install
-	einstalldocs
-	rm -rf "${ED}/usr/share/applications"
-	make_desktop_entry crimson "Crimson Fields"
-}
diff --git a/games-strategy/crimson/metadata.xml b/games-strategy/crimson/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/crimson/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/darwinia-1.4.0_beta9 b/games-strategy/darwinia-1.4.0_beta9
new file mode 100644
index 000000000000..873870d56527
--- /dev/null
+++ b/games-strategy/darwinia-1.4.0_beta9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=the hyped indie game of the year. By the Uplink creators
+EAPI=5
+HOMEPAGE=http://www.darwinia.co.uk/support/linux.html
+IUSE=cdinstall
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Introversion
+PROPERTIES=cdinstall? ( interactive )
+RDEPEND=~virtual/libstdc++-3.3 media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-full-1.4.0b9.sh
+_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_=deadbf88f354f4b99dbc832fc7c54f8a
diff --git a/games-strategy/darwinia-demo-1.3.0-r1 b/games-strategy/darwinia-demo-1.3.0-r1
new file mode 100644
index 000000000000..cd30bab4dc13
--- /dev/null
+++ b/games-strategy/darwinia-demo-1.3.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Darwinia, the hyped indie game of the year. By the Uplink creators
+EAPI=6
+HOMEPAGE=http://www.darwinia.co.uk/downloads/demo_linux.html
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Introversion
+RDEPEND=media-libs/libsdl[abi_x86_32(-)] media-libs/libvorbis[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] ~virtual/libstdc++-3.3 virtual/opengl[abi_x86_32(-)]
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://www.introversion.co.uk/darwinia/downloads/darwinia-demo2-1.3.0.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_=0fb1d6a9143f67db07b1a3bdea726d22
diff --git a/games-strategy/darwinia-demo/Manifest b/games-strategy/darwinia-demo/Manifest
deleted file mode 100644
index ddeecd4498f3..000000000000
--- a/games-strategy/darwinia-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST darwinia-demo2-1.3.0.sh 22470072 BLAKE2B 3169e6de1293eb8e62094e1773dbb871882a5f18d993dd495c27455525c178d02ce21a47425e070da01153eb8d0cdb764f6276da8919d6b0492718701ddf8fb9 SHA512 f561f3e741052888d8a23445f01e0c2a8d2b207b7786b25f297d76d0f4b4ef91bbf7d1ec842e5e2b1051f3f122af12058e2bcb2495478846713e49c2c7d7d92d
-EBUILD darwinia-demo-1.3.0-r1.ebuild 1052 BLAKE2B f645373ccd2f39128d9807cc35553209a7b5e95dd7939f574febd2c303b35766808abe02f1412e1d6b3c5648e445d0a5a80be66003b8a6ff059d8062ea58c6c3 SHA512 656aed9eb59f4a7f372b477d1d344c5e824f5e91c5a7f78f18dae1808ccf74b5722993e31cad597953308a5be815c9cde93ca628fc01a71a5f6140015ada12ee
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild b/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild
deleted file mode 100644
index c49c2f6401b3..000000000000
--- a/games-strategy/darwinia-demo/darwinia-demo-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-DESCRIPTION="Darwinia, the hyped indie game of the year. By the Uplink creators"
-HOMEPAGE="http://www.darwinia.co.uk/downloads/demo_linux.html"
-SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}2-${PV}.sh"
-
-LICENSE="Introversion"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="
-	media-libs/libsdl[abi_x86_32(-)]
-	media-libs/libvorbis[abi_x86_32(-)]
-	virtual/glu[abi_x86_32(-)]
-	~virtual/libstdc++-3.3
-	virtual/opengl[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir="/opt/${PN}"
-
-src_unpack() {
-	unpack_makeself
-}
-
-src_install() {
-	exeinto "${dir}/lib"
-	insinto "${dir}/lib"
-
-	doexe lib/{darwinia.bin.x86,open-www.sh}
-	doins lib/{sounds,main,language}.dat
-
-	insinto "${dir}"
-	dodoc README
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/darwinia
-
-	make_wrapper darwinia-demo ./darwinia "${dir}" "${dir}"
-	newicon darwinian.png ${PN}.png
-	make_desktop_entry darwinia-demo "Darwinia (Demo)"
-}
diff --git a/games-strategy/darwinia-demo/metadata.xml b/games-strategy/darwinia-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/darwinia-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/darwinia/Manifest b/games-strategy/darwinia/Manifest
deleted file mode 100644
index 64b7a5494be5..000000000000
--- a/games-strategy/darwinia/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST darwinia-full-1.4.0b9.sh 4228121 BLAKE2B f1cae61e3ad6802a1e04fc5306bfbb7194ad08df29a82a376dc7f1945ab8f1f99620653800bb2458941f2004488abf441c211bc3f6d7c65e4d3f47cb9155e5f6 SHA512 ed228943d4e70fc5799bbe7566b4fd862f2494f9d02bcd874f0d1b93d7bbc9a2c24a98fb5b8219fed20759bfe2af54d6ea33c60ddd8d8850e591a89822b41bb5
-EBUILD darwinia-1.4.0_beta9.ebuild 1466 BLAKE2B 710ba32f15ec5480f7103d667cca0d21241c486f6355d175706beb017371a7db6efc8ad755f5ef0d213a93bff87251cfbc2bd4b186d6032030d4a823a2b04992 SHA512 095fc06955198e382c49ab81f8e5dec75b736f3c57ce2d30972f40550551f4f82f58f538da8c8b3df8533b038eee1c039a0497b5dc6ebc989107e8258ad5edf1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild b/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
deleted file mode 100644
index 37781bd8245d..000000000000
--- a/games-strategy/darwinia/darwinia-1.4.0_beta9.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CDROM_OPTIONAL="yes"
-inherit eutils unpacker cdrom games
-
-MY_PV=${PV/_beta/b}
-DESCRIPTION="the hyped indie game of the year. By the Uplink creators"
-HOMEPAGE="http://www.darwinia.co.uk/support/linux.html"
-SRC_URI="http://www.introversion.co.uk/darwinia/downloads/${PN}-full-${MY_PV}.sh"
-
-LICENSE="Introversion"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror strip"
-
-RDEPEND="
-	~virtual/libstdc++-3.3
-	media-libs/libsdl[abi_x86_32(-)]
-	media-libs/libvorbis[abi_x86_32(-)]
-	virtual/glu[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/lib/darwinia.bin.x86"
-
-src_unpack() {
-	use cdinstall && cdrom_get_cds gamefiles/main.dat
-	unpack_makeself
-}
-
-src_install() {
-	insinto "${dir}"/lib
-	exeinto "${dir}"/lib
-
-	doins lib/{language,patch}.dat
-	doexe lib/darwinia.bin.x86 lib/open-www.sh
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/darwinia
-
-	if use cdinstall ; then
-		doins "${CDROM_ROOT}"/gamefiles/{main,sounds}.dat
-	fi
-
-	dodoc README
-	newicon darwinian.png darwinia.png
-
-	games_make_wrapper darwinia ./darwinia "${dir}" "${dir}"
-	make_desktop_entry darwinia "Darwinia"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	if ! use cdinstall; then
-		ewarn "To play the game, you need to copy main.dat and sounds.dat"
-		ewarn "from gamefiles/ on the game CD to ${dir}/lib/."
-	fi
-	games_pkg_postinst
-}
diff --git a/games-strategy/darwinia/metadata.xml b/games-strategy/darwinia/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/darwinia/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/defcon-demo-1.60-r1 b/games-strategy/defcon-demo-1.60-r1
new file mode 100644
index 000000000000..00ae24d07863
--- /dev/null
+++ b/games-strategy/defcon-demo-1.60-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Global thermonuclear war simulation with multiplayer support
+EAPI=6
+HOMEPAGE=http://www.introversion.co.uk/defcon/
+IUSE=+system-libs
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=Introversion
+RDEPEND=media-libs/libogg media-libs/libvorbis >=sys-libs/glibc-2.3 x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext system-libs? ( media-libs/libsdl[sound,video] )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=x86? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_i386.deb ) amd64? ( http://www.introversion.co.uk/defcon/downloads/defcon_1.6-1_amd64.deb )
+_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_=39b1c663606f9fc445deb2f5517879a5
diff --git a/games-strategy/defcon-demo/Manifest b/games-strategy/defcon-demo/Manifest
deleted file mode 100644
index 9390dbfad4c6..000000000000
--- a/games-strategy/defcon-demo/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX defcon 400 BLAKE2B 1258e4b6db8262ecd08cf481799a6a296bb7043af3a03a320a10d17ecb4672e990031ef3d2a8e1e2be915fb8f47696fb755fa4502fc194b0cdb3ca590b031857 SHA512 d417fcf9560a3b3a7232e3c86b4315f0de6ed86ce8263348520910ff6bc1d14e649f31d500f52c70c2be655836261219ca9dce4f8df9a32d5ca2b00421667058
-DIST defcon_1.6-1_amd64.deb 62377900 BLAKE2B ad6047a5f57492facf17da50a9d3003181d4352eebaa08e7185a676b3dcfb8a2c3d1001c96c09ae417d482b3a97894032084ede22f841516b9f67ed014861743 SHA512 b71aacc3cd94eec8f1ea19ee03d8098fcdd96191c12d614f55076826ef0bb44c8ada66dfd3df7d94d042b33bdd8fa5f0f58e69fc980d6213c320ab4ce2d682a9
-DIST defcon_1.6-1_i386.deb 62311684 BLAKE2B 3dddd5495410dc875d4ac9ecaea26cbbf2cb258ccdf0ffe0ddb7234009b7986c1ebcb17bdef93a579db8b41eeefaeecea9ebb09bcdb049bee14c0b6af6df26c7 SHA512 0e60e8fbca2f3046228b656990e3adb471de4f64a99d435c96b1e5a8cc49b1250c48ceeb19a4bcb58354e750398de2559256d26a38b20286dec3c0ce7f97ebb8
-EBUILD defcon-demo-1.60-r1.ebuild 2178 BLAKE2B ac3629eede6f8f96dc1dbd2e0f821682b8e73835b9110ce8259cdc38fb212fd5a5712b7755ea6302a9376ae13abd643930313ba45b81885f9bc47339910e9b5e SHA512 76deacb77ad8d5959a750bc74e71cd30d16b70394065879ea34ad7c0eb39204e7326e5efc777928b9544ad68e50534bb76ddcf605c2263b137dfea9c345f7dae
-MISC metadata.xml 390 BLAKE2B a7ff9a2ca8c3de7f31c7acea1ca630c3d0aa39fa108d6bc515c68d2801402051a863a4f1ff260ed56249cf5eef72d0638d86b746293f0b54c85642f4f569b3bb SHA512 afc01361f043a0267f09fc1a83571ade9a3cb3633744ff18e5b5c5f14ac061b5e9d6876c0b3805664a8321a6572bb6c2c3c1f3f0d9f0762d306b80a1b517ea5b
diff --git a/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild b/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
deleted file mode 100644
index 486a654236bb..000000000000
--- a/games-strategy/defcon-demo/defcon-demo-1.60-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs gnome2-utils
-
-MY_PN=defcon
-MY_PV=${PV:0:3}
-MY_PVR=1
-MY_P=defcon_${MY_PV}-${MY_PVR}
-
-DESCRIPTION="Global thermonuclear war simulation with multiplayer support"
-HOMEPAGE="http://www.introversion.co.uk/defcon/"
-SRC_URI="x86? ( http://www.introversion.co.uk/defcon/downloads/${MY_P}_i386.deb )
-	amd64? ( http://www.introversion.co.uk/defcon/downloads/${MY_P}_amd64.deb )"
-
-LICENSE="Introversion"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+system-libs"
-RESTRICT="mirror strip"
-
-# glibc discussion:
-# http://forums.introversion.co.uk/defcon/viewtopic.php?t=4016
-RDEPEND="
-	media-libs/libogg
-	media-libs/libvorbis
-	>=sys-libs/glibc-2.3
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	system-libs? ( media-libs/libsdl[sound,video] )"
-DEPEND=""
-
-QA_PREBUILT="/opt/${PN}/lib/${MY_PN}.bin.x86"
-
-S="${WORKDIR}/usr/local/games/${MY_PN}"
-
-src_unpack() {
-	default
-	unpack ./data.tar.gz
-
-	cd "${S}" || die
-	# maintain compatibility with old installation/script
-	[[ -e lib64 ]] && { mv lib64 lib || die ;}
-	[[ -e ${MY_PN}.bin.x86_64 ]] && { mv ${MY_PN}.bin.x86_64 ${MY_PN}.bin.x86 || die ;}
-}
-
-src_prepare() {
-	default
-
-	# FindPath scripts are ugly and unnecessary
-	if use system-libs ; then
-		rm -f lib/lib*
-	fi
-	sed \
-		-e "s:GAMEDIR:/opt/${PN}:g" \
-		"${FILESDIR}"/${MY_PN} > "${T}"/${MY_PN} || die
-	echo "int chdir(const char *d) { return 0; }" > chdir.c || die
-}
-
-src_compile() {
-	echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c"
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -fPIC -shared -o lib/chdir.so chdir.c || die
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}/lib"
-	doins *.dat
-
-	exeinto "${dir}"/lib
-	doexe lib/*.so
-	doexe ${MY_PN}.bin.x86
-
-	doicon -s 128 ${MY_PN}.png
-
-	# Can be upgraded to full version, so is not installed as "demo"
-	dobin "${T}"/${MY_PN}
-	make_desktop_entry ${MY_PN} "Defcon"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	elog "Screenshots will appear in ~/.${MY_PN}/lib"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/defcon-demo/files/defcon b/games-strategy/defcon-demo/files/defcon
deleted file mode 100644
index 6e9dd3b5307c..000000000000
--- a/games-strategy/defcon-demo/files/defcon
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-if [ -n "GAMEDIR/lib" ] ; then
-	if [ "${LD_LIBRARY_PATH+set}" = "set" ] ; then
-		export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:GAMEDIR/lib"
-	else
-		export LD_LIBRARY_PATH="GAMEDIR/lib"
-	fi
-fi
-if [[ ! -e ~/.defcon/lib ]] ; then
-	mkdir -p ~/.defcon/lib \
-	    && cd ~/.defcon/lib \
-	    && ln -s "GAMEDIR"/lib/* .
-fi
-cd ~/.defcon/lib
-LD_PRELOAD="GAMEDIR/lib/chdir.so" exec ./defcon.bin.x86 "$@"
diff --git a/games-strategy/defcon-demo/metadata.xml b/games-strategy/defcon-demo/metadata.xml
deleted file mode 100644
index 6e48df8a7f4f..000000000000
--- a/games-strategy/defcon-demo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="system-libs">Use system libraries instead of the ones included in the upstream distribution.</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-strategy/dominions2-2.16 b/games-strategy/dominions2-2.16
new file mode 100644
index 000000000000..90e8a27fe26e
--- /dev/null
+++ b/games-strategy/dominions2-2.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Dominions 2: The Ascension Wars is an epic turn-based fantasy strategy game
+EAPI=5
+HOMEPAGE=http://www.illwinter.com/dom2/index.html
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RDEPEND=|| ( ppc? ( media-libs/libsdl virtual/opengl virtual/glu ) !ppc? ( media-libs/libsdl[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] virtual/glu[abi_x86_32(-)] ) ) games-misc/games-envd
+RESTRICT=bindist strip
+SLOT=0
+SRC_URI=x86? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) amd64? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_x86.tgz ) ppc? ( http://www.shrapnelgames.com/downloads/dompatch216_linux_ppc.tgz ) doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf http://www.shrapnelgames.com/downloads/manual_addenda.pdf ) mirror://gentoo/dominions2.png
+_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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=adcb6d0af6e0d8ad73a0e105f203a923
diff --git a/games-strategy/dominions2/Manifest b/games-strategy/dominions2/Manifest
deleted file mode 100644
index a67fa6e3e648..000000000000
--- a/games-strategy/dominions2/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST DOM2_Walkthrough.pdf 549897 BLAKE2B e61df06eae7bf392c4d3f2871d5a6473bba43fc6169617fc56aedd890131a14b2135295fc908bceb9406bb98bfff701d59958776ec0653508ec22e2f57f9ea88 SHA512 cc73bd7e95d8ce1528196f00d91d88a018b88471edade76672feb53b6ff728c9cc5f02e333312533a72842186833669ec290abffa8f51feb15e224b455987b39
-DIST dominions2.png 1135 BLAKE2B 4bfbe3fcdded6eec7a3eea6c9b3dc8b2ae9be2a9f932957d29fedce61cc78f57ae67945903e7d0d5788c37ad76fe053f41c182ef0d0ba38002442e5b99367429 SHA512 1241c64a4acdd4740cc9440ba286b595c2e00a41182c014ef06b7184c3991f2df44e4677f3408b28cd25f928337a60c1e2859486c057ee3bdd393fb99b8d347f
-DIST dompatch216_linux_ppc.tgz 1982323 BLAKE2B 2d56f278fcf188a8e8aa32032872359fa57204d26a37e3b5369367e8297d1f6fb1adc290328ea052be57928efd6c42642294bb62f5b3d209f9028da5c3293bb1 SHA512 6b1ff8b5a041c42193b8f369ee0ff242048fd589ffd9b610628a7bf7a0d159fe6e590b04b914ecbf3b94ef2b94a66a062be84d595777127d8f11311fa92c3ae9
-DIST dompatch216_linux_x86.tgz 1892714 BLAKE2B 72102240b577f696a96ee4ee493180621b5ca65c2fb1394e355210aa3e3ae145e9d8501dff95ffd185344b4259d6df622844504022d9f3475564a6eafc890367 SHA512 9bb2a024235585181f91d8414c07ce8c490fed5ddab9d25817b7ea01618f0f2cf8714fb39a4406abe88e25b354f14ba1ef2db79c39d4c30b4e399d1b60477c2d
-DIST manual_addenda.pdf 192454 BLAKE2B c0fe48855fa8f20cf44c4de3b475494cfa75ba17737f6eab2d537d63fdb7346194a59d3280ad29de1bff1283f3a496a36a8c946841f608a36facb4bbb1719f8b SHA512 ec582e9685edf7164ba8e7c6c99880b30c8a6737d2d339eec2642196abd175857bfef2e1ea3da3ccb0110d441c477c8fad64d47fbb8b1aa39b405484eb548443
-EBUILD dominions2-2.16.ebuild 2650 BLAKE2B a74ba0e758187643a3c69a02825e4adb2c97ae2def4e4f9ceda4a4e71d28a013c40be1881f00e21839fe40568f426db0e9ba9fab89f4051ab110e9b81cef3e01 SHA512 3350412fb2f8679d591441320e6139fd83bde6e74e6ee0ee7c76a6f720b67c30ba59ee85b8bebdb6af7e6c22c53ab71a29eff8461c08f884d150412c08ff6e01
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/dominions2/dominions2-2.16.ebuild b/games-strategy/dominions2/dominions2-2.16.ebuild
deleted file mode 100644
index eca8acd9d25d..000000000000
--- a/games-strategy/dominions2/dominions2-2.16.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cdrom games
-
-DESCRIPTION="Dominions 2: The Ascension Wars is an epic turn-based fantasy strategy game"
-HOMEPAGE="http://www.illwinter.com/dom2/index.html"
-SRC_URI="x86? (
-		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_x86.tgz )
-	amd64? (
-		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_x86.tgz )
-	ppc? (
-		http://www.shrapnelgames.com/downloads/dompatch${PV/\./}_linux_ppc.tgz )
-	doc? ( http://www.shrapnelgames.com/downloads/DOM2_Walkthrough.pdf
-		http://www.shrapnelgames.com/downloads/manual_addenda.pdf )
-	mirror://gentoo/${PN}.png"
-
-# I am not sure what license applies to Dominions II and I couldn't find
-# further information on their homepage or on the game CD :(
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-RESTRICT="bindist strip"
-
-RDEPEND="
-	|| (
-		ppc? (
-			media-libs/libsdl
-			virtual/opengl
-			virtual/glu
-		)
-		!ppc? (
-			media-libs/libsdl[abi_x86_32(-)]
-			virtual/opengl[abi_x86_32(-)]
-			virtual/glu[abi_x86_32(-)]
-		)
-	)"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	mkdir -p "${S}"/patch || die
-	cd "${S}"/patch || die
-	if use x86 || use amd64 ; then
-		unpack dompatch${PV/\./}_linux_x86.tgz
-	elif use ppc ; then
-		unpack dompatch${PV/\./}_linux_ppc.tgz
-	fi
-}
-
-src_install() {
-	cdrom_get_cds dom2icon.ico
-	einfo "Copying files to harddisk... this may take a while..."
-
-	exeinto "${dir}"
-	if use amd64 || use x86 ; then
-		doexe "${CDROM_ROOT}"/bin_lin/x86/dom2*
-	elif use ppc ; then
-		doexe "${CDROM_ROOT}"/bin_lin/ppc/dom2*
-	fi
-	insinto "${dir}"
-	doins -r "${CDROM_ROOT}"/dominions2.app/Contents/Resources/*
-	dodoc "${CDROM_ROOT}"/doc/*
-
-	# applying the official patches just means overwriting some important
-	# files with their more recent versions:
-	einfo "Applying patch for version ${PV}..."
-	dodoc "${S}"/patch/doc/*
-	doexe "${S}"/patch/dom2
-	rm -rf "${S}"/patch/doc/ "${S}"/patch/dom2 || die
-	doins -r "${S}"/patch/*
-
-	if use doc; then
-		elog ""
-		elog "Installing extra documentation to '/usr/share/doc/${P}'"
-		elog ""
-		elog "You may want to study 'DOM2_Walkthrough.pdf' carefully if"
-		elog "you are new to Dominions II."
-		elog ""
-		dodoc "${DISTDIR}"/{DOM2_Walkthrough,manual_addenda}.pdf
-	fi
-
-	doicon "${DISTDIR}"/${PN}.png
-
-	# update times
-	find "${D}" -exec touch '{}' \;
-
-	games_make_wrapper dominions2 ./dom2 "${dir}" "${dir}"
-	make_desktop_entry dominions2 "Dominions II" dominions2
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the game run:"
-	elog " dominions2"
-	echo
-}
diff --git a/games-strategy/dominions2/metadata.xml b/games-strategy/dominions2/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/dominions2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/dopewars-1.5.12-r3 b/games-strategy/dopewars-1.5.12-r3
new file mode 100644
index 000000000000..496d1e56b3ff
--- /dev/null
+++ b/games-strategy/dopewars-1.5.12-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=Re-Write of the game Drug Wars
+EAPI=6
+HOMEPAGE=http://dopewars.sourceforge.net/
+IUSE=nls ncurses gtk gnome sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=ncurses? ( >=sys-libs/ncurses-5.2:0= ) gtk? ( x11-libs/gtk+:2 ) dev-libs/glib:2 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer )
+SLOT=0
+SRC_URI=mirror://sourceforge/dopewars/dopewars-1.5.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=d48af901b202d3bfd667757f70352d6a
diff --git a/games-strategy/dopewars/Manifest b/games-strategy/dopewars/Manifest
deleted file mode 100644
index c469820a201b..000000000000
--- a/games-strategy/dopewars/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX dopewars-1.5.12-CVE-2009-3591.patch 696 BLAKE2B a627b4b714af717942f310411154a069b5ee9a9e98454f325e085354bf1d534528048404cf8c0f78150d5f6af9ca1f8e9aac2d95c90d864e3bea5de51546086d SHA512 3f9476db27f1de31363470688f8a5ec97fa51fda4eb6025da513a1ad1640e5faa802ee7202e0698970eb3bbcb0edadfd304d839f2a3643a64d50e7354c8a049e
-DIST dopewars-1.5.12.tar.gz 1419725 BLAKE2B 930a0406bbf36f874d3bb00c7883c7d47136022e0209ec3993302cd75979d9f80033c973e23d60c4db70a335bfd3b8ff99075af470cb382ded59fc9289ee0edc SHA512 cfabaf9326c847aed6210a852ace64c697df5845a66b3179b8dc8dea7b99a11e1f91358d4ee54929a56c70d5f3a76f9f7bb4079fdef765601f165b4cd06cba5a
-EBUILD dopewars-1.5.12-r3.ebuild 1403 BLAKE2B a213900d842e325726df7df70fc7f54b959c15fde83349bd342e9c6cedf441f168eaeb19b02e60cb4cd38729bdae8c7c8e8a2462558c125e98ca1a642e666cd1 SHA512 6892d2e0feb45c180e9430e2718571cfb01c2caa9274c9f1b7f8de1355f8745988aea987604770ec960c523d91141a8c0398beab66eba9f47d08f07c68ef4eb9
-MISC metadata.xml 331 BLAKE2B af8487e0de1082dcc36415bf1216b7fcfdf35a3caf93fe3e5a0f40de32978b442eac43dfc7283a82a5403e5abfc73ff2b48ee6fce3b489a6fbc88529c4db28ab SHA512 26259f05b18c933c638d693805a106d26288c96ba220a719d8ec12d65b28c9abdb1d120694d31c07194282081e92dd83522e936771ab71e2ce86ea12d629d5b4
diff --git a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild b/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
deleted file mode 100644
index 4d1c38437619..000000000000
--- a/games-strategy/dopewars/dopewars-1.5.12-r3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Re-Write of the game Drug Wars"
-HOMEPAGE="http://dopewars.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dopewars/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls ncurses gtk gnome sdl"
-
-RDEPEND="
-	ncurses? ( >=sys-libs/ncurses-5.2:0= )
-	gtk? ( x11-libs/gtk+:2 )
-	dev-libs/glib:2
-	nls? ( virtual/libintl )
-	sdl? (
-		media-libs/libsdl
-		media-libs/sdl-mixer
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${P}-CVE-2009-3591.patch
-	sed -i \
-		-e "/priv_hiscore/ s:DPDATADIR:\"/var/lib\":" \
-		-e "/\/doc\// s:DPDATADIR:\"/usr/share\":" \
-		-e 's:index.html:html/index.html:' \
-		src/dopewars.c || die
-}
-
-src_configure() {
-	local myservconf
-
-	if ! use gtk ; then
-		myservconf="--disable-gui-client --disable-gui-server --disable-glibtest --disable-gtktest"
-	fi
-
-	econf \
-		$(use_enable ncurses curses-client) \
-		$(use_enable nls) \
-		$(use_with sdl) \
-		--without-esd \
-		--enable-networking \
-		--enable-plugins \
-		${myservconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	rm -r "${ED}"/usr/share/gnome || die
-	rm -rf "${ED}"/usr/share/doc
-	make_desktop_entry "${PN}" "Dopewars" /usr/share/pixmaps/dopewars-weed.png
-	HTML_DOCS="doc/*html" einstalldocs
-}
diff --git a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch b/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
deleted file mode 100644
index 3b8b066a81cd..000000000000
--- a/games-strategy/dopewars/files/dopewars-1.5.12-CVE-2009-3591.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Patch for CVE-2009-3591 -- bug 288295.
-
-Fetched from upstream SVN:
-http://dopewars.svn.sourceforge.net/viewvc/dopewars/dopewars/trunk/src/serverside.c?r1=1033&r2=1032&pathrev=1033
-
---- trunk/src/serverside.c	2009/03/10 07:18:49	1032
-+++ trunk/src/serverside.c	2009/10/05 04:11:32	1033
-@@ -504,6 +504,12 @@
-     break;
-   case C_REQUESTJET:
-     i = atoi(Data);
-+    /* Make sure value is within range */
-+    if (i < 0 || i >= NumLocation) {
-+      dopelog(3, LF_SERVER, _("%s: DENIED jet to invalid location %s"),
-+              GetPlayerName(Play), Data);
-+      break;
-+    }
-     if (Play->EventNum == E_FIGHT || Play->EventNum == E_FIGHTASK) {
-       if (CanRunHere(Play)) {
-         break;
diff --git a/games-strategy/dopewars/metadata.xml b/games-strategy/dopewars/metadata.xml
deleted file mode 100644
index 17b7414b8c0f..000000000000
--- a/games-strategy/dopewars/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">dopewars</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/dunelegacy-0.96.3 b/games-strategy/dunelegacy-0.96.3
new file mode 100644
index 000000000000..d9bc7c1e4b34
--- /dev/null
+++ b/games-strategy/dunelegacy-0.96.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=media-libs/libsdl[X,alsa?,sound,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Updated clone of Westood Studios' Dune2
+EAPI=5
+HOMEPAGE=http://dunelegacy.sourceforge.net
+IUSE=+alsa pulseaudio
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl[X,alsa?,sound,pulseaudio?,video] media-libs/sdl-mixer[midi,mp3,vorbis] games-misc/games-envd
+REQUIRED_USE=|| ( alsa pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/dunelegacy/dunelegacy-0.96.3-src.tar.bz2 https://dev.gentoo.org/~hasufell/distfiles/dunelegacy-0.96.3-no-autoreconf.patch.xz
+_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_=19515a5a8f1045d08f0353d10060a41f
diff --git a/games-strategy/dunelegacy/Manifest b/games-strategy/dunelegacy/Manifest
deleted file mode 100644
index 1f0946fbc919..000000000000
--- a/games-strategy/dunelegacy/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX dunelegacy-0.96.3-build.patch 1942 BLAKE2B 8a230ae20884b11b4608437c03466a856b66e49136574ee5c55c5e90de34efbbb0bab7ed4fe90e2653b44fa1f5adb94d002e7d51912732d22bc5e891e593515c SHA512 fa3ffaa26ba1d85bc65d646347ef9c725bfb4f8b7e78c3ca13429356def201bb255d31c6ec684ca99dd0928bf9a3b83af547a7cb865ba1c2475ce03401fa91bb
-DIST dunelegacy-0.96.3-no-autoreconf.patch.xz 8908 BLAKE2B eb1c0a5a155851e199ad2c1f0cbd8f7c583ac148f92e1b2829607c0960bf09a6d8bea8e34749df726f394b3cf796f0c457086d993ace2b3336ce99ed36fb77e1 SHA512 fc17c771a19611057b2990b76eda0eea08e011dcac455bdf7e26bba1f2e2aa6cec120f2dcbce488a2318553f9e58b4a2b5ea24c7e1e27ada9ec5740f2b66ca4c
-DIST dunelegacy-0.96.3-src.tar.bz2 1652302 BLAKE2B 4502300f1364027f1734a0738a648a9ac473a142e8091d08f5c44996fa41a26e91ab030f90d3f961b95b44e7e2bcb72a376915dc014aafee5e3d0dc4f6c8915b SHA512 c84281b44bdac4eec360d90e2f23aa75468cf08c6edd6a5002c539e609312fd39e3284518ef5498201f2b0433d11cf2478cd13a2159af7c6bbef326e680fa241
-EBUILD dunelegacy-0.96.3.ebuild 1392 BLAKE2B 38f15a59aa1cbded27c61a6f5250e494228c2c1591cebe3abfaab5b27ea024d92ed6d9f7b5c0f0f82e71af305a4455cb99cbf35a6b60fa8538b74f81d77e5e32 SHA512 29ec490705192497ca8e4d27a491d70afb56af253e3e73f230a37255dc0f263de3e3acf75b3836931ae96da73f0fa3e061a9d545c6fa9d6851abc0563cbfc240
-MISC metadata.xml 1103 BLAKE2B 0c07587dff0530955a552cf5dee9835ab0c8b3478e994c0b75524ceb6914a4714e02ad13ab52fba10b401a98a068aae9990ea936333014e8c7226c07aef8983c SHA512 de8920f2cb074e969cb3b8310bf2fb111c52c90a2675833fdefc895cafac79091cee0696b52a40065cd81289d80796cb0b0e40bd8db0e349ba92ec180091edcb
diff --git a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild b/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
deleted file mode 100644
index ee94d40caa60..000000000000
--- a/games-strategy/dunelegacy/dunelegacy-0.96.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# do not use autotools related stuff in stable ebuilds
-# unless you like random breakage: 469796, 469798, 424041
-
-EAPI=5
-inherit eutils gnome2-utils games # STABLE ARCH
-#inherit autotools eutils gnome2-utils games # UNSTABLE ARCH
-
-DESCRIPTION="Updated clone of Westood Studios' Dune2"
-HOMEPAGE="http://dunelegacy.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~hasufell/distfiles/${P}-no-autoreconf.patch.xz" # STABLE ARCH
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+alsa pulseaudio"
-
-RDEPEND="media-libs/libsdl[X,alsa?,sound,pulseaudio?,video]
-	media-libs/sdl-mixer[midi,mp3,vorbis]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# exits on start without libsdl[alsa] or libsdl[pulseaudio]
-REQUIRED_USE="|| ( alsa pulseaudio )"
-
-src_prepare() {
-	epatch "${DISTDIR}"/${P}-no-autoreconf.patch.xz # STABLE ARCH
-#	epatch "${FILESDIR}"/${P}-build.patch # UNSTABLE ARCH
-#	eautoreconf # UNSTABLE ARCH
-}
-
-src_install() {
-	default
-
-	doicon -s scalable ${PN}.svg
-	doicon -s 48 ${PN}.png
-	make_desktop_entry ${PN} "Dune Legacy"
-
-	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-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch b/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
deleted file mode 100644
index 93dd907738bc..000000000000
--- a/games-strategy/dunelegacy/files/dunelegacy-0.96.3-build.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Aug 9 18:57:40 2012 +0200
-
-    respect flags
-    use pkg-config
-    use LDADD instead of LDFLAGS for libs
-
---- configure.ac
-+++ configure.ac
-@@ -16,14 +16,6 @@
- 
- AC_SUBST(dunelegacydatadir)
- 
--dnl Some flags for gcc
--CXXFLAGS="-O3 -pipe -pedantic -Wall -Wextra -Wno-unused-parameter -DNDEBUG"
--dnl Additional flags: -Wconversion -Wno-sign-conversion
--
--dnl Some flags for clang
--dnl CXXFLAGS="-O3 -pipe -pedantic -Weverything -Wno-sign-conversion -Wno-conversion -Wno-shadow -Wno-missing-noreturn -Wno-padded -Wno-packed -Wno-weak-vtables -Wno-c++11-narrowing -Wno-cast-align -Wno-unreachable-code -Wno-missing-prototypes -Wno-float-equal -Wno-global-constructors -Wno-exit-time-destructors -Wno-format-nonliteral -Wno-unused-macros -Wextra -Wno-unused-parameter"
--
--
- dnl test for -ffp-contract=off (gcc >= 4.6) and use -mno-fused-madd instead
- oldCFLAGS="$CFLAGS"
- CFLAGS="-ffp-contract=off"
-@@ -33,34 +25,14 @@
- )
- CFLAGS="$oldCFLAGS"
- 
--case "$target_cpu" in
--i*86) CXXFLAGS="$CXXFLAGS -mfpmath=sse -msse";;
--esac
--
--AC_ARG_ENABLE([debug],
--            [AS_HELP_STRING([--enable-debug],
--              [compile with debug information @<:@default=disabled@:>@])],
--            [],
--            [])
--
--if test "$enable_debug" = "yes" ; then
--	CXXFLAGS="$CXXFLAGS -g"
--fi
- 
- dnl Check for SDL library
- SDL_VERSION=1.2.0
--AM_PATH_SDL($SDL_VERSION, : , AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
-+PKG_CHECK_MODULES([SDL], [sdl >= $SDL_VERSION SDL_mixer])
- CFLAGS="$CFLAGS $SDL_CFLAGS"
- CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
- LIBS="$LIBS $SDL_LIBS"
- 
--dnl Check for SDL_mixer library.
--AC_CHECK_LIB(SDL_mixer, 
--       Mix_OpenAudio, 
--       LIBS="$LIBS -lSDL_mixer", 
--       AC_MSG_ERROR([*** SDL_mixer library not found!]) 
--)
--
- dnl enet defines
- AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)])
- AC_CHECK_FUNC(gethostbyname_r, [AC_DEFINE(HAS_GETHOSTBYNAME_R)])
diff --git a/games-strategy/dunelegacy/metadata.xml b/games-strategy/dunelegacy/metadata.xml
deleted file mode 100644
index 4dc56b2c71f1..000000000000
--- a/games-strategy/dunelegacy/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://sourceforge.net/apps/mediawiki/dunelegacy/index.php?title=Development/Reporting_Bugs</bugs-to>
-		<remote-id type="sourceforge">dunelegacy</remote-id>
-	</upstream>
-	<longdescription lang="en">
-		Dune Legacy is an effort by a handful of developers to revitalize
-		the first-ever real-time strategy game. The original game was the
-		basis for the hugely successful Command and Conquer series, and the
-		gameplay has been replicated an extended to a wide variety of
-		storylines and series.
-
-		Lead one of three interplanetary houses, Atreides, Harkonnen or
-		Ordos, in an attempt to harvest the largest amount of spice from
-		the sand dunes. Exchange your spice stockpiles for credits through
-		refinement and build an army capable of thwarting attempts of the
-		other houses to stop your harvesting! 
-	</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/endless-sky-0.9.6 b/games-strategy/endless-sky-0.9.6
new file mode 100644
index 000000000000..b2f7ebc80b82
--- /dev/null
+++ b/games-strategy/endless-sky-0.9.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND=media-libs/glew:0 media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7]
+DESCRIPTION=Space exploration, trading & combat in the tradition of Terminal Velocity
+EAPI=6
+HOMEPAGE=https://endless-sky.github.io
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain
+RDEPEND=media-libs/glew:0 media-libs/libsdl2 media-libs/libjpeg-turbo media-libs/libpng:= media-libs/openal virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.6.tar.gz -> endless-sky-0.9.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9cbc46f41e551853f1f792f26da8c1a5
diff --git a/games-strategy/endless-sky/Manifest b/games-strategy/endless-sky/Manifest
deleted file mode 100644
index faeaa83d39e0..000000000000
--- a/games-strategy/endless-sky/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST endless-sky-0.9.6.tar.gz 71119557 BLAKE2B cf4fa6575a701396083815abd55071563f85973dc354b52509dc2fb0f7c803d7c6b44e6ace881bb6103063273f358b525c958e10a3c4ca3ceb3d6f849dd745f9 SHA512 e8dbae856153246f68a3c7ba68fd33a15cf60908f65003f614269df6909ed8d7ad848b4add4ee071b295f58be92c532e6579982d3c20b83d9203b74077f90bae
-EBUILD endless-sky-0.9.6.ebuild 1309 BLAKE2B fbc02bb94f10c278c2fedef310782c70490fe6b5d88da554e7cec5b2fb275ecd34b47738e00325db48ee3ea05df564a087a17b17e7b4b1b883d1ca255b221c6b SHA512 4f3f4763d0c9160043f04a9486c921d9c7eada3258a4da07a61445bcb8c171ce746f9c03881149236e70e66aa96f10f113e1b884a34ae230f75cbf896c1e4e12
-MISC metadata.xml 737 BLAKE2B 0936e186a61932b265cd78766420c6affa33c70415d3a0f5e5089d4813e09b652dbfa5e31fab57e0f44deb04590a7667fa4909b194e389facc9e13f51da0b3ff SHA512 498915ae234ea096b061b14057c2103b6cff7b1fbf0ee1d5076c7b2657a1289fd0d9ab5514e5d459b14dfb23ba967c07a4c052c9854b748fcb45ed6e1c1143c3
diff --git a/games-strategy/endless-sky/endless-sky-0.9.6.ebuild b/games-strategy/endless-sky/endless-sky-0.9.6.ebuild
deleted file mode 100644
index e01d717396f9..000000000000
--- a/games-strategy/endless-sky/endless-sky-0.9.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils scons-utils
-
-DESCRIPTION="Space exploration, trading & combat in the tradition of Terminal Velocity"
-HOMEPAGE="https://endless-sky.github.io"
-SRC_URI="https://github.com/endless-sky/endless-sky/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-SA-4.0 CC-BY-SA-3.0 GPL-3+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="media-libs/glew:0
-	media-libs/libsdl2
-	media-libs/libjpeg-turbo
-	media-libs/libpng:=
-	media-libs/openal
-	virtual/opengl"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i 's/\(.*flags += \["\)-O3\("\]\)/\1\2/g' SConstruct || die
-	sed -i 's#env.Install("$DESTDIR$PREFIX/games", sky)#env.Install("$DESTDIR$PREFIX/bin", sky)#g' SConstruct || die
-	eapply_user
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	escons PREFIX="${D}/usr/" install
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
-
-pkg_postinst() {
-	einfo "Endless Sky provides high-res sprites for high-dpi screens."
-	einfo "If you want to use them, download"
-	einfo
-	einfo "   https://github.com/endless-sky/endless-sky-high-dpi/releases"
-	einfo
-	einfo "and extract it to ~/.local/share/endless-sky/plugins/."
-	einfo
-	einfo "   Enjoy."
-}
diff --git a/games-strategy/endless-sky/metadata.xml b/games-strategy/endless-sky/metadata.xml
deleted file mode 100644
index 5754bfb7b195..000000000000
--- a/games-strategy/endless-sky/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games</name>
-	</maintainer>
-	<longdescription lang="en">
-		Explore other star systems. Earn money by trading, carrying passengers, or completing missions. Use your earnings to buy a better ship or to upgrade the weapons and engines on your current one. Blow up pirates. Take sides in a civil war. Or leave human space behind and hope to find some friendly aliens whose culture is more civilized than your own...
-	</longdescription>
-	<upstream>
-		<remote-id type="github">endless-sky/endless-sky</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/freeciv-2.5.11 b/games-strategy/freeciv-2.5.11
new file mode 100644
index 000000000000..8a38997b0890
--- /dev/null
+++ b/games-strategy/freeciv-2.5.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 ) virtual/pkgconfig !dedicated? ( x11-base/xorg-proto nls? ( sys-devel/gettext ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=multiplayer strategy game (Civilization Clone)
+EAPI=6
+HOMEPAGE=http://www.freeciv.org/
+IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[png] media-libs/sdl-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.2 )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeciv/freeciv-2.5.11.tar.bz2
+_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_=9742b3b8877d0c8836c8bcf4b1d9dce4
diff --git a/games-strategy/freeciv-2.6.0_beta3 b/games-strategy/freeciv-2.6.0_beta3
new file mode 100644
index 000000000000..6c54dcca3bbc
--- /dev/null
+++ b/games-strategy/freeciv-2.6.0_beta3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.3 ) virtual/pkgconfig !dedicated? ( x11-base/xorg-proto nls? ( sys-devel/gettext ) ) >=sys-apps/sed-4
+DESCRIPTION=multiplayer strategy game (Civilization Clone)
+EAPI=6
+HOMEPAGE=http://www.freeciv.org/
+IUSE=auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2 app-arch/xz-utils net-misc/curl sys-libs/zlib auth? ( mysql? ( virtual/mysql ) sqlite? ( dev-db/sqlite:3 ) !mysql? ( ( !sqlite? ( virtual/mysql ) ) ) ) readline? ( sys-libs/readline:0= ) dedicated? ( aimodules? ( dev-libs/libltdl:0 ) ) !dedicated? ( media-libs/libpng:0 gtk? ( x11-libs/gtk+:2 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( sys-devel/libtool:2 ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) !sdl? ( !gtk? ( x11-libs/gtk+:2 ) ) ) system-lua? ( >=dev-lang/lua-5.3 )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeciv/freeciv-2.6.0-beta3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c64af87fd31ad1da601732a61c93c59d
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
deleted file mode 100644
index 386f97068f47..000000000000
--- a/games-strategy/freeciv/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX freeciv-2.5.11-freetype_pkgconfig.patch 7770 BLAKE2B 89ee785b4db49eebd2a17d24622728933f9a90c813ea7c5c448efc150d6c9fd1f51ade375e549a45190db08efedeca93ec3c287cff54cf3f7b842a9cd84a14ba SHA512 6aac048569b8b42768832292162dbafceb69b93f6f6419c24e6dedd3a60aee9e059624dbfbf843cea19b1a97370c7e8178ff5a10f199f94665dbabe75e3e81b1
-DIST freeciv-2.5.11.tar.bz2 40940090 BLAKE2B dfc1e714e1a3122335f555c2e57352726bda60dc0d1700b0d8ae937c85cba6beb0b2a6ffa6266b77437934ed85f1740f319c379a10c217161ee147f2339a50d3 SHA512 f5eac2fc2b7e09b9fd3b8b45145a5359f8216aef49050c692893d30584000c7db2f2a6e66ac19e67186e2653efaa0aa7656abefe2d2de25d123e9a52ce604456
-DIST freeciv-2.6.0-beta3.tar.bz2 51761039 BLAKE2B a01e1df80eaa7ab76416190d8c32941e443481b6f7460155f3180548919270bec5bf6efde698931c44d427e17c6347299c0674ed2fc59b5b3c6a8ee5b97c9cf0 SHA512 c8a49ab77d799a65d181632a565d92cd0f9c2cd9fbaa5ce963eddc9abca29ccb9567bc3f731ad80b3f3593dd807c3d702abbe378824e3adef655edb8100711f5
-EBUILD freeciv-2.5.11.ebuild 4569 BLAKE2B 06624aac60d9b6a6ce354f73d22513b429879b15f58d83990abacdb43cece5feff525cd8feaa853867bb0c8038d42b6e00c807c22d998eadd45d455344a63cec SHA512 50ea3f5c7851449554e42485e9b3e45c1483328d9b90c44ee23679a36ba10f7cd2fa84cfc041c2c4aaf9b03f66e53e53dd83d0e89719a3afbd91e221dd369ce3
-EBUILD freeciv-2.6.0_beta3.ebuild 4645 BLAKE2B c9bd80c89361bf855487e92303476fe1d450314baeb860571408a71d87e23c6fde27f6e856da8baccce2f1655007e890a69150e9bf8a227af554004660726648 SHA512 205479dc6f9cc89254e1c1bd80578549a2817d4a3b89b1139469fd5412c81468d8750ce2bd11d43d2bfdbda132d722c2dd49b4b2f2793ff2d17756c31ef2ff53
-MISC metadata.xml 1031 BLAKE2B 1421e4d2e504fbddc337b16cf2dc51af61957e954dc7c1752f537fd90ff1e3869b82c44635887dcd237eac274a5ca8b0d8c2b1cf92dd348a3301c804dd64142d SHA512 cbf6f0e418650f16f4b517895e6e03a9ffb3bdcd66563fab4ec067e6d4df79a1fb13d0cb9b7b314ad274839b430176405a3760e06a7d1f603f3464d1ff2bb201
diff --git a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch b/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
deleted file mode 100644
index b41411c8a164..000000000000
--- a/games-strategy/freeciv/files/freeciv-2.5.11-freetype_pkgconfig.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-From fe3eaf658c256a1ee1aac645c004625e9f345421 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 16 May 2018 20:41:22 +0200
-Subject: [PATCH] Use pkg-config to find freetype
-
-As of freetype-2.9.1 the freetype-config script no longer gets installed
-by default.
----
- m4/freetype2.m4  | 194 -----------------------------------------------
- m4/sdl-client.m4 |   2 +-
- 2 files changed, 1 insertion(+), 195 deletions(-)
- delete mode 100644 m4/freetype2.m4
-
-diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
-deleted file mode 100644
-index 3d0ecb3554..0000000000
---- a/m4/freetype2.m4
-+++ /dev/null
-@@ -1,194 +0,0 @@
--# Configure paths for FreeType2
--# Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor
--#
--# Copyright 2001, 2003, 2007, 2009 by
--# David Turner, Robert Wilhelm, and Werner Lemberg.
--#
--# This file is part of the FreeType project, and may only be used, modified,
--# and distributed under the terms of the FreeType project license,
--# LICENSE.TXT.  By continuing to use, modify, or distribute this file you
--# indicate that you have read the license and understand and accept it
--# fully.
--#
--# As a special exception to the FreeType project license, this file may be
--# distributed as part of a program that contains a configuration script
--# generated by Autoconf, under the same distribution terms as the rest of
--# that program.
--#
--# serial 3
--
--# AC_CHECK_FT2([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
--# Test for FreeType 2, and define FT2_CFLAGS and FT2_LIBS.
--# MINIMUM-VERSION is what libtool reports; the default is `7.0.1' (this is
--# FreeType 2.0.4).
--#
--AC_DEFUN([AC_CHECK_FT2],
--  [# Get the cflags and libraries from the freetype-config script
--   #
--   AC_ARG_WITH([ft-prefix],
--     dnl don't quote AS_HELP_STRING!
--     AS_HELP_STRING([--with-ft-prefix=PREFIX],
--                    [Prefix where FreeType is installed (optional)]),
--     [ft_config_prefix="$withval"],
--     [ft_config_prefix=""])
--
--   AC_ARG_WITH([ft-exec-prefix],
--     dnl don't quote AS_HELP_STRING!
--     AS_HELP_STRING([--with-ft-exec-prefix=PREFIX],
--                    [Exec prefix where FreeType is installed (optional)]),
--     [ft_config_exec_prefix="$withval"],
--     [ft_config_exec_prefix=""])
--
--   AC_ARG_ENABLE([freetypetest],
--     dnl don't quote AS_HELP_STRING!
--     AS_HELP_STRING([--disable-freetypetest],
--                    [Do not try to compile and run a test FreeType program]),
--     [],
--     [enable_fttest=yes])
--
--   if test x$ft_config_exec_prefix != x ; then
--     ft_config_args="$ft_config_args --exec-prefix=$ft_config_exec_prefix"
--     if test x${FT2_CONFIG+set} != xset ; then
--       FT2_CONFIG=$ft_config_exec_prefix/bin/freetype-config
--     fi
--   fi
--
--   if test x$ft_config_prefix != x ; then
--     ft_config_args="$ft_config_args --prefix=$ft_config_prefix"
--     if test x${FT2_CONFIG+set} != xset ; then
--       FT2_CONFIG=$ft_config_prefix/bin/freetype-config
--     fi
--   fi
--
--   if test "x$FT2_CONFIG" = x ; then
--     AC_PATH_PROG([FT2_CONFIG], [freetype-config], [no])
--   fi
--
--   min_ft_version=m4_if([$1], [], [7.0.1], [$1])
--   AC_MSG_CHECKING([for FreeType -- version >= $min_ft_version])
--   no_ft=""
--   if test "$FT2_CONFIG" = "no" ; then
--     no_ft=yes
--   else
--     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
--     FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
--     ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--     ft_config_minor_version=`$FT2_CONFIG $ft_config_args --version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--     ft_config_micro_version=`$FT2_CONFIG $ft_config_args --version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     ft_min_major_version=`echo $min_ft_version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
--     ft_min_minor_version=`echo $min_ft_version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
--     ft_min_micro_version=`echo $min_ft_version | \
--       sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
--     if test x$enable_fttest = xyes ; then
--       ft_config_is_lt=""
--       if test $ft_config_major_version -lt $ft_min_major_version ; then
--         ft_config_is_lt=yes
--       else
--         if test $ft_config_major_version -eq $ft_min_major_version ; then
--           if test $ft_config_minor_version -lt $ft_min_minor_version ; then
--             ft_config_is_lt=yes
--           else
--             if test $ft_config_minor_version -eq $ft_min_minor_version ; then
--               if test $ft_config_micro_version -lt $ft_min_micro_version ; then
--                 ft_config_is_lt=yes
--               fi
--             fi
--           fi
--         fi
--       fi
--       if test x$ft_config_is_lt = xyes ; then
--         no_ft=yes
--       else
--         ac_save_CFLAGS="$CFLAGS"
--         ac_save_LIBS="$LIBS"
--         CFLAGS="$CFLAGS $FT2_CFLAGS"
--         LIBS="$FT2_LIBS $LIBS"
--
--         #
--         # Sanity checks for the results of freetype-config to some extent.
--         #
--         AC_RUN_IFELSE([
--             AC_LANG_SOURCE([[
--
--#include <ft2build.h>
--#include FT_FREETYPE_H
--#include <stdio.h>
--#include <stdlib.h>
--
--int
--main()
--{
--  FT_Library library;
--  FT_Error  error;
--
--  error = FT_Init_FreeType(&library);
--
--  if (error)
--    return 1;
--  else
--  {
--    FT_Done_FreeType(library);
--    return 0;
--  }
--}
--
--             ]])
--           ],
--           [],
--           [no_ft=yes],
--           [echo $ECHO_N "cross compiling; assuming OK... $ECHO_C"])
--
--         CFLAGS="$ac_save_CFLAGS"
--         LIBS="$ac_save_LIBS"
--       fi             # test $ft_config_version -lt $ft_min_version
--     fi               # test x$enable_fttest = xyes
--   fi                 # test "$FT2_CONFIG" = "no"
--
--   if test x$no_ft = x ; then
--     AC_MSG_RESULT([yes])
--     m4_if([$2], [], [:], [$2])
--   else
--     AC_MSG_RESULT([no])
--     if test "$FT2_CONFIG" = "no" ; then
--       AC_MSG_WARN([
--
--  The freetype-config script installed by FreeType 2 could not be found.
--  If FreeType 2 was installed in PREFIX, make sure PREFIX/bin is in
--  your path, or set the FT2_CONFIG environment variable to the
--  full path to freetype-config.
--       ])
--     else
--       if test x$ft_config_is_lt = xyes ; then
--         AC_MSG_WARN([
--
--  Your installed version of the FreeType 2 library is too old.
--  If you have different versions of FreeType 2, make sure that
--  correct values for --with-ft-prefix or --with-ft-exec-prefix
--  are used, or set the FT2_CONFIG environment variable to the
--  full path to freetype-config.
--         ])
--       else
--         AC_MSG_WARN([
--
--  The FreeType test program failed to run.  If your system uses
--  shared libraries and they are installed outside the normal
--  system library path, make sure the variable LD_LIBRARY_PATH
--  (or whatever is appropriate for your system) is correctly set.
--         ])
--       fi
--     fi
--
--     FT2_CFLAGS=""
--     FT2_LIBS=""
--     m4_if([$3], [], [:], [$3])
--   fi
--
--   AC_SUBST([FT2_CFLAGS])
--   AC_SUBST([FT2_LIBS])])
--
--# end of freetype2.m4
-diff --git a/m4/sdl-client.m4 b/m4/sdl-client.m4
-index 095cd0b287..015d948d95 100644
---- a/m4/sdl-client.m4
-+++ b/m4/sdl-client.m4
-@@ -30,7 +30,7 @@ AC_DEFUN([FC_SDL_CLIENT],
-         missing_project="SDL_gfx"
-       fi
-       if test "x$sdl_h_found" = "xyes" ; then
--        AC_CHECK_FT2([2.1.3], [freetype_found="yes"], [freetype_found="no"])
-+        PKG_CHECK_MODULES(FT2, freetype2 >= 7.0.1, [freetype_found="yes"], [freetype_found="no"])
-         if test "$freetype_found" = yes; then
- 	  gui_sdl_cflags="$gui_sdl_cflags $FT2_CFLAGS"
- 	  gui_sdl_libs="$gui_sdl_libs $FT2_LIBS"
--- 
-2.17.0
-
diff --git a/games-strategy/freeciv/freeciv-2.5.11.ebuild b/games-strategy/freeciv/freeciv-2.5.11.ebuild
deleted file mode 100644
index 149823db3192..000000000000
--- a/games-strategy/freeciv/freeciv-2.5.11.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic gnome2-utils
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-	)
-	readline? ( sys-libs/readline:0= )
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl[video]
-			media-libs/sdl-gfx
-			media-libs/sdl-image[png]
-			media-libs/sdl-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl[sound]
-			media-libs/sdl-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.11-freetype_pkgconfig.patch"
-)
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient mydatabase myeconfargs
-
-	if use auth ; then
-		if ! use mysql && ! use sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase+=" mysql"
-			use sqlite && mydatabase+=" sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myeconfargs+=( --enable-server )
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl"
-			use gtk && myclient+=" gtk2"
-			if use qt5 ; then
-				myclient+=" qt"
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myeconfargs+=( $(use_enable server) --without-ggz-client )
-	fi
-
-	myeconfargs+=(
-		--enable-aimodules="$(usex aimodules "yes" "no")"
-		--enable-client="${myclient}"
-		--enable-fcdb="${mydatabase}"
-		--enable-fcmp="$(usex modpack "gtk2" "no")"
-		# disabling shared libs will break aimodules USE flag
-		--enable-shared
-		--localedir=/usr/share/locale
-		$(use_enable ipv6)
-		$(use_enable mapimg)
-		$(use_enable nls)
-		$(use_enable sound sdl-mixer)
-		$(use_enable system-lua sys-lua)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${ED%/}/usr/share/pixmaps"
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			docinto html
-			dodoc manual*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${ED}" -name "freeciv-manual*" -delete
-
-	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild b/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
deleted file mode 100644
index ceb9ae038ec1..000000000000
--- a/games-strategy/freeciv/freeciv-2.6.0_beta3.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils ltprune xdg-utils
-
-DESCRIPTION="multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="http://www.freeciv.org/"
-SRC_URI="mirror://sourceforge/freeciv/${P/_/-}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-[[ ${PV} != *_beta* ]] || [[ ${PV} != *_rc* ]] || \
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="auth aimodules dedicated +gtk ipv6 mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite system-lua"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="app-arch/bzip2
-	app-arch/xz-utils
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		mysql? ( virtual/mysql )
-		sqlite? ( dev-db/sqlite:3 )
-		!mysql? ( ( !sqlite? ( virtual/mysql ) ) )
-	)
-	readline? ( sys-libs/readline:0= )
-	dedicated? ( aimodules? ( dev-libs/libltdl:0 ) )
-	!dedicated? (
-		media-libs/libpng:0
-		gtk? ( x11-libs/gtk+:2 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:2 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		sdl? (
-			media-libs/libsdl2[video]
-			media-libs/sdl2-gfx
-			media-libs/sdl2-image[png]
-			media-libs/sdl2-ttf
-		)
-		server? ( aimodules? ( sys-devel/libtool:2 ) )
-		sound? (
-			media-libs/libsdl2[sound]
-			media-libs/sdl2-mixer[vorbis]
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:2 ) )
-	)
-	system-lua? ( >=dev-lang/lua-5.3 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!dedicated? (
-		x11-base/xorg-proto
-		nls? ( sys-devel/gettext )
-	)"
-
-S="${WORKDIR}/${P/_/-}"
-
-pkg_setup() {
-	if use !dedicated && use !server ; then
-		ewarn "Disabling server USE flag will make it impossible"
-		ewarn "to start local games, but you will still be able to"
-		ewarn "join multiplayer games."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# install the .desktop in /usr/share/applications
-	# install the icons in /usr/share/pixmaps
-	sed -i \
-		-e 's:^.*\(desktopfiledir = \).*:\1/usr/share/applications:' \
-		-e 's:^\(icon[0-9]*dir = \)$(prefix)\(.*\):\1/usr\2:' \
-		-e 's:^\(icon[0-9]*dir = \)$(datadir)\(.*\):\1/usr/share\2:' \
-		client/Makefile.in \
-		server/Makefile.in \
-		tools/Makefile.in \
-		data/icons/Makefile.in || die
-	sed -i -e 's/=SDL/=X-SDL/' bootstrap/freeciv-sdl.desktop.in || die
-}
-
-src_configure() {
-	local myclient mydatabase myeconfargs
-
-	if use auth ; then
-		if ! use mysql && ! use sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=mysql
-		else
-			use mysql && mydatabase+=" mysql"
-			use sqlite && mydatabase+=" sqlite3"
-		fi
-	else
-		mydatabase=no
-	fi
-
-	if use dedicated ; then
-		myclient="no"
-		myeconfargs+=(
-			--enable-server
-			--enable-freeciv-manual=html
-		)
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to"
-			einfo "gtk2 client!"
-			myclient="gtk2"
-		else
-			use sdl && myclient+=" sdl2"
-			use gtk && myclient+=" gtk2"
-			if use qt5 ; then
-				myclient+=" qt"
-				append-cxxflags -std=c++11
-			fi
-		fi
-		myeconfargs+=(
-			$(use_enable server)
-			$(use_enable server freeciv-manual html )
-		)
-	fi
-
-	myeconfargs+=(
-		--enable-aimodules="$(usex aimodules "yes" "no")"
-		--enable-client="${myclient}"
-		--enable-fcdb="${mydatabase}"
-		--enable-fcmp="$(usex modpack "gtk2" "no")"
-		# disabling shared libs will break aimodules USE flag
-		--enable-shared
-		--localedir=/usr/share/locale
-		$(use_enable ipv6)
-		$(use_enable mapimg)
-		$(use_enable nls)
-		$(use_enable sound sdl-mixer)
-		$(use_enable system-lua sys-lua)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use dedicated ; then
-		rm -rf "${ED%/}/usr/share/pixmaps"
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-{client,gtk2,gtk3,modpack,qt,sdl,xaw}*
-	else
-		if use server ; then
-			# Create and install the html manual. It can't be done for dedicated
-			# servers, because the 'freeciv-manual' tool is then not built. Also
-			# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-			# Note: to have it localized, it should be ran from _postinst, or
-			# something like that, but then it's a PITA to avoid orphan files...
-			./tools/freeciv-manual || die
-			docinto html
-			dodoc classic*.html
-		fi
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm -f "${ED%/}"/usr/share/man/man6/freeciv-sdl*
-		fi
-		rm -f "${ED%/}"/usr/share/man/man6/freeciv-xaw*
-	fi
-	find "${ED}" -name "freeciv-manual*" -delete
-
-	rm -f "${ED%/}/usr/$(get_libdir)"/*.a
-	prune_libtool_files
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
deleted file mode 100644
index 6a23f56ccce9..000000000000
--- a/games-strategy/freeciv/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="aimodules">Support for dynamically loadable AI
-			modules (server-side)</flag>
-		<flag name="auth">Add authentication capability via
-			mysql, postgres or sqlite3</flag>
-		<flag name="mapimg">Additional mag image toolkit
-			via <pkg>media-gfx/imagemagick</pkg></flag>
-		<flag name="modpack">Build the freeciv-modpack-program
-			to download/install mods</flag>
-		<flag name="server">Enable server support. Disabling this
-			will also make it impossible to start local games.</flag>
-		<flag name="sound">Add support for sound provided by
-			<pkg>media-libs/sdl-mixer</pkg></flag>
-		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of
-			the bundled liblua</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freeciv</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/freecol-0.11.6 b/games-strategy/freecol-0.11.6
new file mode 100644
index 000000000000..ed5f6161c50d
--- /dev/null
+++ b/games-strategy/freecol-0.11.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=An open source clone of the game Colonization
+EAPI=5
+HOMEPAGE=http://www.freecol.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/jre-1.8 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/freecol/freecol-0.11.6-src.zip
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=25e048e64cca192c37301c3c19802b42
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
deleted file mode 100644
index 9a9aef337104..000000000000
--- a/games-strategy/freecol/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX freecol-0.11.6-gentoo.patch 1251 BLAKE2B 7de241498bba19c665812236a7898cf8295ffa9be0123a56ff0b65c85e9173dbfb3e458c26c632538230035320d9b93f0ba57b4eb6e8cf606c82b20befcf11ac SHA512 c94fa10fb210547b67b38562faa2d1e39f17264cdfc8819c5b6b856ba068757d88e29ea43bec573400a81b081965f687aea93335b62969b15122d9373290f224
-DIST freecol-0.11.6-src.zip 45002451 BLAKE2B 1d0e56b43f63557e3a520d6d30b8831db6c0284ac6cfebf68f3a11264d8bcfc80b883c8d4fe82e4fbd992f02a82ffdf36ed102613010d28375b61cfa30874f68 SHA512 fbfec95ad7128477d631be92b750d639d42bde3e052c94265590933e841adf66e670d5e1b2f6e8ef05629afeafded60cbb495ef93272ebc14ce7fd2f2eaa53de
-EBUILD freecol-0.11.6.ebuild 1669 BLAKE2B c1250ab2b190f052f838af33c5de61c1f3974e38c8cdd3c9a6b9237b71a60732a1734f1654d6659a25bac29bd54f930641659dfc9d87b8d5af4444a598a4dcb4 SHA512 f17d732be0523537ac0a467da97a54063b16804013525caa2893497c0b03cfebcd536fc6ddc99206962fac6d1f2066ac71146e1c75422036567e439bdad36b34
-MISC metadata.xml 330 BLAKE2B ae0631cafebbd8fdebafaf416d6a8c7ca0152f83915aecca6366b74026523914e60761219eab4034401673fce1e54ea3c548bcbae7a084f301aaf6922569e61b SHA512 a626ad559d71b69d9f074fc7a223d226c3e911f21adecfaea48425f81fd81accf443e7518f16bbbadb1b92854f7c99e3eafda22ba0aa787bae3d44b02f8d71ab
diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
deleted file mode 100644
index c087193eb8c5..000000000000
--- a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- build.xml.orig	2015-12-09 21:10:08.272361404 -0500
-+++ build.xml	2015-12-09 21:11:26.189663216 -0500
-@@ -36,12 +36,11 @@
- 
-     <path id="libraries.classpath">
-         <!-- MigLayout manager -->
--        <pathelement location="${basedir}/${miglayout-swing.jar}"/>
--        <pathelement location="${basedir}/${miglayout-core.jar}"/>
-+        <pathelement location="${miglayout.jar}"/>
-         <!-- Command line processor -->
--        <pathelement location="${basedir}/${cli.jar}"/>
-+        <pathelement location="${cli.jar}"/>
-         <!-- Cortado Video Applet -->
--        <pathelement location="${basedir}/${cortado.jar}"/>
-+        <pathelement location="${cortado.jar}"/>
-         <!-- JOgg/JOrbis libraries -->
-         <pathelement location="${basedir}/jars/jogg-0.0.17.jar"/>
-         <pathelement location="${basedir}/jars/jorbis-0.0.17.jar"/>
-@@ -162,7 +161,7 @@
- 
-     <target name="manifest" depends="git-revision"
-             description="Creates the Manifest file.">
--        <manifestclasspath property="jar.classpath"
-+        <manifestclasspath maxParentLevels="50" property="jar.classpath"
-                            jarfile="Freecol.jar">
-             <classpath refid="libraries.classpath" />
-         </manifestclasspath>
diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
deleted file mode 100644
index 8d7df3ab2726..000000000000
--- a/games-strategy/freecol/freecol-0.11.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 games
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="http://www.freecol.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jsr173
-	dev-java/wstx:3.2
-	dev-java/commons-cli:1
-	dev-java/cortado
-	dev-java/miglayout"
-DEPEND=">=virtual/jdk-1.8
-	app-arch/unzip
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.8
-	${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
-	# jorbis isn't in portage yet
-	rm jars/{commons-cli-1.1,cortado-0.6.0,miglayout-core-4.2,miglayout-swing-4.2}.jar || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_prepare() {
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	EANT_BUILD_TARGET=package
-	EANT_EXTRA_ARGS="
-		-Dstax.jar=$(java-pkg_getjars jsr173)
-		-Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
-		-Dcli.jar=$(java-pkg_getjars commons-cli-1)
-		-Dmiglayout.jar=$(java-pkg_getjars miglayout)
-		-Dcortado.jar=$(java-pkg_getjars cortado)
-	"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
-	java-pkg_dojar FreeCol.jar
-	java-pkg_dolauncher ${PN} \
-		-into "${GAMES_PREFIX}" \
-		--pwd "${GAMES_DATADIR}"/${PN} \
-		--jar FreeCol.jar \
-		--java_args -Xmx512M
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r data schema
-	doicon data/${PN}.png
-	make_desktop_entry ${PN} FreeCol
-	dodoc README
-	prepgamesdirs
-}
-
-pkg_setup() {
-	games_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	java-pkg-2_pkg_preinst
-}
diff --git a/games-strategy/freecol/metadata.xml b/games-strategy/freecol/metadata.xml
deleted file mode 100644
index 683a3878d849..000000000000
--- a/games-strategy/freecol/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">freecol</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/freeorion-0.4.7.1 b/games-strategy/freeorion-0.4.7.1
new file mode 100644
index 000000000000..24d981db40e9
--- /dev/null
+++ b/games-strategy/freeorion-0.4.7.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi || ( >=dev-lang/python-2.7.5-r2:2.7 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A free turn-based space empire and galactic conquest game
+EAPI=6
+HOMEPAGE=http://www.freeorion.org
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/boost-1.56[python,threads] media-libs/freealut media-libs/freetype media-libs/glew:* media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
+SLOT=0
+SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.7.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	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d43cb6199a5176536bebf250ecd6879a
diff --git a/games-strategy/freeorion-0.4.7.1-r3 b/games-strategy/freeorion-0.4.7.1-r3
new file mode 100644
index 000000000000..0dc0175a585c
--- /dev/null
+++ b/games-strategy/freeorion-0.4.7.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=A free turn-based space empire and galactic conquest game
+EAPI=6
+HOMEPAGE=http://www.freeorion.org
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
+SLOT=0
+SRC_URI=https://github.com/freeorion/freeorion/archive/v0.4.7.1.tar.gz -> freeorion-0.4.7.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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=56d488ea6924d41b0601cefafe0ea6bc
diff --git a/games-strategy/freeorion-9999 b/games-strategy/freeorion-9999
new file mode 100644
index 000000000000..6f8323823345
--- /dev/null
+++ b/games-strategy/freeorion-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A free turn-based space empire and galactic conquest game
+EAPI=6
+HOMEPAGE=http://www.freeorion.org
+IUSE=python_targets_python2_7
+LICENSE=GPL-2 LGPL-2.1 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/boost-1.56:=[python,threads,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] media-libs/freealut media-libs/freetype media-libs/glew:= media-libs/libsdl2 >=media-libs/libogg-1.1.3 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] >=media-libs/libvorbis-1.1.2 media-libs/openal sci-physics/bullet sys-libs/zlib virtual/opengl !dev-games/gigi
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=56d488ea6924d41b0601cefafe0ea6bc
diff --git a/games-strategy/freeorion/Manifest b/games-strategy/freeorion/Manifest
deleted file mode 100644
index e57fd5ee697f..000000000000
--- a/games-strategy/freeorion/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX freeorion.envd 70 BLAKE2B a893f14754bfb7617f4a250dce8d64ea3de6c0ed3ad51fb62d46baf39ac3e4ead44a51e22e934d206eeef77b5bbdb2e4240178e856def0280ed38607647b4909 SHA512 ed9e2adf837cd381241dacf4da446a8ded1486c51a011eaf0cdf84b62831cd005f3e210b8f31847f9aba1d54ddd5f352fde6b33eefb215ab264ff53c3e3be74b
-DIST freeorion-0.4.7.1.tar.gz 105942075 BLAKE2B f75940ac79e329fd7e03e85b1cd712ff6dcf06583ad8feff43f8b2d6e28a53c9029724d1450d26d2367bafd1d04858e3659b8e47986df96657d91526f594eb5e SHA512 9c8d0437ee827a1104a541e1123ce6b5d229bd6253bfe275028805a4c34de882ca3a9d5361e3f64098f935d0926a656a64fe468690c8d195e05de86cd1b2699d
-EBUILD freeorion-0.4.7.1-r3.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
-EBUILD freeorion-0.4.7.1.ebuild 1679 BLAKE2B d60e8dca3465f700cc629f8df45b4f92efbfa1814e6d4dd2c23b40c13684cc614c947c40e931810095487cf3070077dc8ba36b36a3fcf51e5b3c657f6b6f4607 SHA512 88f9d3905770f0a97a3938d58bad1c6698c5d8b651718a19cb634aaef857582023051700bc692ae59a2b8ee83b1da6841fff1a576078f7df1705e388b6faca7b
-EBUILD freeorion-9999.ebuild 1704 BLAKE2B aeb98f2232bf05e0030efaa6041e5817afa53af6d228c9431f105e62b4004b0bb66316848114db2e42c044bdb2f8b3b40776dcd0b861457f0c09fc91a8c6fa70 SHA512 401e40826695b6aa1158f7b3a266d7d5db7ef862dfdc62bcc598c42069e9e580cc5ab23fd349bf5558bebf7562fc0d57f189f9ed7c166bc84e078f2496b74c20
-MISC metadata.xml 684 BLAKE2B 1c415c0258973d2953f7ee0a9ff5811b17cff7000a499e2568c56b09f6c7ca40aedd345c1f377822bb0d30d50638fe76eb1e12da19da0a86b76bba9919633199 SHA512 e569a1bb722ad194a47292a6c67670fef05f5f1ac390245c81140e8fcc57f2699eec4e8037e3cae31d46d7e62eac8504d69971dc7db76226f2a31f85bb531bb1
diff --git a/games-strategy/freeorion/files/freeorion.envd b/games-strategy/freeorion/files/freeorion.envd
deleted file mode 100644
index 182c707cb002..000000000000
--- a/games-strategy/freeorion/files/freeorion.envd
+++ /dev/null
@@ -1 +0,0 @@
-LDPATH="/usr/lib64/freeorion:/usr/lib32/freeorion:/usr/lib/freeorion"
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
deleted file mode 100644
index 8d750687b353..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.7.1-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 gnome2-utils
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
-	media-libs/freealut
-	media-libs/freetype
-	media-libs/glew:=
-	media-libs/libsdl2
-	>=media-libs/libogg-1.1.3
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	>=media-libs/libvorbis-1.1.2
-	media-libs/openal
-	sci-physics/bullet
-	sys-libs/zlib
-	virtual/opengl
-	!dev-games/gigi"
-	# Use bundled gigi as of freeorion-0.4.3
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPEE=Release
-		-DRELEASE_COMPILE_FLAGS=""
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog.md
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeorion/freeorion-0.4.7.1.ebuild b/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
deleted file mode 100644
index 1be8614838d4..000000000000
--- a/games-strategy/freeorion/freeorion-0.4.7.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-any-r1 gnome2-utils
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/boost-1.56[python,threads]
-	media-libs/freealut
-	media-libs/freetype
-	media-libs/glew:*
-	media-libs/libsdl2
-	>=media-libs/libogg-1.1.3
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	>=media-libs/libvorbis-1.1.2
-	media-libs/openal
-	sci-physics/bullet
-	sys-libs/zlib
-	virtual/opengl
-	!dev-games/gigi"
-	# Use bundled gigi as of freeorion-0.4.3
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPEE=Release
-		-DRELEASE_COMPILE_FLAGS=""
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog.md
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
deleted file mode 100644
index 8d750687b353..000000000000
--- a/games-strategy/freeorion/freeorion-9999.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils python-single-r1 gnome2-utils
-
-DESCRIPTION="A free turn-based space empire and galactic conquest game"
-HOMEPAGE="http://www.freeorion.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/freeorion/freeorion.git"
-else
-	MY_PV="${PV/_/-}"
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
-	media-libs/freealut
-	media-libs/freetype
-	media-libs/glew:=
-	media-libs/libsdl2
-	>=media-libs/libogg-1.1.3
-	media-libs/libpng:0
-	media-libs/libsdl2[X,opengl,video]
-	>=media-libs/libvorbis-1.1.2
-	media-libs/openal
-	sci-physics/bullet
-	sys-libs/zlib
-	virtual/opengl
-	!dev-games/gigi"
-	# Use bundled gigi as of freeorion-0.4.3
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# build system is using FindPythonLibs.cmake which needs python:2
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s/-O3//" -i CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPEE=Release
-		-DRELEASE_COMPILE_FLAGS=""
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc ChangeLog.md
-
-	newenvd "${FILESDIR}/${PN}.envd" 99${PN}
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
deleted file mode 100644
index ccd88c4f149a..000000000000
--- a/games-strategy/freeorion/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>NP-Hardass@gentoo.org</email>
-    <name>NP-hardass</name>
-  </maintainer>
-  <longdescription lang="en">
-  FreeOrion is a free, open source, turn-based space empire and
-  galactic conquest (4X) computer game being designed and built by the
-  FreeOrion project. FreeOrion is inspired by the tradition of the
-  Master of Orion games, but is not a clone or remake of that series
-  or any other game.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">freeorion/freeorion</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-strategy/freesynd-0.7.1-r1 b/games-strategy/freesynd-0.7.1-r1
new file mode 100644
index 000000000000..5b5b7fd75274
--- /dev/null
+++ b/games-strategy/freesynd-0.7.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=media-libs/libogg media-libs/libpng:0= media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png] sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Portable reimplementation of engine for the classic Bullfrog game, Syndicate
+EAPI=6
+HOMEPAGE=http://freesynd.sourceforge.net/
+IUSE=debug devtools
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=media-libs/libogg media-libs/libpng:0= media-libs/libsdl[X,sound,video] media-libs/libvorbis media-libs/sdl-mixer[mp3,vorbis] media-libs/sdl-image[png]
+SLOT=0
+SRC_URI=mirror://sourceforge/freesynd/freesynd-0.7.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	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f4d6d2c2ef904c8369493bdb7412a71e
diff --git a/games-strategy/freesynd/Manifest b/games-strategy/freesynd/Manifest
deleted file mode 100644
index 389db704dbdd..000000000000
--- a/games-strategy/freesynd/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX freesynd-0.7.1-cmake.patch 931 BLAKE2B 0ad1994ad923355fdcae7c472a1440c88a848c409d5cc17b43d4d42e6307eb5c9f362efae5d81227d6ed6a7a4ecd5a7ec3492086e11f2208473190f2713fdd89 SHA512 994d12a2f079582bda03a600888c2d7ed2043468d69ce752e64deb45d156de5a7556edabd00d2635acc2c39882a8074193dc559e423e8e0181e9d4ea9d8b8b6f
-DIST freesynd-0.7.1.tar.gz 2576695 BLAKE2B 11b8f1d25768cdef6cf6894e8141cd13562a133a3253aa5b19034f0c54f114081dd97d41d230c74b5b1aaf66d84ad45d0c09ca5cdc72fb1de00a39ff23ad1272 SHA512 b87e6adaf71206532b4f90cd230ca6be00438fe26f000c5a0bfebf2839fea80d78d98ddc27331a2224874338c3e14ffbfa58b8c5bdbdc53c93bba8d6a9e6b7b4
-EBUILD freesynd-0.7.1-r1.ebuild 1597 BLAKE2B 3d7fadee4f1f1c9c8574b7477972cd781afab7c1f321137bfef5ae84cbb80c6b595ac1b73b165e4878f7a03995899c9a79fd90faddd035c3d10f0fd477f6da03 SHA512 29892a155a86b4a3eda85c5d1e8f987a85f7b63a70ef2b9adc981b509e804bcf2ae4b4b5c28bc19f4fe9499504f8d4a7d6c1e204ce7e9d32cd778394a525c718
-MISC metadata.xml 401 BLAKE2B e83ee7425bd7de156c4ce45903a7fe00a12ad94f9e8bfe8ab0547458d2cf3f883fbbb319494a40bdabbadf2d85e74d0a929c43973d27550a7198bfd2c0e7add7 SHA512 5750ad5bed978d8a906a3cea47f3602257b5390bb87096c1e005d0c2bd1921b9033bdfb87f14506e88e8929268a9c9bb0003c9b343d0a0040b30df2058726152
diff --git a/games-strategy/freesynd/files/freesynd-0.7.1-cmake.patch b/games-strategy/freesynd/files/freesynd-0.7.1-cmake.patch
deleted file mode 100644
index 817cd39dcb4f..000000000000
--- a/games-strategy/freesynd/files/freesynd-0.7.1-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- freesynd-0.7.1/CMakeLists.txt
-+++ freesynd-0.7.1/CMakeLists.txt
-@@ -34,6 +34,13 @@
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS}")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}")
- 
-+option(BUILD_DEV_TOOLS "Build development tools")
-+option(WITH_DEBUG "Enable debug definitions")
-+
-+if(WITH_DEBUG)
-+	add_definitions (-D_DEBUG)
-+endif()
-+
- # Set standard definitions for all platforms.
- add_definitions (-DSYSTEM_SDL)
- add_definitions (-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\")
-@@ -59,10 +66,7 @@
- 	message (FATAL_ERROR "Unable to locate PNG")
- endif ()
- 
--if (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQUAL "debug")
--	set (BUILD_DEV_TOOLS TRUE)
--else ()
--	set (BUILD_DEV_TOOLS FALSE)
-+if (CMAKE_BUILD_TYPE AND NOT CMAKE_BUILD_TYPE STREQUAL "debug")
- 	# We only define an install target if we're doing a release build.
- 	# Furthermore, on Mac, the data folder is a part of the app bundle.
- 	if (NOT APPLE)
diff --git a/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild b/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
deleted file mode 100644
index 08cdeb54329a..000000000000
--- a/games-strategy/freesynd/freesynd-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Portable reimplementation of engine for the classic Bullfrog game, Syndicate"
-HOMEPAGE="http://freesynd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug devtools"
-
-RDEPEND="
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl[X,sound,video]
-	media-libs/libvorbis
-	media-libs/sdl-mixer[mp3,vorbis]
-	media-libs/sdl-image[png]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( NEWS README INSTALL AUTHORS )
-
-PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
-
-DOC_CONTENTS="
-	You have to set \"data_dir = /my/path/to/synd-data\"
-	in \"~/.${PN}/${PN}.ini\".
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed \
-		-e "s:#freesynd_data_dir = /usr/share/freesynd/data:freesynd_data_dir = /usr/share/${PN}/data:" \
-		-i ${PN}.ini || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_DEBUG=$(usex debug)
-		-DBUILD_DEV_TOOLS=$(usex devtools)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	dobin src/${PN}
-	use devtools && newbin src/dump ${PN}-dump
-	insinto /usr/share/${PN}
-	doins -r data
-	newicon -s 128 icon/sword.png ${PN}.png
-	make_desktop_entry ${PN}
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	if use debug ; then
-		ewarn "Debug build is not meant for regular playing,"
-		ewarn "game speed is higher."
-	fi
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/freesynd/metadata.xml b/games-strategy/freesynd/metadata.xml
deleted file mode 100644
index 2ba784f8d996..000000000000
--- a/games-strategy/freesynd/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="devtools">Build development tools</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freesynd</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/galaxyhack-1.74-r1 b/games-strategy/galaxyhack-1.74-r1
new file mode 100644
index 000000000000..f19ad89dda14
--- /dev/null
+++ b/games-strategy/galaxyhack-1.74-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst prepare
+DESCRIPTION=Multiplayer AI script based strategy game
+EAPI=6
+HOMEPAGE=http://galaxyhack.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 galaxyhack
+SLOT=0
+SRC_URI=mirror://sourceforge/galaxyhack/galaxyhack-1.74.tar.bz2 mirror://gentoo/galaxyhack.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1a55687f7b06c1ad126b5116cc553b86
diff --git a/games-strategy/galaxyhack/Manifest b/games-strategy/galaxyhack/Manifest
deleted file mode 100644
index c3dd85d53b68..000000000000
--- a/games-strategy/galaxyhack/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX galaxyhack-1.74-boost-1.50.patch 3206 BLAKE2B c97b67ac602a440eb90ae481e0ef5837e64cf9ad3c07e722899b7e1c6701536df1af3dca5e7e645dc13bd3622b8bf7e1a274c0c0de24cb9f39287f1af2e5e14f SHA512 ce441bd44c44000b28520bba3c76b4e3d37fef5b424ddae1be4ee2e0675859ce22090c9e79a7fca37f46b16312b581201eb413d89cdddab3d6169c97ec0d6304
-AUX galaxyhack-1.74-boost.patch 245 BLAKE2B afb356c6fb7d2f5243466f84d5605e1cc13da00b842c2bc554d791f20de6c37ab6b563e3320b3f0f6ca242987c75ffe6fbaba5ba236bd833a3bc86361be689b9 SHA512 19a6ef4ee430edab619d60d4410d318e07ba3dd75b48036331029ff0de11ad5ccc73970825708764a7da9870d9ae8a7708a22176aa6698fdd4c2837bf3a91885
-AUX galaxyhack-1.74-destdirs.patch 390 BLAKE2B 5c807a22493528f472e3d5e9366ab4b8bacfb7d3a7c31291a3a1e8cf872fcd2cf9c3e373e53bffa9d92af68bf9549c6ebf44a6aaa8d6cd10f6afcfd6e6906690 SHA512 d154eb0b0116fa1e067bae12db82cef5eb3bf882683f624becb54244ffa744a3bdc7ebe77fe6e87c634f42f649cc8dd0fb7067aa5d2cb5b8a72cf50cdbfe7702
-AUX galaxyhack-1.74-format.patch 1768 BLAKE2B 5a0ee8e935c557ac25b470e1914f242da093352321ba34c067ca3997e3892aff3f6330b827bc7d08c7541cc1e9e0cb2e0b4e0d938ddd1f9cfd21916b11f978e3 SHA512 e38280f9a06426a77abea3a10de6ce23868dd2d4df0c398832856bfa5e39c329cf39b39bd4ff766c54fd72813933c502ca9a63750b7a4160e536a40a08bc0ba3
-AUX galaxyhack-1.74-gcc43.patch 309 BLAKE2B f8af1b8b2d4d50bb37eb13237915638d746a79daa621d81958bf99d7071178d3402989fa0fbeb9d67abffea4a15a97d1da263855b5ac17b1caf96213ebddcb31 SHA512 21169edbaf8f4c0d8f4fcd44a494e0121fb332b42cf14ba09818cf871cfdb792e4bbe00c7ae1b9ddc9094c96edda785f2763c76a70dcf92ec7ea163e3248aaa0
-AUX galaxyhack-1.74-gentoo.patch 992 BLAKE2B 63ca6fee15f9f088e2c8a73566d5a7579ed4636d8048771ee01aa40a6f8edd1013e1d6a710d45caa951311709c19ed3d670014bfd1513982c317d6ea5d1b4d34 SHA512 e268019e57c95caf6f24331e0c1f6bb0f47507940e8621cf5307f5cdd24cdd9ab49307208f6914558df35bedd725db38374c04b4f887c89814896ce9902f7b0a
-DIST galaxyhack-1.74.tar.bz2 9948336 BLAKE2B 2029e4a27e2995ebd8bb4f7e9192fc353b22a0246e5bca5294a9a09ee936c0050682dcff52a233b87d659a6a4e98f56fcd4b563fb1159b52f6f596a5413a687b SHA512 d708494b1ad572c0243da9e7168b4707112ec3c99a09498b87f8e0cb2e4e5bc9df8dc4631e3fb4d3cd7517ec4b17e937798dec3fcf770de9d0fc1b5e29a0bd58
-DIST galaxyhack.png 819 BLAKE2B c19a6c05313eedfd118de0b02b688e98dc011a760da10c5edc6ee15eea3668e7dbf19fcbc7546807221b3b727056c5d5075c91cae699300c6d7b19c939b0f2b6 SHA512 b8ab4dd1c18c079ec3f60b3d04843fbb7a892feb8f872d498c20eb3142e7de26bff90c93b308656e1afe5ee77074fcb3f78542dfd175c27a9b865a512e0b0200
-EBUILD galaxyhack-1.74-r1.ebuild 1592 BLAKE2B afde825de3df81f6b18cce5376f30059763dfeab87c154a8b3f7fa9c4a7d011a66cd53b2a3df165bd3c05eb858317c1f9ee20545b10295fb76eca3691a5c265d SHA512 abd828bf419949722c7261439c6bb386b9f6813da6bd6c68c91d8084ae4a0d04f2b6f6660116a8cc969a742ed62ce05bec3306fa58bca93d79186af3d00c4072
-MISC metadata.xml 1383 BLAKE2B b358635bd0e1f15560dc84368bc32eb1de4a487ca377924d82f3d2b28912ec702a07fa34565fea4fdf77280599403187b670a103d3d158e0c5ccfa3265257725 SHA512 1857f21b7f01d16e5eaa7fd6f3b653c820837d5b47022bf47c02af44c5bb00f0010c36c722aa1225d0cf0cdec8d85c4f6f14e5c7c0785da8706ea9886a72b285
diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
deleted file mode 100644
index ed8ff748aa98..000000000000
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost-1.50.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/ForceSelectWin.cpp.orig	2012-08-20 17:35:01.000000000 +0200
-+++ b/ForceSelectWin.cpp	2012-08-20 17:47:19.000000000 +0200
-@@ -1596,15 +1596,15 @@
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

- 	for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) {

- 		if (is_directory(*iter)) {

--			fs::create_directory(destPath.string() + "/" + iter->leaf());

--			DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf());

-+			fs::create_directory(destPath.string() + "/" + iter->path().filename().string());

-+			DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string());

- 			continue;

- 		}

- 		string destFile;

--		if (iter->leaf() == sideName + ".dat")

-+		if (iter->path().filename() == sideName + ".dat")

- 			destFile = theInput + ".dat";

- 		else	

--			destFile = iter->leaf();

-+			destFile = iter->path().filename().string();

- 		

- 		fs::copy_file(*iter, destPath.string() + "/" + destFile);

- 	}

---- a/Main.cpp.orig	2012-08-20 17:48:13.000000000 +0200
-+++ b/Main.cpp	2012-08-20 17:50:51.000000000 +0200
-@@ -339,12 +339,6 @@
- 

- void GameInit(char* argv[]) {

- 	namespace fs = boost::filesystem;

--	//boost is really quite stupid

--	#ifndef WIN32

--		fs::path::default_name_check(fs::windows_name);

--	#else

--		fs::path::default_name_check(fs::native);

--	#endif

- 	

- 	FindHomePath();

- 	LoadSettings(argv);

---- a/Menu_Base.cpp.orig	2012-08-20 17:51:05.000000000 +0200
-+++ b/Menu_Base.cpp	2012-08-20 17:52:15.000000000 +0200
-@@ -206,7 +206,7 @@
- 

- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

- 	for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) {

--		string filename = iter->leaf();

-+		string filename = iter->path().filename().string();

- 

- 		if (filename.find('.') == filename.npos)

- 			continue;

-@@ -237,7 +237,7 @@
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

- 	for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) {

- 		if (fs::is_directory(*iter)) {

--			string fleetName = iter->leaf();

-+			string fleetName = iter->path().filename().string();

- 

- 			if (CheckFleetExists(fleetName)) {

- 				tempItem.desc = fleetName;

-@@ -261,7 +261,7 @@
- 	fs::path iterPath(GetFleetDir(whichSide));

- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

- 	for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) {

--		string filename = iter->leaf();

-+		string filename = iter->path().filename().string();

- 

- 		if (filename.find('.') == filename.npos)

- 			continue;

---- a/Stuff.cpp.orig	2012-08-20 17:52:36.000000000 +0200
-+++ b/Stuff.cpp	2012-08-20 17:53:11.000000000 +0200
-@@ -657,7 +657,7 @@
- 	fs::directory_iterator directoryEnd; // default construction yields past-the-end

- 	for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) {

- 		if (fs::is_directory(*iter) && !fs::is_empty(*iter))

--			RemoveDirectory(iter->string());

-+			RemoveDirectory(iter->path().string());

- 		else

- 			fs::remove(*iter);

- 	}

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
deleted file mode 100644
index c7fd49135dee..000000000000
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-boost.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/SetupBattle.cpp
-+++ src/SetupBattle.cpp
-@@ -18,7 +18,7 @@
- #include "PreBattle.h"

- 

- #include <sstream>

--#include <boost/filesystem/exception.hpp>

-+#include <boost/filesystem.hpp>

- 

- using std::stringstream;

- using std::getline;

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
deleted file mode 100644
index 7c60c4efa624..000000000000
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-destdirs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Main.cpp.old	2006-07-28 00:04:46.000000000 +0200
-+++ b/Main.cpp	2006-07-28 00:08:28.000000000 +0200
-@@ -184,7 +184,7 @@
- #ifndef WIN32

- 	string settingsPath = userHomePath + "settings.dat";

- 	if (!DoesFileExist(settingsPath))

--		settingsPath = "settings.dat";

-+		settingsPath = "@GAMES_DATADIR@/galaxyhack/settings.dat";

- #else

- 	string settingsPath = "settings.dat";

- #endif

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
deleted file mode 100644
index 478e58001c73..000000000000
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-format.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/JSDL.cpp.old	2016-01-04 10:42:56.404316856 +0100
-+++ b/JSDL.cpp	2016-01-04 10:51:16.744255312 +0100
-@@ -47,14 +47,14 @@
- 	if (!globalSettings.batch) {

- 		if (SDL_Init(SDL_INIT_TIMER | SDL_INIT_VIDEO) == -1) {

- 			char output[120];

--			sprintf(output, SDL_GetError());

-+			strcpy(output, SDL_GetError());

- 			throw runtime_error(output);

- 		}

- 		

- 		if (!globalSettings.disableSound) {

- 			if (SDL_InitSubSystem(SDL_INIT_AUDIO) == -1) {

- 				char error[120];

--				sprintf(error, SDL_GetError());

-+				strcpy(error, SDL_GetError());

- 				string errorStr = error;

- 				errorStr += ", continuing without initialising sound.";

- 				WriteLog(errorStr);

-@@ -81,7 +81,7 @@
- 		//4096 is rather a large chunksize, should be smaller if I add sound effects

- 		if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 2, 4096) == -1) {

- 			char output[100];

--			sprintf(output, Mix_GetError());

-+			strcpy(output, Mix_GetError());

- 			throw runtime_error(output);

- 		}

- 	}

-@@ -101,7 +101,7 @@
- 	if (screen == NULL) {

- 		SDL_Quit();

- 		char output[120];

--		sprintf(output, SDL_GetError());

-+		strcpy(output, SDL_GetError());

- 		throw runtime_error(output);

- 	}

- }

-@@ -114,7 +114,7 @@
- 

- 	if (loadingSurface == NULL) {

- 		char output[100];

--		sprintf(output, IMG_GetError());

-+		strcpy(output, IMG_GetError());

- 		throw runtime_error(output);

- 	}

- 

-@@ -308,7 +308,7 @@
- 

- 	if (!theMusic) {

- 		char output[100];

--		sprintf(output, Mix_GetError());

-+		strcpy(output, Mix_GetError());

- 		throw runtime_error(output);

- 	}

- }

-@@ -319,7 +319,7 @@
- 

- 	if (Mix_PlayMusic(theMusic, -1) == -1) {

- 		char output[100];

--		sprintf(output, Mix_GetError());

-+		strcpy(output, Mix_GetError());

- 		throw runtime_error(output);

- 	}

- }

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
deleted file mode 100644
index eeb64d12e587..000000000000
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur src.old/JSDL.cpp src/JSDL.cpp
---- src.old/JSDL.cpp	2008-07-17 18:31:38.000000000 +0200
-+++ src/JSDL.cpp	2008-07-17 19:19:39.000000000 +0200
-@@ -20,7 +20,7 @@
- #include <cstdlib>

- #include <fstream>

- #include <stdexcept>

--

-+#include <cstring>

- using std::runtime_error;

- using std::memcpy;

- 

diff --git a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch b/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
deleted file mode 100644
index 9e55c941bfeb..000000000000
--- a/games-strategy/galaxyhack/files/galaxyhack-1.74-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.old	2009-02-11 22:21:26.000000000 +0100
-+++ b/Makefile	2009-02-11 22:20:58.000000000 +0100
-@@ -6,12 +6,11 @@
- # James Gregory and Everton da Silva Marques <evertonsm@yahoo.com.br>
- #
- 
--INSTALL_DIR=/usr/local/share
--INSTALL_BIN_DIR=/usr/local/bin
-+INSTALL_DIR="${GAMES_DATADIR}"
-+INSTALL_BIN_DIR="${GAMES_BINDIR}"
- 
--CXX = g++
--CXXFLAGS = $(shell sdl-config --cflags) -O3
--LDFLAGS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem
-+CXXFLAGS += $(shell sdl-config --cflags)
-+LDLIBS = $(shell sdl-config --libs) -lSDL_image -lSDL_mixer -lboost_filesystem -lboost_system -lm
- 
- OBJS = AIInterpreter.o AutoFireUnit.o BCCompiler.o DerivedGroups.o DragWindow.o \
- 	ForceSelect.o ForceSelectWin.o GenWindow.o GenWindow_Base.o GFX.o Globals.o \
-@@ -40,7 +39,7 @@
- 	install $(TARGET) $(INSTALL_BIN_DIR)
- 
- $(TARGET): $(OBJS)
--	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- %.o: %.cpp
- 	$(CXX) $(CXXFLAGS) -c $< -o $@
diff --git a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild b/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
deleted file mode 100644
index aead3e7b9481..000000000000
--- a/games-strategy/galaxyhack/galaxyhack-1.74-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Multiplayer AI script based strategy game"
-HOMEPAGE="http://galaxyhack.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	mirror://gentoo/${PN}.png"
-
-LICENSE="GPL-2 galaxyhack"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libsdl[video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod,vorbis]
-	>=dev-libs/boost-1.34
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}/src"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Settings will default to those found in
-/usr/share/galaxyhack/settings.dat
-Per user settings can be specified by creating
-~/.galaxyhack/settings.dat
-
-Additional user submitted fleets can be downloaded from
-http://galaxyhack.sourceforge.net/viewfleets.php
-"
-
-src_prepare() {
-	default
-	edos2unix Makefile
-	eapply \
-		"${FILESDIR}"/${P}-destdirs.patch \
-		"${FILESDIR}"/${P}-boost.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-boost-1.50.patch \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-gentoo.patch
-	sed -i "s:@GAMES_DATADIR@:/usr/share:" \
-		Main.cpp || die
-	sed -i "/Base data path/s:pwd:/usr/share/${PN}:" \
-		../settings.dat || die
-}
-
-src_install() {
-	dobin "${PN}"
-	cd ..
-	insinto /usr/share/${PN}
-	doins -r fleets gamedata graphics music standardpictures \
-		settings.dat
-	dodoc readme.txt
-	readme.gentoo_create_doc
-	doicon "${DISTDIR}"/${PN}.png
-	make_desktop_entry ${PN} GalaxyHack
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-strategy/galaxyhack/metadata.xml b/games-strategy/galaxyhack/metadata.xml
deleted file mode 100644
index 9dbded1c3212..000000000000
--- a/games-strategy/galaxyhack/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-GalaxyHack allows you to design a fleet of spaceships which can then be tested
-in AI script based battles against fleets designed by other players. Though
-battles take place in real time, the strategy comes before hand, both in
-writing short AI scripts in a simple scripting language, and also in the set up
-and selection of your fleet. You don't actually have any control over your
-units at all mid-battle, but rather use the time to see where the set up of
-your fleets is working, where your fleets' weaknesses lie and changes are
-needed, and perhaps also to learn from the strategy of your opponent.
-
-The game revolves around very large capital ships, from which smaller ships are
-launched, but which are not designed for attacking themselves, and which cannot
-be moved mid-battle. To win a battle you must destroy of all of your opponent's
-capital ships before they destroy yours.
-
-There can be hundreds of units in any one battle, but there is no harvesting,
-resource management or base building.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">galaxyhack</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/glob2-0.9.4.4-r2 b/games-strategy/glob2-0.9.4.4-r2
new file mode 100644
index 000000000000..ab7a9d2feb3d
--- /dev/null
+++ b/games-strategy/glob2-0.9.4.4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst
+DEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl] media-libs/libvorbis media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf media-libs/speex virtual/glu virtual/opengl >=sys-apps/sed-4 dev-util/scons[python_targets_python2_7]
+DESCRIPTION=Real Time Strategy (RTS) game involving a brave army of globs
+EAPI=6
+HOMEPAGE=http://globulation2.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/boost-1.34[threads] dev-libs/fribidi media-libs/libsdl[opengl] media-libs/libvorbis media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-ttf media-libs/speex virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=mirror://nongnu/glob2/0.9.4/glob2-0.9.4.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8505071d77f09a50d453605a933e3376
diff --git a/games-strategy/glob2/Manifest b/games-strategy/glob2/Manifest
deleted file mode 100644
index 8cfd63e1a78b..000000000000
--- a/games-strategy/glob2/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX glob2-0.9.4.4-gcc44.patch 188 BLAKE2B bd6fc1a3ad79eb29e070d53099079c403553add1e8fcf513d8c5cf58902120ff0735ad0cc78d396329ababf64d94355c21b9e2269046467b8a68069cee0afdc4 SHA512 c341e484311fa508f9a034d216729fa7a8251e6fb710fe6417bd0a000b89a870cf5a24850e6126a704f160fee064fa7211973da8f3720dbd9a96df86adcd67fd
-AUX glob2-0.9.4.4-gcc49.patch 907 BLAKE2B f7ad515c19660af0713ca8c79c40a4c225372da85d17dfa58bc4a31e65bdced9a24ae9ff3f8f57f623da0011b24d841618bfc8fe09000703db94bc9e89a66971 SHA512 7a1f19fe40effa577b2eb03ec4f2ddd7df78bff1c3df25c8b15df37d9feb03e4583e1776e4c2240130f318f9fa643d2d662492c9c5be46ed659bd587f88eafac
-AUX glob2-0.9.4.4-gcc6.patch 1767 BLAKE2B 41716842d1d0552e4ea05e4ae189b92ea600ca5e31604bf19e5659ca6690c7e394d25f11baf3fee07b9bdfcba6a748586b152a0141312daad89ab76946ea4d82 SHA512 d2eddfe657f81a1ec085298f09aafb904d22a80d601aca6405d92d6f17b28d0f3f3b5b445a9423988b7bc8869ca41698783e4139928f9f2ba33093ded6a3cb02
-AUX glob2-0.9.4.4-scons-blows.patch 908 BLAKE2B 6d677c0588dbad9f44307579549946c8979b956331be3ef667fb4bbcd6fdf3e9889b22cd4c9458a76f487b12bc73ae73dfba03e0c1f86fb228e1934b1d4e67cc SHA512 0d805014200c76ca571ecc97c284b9168f280df0e88060c880b284b8e3d5490c1512708857bb22a0b2a4e4b78716d98ae26ae552531f661bb38f6dd75af474d3
-AUX glob2-0.9.4.4-underlinking.patch 672 BLAKE2B 59fbd0afacd468cc6a2e6e18336c524653697f42404124d9b2347246130ba390a202cb2b88fa223bd80063e6555211a5065cbf08dd4d113b7dadd2e0ad9a3f41 SHA512 24551c73af34badaa4a464da30c771c95082f0bfe83f351b264abddc578d5486a71f1a79b02d13ff48753e67059f8350752e77eb89397029833647bb74d79d21
-DIST glob2-0.9.4.4.tar.gz 11338986 BLAKE2B 047f27385c9b819c6ca2614406d340ff2cb7dcc26c8a20a205b11dce234af4ea52cb4eb04b7ed5b695382b17b34b5dd50387d61cfecaced16ee61b3c69c2921f SHA512 c82ace807ad208bc386b730f1fe6d6162640a9468440482f3584f8ccab825967660d8bbf6b3bebf70c74d1ed95f153cd9b5a0bd72dc247a1f97176c6c737f6ca
-EBUILD glob2-0.9.4.4-r2.ebuild 1251 BLAKE2B 41c2a82cecb07b7e544d457519af07829702584b083990933ac2f2a64024cc10e3a5bd9546dcf9712fa762560efbae6bf3ffdd3d53d45ffc3259d3d145947f39 SHA512 aff57e535f19cae25e86dd0f85edbcccec499951d5e12c2c718bc83f70f061de9b6b5f705a4da86e0d2dee51f815383e73f6495e0644a9eb5fed9c4396876e36
-MISC metadata.xml 637 BLAKE2B 405198c067618ace05cf22e6b790a356eb643cddf921f07a37516cc661f37706adab72edde18639abaa5b23ebfe771877ced14f1eacb3d9da83ed5c9e32213f5 SHA512 af021418808275511478f34bcbd4a3fadd193a583c7e94c676e94d39d10fb23c8d2de7b3ef5c8da81f2f6291a3bf9d0cc09448aea1b16959e7c811ba38d64e66
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
deleted file mode 100644
index 8d2da78cee23..000000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc44.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/libgag/include/StreamBackend.h.old
-+++ b/libgag/include/StreamBackend.h
-@@ -28,6 +28,9 @@
- #ifdef putc
- #undef putc
- #endif
-+#ifdef getc
-+#undef getc
-+#endif
- 
- namespace GAGCore
- {
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
deleted file mode 100644
index fca1efb5891a..000000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc49.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From https://bugs.gentoo.org/show_bug.cgi?id=538580
-
-Works around this build failure:
-
-In file included from src/AICastor.cpp:26:0:
-src/Game.h: In member function 'void AICastor::computeBuildingNeighbourMap(int, int)':
-src/Game.h:152:9: error: 'struct Game::BuildProject' is private
-  struct BuildProject
-         ^
-src/AICastor.cpp:2296:23: error: within this context
-  for (std::list<Game::BuildProject>::iterator bpi=game->buildProjects.begin(); bpi!=game->buildProjects.end(); bpi++)
-                       ^
-scons: *** [src/AICastor.o] Error 1
-scons: building terminated because of errors.
-
-patch submitted by zimous
-
---- glob2-0.9.4.4.orig/src/Game.h
-+++ glob2-0.9.4.4/src/Game.h
-@@ -149,6 +149,7 @@
- 		BOTTOM_TO_TOP
- 	};
- 	
-+public:
- 	struct BuildProject
- 	{
- 		int posX;
-@@ -159,6 +160,7 @@
- 		int unitWorkingFuture;
- 	};
- 	
-+private:
- 	///Initiates Game
- 	void init(GameGUI *gui, MapEdit* edit);
- 
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch b/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
deleted file mode 100644
index f1152c3ba1cc..000000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-gcc6.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Bug: https://bugs.gentoo.org/610382
-Upstream commit: https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
-
-# HG changeset patch
-# User Jonathan Wakely <jwakely@redhat.com>
-# Date 1485875296 0
-# Node ID c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a
-# Parent  c4da01699846179d8bf21e8dae2b973158ec0775
-Fix last argument to ChooseMapScreen constructor
-
-Since C++14 'false' is not a valid null pointer constant, so cannot be passed
-to functions expecting pointer arguments.
-
-diff --git a/src/EditorMainMenu.cpp b/src/EditorMainMenu.cpp
---- a/src/EditorMainMenu.cpp
-+++ b/src/EditorMainMenu.cpp
-@@ -90,7 +90,7 @@
- 		}
- 		else if (par1==LOADMAP)
- 		{
--			ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", false);
-+			ChooseMapScreen chooseMapScreen("maps", "map", false, "games", "game", NULL);
- 			int rc=chooseMapScreen.execute(globalContainer->gfx, 40);
- 			if (rc==ChooseMapScreen::OK)
- 			{
-diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp
---- a/src/LANMenuScreen.cpp
-+++ b/src/LANMenuScreen.cpp
-@@ -62,7 +62,7 @@
- 		}
- 		else if(par1 == HOST)
- 		{
--			ChooseMapScreen cms("maps", "map", false, "games", "game", false);
-+			ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
- 			int rc = cms.execute(globalContainer->gfx, 40);
- 			if(rc == ChooseMapScreen::OK)
- 			{
-diff --git a/src/YOGClientLobbyScreen.cpp b/src/YOGClientLobbyScreen.cpp
---- a/src/YOGClientLobbyScreen.cpp
-+++ b/src/YOGClientLobbyScreen.cpp
-@@ -326,7 +326,7 @@
- 
- void YOGClientLobbyScreen::hostGame()
- {
--	ChooseMapScreen cms("maps", "map", false, "games", "game", false);
-+	ChooseMapScreen cms("maps", "map", false, "games", "game", NULL);
- 	int rc = cms.execute(globalContainer->gfx, 40);
- 	if(rc == ChooseMapScreen::OK)
- 	{
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch b/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
deleted file mode 100644
index b3e6e86eb485..000000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-scons-blows.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/SConstruct.orig
-+++ b/SConstruct
-@@ -1,6 +1,7 @@
- EnsureSConsVersion(0, 96, 92)
- import sys
- import os
-+import SCons.Util
- import glob
- sys.path.append( os.path.abspath("scons") )
- import bundle
-@@ -268,6 +269,15 @@
-     env["TARFILE"] = env.Dir("#").abspath + "/glob2-" + env["VERSION"] + ".tar.gz"
-     env["TARFLAGS"] = "-c -z"
-     env.Alias("dist", env["TARFILE"])
-+    # Using suggestions for https://dev.gentoo.org/~vapier/scons-blows.txt
-+    if os.environ.has_key('CC'):
-+           env['CC'] = os.environ['CC']
-+    if os.environ.has_key('CXX'):
-+           env['CXX'] = os.environ['CXX']
-+    if os.environ.has_key('CXXFLAGS'):
-+           env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+    if os.environ.has_key('LDFLAGS'):
-+           env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
- 
-     def PackTar(target, source):
-         if "dist" in COMMAND_LINE_TARGETS:
diff --git a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch b/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
deleted file mode 100644
index 65eba48717db..000000000000
--- a/games-strategy/glob2/files/glob2-0.9.4.4-underlinking.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- glob2-0.9.4.4.orig/SConstruct
-+++ glob2-0.9.4.4/SConstruct
-@@ -110,6 +110,16 @@
-             print "Could not find libz or zlib1.dll"
-             missing.append("zlib")
- 
-+    boost_system = ''
-+    if conf.CheckLib("boost_system"):
-+        boost_system="boost_system"
-+    elif conf.CheckLib("boost_system-mt"):
-+        boost_system="boost_system-mt"
-+    else:
-+        print "Could not find libboost_system or libboost_system-mt"
-+        missing.append("libboost_system")
-+    env.Append(LIBS=[boost_system])
-+
-     boost_thread = ''
-     if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"):
-         boost_thread="boost_thread"
diff --git a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild b/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
deleted file mode 100644
index fe7cdc7b1729..000000000000
--- a/games-strategy/glob2/glob2-0.9.4.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils scons-utils
-
-DESCRIPTION="Real Time Strategy (RTS) game involving a brave army of globs"
-HOMEPAGE="http://globulation2.org/"
-SRC_URI="mirror://nongnu/glob2/${PV:0:5}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/boost-1.34[threads]
-	dev-libs/fribidi
-	media-libs/libsdl[opengl]
-	media-libs/libvorbis
-	media-libs/sdl-image[png]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	media-libs/speex
-	virtual/glu
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-{gcc{44,49,6},scons-blows,underlinking}.patch )
-
-src_configure() {
-	myesconsargs=(
-		INSTALLDIR=/usr/share/${PN}
-		DATADIR=/usr/share/${PN}
-	)
-	escons data
-}
-
-src_compile() {
-	escons
-}
-
-src_install() {
-	dobin src/${PN}
-	insinto /usr/share/${PN}
-	doins -r campaigns data maps scripts
-	find "${ED}"/usr/share/${PN} -name SConscript -exec rm -f '{}' +
-	newicon -s 48 data/icons/glob2-icon-48x48.png ${PN}.png
-	make_desktop_entry glob2 "Globulation 2"
-	einstalldocs
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/glob2/metadata.xml b/games-strategy/glob2/metadata.xml
deleted file mode 100644
index 181fc4eec533..000000000000
--- a/games-strategy/glob2/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-Globulation2 is an innovative high quality Real-Time Strategy [RTS], 
-which minimizes micro-management by automatically assigning tasks to 
-the units. The player has to choose the number of units he wants for 
-the different tasks, and the units will do their best to satisfy the 
-requests. This allows to manage more units and to focus on strategies.
-</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/gorky17-demo-1.0.1.0.1-r1 b/games-strategy/gorky17-demo-1.0.1.0.1-r1
new file mode 100644
index 000000000000..ef7b77107da7
--- /dev/null
+++ b/games-strategy/gorky17-demo-1.0.1.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Horror conspiracy game mixing elements of strategy and role-playing
+EAPI=5
+HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=gorky17
+KEYWORDS=~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] >=sys-libs/zlib-1.2.8-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(-)] games-misc/games-envd
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=http://demofiles.linuxgamepublishing.com/gorky17/gorky17_demo.run http://updatefiles.linuxgamepublishing.com/gorky17-demo/gorky17-demo-1.0-1.0.1-x86.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_=c09c1c4db7aa604298ab9d4751f2113b
diff --git a/games-strategy/gorky17-demo/Manifest b/games-strategy/gorky17-demo/Manifest
deleted file mode 100644
index cf26ab12cdc6..000000000000
--- a/games-strategy/gorky17-demo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gorky17-demo-1.0-1.0.1-x86.run 955547 BLAKE2B 702f4ce40b7a272ee39f8b1e59a0bd559bc4c8520a7406f6d0d4f5a153f4610e54fa628289634c848d30dfe67e56ac59da0678c143f02208847e71b94454b647 SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba
-DIST gorky17_demo.run 158781516 BLAKE2B 7ccb91362bc9d4463a15ad7f47a2c3af9670d0b80655d4a97ec7ab9d7eb861e42dcd39b30fb381b013cb87b853ead8fc3751c1c5d769f8b2bc9465f352339266 SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00
-EBUILD gorky17-demo-1.0.1.0.1-r1.ebuild 1842 BLAKE2B 9c20bdfe15f7110e28e0cac1234109346d29cb4e841871f619824c47681e0184e7d8410c41f17d51b69a1e7ea702ac15c4e9a1d02d3c0a06a85f70739cba77cf SHA512 bfa408ffe721ce04e2df65e4a02c9bc981a0ca796b93b12affc63ba4d75fce7f1b88110af0b7be73bc84fef1cd1f2656ec8aa06343837f525a70a60e8163aed7
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild b/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild
deleted file mode 100644
index 5a65f2538872..000000000000
--- a/games-strategy/gorky17-demo/gorky17-demo-1.0.1.0.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker versionator games
-
-MY_PN="gorky17"
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="Horror conspiracy game mixing elements of strategy and role-playing"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=gorky17"
-SRC_URI="http://demofiles.linuxgamepublishing.com/${MY_PN}/${MY_PN}_demo.run
-	http://updatefiles.linuxgamepublishing.com/gorky17-demo/${PN}-${MY_PV}-x86.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="
-	>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
-	>=sys-libs/zlib-1.2.8-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(-)]"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-QA_EXECSTACK="${dir:1}/gorky17_demo ${dir:1}/gorky17_demo.dynamic"
-
-src_unpack() {
-	unpack_makeself ${MY_PN}_demo.run
-	unpack ./data/data.tar.gz
-
-	mkdir patch_dir
-	cd patch_dir
-	unpack_makeself ${PN}-${MY_PV}-x86.run
-	cd "${S}"
-
-	# Apply patch
-	mv bin/Linux/x86/* .
-	mv patch_dir/*.sh .
-	./patch_dir/bin/Linux/x86/loki_patch patch_dir/patch.dat . || die
-
-	rm -r update.sh *patch.sh data lgp_* patch_dir setup* bin
-}
-
-src_install() {
-	insinto "${dir}"
-	doins -r *
-	rm "${Ddir}"/${MY_PN}*
-
-	exeinto "${dir}"
-	doexe ${MY_PN}*
-
-	games_make_wrapper ${PN} ./${MY_PN}_demo "${dir}" "${dir}"
-	newicon icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gorky 17 (Demo)" ${PN}
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "The instruction manual is available as:"
-	elog "   http://demofiles.linuxgamepublishing.com/gorky17/manual.pdf"
-	echo
-}
diff --git a/games-strategy/gorky17-demo/metadata.xml b/games-strategy/gorky17-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/gorky17-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/gwp-0.4.0-r3 b/games-strategy/gwp-0.4.0-r3
new file mode 100644
index 000000000000..f52dddb2393d
--- /dev/null
+++ b/games-strategy/gwp-0.4.0-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME client for the classic PBEM strategy game VGA Planets 3
+EAPI=5
+HOMEPAGE=http://gwp.lunix.com.ar/
+IUSE=nls opengl python debug python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 gnome-base/libgnomeui gnome-base/libglade app-text/rarian dev-libs/libpcre nls? ( virtual/libintl ) opengl? ( x11-libs/gtkglext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=http://gwp.lunix.com.ar/releases/gwp-0.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5217357bd04fef53dc924b1f2f69427b
diff --git a/games-strategy/gwp/Manifest b/games-strategy/gwp/Manifest
deleted file mode 100644
index e00be7db2e04..000000000000
--- a/games-strategy/gwp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gwp-0.4.0-exec-stack.patch 2842 BLAKE2B 7ab54e843e6b19768f433cae2898e7d9df7380996dc1e2afab8d9d3cf3ce081beef247d12234622e23fe6508aef21f3aecda5f4bc9744be6e9051eabc2aa8751 SHA512 b6845071c5639e4d240742e7470de4723e534814b670e8b98b1971c6e1ae2a64a8d4b8ffaf86ef28bdf3ad6d861dfeee5e2c5e46c43ea955614999fbed46da96
-AUX gwp-0.4.0-gcc41.patch 4100 BLAKE2B 656a9a6b514bd78e61b48a0f43e4230e8164107939c790d599398a0be213383f4f367e9c109cb3935b4a6a150034306f453a72356a2ea408e15e70ffc96ca16b SHA512 0e3acd8978f3a6f1585ad45c2d04c97282daa9173b6d67807d473d79bbc665be4a3471537139e9d710832afeff5e6aa4a3064c3cc36cfe3beba012f330530f31
-DIST gwp-0.4.0.tar.gz 2294453 BLAKE2B 75a688a00b3411c577e6eaae500d15963efb1c96edd82a50863239225fba2d653b52becda8ae71dbe5b88910382d1c64456fc13899e559d3aefefb6bed1e7da5 SHA512 dcb23bb49929bc01129ab5f02b56edb7f775feb0c37bd7613277af8aa0f4b47667f95413725f74a2b83b60159555a50fcabdc8736094aad0684b03cd150b4957
-EBUILD gwp-0.4.0-r3.ebuild 1312 BLAKE2B 7d64a2d61eb2e6359710ea46d8a9e43f08892407cdf9ee8ac6d62681ee29e7d66b11b0aaf0c4c7a78857a6c0e6e46cf16448b7c57f8043246d68d2f084f65cb4 SHA512 6df424a66ea2d011eeeb4b80373f0aeb343f1a12ae56c3a1896d33e16ee4861516ddbf6861878587edf274570bed0555044a6126cf3620e6063571ceab2d24e1
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch b/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch
deleted file mode 100644
index 1458b7ba1dfd..000000000000
--- a/games-strategy/gwp/files/gwp-0.4.0-exec-stack.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/starchart.c
-+++ src/starchart.c
-@@ -3187,10 +3187,16 @@
- /**
-  * Initializes starchart constellations.
-  */
-+static GSList *planets;
-+
-+static void add_item (gpointer key, gpointer value, gpointer user_data) {
-+  /*    GSList *p_list = (GSList *)user_data; */
-+  planets = g_slist_append (planets, value);
-+}
-+
- static void 
- init_starchart_constellations (void)
- {
--  GSList *planets = NULL;
-   GSList *ppq[TOTAL_QUADS];
-   GSList *list_nearby = NULL;
-   GwpPlanet *planet_a, *planet_b;
-@@ -3199,10 +3205,6 @@
-   gdouble wx, wy;
-   gdouble ax, ay, bx, by, zoom;
- 
--  static void add_item (gpointer key, gpointer value, gpointer user_data) {
--    /*    GSList *p_list = (GSList *)user_data; */
--    planets = g_slist_append (planets, value);
--  }
- 
-   g_hash_table_foreach (planet_list, (GHFunc)add_item, NULL);
-   
---- src/vcr.c
-+++ src/vcr.c
-@@ -2687,12 +2687,29 @@
-   return( retval );
- }
- 
-+static gchar *name;
-+
-+static void foreach_func( gpointer key, gpointer value, gpointer user_data )
-+{
-+  GwpShip *ship = GWP_SHIP( value );
-+  GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) );
-+  gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
-+  gint curr = idlist[0];
-+
-+  if( gwp_ship_is_mine( ship ) )
-+  {
-+    curr++;
-+    idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) );
-+    idlist[0]++;
-+    g_sprintf( name, "%03d: ", idlist[curr] );
-+    strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 );
-+    gtk_combo_box_append_text( box, name );
-+  }
-+}
- 
- void vcr_populate_ship_a_list( GtkWidget *widget, gpointer user_data )
- {
--  gchar *name;
-   gint *idlist;
--  static void foreach_func( gpointer key, gpointer value, gpointer user_data );
- 
-   /* test if list is already populated */
-   idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
-@@ -2708,23 +2725,7 @@
-   GtkWidget *combox = lookup_widget("vcr_comboboxentry_sel_ext_shp_a");
-   g_object_set_data(G_OBJECT(combox), "shipidlist", idlist );
- 
--  void foreach_func( gpointer key, gpointer value, gpointer user_data )
--  {
--    GwpShip *ship = GWP_SHIP( value );
--    GtkComboBox *box = GTK_COMBO_BOX( lookup_widget( "vcr_comboboxentry_sel_ext_shp_a" ) );
--    gint *idlist = (gint *)g_object_get_data(G_OBJECT(lookup_widget("vcr_comboboxentry_sel_ext_shp_a")), "shipidlist");
--    gint curr = idlist[0];
- 
--    if( gwp_ship_is_mine( ship ) )
--    {
--      curr++;
--      idlist[curr] = gwp_object_get_id( GWP_OBJECT(ship) );
--      idlist[0]++;
--      g_sprintf( name, "%03d: ", idlist[curr] );
--      strncat( name, gwp_object_get_name (GWP_OBJECT(ship)), 50 );
--      gtk_combo_box_append_text( box, name );
--    }
--  }
- 
-   g_hash_table_foreach( ship_list, (GHFunc) foreach_func, user_data );
- 
diff --git a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch b/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
deleted file mode 100644
index fa7ee5c5443c..000000000000
--- a/games-strategy/gwp/files/gwp-0.4.0-gcc41.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- src/gwp-game-state.c.old	2006-03-05 00:56:48.000000000 +0900
-+++ src/gwp-game-state.c	2006-03-05 00:57:38.000000000 +0900
-@@ -749,7 +749,7 @@
-   /* Connect to interesting signals */
-   /**********************************/
-   /* Selected planets */
--  static void planet_conn (gpointer key, gpointer value, gpointer self) {
-+  void planet_conn (gpointer key, gpointer value, gpointer self) {
-     g_signal_connect (GWP_PLANET(value),
- 		      "selected",
- 		      G_CALLBACK(selected_planet_notification),
-@@ -757,7 +757,7 @@
-   }
-   g_hash_table_foreach (planet_list, (GHFunc) planet_conn, self);
-   /* Selected ships */
--  static void ship_conn (gpointer key, gpointer value, gpointer self) {
-+  void ship_conn (gpointer key, gpointer value, gpointer self) {
-     g_signal_connect (GWP_SHIP(value),
- 		      "selected",
- 		      G_CALLBACK(selected_ship_notification),
---- src/starchart.c.old	2006-03-05 01:13:39.000000000 +0900
-+++ src/starchart.c	2006-03-05 01:18:04.000000000 +0900
-@@ -2111,7 +2111,7 @@
-   /*******************/
-   /* Planets signals */
-   /*******************/
--  static void planet_conn (gpointer key, gpointer value, gpointer data) {
-+  void planet_conn (gpointer key, gpointer value, gpointer data) {
-     g_signal_connect (GWP_PLANET(value),
- 		      "property-changed",
- 		      G_CALLBACK(update_planet_notification),
---- src/vp_utils.c.old	2006-03-05 01:18:14.000000000 +0900
-+++ src/vp_utils.c	2006-03-05 01:18:52.000000000 +0900
-@@ -2590,7 +2590,7 @@
- 	  gwp_planet_set_colonists (planet, atoi(p_clans));
-       
- 	  /* Compare func */
--	  static gint compare_race (gconstpointer race, gconstpointer adj) {
-+	  gint compare_race (gconstpointer race, gconstpointer adj) {
- 	       gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
- 	       if (strncmp(race_str, adj, strlen(adj)) == 0) 
- 		    return 0;
-@@ -2639,7 +2639,7 @@
- 	  /* Assign known planet values */
- 	  gwp_planet_set_is_known (planet, TRUE);
- 	  /* Compare func */
--	  static gint compare_race (gconstpointer race, gconstpointer adj) {
-+	  gint compare_race (gconstpointer race, gconstpointer adj) {
- 	       gchar *race_str = gwp_race_get_adjective(GWP_RACE(race));
- 	       if (strncmp(race_str, adj, strlen(adj)) == 0) 
- 		    return 0;
---- src/gwp-py-mappings.c.old	2006-03-05 01:28:39.000000000 +0900
-+++ src/gwp-py-mappings.c	2006-03-05 01:29:30.000000000 +0900
-@@ -8657,7 +8657,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_ship (gpointer key, gpointer value, gpointer user_data) {
-+  void add_ship (gpointer key, gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpShip *ship = GWP_SHIP(value);
- 
-@@ -8679,7 +8679,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_planet (gpointer key, gpointer value, gpointer user_data) {
-+  void add_planet (gpointer key, gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpPlanet *planet = GWP_PLANET(value);
- 
-@@ -8701,7 +8701,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_hullspec (gpointer value, gpointer user_data) {
-+  void add_hullspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpHullSpec *hullspec = GWP_HULLSPEC(value);
- 
-@@ -8723,7 +8723,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_engspec (gpointer value, gpointer user_data) {
-+  void add_engspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpEngSpec *engspec = GWP_ENGSPEC(value);
- 
-@@ -8745,7 +8745,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_beamspec (gpointer value, gpointer user_data) {
-+  void add_beamspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpBeamSpec *beamspec = GWP_BEAMSPEC(value);
- 
-@@ -8767,7 +8767,7 @@
- {
-   PyObject *ret = PyDict_New();
- 
--  static void add_torpspec (gpointer value, gpointer user_data) {
-+  void add_torpspec (gpointer value, gpointer user_data) {
-     PyObject *dict = (PyObject *)user_data;
-     GwpTorpSpec *torpspec = GWP_TORPSPEC(value);
- 
diff --git a/games-strategy/gwp/gwp-0.4.0-r3.ebuild b/games-strategy/gwp/gwp-0.4.0-r3.ebuild
deleted file mode 100644
index f9a4fa227439..000000000000
--- a/games-strategy/gwp/gwp-0.4.0-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic gnome2 python-single-r1
-
-DESCRIPTION="GNOME client for the classic PBEM strategy game VGA Planets 3"
-HOMEPAGE="http://gwp.lunix.com.ar/"
-SRC_URI="http://gwp.lunix.com.ar/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="x11-libs/gtk+:2
-	gnome-base/libgnomeui
-	gnome-base/libglade
-	app-text/rarian
-	dev-libs/libpcre
-	nls? ( virtual/libintl )
-	opengl? ( x11-libs/gtkglext )
-	python? ( ${PYTHON_DEPS}
-		dev-python/pygtk[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	append-libs -lm
-	epatch \
-		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-exec-stack.patch
-	sed -i \
-		-e '/ -O1/d' \
-		-e '/ -g$/d' \
-		src/Makefile.in || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable opengl gtkglext) \
-		$(use_enable python)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog CHANGES README TODO" \
-	gnome2_src_install
-	rm -rf "${D}"/usr/share/doc/gwp
-}
diff --git a/games-strategy/gwp/metadata.xml b/games-strategy/gwp/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/gwp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/hedgewars-0.9.24.1 b/games-strategy/hedgewars-0.9.24.1
new file mode 100644
index 000000000000..16652d91a6d4
--- /dev/null
+++ b/games-strategy/hedgewars-0.9.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) >=dev-lang/fpc-2.4 dev-qt/linguist-tools:5 server? ( >=dev-lang/ghc-6.10 dev-haskell/entropy dev-haskell/hslogger >=dev-haskell/mtl-2 >=dev-haskell/network-2.3 dev-haskell/random dev-haskell/regex-tdfa dev-haskell/sandi dev-haskell/sha dev-haskell/vector dev-haskell/utf8-string >=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6 ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A turn-based strategy, artillery, action and comedy game
+EAPI=6
+HOMEPAGE=https://www.hedgewars.org/
+IUSE=libav server
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 Apache-2.0 FDL-1.3
+RDEPEND=>=dev-games/physfs-3.0.1 dev-lang/lua:0= dev-qt/qtcore:5= dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libpng:0= media-libs/libsdl2:= media-libs/sdl2-image:= media-libs/sdl2-mixer:=[vorbis] media-libs/sdl2-net:= media-libs/sdl2-ttf:= sys-libs/zlib:= libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) app-arch/xz-utils >=media-fonts/dejavu-2.28 media-fonts/wqy-zenhei
+SLOT=0
+SRC_URI=https://www.hedgewars.org/download/releases/hedgewars-src-0.9.24.1.tar.bz2 mirror://debian/pool/main/h/hedgewars/hedgewars_0.9.23-dfsg-2.debian.tar.xz
+_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_=e3bcd50f1a8718040d8a8793d96668c7
diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest
deleted file mode 100644
index fa8bc20c4461..000000000000
--- a/games-strategy/hedgewars/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX hedgewars-0.9.22-rpath-fix.patch 677 BLAKE2B 361eac896d7c7e9b6b3fa5daf4c24214e868b2098db96445b612f5ac0a9ce3f09ec88ec7feaaa62e75be5e2f61e62e6ecae68417519b907f54e6eac051d320c4 SHA512 d4511d1d3d6da4d30e33cc12b7c12feb6cf25d1fcdaab4b09a7c4f7a2a5282826190a152e6c1609d2afab71ac001557d2a757c232382f5cd471753f8a4cee8ee
-DIST hedgewars-src-0.9.24.1.tar.bz2 175069915 BLAKE2B 5c49b91b9a77a110a7bc8667f9621c92d638950071c8db7493b7797c2e504a214052fad6ae8554d844146eecabd794529891aebf4e54ee73f8a447ab11c6c7da SHA512 b0b166c807e0d08a763e5e88e178d6e629baa420685bbfe381db7b5ecf003175892f8c2e3b75f1f6d7663335bd5b417d1a2afdc89b9d56b348b056ee3490ed2f
-DIST hedgewars_0.9.23-dfsg-2.debian.tar.xz 77488 BLAKE2B 5de6fa2ad91f1346f679d07b3b445bd119d2cdd3c715ace20fc36abe726330ccf9a9b69ec56c58cfca4cc6256ff248b0cc0b0e27caf2a79df0f1662ea7727e8e SHA512 03680446930279178ddff85a87fc27b7c26ad6d850c8f26571517ebbd6dff296db216da6b56d4bd55c659786bc5c76e2b67a63052ee38e150655e60c08f7c491
-EBUILD hedgewars-0.9.24.1.ebuild 2693 BLAKE2B ea23fac741436c809f3642818833f23ccefe362b14b4576b0f26dc156e85e2e56b1d94d87002475c7788e645f9d676a343f0abb9f741c98313fb81ba10fc4dae SHA512 710ef2dec6586ae25603552cc5a02213bcb8ff4aa5a0b3037608c9ddb39f83d6e68c90097063757e8cc69bb9fa853f7fa88fae33fad394cdee57aa08c45f7d09
-MISC metadata.xml 310 BLAKE2B 0893b58ddb3ed4a4d6a73bd5cc4d31558d185953ea37fd15f9e067804b8fd4aad9021666f35feabe695fc34df502f1c1c814e52b717fdb26a5f419c07e5696a0 SHA512 aab3f53bd107c152983576ef65b7021002724f73e0a8cbda391284347eff3eb8d8489cb26fae34512e3a58bc9529903c05f41c1277e25af155215308b3da462b
diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch b/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
deleted file mode 100644
index 881c0d3217d6..000000000000
--- a/games-strategy/hedgewars/files/hedgewars-0.9.22-rpath-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/cmake_modules/paths.cmake	2015-12-02 15:02:38.000000000 +0100
-+++ b/cmake_modules/paths.cmake	2015-12-02 15:15:24.729980850 +0100
-@@ -67,5 +67,5 @@ else(APPLE AND NOT (${CMAKE_INSTALL_PREF
-     # - the third one is the full path of the system dir
-     #source http://www.cmake.org/pipermail/cmake/2008-January/019290.html
-     #skip this if the install prefix is the standard one
--    set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
-+    #set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/")
- endif(APPLE)
diff --git a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild b/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
deleted file mode 100644
index 3e592af7ebfa..000000000000
--- a/games-strategy/hedgewars/hedgewars-0.9.24.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake-utils desktop xdg-utils
-
-MY_P=${PN}-src-${PV}
-DEB_PATCH_VER=2
-
-DESCRIPTION="A turn-based strategy, artillery, action and comedy game"
-HOMEPAGE="https://www.hedgewars.org/"
-SRC_URI="https://www.hedgewars.org/download/releases/${MY_P}.tar.bz2
-	mirror://debian/pool/main/h/${PN}/${PN}_0.9.23-dfsg-${DEB_PATCH_VER}.debian.tar.xz"
-
-LICENSE="GPL-2 Apache-2.0 FDL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libav server"
-
-QA_FLAGS_IGNORED="/usr/bin/hwengine" # pascal sucks
-QA_PRESTRIPPED="/usr/bin/hwengine" # pascal sucks
-
-# qtcore:5= - depends on private header
-CDEPEND="
-	>=dev-games/physfs-3.0.1
-	dev-lang/lua:0=
-	dev-qt/qtcore:5=
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/sdl2-image:=
-	media-libs/sdl2-mixer:=[vorbis]
-	media-libs/sdl2-net:=
-	media-libs/sdl2-ttf:=
-	sys-libs/zlib:=
-	libav? ( media-video/libav:= )
-	!libav? ( media-video/ffmpeg:= )"
-DEPEND="${CDEPEND}
-	>=dev-lang/fpc-2.4
-	dev-qt/linguist-tools:5
-	server? (
-		>=dev-lang/ghc-6.10
-		dev-haskell/entropy
-		dev-haskell/hslogger
-		>=dev-haskell/mtl-2
-		>=dev-haskell/network-2.3
-		dev-haskell/random
-		dev-haskell/regex-tdfa
-		dev-haskell/sandi
-		dev-haskell/sha
-		dev-haskell/vector
-		dev-haskell/utf8-string
-		>=dev-haskell/zlib-0.5.3 <dev-haskell/zlib-0.6
-	)"
-RDEPEND="${CDEPEND}
-	app-arch/xz-utils
-	>=media-fonts/dejavu-2.28
-	media-fonts/wqy-zenhei"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.22-rpath-fix.patch
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DMINIMAL_FLAGS=ON
-		-DDATA_INSTALL_DIR="${EPREFIX}/usr/share/${PN}"
-		-Dtarget_binary_install_dir="${EPREFIX}/usr/bin"
-		-Dtarget_library_install_dir="${EPREFIX}/usr/$(get_libdir)"
-		-DNOSERVER=$(usex server FALSE TRUE)
-		-DCMAKE_VERBOSE_MAKEFILE=TRUE
-		-DPHYSFS_SYSTEM=ON
-		# Need to tell the build system where the fonts are located
-		# as it uses PhysFS' symbolic link protection mode which
-		# prevents us from symlinking the fonts into the right directory
-		#   https://hg.hedgewars.org/hedgewars/rev/76ad55807c24
-		#   https://icculus.org/physfs/docs/html/physfs_8h.html#aad451d9b3f46f627a1be8caee2eef9b7
-		-DFONTS_DIRS="${EPREFIX}/usr/share/fonts/wqy-zenhei;${EPREFIX}/usr/share/fonts/dejavu"
-		# upstream sets RPATH that leads to weird breakage
-		# https://bugzilla.redhat.com/show_bug.cgi?id=1200193
-		-DCMAKE_SKIP_RPATH=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman man/${PN}.6
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/games-strategy/hedgewars/metadata.xml b/games-strategy/hedgewars/metadata.xml
deleted file mode 100644
index c8b942447c41..000000000000
--- a/games-strategy/hedgewars/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<use>
-	<flag name="server">Enable local server</flag>
-</use>
-</pkgmetadata>
diff --git a/games-strategy/heroes3-1.3.1a-r2 b/games-strategy/heroes3-1.3.1a-r2
new file mode 100644
index 000000000000..c1ccfcd28392
--- /dev/null
+++ b/games-strategy/heroes3-1.3.1a-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND==dev-util/xdelta-1* games-util/loki_patch
+DESCRIPTION=Heroes of Might and Magic III: The Restoration of Erathia
+EAPI=5
+HOMEPAGE=http://www.lokigames.com/products/heroes3/
+IUSE=nocd maps music sounds videos
+KEYWORDS=~amd64 ~x86
+LICENSE=LOKI-EULA
+PROPERTIES=interactive
+RDEPEND=!ppc? ( sys-libs/lib-compat-loki ) games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=x86? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) amd64? ( mirror://lokigames/heroes3/heroes3-1.3.1a-cdrom-x86.run ) ppc? ( mirror://lokigames/heroes3/heroes3-1.3.1a-ppc.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_=491f821945f5c93f12ff0187b305461d
diff --git a/games-strategy/heroes3-demo-1.3.1a b/games-strategy/heroes3-demo-1.3.1a
new file mode 100644
index 000000000000..35d98b231cce
--- /dev/null
+++ b/games-strategy/heroes3-demo-1.3.1a
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-util/loki_patch
+DESCRIPTION=turn-based 2D medieval combat
+EAPI=5
+HOMEPAGE=http://www.lokigames.com/products/heroes3/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=sys-libs/lib-compat-loki-0.2 || ( ppc? ( x11-libs/libX11 ) !ppc? ( x11-libs/libX11[abi_x86_32(-)] ) ) games-misc/games-envd
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=mirror://lokigames/loki_demos/heroes3-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_=097d6450540d903a28c950519ef41070
diff --git a/games-strategy/heroes3-demo/Manifest b/games-strategy/heroes3-demo/Manifest
deleted file mode 100644
index fefb12231eec..000000000000
--- a/games-strategy/heroes3-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST heroes3-demo.run 99026773 BLAKE2B 48963111c1f076acc2eb3f34a3b86d64943777ea76e8fba09f883bdfe4b89c4daa07e9e5dc584f2a11adda957869728c0806726ef21c6ff82843605e32e34ab7 SHA512 a3f60f12f7ce8ea0f160ec211e1f077693ff2f5e4b8b85ae0e31f1230a910b4df7c8c6a340762d4f09c9845d6141d235307f933305557a75fc63f409e077ac71
-EBUILD heroes3-demo-1.3.1a.ebuild 1438 BLAKE2B bfa532c2791435d8ce9be9f2cf92d68e770c512f1fd8c3da49c13fb80c4f776f2b63a7e7a6af7f139959821c954a1256773232ca1b43951d6ebf0bf360f7329b SHA512 a5dd6d09ba5d48b505bf610fdddcefd537c1263d33f5de8d7076529c841910711bbdfd5579c7bfa0574a9d8c23afd4bf2decf0d349ac9a33903f635ed11ee00c
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild b/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
deleted file mode 100644
index d20f909b2cb3..000000000000
--- a/games-strategy/heroes3-demo/heroes3-demo-1.3.1a.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_PN=${PN%-demo}
-
-DESCRIPTION="turn-based 2D medieval combat"
-HOMEPAGE="http://www.lokigames.com/products/heroes3/"
-SRC_URI="mirror://lokigames/loki_demos/${PN}.run"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-# Should also work on ppc
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND=">=sys-libs/lib-compat-loki-0.2
-	|| (
-		ppc? (
-			x11-libs/libX11
-		)
-		!ppc? (
-			x11-libs/libX11[abi_x86_32(-)]
-		)
-	)"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-QA_PREBUILT="${dir:1}/*"
-
-S=${WORKDIR}
-
-src_install() {
-	# Apply patch
-	loki_patch patch.dat data/ || die
-
-	local demo="data/demos/${MY_PN}_demo"
-
-	local exe_stub="${MY_PN}_demo"
-	if use ppc ; then
-		exe="${exe_stub}.ppc"
-	else
-		exe="${exe_stub}.x86"
-	fi
-
-	insinto "${dir}"
-	exeinto "${dir}"
-	doins -r "${demo}"/*
-	rm "${D}/${dir}"/{${exe_stub}*,*.sh} || die
-	doexe "${demo}/${exe}"
-
-	einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-	dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
-	dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
-	dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
-
-	games_make_wrapper ${PN} "./${exe}" "${dir}"
-	newicon "${demo}/icon.xpm" ${PN}.png
-	make_desktop_entry ${PN} "Heroes of Might and Magic III (Demo)" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-strategy/heroes3-demo/metadata.xml b/games-strategy/heroes3-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/heroes3-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/heroes3/Manifest b/games-strategy/heroes3/Manifest
deleted file mode 100644
index bf69810036c1..000000000000
--- a/games-strategy/heroes3/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX heroes3-wrapper.sh 195 BLAKE2B 8c588f523487201cc7323f49e0912c32dee2699d04ed4ac9bea55aa588918fc797c93d2fbeb04aa5a726ebce01e0862d5e21a80d477f1e32f535f5c5c9d771ef SHA512 ac1871676ffb0c818ddd9dcadad031d3e296982a989dcc91241b2630eb773e341058e1d4406374a21bcc0f6c8caba94398541ddbc540e7c140660838ef3ed0c8
-DIST heroes3-1.3.1a-cdrom-x86.run 3012188 BLAKE2B 9a76fef81737fd4d0bd6d6c75a5c845a8fef00e739463737996b2065cc9be0c773c198d76310ceafb25cd60b01ded7862cc3ef906eebbe91d50d5f34d454a23a SHA512 d0cb902386361b17009aece0d0508a0c19683c71acf3abe11a7f50ec2d4710a89cda3f5f9da326b58e9b945da5f62533dea54457e141ce71ebc3e9945dca814d
-DIST heroes3-1.3.1a-ppc.run 2643068 BLAKE2B bb975aca97d5b753badb6f0511f2bc88f3ace3488f82a1d70ddd5cadf78f8ab57c4472f6d3d3e9f69728d1008d51ab31a816660611e421873f7b773bf76fb23e SHA512 3578dbed0ed9fd47f67e6abaec4b4d66628160509e68dc3bea7b5288230e344b5b8f9d380c6a35ffc9d084d0e2a54ce84df72b13bfb609fa4d7edd1456264276
-EBUILD heroes3-1.3.1a-r2.ebuild 5478 BLAKE2B 6b13ab2a5bf911b39b36d73cdb702f6f643cdb993ed9a2130799eb8f16427b54dbb66bedbc1fba5b8ebc85c7bc4213b0fd2bb6f59b6adb6804dc8013325372c0 SHA512 56678d9f57e964d89f93fa61a11c2cb3c2b476bbe982a1b861b01859655de51a579e34114b210d2fba412506ffe2db3693a035b854acd0e7e4ba1142596595c9
-MISC metadata.xml 451 BLAKE2B ea23bfe60a36d79f73d5ec04c4b58fe66241baff684458e6121f0f247ee8516767f372551e8b17933cbdb4271d3e99f6028c9a99136daa6e8b558e7a918acf2a SHA512 d4b4f5dd75aec49703e77221d3811c20f72405f45f5ac7990e46a8cf8d639f3c53c5bfae13e6615c0a0ac16ee57073c8e92de355f7e1ac934d9be6b90bce6990
diff --git a/games-strategy/heroes3/files/heroes3-wrapper.sh b/games-strategy/heroes3/files/heroes3-wrapper.sh
deleted file mode 100644
index 3847c539ed76..000000000000
--- a/games-strategy/heroes3/files/heroes3-wrapper.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-DIR="${HOME}/.loki/heroes3"
-
-if [ ! -d "${DIR}" ]; then
-    echo "* Creating '${DIR}'"
-    mkdir -p ${DIR}
-fi
-
-# fixes bug #93604
-cd ${DIR}
-
-exec GAMES_PREFIX_OPT/heroes3/heroes3 ${@}
diff --git a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild b/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
deleted file mode 100644
index a08da4b3256a..000000000000
--- a/games-strategy/heroes3/heroes3-1.3.1a-r2.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-#	[x] Base Install Required (+4 MB)
-#	[x] Scenarios (+7 MB)
-#	[x] Sounds and Graphics (+118 MB)
-#	[x] Music (+65 MB)
-#	[x] Videos (+147 MB)
-#	--------------------
-#	Total 341 MB
-
-EAPI=5
-LANGS="de es pl"
-LANGPACKPREFIX="${PN}-lang"
-LANGPACKBASE="http://babelize.org/download/"
-LANGPACKPATHPREFIX="${LANGPACKBASE}/${LANGPACKPREFIX}"
-LANGPACKVERSION=1.0.4
-
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Heroes of Might and Magic III: The Restoration of Erathia"
-HOMEPAGE="http://www.lokigames.com/products/heroes3/"
-
-# Since I do not have a PPC machine to test with, I will leave the PPC stuff in
-# here so someone else can stabilize loki_setupdb and loki_patch for PPC and
-# then KEYWORD this appropriately.
-SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
-	amd64? ( mirror://lokigames/${PN}/${P}-cdrom-x86.run )
-	ppc? ( mirror://lokigames/${PN}/${P}-ppc.run )"
-# This is commented because the server is unreachable.
-#	linguas_es? ( ${LANGPACKPATHPREFIX}-es.tar.gz )
-#	linguas_de? ( ${LANGPACKPATHPREFIX}-de.tar.gz )
-#	linguas_pl? ( ${LANGPACKPATHPREFIX}-pl.tar.gz )"
-
-#		${LANGPACKBASE}/${PN}-localize-${LANGPACKVERSION}.run
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-IUSE="nocd maps music sounds videos"
-#linguas_en linguas_es linguas_pl linguas_de"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="strip"
-
-DEPEND="=dev-util/xdelta-1*
-	games-util/loki_patch"
-RDEPEND="!ppc? ( sys-libs/lib-compat-loki )"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-#	strip-linguas en ${LANGS}
-
-	use nocd && fullinstall=1
-	use sounds && use videos && use maps && fullinstall=1
-
-	[[ ${fullinstall} -eq 1 ]] \
-		&& ewarn "The full installation takes about 341 MB of space!"
-
-#	if [[ -n "${fullinstall}" ]]
-#	then
-#		langcount=0
-#		for i in ${LINGUAS}
-#		do
-#			i="${i/_/-}"
-#			if [[ ${i} != "en" ]]
-#			then
-#				let $((++langcount))
-#				if [[ $langcount = 2 ]]
-#				then
-#					eerror "Heroes3 only supports one localization at once!"
-#					die "Localization is only supported when Heroes3 is in a single language!"
-#				fi
-#			fi
-#		done
-#	else
-#		for i in ${LINGUAS}
-#		do
-#			i="${i/_/-}"
-#			if [[ ${i} != "en" ]]
-#			then
-#				eerror "Full installation (nocd flag or data + video + maps flags) is needed for ${i} language!"
-#				die "Localization is only supported when Heroes3 is fully locally installed!"
-#			fi
-#		done
-#	fi
-}
-
-src_unpack() {
-	cdrom_get_cds hiscore.tar.gz
-	(use x86 || use amd64) && unpack_makeself ${P}-cdrom-x86.run
-	use ppc && unpack_makeself ${P}-ppc.run
-
-#	for i in ${LINGUAS}
-#	do
-#		i="${i/_/-}"
-#		if [[ ${i} != "en" ]]
-#		then
-#			mkdir localize
-#			cd localize
-##			unpack_makeself ${PN}-localize-${LANGPACKVERSION}.run
-#			unpack ${LANGPACKPREFIX}-${i}.tar.gz
-#			break
-#		fi
-#	done
-}
-
-src_install() {
-	exeinto "${dir}"
-	insinto "${dir}"
-	einfo "Copying files... this may take a while..."
-	doexe "${CDROM_ROOT}"/bin/x86/${PN}
-	doins "${CDROM_ROOT}"/{Heroes_III_Tutorial.pdf,README,icon.{bmp,xpm}}
-
-	if use nocd
-	then
-		doins -r "${CDROM_ROOT}"/{data,maps,mp3}
-	else
-		if use maps
-		then
-			doins -r "${CDROM_ROOT}"/maps
-		fi
-		if use music
-		then
-			doins -r "${CDROM_ROOT}"/mp3
-		fi
-		if use sounds
-		then
-			insinto "${dir}"/data
-			doins "${CDROM_ROOT}"/data/{*.lod,*.snd}
-		fi
-		if use videos
-		then
-			doins -r "${CDROM_ROOT}"/data/video
-		fi
-	fi
-
-#	if [[ -n "${fullinstall}" ]]
-#	then
-#		for i in ${LINGUAS}
-#		do
-#			i="${i/_/-}"
-#			if [[ ${i} != "en" ]]
-#			then
-#				find "${S}/localize/${i}" -type f | while read xfile
-#				do
-#					local file=$(echo "${xfile}" | \
-#						sed "s#^${S}/localize/${i}/##;s#\.xdelta\$##")
-#					ebegin "Localizing ${file}"
-#					xdelta patch "${xfile}" "${Ddir}/${file}" "${Ddir}/${file}.xdp"
-#					local retval=$?
-#					if [[ $retval = 0 ]]
-#					then
-#						mv -f  "${Ddir}/${file}.xdp" "${Ddir}/${file}"
-#					else
-#						rm -f "${Ddir}/${file}.xdp"
-#					fi
-#					eend $retval "File $file could not be localized/patched! Original english version untouched..."
-#				done
-#				break
-#			fi
-#		done
-#	fi
-
-	tar zxf "${CDROM_ROOT}"/hiscore.tar.gz -C "${Ddir}" || die
-
-	cd "${S}"
-	loki_patch --verify patch.dat
-	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 '{}' \;
-
-	newicon "${CDROM_ROOT}"/icon.xpm heroes3.xpm
-
-	prepgamesdirs
-	make_desktop_entry heroes3 "Heroes of Might and Magic III" "heroes3"
-
-	if ! use ppc
-	then
-		einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-		dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2
-		dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6
-		dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
-	fi
-
-	elog "Changing 'hiscore.dat' to be writeable for group 'games'."
-	fperms g+w "${dir}/data/hiscore.dat"
-
-	# in order to play campaign games, put this wrapper in place.
-	# it changes CWD to a user-writeable directory before executing heroes3.
-	# (fixes bug #93604)
-	einfo "Preparing wrapper."
-	cp "${FILESDIR}"/heroes3-wrapper.sh "${T}"/heroes3 || die
-	sed -i -e "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" "${T}"/heroes3 || die
-	dogamesbin "${T}"/heroes3
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To play the game run:"
-	elog " heroes3"
-}
diff --git a/games-strategy/heroes3/metadata.xml b/games-strategy/heroes3/metadata.xml
deleted file mode 100644
index 5ae90d93661b..000000000000
--- a/games-strategy/heroes3/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="maps">Installs optional map data</flag>
-    <flag name="music">Installs optional music data</flag>
-    <flag name="sounds">Installs optional sound data</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-strategy/ja2-stracciatella-0.12.1_p7072 b/games-strategy/ja2-stracciatella-0.12.1_p7072
new file mode 100644
index 000000000000..e05755dc9295
--- /dev/null
+++ b/games-strategy/ja2-stracciatella-0.12.1_p7072
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib )
+DESCRIPTION=A port of Jagged Alliance 2 to SDL
+EAPI=5
+HOMEPAGE=https://ja2-stracciatella.github.io/
+IUSE=cdinstall editor ru-gold zlib l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru
+KEYWORDS=~amd64 ~x86
+LICENSE=SFI-SCLA
+RDEPEND=media-libs/libsdl[X,sound,video] zlib? ( sys-libs/zlib ) cdinstall? ( games-strategy/ja2-stracciatella-data ) games-misc/games-envd
+REQUIRED_USE=^^ ( l10n_de l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/ja2-stracciatella-0.12.1_p7072.tar.xz http://tron.homeunix.org/ja2/editor.slf.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_=086b7aaf5ca83848d553811f45b09f84
diff --git a/games-strategy/ja2-stracciatella-data-1 b/games-strategy/ja2-stracciatella-data-1
new file mode 100644
index 000000000000..d69e038b7719
--- /dev/null
+++ b/games-strategy/ja2-stracciatella-data-1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=app-arch/unshield
+DESCRIPTION=A port of Jagged Alliance 2 to SDL (data files)
+EAPI=5
+HOMEPAGE=http://tron.homeunix.org/ja2/
+KEYWORDS=~amd64 ~x86
+LICENSE=SIR-TECH
+PROPERTIES=interactive
+RDEPEND=games-misc/games-envd
+SLOT=0
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cdrom	c64e4c5e9cbf2a58be31431e015a6210	check-reqs	fd05cf75484aa28d307cf4ee6e1db056	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a78ea64451dfed10553aef455e664bb1
diff --git a/games-strategy/ja2-stracciatella-data/Manifest b/games-strategy/ja2-stracciatella-data/Manifest
deleted file mode 100644
index df17ad7cc8a7..000000000000
--- a/games-strategy/ja2-stracciatella-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD ja2-stracciatella-data-1.ebuild 1313 BLAKE2B cecb581bcd57959652149938e091f4baf50923b22587fe27718d8350cd2288f316b20dcb7303fb9dcced26210d2680483f17aafec019af243b263c5801a16bcc SHA512 3718d75c55421e216a72d4a04d296b6ebb7567d7532fd189e7da0a125a8ae1947f132ac3779088ce2778e3878321d4921241917048b34ed53b7eda1d9e7ee6f0
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild b/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
deleted file mode 100644
index f25285d68939..000000000000
--- a/games-strategy/ja2-stracciatella-data/ja2-stracciatella-data-1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cdrom check-reqs games
-
-DESCRIPTION="A port of Jagged Alliance 2 to SDL (data files)"
-HOMEPAGE="http://tron.homeunix.org/ja2/"
-SRC_URI=""
-
-LICENSE="SIR-TECH"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="app-arch/unshield"
-
-S=${WORKDIR}
-
-CHECKREQS_DISK_BUILD="3G"
-CHECKREQS_DISK_USR="1G"
-
-src_unpack() {
-	export CDROM_NAME="INSTALL_CD"
-
-	cdrom_get_cds INSTALL/data1.cab
-
-	# this makes some serious overhead
-	unshield x "${CDROM_ROOT}"/INSTALL/data1.cab || die "unpacking failed"
-}
-
-src_prepare() {
-	cd "${S}"/Ja2_Files/Data || die
-	local lower i
-
-	# convert to lowercase
-	find . \( -iname "*.jsd" -o -iname "*.wav" -o -iname "*.sti" -o -iname "*.slf" \) \
-		-exec sh -c 'echo "${1}"
-	lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-	[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}`
-	[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-	# remove possible leftover
-	rm -r ./TILECACHE ./STSOUNDS
-}
-
-src_install() {
-	insinto "${GAMES_DATADIR}"/ja2/data
-	doins -r "${S}"/Ja2_Files/Data/*
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "This is just the data portion of the game. You will need to install"
-	elog "games-strategy/ja2-stracciatella to play the game."
-}
diff --git a/games-strategy/ja2-stracciatella-data/metadata.xml b/games-strategy/ja2-stracciatella-data/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-strategy/ja2-stracciatella-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/ja2-stracciatella/Manifest b/games-strategy/ja2-stracciatella/Manifest
deleted file mode 100644
index c5c81c574245..000000000000
--- a/games-strategy/ja2-stracciatella/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX ja2-convert.sh 411 BLAKE2B 5b6f0682475d1cdacd914f9b0656e35608631e814ac54be81f19cfa39565e9d334499ec658095d3071fa2eb7c9200a81fe5650e4eea16a2077c86dd3edae2261 SHA512 478a8e94c10d69c18812a42fdc6766b77ef743793df38665677e9a878743a770a5565fed1a487e992ce0609d0fa371fb027ee55a9e01c32c283ad75f8a62c09d
-AUX ja2-stracciatella-0.12.1_p7072-gcc6.patch 526 BLAKE2B 22567919e68d467447befb3bb3a42bd64a80df24166375f0925d8d7237bb4471daa1a7a617a193ed9b3320c4fa1ae2bfd37116bc91aae0cb41fd5ca56abfa7f4 SHA512 15aabca2fc0e9d7cab0b4c7ed471eda8029e073250959f038a714eccbddddc1a0dc0aab54e7f45dd988347b52346386e90e75c29025698c9d7814c3fb10a5b1f
-AUX ja2-stracciatella-0.12.1_p7072-makefile.patch 3666 BLAKE2B 11c110649dce7650a315511edbff12036ad2a257d7d4c3d4da5a14a7d3ae0e9949fc2c8b5f435789a3090cf2a200f4b1d9e2175a1fa94466eaa6e1c209bfcee7 SHA512 07cd2f1367bd9dbad9bc6ec3d633fc77bf337dddf69d69da7c297722c1684c9c80e88b918b89dc2e02e83160b224cf7b22f6e21fce2de525ee480a513c64cd99
-DIST editor.slf.gz 134265 BLAKE2B 0a379a2340ad717b2be913eb7368a73232a231e7cf2753f2569bfe3027f51e5e4b8aac8cb15982b6d46161529054c3f15ae11849faae42ed34c8d4dbb4aa52c3 SHA512 243e3bf5e7298c3a71b330985f5c4d4df3e4cb43df32c823d835353d6309a64f62679c3d0634ca162f6484f7cbf366627e57b1d967188c13940db8933a5f03f2
-DIST ja2-stracciatella-0.12.1_p7072.tar.xz 2118832 BLAKE2B 229cd30891216ba305f8b81764b57edf4179bb09a783d2619242c6e3cbeb29f131cb1901934364d952b54796c8398985a54cbf465d36f737c438958c145dcdb1 SHA512 9269c9e2e179d705b6d83dfac56c604eaefbe5bffe5c16e3f26c1209d3842bbac22db19362e51acf0c6602d64a283d2ec4fa19b0f37d1cddfb013f686c936411
-EBUILD ja2-stracciatella-0.12.1_p7072.ebuild 2109 BLAKE2B 184b1753465260dcdd0d175f0b9b6c1af01ff3486111cd4f6fb2f1d08ec000a231feee8ca62c65f66f0fed2e67e9e8eab6892d78c753d046d5ea19bb597cbfd2 SHA512 3974587fbc679732a92cab1b7418fb90f4cbf9d7aa8f0e8c28c4bfae106379bc13c8184fa0680c604af3af1dfd83c8af9b630416c3267c61da0de1013f756d11
-MISC metadata.xml 402 BLAKE2B 4329f4f00399517a6c54e94930d5ecaebd78d2321fb479f3de4faf42783ea8c3e081fca8b16e129d6351fc6e2d5e47b17273198ea1da851578dfa59091900736 SHA512 7f56ace0297b3af4c5d4f386428d9341bb7ca462370abf4c8b4814fce550b724f40f97d876b350ab8b1dd8f0c6916e20ca90a32de07d400739bfa40e004d1dbf
diff --git a/games-strategy/ja2-stracciatella/files/ja2-convert.sh b/games-strategy/ja2-stracciatella/files/ja2-convert.sh
deleted file mode 100644
index 4f337ca75351..000000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-convert.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# Convert names of data-files to lower-case
-
-# location of the data-files
-GAMES_DATADIR=@GAMES_DATADIR@
-
-cd "${GAMES_DATADIR}" || exit 1
-
-# convert to lowercase
-find . -exec sh -c 'echo "${1}"
-lower="`echo "${1}" | tr [:upper:] [:lower:]`"
-[ -d `dirname "${lower}"` ] || mkdir `dirname ${lower}`
-[ "${1}" = "${lower}" ] || mv "${1}" "${lower}"' - {} \;
-
-# remove leftover
-rm -r ./TILECACHE ./STSOUNDS
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
deleted file mode 100644
index 2661b19d6c77..000000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-gcc6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Bug: https://bugs.gentoo.org/600082
-
---- a/Build/Laptop/BobbyRGuns.cc
-+++ b/Build/Laptop/BobbyRGuns.cc
-@@ -700,7 +700,7 @@
- 	//center picture in frame
- 	ETRLEObject const& pTrav   = uiImage->SubregionProperties(0);
- 	UINT32      const  usWidth = pTrav.usWidth;
--	INT16       const  sCenX   = PosX + abs(BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
-+	INT16       const  sCenX   = PosX + (BOBBYR_GRID_PIC_WIDTH - usWidth) / 2 - pTrav.sOffsetX;
- 	INT16       const  sCenY   = PosY + 8;
- 
- 	//blt the shadow of the item
diff --git a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch b/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
deleted file mode 100644
index 0475773bd361..000000000000
--- a/games-strategy/ja2-stracciatella/files/ja2-stracciatella-0.12.1_p7072-makefile.patch
+++ /dev/null
@@ -1,179 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue May  8 19:16:08 UTC 2012
-Subject: build system
-
---- Makefile
-+++ Makefile
-@@ -16,106 +16,94 @@
- MANPREFIX ?= $(PREFIX)
- 
- INSTALL         ?= install
--INSTALL_PROGRAM ?= $(INSTALL) -m 555 -s
--INSTALL_MAN     ?= $(INSTALL) -m 444
--INSTALL_DATA    ?= $(INSTALL) -m 444
-+INSTALL_PROGRAM ?= $(INSTALL) -m 755
-+INSTALL_MAN     ?= $(INSTALL) -m 644
-+INSTALL_DATA    ?= $(INSTALL) -m 644
- 
-+# compiler CFLAGS
-+CFLAGS += -std=gnu99
- 
-+# sdl-flags
- SDL_CONFIG  ?= sdl-config
- ifndef CFLAGS_SDL
- CFLAGS_SDL  := $(shell $(SDL_CONFIG) --cflags)
- endif
- ifndef LDFLAGS_SDL
--LDFLAGS_SDL := $(shell $(SDL_CONFIG) --libs)
-+LIBS_SDL := $(shell $(SDL_CONFIG) --libs)
- endif
- 
-+# LIBS
-+LIBS += $(LIBS_SDL)
-+LIBS += -lm
-+
-+ifdef WITH_ZLIB
-+LIBS += -lz
-+endif
- 
--CFLAGS += $(CFLAGS_SDL)
--CFLAGS += -I Build
--CFLAGS += -I Build/Tactical
--CFLAGS += -I Build/Strategic
--CFLAGS += -I Build/Editor
--CFLAGS += -I Build/Res
--CFLAGS += -I Build/Laptop
--CFLAGS += -I Build/Utils
--CFLAGS += -I Build/TileEngine
--CFLAGS += -I Build/TacticalAI
--CFLAGS += -I sgp
--
--#CFLAGS += -Wall
--#CFLAGS += -W
--CFLAGS += -Wpointer-arith
--CFLAGS += -Wreturn-type
--CFLAGS += -Wunused-label
--CFLAGS += -Wunused-variable
--CFLAGS += -Wwrite-strings
- 
--CFLAGS += -DJA2
-+# preprocessor flags
-+CPPFLAGS += $(CFLAGS_SDL)
-+CPPFLAGS += -I Build
-+CPPFLAGS += -I Build/Tactical
-+CPPFLAGS += -I Build/Strategic
-+CPPFLAGS += -I Build/Editor
-+CPPFLAGS += -I Build/Res
-+CPPFLAGS += -I Build/Laptop
-+CPPFLAGS += -I Build/Utils
-+CPPFLAGS += -I Build/TileEngine
-+CPPFLAGS += -I Build/TacticalAI
-+CPPFLAGS += -I sgp
- 
-+CPPFLAGS += -DJA2
- 
- ifdef WITH_DEMO
--  CFLAGS += -DJA2DEMO
-+  CPPFLAGS += -DJA2DEMO
- endif
- 
- ifdef WITH_DEMO_ADS
-   ifndef WITH_DEMO
-     $(error WITH_DEMO_ADS needs WITH_DEMO)
-   endif
--  CFLAGS += -DJA2DEMOADS
-+  CPPFLAGS += -DJA2DEMOADS
- endif
- 
- ifdef WITH_FIXMES
--  CFLAGS += -DWITH_FIXMES
-+  CPPFLAGS += -DWITH_FIXMES
- endif
- 
- ifdef WITH_MAEMO
--  CFLAGS += -DWITH_MAEMO
-+  CPPFLAGS += -DWITH_MAEMO
- endif
- 
- ifdef WITH_SOUND_DEBUG
--  CFLAGS += -DWITH_SOUND_DEBUG
-+  CPPFLAGS += -DWITH_SOUND_DEBUG
- endif
- 
- ifdef _DEBUG
--  CFLAGS += -D_DEBUG
-+  CPPFLAGS += -D_DEBUG
-   ifndef JA2TESTVERSION
-     JA2TESTVERSION := yes
-   endif
- endif
- 
- ifdef JA2TESTVERSION
--  CFLAGS += -DJA2TESTVERSION
-+  CPPFLAGS += -DJA2TESTVERSION
-   ifndef JA2BETAVERSION
-   	JA2BETAVERSION := yes
-   endif
- endif
- 
- ifdef JA2BETAVERSION
--CFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
-+CPPFLAGS += -DJA2BETAVERSION -DSGP_DEBUG -DFORCE_ASSERTS_ON -DSGP_VIDEO_DEBUGGING
- endif
- 
- ifdef JA2EDITOR
--CFLAGS += -DJA2EDITOR
-+CPPFLAGS += -DJA2EDITOR
- endif
- 
--CFLAGS += -D$(LNG)
--
--CFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
--
--CCFLAGS += $(CFLAGS)
--CCFLAGS += -std=gnu99
--CCFLAGS += -Werror-implicit-function-declaration
--CCFLAGS += -Wimplicit-int
--CCFLAGS += -Wmissing-prototypes
-+CPPFLAGS += -D$(LNG)
-+CPPFLAGS += -DSGPDATADIR=\"$(SGPDATADIR)\"
- 
--CXXFLAGS += $(CFLAGS)
--
--LDFLAGS += $(LDFLAGS_SDL)
--LDFLAGS += -lm
--
--ifdef WITH_ZLIB
--LDFLAGS += -lz
--endif
- 
- SRCS :=
- SRCS += Build/AniViewScreen.cc
-@@ -468,7 +456,7 @@
- .SUFFIXES:
- .SUFFIXES: .c .cc .d .o
- 
--Q ?= @
-+Q = 
- 
- all: $(BINARY)
- 
-@@ -476,15 +464,15 @@
- 
- $(BINARY): $(OBJS)
- 	@echo '===> LD $@'
--	$(Q)$(CXX) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $@
-+	$(Q)$(CXX) $(CXXFLAGS) $(OBJS) $(LDFLAGS) -o $@ $(LIBS)
- 
- .c.o:
- 	@echo '===> CC $<'
--	$(Q)$(CC) $(CCFLAGS) -c -MMD -o $@ $<
-+	$(Q)$(CC) $(CFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
- 
- .cc.o:
- 	@echo '===> CXX $<'
--	$(Q)$(CXX) $(CXXFLAGS) -c -MMD -o $@ $<
-+	$(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -MMD -o $@ $<
- 
- clean distclean:
- 	@echo '===> CLEAN'
diff --git a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild b/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
deleted file mode 100644
index 4da66d2c406f..000000000000
--- a/games-strategy/ja2-stracciatella/ja2-stracciatella-0.12.1_p7072.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A port of Jagged Alliance 2 to SDL"
-HOMEPAGE="https://ja2-stracciatella.github.io/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
-	http://tron.homeunix.org/ja2/editor.slf.gz"
-
-LICENSE="SFI-SCLA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdinstall editor ru-gold zlib"
-
-DEPEND="media-libs/libsdl[X,sound,video]
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
-	cdinstall? ( games-strategy/ja2-stracciatella-data )"
-
-LANGS="l10n_de +l10n_en l10n_fr l10n_it l10n_nl l10n_pl l10n_ru"
-IUSE="$IUSE $LANGS"
-REQUIRED_USE="^^ ( ${LANGS//+/} )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-gcc6.patch
-
-	sed \
-		-e "s:/some/place/where/the/data/is:${GAMES_DATADIR}/ja2:" \
-		-i sgp/FileMan.cc || die
-
-	sed \
-		-e "s:@GAMES_DATADIR@:${GAMES_DATADIR}/ja2/data:" \
-		"${FILESDIR}"/ja2-convert.sh > "${T}"/ja2-convert || die
-}
-
-src_compile() {
-	local myconf
-
-	case ${L10N} in
-		de) myconf="LNG=GERMAN" ;;
-		nl) myconf="LNG=DUTCH" ;;
-		fr) myconf="LNG=FRENCH" ;;
-		it) myconf="LNG=ITALIAN" ;;
-		pl) myconf="LNG=POLISH" ;;
-		ru) myconf="LNG=$(usex ru-gold RUSSIAN_GOLD RUSSIAN)" ;;
-		en) myconf="LNG=ENGLISH" ;;
-		*) die "wat" ;;
-	esac
-	elog "Chosen language is ${myconf#LNG=}"
-
-	use editor && myconf+=" JA2EDITOR=yes JA2BETAVERSION=yes"
-	use zlib && myconf+=" WITH_ZLIB=yes"
-
-	emake ${myconf}
-}
-
-src_install() {
-	dogamesbin ja2 "${T}"/ja2-convert
-
-	if use editor; then
-		insinto "${GAMES_DATADIR}"/ja2/data
-		doins "${WORKDIR}"/editor.slf
-	fi
-
-	make_desktop_entry ja2 ${PN}
-	doman ja2.6
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	elog "You need ja2 in the chosen language, otherwise set it in package.use!"
-
-	if ! use cdinstall ; then
-		elog "You need to copy all files from the Data directory of"
-		elog "Jagged Alliance 2 installation to"
-		elog "${GAMES_DATADIR}/ja2/data "
-		elog "Make sure the filenames are lowercase. You may want to run the"
-		elog "script":
-		elog "${GAMES_BINDIR}/ja2-convert"
-	fi
-}
diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
deleted file mode 100644
index 3db7ad1de988..000000000000
--- a/games-strategy/ja2-stracciatella/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="editor">Adds necessary file to run the editor</flag>
-		<flag name="ru-gold">Support for russian gold ja2 version</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-strategy/knights-demo-1.32-r2 b/games-strategy/knights-demo-1.32-r2
new file mode 100644
index 000000000000..19f5ae12e5f8
--- /dev/null
+++ b/games-strategy/knights-demo-1.32-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Anglo-Saxon medieval army battles and resource management
+EAPI=6
+HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=knights
+KEYWORDS=~amd64 ~x86
+LICENSE=knights-demo
+RDEPEND=sys-libs/glibc >=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/libXi-1.7.2[abi_x86_32(-)]
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://gentoo/knights-demo-1.32.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
+_md5_=e865f9a5641587ca9e9f71ba3bfdcd37
diff --git a/games-strategy/knights-demo/Manifest b/games-strategy/knights-demo/Manifest
deleted file mode 100644
index 152c63cfe4f3..000000000000
--- a/games-strategy/knights-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST knights-demo-1.32.run 31667235 BLAKE2B ee9c63a261aaea93122b790ef3d4df21b30b53d8f47e2f1549c3e6aaf7a09f04b5f7985e6d26e395266176fa9135cb7257bfc5c6f5eba7524da19758ab241715 SHA512 f53cf9524811b4a83ec2531f62ea251fc5a939cb09445ab850c7bbac85301e8b8275dda12a8dc991e4412eb4358d7597d0c007bd9263fd875289b039b941ed9c
-EBUILD knights-demo-1.32-r2.ebuild 1183 BLAKE2B 7474ab747a641cb6913a5aa26d4fcaf1e0fd319b5db9e50d133ba05af9828a6caf76318f66d627ce23b19880c92fc2e2ef27e12b3511e298d57995844a4005ce SHA512 213b7a7f8fe80e919077ad35fa68ed7d7c111ef408917e55ab307afade34ea4843bf6a0f2d6ac4a01f2d10768fd57d8bd670c04f3a20389e8d6a2485a8a8b231
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
deleted file mode 100644
index d314a019ee7c..000000000000
--- a/games-strategy/knights-demo/knights-demo-1.32-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-DESCRIPTION="Anglo-Saxon medieval army battles and resource management"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=knights"
-# Unversioned upstream filename
-SRC_URI="mirror://gentoo/${P}.run"
-
-LICENSE="knights-demo"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="strip"
-
-RDEPEND="
-	sys-libs/glibc
-	>=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/libXi-1.7.2[abi_x86_32(-)]
-"
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack_makeself ${P}.run
-	mv -f data{,-temp}
-	unpack ./data-temp/data.tar.gz
-	rm -rf data-temp lgp_* setup*
-}
-
-src_install() {
-	local dir=/opt/${PN}
-
-	exeinto "${dir}"
-	doexe bin/Linux/x86/${PN}{,.dynamic}
-
-	insinto "${dir}"
-	doins -r data
-	doins EULA icon.xpm README{,.licenses}
-
-	# We don't support the dynamic version, even though we install it.
-	make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
-	newicon icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Knights and Merchants (Demo)" ${PN}
-}
diff --git a/games-strategy/knights-demo/metadata.xml b/games-strategy/knights-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/knights-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/lgeneral-1.3.1-r2 b/games-strategy/lgeneral-1.3.1-r2
new file mode 100644
index 000000000000..864c3858e868
--- /dev/null
+++ b/games-strategy/lgeneral-1.3.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1: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 Panzer General clone written in SDL
+EAPI=6
+HOMEPAGE=http://lgames.sourceforge.net/LGeneral/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libsdl[sound,video] media-libs/sdl-mixer nls? ( virtual/libintl )
+SLOT=0
+SRC_URI=mirror://sourceforge/lgeneral/lgeneral-1.3.1.tar.gz mirror://sourceforge/lgeneral/pg-data.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_=5df6697890cec4d2135348e51d8aacc4
diff --git a/games-strategy/lgeneral/Manifest b/games-strategy/lgeneral/Manifest
deleted file mode 100644
index a4304e1f2633..000000000000
--- a/games-strategy/lgeneral/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST lgeneral-1.3.1.tar.gz 1678892 BLAKE2B 701b22a8967c037e2385a1f1bbb2e91703cbffc7fff6383f3d593fab07dc01fa352f9ec3ee25dfbbdd5172c4e8cd804bd7f9fa2a84a3c6a22f581884c8d7d9d9 SHA512 4eb8fc6d1dc134792893f3f9b23833da75412fafefea66d699a27de1954d3c1338c7e5dedef842537303368387797ecea2158a477fe1d018e3af973dd5b755e5
-DIST pg-data.tar.gz 410454 BLAKE2B 70b325636c43b69b7cdc2f074a0ac49af46db5c60ebeea5ecefaae18169509b05b4c452c34e8b0cd483d3565c54191623ff3eb900f24683252fd8c775ecdf847 SHA512 b0df30dd9a9d0652acd8702d601c489e5d3a030854ceeb173d2daa656c00633a78a3f45814da9f4157b86544dec34eda02495742242653c7cdebba5ec9951516
-EBUILD lgeneral-1.3.1-r2.ebuild 1922 BLAKE2B 743229424c55bc5581c30bcccf727efe5720294f8449e58113acf4a3b83a4a5c101430aad7ac12c0a1fbea35a053e93b5f05138b3a5d36ab22d9a662d2a86ee2 SHA512 5edbe0077b8fcca017235986c57c481ac88798494830015feaf57efee555614562fab26f17a51b9cd65621846e906ccac8e8657956af76db3e48c0ddefd10585
-MISC metadata.xml 331 BLAKE2B ed6b281fa54a304ddd752e6bda476635922a0d9be37524a0e988666502279b85c793d455de63929c93e02f5b105367b78bea2eeb004e1a996d558159fe6443e2 SHA512 eef1e23a9d81b81e39f84ba41d70d39bf11f52acad42dc312548239919b7ce359a671f9b76dcdee92be92bc11c798d9031f3a641c13ab6febfe5bd978a4bbeeb
diff --git a/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild b/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
deleted file mode 100644
index bc431e1c2933..000000000000
--- a/games-strategy/lgeneral/lgeneral-1.3.1-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools desktop gnome2-utils
-
-MY_P="${P/_/}"
-MY_P="${MY_P/beta/beta-}"
-DESCRIPTION="A Panzer General clone written in SDL"
-HOMEPAGE="http://lgames.sourceforge.net/LGeneral/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	mirror://sourceforge/${PN}/pg-data.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/desktop_DATA/d' \
-		-e '/icon_DATA/d' \
-		Makefile.am || die
-
-	cp /usr/share/gettext/config.rpath .
-	rm -f missing
-	mv configure.in configure.ac
-	eautoreconf
-
-	# Build a temporary lgc-pg that knows about ${WORKDIR}:
-	cp -pPR "${S}" "${WORKDIR}"/tmp-build || die
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share:" \
-		-e "s:@D@::" \
-		{lgc-pg,src}/misc.c || die
-
-	cd "${WORKDIR}"/tmp-build || die
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:/usr/share:" \
-		-e "s:@D@:${D}:" \
-		{lgc-pg,src}/misc.c || die
-}
-
-src_configure() {
-	econf $(use_enable nls)
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build || die
-	econf \
-		--disable-nls \
-		--datadir="${D}/usr/share"
-}
-
-src_compile() {
-	emake
-
-	# Build the temporary lgc-pg:
-	cd "${WORKDIR}"/tmp-build || die
-	emake
-}
-
-src_install() {
-	default
-	keepdir /usr/share/${PN}/{ai_modules,music,terrain}
-
-	# Generate scenario data:
-	dodir /usr/share/${PN}/gfx/{flags,units,terrain} #413901
-	SDL_VIDEODRIVER=dummy "${WORKDIR}"/tmp-build/lgc-pg/lgc-pg --separate-bridges \
-		-s "${WORKDIR}"/pg-data \
-		-d "${D}"/usr/share/${PN} || die
-
-	doicon -s 48 lgeneral.png
-	make_desktop_entry ${PN} LGeneral
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/lgeneral/metadata.xml b/games-strategy/lgeneral/metadata.xml
deleted file mode 100644
index a7f8ed3d65fa..000000000000
--- a/games-strategy/lgeneral/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lgeneral</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/lightyears-1.4-r2 b/games-strategy/lightyears-1.4-r2
new file mode 100644
index 000000000000..ceceac9ac563
--- /dev/null
+++ b/games-strategy/lightyears-1.4-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=A single-player game with a science-fiction theme
+EAPI=6
+HOMEPAGE=http://www.jwhitham.org/20kly/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.jwhitham.org/20kly/lightyears-1.4.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3a7ba127431dfbda4252b303d54a45f8
diff --git a/games-strategy/lightyears/Manifest b/games-strategy/lightyears/Manifest
deleted file mode 100644
index 7cf7cebecb57..000000000000
--- a/games-strategy/lightyears/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX lightyears-1.4-gentoo.patch 1280 BLAKE2B fd247d049fe7e32264a0d86ffa06f37ca8a8ffb4fd7b5651adce2008f089b1b83758286b46e33555c61b4a62fb79e6ed93475bf51aff599117fc5eedbfe70680 SHA512 4a8770b29c7aa8b489a8afaac7ba3ec9a2efc1466f6263f35ee531a8e4498a1490080bd390a87309983d62ac0d3a722421058d671c32c7cda91bcc6a94d81be3
-DIST lightyears-1.4.tar.bz2 693877 BLAKE2B 871b8f66088c3a947de50e7b47a8aeef4d06f9c7919f4f361a6719ff0dfa6b48acabb759dca6969d09255e2c89c158caa0cd560ef02567df6e46bbcda2eb9417 SHA512 68f576d820d54b353adbc504f8aa3341547e2e56474717cc59aecc2368fc0eb533458e09876b3cd2a9062914a8a58d39a35ce944256372bb9e15830210924597
-EBUILD lightyears-1.4-r2.ebuild 1020 BLAKE2B d692c8e1087689b67a62a8785869d5c66511bdfd8114e9b27378ab0c3b35418b733eb8c4d37bfcfa25a2943a035207648d0e39eb39b3ec3b318f4c3197491e9e SHA512 1721d4023d7a275d67f691e867d857200d7c9e71b871b4b7fec34302707324ebf8d88c47d03d0331e149ca9ace89daceece333415c45225f690220574cdae087
-MISC metadata.xml 457 BLAKE2B 7f250bdb961fe6d994ebc983f8dfaf3cbe7c4763b766fbcbc199b2db3f33ca273136e827adece324f4c00b611521882b932a1750a372258e0d52daf691a2c1bb SHA512 354fad5eed1305fc7e5ed69de92f7033b651371a1993ccd90d3d6fd9f49975e30e8b5b4c8cfcf8bb6f1284b5ef0df790adf863f76f580945ff3699ff275d5c13
diff --git a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch b/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
deleted file mode 100644
index 325c4365ded4..000000000000
--- a/games-strategy/lightyears/files/lightyears-1.4-gentoo.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/lightyears
-+++ b/lightyears
-@@ -1,7 +1,6 @@
- #!/usr/bin/python
- 
- # Set the location of the LightYears files here:
--LIGHTYEARS_DIR = "."
- # LIGHTYEARS_DIR = "/usr/share/games/lightyears" # (for Debian)
- 
- # Save games and configuration files are stored in the user's
-@@ -10,31 +9,6 @@
- import sys, os
- 
- if __name__ == "__main__":
--    # Path to data/code dir can be overridden by environment variable
--    LIGHTYEARS_DIR = os.environ.get("LIGHTYEARS_DIR", LIGHTYEARS_DIR)
--
--    # Path does not exist? Try current directory.
--    if ((LIGHTYEARS_DIR == None)
--    or (not os.path.isdir(LIGHTYEARS_DIR))
--    or (not os.path.isfile(os.path.join(LIGHTYEARS_DIR, 
--                            'code', 'startup.py')))):
--        LIGHTYEARS_DIR = os.getcwd()
--
--    # Paths obtained
--    sys.path.insert(0, os.path.join(LIGHTYEARS_DIR, 'code'))
--    data_dir = os.path.join(LIGHTYEARS_DIR, 'data')
--
--    # Go
--    try:
--        import startup
--        assert os.path.isdir(data_dir)
--    except:
--        print "Unable to find LightYears code & data in:"
--        for p in sys.path:
--            print '  ', p
--
--        sys.exit(1)
--
--    startup.Main(data_dir)
--    
--
-+    sys.path.insert(0, "@GENTOO_LIBDIR@")
-+    import startup
-+    startup.Main("@GENTOO_DATADIR@/data")
diff --git a/games-strategy/lightyears/lightyears-1.4-r2.ebuild b/games-strategy/lightyears/lightyears-1.4-r2.ebuild
deleted file mode 100644
index 7e7344951fc2..000000000000
--- a/games-strategy/lightyears/lightyears-1.4-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop python-single-r1
-
-DESCRIPTION="A single-player game with a science-fiction theme"
-HOMEPAGE="http://www.jwhitham.org/20kly/"
-SRC_URI="http://www.jwhitham.org/20kly/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}/${P}"-gentoo.patch
-	sed -i \
-		-e "s:@GENTOO_LIBDIR@:/usr/$(get_libdir)/${PN}:" \
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		${PN} || die
-	python_fix_shebang .
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /usr/"$(get_libdir)/${PN}"
-	doins code/*.py
-
-	einstalldocs
-
-	insinto "/usr/share/${PN}"
-	doins -r audio data manual
-
-	python_optimize "${ED}/usr/$(get_libdir)/${PN}"
-
-	newicon data/32.png ${PN}.png
-	make_desktop_entry ${PN} "Light Years Into Space"
-}
diff --git a/games-strategy/lightyears/metadata.xml b/games-strategy/lightyears/metadata.xml
deleted file mode 100644
index c314eef5e089..000000000000
--- a/games-strategy/lightyears/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-"20,000 Light Years Into Space" was written for Pyweek (March 2006) by Jack
-Whitham. It is a single-player real-time strategy game with a science-fiction
-theme.
-</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/liquidwar-5.6.4-r2 b/games-strategy/liquidwar-5.6.4-r2
new file mode 100644
index 000000000000..ecf54bf2b426
--- /dev/null
+++ b/games-strategy/liquidwar-5.6.4-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=media-libs/allegro-4.2:0[X]
+DESCRIPTION=Unique multiplayer wargame
+EAPI=6
+HOMEPAGE=http://www.ufoot.org/liquidwar/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/allegro-4.2:0[X]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/liquidwar/liquidwar-5.6.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=b96bac4be5d2f69f910c3f9fdc066195
diff --git a/games-strategy/liquidwar/Manifest b/games-strategy/liquidwar/Manifest
deleted file mode 100644
index 9ac03e77fc48..000000000000
--- a/games-strategy/liquidwar/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX liquidwar-5.6.4-exec-stack.patch 442 BLAKE2B 21e0cdd8bb36ff7ce4bacb9bf9c5bd046803c953818eb73e58f372eb431a368dfd97530b22d3352eceecbb503975ccf3fa041d2776a48f63c15dcb4ef809a6fd SHA512 9759a6ae5805871ccbe2161e295449efc268403094d96360596e6043c1583e9ee18d2fdefbbf6bc695dadfe5f57170a5badf930a0fe8aa637b10215014c9561a
-AUX liquidwar-5.6.4-ovflfix.patch 700 BLAKE2B d0a46b244008d78eaa67cba8f8a39a710c8b75d64876a9e7eae86b168c94f8111326739795b061a2209c70fbb05399291cfdfa6f580c3439e7a68768e9049def SHA512 0d242ff7ba17af4b5d61e040b37fbf363d5c4bec615af21e2b2ea77f7cef4633f66a870196e40b590c6609ed15c90208172154b4e613b6ea0d4fe0f2189bb294
-AUX liquidwar-5.6.4-underlink.patch 442 BLAKE2B bfd7beea85546fca013de4229bbd0b1a658f87a608d1340e2463304c72b1d6e82917a95052488f53be40e3bfcafcf23b13007d8f86d541c8236e6dbaeec1c948 SHA512 3835cad62e8141774c5675d1dbc22103cb41a6af0d4a0a70b23e96d88fe72f49b872823bfb9f35294b8d1bec5d6e89942b37928ee92bb53ecb177a560fe8559d
-DIST liquidwar-5.6.4.tar.gz 3268432 BLAKE2B 9b74b057ecb065e18c355c92e9b71bcd257997d9b9874c37a77352b1df83fe17d130c6ac1394368eeb40957ff81d26e973f0677035949d84c357829dc40875f6 SHA512 7145a8362c46a0f39662327edf81b341659a3ce8216f9fb3bb32e483de618c0f46169ed916fe2c4c651ebc5925ecdc534b372c381e16c3ddae9a50fb48f98ed7
-EBUILD liquidwar-5.6.4-r2.ebuild 1650 BLAKE2B 92597eae770aa2a1063101a383eb406922c969b9adf8187b812fa98ae04d6135b29dcb90440190c0a02d2637d3f06752894c7a122aac3c88a62a3a67fa08558f SHA512 4adc6c05c0f9c319ba75c3720679040bdf5e2b2e269ed1208cf155a44b26b14d015943b5520233adcb86156f007b16840f8696d1d150933b1e8cc1b89f5c86c9
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
deleted file mode 100644
index a1e93c9b738c..000000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-exec-stack.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/glouglou.s
-+++ b/src/glouglou.s
-@@ -240,3 +240,6 @@
- 
-    ret
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/monster.s
-+++ b/src/monster.s
-@@ -972,3 +972,6 @@
-    ret                              # retour au c
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
---- a/src/spread.s
-+++ b/src/spread.s
-@@ -957,3 +957,6 @@
- 
- 
- 
-+#ifdef __ELF__
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
deleted file mode 100644
index c092f02beabe..000000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-ovflfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/wwwsrv.c.old	2010-10-26 14:16:31.000000000 +0200
-+++ b/src/wwwsrv.c	2010-10-26 14:17:35.000000000 +0200
-@@ -100,12 +100,12 @@
- 
-   data->privacy = privacy;
-   data->log = log;
--  strncpy (data->metaserver, metaserver, URL_SIZE);
-+  strncpy (data->metaserver, metaserver, sizeof(data->metaserver));
-   data->port = port;
-   data->busy_players = busy_players;
-   data->max_players = max_players;
--  strncpy (data->password, password, URL_SIZE);
--  strncpy (data->comment, comment, URL_SIZE);
-+  strncpy (data->password, password, sizeof(data->password));
-+  strncpy (data->comment, comment, sizeof(data->comment));
- }
- 
- /*------------------------------------------------------------------*/
diff --git a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch b/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
deleted file mode 100644
index d80e349bf1b1..000000000000
--- a/games-strategy/liquidwar/files/liquidwar-5.6.4-underlink.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.in.old	2011-06-22 07:45:05.756127862 +0200
-+++ b/src/Makefile.in	2011-06-22 07:46:00.681613957 +0200
-@@ -223,7 +223,7 @@
-     EXTERN_LIBS = `allegro-config --static $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
- else
-     LINK_OPTIONS = 
--    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY)
-+    EXTERN_LIBS = `allegro-config --libs $(ALLEGRO_LIBRARY)` $(EFENCE_LIBRARY) -lm
- endif
- 
- CONFIG_OPTIONS = \
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
deleted file mode 100644
index 8899b512aa19..000000000000
--- a/games-strategy/liquidwar/liquidwar-5.6.4-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Unique multiplayer wargame"
-HOMEPAGE="http://www.ufoot.org/liquidwar/"
-SRC_URI="https://savannah.nongnu.org/download/liquidwar/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-RDEPEND=">=media-libs/allegro-4.2:0[X]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-exec-stack.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	sed -i \
-		-e 's:/games::' \
-		-e '/^MANDIR/ s:=.*:= $(mandir)/man6:' \
-		-e '/^PIXDIR/ s:=.*:= /usr/share/pixmaps:' \
-		-e '/^DESKTOPDIR/ s:=.*:= /usr/share/applications/:' \
-		-e '/^INFODIR/ s/=.*/= $(infodir)/' \
-		-e '/^GAMEDIR/ s/exec_prefix/bindir/' \
-		-e '/install/s:-s ::' \
-		-e 's:$(DOCDIR)/txt:$(DOCDIR):g' \
-		-e 's:$(GMAKE):$(MAKE):' \
-		-e '/^DOCDIR/ s:=.*:= /usr/share/doc/$(PF):' Makefile.in \
-		|| die 'sed Makefile.in failed'
-	sed -i \
-		-e '/^GAMEDIR/ s/$(exec_prefix)/@bindir@/' \
-		-e 's:/games::' src/Makefile.in \
-		|| die "sed src/Makefile.in failed"
-	eapply "${FILESDIR}"/${P}-underlink.patch
-}
-
-src_configure() {
-	econf \
-		--disable-doc-ps \
-		--disable-doc-pdf \
-		--disable-target-opt \
-		$(use_enable x86 asm)
-}
-
-src_compile() {
-	# skip build_doc target wrt bug 460344
-	emake build_bin build_data
-}
-
-src_install() {
-	emake DESTDIR="${D}" install_nolink
-	einstalldocs
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING
-	# Provided desktop file is completely obsolete
-	rm -f "${ED}"/usr/share/applications/liquidwar.desktop
-	make_desktop_entry ${PN} "Liquid War" /usr/share/pixmaps/${PN}.xpm
-}
diff --git a/games-strategy/liquidwar/metadata.xml b/games-strategy/liquidwar/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/liquidwar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/liquidwar6-0.4.3681-r1 b/games-strategy/liquidwar6-0.4.3681-r1
new file mode 100644
index 000000000000..41724b444900
--- /dev/null
+++ b/games-strategy/liquidwar6-0.4.3681-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) dev-lang/perl 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=Unique multiplayer wargame between liquids
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/liquidwar6/
+IUSE=doc gles2 gtk libcaca +maps nls +ogg openmp readline test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=dev-db/sqlite:3 dev-libs/expat dev-scheme/guile:12 dev-util/cunit media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl[X,opengl,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-ttf net-misc/curl || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl libcaca? ( media-libs/libcaca ) gles2? ( media-libs/mesa[gles2] ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl virtual/libiconv ) ogg? ( media-libs/libsdl[X,sound,opengl,video] media-libs/sdl-mixer[vorbis] ) readline? ( sys-libs/ncurses:0 sys-libs/readline:0 ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-0.4.3681.tar.gz maps? ( http://www.ufoot.org/download/liquidwar/v6/0.4.3681/liquidwar6-extra-maps-0.4.3681.tar.gz )
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9fe6bf574519c5cb06ed930c4c6dcb20
diff --git a/games-strategy/liquidwar6/Manifest b/games-strategy/liquidwar6/Manifest
deleted file mode 100644
index f510733c8b7f..000000000000
--- a/games-strategy/liquidwar6/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX liquidwar6-0.4.3681-check-headers.patch 3579 BLAKE2B 11772008f512e5a54af6e94979b22f46c02f3b76276393dbcb0c44cc10e4c554e0153daee013c021f3678f3d3a201b0a9754677a3fd2a1e3cb58055260110498 SHA512 43429430fe1d447bd70a8b7a6b1da0023a9f17d6b96e2edd7079e199c25e8e28df9ffadbca6c94ee4fdb397022d89f0246cf4da3468255fd204ae4e51fe53e9f
-AUX liquidwar6-0.4.3681-ldconfig.patch 717 BLAKE2B 6275696534deda1daca800b033c8c9fffbeeb802df5ea13a7cc443e5f45cb4c56c113bf2b51915b45883d3a6521199f7c4fd89e5d8cc9209c9b5465a29a9611e SHA512 8dfb058210de219c6f27564988ba92c4bcbae2e74b3c42636fccf3e8c039e1aae8df724bc59d40484dd40151eb46c168a2eba929af15f54ee029b5a600559c2b
-AUX liquidwar6-0.4.3681-paths.patch 788 BLAKE2B a12e9a5de06c465b89832b918c35a460919f0521462e33afe1768a232f0a400748e864d689d156f94c7130dc82930f7b1fda5d1b0dbc37f387420d0f5be1f1aa SHA512 6e89453c4c5ff08f99d41c1ab92ed6552c41b4f08eb09b2e7c5ca10147eeb02b000eb68bc1eb4b4b29f27e15ed7e7d380999c13a16804665a937e5facb67f365
-DIST liquidwar6-0.4.3681.tar.gz 26531646 BLAKE2B c6043931f634dd9769c822b18d243fd32cf0457e6974ec3fee5a8098f4864a7de09d343fd729b2cd9b8c966f92279d972636bb82bc40065f1635b4f5d41ce36f SHA512 4154c8d3c2ceb128cf2d27a4682c89a30d3610f695b2e05f8d4e33c13fb54aaab3bb4a2b5c6dbcc43ff5d24991ea57a521716c94e15d8dd05dc384c22a37f52a
-DIST liquidwar6-extra-maps-0.4.3681.tar.gz 16191302 BLAKE2B 178d9ca86b0ede86d2dec61b92033ea86c01b18d1bbded79d7ffa1643e6fa6e4665a989bc6295923aed55f4e663090e907852581be23c86c9f5220bdc3ca557d SHA512 e767adc4402f803824145fd12f79eb2cbf9b34aea12065123a558dfb6704bd7ab1861b453e794f7a612d4fa75d0f6024ef410b2700eea08a279d6857b9dc2ba7
-EBUILD liquidwar6-0.4.3681-r1.ebuild 2618 BLAKE2B 28140feeafe20351f10b8ae49bee685f949818bc9c5ded2789447b8cba09812825f46cd6b5c6ebdad698e5131ce771fb7268b13c60515fe0a1806088672e77d3 SHA512 c4d79e05d6e34f324892828ce107e9d0a30773f56610e4009aaada084ca49e11bb20150a10bab215b8842dbbcd68cb8d7e2e96f76566525b92d7d7c04835699a
-MISC metadata.xml 1468 BLAKE2B 8c62f766b9ec5a31ae289746600d37bf94e519f5d238d37f3e93c548d4b03340a0b7743e5979536f88dafcbbffa306651b85df3f7f0f6f0431bd551db3ee0bab SHA512 e7c970ad9f7f0798ec2968ba703fd42fd1e7b49a075f84b6e4ff1109d2bc5ef5daa2b9b41e342c754e5dd4d804ddde4d7d7b2fbcc22ca4dad10dad21b5b33eb4
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch
deleted file mode 100644
index 34dd76b48ea0..000000000000
--- a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-check-headers.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Wed Jun  4 16:01:18 UTC 2014
-Subject: fix header checks
-
-	our multilib wrapped headers are broken shit
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -55,7 +55,7 @@
- AC_SUBST(LW6_VERSION_MINOR)
- 
- dnl Headers, some are optional
--AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
-+AC_CHECK_HEADERS(arpa/inet.h caca.h ctype.h CUnit/CUnit.h CUnit/Automated.h CUnit/CUCurses.h dirent.h errno.h execinfo.h expat.h fcntl.h gc/gc.h gmp.h GL/gl.h GL/glu.h GLES2/gl2.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h)
- 
- dnl GNULIB stuff, http://www.gnu.org/software/gnulib/
- gl_00GNULIB
-@@ -477,40 +477,42 @@
- fi
- SDL_EXTRA="${SDL_EXTRA_CFLAGS} ${SDL_EXTRA_LIBS}"
- 
-+CFLAGS="$CFLAGS $SDL_EXTRA_CFLAGS"
-+
- AC_CHECK_HEADER(SDL/SDL.h, HAVE_SDL_H=1, AC_MSG_WARN([
- *** Liquid War 6 needs SDL (http://www.libsdl.org/)
--]),[${SDL_EXTRA}])
-+]),[])
- AC_CHECK_LIB(SDL, SDL_Init, HAVE_LIBSDL=1, AC_MSG_WARN([
- *** Liquid War 6 needs SDL (http://www.libsdl.org/)
--]),[${SDL_EXTRA}])
-+]),[])
- 
- AC_CHECK_HEADER(GL/gl.h, HAVE_GL_GL_H=1,AC_MSG_WARN([
- *** Liquid War 6 needs Mesa (http://www.mesa3d.org/)
--]),[${SDL_EXTRA}])
-+]),[])
- AC_CHECK_LIB(GL, glBegin, HAVE_LIBGL=1, AC_MSG_WARN([
- *** Liquid War 6 needs Mesa (http://www.mesa3d.org/)
--]),[${SDL_EXTRA}])
-+]),[])
- 
- AC_CHECK_HEADER(GL/glu.h, HAVE_GL_GLU_H=1,AC_MSG_WARN([
- *** Liquid War 6 needs GLU (http://www.mesa3d.org/)
--]),[${SDL_EXTRA}])
-+]),[])
- AC_CHECK_LIB(GLU, gluBeginCurve, HAVE_LIBGLU=1, AC_MSG_WARN([
- *** Liquid War 6 needs GLU (http://www.mesa3d.org/)
--]),[${SDL_EXTRA}])
-+]),[])
- 
- AC_CHECK_HEADER(SDL/SDL_image.h, HAVE_SDL_IMAGE_H=1, AC_MSG_WARN([
- *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/)
--]),[${SDL_EXTRA}])
-+]),[])
- AC_CHECK_LIB(SDL_image, IMG_Load, HAVE_LIBSDL_IMAGE=1, AC_MSG_WARN([
- *** Liquid War 6 needs SDL_image (http://www.libsdl.org/projects/SDL_image/)
--]),[${SDL_EXTRA}])
-+]),[])
- 
- AC_CHECK_HEADER(SDL/SDL_ttf.h, HAVE_SDL_TTF_H=1, AC_MSG_WARN([
- *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/)
--]),[${SDL_EXTRA}])
-+]),[])
- AC_CHECK_LIB(SDL_ttf, TTF_Init, HAVE_LIBSDL_TTF=1, AC_MSG_WARN([
- *** Liquid War 6 needs SDL_ttf (http://www.libsdl.org/projects/SDL_ttf/)
--]),[${SDL_EXTRA}])
-+]),[])
- 
- AC_ARG_ENABLE([mod-gl1], AS_HELP_STRING([--enable-mod-gl1],[compile mod-gl1 default=yes]), [enable_mod_gl1=$enableval], [enable_mod_gl1=yes])
- 
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch
deleted file mode 100644
index dd5e702b6144..000000000000
--- a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-ldconfig.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit 1bd3596545912f2e47b8848df3fb5d99195d299a
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jan 8 17:21:09 2014 +0100
-
-    don't run ldconfig
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -65,7 +65,6 @@ EXTRA_DIST = scriptpo.c indent.sh scriptpo-update.sh stamp.sh clean.sh dtou.sh u
- SUBDIRS = lib
- 
- install-exec-local:
--	if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root
- 	if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@LW6_VERSION_BASE@; ln -s @PACKAGE_TARNAME@-@LW6_VERSION_BASE@ $(DESTDIR)$(bindir)/liquidwar6; fi
- 
- uninstall-local:
diff --git a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch b/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch
deleted file mode 100644
index 3ac69032471e..000000000000
--- a/games-strategy/liquidwar6/files/liquidwar6-0.4.3681-paths.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit b121fe3d9fb7e5fc52f592482e02b6a28430435f
-Author: hasufell <hasufell@gentoo.org>
-Date:   Wed Jan 8 17:23:56 2014 +0100
-
-    respect datarootdir
-
---- a/data/icon/Makefile.am
-+++ b/data/icon/Makefile.am
-@@ -19,6 +19,6 @@
- # Contact author        : ufoot@ufoot.org
- 
- pkgdata_DATA = liquidwar6.png liquidwar6.xpm
--pkgdatadir = $(datadir)/pixmaps
-+pkgdatadir = $(datarootdir)/pixmaps
- EXTRA_DIST = $(pkgdata_DATA) liquidwar6.ico liquidwar6.icns
- 
---- a/pkg/Makefile.am
-+++ b/pkg/Makefile.am
-@@ -19,7 +19,7 @@
- # Contact author        : ufoot@ufoot.org
- 
- pkgdata_DATA = liquidwar6.desktop
--pkgdatadir = $(datadir)/applications
-+pkgdatadir = $(datarootdir)/applications
- EXTRA_DIST =  $(pkgdata_DATA) liquidwar6.spec liquidwar6d 406FFCAB.gnupg.txt FD409E94.gnupg.txt
- 
- distclean-local:
diff --git a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild b/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
deleted file mode 100644
index c5881059e602..000000000000
--- a/games-strategy/liquidwar6/liquidwar6-0.4.3681-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils toolchain-funcs games
-
-MY_PV=${PV/_beta/beta}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Unique multiplayer wargame between liquids"
-HOMEPAGE="https://www.gnu.org/software/liquidwar6/"
-SRC_URI="http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${MY_P}.tar.gz
-	maps? ( http://www.ufoot.org/download/liquidwar/v6/${MY_PV}/${PN}-extra-maps-${MY_PV}.tar.gz )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gles2 gtk libcaca +maps nls +ogg openmp readline test"
-
-# yes, cunit is rdep
-# Drop the libtool dep once libltdl goes stable.
-RDEPEND="dev-db/sqlite:3
-	dev-libs/expat
-	dev-scheme/guile:12
-	dev-util/cunit
-	media-libs/freetype:2
-	media-libs/libpng:0
-	media-libs/libsdl[X,opengl,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-ttf
-	net-misc/curl
-	|| ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 )
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	libcaca? ( media-libs/libcaca )
-	gles2? ( media-libs/mesa[gles2] )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl
-		virtual/libiconv )
-	ogg? (
-		media-libs/libsdl[X,sound,opengl,video]
-		media-libs/sdl-mixer[vorbis]
-	)
-	readline? ( sys-libs/ncurses:0
-		sys-libs/readline:0 )"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${MY_P}
-S_MAPS=${WORKDIR}/${PN}-extra-maps-${MY_PV}
-
-pkg_setup() {
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp ; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-	fi
-	games_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-{ldconfig,paths}.patch \
-		"${FILESDIR}"/${P}-check-headers.patch
-
-	sed -i \
-		-e 's/-Werror//' \
-		configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	# configure fails with cunit disabled
-	egamesconf \
-		$(use_enable nls) \
-		--enable-cunit \
-		$(use_enable gtk) \
-		--enable-mod-gl1 \
-		$(use_enable gles2 mod-gles2) \
-		$(use_enable libcaca mod-caca) \
-		$(use_enable openmp) \
-		$(use_enable ogg mod-ogg) \
-		$(use_enable !ogg silent) \
-		$(use_enable readline console) \
-		--disable-static \
-		--datarootdir=/usr/share \
-		--mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html
-
-	if use maps; then
-		cd "${S_MAPS}" || die
-		egamesconf
-	fi
-}
-
-src_compile() {
-	default
-	use doc && emake html
-	use maps && emake -C "${S_MAPS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use maps && emake -C "${S_MAPS}" DESTDIR="${D}" install
-	prune_libtool_files --all
-	prepgamesdirs
-}
diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml
deleted file mode 100644
index 5f504d57eb1c..000000000000
--- a/games-strategy/liquidwar6/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="doc">Convert the info pages to html</flag>
-		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
-		<flag name="gtk">Used to display error/critical messages</flag>
-		<flag name="maps">Install extra maps</flag>
-		<flag name="ogg">Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg> (currently the only sound provider)</flag>
-		<flag name="readline">Enable interactive script shell for hacking</flag>
-	</use>
-	<longdescription lang="en">
-		FEATURES:
-		* Fast-paced tactical action. Control the movement of all your forces at the same time
-		* Simple yet original game mechanics, discovered by Thomas Colcombet
-		* 10 different teams, each with their own charactaristics and special attacks
-		* 13 levels, each one twisting the gameplay in a new direction
-		* 100+ more levels if you download the bonus pack
-		* Levels can be created using simple image files
-		* Lots of level design options: walls, edge wraparound, bridges, different speed, special areas such as glue or danger and varied army size and fighter behavior
-		* Internationalization support, interface translated in French, Norwegian and Russian
-		* Free Software, part of the GNU project (licence: GNU GPL v3+)
-	</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/majesty-demo-1.0.0-r1 b/games-strategy/majesty-demo-1.0.0-r1
new file mode 100644
index 000000000000..f7419e183440
--- /dev/null
+++ b/games-strategy/majesty-demo-1.0.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Control your own kingdom in this simulation
+EAPI=6
+HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=8&
+KEYWORDS=~amd64 ~x86
+LICENSE=MAJESTY-DEMO
+RDEPEND=sys-libs/glibc x11-libs/libX11[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)]
+RESTRICT=bindist strip
+SLOT=0
+SRC_URI=http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_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
+_md5_=0a9382baab126fb0b086b8348a4266dc
diff --git a/games-strategy/majesty-demo/Manifest b/games-strategy/majesty-demo/Manifest
deleted file mode 100644
index fb21a2c32ed9..000000000000
--- a/games-strategy/majesty-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST majesty_demo.run 36582366 BLAKE2B f972f5d98eb0a907d7b34dd09c8a1eabb67ded08287e147f08125a6b6e833e4e7c18f8374873b532f765a6c121a6885a46f06645eddb4245db93e801f5a67328 SHA512 0573b29fa2635aeb0aa6ebaaa55c924322b3805e120f49fde51409cc6f101d7ae41d72ed0d086ffeac4d591ba75ee8bc190c46a3b71adb6b36d867df16be2c79
-EBUILD majesty-demo-1.0.0-r1.ebuild 1029 BLAKE2B 129421df38286b45c02fdafbbc4dac32b8f23ce76ee1c7c8a57fbe9383687f15341c2187ee9ec95259b4b550ac3f97ade3ea10a663af2509c89e65221d87b378 SHA512 e6c950304ea53be9627c53fbfbe37bfe57d4a3338375ee675cf5c4a5bc53cb9cd1c5f378f121ba102ba2d98d35370f0e50cf76c1ac9e7378ac880bb1be27d8c2
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild b/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
deleted file mode 100644
index 7a9bb85b31a9..000000000000
--- a/games-strategy/majesty-demo/majesty-demo-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils unpacker
-
-DESCRIPTION="Control your own kingdom in this simulation"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=8&"
-SRC_URI="http://ftp2.za.freebsd.org/pub/FreeBSD/ports/distfiles/majesty_demo.run"
-
-LICENSE="MAJESTY-DEMO"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist strip"
-
-RDEPEND="
-	sys-libs/glibc
-	x11-libs/libX11[abi_x86_32(-)]
-	x11-libs/libXext[abi_x86_32(-)]
-	x11-libs/libXau[abi_x86_32(-)]
-	x11-libs/libXdmcp[abi_x86_32(-)]
-"
-DEPEND=""
-
-S="${WORKDIR}"
-
-dir="/opt/${PN}"
-Ddir="${D}/${dir}"
-QA_PREBUILT="${dir:1}/maj_demo"
-
-src_install() {
-	einstalldocs
-	insinto "${dir}"
-	exeinto "${dir}"
-	doins -r data quests
-	doins majesty.{bmp,xpm} majestysite.url
-	newicon majesty.xpm majesty-demo.xpm
-	# only installing the static version for now
-	doexe bin/Linux/x86/maj_demo
-	make_wrapper maj_demo ./maj_demo "${dir}" "${dir}"
-	make_desktop_entry maj_demo "Majesty (Demo)"
-}
diff --git a/games-strategy/majesty-demo/metadata.xml b/games-strategy/majesty-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/majesty-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/maxr-0.2.9 b/games-strategy/maxr-0.2.9
new file mode 100644
index 000000000000..4a29fe004be5
--- /dev/null
+++ b/games-strategy/maxr-0.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Mechanized Assault and Exploration Reloaded
+EAPI=6
+HOMEPAGE=https://www.maxr.org
+IUSE=dedicated
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 FDL-1.2+
+RDEPEND=media-libs/libsdl2[video] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net
+SLOT=0
+SRC_URI=https://www.maxr.org/downloads/maxr-0.2.9.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0324bab7ca4c53fedc341b08fc4e51f2
diff --git a/games-strategy/maxr/Manifest b/games-strategy/maxr/Manifest
deleted file mode 100644
index 8bf86d8a34b4..000000000000
--- a/games-strategy/maxr/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST maxr-0.2.9.tar.gz 14847180 BLAKE2B eac99b06f84a2559a6ba601396a43b98014ccea2339bd5f7b8327d000d5a5ddf032c2a1fd1c0bec9e3be16e95e170acf93bc99438400d92eb637c2fa68ebcfed SHA512 8c92d85edf152b1730a8b9e1047d41687cfac816ea854e1ec0b5068a650d399cd3cfc4c47593a2eb83604fd649a05ba649763251104fd70d49bb1cb33d4f58fc
-EBUILD maxr-0.2.9.ebuild 906 BLAKE2B 8a9d82045a516ff1ff6fcce2b65e56740fed45a327e9723b910efcf262c45c6790ba932ba0d114bb8fca9dee85b2a5d90816ce6798d10b309160981eecff2617 SHA512 cb51b58e53d9286e77628ff866f63109843c6daf64592bf3c1cdbdee284d627ab3988caa566f17c6a4db7be99ef4d39cbec3f1ae5b5a2b601887cb32b7556d65
-MISC metadata.xml 259 BLAKE2B de713fcef8fdf70397a1488db3be1d10415e1177b400921c0017b69bcfb1849bb5eaef32ca00118ff25391d52d2071af70c83b6357fbf5199e4745d34e9994e1 SHA512 8516e2364a64325b483a394a14c52e32b029beccd05586623e5dba0b861970722c3709070c8fd4b80a23f0a84b74a475485b0f2b05f44fae6f27f163714aef68
diff --git a/games-strategy/maxr/maxr-0.2.9.ebuild b/games-strategy/maxr/maxr-0.2.9.ebuild
deleted file mode 100644
index 4e1287280ad5..000000000000
--- a/games-strategy/maxr/maxr-0.2.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils
-
-DESCRIPTION="Mechanized Assault and Exploration Reloaded"
-HOMEPAGE="https://www.maxr.org"
-SRC_URI="https://www.maxr.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2 FDL-1.2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-
-RDEPEND="media-libs/libsdl2[video]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	mycmakeargs=(
-		-DMAXR_BUILD_DEDICATED_SERVER=$(usex dedicated)
-		-DCMAKE_BUILD_TYPE=Release
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doicon -s 128 data/${PN}.png
-	make_desktop_entry ${PN} "Mechanized Assault and Exploration Reloaded"
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-strategy/maxr/metadata.xml b/games-strategy/maxr/metadata.xml
deleted file mode 100644
index c040f7c7d3e0..000000000000
--- a/games-strategy/maxr/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/games-strategy/megaglest-3.11.1-r1 b/games-strategy/megaglest-3.11.1-r1
new file mode 100644
index 000000000000..699dad28c367
--- /dev/null
+++ b/games-strategy/megaglest-3.11.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=~games-strategy/megaglest-data-3.11.1 >=dev-lang/lua-5.1:0 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) !static? ( dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8 net-misc/curl virtual/jpeg:0 ) videos? ( media-video/vlc ) sys-apps/help2man virtual/pkgconfig editor? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) model-viewer? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) static? ( dev-libs/icu[static-libs] dev-libs/xerces-c[icu,static-libs] media-libs/ftgl[static-libs] media-libs/glew[static-libs] media-libs/libpng:0[static-libs] net-libs/libircclient[static-libs] net-libs/miniupnpc[static-libs] net-misc/curl[static-libs] virtual/jpeg:0[static-libs] ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Cross-platform 3D realtime strategy game
+EAPI=5
+HOMEPAGE=http://www.megaglest.org/
+IUSE=debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 BitstreamVera
+RDEPEND=~games-strategy/megaglest-data-3.11.1 >=dev-lang/lua-5.1:0 dev-libs/libxml2 media-libs/fontconfig media-libs/freetype media-libs/libsdl[X,sound,joystick,opengl,video] media-libs/libvorbis media-libs/openal net-libs/gnutls sys-libs/zlib virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXext editor? ( x11-libs/wxGTK:3.0[X,opengl] ) fribidi? ( dev-libs/fribidi ) model-viewer? ( x11-libs/wxGTK:3.0[X] ) !static? ( dev-libs/xerces-c[icu] media-libs/ftgl media-libs/glew media-libs/libpng:0 net-libs/libircclient >=net-libs/miniupnpc-1.8 net-misc/curl virtual/jpeg:0 ) videos? ( media-video/vlc ) games-misc/games-envd
+SLOT=0
+SRC_URI=https://github.com/MegaGlest/megaglest-source/releases/download/3.11.1/megaglest-source-3.11.1.tar.xz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5a9fa18949dad32219e0e443ff699bc4
diff --git a/games-strategy/megaglest-data-3.11.1 b/games-strategy/megaglest-data-3.11.1
new file mode 100644
index 000000000000..0fe60cff9f26
--- /dev/null
+++ b/games-strategy/megaglest-data-3.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Data files for the cross-platform 3D realtime strategy game MegaGlest
+EAPI=5
+HOMEPAGE=http://www.megaglest.org/
+IUSE=doc
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-SA-3.0
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=https://github.com/MegaGlest/megaglest-data/releases/download/3.11.1/megaglest-data-3.11.1.tar.xz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=63917303de23782c56b645fd7128c9a8
diff --git a/games-strategy/megaglest-data/Manifest b/games-strategy/megaglest-data/Manifest
deleted file mode 100644
index d4668c5ba765..000000000000
--- a/games-strategy/megaglest-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST megaglest-data-3.11.1.tar.xz 283383936 BLAKE2B d3c3d6c99f8b5f1360ecf72f69b47ce1ee1777019bdd8c2c0cfad8128a0ca07906a906be031526bcd255c5db3565bf4225a1170fdbcfc76819f65055d4d69c79 SHA512 a0ca22c2ba44992ce244c19f1bf3b19983a76520566286728ff4de4c14ef568aec3b166a2dde615b221d4cded8f2714b873a56fd58c1beebdc7120508ba0e357
-EBUILD megaglest-data-3.11.1.ebuild 976 BLAKE2B 0c2891e67a8bf8c464b40edddf0a4982813d51b7be94395fbdd5730236dad55b97182608ddc7dadf09df382214d2b17e518d6b7bccbf796fefea7de89337649f SHA512 cbc1bd54a07b22776d0f49388ec43f2cb94fc8d47b04ded079c511d5c87c3f0fd8f38a37cae2ba32652085c6716610084125309a12e24297c22c6b1443a2a7b1
-MISC metadata.xml 342 BLAKE2B 3e1f532ee136e71fe0c923694e49cedfdce563f052f0e1a48bad9086fa511ffdef728107969738251cb13fe8df360270df227d1b7dec383110564f5cad54ab1e SHA512 6ae571607c0fefd0ff846ea1f9946d1e5de8a208494b71474f2c46495beb4d306edc37d7ed754305c6e325e7b7306f13f3e78010235bef1c97873cf01de519fe
diff --git a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild b/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
deleted file mode 100644
index c10fa689e223..000000000000
--- a/games-strategy/megaglest-data/megaglest-data-3.11.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils games
-
-MY_PN="megaglest"
-DESCRIPTION="Data files for the cross-platform 3D realtime strategy game MegaGlest"
-HOMEPAGE="http://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-data/releases/download/${PV}/megaglest-data-${PV}.tar.xz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DOCS=( docs/AUTHORS.data.txt docs/CHANGELOG.txt docs/README.txt )
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${MY_PN}"
-		-DMEGAGLEST_ICON_INSTALL_PATH="/usr/share/pixmaps"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS="docs/glest_factions/"
-	cmake-utils_src_install
-	prepgamesdirs
-}
diff --git a/games-strategy/megaglest-data/metadata.xml b/games-strategy/megaglest-data/metadata.xml
deleted file mode 100644
index 860fcccb60df..000000000000
--- a/games-strategy/megaglest-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">MegaGlest/megaglest-data</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/megaglest/Manifest b/games-strategy/megaglest/Manifest
deleted file mode 100644
index dc77bd19f530..000000000000
--- a/games-strategy/megaglest/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX megaglest-3.11.1-cmake.patch 897 BLAKE2B 3076a11cbb18263aabfabdaadb4e201d26b7db6e55e32278c0f37ebd938ae8a41cccb906bcf30ff99a32f6ecb35d77512fd3904610443847d1e3bb3212122902 SHA512 f49580a2b87fbc1e9aa3bec7313bdff36f78404aa97ac9f0cef790202c7d92439ad3fd8a9bdc991540048adb771e22f36c946f44a967cacae5157ef98b41c6cc
-AUX megaglest-3.11.1-miniupnpc.patch 1299 BLAKE2B e56123ca017cf7b244c449e7b77385d9adc5066873e2ff220eed0344752405019abb13a7dfd0ade027dedd7064e65cf4d6e0509b44986aa5692d7af73b701f7f SHA512 62bf0ff8fa167cecae9f7bf65e5295d609afcdb9fdcb3bf502366eb775fa8d3d39c12001d320a9dc42e12075004c86b7d118eb517d6a57473e03aa26944f8bd4
-AUX megaglest-3.11.1-static-build.patch 1939 BLAKE2B 6d71cdc521f3bcf519a3f98bee00bf45951c26f895c3fe74cd03f3ea74c7a28f370726e82385ce6e6af46a81fa77999b28ae266bdbb8b34cf9d1a5e66abb8bef SHA512 c83c8ed2700cd951516d497ac2a2cadbbb9fe56634e368a252ea7186266ada0bb744edb05fc2d8f1483a5f968854e46606f54926b50677cf424503b6c496dee5
-DIST megaglest-source-3.11.1.tar.xz 2863180 BLAKE2B 01923ad4b29cc7042f0a26ba44a6a023020cbe2071b26b40c3332d763430dd559eb9eb7041182e154a0f1832866c759e08f21a677fcb5f2dba134127b0624b30 SHA512 9e1d8eccff1889199ff0e4b0f1cc3d0193306cd9271a2c98f12a49d61a09789d0813d5f3dadfe7701d2446976992834c63287f0227d660dc9cc9d2ecef65e225
-EBUILD megaglest-3.11.1-r1.ebuild 4505 BLAKE2B 4740e92ac4cc3159ee3e52500a089cad5ebfa530196989737711bdd0fbd86a6fcede17a59190f02450a3b834f502f8b3f263af0325c1ad0d47c091a2dce7735e SHA512 7df2fe631b17a88fead0cd758bcbd8cc7b4f94bf5f5cd4bc541ab527d204c3e769929e573c4ee586a614ff4ccc90ca99cf1bccc73a7b512c7fe119ee93455a87
-MISC metadata.xml 1649 BLAKE2B 92291055582673bdb4c067a42b6f6c599e205e9f8e98a00311d603921a64ce94f2c7b58a2cfbb0b0c9cd7214fd9f3aab3f6d4f9464b77133287638d743ec55a6 SHA512 65e705850828566bafc3b87638613574245039d91da5a39b7d79296c2eeb8701ef04c3bd520686c2dc73d65baa58f1ecb61ee2ce188204a5e704bf15261d34c3
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch b/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
deleted file mode 100644
index 527671246e98..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-cmake.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e463986ba1f40210b40eff34c4aac727c7f2e571 Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Wed, 13 May 2015 04:22:45 +1000
-Subject: [PATCH] Fix build with >=cmake-3.2.
-
-The FindOpenGL module no longer pulls in X11 libraries.
----
- source/shared_lib/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/source/shared_lib/CMakeLists.txt b/source/shared_lib/CMakeLists.txt
-index 3da563e..e5a06fc 100644
---- a/source/shared_lib/CMakeLists.txt
-+++ b/source/shared_lib/CMakeLists.txt
-@@ -95,6 +95,10 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER OR BUILD_MEGAGLEST_MAP_EDITOR OR BUILD_MEGAGLEST
- 		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${OPENGL_LIBRARY})
- 	ENDIF()
- 
-+        IF(UNIX)
-+		FIND_PACKAGE(X11 REQUIRED)
-+		SET(EXTERNAL_LIBS ${EXTERNAL_LIBS} ${X11_LIBRARIES})
-+        ENDIF()
- 
-         IF(WANT_XERCES)
- 	        FIND_PACKAGE(XercesC REQUIRED)
--- 
-2.3.6
-
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch b/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
deleted file mode 100644
index 112e734c6efb..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-miniupnpc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/source/shared_lib/sources/platform/posix/socket.cpp b/source/shared_lib/sources/platform/posix/socket.cpp
-index a5d4b92..cb8ceb4 100644
---- a/source/shared_lib/sources/platform/posix/socket.cpp
-+++ b/source/shared_lib/sources/platform/posix/socket.cpp
-@@ -2563,9 +2563,15 @@ int UPNP_Tools::upnp_init(void *param) {
- 		const char *upnp_minissdpdsock = NULL;
- 		int upnp_sameport = 0;
- 		int upnp_ipv6 = 0;
-+		unsigned char upnp_ttl = 2;
- 		int upnp_error = 0;
- 
--#ifndef MINIUPNPC_VERSION_PRE1_6
-+#if (MINIUPNPC_API_VERSION >= 14)
-+		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, upnp_ttl, &upnp_error);
-+
-+		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
-+		if(SystemFlags::VERBOSE_MODE_ENABLED) printf("UPnP discover returned upnp_error = %d.\n",upnp_error);
-+#elif (MINIUPNPC_API_VERSION >= 8)
- 		devlist = upnpDiscover(upnp_delay, upnp_multicastif, upnp_minissdpdsock, upnp_sameport, upnp_ipv6, &upnp_error);
- 
- 		if(SystemFlags::getSystemSettingType(SystemFlags::debugNetwork).enabled) SystemFlags::OutputDebug(SystemFlags::debugNetwork,"UPnP discover returned upnp_error = %d.\n",upnp_error);
diff --git a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch b/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
deleted file mode 100644
index 2586a561956b..000000000000
--- a/games-strategy/megaglest/files/megaglest-3.11.1-static-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit 754a6eb9f81a4a40a2a0102ffe1bfdbba734b36a
-Author: hasufell <hasufell@gentoo.org>
-Date:   Mon Nov 18 21:54:54 2013 +0100
-
-    fix static build
-
-diff --git a/mk/cmake/Modules/FindOGG.cmake b/mk/cmake/Modules/FindOGG.cmake
-index 2a026cc..8ca8a23 100644
---- a/mk/cmake/Modules/FindOGG.cmake
-+++ b/mk/cmake/Modules/FindOGG.cmake
-@@ -19,11 +19,11 @@
- 
- FIND_PATH(OGG_INCLUDE_DIR ogg/ogg.h)
- 
--#IF (OGG_STATIC AND NOT OGG_LIBRARY)
--#	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a ogg)
--#ELSE()
--	FIND_LIBRARY(OGG_LIBRARY NAMES ogg)
--#ENDIF()
-+IF (OGG_STATIC AND NOT OGG_LIBRARY)
-+	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.a)
-+ELSE()
-+	FIND_LIBRARY(OGG_LIBRARY NAMES libogg.so)
-+ENDIF()
- 
- #IF (OGG_STATIC AND NOT VORBIS_LIBRARY)
- #	FIND_LIBRARY(VORBIS_LIBRARY NAMES libvorbis.a vorbis)
---- a/mk/cmake/Modules/FindXercesC.cmake
-+++ b/mk/cmake/Modules/FindXercesC.cmake
-@@ -83,6 +83,9 @@
- 	 /usr/lib
- 	 /usr/local/lib
- 	)
-+	
-+	FIND_LIBRARY(ICUUC_LIBRARY NAMES libicuuc.a)
-+	FIND_LIBRARY(ICUDATA_LIBRARY NAMES libicudata.a)
- 
- 	IF (XERCESC_INCLUDE AND XERCESC_LIBRARY)
-                 MESSAGE(STATUS "Found static Xerces-C lib [${XERCESC_LIBRARY}]")
-@@ -90,7 +93,7 @@
- 
- 		IF(UNIX AND NOT APPLE)
- 			#SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} -Bdynamic -licuuc -licudata")
--			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY}")
-+			SET(XERCESC_LIBRARY "-Bstatic ${XERCESC_LIBRARY} ${ICUUC_LIBRARY}  ${ICUDATA_LIBRARY}")
- 		ENDIF()
- 	ENDIF()
- ENDIF()
---- a/mk/cmake/Modules/FindFriBiDi.cmake
-+++ b/mk/cmake/Modules/FindFriBiDi.cmake
-@@ -28,9 +28,9 @@
- SET(FRIBIDI_NAMES ${FRIBIDI_NAMES} fribidi libfribidi)
- 
- OPTION(WANT_STATIC_LIBS "builds as many static libs as possible" OFF)
--IF(WANT_STATIC_LIBS)
--	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
--ENDIF()
-+#IF(WANT_STATIC_LIBS)
-+#	SET(FRIBIDI_NAMES fribidi.a libfribidi.a ${FRIBIDI_NAMES})
-+#ENDIF()
- 
- MESSAGE(STATUS "** Searching for library names: [${FRIBIDI_NAMES}] ...")
- 
diff --git a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild b/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
deleted file mode 100644
index ef99043c0a34..000000000000
--- a/games-strategy/megaglest/megaglest-3.11.1-r1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# google-breakpad
-# TODO: fribidi, libvorbis static
-
-EAPI=5
-VIRTUALX_REQUIRED="manual"
-inherit eutils flag-o-matic cmake-utils virtualx wxwidgets gnome2-utils games
-
-DESCRIPTION="Cross-platform 3D realtime strategy game"
-HOMEPAGE="http://www.megaglest.org/"
-SRC_URI="https://github.com/MegaGlest/megaglest-source/releases/download/${PV}/megaglest-source-${PV}.tar.xz"
-
-LICENSE="GPL-3 BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +editor fribidi cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static +streflop +tools +unicode wxuniversal +model-viewer videos"
-
-RDEPEND="
-	~games-strategy/${PN}-data-${PV}
-	>=dev-lang/lua-5.1:0
-	dev-libs/libxml2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/libsdl[X,sound,joystick,opengl,video]
-	media-libs/libvorbis
-	media-libs/openal
-	net-libs/gnutls
-	sys-libs/zlib
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXext
-	editor? ( x11-libs/wxGTK:3.0[X,opengl] )
-	fribidi? ( dev-libs/fribidi )
-	model-viewer? ( x11-libs/wxGTK:3.0[X] )
-	!static? (
-		dev-libs/xerces-c[icu]
-		media-libs/ftgl
-		media-libs/glew
-		media-libs/libpng:0
-		net-libs/libircclient
-		>=net-libs/miniupnpc-1.8
-		net-misc/curl
-		virtual/jpeg:0
-		)
-	videos? ( media-video/vlc )"
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig
-	editor? ( ${VIRTUALX_DEPEND} )
-	model-viewer? ( ${VIRTUALX_DEPEND} )
-	static? (
-		dev-libs/icu[static-libs]
-		dev-libs/xerces-c[icu,static-libs]
-		media-libs/ftgl[static-libs]
-		media-libs/glew[static-libs]
-		media-libs/libpng:0[static-libs]
-		net-libs/libircclient[static-libs]
-		net-libs/miniupnpc[static-libs]
-		net-misc/curl[static-libs]
-		virtual/jpeg:0[static-libs]
-	)"
-
-src_prepare() {
-	if use editor || use model-viewer ; then
-		WX_GTK_VER="3.0"
-		need-wxwidgets unicode
-	fi
-
-	epatch "${FILESDIR}"/${P}-static-build.patch \
-		"${FILESDIR}"/${P}-cmake.patch \
-		"${FILESDIR}"/${P}-miniupnpc.patch
-}
-
-src_configure() {
-	if use cpu_flags_x86_sse3; then
-		SSE=3
-	elif use cpu_flags_x86_sse2; then
-		SSE=2
-	elif use cpu_flags_x86_sse; then
-		SSE=1
-	else
-		SSE=0
-	fi
-
-	local mycmakeargs=(
-		$(cmake-utils_use_enable fribidi FRIBIDI)
-		$(cmake-utils_use_build editor MEGAGLEST_MAP_EDITOR)
-		$(cmake-utils_use_build tools MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS)
-		$(cmake-utils_use_build model-viewer MEGAGLEST_MODEL_VIEWER)
-		$(cmake-utils_use_with videos VLC)
-		-DMAX_SSE_LEVEL_DESIRED="${SSE}"
-		-DMEGAGLEST_BIN_INSTALL_PATH="${GAMES_BINDIR}"
-		-DMEGAGLEST_DATA_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		# icons are used at runtime, wrong default location share/pixmaps
-		-DMEGAGLEST_ICON_INSTALL_PATH="${GAMES_DATADIR}/${PN}"
-		-DUSE_FTGL=ON
-		$(cmake-utils_use_want static STATIC_LIBS)
-		$(cmake-utils_use_want streflop STREFLOP)
-		-DWANT_SVN_STAMP=off
-		$(cmake-utils_use static wxWidgets_USE_STATIC)
-		$(cmake-utils_use unicode wxWidgets_USE_UNICODE)
-		$(cmake-utils_use wxuniversal wxWidgets_USE_UNIVERSAL)
-
-		$(usex debug "-DBUILD_MEGAGLEST_UPNP_DEBUG=ON -DwxWidgets_USE_DEBUG=ON" "")
-	)
-
-	# support CMAKE_BUILD_TYPE=Gentoo
-	append-cppflags '-DCUSTOM_DATA_INSTALL_PATH=\\\"'${GAMES_DATADIR}/${PN}/'\\\"'
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	if use editor || use model-viewer; then
-		# work around parallel make issues - bug #561380
-		MAKEOPTS="-j1 ${MAKEOPTS}" \
-			VIRTUALX_COMMAND="cmake-utils_src_compile" virtualmake
-	else
-		cmake-utils_src_compile
-	fi
-}
-
-src_install() {
-	# rebuilds some targets randomly without fast option
-	emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" "$@" install/fast
-
-	dodoc docs/{AUTHORS.source_code,CHANGELOG,README}.txt
-	doicon -s 48 ${PN}.png
-
-	use editor &&
-		make_desktop_entry ${PN}_editor "MegaGlest Map Editor"
-	use model-viewer &&
-		make_desktop_entry ${PN}_g3dviewer "MegaGlest Model Viewer"
-
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	einfo
-	elog 'Note about Configuration:'
-	elog 'DO NOT directly edit glest.ini and glestkeys.ini but rather glestuser.ini'
-	elog 'and glestuserkeys.ini in ~/.megaglest/ and create your user over-ride'
-	elog 'values in these files.'
-	elog
-	elog 'If you have an older graphics card which only supports OpenGL 1.2, and the'
-	elog 'game crashes when you try to play, try starting with "megaglest --disable-vbo"'
-	elog 'Some graphics cards may require setting Max Lights to 1.'
-	einfo
-
-	games_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/megaglest/metadata.xml b/games-strategy/megaglest/metadata.xml
deleted file mode 100644
index 192243d3ba3d..000000000000
--- a/games-strategy/megaglest/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://megaglest.svn.sourceforge.net/viewvc/megaglest/trunk/docs/CHANGELOG.txt?revision=3397</changelog>
-		<doc lang="en">http://glest.wikia.com/wiki/MG</doc>
-		<bugs-to>https://sourceforge.net/tracker/?group_id=300350&amp;atid=1266776</bugs-to>
-		<remote-id type="github">MegaGlest/megaglest-source</remote-id>
-	</upstream>
-	<use>
-		<flag name="editor">Build map editor</flag>
-		<flag name="fribidi">Enable FriBIDi support</flag>
-		<flag name="streflop">Use the library streflop. Out of synchs may
-			occur if not enabled.</flag>
-		<flag name="tools">Build model import/export tools</flag>
-		<flag name="unicode">Use unicode strings for wxwidgets</flag>
-		<flag name="wxuniversal">Use the wxUniversal port which implements
-			the various GUI controls by drawing them itself </flag>
-		<flag name="model-viewer">Build model viewer</flag>
-	</use>
-	<longdescription lang="en">
-		MegaGlest is an entertaining free (freeware and free software) and
-		open source cross-platform 3D real-time strategy (RTS) game, where
-		you control the armies of one of seven different factions: Tech,
-		Magic, Egyptians, Indians, Norsemen, Persian or Romans. The game is
-		setup in one of 17 naturally looking settings, which -like the unit
-		models- are crafted with great appreciation for detail. Additional
-		game data can be downloaded from within the game at no cost.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/metadata.xml b/games-strategy/metadata.xml
deleted file mode 100644
index 9cac05913c02..000000000000
--- a/games-strategy/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-strategy category contains strategy games.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-strategy enthält Strategiespiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-strategy contiene juegos de estrategia.
-	</longdescription>
-	<longdescription lang="ja">
-		games-strategyカテゴリーにはストラテジー・ゲームが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-strategy categorie bevat strategiespellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-strategy chứa các trò chơi chiến thuật.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-strategy contiene giochi strategici.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-strategy contém jogos de estratégia.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-strategy zawiera gry strategiczne.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-strategy/mindrover-demo-1.07b b/games-strategy/mindrover-demo-1.07b
new file mode 100644
index 000000000000..b4d802167cb2
--- /dev/null
+++ b/games-strategy/mindrover-demo-1.07b
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Control a robot as it races across Europa
+EAPI=5
+HOMEPAGE=http://www.linuxgamepublishing.com/info.php?id=9
+KEYWORDS=~x86
+LICENSE=all-rights-reserved GPL-2+
+RDEPEND=virtual/opengl games-misc/games-envd
+RESTRICT=mirror bindist strip
+SLOT=0
+SRC_URI=http://demos.linuxgamepublishing.com/mindrover/mindrover_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_=607231463986813eb882fd88b62f2a99
diff --git a/games-strategy/mindrover-demo/Manifest b/games-strategy/mindrover-demo/Manifest
deleted file mode 100644
index 14f2b2370beb..000000000000
--- a/games-strategy/mindrover-demo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mindrover_demo.run 25266633 BLAKE2B 427dd9a808309634ff59c5cb756b7433225f15f4bfed8ef6ed5ebf0f85db1a0db5e488b4041c04aa3b75a6f651bd0a013e89d70b8c11b1cab262861888d26bb2 SHA512 ddb78f6a40bd42dd3b3ce0a6793f5e217937d3be1dd294d7d8596f8409eee506522a64d9396db2d93fa3beca197d85c7a6507a8f2ae773d0b9b123e9be1e761c
-EBUILD mindrover-demo-1.07b.ebuild 1102 BLAKE2B cc5f9cd09c652dc9576824bfa46b4fa851d0f7c39db84ac1573f4fbb5a7b2a578eb5c11d4c125ef33c981f44fd65bd9e3478d261d4436e590c10f4240d7edc51 SHA512 b778ebbe2c38346ca1a0e1ce4c7a60308a08809c930df095eb9bef7fc941b219c20a4246cad746ef7b718e1ff22d60a19aa6c95e639a3dae8badc174c6f4cb89
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/mindrover-demo/metadata.xml b/games-strategy/mindrover-demo/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/mindrover-demo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild b/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
deleted file mode 100644
index c41f3c126707..000000000000
--- a/games-strategy/mindrover-demo/mindrover-demo-1.07b.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker games
-
-MY_P="mindrover_demo.run"
-DESCRIPTION="Control a robot as it races across Europa"
-HOMEPAGE="http://www.linuxgamepublishing.com/info.php?id=9"
-SRC_URI=" http://demos.linuxgamepublishing.com/mindrover/${MY_P}"
-
-LICENSE="all-rights-reserved GPL-2+"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="mirror bindist strip"
-
-RDEPEND="virtual/opengl"
-
-S=${WORKDIR}
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_install() {
-	einfo "This will take a while ... go get a pizza or something"
-
-	dodir "${dir}"
-
-	tar -zxf data.tar.gz -C "${Ddir}"/ || die
-	tar -zxf music.tar.gz -C "${Ddir}"/ || die
-
-	dodoc README
-	newicon icon.xpm ${PN}.xpm || die
-	exeinto "${dir}"
-	doexe bin/Linux/x86/glibc-2.1/mindrover_demo \
-		bin/Linux/x86/glibc-2.1/lib/libopenal.so.0.0.6 || die
-	dosym "${dir}"/libopenal.so.0.0.6 "${dir}"/libopenal.so.0
-
-	games_make_wrapper ${PN} ./mindrover_demo "${dir}" "${dir}"
-	make_desktop_entry ${PN} "Mindrover: Europa Project (Demo)"
-
-	prepgamesdirs
-}
diff --git a/games-strategy/naev-0.6.1-r1 b/games-strategy/naev-0.6.1-r1
new file mode 100644
index 000000000000..cf2af825b622
--- /dev/null
+++ b/games-strategy/naev-0.6.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst unpack
+DEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A 2D space trading and combat game, in a similar vein to Escape Velocity
+EAPI=6
+HOMEPAGE=http://blog.naev.org/
+IUSE=debug +mixer +openal
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=media-libs/libsdl2[X,sound,video] dev-libs/libzip dev-libs/libxml2 >=media-libs/freetype-2:2 >=media-libs/libvorbis-1.2.1 >=media-libs/libpng-1.2:0= virtual/glu virtual/opengl dev-lang/lua:0 mixer? ( media-libs/sdl2-mixer ) openal? ( media-libs/openal )
+SLOT=0
+SRC_URI=mirror://sourceforge/naev/naev-0.6.1.tar.bz2 mirror://sourceforge/naev/ndata-0.6.1.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ff2273c1a031ca4b9b322c90f33b256
diff --git a/games-strategy/naev/Manifest b/games-strategy/naev/Manifest
deleted file mode 100644
index 113e0384af04..000000000000
--- a/games-strategy/naev/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST naev-0.6.1.tar.bz2 1047908 BLAKE2B 3763440c64f89c5ceb5993a3e4ee356d0cc615df8b70dba14ce0fb35d12a0a136e82958349887d9c5a719e14d9ddfc47beb524b88650ea6f7a6859a6422d6898 SHA512 4766c80b49de5a7e748948f0404ac54edbc5afa80618150d1f993d66c7462ea73bfc5220d73073cb51cd76ff5dc6ecdf935d6f843051943136ceefaea9837203
-DIST ndata-0.6.1.zip 303984255 BLAKE2B 154d8b326e2596cfe16fc646e7d482c07d7015253b6933889d12b93a2ee7e28649b1f3ffcb0c0ed2bfe9d1e3654623cab00113486d05fe6fd1262ce989bf9c25 SHA512 71c3024e1713b094b63cb0de3c70239d61c54142b715e61d5206c5eb3cb8c7a851fc1b388ecf891110dd8bb5c2b3759af71d20f39cb6e629c71b27386a57d7fe
-EBUILD naev-0.6.1-r1.ebuild 1545 BLAKE2B 44c10dd5764f76cfb8c693d5b75072d0262f91ee88e1d0769cc931508b494f710536b6c4bf922b9a97de65f04752a8c4d416ec2323e26677900321725f6a2da9 SHA512 787650821eb5ca41c6c816961fee73b30ed915c2c2ad1fc95c1b389e32230ce809f41e92d601aa662af867db361b6404ebb66f85902b1de4b178cf52268272a0
-MISC metadata.xml 480 BLAKE2B 5769dca136bfc7d26f0b5acb60ee6598d75651b7a58d9899b6da0839180a95bee9d183c229026773ec5641e07637e3dbbfbe4fe6f77b0c466fdf62dfb01fc4cc SHA512 d42e9402581393d47976730560c1850d41e0bdd5d8bf842781222b4621db4c5c55ed5b3a886106d7bc43c3830e38bfef55182478fa7eae8bc6342cd1ec293f62
diff --git a/games-strategy/naev/metadata.xml b/games-strategy/naev/metadata.xml
deleted file mode 100644
index fd273f3193a7..000000000000
--- a/games-strategy/naev/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="mixer">
-		Enables <pkg>media-libs/sdl-mixer</pkg> sound backend in addition to
-		<pkg>media-libs/openal</pkg> one.
-	</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">naev</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/naev/naev-0.6.1-r1.ebuild b/games-strategy/naev/naev-0.6.1-r1.ebuild
deleted file mode 100644
index c7932c3eb325..000000000000
--- a/games-strategy/naev/naev-0.6.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="A 2D space trading and combat game, in a similar vein to Escape Velocity"
-HOMEPAGE="http://blog.naev.org/"
-SRC_URI="mirror://sourceforge/naev/${P}.tar.bz2
-	mirror://sourceforge/naev/ndata-${PV}.zip"
-
-LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +mixer +openal"
-
-RDEPEND="
-	media-libs/libsdl2[X,sound,video]
-	dev-libs/libzip
-	dev-libs/libxml2
-	>=media-libs/freetype-2:2
-	>=media-libs/libvorbis-1.2.1
-	>=media-libs/libpng-1.2:0=
-	virtual/glu
-	virtual/opengl
-	dev-lang/lua:0
-	mixer? ( media-libs/sdl2-mixer )
-	openal? ( media-libs/openal )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--enable-lua=shared \
-		$(use_enable debug) \
-		$(use_with openal) \
-		$(use_with mixer sdlmixer)
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		appicondir=/usr/share/pixmaps \
-		appdatadir=/usr/share/appdata \
-		Graphicsdir=/usr/share/applications \
-		install
-	insinto /usr/share/${PN}
-	newins "${DISTDIR}"/ndata-${PV}.zip ndata
-
-	local res
-	for res in 16 32 64 128; do
-		newicon -s ${res} extras/logos/logo${res}.png naev.png
-	done
-
-	rm -f "${D}"/usr/share/doc/${PF}/LICENSE
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/netherearth-0.52-r1 b/games-strategy/netherearth-0.52-r1
new file mode 100644
index 000000000000..5d1fa21081f5
--- /dev/null
+++ b/games-strategy/netherearth-0.52-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut app-arch/unzip
+DESCRIPTION=A remake of the SPECTRUM game Nether Earth
+EAPI=6
+HOMEPAGE=http://www.braingames.getput.com/nether/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+RDEPEND=>=media-libs/libsdl-1.2.6-r3 >=media-libs/sdl-mixer-1.2.5-r1 media-libs/freeglut
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.braingames.getput.com/nether/sources.zip http://www.braingames.getput.com/nether/netherearth052.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097
+_md5_=6dab8984b931ba946c6ddc566c3d816b
diff --git a/games-strategy/netherearth/Manifest b/games-strategy/netherearth/Manifest
deleted file mode 100644
index d7ea91b7f4a6..000000000000
--- a/games-strategy/netherearth/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX Makefile 1003 BLAKE2B 53264f4ebfcb11142d6c503263d47825cb9f3370a9e291551043aab616da09fb936e293a01eb5f4916ebd29690e315004b0dfa2303f2853963b3e80e0b260d59 SHA512 72cb6f6cb31beb79d91ac3b60eff1cb4046fcecd83621c42ff34a145eefbf484b8bc87ed3c2792bec7d1587d2578c95b4a4b925f9a032c8eefe9a9208a96fcdb
-AUX netherearth-0.52-freeglut.patch 371 BLAKE2B 3b480c96a2ce423213e870a3310a2d0411717662b1f557268ceaf46a4ca7710044a82f7df0f9d2128006a0e7dcad6322be86b91260d4f4f2a6a2215ec66b4c02 SHA512 125c27de71d4c600f78ca3c6f86e6431a6ae20cfc2b12238f3fdfca99bc77bbe90ffb5f3b98ee58d987d8852b154d63342f1677eae99eeebff07b0b2d810edfa
-AUX netherearth-0.52-gentoo-paths.patch 4356 BLAKE2B 59b2320ab0e5dadd23a6d9559e45da2f9ede1daa78b97ba3ebde6a74db4d8fe3281ed7244f180e7d863022f0350c481d9e7c800d524fcc1d763d5aa33e16d77f SHA512 55fe5ddc2e4d783eb3b930600168c1c106562c84e4532f84dbfe44afb44e9134bb32f0c5cc8dea520cc86d661cf984122d4e82da8d624d03bd6fb42e67ba45ca
-AUX netherearth-0.52-glibc-212.patch 410 BLAKE2B 3aaf59a8ed6c02df5cf5e5037c92d3b51866be06bc28e79980cdddc983c6da5be8f298139a651f625e17011426fed85d86dbff075b1a8980134cf0a3e052ec1e SHA512 fe33f1b9220a8538490316880bfbb671ad65c0a55a896aaa624791a9c094cbded0e5ac182f87750bd58300550a9dbcb10da6453b531c2d58582780a10838ecef
-AUX netherearth-0.52-ldflags.patch 333 BLAKE2B 557e8519d0dafe902a0713d91c539b4ddf7b11d8a05a3ce22a2c5d4c806f6c54e29a77c371991a8dbc5c2afa88f85cc4792e2e5966c606ad95217e997e80f8dc SHA512 39aab126a7110590d8fa77d7f1e1d695a16af43809ac128a01a06f6f583f7a80435d40e1f341c945b3279a17c51348a5c5744954588740106549e292721743a9
-AUX netherearth-0.52-linux.patch 1255 BLAKE2B 5389c41fa27426a89c904605ca058620636ebccbdf6a2c74988f7b777618e4892a9e352bf54d851da739dceba7721807b3113126da9825d3efe8257fabfe65cd SHA512 fd5e4385798a3027bb6fe89b92939e0e9d7f463420cb1d47d1606bd2fabc12d1f755892cb1523062a07eb5d2138156aabfcb801daaff7b5f1fdbba8d079ef56f
-DIST netherearth052.zip 872397 BLAKE2B 091a5f9e6773450e3796daebf0d40e1796ca97682aa8092dd669deb3dcf4161a9f6f408d5e43bcce847375ad61c7cb43a90acf382898a0ddd36b3da55917cbb1 SHA512 1f2cb3e896ac076c5ed3d346f19d8328b879546c4dc58609251bdbc8fd96b201cbc5dcb400df2a0dd4c717c7be002f83b92acf33f607890fa736b572c72a8cf5
-DIST sources.zip 75918 BLAKE2B 23142db81e0fca94948cfc6d6443daf1f7909c1dc2334b73897c1e07d1eb39c0c05cedb7cb0b1c8681990a0a0b6632e4666e67128379e14da23fbbe90b9ae641 SHA512 8daa9def65f4be8a541df15c69531da84344906e0f3eab2b7e84f8a94e2f3278d2033e37a9edd4b17fc19b1f7fbf3537286a2a2a9877950d19a51a1167487b75
-EBUILD netherearth-0.52-r1.ebuild 1959 BLAKE2B 062404ba75e3c292cab09260d201244b6d1c8126f8446f0a5d1471a74308138e553455d765c3f8e26d794eb3e06e1ef3a4c8cf9b510218aba61ea31fbb6b5f59 SHA512 4f92ffd97841c6759002571031eb01b1f9c7732cd0888962faf28d0d470e97fd315eeaf07fedf80d81ce31816ae8dbba9d9cc6d6ac95937a6b258d8948f22b6a
-MISC metadata.xml 530 BLAKE2B a306a4d5741d0e7e1bfca697f04e8aed8337c7658cf910c213eee9541510484019ded391b4d884bda58cbd30a47a913a5eb1ac8b298cb4dfd4ba733fda64818a SHA512 4ec339e99b397a71a0f5b6ffccf7f9cefafdee1ce0627c9c5e5f8b00c0158fd7e73e7d0d9612c8f653ea30113905ad6b4efbec694fcd4c05b3ab59439d558868
diff --git a/games-strategy/netherearth/files/Makefile b/games-strategy/netherearth/files/Makefile
deleted file mode 100644
index 07c671a10e31..000000000000
--- a/games-strategy/netherearth/files/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# ls *.cpp

-#

-#3dobject-ase.cpp  construction.cpp  maps.cpp         netherdebug.cpp    radar.cpp

-#3dobject.cpp      enemy_ai.cpp      menu.cpp         nethersave.cpp     robot_ai.cpp

-#bitmap.cpp        glprintf.cpp      myglutaux.cpp    particles.cpp      robots.cpp

-#bullet.cpp        main.cpp          nether.cpp       piece3dobject.cpp  shadow3dobject.cpp

-#cmc.cpp           mainmenu.cpp      nethercycle.cpp  quaternion.cpp     vector.cpp

-

-

-SOURCES = 3dobject-ase.cpp 3dobject.cpp cmc.cpp nether.cpp piece3dobject.cpp vector.cpp bitmap.cpp bullet.cpp glprintf.cpp main.cpp mainmenu.cpp maps.cpp menu.cpp myglutaux.cpp nethercycle.cpp netherdebug.cpp nethersave.cpp particles.cpp construction.cpp quaternion.cpp radar.cpp enemy_ai.cpp robot_ai.cpp robots.cpp shadow3dobject.cpp

-OBJECTS = $(SOURCES:.cpp=.o)

-TARGET = nether_earth

-

-.cpp.o:

-	g++ ${CXXFLAGS} -c $< -o $@

-

-all: $(TARGET)

-

-$(TARGET): $(OBJECTS)

-	g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread

diff --git a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch b/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
deleted file mode 100644
index b61e1f139b04..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-freeglut.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/main.cpp
-+++ b/main.cpp
-@@ -8,6 +8,7 @@
- 

- #include <stdio.h>

- #include <stdlib.h>

-+#include <GL/glut.h>

- #include "SDL/SDL.h"

- #include "SDL/SDL_mixer.h"

- 

-@@ -144,6 +145,7 @@
-     bool quit = false;

- 

- 	load_configuration();

-+	glutInit(&argc, argv);

- 

- 	screen_sfc = initialization((fullscreen ? SDL_FULLSCREEN : 0));

- 	if (screen_sfc==0) return 0;

diff --git a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch b/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch
deleted file mode 100644
index 25f99be50fab..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-gentoo-paths.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp ./3dobject-ase.cpp
---- ../NetherEarth_v0.51-linsrc.orig/3dobject-ase.cpp	2002-10-26 00:00:00.000000000 +0300
-+++ ./3dobject-ase.cpp	2004-04-16 21:42:55.000000000 +0300
-@@ -34,7 +34,7 @@
- 	char buffer[256];

- 	FILE *fp;

- 

--	fp=fopen(file,"r+");

-+	fp=fopen(file,"r");

- 	if (fp==NULL) return false;

- 

- 	/* Look for the materials: */ 

-diff -ud ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp ./3dobject.cpp
---- ../NetherEarth_v0.51-linsrc.orig/3dobject.cpp	2004-01-06 20:49:00.000000000 +0200
-+++ ./3dobject.cpp	2004-04-16 21:43:44.000000000 +0300
-@@ -74,7 +74,7 @@
- 

- 	int *smooth;

- 

--	fp=fopen(file,"r+");

-+	fp=fopen(file,"r");

- 	if (fp==NULL) return false;

- 

- 	/* Importar un fichero .ASC de 3DStudio */ 

-diff -ud ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp ./bitmap.cpp
---- ../NetherEarth_v0.51-linsrc.orig/bitmap.cpp	2004-01-06 20:49:00.000000000 +0200
-+++ ./bitmap.cpp	2004-04-16 21:45:13.000000000 +0300
-@@ -14,7 +14,7 @@
- 	g=0;

- 	b=0;

- 

--	fp=fopen(file,"rb+");

-+	fp=fopen(file,"rb");

- 	if (fp==NULL) return;

- 

- 	/* Tag: */ 

-diff -ud ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp ./mainmenu.cpp
---- ../NetherEarth_v0.51-linsrc.orig/mainmenu.cpp	2004-01-06 20:50:00.000000000 +0200
-+++ ./mainmenu.cpp	2004-04-16 21:14:14.000000000 +0300
-@@ -6,6 +6,9 @@
- #include <dirent.h>

- #endif

- 

-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- #include "string.h"

- #include "stdio.h"

- #include "math.h"

-@@ -483,8 +486,10 @@
- {

- 	int v;

- 	FILE *fp;

-+	char cfg_path[300];
- 

--	fp=fopen("nether.cfg","r");

-+	sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME"));
-+	fp=fopen(cfg_path,"r");

- 	if (fp==0) return;

- 

- 	if (2!=fscanf(fp,"%i %i",&SCREEN_X,&SCREEN_Y)) return;

-@@ -510,8 +515,12 @@
- void save_configuration(void)

- {

- 	FILE *fp;

-+	char cfg_path[300];
- 

--	fp=fopen("nether.cfg","w");

-+	sprintf(cfg_path, "%s/.netherearth", getenv("HOME"));
-+	mkdir(cfg_path, 0755);
-+	sprintf(cfg_path, "%s/.netherearth/nether.cfg", getenv("HOME"));
-+	fp=fopen(cfg_path,"w");

- 	if (fp==0) return;

- 

- 	fprintf(fp,"%i %i\n",SCREEN_X,SCREEN_Y);

-diff -ud ../NetherEarth_v0.51-linsrc.orig/nether.cpp ./nether.cpp
---- ../NetherEarth_v0.51-linsrc.orig/nether.cpp	2004-01-06 21:03:00.000000000 +0200
-+++ ./nether.cpp	2004-04-16 20:54:54.000000000 +0300
-@@ -1203,7 +1203,7 @@
- 			if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0);

- 						       else glColor3f(0.5,0.5,1.0);

- 			glTranslatef(0,-2,0);

--			sprintf(filename,"savedgame%i.txt",i);

-+			sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i);

- 			fp=fopen(filename,"r");

- 			if (fp==0) {

- 				scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1);

-@@ -1232,7 +1232,7 @@
- 			if (option_menu==(i+1)) glColor3f(1.0,0.0,0.0);

- 						       else glColor3f(0.5,0.5,1.0);

- 			glTranslatef(0,-2,0);

--			sprintf(filename,"savedgame%i.txt",i);

-+			sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), i);

- 			fp=fopen(filename,"r");

- 			if (fp==0) {

- 				scaledglprintf(0.01,0.01,"SLOT%i - EMPTY",i+1);

-@@ -1291,7 +1291,7 @@
- 			case 4:

- 				{

- 					char filename[80];

--					sprintf(filename,"savedgame%i.txt",option_menu-1);

-+					sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1);

- 					save_game(filename);

- 					//save_debug_report("debugreport.txt");

- 					game_state=STATE_PAUSE;

-@@ -1326,7 +1326,7 @@
- 			case 4:

- 				{

- 					char filename[80];

--					sprintf(filename,"savedgame%i.txt",option_menu-1);

-+					sprintf(filename,"%s/.netherearth/savedgame%i.txt", getenv("HOME"), option_menu-1);

- 					killmenu(act_menu);

- 					load_game(filename);

- 					newmenu(act_menu);

-diff -ud ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp ./nethersave.cpp
---- ../NetherEarth_v0.51-linsrc.orig/nethersave.cpp	2003-09-17 00:00:00.000000000 +0300
-+++ ./nethersave.cpp	2004-04-16 21:23:04.000000000 +0300
-@@ -2,6 +2,10 @@
- #include "windows.h"

- #endif

- 

-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <fcntl.h>
-+#include <unistd.h>
- #include "string.h"

- #include "stdio.h"

- #include "math.h"

-@@ -40,7 +44,10 @@
- 	ROBOT *r;

- 	BULLET *bul;

- 	EXPLOSION *e;

-+	char tmp_path[300];
- 

-+	sprintf(tmp_path, "%s/.netherearth", getenv("HOME"));
-+	mkdir(tmp_path, 0755);
- 	fp=fopen(filename,"w");

- 	if (fp==0) return false;

- 

diff --git a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch b/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
deleted file mode 100644
index 813f963db4c8..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-glibc-212.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/335137
-
---- sources/mainmenu.cpp
-+++ sources/mainmenu.cpp
-@@ -3,6 +3,7 @@
- #else

- #include <stddef.h>

- #include <sys/types.h>

-+#include <sys/stat.h>

- #include <dirent.h>

- #endif

- 

---- sources/nethersave.cpp
-+++ sources/nethersave.cpp
-@@ -1,5 +1,8 @@
- #ifdef _WIN32

- #include "windows.h"

-+#else

-+#include <sys/types.h>

-+#include <sys/stat.h>

- #endif

- 

- #include "string.h"

diff --git a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch b/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
deleted file mode 100644
index 7d81f912764f..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-ldflags.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/Makefile.old	2010-10-12 09:30:19.000000000 +0200
-+++ b/Makefile	2010-10-12 09:30:38.000000000 +0200
-@@ -17,4 +17,4 @@
- all: $(TARGET)

- 

- $(TARGET): $(OBJECTS)

--	g++ $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread

-+	g++ $(LDFLAGS) $(OBJECTS) -o $(TARGET) -lGL -lGLU -lglut -lSDL -lSDL_mixer -lpthread

diff --git a/games-strategy/netherearth/files/netherearth-0.52-linux.patch b/games-strategy/netherearth/files/netherearth-0.52-linux.patch
deleted file mode 100644
index 6c4c0d1e9733..000000000000
--- a/games-strategy/netherearth/files/netherearth-0.52-linux.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -burN sources/glprintf.cpp sources-linux/glprintf.cpp
---- sources/glprintf.cpp	2002-10-26 00:17:00.000000000 +0200
-+++ sources-linux/glprintf.cpp	2005-06-18 18:22:54.000000000 +0200
-@@ -3,6 +3,7 @@
- #endif

- #include "GL/gl.h"

- 

-+#include "string.h"
- #include "stdio.h"

- #include "stdarg.h"

- #include "GL/gl.h"

-diff -burN sources/list.h sources-linux/list.h
---- sources/list.h	2002-10-27 12:17:00.000000000 +0100
-+++ sources-linux/list.h	2005-06-18 18:21:34.000000000 +0200
-@@ -1,6 +1,9 @@
- #ifndef GENERIC_LIST

- #define GENERIC_LIST

- 

-+
-+#include "stdlib.h"
-+
- /* 

- Funciones para LISTAS: 

- 

-diff -burN sources/maps.cpp sources-linux/maps.cpp
---- sources/maps.cpp	2005-05-05 23:42:00.000000000 +0200
-+++ sources-linux/maps.cpp	2005-06-18 18:23:05.000000000 +0200
-@@ -3,6 +3,7 @@
- #endif

- 

- #include "stdio.h"

-+#include "string.h"
- 

- #include "GL/gl.h"

- #include "GL/glu.h"

-diff -burN sources/myglutaux.cpp sources-linux/myglutaux.cpp
---- sources/myglutaux.cpp	2002-10-26 00:17:00.000000000 +0200
-+++ sources-linux/myglutaux.cpp	2005-06-18 18:23:29.000000000 +0200
-@@ -5,6 +5,8 @@
- #include <GL/gl.h>

- #include "GL/glut.h"

- 

-+#include "string.h"
-+#include "stdlib.h"
- #include "stdio.h"

- #include "math.h"

- #include "vector.h"

diff --git a/games-strategy/netherearth/metadata.xml b/games-strategy/netherearth/metadata.xml
deleted file mode 100644
index 26fb6b6b6d5b..000000000000
--- a/games-strategy/netherearth/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Nether Earth was the very first real time strategy game. It worked on a
-		SPECTRUM machine, and only needed 48KB of RAM to work!! It has all the
-		typical elements of strategy games: resources, factories, combat units,
-		etc.
-	</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/netherearth/netherearth-0.52-r1.ebuild b/games-strategy/netherearth/netherearth-0.52-r1.ebuild
deleted file mode 100644
index e1aa7cabaaac..000000000000
--- a/games-strategy/netherearth/netherearth-0.52-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-MY_PV="${PV/./}"
-DESCRIPTION="A remake of the SPECTRUM game Nether Earth"
-HOMEPAGE="http://www.braingames.getput.com/nether/"
-SRC_URI="http://www.braingames.getput.com/nether/sources.zip
-	http://www.braingames.getput.com/nether/${PN}${MY_PV}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="mirror bindist"
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.6-r3
-	>=media-libs/sdl-mixer-1.2.5-r1
-	media-libs/freeglut
-"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-"
-
-S="${WORKDIR}/sources"
-
-data="../nether earth v${PV}"
-
-src_unpack() {
-	unzip -LL "${DISTDIR}/${PN}${MY_PV}.zip" >/dev/null || die
-	unzip -LL "${DISTDIR}/sources.zip" >/dev/null || die
-}
-
-src_prepare() {
-	default
-
-	DATA_DIR=/usr/share/${PN}
-
-	cp "${FILESDIR}/Makefile" . || die
-
-	# Fix compilation errors/warnings
-	eapply "${FILESDIR}"/${P}-linux.patch
-
-	eapply "${FILESDIR}"/${P}-freeglut.patch \
-		"${FILESDIR}"/${P}-glibc-212.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	# Modify dirs and some fopen() permissions
-	eapply "${FILESDIR}/${P}-gentoo-paths.patch"
-	sed -i \
-		-e "s:models:${DATA_DIR}/models:" \
-		-e "s:textures:${DATA_DIR}/textures:" \
-		-e "s:maps/\*:${DATA_DIR}/maps/\*:" \
-		-e "s:\./maps:${DATA_DIR}/maps:" \
-		mainmenu.cpp || die
-	sed -i \
-		-e "s:models:${DATA_DIR}/models:g" \
-		-e "s:textures:${DATA_DIR}/textures:" \
-		-e "s:sound/:${DATA_DIR}/sound/:" \
-		nether.cpp || die
-	sed -i -e "s:maps:${DATA_DIR}/maps:" \
-		main.cpp || die
-	sed -i -e "s:textures/:${DATA_DIR}/textures/:" \
-		myglutaux.cpp || die
-
-	cd "${data}"
-	rm textures/thumbs.db
-}
-
-src_install() {
-	dobin nether_earth
-
-	cd "${data}"
-
-	# Install all game data
-	insinto "${DATA_DIR}"
-	doins -r maps models sound textures
-
-	dodoc readme.txt
-
-	newicon textures/nuclear.bmp ${PN}.bmp
-	make_desktop_entry nether_earth "Nether Earth" /usr/share/pixmaps/${PN}.bmp
-}
diff --git a/games-strategy/netpanzer-0.8.2 b/games-strategy/netpanzer-0.8.2
new file mode 100644
index 000000000000..0b593d761cb4
--- /dev/null
+++ b/games-strategy/netpanzer-0.8.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs dev-util/ftjam
+DESCRIPTION=Fast-action multiplayer strategic network game
+EAPI=5
+HOMEPAGE=http://www.netpanzer.info/
+IUSE=dedicated
+KEYWORDS=~x86
+LICENSE=GPL-2
+RDEPEND=dedicated? ( app-misc/screen ) media-libs/libsdl[sound,video] media-libs/sdl-mixer media-libs/sdl-image dev-games/physfs games-misc/games-envd
+SLOT=0
+SRC_URI=mirror://sourceforge/netpanzer.berlios/netpanzer-0.8.2.tar.bz2 mirror://sourceforge/netpanzer.berlios/netpanzer-data-0.8.tar.bz2
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c0b4a215067047580fc6870b42ba138d
diff --git a/games-strategy/netpanzer/Manifest b/games-strategy/netpanzer/Manifest
deleted file mode 100644
index 98bca346ff28..000000000000
--- a/games-strategy/netpanzer/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX netpanzer-0.8.2-gcc43.patch 2241 BLAKE2B ee3c15946fd3877544e69de53c54eed1ab160154d19a161a061dd98663b1c97f586482dcbecccbe8d13ccddac299386b28efed166899d214fe99fa0b88f2d27d SHA512 aeddced38643a38d0bd86d02d4b4c8acb6a7c74f80d6fd0f9697b325b3bd1bd019a9145bfad91c9e658c8d4e267efb83ccb58424efff9a1c63d2e4c617a31fe2
-AUX netpanzer-0.8.2-gcc47.patch 399 BLAKE2B c62dc1fc9b0945324ae1e6a39cab0fd70c4c8b98afeec9c9af3912c584cce64ae4646dd6a5c2be5e880cc1bafb39e19b0a5fe15c7f7d6cf481fe3714be70cf86 SHA512 d4d62649e33de0f40ae159b07a59e95fa7928ad88d4bfbfc6677d6404c7abd22954e72902ef88d98275ede223c9866dcd361d9dc48969638742f50335e3a562c
-AUX netpanzer-ded 359 BLAKE2B 693ace37fc7011d73425101d21bbc47547872e3377094910addd914dedc09161ac4ea9389d01e65cf2347a30fb7fd7a02e9c802c9e6045ee31275f74e7feb41b SHA512 0d8c410711627664e41853dc31c73cefece2ed51696713969eae7bfbc6eefe9a4f878e95fbd6584db6ba46c8af76c300281939a3d663cc16bebd2c46040700d1
-AUX netpanzer-ded.ini 1261 BLAKE2B a1c333ba3c6ea49d8104c473d4109a64746d984dabc3001f74225da25eaa14654989cc140d4aa003ff7f47cb86c681760a6a6ea12256da983c6f5813bed09c9b SHA512 3d9e8603d717a52b603c1da7b6b734f771b768b8d3f64c27d881af87947b3c816ec07420cd841c728a6a4e9e5d92798e78d910516d8c5fe33d192ac6a6bcabb6
-AUX netpanzer.rc 776 BLAKE2B a5e60db1a8a0a6615a83f06a4eee56478b0ae6faae01033b24cfff9b4565ccf0d4bb8a85ff8e905474c352639852f56cace93ebbf6ce15e79269ec835955def7 SHA512 b82f11ec76e44d2adc7567ee95e564b05d613b96da6fa9218b0a1571f22577259a60748e0b4da486a00e6c65b26fba339ef78a1798d7c9aca89d9edcf4b33055
-DIST netpanzer-0.8.2.tar.bz2 10416147 BLAKE2B d3c704c5244b00c15abfe45256c2bc9d2f84856cf221aa2b969af24dde3bcc7f28df1678fe5833b5caac9384c209cea2e2bfea9b6fb128c76dad75307f125c33 SHA512 7d7f5b485b20b2cefc71061412367edd963e59612767f6b69751915eda3f2939eebedfa29cb77ba0986cf4966b0fc12456b1bb6cfc2bd794c47fbce0b5f6f57a
-DIST netpanzer-data-0.8.tar.bz2 10123751 BLAKE2B 3c0baf7f5df93f7bc907bbcd627cdac9a9844e9ff12297bdd9b82074e26fe45010fe19efab1fd5725d29f1d52a5d0bc2873aa32371461fca5955ae4f53808f81 SHA512 9120d8d3a190069206ed327f1d7d2b2d36f40feefa823956cf6db66e8d0622959449b9385d81b08fdfc59b3b44b7e4d6f6ca2c7362f1a857e1110d61e7c08ce6
-EBUILD netpanzer-0.8.2.ebuild 1639 BLAKE2B ab98fea2164858540ede69dee0832947c5d5f97abb483849edc4f8e450644c52b97e00420304c59ae8d496e2de0a9abf9ec8cb652b9203cfb32aa6a38ee6be83 SHA512 c18068518f7f4db191d13dba3f6798ecd1476c31146947f49fa189f2a2e7d62ad44525951a572a8c7bac4c4846d1cf97366a370ecfd8415924f7aa11b755530e
-MISC metadata.xml 340 BLAKE2B 7bbd91e252ff994e9d7e3607cb47c01e734f724f7c1a469472a7d503db70006e319fcc5553121dc6aeaad71f73afdcc54be8855dac5683e085845605b2c1da2a SHA512 b4d07a9224bcf6390184655df2a7826b3ecae25e21fa707851d389364366cc5f0e317d8ffc3d6f8abed33ebd4a886bbdbfecb11330e25ca1a2eb6e2045153e76
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch
deleted file mode 100644
index cf73ba4c2252..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc43.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp
-===================================================================
---- netpanzer-0.8.2.orig/src/Lib/2D/ColorTable.cpp	2008-02-05 16:36:27.000000000 +0000
-+++ netpanzer-0.8.2/src/Lib/2D/ColorTable.cpp	2008-02-05 16:36:39.000000000 +0000
-@@ -17,6 +17,8 @@
- */
- #include <config.h>
- 
-+#include <memory>
-+
- #include "Util/FileSystem.hpp"
- #include "Util/Log.hpp"
- #include "Util/Exception.hpp"
-Index: netpanzer-0.8.2/src/Lib/2D/Palette.cpp
-===================================================================
---- netpanzer-0.8.2.orig/src/Lib/2D/Palette.cpp	2008-02-05 16:36:27.000000000 +0000
-+++ netpanzer-0.8.2/src/Lib/2D/Palette.cpp	2008-02-05 16:36:39.000000000 +0000
-@@ -18,6 +18,7 @@
- #include <config.h>
- 
- #include <math.h>
-+#include <memory>
- 
- #include "Palette.hpp"
- #include "Util/FileSystem.hpp"
-Index: netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp
-===================================================================
---- netpanzer-0.8.2.orig/src/NetPanzer/Network/ProxyServer.cpp	2008-02-05 16:36:27.000000000 +0000
-+++ netpanzer-0.8.2/src/NetPanzer/Network/ProxyServer.cpp	2008-02-05 16:36:39.000000000 +0000
-@@ -17,6 +17,7 @@
- */
- #include <config.h>
- 
-+#include <cstdlib>
- #include <string>
- #include <stdexcept>
- #include <ctype.h>
-Index: netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
-===================================================================
---- netpanzer-0.8.2.orig/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2008-02-05 16:36:27.000000000 +0000
-+++ netpanzer-0.8.2/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp	2008-02-05 16:36:39.000000000 +0000
-@@ -17,6 +17,7 @@
- */
- #include <config.h>
- 
-+#include <memory>
- #include <vector>
- #include <string>
- #include "MapSelectionView.hpp"
-Index: netpanzer-0.8.2/src/Lib/Util/Log.cpp
-===================================================================
---- netpanzer-0.8.2.orig/src/Lib/Util/Log.cpp	2008-02-05 17:13:36.000000000 +0000
-+++ netpanzer-0.8.2/src/Lib/Util/Log.cpp	2008-02-05 17:13:43.000000000 +0000
-@@ -26,6 +26,7 @@
- #include <vector>
- #include <exception>
- #include <iomanip>
-+#include <algorithm>
- 
- #include "Exception.hpp"
- #include "FileSystem.hpp"
-
diff --git a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc47.patch b/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc47.patch
deleted file mode 100644
index 432f40a9f9aa..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-0.8.2-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Lib/ArrayUtil/QueueTemplate.hpp.old	2012-10-16 13:57:33.000000000 +0200
-+++ src/Lib/ArrayUtil/QueueTemplate.hpp	2012-10-16 13:58:16.000000000 +0200
-@@ -42,7 +42,7 @@
- 
-     bool enqueue(const TYPE& object )
-     {
--        add( object, (rear + 1) % this->size );
-+        this->add( object, (rear + 1) % this->size );
-         rear = (rear + 1) % this->size;
- 
-         if ( front == rear )
diff --git a/games-strategy/netpanzer/files/netpanzer-ded b/games-strategy/netpanzer/files/netpanzer-ded
deleted file mode 100644
index d6dd85193641..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-ded
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-running=yes
-while [[ $running = yes ]] ; do
-    /usr/games/bin/netpanzer --game_config=/etc/netpanzer-ded.ini -d $@
-    if [[ $? -ge 128 ]] ; then
-        echo "`date`: Restarting server after crash"
-        # wait a bit to not blow cpu and logfiles on constant crashs
-        sleep 30
-    else
-        #normal exit
-        running=no
-    fi
-done
-
diff --git a/games-strategy/netpanzer/files/netpanzer-ded.ini b/games-strategy/netpanzer/files/netpanzer-ded.ini
deleted file mode 100644
index 903fb3b493b3..000000000000
--- a/games-strategy/netpanzer/files/netpanzer-ded.ini
+++ /dev/null
@@ -1,80 +0,0 @@
-[game]
-
-[interface]
-attacknotificationtime=5
-consoletextdelay=3
-consoletextusage=25
-drawunitdamage=yes
-drawunitflags=yes
-drawunitreload=no
-gameinfoposition_x=0
-gameinfoposition_y=0
-minimapdrawtype=0
-minimapposition_x=0
-minimapposition_y=0
-minimapsize_x=194
-minimapsize_y=194
-playerflag=26
-rankposition_x=0
-rankposition_y=0
-scrollrate=1000
-toolbarposition_x=0
-toolbarposition_y=0
-unitcolor=0
-unitinfodrawlayer=0
-unitselectionmode=1
-vehicleselectioncolor=1
-viewdrawbackgroundmode=0
-
-[player]
-masterservers=81.169.185.36,81.173.119.122
-name=Gentoo NetPanzer Server
-proxyserver=
-proxyserverpass=
-proxyserveruser=
-
-[radar]
-alliedoutpostcolor=11
-alliedunitcolor=11
-displayclouds=no
-enemyoutpostcolor=4
-objectivedrawmode=1
-playeroutpostcolor=1
-playerunitcolor=0
-resizerate=400
-unitsize=0
-
-[server]
-allowallies=yes
-bindaddress=
-cloudcoverage=0
-fraglimit=500
-gametype=0
-logging=yes
-mapcycle=Cramped, Tight Quarters, Two Villages, Cramped
-maxplayers=8
-maxunits=160
-objectivepercentage=75
-powerups=yes
-public=yes
-respawntype=1
-serverport=3030
-timelimit=50
-windspeed=30
-
-[sound]
-effects=yes
-effectsvolume=100
-enable=yes
-music=yes
-musicvolume=80
-
-[visuals]
-blendsmoke=yes
-displayshadows=yes
-fullscreen=yes
-gamma=50
-hardwareDoubleBuffer=yes
-hardwareSurface=yes
-resolution=0
-
diff --git a/games-strategy/netpanzer/files/netpanzer.rc b/games-strategy/netpanzer/files/netpanzer.rc
deleted file mode 100644
index b1d29df5be33..000000000000
--- a/games-strategy/netpanzer/files/netpanzer.rc
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting netpanzer dedicated server"
-	screen -A -m -d -S netpanzer-ded su - GAMES_USER_DED -c "GENTOO_DIR/netpanzer-ded"
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping netpanzer dedicated server"
-	local pid=`screen -list | grep netpanzer-ded | awk -F . '{print $1}' | sed -e s/.//`
-	if [[ -z "${pid}" ]] ; then
-		eend 1 "Lost screen session"
-	else
-		pid=`pstree -p ${pid} | sed -e 's:^.*netpanzer-ded(\([0-9]*\)).*:\1:'`
-		if [[ -z "${pid}" ]] ; then
-			eend 1 "Lost netpanzer-ded session"
-		else
-			kill ${pid}
-			eend $? "Could not kill netpanzer-ded"
-		fi
-	fi
-}
-
-status() {
-	screen -list | grep netpanzer-ded
-}
diff --git a/games-strategy/netpanzer/metadata.xml b/games-strategy/netpanzer/metadata.xml
deleted file mode 100644
index 6bb77c4ca82c..000000000000
--- a/games-strategy/netpanzer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">netpanzer.berlios</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild b/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
deleted file mode 100644
index 9a70ba26b16f..000000000000
--- a/games-strategy/netpanzer/netpanzer-0.8.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DATAVERSION="0.8"
-DESCRIPTION="Fast-action multiplayer strategic network game"
-HOMEPAGE="http://www.netpanzer.info/"
-SRC_URI="mirror://sourceforge/netpanzer.berlios/${P}.tar.bz2
-	mirror://sourceforge/netpanzer.berlios/${PN}-data-${DATAVERSION}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="dedicated"
-
-RDEPEND="dedicated? ( app-misc/screen )
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	dev-games/physfs"
-DEPEND="${RDEPEND}
-	dev-util/ftjam"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_configure() {
-	egamesconf
-	cd "${WORKDIR}"/${PN}-data-${DATAVERSION} \
-		&& egamesconf
-}
-
-src_compile() {
-	AR="${AR} cru" jam -q || die
-
-	cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
-	jam -q || die
-}
-
-src_install() {
-	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die
-
-	cd "${WORKDIR}"/${PN}-data-${DATAVERSION}
-	jam -sDESTDIR="${D}" -sappdocdir=/usr/share/doc/${PF} install || die
-
-	if use dedicated ; then
-		newinitd "${FILESDIR}"/${PN}.rc ${PN}
-		sed -i \
-			-e "s:GAMES_USER_DED:${GAMES_USER_DED}:" \
-			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
-			"${D}"/etc/init.d/${PN} || die
-
-		insinto /etc
-		doins "${FILESDIR}"/${PN}-ded.ini
-		dogamesbin "${FILESDIR}"/${PN}-ded
-		sed -i \
-			-e "s:GENTOO_DIR:${GAMES_BINDIR}:" \
-			"${D}/${GAMES_BINDIR}"/${PN}-ded || die
-	fi
-
-	rm -rf "${D}/${GAMES_DATADIR}"/{applications,pixmaps}
-	doicon "${S}"/${PN}.png
-	make_desktop_entry ${PN} NetPanzer
-	prepgamesdirs
-}
diff --git a/games-strategy/openra-20141029-r2 b/games-strategy/openra-20141029-r2
new file mode 100644
index 000000000000..5c629d8b6098
--- /dev/null
+++ b/games-strategy/openra-20141029-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl >=sys-apps/sed-4
+DESCRIPTION=A free RTS engine supporting games like Command & Conquer and Red Alert
+EAPI=5
+HOMEPAGE=http://open-ra.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-dotnet/libgdiplus dev-lang/mono media-libs/freetype:2[X] media-libs/libsdl2[X,opengl,video] media-libs/openal virtual/jpeg:0 virtual/opengl games-misc/games-envd
+SLOT=0
+SRC_URI=https://github.com/OpenRA/OpenRA/tarball/release-20141029 -> openra-20141029.tar.gz
+_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=03c213a841dec897b386ac7037cde118
diff --git a/games-strategy/openra/Manifest b/games-strategy/openra/Manifest
deleted file mode 100644
index 7634c50e0840..000000000000
--- a/games-strategy/openra/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX README.gentoo 4754 BLAKE2B 08fc1df7aa3f14a44c2642b606a351be4b117d2a133f04c680159b17998ccb056fb285910804c321a212fcab162e739a0c914e41203dc37b1682386754ec016f SHA512 423c2682c3a9e69ccb078399ffec2ed2cb4bf1445c86db730756457e65f90d6f56c80e09b4f5e0b0eb0501a2a692d7d2add3847f77794aaf7555574a76c75392
-DIST openra-20141029.tar.gz 15340674 BLAKE2B bcb18118b1c04da6d2c7c9db2fc10e69a35623994c0c2915ce1c3b410889b72a8761ab6235a876c774470dc8ca03c823f09a6d195416dacd7f55ea6ea5353f06 SHA512 44594ec3c3a590ae29b0291fdf2292c72ba920dff7892cc269e729a161505c4bc0c5c682bf3c6d3cabb0cdebfa3cac5975eeeeec3f5a673e948ed28132c4a313
-EBUILD openra-20141029-r2.ebuild 2001 BLAKE2B dcf47ec78d0898fd0e7e69b63dcfa4aec12cc16b67e7c460c08e248726ba9c8013868d6a895b6c7bfc04650daa8016ebd71289cbe94bc496feb30f5d3c320874 SHA512 01a42450a6edb1b6a7b74264a0bbdf23d98af852697fb99a74af81e89598ed2705ceb1408108400a4a925b113f717a3d6eed781a8a680d6ecf1b084db27c7570
-MISC metadata.xml 508 BLAKE2B b34a0d75f760668ced55f5268e2f75e7980dcccac6bbe26a6822f4434327888c8e242a1ea2f5bd3c70493a9b1a4e5b5905a36ceb615bf99544ac9c27c12457a7 SHA512 a001c0493ffb22d88e5c6769afcbd6f21193ec3f200d92181baaa280ce56ce5e9062c1685497549a7682b5c423525a65117af298df3d2218c80fcc3d7c34bf4a
diff --git a/games-strategy/openra/files/README.gentoo b/games-strategy/openra/files/README.gentoo
deleted file mode 100644
index 33502af0f9d2..000000000000
--- a/games-strategy/openra/files/README.gentoo
+++ /dev/null
@@ -1,111 +0,0 @@
-OpenRA is a Libre/Free Real Time Strategy game engine supporting early
-Westwood games like Command & Conquer and Command & Conquer: Red Alert.
-
-Distributed mods include a reimagining and updating of both the Red
-Alert and Command & Conquer multiplayer games.
-
-You may run the game from desktop games menu or just manually
-run the game with `mono OpenRA.Game.exe Game.Mods=ra` for Red Alert
-or `mono OpenRA.Game.exe Game.Mods=cnc` for Command & Conquer.
-
-If you have problems starting the game consider switching to
-alternative Cg Renderer. You may run the game with alternative
-Cg Graphics Renderer from desktop games menu or by adding
-`Graphics.Renderer=Cg` parameter explicitly to above console commands
- (convenient for some integrated graphics cards).
-To run explicitly with a default one use `Graphics.Renderer=Gl`
-parameter. The default Graphics Renderer is a better one, so
-don't forget to upgrade your graphics hardware drivers to the
-latest version. For Cg renderer also try to upgrade nvidia-cg-toolkit
-too. 
-
-The RA packages will need to be extracted to ~/.openra/Content/ra/
-before the RA mod will actually work. The C&C packages will need
-to be extracted to ~/.openra/Contet/cnc/ for C&C mod. You may 
-execute OpenRA and it will suggest to download content from original
-CD or a minimal one from OpenRA site automatically. You may also try
-to download minimal content pack from OpenRA site manually by using
-OpenRA Utility:
-
-cd /usr/share/games/openra
-mono OpenRA.Utility.exe --download-url=http://open-ra.org/get-dependency.php?file=ra-packages,/tmp/ra-packages.zip
-mono OpenRA.Utility.exe --extract-zip=/tmp/ra-packages.zip,~/.openra/Content/ra/
-
-The same commands for C&C mod:
-mono OpenRA.Utility.exe --download-url=http://open-ra.org/get-dependency.php?file=cnc-packages,/tmp/cnc-packages.zip
-mono OpenRA.Utility.exe --extract-zip=/tmp/cnc-packages.zip,~/.openra/Content/cnc/
-
-But the better choice is to download a full pack from original game CD
-(or iso). However, full CD pack usage result in slower game start from
-OpenRA Lobby. It happens due to a lot of unnecessary things like video
-clips were pre-packaged in it. If you want optimal game start and all
-music themes (made by Frank Klepacki) from classic CD you should
-download them from OpenRA Forum:
-http://www.sleipnirstuff.com/forum/viewtopic.php?f=83&t=15063
-
-The minimal required files for the Red Alert mod are:
-EITHER:
- * conquer.mix
- * temperat.mix
- * interior.mix
- * snow.mix
- * sounds.mix
- * allies.mix
- * russian.mix
-OR: (Usually pretty long game start)
- * main.mix
-AND:
- * redalert.mix
-
-The minimal required files for the Command and Conquer mod are:
- * cclocal.mix
- * speech.mix
- * conquer.mix
- * sounds.mix
- * tempicnh.mix
- * temperat.mix
- * winter.mix
- * desert.mix
-
-If you have a case-sensitive filesystem you must change the filenames to
-lower case.
-
-Red Alert and C&C have been released by EA Games as freeware. They could be
-downloaded from http://www.commandandconquer.com/classic
-Unfortunately the installer is 16-bit and so won’t run on 64-bit operating
-systems. This can be worked around by using the Red Alert Setup Manager
- (http://ra.afraid.org/html/downloads/utilities-3.html).
-Make sure you apply the no-CD protection fix so all the files needed
-are installed to the hard drive.
-
-If your notebook doesn't show long battery life under OpenRA load you can
-do several things:
-1. Turn off "Show Shellmap" item under General tab of Settings menu.
-2. Edit ~/.openra/settings.yaml in the "Graphics:" section to add
-framelimiter. Add "CapFramerate: True" string there to enable framelimiter.
-The default setting is 60 frames per second. You can change it's value by
-adding "MaxFramerate: 70", for example, string in that section. Be careful
-with special tab symbols at the beginning of the strings. Don't forget to
-backup your settings file.
-
-Please note: OpenRA has 2 types of released versions:
-1. Release Versions or just Versions.
-2. Unstable Playtests Versions or just Playtests.
-Release Versions are considered as more stable ones. Playtests are also
-pretty stable in most cases but they have usually more features wich are
-needed to be tested before inclusion into release. So, if you have any
-problems, please report them to the IRC channel #openra on irc.freenode.net
-(Use http://webchat.freenode.net/ if you don't have IRC client)
-or to the bug-tracker (http://bugs.open-ra.org).
-
-You may also see servers list with
-http://master.open-ra.org/list.php
-or by using orabot on IRC channel:
-]games (or !games)
-to see the games wich are waiting to start or
-]games --all
-to see all games.
-
-Please read HACKING for an overview of the engine and read OpenRA Wiki
-page for more info about the game and it's development:
-https://github.com/OpenRA/OpenRA/wiki
diff --git a/games-strategy/openra/metadata.xml b/games-strategy/openra/metadata.xml
deleted file mode 100644
index a4988625f33d..000000000000
--- a/games-strategy/openra/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://openra.res0l.net/news/</changelog>
-		<doc lang="en">https://github.com/OpenRA/OpenRA/wiki</doc>
-		<bugs-to>https://github.com/OpenRA/OpenRA/issues</bugs-to>
-		<remote-id type="github">OpenRA/OpenRA</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/openra/openra-20141029-r2.ebuild b/games-strategy/openra/openra-20141029-r2.ebuild
deleted file mode 100644
index 9c2afbc5770c..000000000000
--- a/games-strategy/openra/openra-20141029-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils mono-env gnome2-utils vcs-snapshot games
-
-DESCRIPTION="A free RTS engine supporting games like Command & Conquer and Red Alert"
-HOMEPAGE="http://open-ra.org/"
-SRC_URI="https://github.com/OpenRA/OpenRA/tarball/release-${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-QA_PREBUILT="$(games_get_libdir)/openra/liblua*"
-
-DEPEND="dev-dotnet/libgdiplus
-	dev-lang/mono
-	media-libs/freetype:2[X]
-	media-libs/libsdl2[X,opengl,video]
-	media-libs/openal
-	virtual/jpeg:0
-	virtual/opengl"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	mono-env_pkg_setup
-	games_pkg_setup
-}
-
-src_unpack() {
-	vcs-snapshot_src_unpack
-}
-
-src_configure() { :; }
-
-src_prepare() {
-	# register game-version
-	sed \
-		-e "/Version/s/{DEV_VERSION}/release-${PV}/" \
-		-i mods/{ra,cnc,d2k}/mod.yaml || die
-}
-
-src_compile() {
-	emake all
-	emake native-dependencies
-	emake docs
-}
-
-src_install() {
-	emake \
-		datadir="/usr/share" \
-		bindir="${GAMES_BINDIR}" \
-		libdir="$(games_get_libdir)" \
-		DESTDIR="${D}" \
-		install-all install-linux-scripts
-
-	exeinto "$(games_get_libdir)/openra"
-	doexe Eluant.dll.config liblua$(usex amd64 "64" "32")*
-
-	# icons
-	insinto /usr/share/icons/
-	doins -r packaging/linux/hicolor
-
-	# desktop entries
-	make_desktop_entry "${PN} Game.Mods=cnc" "OpenRA CNC" ${PN}
-	make_desktop_entry "${PN} Game.Mods=ra" "OpenRA RA" ${PN}
-	make_desktop_entry "${PN} Game.Mods=d2k" "OpenRA Dune2k" ${PN}
-	make_desktop_entry "${PN}-editor" "OpenRA Map Editor" ${PN}
-
-	dodoc "${FILESDIR}"/README.gentoo README.md CONTRIBUTING.md AUTHORS \
-		DOCUMENTATION.md Lua-API.md
-
-	# file permissions
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-
-	elog "optional dependencies:"
-	elog "  media-gfx/nvidia-cg-toolkit (fallback renderer if OpenGL fails)"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/outerspace-0.5.68-r1 b/games-strategy/outerspace-0.5.68-r1
new file mode 100644
index 000000000000..0aa4d863ea04
--- /dev/null
+++ b/games-strategy/outerspace-0.5.68-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=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=On-line strategy game taking place in the dangerous universe
+EAPI=6
+HOMEPAGE=https://www.ospace.net/ https://sourceforge.net/projects/ospace/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pygame-1.7 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ospace/Client/0.5.68/Outer%20Space-0.5.68.tar.gz -> outerspace-0.5.68.tar.gz mirror://sourceforge/ospace/Client/0.5.68/outerspace_0.5.68-0ubuntu1_all.deb
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9aebb47150fe67f59995e43c1582bcf3
diff --git a/games-strategy/outerspace/Manifest b/games-strategy/outerspace/Manifest
deleted file mode 100644
index feafc91522f6..000000000000
--- a/games-strategy/outerspace/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX outerspace 169 BLAKE2B 432402aa2fa9b80c2a5d22f22e5858dd6d618145d37abe54736d7a23fbfcc20dbe6e8c8e2427a4e561960b338def2bd0c28f37f5fdcfcbfc1983b740f3f2a1f3 SHA512 fd20d9de084fef162eec391d68dc973df566b62fd2254fe8ad92c91b073341ca17f96844e0cae28592a7a4d05cc6e3744d66cd37dce9b70319678b91db8d8a1b
-AUX outerspace-0.5.68-setup.patch 1652 BLAKE2B 60d940c6c6c8c95452288abc13873aceff6d8cd6dd1216a61ca02de5bd1e834365fd2bbc0d6dd38500b1e2b764ccd1d629831871b40d2d45c708460939d23120 SHA512 b3d7f604724e6990436808dc62214a55325278cc04006fbe8438a213e772615a46b2969f88b03364332154af3cf996c7bdce05cc40dd5d24938bf6b537f9884b
-DIST outerspace-0.5.68.tar.gz 2249703 BLAKE2B 16b8c2d6c4e0516867d9a07a2762112da39f9a1074dffad9a9a3c343dd75662cba74d50f2a028b530013f320ffd7481317d061a3ebb449e9acf2f41bf56312a3 SHA512 dc2cbebf16fefabcc3356efb496766b90a5eabbf218f085fdc83cf956ca9503e99ef3154e0905c2432a3bf7caabd1f2af585a43397ba368581cd66546fcddc6b
-DIST outerspace_0.5.68-0ubuntu1_all.deb 2634188 BLAKE2B fd1667ae130e9a0ed603c369e9751d0b83414f20dd06c2f7e9941e2c465bdad0ff050ca41a928906bc5cc755eb05c0a5dfa18a8c35c868650c3fec6cf2e4f1f8 SHA512 9520cf1207a59497d6253b42bc34d580f9b805cf4ae55a5c921082e965892aa67921c4624ea94a5145c911dc2b24a1cca2806c06770ef8d1ded10855fb42666c
-EBUILD outerspace-0.5.68-r1.ebuild 1607 BLAKE2B 0f40261cf16d047c90c3bc49591b5e510c282eb2267e591ad027f80a537f33bc1f579bac8c2f179a230b7d9d2bcecdb31ccc9873f0c40b705b21d988a3a78666 SHA512 778a9c0879b0c03ff527f6918f0e8bf8ebaec479aa02d5a43fe791e6c73d8daa912dc37cd19f35d2e36191b7fb2f5155fcdbc03a432dd5b8969d92f177247ae7
-MISC metadata.xml 831 BLAKE2B 2eb39d75eca89288ab8dcb4ff274891d62e4c9a9540ceb2a2f887e2743c28c4d04b8692a093e24c0226b88d2dbe938b268ef17de4974e5c127422ed387bac6a7 SHA512 d607343f2cc56162b694e28523cf256339a306b03bcca9c0148c59700491249a9acc6cfc193467cbdd04d8ea9bb564816747276143b3e4e1bf3dc7deab480d1e
diff --git a/games-strategy/outerspace/files/outerspace b/games-strategy/outerspace/files/outerspace
deleted file mode 100644
index 2a6bbe26dafb..000000000000
--- a/games-strategy/outerspace/files/outerspace
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-mkdir -p ~/.outerspace
-cd ~/.outerspace || exit 1
-
-ln -sf "@GENTOO_LIBDIR@"/{osc.py,lib,libsrvr} .
-ln -sf "@GENTOO_DATADIR@"/res .
-
-exec python osc.py "$@"
diff --git a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch b/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
deleted file mode 100644
index c95852dca3dc..000000000000
--- a/games-strategy/outerspace/files/outerspace-0.5.68-setup.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -42,12 +42,7 @@
- 
- # collect data files
- data_files = []
--data_files.append(
--    (
--        ".",
--        ["../ChangeLog.txt", "../COPYING", "../README", "../README_CZ"]
--    )
--)
-+
- 
- # resources
- for root, dirs, files in os.walk('res'):
-@@ -57,16 +52,6 @@
-         pass
-     if files:
-         data_files.append((root, [os.path.join(root, file) for file in files]))
--
--data_files.append(
--    (
--        "res/techspec",
--        [
--            "../server/lib/ige/ospace/Rules/techs.spf",
--            "../server/lib/ige/ospace/Rules/Tech.spf",
--        ]
--    )
--)
- 
- if havePy2Exe:
-     data_files.append((".", ["../updater/update.exe"]))
-@@ -114,10 +99,3 @@
-     **extraArgs
- )
- 
--# cleanup
--def onerror(func, path, err):
--    if func is os.remove:
--        os.chmod(path, stat.S_IWRITE)
--        os.remove(path)
--
--shutil.rmtree("libsrvr", onerror = onerror)
---- a/osc.py
-+++ b/osc.py
-@@ -23,12 +23,36 @@
- # tweak PYTHONPATH
- import sys
- import os
-+import errno
- sys.path.insert(0, "lib")
- 
- for item in ("libsrvr", "../server/lib"):
-     if os.path.exists(item):
-         sys.path.insert(0, item)
-         break
-+
-+userdir=os.path.expanduser("~/.outerspace")
-+resdir=os.path.join(userdir, "res")
-+rootresdir="@GENTOO_DATADIR@/res"
-+
-+if not (os.path.isdir(userdir)):
-+	try:
-+		os.makedirs(userdir)
-+	except:
-+		sys.exit("unable to create %s" % userdir)
-+
-+try:
-+	os.symlink(rootresdir, resdir)
-+except OSError, e:
-+	if e.errno == errno.EEXIST:
-+		os.remove(resdir)
-+		os.symlink(rootresdir, resdir)
-+
-+try:
-+	os.chdir(userdir)
-+except:
-+	sys.exit("unable to cd into %s" % userdir)
-+
- 
- #configure gc
- #import gc
diff --git a/games-strategy/outerspace/metadata.xml b/games-strategy/outerspace/metadata.xml
deleted file mode 100644
index 8868ccd042b9..000000000000
--- a/games-strategy/outerspace/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription lang="en">
-Outer Space is an on-line strategy game which takes place in the dangerous
-universe. You will become powerful commander of many stars, planets, and great
-fleets and will struggle for survival with other commanders.
-
-Outer Space communicates with the server in the same way as your browser, but
-you will need a special client to play it. Using this client you can create an
-account on the server and you can start to explore the world of the Outer Space.
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">ospace</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild b/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
deleted file mode 100644
index a7d5680c16a5..000000000000
--- a/games-strategy/outerspace/outerspace-0.5.68-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit desktop gnome2-utils distutils-r1
-
-MY_PN="${PN/outerspace/Outer Space}"
-DESCRIPTION="On-line strategy game taking place in the dangerous universe"
-HOMEPAGE="https://www.ospace.net/ https://sourceforge.net/projects/ospace/"
-SRC_URI="mirror://sourceforge/ospace/Client/${PV}/Outer%20Space-${PV}.tar.gz -> ${P}.tar.gz
-	mirror://sourceforge/ospace/Client/${PV}/outerspace_${PV}-0ubuntu1_all.deb"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pygame-1.7"
-DEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	default
-	unpack ./data.tar.gz
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-scripts="/usr/bin" \
-		--install-data="/usr/share/${PN}" \
-		--install-lib="$(python_get_sitedir)"
-
-	# source tarball is missing files
-	# get them from ubuntu.deb
-	insinto "$(python_get_sitedir)"/ige/ospace/Rules
-	doins "${WORKDIR}"/usr/share/games/outerspace/libsrvr/ige/ospace/Rules/{Tech,techs}.spf
-}
-
-src_prepare() {
-	default
-
-	# fix setup script
-	# rework python start script to avoid shell-wrapper script
-	eapply "${FILESDIR}"/${P}-setup.patch
-
-	sed -i\
-		-e "s:@GENTOO_DATADIR@:/usr/share/${PN}:" \
-		osc.py || die "sed failed"
-
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	newicon res/logo-login.png ${PN}.png
-	make_desktop_entry "osc.py" "${MY_PN}"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/s25rttr-0.8.1-r3 b/games-strategy/s25rttr-0.8.1-r3
new file mode 100644
index 000000000000..4b95314b6c53
--- /dev/null
+++ b/games-strategy/s25rttr-0.8.1-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Open Source remake of The Settlers II game (needs original game files)
+EAPI=6
+HOMEPAGE=https://www.siedler25.org/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2 media-libs/libsamplerate media-libs/libsdl[X,sound,opengl,video] media-libs/libsndfile media-libs/sdl-mixer[vorbis] net-libs/miniupnpc virtual/libiconv virtual/opengl
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~hasufell/distfiles/s25rttr-0.8.1.tar.xz
+_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	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c42e2282e17fb238b7e9d592c2f59611
diff --git a/games-strategy/s25rttr/Manifest b/games-strategy/s25rttr/Manifest
deleted file mode 100644
index 56eb1652559e..000000000000
--- a/games-strategy/s25rttr/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX s25rttr-0.8.1-cmake-3.patch 851 BLAKE2B 212aacf9ab7d37f41b0f1ade26fac67f015c62c02058874910af7d8e0123bd39a1f1301e0296ec906ce55f38e006bbdba6f30d9b98f35439639ea778f8272c22 SHA512 46f012e386854fbb7f21bbee98855849303501bf946b74a93c87ec9745cf5ec50b903ea3d35ecf9e84c1e4161c1876d43507c97d6bd9af8b5af2f6c9f4cb2805
-AUX s25rttr-0.8.1-cmake.patch 5706 BLAKE2B 5b9d796e1e6815336eb9a9006e321a66e6c733ebd514b5ff92ae542e6078a9dc2366dc7e01cc310ea758c903dceebb545a860fa09fe462fd5fa00bf2202c3647 SHA512 0a53ea20225d616686aff2ef2d98ae5dc5394e28db9be554102332705de5418cd5dd895075923924c7ada0e8bbcc2b9825203e531b3fffa531dc4232d9463fa3
-AUX s25rttr-0.8.1-format.patch 698 BLAKE2B f4ad85af1c05e4a6ace8da4a62e75673a773698170a430a716aef0219d08badfef01fb3b9d71b225549e541a3f7dc9be754c18f349c522c046f4ec8b83125385 SHA512 f0ba023f3d6fff3970cfcfc132c44e4dcff41ed91faee74b5ad513bce3bd625d6528511114fad70f6d3f5cdfc6e471ecef07a607be6a082ca7f3a0b71477d8cc
-AUX s25rttr-0.8.1-fpic.patch 1508 BLAKE2B f53042695c3fa65fb2ced0afb8307fd9e56d12d2b6ad0bef2c309720177d3466eb61a7bd0ed89c9f4c6ff3ff45faf9fab5e7e4b7d26f4a6dbb957f030805df31 SHA512 23c2f54864205c55bb7f18cb9b6e949640451b4b4de86b2c30a8721fd724c8ba00fd667bc8c07ea31ba8edfb92630afec08e1f52ab861d08887cf639f8cde7a9
-AUX s25rttr-0.8.1-gcc6.patch 1504 BLAKE2B 6cbb0fcd59ebedbb0e9faf49bc192944b70ceee9a0abdc3b5256717672da190a6337ed2ad4d52d28aedc1b0e29704c9fe36b6a67aafe9aceb28bd350895efb12 SHA512 3a10ee4c6329c1dcc514e2b4d5edec41b56ac72c08955b24eeced94d1c9757703fe0732d833718dd99a4e5d70857a8e84347d8036c683b9b82d37916bd2cf951
-AUX s25rttr-0.8.1-miniupnpc-api-14.patch 1385 BLAKE2B a5fe9c6937dfe154685ac1e0debab0b5ef3e6c3e27a792f947e1c5a93f772f2d9829602c87db76d9a421d723e652c01f3e015643801d0c136002164f366a5fca SHA512 163a83ac734ff2accca133c20c0e15f7f21140e41661add4229f2a878baebebf09eb82420b2d0b0a7a77042be35608bd00c30006265395e842ae28d64b8986f6
-AUX s25rttr-0.8.1-soundconverter.patch 767 BLAKE2B 7a3772caa5624ee18a73cff0fb41531798022ef845feb4e1bb7bae560207efe82fb084fec7c0d9dfdde02c293db6fe3c2ea9290a5a6fd59cc59fee37a32693b7 SHA512 e62de5e040e89d53b73a0b7202eab0b32382656978e6c4471b1f3b996c9c679c9de13a8db671d719a79b985b062be3e67e75dacd4d9b5efb58e63c30bde1c10c
-DIST s25rttr-0.8.1.tar.xz 39644940 BLAKE2B 80268ac6ee20da983b4c3a90d8a9ebd5903734547fb48036963f435498a3395964afba990498a306a89009da50d023982a1dbd502e1ed618734c6a8d44ba2368 SHA512 31a7d640e1ecd5488ef02d0ed3adcaeb9b5ae5f6af5e006deb4100fde3eb8ec567e34519e9c2b82f38c9972d62790a6f6978d5da6c6dfca7f1c153fa65f22df2
-EBUILD s25rttr-0.8.1-r3.ebuild 2561 BLAKE2B f13028cb9ecc8411759492da43b3203c22ef701d81c7f84641c79f1ea1a727ff68f66b4cf8fee5c5fba1b28439fcb14ee6588d7e973f030f7cddea78181080bb SHA512 d08a0c4eccab8a1cd85efca0f794ff36b340b8326e103df69fbed55a48a530a8315e73635d0b8bc3647df2c3b5c346a7371633e3073919992259f9c295d02f1f
-MISC metadata.xml 463 BLAKE2B 33a0cc242b253cb1a3446cc2705cfb32bf0cd125c990bf0b8d527c3c9de546c390dd8fbad984c2a2a6264a25e0f889b63e86287024aa666dfdac94a5aacc3664 SHA512 dd5ea72d1f7ceda9bb2f033c8482e2978924ebee1a61e00fb515b0b0e846553bb1a4024aa739ae1f51608dcb90d0138d6679df1133a8140bfa2bfdb48163c885
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
deleted file mode 100644
index b7e9e424eb08..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake-3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fcbfb02..ae1c5f0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,12 +2,12 @@
- ### $Id: CMakeLists.txt 8341 2012-09-30 12:09:04Z FloSoft $
- ################################################################################
- 
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
--CMAKE_POLICY(SET CMP0003 OLD)
--
--IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
--	CMAKE_POLICY(SET CMP0015 OLD)
--ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7 AND ${CMAKE_PATCH_VERSION} GREATER 0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7)
-+CMAKE_POLICY(SET CMP0003 NEW)
-+CMAKE_POLICY(SET CMP0015 NEW)
-+IF(NOT CMAKE_VERSION VERSION_LESS 3.1)
-+	CMAKE_POLICY(SET CMP0053 NEW)
-+ENDIF()
- 
- SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
- 
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
deleted file mode 100644
index 14f2edb52df5..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-cmake.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Oct  5 13:33:05 UTC 2012
-
-make build system gentoo-compatible
-provide options for SDL and GLFW video drivers
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -19,12 +19,19 @@
- 
- ################################################################################
- 
--INCLUDE(cmake/crosscompile.cmake)
--
- PROJECT(s25client)
- 
- ################################################################################
- 
-+# options
-+OPTION(BUILD_GLFW_DRIVER "Build the GLFW video driver" 0)
-+OPTION(BUILD_SDL_DRIVER "Build the sdl video driver" 1)
-+IF (UNIX)
-+	IF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
-+		MESSAGE(FATAL_ERROR "No video driver selected! Either use SDL or GLFW.")
-+	ENDIF (NOT BUILD_SDL_DRIVER AND NOT BUILD_GLFW_DRIVER)
-+ENDIF (UNIX)
-+
- SET(PREFIX ${PREFIX} CACHE STRING "Path prefix")
- SET(BINDIR ${BINDIR} CACHE STRING "Directory for the binaries")
- SET(DATADIR ${DATADIR} CACHE STRING "Data directory")
-@@ -106,38 +113,6 @@
- 			   build_paths.h)
- CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build_version.h.cmake"
- 			   build_version.h)
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/preinstall.sh.cmake"
--			   preinstall.sh @ONLY)
--CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/build/postinstall.sh.cmake"
--			   postinstall.sh @ONLY)
--
--################################################################################
--
--ADD_SUBDIRECTORY(version)
--
--ADD_CUSTOM_TARGET(updateversion ALL
--				  COMMAND "${CMAKE_BINARY_DIR}/version/src/version" "${CMAKE_SOURCE_DIR}"
--				  DEPENDS version
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--ADD_CUSTOM_TARGET(mrproper
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build/cleanup.sh"
--				  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
--)
--
--ADD_CUSTOM_TARGET(create_nightly
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "nightly" "${CMAKE_SOURCE_DIR}"
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--ADD_CUSTOM_TARGET(create_stable
--				  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/release/create_release.sh" "stable" "${CMAKE_SOURCE_DIR}"
--				  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
--)
--
--# preinstall script
--INSTALL(SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/cmake/preinstall.cmake")
- 
- ################################################################################
- 
-@@ -148,7 +123,6 @@
- ADD_SUBDIRECTORY(libutil)
- ADD_SUBDIRECTORY(liblobby)
- ADD_SUBDIRECTORY(s-c)
--ADD_SUBDIRECTORY(s25update)
- ADD_SUBDIRECTORY(src)
- 
- ################################################################################
-@@ -157,7 +131,6 @@
- INSTALL(CODE "INCLUDE(driver/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(libsiedler2/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(s-c/cmake_install.cmake)")
--INSTALL(CODE "INCLUDE(s25update/cmake_install.cmake)")
- INSTALL(CODE "INCLUDE(src/cmake_install.cmake)")
- 
- # and then dont let him install anything
---- a/driver/video/CMakeLists.txt
-+++ b/driver/video/CMakeLists.txt
-@@ -3,7 +3,11 @@
- #################################################################################
- 
- ADD_SUBDIRECTORY( WinAPI )
--ADD_SUBDIRECTORY( GLFW )
--ADD_SUBDIRECTORY( SDL )
-+IF(BUILD_GLFW_DRIVER)
-+	ADD_SUBDIRECTORY( GLFW )
-+ENDIF(BUILD_GLFW_DRIVER)
-+IF(BUILD_SDL_DRIVER)
-+	ADD_SUBDIRECTORY( SDL )
-+ENDIF(BUILD_SDL_DRIVER)
- 
- #################################################################################
---- a/driver/video/SDL/src/CMakeLists.txt
-+++ b/driver/video/SDL/src/CMakeLists.txt
-@@ -30,9 +30,9 @@
- 	ADD_CUSTOM_COMMAND(TARGET videoSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../videoSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
- 	
- 	INSTALL(TARGETS videoSDL 
--		RUNTIME DESTINATION ${LIBDIR}/driver/video 
--		LIBRARY DESTINATION ${LIBDIR}/driver/video
--		ARCHIVE DESTINATION ${LIBDIR}/driver/video
-+		RUNTIME DESTINATION ${LIBDIR} 
-+		LIBRARY DESTINATION ${LIBDIR}
-+		ARCHIVE DESTINATION ${LIBDIR}
- 	)
- ELSE (SDL_FOUND)
- 	MESSAGE(WARNING ": SDL library not found: Not building SDL videodriver")
---- a/driver/video/GLFW/src/CMakeLists.txt
-+++ b/driver/video/GLFW/src/CMakeLists.txt
-@@ -2,7 +2,7 @@
- ### $Id$
- #################################################################################
- 
--IF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
-+IF ("${COMPILEFOR}" STREQUAL "linux" )
- 	FIND_LIBRARY(GLFW_LIBRARY glfw) 
- 	
- 	IF (GLFW_LIBRARY)
-@@ -21,6 +21,6 @@
- 	ELSE (GLFW_LIBRARY)
- 		MESSAGE(WARNING ": GLFW library not found: Not building GLFW videodriver")
- 	ENDIF (GLFW_LIBRARY)
--ENDIF ("${COMPILEFOR}/${COMPILEARCH}" STREQUAL "linux/i386" )
-+ENDIF ("${COMPILEFOR}" STREQUAL "linux" )
- 
- #################################################################################
---- a/driver/audio/SDL/src/CMakeLists.txt
-+++ b/driver/audio/SDL/src/CMakeLists.txt
-@@ -34,9 +34,9 @@
-         ADD_CUSTOM_COMMAND(TARGET audioSDL POST_BUILD COMMAND ln -fvs SDL/src/${SL_PREFIX}audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX} ../../audioSDL${CMAKE_SHARED_LIBRARY_SUFFIX})
- 
-         INSTALL(TARGETS audioSDL 
--            RUNTIME DESTINATION ${LIBDIR}/driver/audio 
--            LIBRARY DESTINATION ${LIBDIR}/driver/audio
--            ARCHIVE DESTINATION ${LIBDIR}/driver/audio
-+            RUNTIME DESTINATION ${LIBDIR} 
-+            LIBRARY DESTINATION ${LIBDIR}
-+            ARCHIVE DESTINATION ${LIBDIR}
-         )
-     ELSE (SDLMIXER_FOUND)
-         MESSAGE(WARNING ": SDL_mixer library not found: Not building SDL audiodriver")
---- a/build_paths.h.cmake
-+++ b/build_paths.h.cmake
-@@ -41,6 +41,7 @@
- 
- //	set game directory (normal $(datadir)/s25rttr/S2)
- //#define GAMEDIR DATADIR"/S2"
-+#cmakedefine GAMEDIR "${GAMEDIR}"
- 
- //	set driver directory (normal $(libdir)/driver)
- //#define DRIVERDIR LIBDIR"/driver"
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
deleted file mode 100644
index 3d50543b9c0e..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/dskGameInterface.cpp.old	2016-02-15 21:11:58.308899794 +0100
-+++ b/src/dskGameInterface.cpp	2016-02-15 21:12:24.564433584 +0100
-@@ -1349,7 +1349,7 @@
- 			snprintf(text, sizeof(text), _("Team victory! '%s' and '%s' and '%s' and '%s' are the winners!"), GameClient::inst().GetPlayer(winners[0])->name.c_str(),GameClient::inst().GetPlayer(winners[1])->name.c_str(),GameClient::inst().GetPlayer(winners[2])->name.c_str(),GameClient::inst().GetPlayer(winners[3])->name.c_str());
- 			break;
- 		default:
--			snprintf(text, sizeof(text), _("Team victory!"));
-+			snprintf(text, sizeof(text), "%s", _("Team victory!"));
- 			break;
- 	}
- 	messenger.AddMessage("", 0, CD_SYSTEM, text, COLOR_ORANGE);
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
deleted file mode 100644
index 4a1d11ef1704..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001
-From: nE0sIghT <ykonotopov@gmail.com>
-Date: Sat, 18 Jul 2015 19:03:05 +0300
-Subject: [PATCH] Fixed build of sdl drivers
-
----
- driver/audio/SDL/src/CMakeLists.txt | 1 +
- driver/video/SDL/src/CMakeLists.txt | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt
-index 5ad3f02..5a91cd5 100644
---- a/driver/audio/SDL/src/CMakeLists.txt
-+++ b/driver/audio/SDL/src/CMakeLists.txt
-@@ -20,6 +20,7 @@ IF (SDL_FOUND)
-         
-         ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h)
-     
-+    	ADD_DEFINITIONS(-fPIC)
-         ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
-         ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR})
- 
-diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt
-index 83d10cf..ca67573 100644
---- a/driver/video/SDL/src/CMakeLists.txt
-+++ b/driver/video/SDL/src/CMakeLists.txt
-@@ -16,6 +16,7 @@ IF (SDL_FOUND)
- 
- 	ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp)
- 
-+	ADD_DEFINITIONS(-fPIC)
- 	ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR})
- 	ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR})
- 
--- 
-2.3.6
-
-
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
deleted file mode 100644
index 957ecf4ddf50..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-gcc6.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Bug: https://bugs.gentoo.org/610972
-Commit: https://github.com/Return-To-The-Roots/mygettext/commit/3b902a46322b7e88e9d2cdf85ee0912c6565f9a2
-
---- a/driver/audio/SDL/src/SDL.cpp
-+++ b/driver/audio/SDL/src/SDL.cpp
-@@ -175,23 +175,23 @@
- 	
- 	char file[512];
- 	if(!tempname(file, 512))
--		return false;
-+		return NULL;
- 
- 	strncat(file, ".wav", 512);
- 	
- 	FILE *dat = fopen(file, "wb");
- 	if(!dat)
--		return false;
-+		return NULL;
- 
- 	if(fwrite(data, 1, size, dat) != size)
--		return false;
-+		return NULL;
- 	
- 	fclose(dat);
- 
- 	switch(data_type)
- 	{
- 	default:
--		return false;
-+		return NULL;
- 
- 	case AudioDriver::AD_WAVE:
- 		{
-@@ -233,12 +233,12 @@
- 
- 	char file[512];
- 	if(!tempname(file, 512))
--		return false;
-+		return NULL;
- 
- 	switch(data_type)
- 	{
- 	default:
--		return false;
-+		return NULL;
- 
- 	case AudioDriver::AD_MIDI:
- 		{
-@@ -266,10 +266,10 @@
- 
- 	FILE *dat = fopen(file, "wb");
- 	if(!dat)
--		return false;
-+		return NULL;
- 
- 	if(fwrite(data, 1, size, dat) != size)
--		return false;
-+		return NULL;
- 
- 	fclose(dat);
- 
---- a/src/VideoDriverWrapper.cpp
-+++ b/src/VideoDriverWrapper.cpp
-@@ -481,7 +481,7 @@
- 	if(videodriver == NULL)
- 	{
- 		fatal_error("Kein Videotreiber ausgewaehlt!\n");
--		return false;
-+		return NULL;
- 	}
- 
- 	return videodriver->GetFunction(extension);
---- a/mygettext/src/mygettext.h
-+++ b/mygettext/src/mygettext.h
-@@ -21,6 +21,9 @@
- 
- #pragma once
- 
-+// necessarily here
-+#include <locale>
-+
- const char *mysetlocale(int category, const char *locale);
- 
- #undef gettext
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
deleted file mode 100644
index d2ff0ee1fe39..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-miniupnpc-api-14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3b08b907235c09ab84e3bb23d1e05fe5a1d1c00e Mon Sep 17 00:00:00 2001
-From: Manuel Zeise <mail@manuel-zeise.de>
-Date: Sun, 3 Jan 2016 16:54:05 +0100
-Subject: [PATCH] Switch for miniUPnPc API version 14 and above
-
-API version 14 of miniUPnPc has introduced a new TTL argument to
-upnpDiscover() with a recommended default value of 2. A new preprocessor
-statement evaluates the API version and selects the correct version of
-upnpDiscover() based on the API version.
-
---- s25rttr-0.8.1/libutil/src/UPnP.cpp
-+++ s25rttr-0.8.1/libutil/src/UPnP.cpp
-@@ -210,7 +210,11 @@
- 	UPNPDev* devicelist = NULL;
- #ifdef UPNPDISCOVER_SUCCESS
- 	int upnperror = 0;
-+#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
-+	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
-+#else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
-+#endif
- #else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
- #endif
-@@ -276,7 +280,11 @@
- 	UPNPDev* devicelist = NULL;
- #ifdef UPNPDISCOVER_SUCCESS
- 	int upnperror = 0;
-+#if (MINIUPNPC_API_VERSION >= 14) /* miniUPnPc API version 14 adds TTL parameter */
-+	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, 2, &upnperror);
-+#else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0, 0 /* ipv6 */, &upnperror);
-+#endif
- #else
- 	devicelist = upnpDiscover(2000, NULL, NULL, 0);
- #endif
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
deleted file mode 100644
index 1cc7686b850d..000000000000
--- a/games-strategy/s25rttr/files/s25rttr-0.8.1-soundconverter.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: hasufell <julian.ospald@googlemail.com>
-Date: Mon Apr 30 20:42:28 UTC 2012
-
-relocate executables sound-convert and s-c_resample which get installed
-into datadir by default
-
---- a/libutil/src/files.h
-+++ b/libutil/src/files.h
-@@ -140,7 +140,7 @@
- 	/* 54 */RTTRDIR "",                               // unbenutzt
- 	/* 55 */SETTINGSDIR "/LSTS/SOUND.LST",            // Die konvertierte sound.lst
- 	/* 56 */RTTRDIR "/sound.scs",                     // Das konvertier-script
--	/* 57 */RTTRDIR "",                               // Basispfad fürn Soundconverter
-+	/* 57 */DRIVERDIR "",                             // Basispfad fürn Soundconverter
- 	/* 58 */GAMEDIR "/DATA/MIS0BOBS.LST",
- 	/* 59 */GAMEDIR "/DATA/MIS1BOBS.LST",
- 	/* 60 */GAMEDIR "/DATA/MIS2BOBS.LST",
diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
deleted file mode 100644
index 7603c5eda305..000000000000
--- a/games-strategy/s25rttr/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<changelog>http://www.siedler25.org/index.php?com=dynamic&amp;mod=9&amp;PHPSESSID=e5fa4f90c4db5df0cb1e417e128300b5</changelog>
-		<bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
deleted file mode 100644
index 47531d7e1d95..000000000000
--- a/games-strategy/s25rttr/s25rttr-0.8.1-r3.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop gnome2-utils readme.gentoo-r1
-
-DESCRIPTION="Open Source remake of The Settlers II game (needs original game files)"
-HOMEPAGE="https://www.siedler25.org/"
-# no upstream source tarball yet
-# https://bugs.launchpad.net/s25rttr/+bug/1069546
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="
-	app-arch/bzip2
-	media-libs/libsamplerate
-	media-libs/libsdl[X,sound,opengl,video]
-	media-libs/libsndfile
-	media-libs/sdl-mixer[vorbis]
-	net-libs/miniupnpc
-	virtual/libiconv
-	virtual/opengl
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-DOCS=( RTTR/texte/{keyboardlayout.txt,readme.txt} )
-
-DOC_CONTENTS="Copy your Settlers2 game files into ~/.${PN}/S2"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cmake.patch
-	"${FILESDIR}"/${P}-soundconverter.patch
-	"${FILESDIR}"/${P}-fpic.patch
-	"${FILESDIR}"/${P}-format.patch
-	"${FILESDIR}"/${P}-miniupnpc-api-14.patch
-	"${FILESDIR}"/${P}-cmake-3.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-src_configure() {
-	local arch
-	case ${ARCH} in
-		amd64)
-			arch="x86_64" ;;
-		x86)
-			arch="i386" ;;
-		*) die "Architecture ${ARCH} not yet supported" ;;
-	esac
-
-	local mycmakeargs=(
-		-DCOMPILEFOR="linux"
-		-DCOMPILEARCH="${arch}"
-		-DCMAKE_SKIP_RPATH=YES
-		-DPREFIX="/usr/"
-		-DBINDIR="/usr/bin"
-		-DDATADIR="/usr/share"
-		-DLIBDIR="/usr/$(get_libdir)/${PN}"
-		-DDRIVERDIR="/usr/$(get_libdir)/${PN}"
-		-DGAMEDIR="~/.${PN}/S2"
-		-DBUILD_GLFW_DRIVER=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	# work around some relative paths (CMAKE_IN_SOURCE_BUILD not supported)
-	ln -s "${CMAKE_USE_DIR}"/RTTR "${CMAKE_BUILD_DIR}"/RTTR || die
-
-	cmake-utils_src_compile
-
-	mv "${CMAKE_USE_DIR}"/RTTR/{sound-convert,s-c_resample} "${T}"/ || die
-}
-
-src_install() {
-	cd "${CMAKE_BUILD_DIR}" || die
-
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe "${T}"/{sound-convert,s-c_resample}
-	exeinto /usr/"$(get_libdir)"/${PN}/video
-	doexe driver/video/SDL/src/libvideoSDL.so
-	exeinto /usr/"$(get_libdir)"/${PN}/audio
-	doexe driver/audio/SDL/src/libaudioSDL.so
-
-	insinto /usr/share
-	doins -r "${CMAKE_USE_DIR}"/RTTR
-	dosym ./LSTS/splash.bmp /usr/share/RTTR/splash.bmp
-
-	doicon -s 64 "${CMAKE_USE_DIR}"/debian/${PN}.png
-	dobin src/s25client
-	make_desktop_entry "s25client" "Settlers RTTR" "${PN}"
-
-	einstalldocs
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/scorched3d-44-r2 b/games-strategy/scorched3d-44-r2
new file mode 100644
index 000000000000..163d62b41e5b
--- /dev/null
+++ b/games-strategy/scorched3d-44-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dev-libs/expat media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-net sys-libs/zlib virtual/jpeg:0 !dedicated? ( virtual/opengl virtual/glu media-libs/glew:0= media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:3.0[X] media-libs/freetype:2 sci-libs/fftw:3.0= ) mysql? ( virtual/mysql ) !dedicated? ( 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=Multi-player tank battle in 3D (OpenGL)
+EAPI=6
+HOMEPAGE=http://www.scorched3d.co.uk/
+IUSE=dedicated mysql
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat media-fonts/dejavu media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-net sys-libs/zlib virtual/jpeg:0 !dedicated? ( virtual/opengl virtual/glu media-libs/glew:0= media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:3.0[X] media-libs/freetype:2 sci-libs/fftw:3.0= ) mysql? ( virtual/mysql )
+SLOT=0
+SRC_URI=mirror://sourceforge/scorched3d/Scorched3D-44-src.tar.gz
+_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	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=3891e000be68b77a4ae4498fe542aaaf
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
deleted file mode 100644
index 01f629e05553..000000000000
--- a/games-strategy/scorched3d/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX scorched3d-44-fix-c++14.patch 566 BLAKE2B 0924707c4da94b1ca088b46db19e145191708d38be6f848cdeec5a84a1f90002736d40ed3e95b8e836580adb496d5fbb0f247f31df991a28c797842086cca01e SHA512 f74db569f471e1ac24fe6dfa15c319ac6dce52a6b35d333efb314b59156b150e7a09c843e7046d804a4768eea294671546313043c46bc38ac5e951d1daa1c23d
-AUX scorched3d-44-fixups.patch 717 BLAKE2B 24af35bbc6d1070d08282e4915d4575f1d0783a49d542a3d7aca45ad91ac8ab8378a0a48d19e7e593d71e39882ea1964a1686d6f4fbcacedb00cbc26f8e68d65 SHA512 8045df51e6a09d9101d971056edc77e03694b2872819cd892d1239c04ad5c59afa8a60adc2ca04a63a5d501bbb113221408522a33159eee836e600bb2b8d40c7
-AUX scorched3d-44-freetype.patch 1372 BLAKE2B a2b5f4551ae2d64c8a35cf9f305c3ff67b62d0cf5bf939b2c2a450fa347d6f39d6bc240346ee3deda98b8c3b87053a6fbcc22125c5ba0c63d149c64ab7194775 SHA512 98688db48920b32aa87aeb9fbfb245f18ebc0f5b2a92a341ffd49ad94fc10e6bee4ee5864e15497e7617467759cc1fe809887e107d881b199965f5b22045bfc9
-AUX scorched3d-44-gcc43.patch 561 BLAKE2B 4fb787d19161ecb21b40f0636288d521af62d281bfe9af7408761851f3f527e0645d0c698f42b47765743f72d2d07d85b45d32875182c6febe1b38e0862b3e45 SHA512 c00bfcf2feb7d740e4fc4337a5577962a198d56296bae68a96902046f78fd29856d83b57f309ea9c61d36d4a767e76ae101639a8ed786c5451b440b5a0d908c1
-AUX scorched3d-44-jpeg9.patch 614 BLAKE2B de7f71778be9530801a6f764d64f6020a260c9cef328dbf0481f9a486f50211879db981fffc54ec4fa67309a365fa8f1e712be28b72514dc69473c23c7b422e5 SHA512 8adb3bd124b11b006d8124e57fc506e8dc56415c89cca70440901cef7aa547f241d100c42281345fd489c95f9e8eb105d5e5de5ef18382087e203877cc8f6ca4
-AUX scorched3d-44-odbc.patch 503 BLAKE2B 90c212fd77732bad90d5455e967cbc18f3e28c6352637e6325dd9c3ae91e9e86d759dac66d1054a75a84ddfa827fb5b80aa4483d90e77782a5632ad4bc29fdd6 SHA512 8bf3e3f9a91502a7c84be73a73e0909c09b050266fb2c6847be2cca13b1a368697dd70c373b6bbce4b12ba97241b2d577cce3604640b4182b2be223d009a4f6e
-AUX scorched3d-44-win32.patch 464 BLAKE2B 51362a695212dd8d37013c1b4a11d77fb1b8564b54e3ec9ce3e0165ee83e42d65883dc3df964180d975885a555b1ae02e87fc20cc3c85d4507308110ee7cf810 SHA512 992224f65f80527276c0b6e139ea44c6c29a2fbfa3a0af78e2f2366897dbd51e9988b065aa21ac95cf9b1a0efc8866e2e45646e1851f8afd195651b3c47a81dd
-AUX scorched3d-44-wxgtk.patch 7001 BLAKE2B b120e1cc12343fa5be2e4348930d2656eb2c727224a8e9e63f00dfb4da71888918d3fcccc1a9a439737ce2f6fbe6224be06d4801b4cb857ad1e4765d2c444e4e SHA512 99e21ff6854bbea676c8ea0a5ef2b28a4d6020b34fbae134d9346d4febb7b6defbd39cb712f29b3dcff7ac829b2e76275a85d7d740e921835898f550c4471120
-DIST Scorched3D-44-src.tar.gz 41689613 BLAKE2B 61f5536ad6e9dedeb0e778f90d73aa918f890632385278d4d788a43f1e199e817d6199f923c264dadbe8084fa53c32968b599c9b08784de0d5752069f9bed818 SHA512 27341d12ef9db5b64c1051a8abe45cef8a957e26c2cd8928f64c071589052d2857fc6f8104772bb67d5d348aef14122a117d9e00d61e4d9f963f3b5bbe5859ca
-EBUILD scorched3d-44-r2.ebuild 2310 BLAKE2B 3826272ff4fe72b696980b08102036a1bd87e4bbd1da35fa5d64abf39f86b14dec6c11fa8169393edb8e6935a10f91e76677a3a4fc8ab164fa9445a38326a06b SHA512 239d20d7d6125eb299c9e88a7d69feafbce593190daf724539bf846cc1dd4de13df6be9e8b8d02f59e4d2ad601310b7b37ef31e55d51909c4e245f5b30ccd74f
-MISC metadata.xml 333 BLAKE2B da791c5728d5a17950492280dcf23b0543b6c444885f852b491a8eaa65f2befcd755470183e8084034a16fb6507b073b2de91afdb00d4db2eaca68077495daa8 SHA512 91b1e0f50ec4635e81ee904179228d25b8168bf74d00eacb734365514e43e681879c121cc2f60302b446367b8b6fb388842e28890719f6785fb5bf389f638171
diff --git a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch b/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch
deleted file mode 100644
index e3cba2741405..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-fix-c++14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-In C++14, bool -> T* implicit conversions are not allowed anymore.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=601890
-
---- a/src/common/weapons/AccessoryStore.cpp
-+++ b/src/common/weapons/AccessoryStore.cpp
-@@ -156,7 +156,7 @@
- 	Accessory *parent, XMLNode *currentNode)

- {

- 	XMLNode *typeNode = 0;

--	if (!currentNode->getNamedParameter("type", typeNode)) return false;

-+	if (!currentNode->getNamedParameter("type", typeNode)) return NULL;

- 

- 	AccessoryPart *accessoryPart = 

- 		AccessoryMetaRegistration::getNewAccessory(typeNode->getContent(), this);

diff --git a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch b/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
deleted file mode 100644
index 47499d4cf307..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-fixups.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- scorched.orig/configure.ac
-+++ scorched/configure.ac
-@@ -13,22 +13,6 @@
- AC_PROG_INSTALL
- AC_PROG_RANLIB
- 
--LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -L/usr/X11R6"
--CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include -I/usr/X11R6"
--
--if test `uname` == Darwin; then
--LDFLAGS="$LDFLAGS -lmx"
--CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
--else
--LDFLAGS="$LDFLAGS -L/usr/local/lib"
--CPPFLAGS="$CPPFLAGS -I/usr/local/include"
--fi
--
--AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
--	echo "Warning: No beer found in fridge!";
--	echo "We highly suggest that you rectify this situation immediately."
--])
--
- AC_ARG_ENABLE(serveronly, 
- 	[  --enable-serveronly Enable server only compilation],
- 		    , enable_serveronly=no,
diff --git a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch b/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
deleted file mode 100644
index e4717972d81a..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-freetype.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -437,7 +437,7 @@
-    if test "$FT2_CONFIG" = "no" ; then
-      no_ft=yes
-    else
--     FT2_CFLAGS=`$FT2_CONFIG $ft_config_args --cflags`
-+     FT2_CFLAGS="`$FT2_CONFIG $ft_config_args --cflags` `$FT2_CONFIG $ft_config_args --cflags | sed -e 's:freetype2:freetype2/freetype:'`"
-      FT2_LIBS=`$FT2_CONFIG $ft_config_args --libs`
-      ft_config_major_version=`$FT2_CONFIG $ft_config_args --version | \
-        sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
---- a/src/client/GLEXT/GLFont2dFreeType.h
-+++ b/src/client/GLEXT/GLFont2dFreeType.h
-@@ -23,10 +23,10 @@
- 

- #include <GLEXT/GLFont2dStorage.h>

- #include <ft2build.h>

--#include <freetype/freetype.h>

--#include <freetype/ftglyph.h>

--#include <freetype/ftoutln.h>

--#include <freetype/fttrigon.h>

-+#include <freetype.h>

-+#include <ftglyph.h>

-+#include <ftoutln.h>

-+#include <fttrigon.h>

- #include <string>

- 

- class GLFont2dFreeType

---- a/src/launcher/wxdialogs/TrueTypeFont.h
-+++ b/src/launcher/wxdialogs/TrueTypeFont.h
-@@ -25,10 +25,10 @@
- #include <wx/image.h>

- #include <ft2build.h>

- #include <string>

--#include <freetype/freetype.h>

--#include <freetype/ftglyph.h>

--#include <freetype/ftoutln.h>

--#include <freetype/fttrigon.h>

-+#include <freetype.h>

-+#include <ftglyph.h>

-+#include <ftoutln.h>

-+#include <fttrigon.h>

- 

- class TrueTypeFont

- {

diff --git a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
deleted file mode 100644
index 79f40b70e652..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-gcc43.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- scorched.old/src/common/common/main.h
-+++ scorched/src/common/common/main.h
-@@ -40,7 +40,7 @@
- void _no_storage()

- {

- 	printf("Failed to allocate memory!!");

--	std::exit(1);

-+	exit(1);

- }

- 

- void run_main(int argc, char *argv[], OptionsParameters &params)

---- scorched.old/src/common/porting/windows.h
-+++ scorched/src/common/porting/windows.h
-@@ -20,7 +20,7 @@
- typedef unsigned short  WORD;

- typedef unsigned char   BYTE;

- 

--typedef int 	HWND;

-+// typedef int 	HWND;

- typedef void * 	HINSTANCE;

- typedef int 	WPARAM;

- typedef int 	LPARAM;

diff --git a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch b/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
deleted file mode 100644
index 1cebf3ebd7bc..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-jpeg9.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/common/image/ImageJpgFactory.cpp.old	2014-12-03 09:52:03.306552513 +0100
-+++ b/src/common/image/ImageJpgFactory.cpp	2014-12-03 09:53:22.117786304 +0100
-@@ -79,7 +79,7 @@
- 	src->next_input_byte = FakeEOI;

- 	src->bytes_in_buffer = 2;

- 

--	return TRUE;

-+	return (boolean)TRUE;

- }

- 

- METHODDEF(void)

-@@ -166,7 +166,7 @@
- 	src->bytes_in_buffer = buffer.getBufferUsed();

- 	src->next_input_byte = (JOCTET *) buffer.getBuffer();

- 

--	jpeg_read_header(&cinfo, TRUE);

-+	jpeg_read_header(&cinfo, (boolean)TRUE);

- 	jpeg_start_decompress(&cinfo);

- 

- 	if ((cinfo.output_components == 3 && !readalpha) ||

diff --git a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch b/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
deleted file mode 100644
index e7f3833bf897..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-odbc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-When x11-libs/wxGTK is built with the odbc use flag, scorched3d fails to build.
-bug #285384 - patch from Bob Johnson
-
---- scorched/src/common/porting/windows.h
-+++ fix_scorched/src/common/porting/windows.h
-@@ -11,8 +11,8 @@
- 

- typedef char * 		LPSTR;

- typedef const char *	LPCTSTR;

--typedef unsigned int 	DWORD;

--typedef unsigned int *  LPDWORD;

-+typedef unsigned long 	DWORD;

-+typedef DWORD *         LPDWORD;

- typedef unsigned char * LPBYTE;

- typedef int 		INT;

- typedef long         	LONG;

diff --git a/games-strategy/scorched3d/files/scorched3d-44-win32.patch b/games-strategy/scorched3d/files/scorched3d-44-win32.patch
deleted file mode 100644
index 05f9c806b1c7..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-win32.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- scorched.old/src/common/porting/windows.h
-+++ scorched/src/common/porting/windows.h
-@@ -9,6 +9,7 @@
- #include <ctype.h>

- #include <common/Defines.h>

- 

-+#ifdef _WIN32

- typedef char * 		LPSTR;

- typedef const char *	LPCTSTR;

- typedef unsigned int 	DWORD;

-@@ -27,6 +28,7 @@
- typedef int 	LRESULT;

- typedef void *	HDC;

- typedef void *  HGLRC;

-+#endif  /* _WIN32 */

- 

- #define _strnicmp(a,b,c)	strncasecmp(a,b,c)

- #define stricmp(a,b)		strcasecmp(a,b)

diff --git a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch b/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
deleted file mode 100644
index ee8b97554656..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-44-wxgtk.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Description: Fix to build with wxWidgets 3.0
-Author: Olly Betts <olly@survex.com>
-Last-Update: 2014-05-01
-
---- a/src/launcher/wxdialogs/Display.cpp
-+++ b/src/launcher/wxdialogs/Display.cpp
-@@ -26,7 +26,7 @@
- 	// Display settings
- 	wxStaticBox *displayBox = new wxStaticBox(parent, -1, wxT("&Display"));
- 	wxStaticBoxSizer *displaySizer = new wxStaticBoxSizer(displayBox, wxVERTICAL);
--	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(2, 3, 5, 5);
-+	wxFlexGridSizer *displaySizer2 = new wxFlexGridSizer(0, 3, 5, 5);
- 	wxStaticText *resText = new wxStaticText(parent, -1, wxT("&Resolution :"));
- 	IDC_DISPLAY_CTRL = 
- 		new wxComboBox(parent, -1,
-@@ -88,7 +88,7 @@
- 	// Sound settings
- 	wxStaticBox *soundBox = new wxStaticBox(parent, -1, wxT("&Sound"));
- 	wxStaticBoxSizer *soundSizerMain = new wxStaticBoxSizer(soundBox, wxVERTICAL);
--	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(4, 2);
-+	wxFlexGridSizer *soundSizer1 = new wxFlexGridSizer(0, 4, 2, 0);
- 	wxStaticText *volumeText = new wxStaticText(parent, -1, wxT("Sound Volume :"));
- 	wxStaticText *musicVolumeText = new wxStaticText(parent, -1, wxT("Music Volume :"));
- 	wxStaticText *ambientVolumeText = new wxStaticText(parent, -1, wxT("Ambient Volume :"));
-@@ -137,7 +137,7 @@
- 		wxT("Game Detail Options"));
- 	wxStaticBoxSizer *speedSizer = new wxStaticBoxSizer(speedBox, wxHORIZONTAL);
- 
--	wxGridSizer *loadSizer = new wxFlexGridSizer(2, 2);
-+	wxGridSizer *loadSizer = new wxFlexGridSizer(0, 2, 2, 0);
- 	IDC_LOADULTRA_CTRL = new wxButton(parent,  ID_LOADULTRA, wxT("&Ultra Detail"), wxDefaultPosition, wxSize(120,-1));
- 	IDC_LOADDEFAULTS_CTRL = new wxButton(parent, ID_LOADDEFAULTS, wxT("&Normal Detail"), wxDefaultPosition, wxSize(120,-1));
- 	IDC_LOADMEDIUM_CTRL = new wxButton(parent, ID_LOADMEDIUM, wxT("Faster Detail"), wxDefaultPosition, wxSize(120,-1));
-@@ -256,7 +256,7 @@
- 		wxStaticBox *waterDetailBox = new wxStaticBox(parent, -1, 
- 													  wxT("Graphics Detail"));
- 		wxStaticBoxSizer *waterDetailSizer = new wxStaticBoxSizer(waterDetailBox, wxHORIZONTAL);
--		wxGridSizer *waterDetailSizer2 = new wxGridSizer(3, 1, 10, 10);
-+		wxGridSizer *waterDetailSizer2 = new wxGridSizer(0, 1, 10, 10);
- 		
- 		IDC_NOWATERREF_CTRL = 
- 		new wxCheckBox(parent, -1, wxT("Don't draw water reflections - Large Framerate Improvement"));
-@@ -471,7 +471,7 @@
- {
- 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(parent, -1, 
- 		wxDefaultPosition, wxSize(480, 250));
--	wxSizer *sizer = new wxFlexGridSizer(5, 1);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 5, 1, 0);
- 	
- 	keyboardKeyList.clear();
- 	if (!Keyboard::instance()->loadKeyFile())
---- a/src/launcher/wxdialogs/SettingsDialog.cpp
-+++ b/src/launcher/wxdialogs/SettingsDialog.cpp
-@@ -105,7 +105,7 @@
- 	mainPanel_ = new wxPanel(book_, -1);
- 	book_->AddPage(mainPanel_, wxT("Main"));
- 	wxSizer *mainPanelSizer = new wxBoxSizer(wxVERTICAL);
--	wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- 	mainPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
- 
- 	setters_.push_back(
-@@ -166,7 +166,7 @@
- {
- 	moneyPanel_ = new wxPanel(book_, -1);
- 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
--	wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
- 
- 	setters_.push_back(
-@@ -215,7 +215,7 @@
- {
- 	scorePanel_ = new wxPanel(book_, -1);
- 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
--	wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
- 
- 	setters_.push_back(
-@@ -249,7 +249,7 @@
- {
- 	weaponsPanel_ = new wxPanel(book_, -1);
- 	wxSizer *ecoPanelSizer = new wxBoxSizer(wxVERTICAL);
--	wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- 	ecoPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
- 
- 	setters_.push_back(
-@@ -286,7 +286,7 @@
- {
- 	envPanel_ = new wxPanel(book_, -1);
- 	wxSizer *envPanelSizer = new wxBoxSizer(wxVERTICAL);
--	wxSizer *sizer = new wxFlexGridSizer(2, 2);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 2, 2, 0);
- 	envPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
- 
- 	setters_.push_back(
-@@ -337,7 +337,7 @@
- 	wxScrolledWindow *scrolledWindow = new wxScrolledWindow(landPanel_, -1, 
- 		wxDefaultPosition, wxSize(225, 200));
- 
--	wxSizer *sizer = new wxFlexGridSizer(3, 3);
-+	wxSizer *sizer = new wxFlexGridSizer(0, 3, 3, 0);
- 	int i = 0;
- 	std::list<LandscapeDefinitionsEntry> &defns =
- 		landscapeDefinitions.getAllLandscapes();
-@@ -438,7 +438,7 @@
- 		wxT("Players are persistent for game"));
- 	playersPanelSizer->Add(IDC_SERVER_RESIDUAL_CTRL, 0, wxALIGN_CENTER | wxTOP, 10);
- 		
--	wxSizer *sizer = new wxGridSizer(3, 3);
-+	wxSizer *sizer = new wxGridSizer(0, 3, 3, 0);
- 	playersPanelSizer->Add(sizer, 0, wxALL | wxALIGN_CENTER, 10);
- 
- 	for (int i=0; i<24; i++)
---- a/src/launcher/wxdialogs/DisplayDialog.cpp
-+++ b/src/launcher/wxdialogs/DisplayDialog.cpp
-@@ -449,15 +449,15 @@
- 	IDC_SLIDER1_CTRL->SetValue(OptionsDisplay::instance()->getBrightness());
- 	IDC_SLIDER1_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getBrightnessEntry().getDescription(), wxConvUTF8));
- 	IDC_VOLUME_CTRL->SetRange(0, 128);
--	IDC_VOLUME_CTRL->SetTickFreq(4, 0);
-+	IDC_VOLUME_CTRL->SetTickFreq(4);
- 	IDC_VOLUME_CTRL->SetValue(OptionsDisplay::instance()->getSoundVolume());
- 	IDC_VOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getSoundVolumeEntry().getDescription(), wxConvUTF8));
- 	IDC_MUSICVOLUME_CTRL->SetRange(0, 128);
--	IDC_MUSICVOLUME_CTRL->SetTickFreq(4, 0);
-+	IDC_MUSICVOLUME_CTRL->SetTickFreq(4);
- 	IDC_MUSICVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getMusicVolume());
- 	IDC_MUSICVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getMusicVolumeEntry().getDescription(), wxConvUTF8));
- 	IDC_AMBIENTVOLUME_CTRL->SetRange(0, 128);
--	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4, 0);
-+	IDC_AMBIENTVOLUME_CTRL->SetTickFreq(4);
- 	IDC_AMBIENTVOLUME_CTRL->SetValue(OptionsDisplay::instance()->getAmbientSoundVolume());
- 	IDC_AMBIENTVOLUME_CTRL->SetToolTip(wxString(OptionsDisplay::instance()->getAmbientSoundVolumeEntry().getDescription(), wxConvUTF8));
- 	IDC_USERNAME_CTRL->SetValue(wxString(OptionsDisplay::instance()->getOnlineUserName(), wxConvUTF8));
-@@ -733,11 +733,7 @@
- 		convertString(S3D::formatStringBuffer("%s.s3m", (const char *) (selection.mb_str(wxConvUTF8)))), // default filename
- 		wxT(""), // default extension
- 		wxT("*.s3m"),
--#if wxCHECK_VERSION(2, 8, 0)
- 		wxFD_SAVE);
--#else
--		wxSAVE);
--#endif
- 	if (file.empty()) return;
- 	ModFiles files;
- 	if (!files.loadModFiles(std::string(selection.mb_str(wxConvUTF8)), false))
-@@ -761,11 +757,7 @@
- 		wxT(""), // default filename
- 		wxT(""), // default extension
- 		wxT("*.s3m"),
--#if wxCHECK_VERSION(2, 8, 0)
- 		wxFD_OPEN | wxFD_FILE_MUST_EXIST);
--#else
--		wxOPEN | wxFILE_MUST_EXIST);
--#endif
- 	if (file.empty()) return;
- 	ModFiles files;
- 	std::string mod;
diff --git a/games-strategy/scorched3d/metadata.xml b/games-strategy/scorched3d/metadata.xml
deleted file mode 100644
index bad136330d96..000000000000
--- a/games-strategy/scorched3d/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">scorched3d</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/scorched3d/scorched3d-44-r2.ebuild b/games-strategy/scorched3d/scorched3d-44-r2.ebuild
deleted file mode 100644
index 6cd098e970d6..000000000000
--- a/games-strategy/scorched3d/scorched3d-44-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0
-
-inherit autotools eutils wxwidgets
-
-DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
-HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/scorched3d/Scorched3D-${PV}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="dedicated mysql"
-
-RDEPEND="
-	dev-libs/expat
-	media-fonts/dejavu
-	media-libs/libpng:0=
-	media-libs/libsdl[video]
-	media-libs/sdl-net
-	sys-libs/zlib
-	virtual/jpeg:0
-	!dedicated? (
-		virtual/opengl
-		virtual/glu
-		media-libs/glew:0=
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/openal
-		media-libs/freealut
-		x11-libs/wxGTK:${WX_GTK_VER}[X]
-		media-libs/freetype:2
-		sci-libs/fftw:3.0=
-	)
-	mysql? ( virtual/mysql )"
-DEPEND="${RDEPEND}
-	!dedicated? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/scorched
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fixups.patch
-	"${FILESDIR}"/${P}-gcc43.patch
-	"${FILESDIR}"/${P}-odbc.patch
-	"${FILESDIR}"/${P}-win32.patch
-	"${FILESDIR}"/${P}-freetype.patch
-	"${FILESDIR}"/${P}-jpeg9.patch
-	"${FILESDIR}"/${P}-wxgtk.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_prepare() {
-	edos2unix \
-		src/launcher/wxdialogs/SettingsDialog.cpp \
-		src/launcher/wxdialogs/DisplayDialog.cpp \
-		src/launcher/wxdialogs/Display.cpp \
-		src/launcher/wxdialogs/KeyDialog.cpp
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--with-fftw="${EPREFIX}"/usr \
-		--with-ogg="${EPREFIX}"/usr \
-		--with-vorbis="${EPREFIX}"/usr \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-wx-config="${WX_CONFIG}" \
-		--without-pgsql \
-		$(use_with mysql) \
-		$(use_enable dedicated serveronly)
-}
-
-src_install() {
-	default
-
-	# remove bundled fonts
-	rm "${ED%/}"/usr/share/${PN}/data/fonts/* || die
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf /usr/share/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansCondensed-Bold.ttf /usr/share/${PN}/data/fonts/dejavusconbd.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf /usr/share/${PN}/data/fonts/dejavusmobd.ttf
-
-	if ! use dedicated; then
-		newicon data/images/tank-old.bmp ${PN}.bmp
-		make_desktop_entry ${PN} "Scorched 3D" /usr/share/pixmaps/${PN}.bmp
-	fi
-}
diff --git a/games-strategy/seven-kingdoms-2.14.7 b/games-strategy/seven-kingdoms-2.14.7
new file mode 100644
index 000000000000..9238eaabbff9
--- /dev/null
+++ b/games-strategy/seven-kingdoms-2.14.7
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install unpack
+DEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
+DESCRIPTION=Seven Kingdoms: Ancient Adversaries
+EAPI=6
+HOMEPAGE=https://7kfans.com/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=net-libs/enet:1.3= media-libs/libsdl2[X,video] media-libs/openal net-misc/curl
+SLOT=0
+SRC_URI=https://github.com/the3dfxdude/7kaa/releases/download/v2.14.7/7kaa-2.14.7.tar.xz https://dev.gentoo.org/~pinkbyte/distfiles/7kaa.png
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cb836dd5eaf549f85884bbcd341141f8
diff --git a/games-strategy/seven-kingdoms/Manifest b/games-strategy/seven-kingdoms/Manifest
deleted file mode 100644
index 32b874b17bde..000000000000
--- a/games-strategy/seven-kingdoms/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST 7kaa-2.14.7.tar.xz 31342092 BLAKE2B 1e2456ff8e40eace3185f842aad1d436e7e336eb4489a1a23022c89e7695ef1fc6f632d884d5d992c63f8b67f8b045fbda37e2fa3a07e9be13b9801d959b1e93 SHA512 5c2067a842af18f2eaa21267ee0c48064eecfc6b967eb2abf967f2bf782a9699186b038d87de03fad71b5d88ec9fc1cfddd7521cb90c255a3a8d2aa586d3f2c1
-DIST 7kaa.png 559 BLAKE2B 0379e60a5355c93cddf2a5f30b5e84711f77df073db4e85eee13d51654180572cd73dc96e8a9b954101e8b0ecacd879d6fa9e57feb70b66d1bdd043d07a40113 SHA512 0ec1ba67107a7823943704879efaf12297c5441c43b54f49684550927b10dc40c657fe93eb7c4cc85208d08194f179c9602fd8df6545776f3e1b4481803b16e6
-EBUILD seven-kingdoms-2.14.7.ebuild 783 BLAKE2B 88eb5caf7fad23b0924878a177f4dc4c7da78e928752ff6082350bc44635ab8b2e0c5286d14d5e36562eb23c6bff40e6e52d2b3d6b7bcbb298cf3df578f1ccf7 SHA512 f360b0580feefb5e53f0639e56aa206af62ac20932c0e624bff9865e449c31fe72d735cc7b204eb073252c6509872f2ce487a5ff00164ce4a79910d3bf3fefcc
-MISC metadata.xml 323 BLAKE2B d6893eaaa3f0dd7c230028000f15ed2964a7e7f4b2e5c710c61e2735aa27dafd4c2cff4deaec887854a68e7102f6df772fa8c1ae9c1286df68f115704e608049 SHA512 09f1b34120c01f3dd5f367a2b4ba99b7b89ef06362843e18bc320c7ce7eaea02cbc6c8a0d33541630758d77c6482bc88138d7cdfa1c4fa6dac7ca559d0feeff8
diff --git a/games-strategy/seven-kingdoms/metadata.xml b/games-strategy/seven-kingdoms/metadata.xml
deleted file mode 100644
index 4a1da05f9526..000000000000
--- a/games-strategy/seven-kingdoms/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">skfans</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild b/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
deleted file mode 100644
index 33a7974f04b1..000000000000
--- a/games-strategy/seven-kingdoms/seven-kingdoms-2.14.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-MY_PN="7kaa"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Seven Kingdoms: Ancient Adversaries"
-HOMEPAGE="https://7kfans.com/"
-SRC_URI="https://github.com/the3dfxdude/${MY_PN}/releases/download/v${PV}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~pinkbyte/distfiles/${MY_PN}.png"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="net-libs/enet:1.3=
-	media-libs/libsdl2[X,video]
-	media-libs/openal
-	net-misc/curl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${MY_P}.tar.xz
-}
-
-src_install() {
-	default
-
-	doicon "${DISTDIR}/${MY_PN}.png"
-	make_desktop_entry "${MY_PN}" "Seven Kingdoms: Ancient Adversaries" "${MY_PN}" "Game;StrategyGame"
-}
diff --git a/games-strategy/smac-6.0a b/games-strategy/smac-6.0a
new file mode 100644
index 000000000000..9fe417c7dc9c
--- /dev/null
+++ b/games-strategy/smac-6.0a
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=games-util/loki_patch
+DESCRIPTION=Linux port of the popular strategy game from Firaxis
+EAPI=5
+HOMEPAGE=http://www.lokigames.com/products/smac/
+IUSE=+videos
+KEYWORDS=~amd64 ~x86
+LICENSE=LOKI-EULA
+PROPERTIES=interactive
+RDEPEND=sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp !ppc? ( sys-libs/lib-compat-loki ) media-libs/libsdl[sound,video] media-libs/sdl-ttf media-libs/sdl-mixer media-libs/smpeg media-libs/freetype sys-libs/zlib games-misc/games-envd
+RESTRICT=strip
+SLOT=0
+SRC_URI=x86? ( mirror://lokigames/smac/smac-6.0a-x86.run ) amd64? ( mirror://lokigames/smac/smac-6.0a-x86.run ) ppc? ( http://mirrors.dotsrc.org/lokigames/installers/smac/smac-install-ppc.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_=2530ab3e491cc4e81b36d0a4180fd057
diff --git a/games-strategy/smac/Manifest b/games-strategy/smac/Manifest
deleted file mode 100644
index 00cea5f3ed46..000000000000
--- a/games-strategy/smac/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST smac-6.0a-x86.run 6801730 BLAKE2B 95d50c79cde06c4abb5473d7a67f4a66205f7147b7796c9f5e62273776083ce592ec748fd4db559b57568075fb53b4d44db05b2cf14e450ed5757898da6c26d7 SHA512 b71dd1ee46d37d66131cf6fc15c6a406719989021c8dbb6e74cded18c5520ee9ba4bbdfc5bdfc0ddfa67fa2e846365636be41d87a6440473e8ae5ebf542b7744
-DIST smac-install-ppc.run 18528928 BLAKE2B f5c9689c192ebd8ae03d5bb5d4db6deb2b19c5924ce87426cb9140163c9b53a1c4b0ba8592d8b823b2b73847cbf4ffa6d400000a3cf458dd5473ab6bd0aef965 SHA512 99fc6edca2c9e64bfc0cab644cbd061c3842359c16e5e6537a2aa2df4cd2a1a6a39169a2b9540199b08f7aee28f4e2cfad814499fdd55b5edf7ab9b19c12d793
-EBUILD smac-6.0a.ebuild 3069 BLAKE2B dd865b2d81bc1bcb69254beed8f8f9066a83e87541bac41bd230a895f72939b8f0780fa6771cda473c3fe43a8277531e026c0da204b921f83d0f87cdec9e070e SHA512 031b661c3fc11be4c3474fc7c752ca15332b982e527f61560763c5a3592369262e5ce76157f61f00a635b22b0d0be489732183ae5ceb42a09fda004ecb5d315b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/smac/metadata.xml b/games-strategy/smac/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/smac/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/smac/smac-6.0a.ebuild b/games-strategy/smac/smac-6.0a.ebuild
deleted file mode 100644
index e6aff2ef3a12..000000000000
--- a/games-strategy/smac/smac-6.0a.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils unpacker cdrom games
-
-DESCRIPTION="Linux port of the popular strategy game from Firaxis"
-HOMEPAGE="http://www.lokigames.com/products/smac/"
-SRC_URI="x86? ( mirror://lokigames/${PN}/${P}-x86.run )
-	amd64? ( mirror://lokigames/${PN}/${P}-x86.run )
-	ppc? ( http://mirrors.dotsrc.org/lokigames/installers/${PN}/${PN}-install-ppc.run )"
-
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+videos"
-RESTRICT="strip"
-
-DEPEND="games-util/loki_patch"
-RDEPEND="sys-libs/glibc
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	!ppc? ( sys-libs/lib-compat-loki )
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	media-libs/smpeg
-	media-libs/freetype
-	sys-libs/zlib"
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-src_unpack() {
-	cdrom_get_cds Alien_Crossfire_Manual.pdf
-	mkdir -p "${S}"/a
-	cd "${S}"/a
-	use x86 || use amd64 && unpack_makeself ${P}-x86.run
-	use ppc && unpack_makeself ${PN}-install-ppc.run
-}
-
-src_install() {
-	einfo "Copying files... this may take a while..."
-	exeinto "${dir}"
-	doexe "${CDROM_ROOT}"/bin/x86/{smac,smacx,smacpack}
-
-	insinto "${dir}"
-	doins ${CDROM_ROOT}/{{Alien_Crossfire,Alpha_Centauri}_Manual.pdf,QuickStart.txt,README,icon.{bmp,xpm}}
-
-	cd "${Ddir}"
-	tar xzf "${CDROM_ROOT}"/data.tar.gz || die
-	insinto "${dir}"/data
-	doins "${CDROM_ROOT}"/data/*.{pcx,cvr,flc,gif}
-	doins -r "${CDROM_ROOT}"/data/{facs,fx,projs,techs,voices}
-
-	if use videos ; then
-		doins -r "${CDROM_ROOT}"/data/movies
-	fi
-
-	cd "${S}"/a
-	if use ppc ; then
-		cd ${P}-ppc
-	fi
-	loki_patch --verify patch.dat
-	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 '{}' +
-
-	newicon "${CDROM_ROOT}"/icon.xpm smac.xpm
-
-	games_make_wrapper ${PN}pack ./${PN}pack "${dir}" "${dir}"
-	games_make_wrapper ${PN} ./${PN} "${dir}" "${dir}"
-	games_make_wrapper ${PN}x ./${PN}x "${dir}" "${dir}"
-	make_desktop_entry smacpack "Sid Meier's SMAC Planetary Pack" smacpack
-	make_desktop_entry smac "Sid Meier's Alpha Centauri" smac
-	make_desktop_entry smacx "Sid Meier's Alpha Centauri - Alien Crossfire" smac
-	prepgamesdirs
-
-	if use x86 || use amd64 ; then
-	    einfo "Linking libs provided by 'sys-libs/lib-compat-loki' to '${dir}'."
-	    dosym /lib/loki_ld-linux.so.2 "${dir}"/ld-linux.so.2 && \
-	    dosym /usr/lib/loki_libc.so.6 "${dir}"/libc.so.6 && \
-	    dosym /usr/lib/loki_libnss_files.so.2 "${dir}"/libnss_files.so.2
-	fi
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	elog "To start Sid Meyer's SMAC Planetary Pack run:"
-	elog " smac"
-	elog "To play Sid Meyer's Alpha Centauri run:"
-	elog " smac"
-	elog "To play Alien Crossfire run:"
-	elog " smacx"
-	elog "Be sure to enable CONFIG_UID16 in your kernel config or"
-	elog "the game will error." # bug 340303
-}
diff --git a/games-strategy/spaz-1.605 b/games-strategy/spaz-1.605
new file mode 100644
index 000000000000..c08022922fcf
--- /dev/null
+++ b/games-strategy/spaz-1.605
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Space Pirates and Zombies
+EAPI=4
+HOMEPAGE=http://spacepiratesandzombies.com
+IUSE=alsa pulseaudio
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LOKI-EULA
+RDEPEND=>=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)] >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)] games-misc/games-envd
+RESTRICT=fetch strip
+SLOT=0
+SRC_URI=spaz-linux-humblebundle-09182012-bin
+_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_=bc2851baad46c7f377e149d64af8a42f
diff --git a/games-strategy/spaz/Manifest b/games-strategy/spaz/Manifest
deleted file mode 100644
index 11d2bf945db8..000000000000
--- a/games-strategy/spaz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST spaz-linux-humblebundle-09182012-bin 157466422 BLAKE2B c3b832c4cb8b68bbe353bc019d4af6af335b45e3bcc89209f2a61a840b52448f4d09eaf1544f67995049d377600eae433ce2140171d189afcd7d3c388d67ec78 SHA512 ba62be6a247dfb1ee04db8784b3e173140e7491f2bd68a528ad9c81cab4bc8f807bfeb4593fa37c76e43401420a6f788075cd2541fd16ed7443fe4301a76d50c
-EBUILD spaz-1.605.ebuild 929 BLAKE2B 00b3287d47a9c8d24ba6931083a291522c8060632c243ae768af92f228a1dde7aae10b952bbb725363144c6a18e97ba91ddff1e748c26860188d706da0e70577 SHA512 54c156847f3e387498b90db80e9330a6610824b5fce54895aafc41ab00f5e9d1a089f3c199d9f19f44012201484131f0c3da9113c5116c83af1ea49b2d19c27d
-MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/games-strategy/spaz/metadata.xml b/games-strategy/spaz/metadata.xml
deleted file mode 100644
index 5b159fbcadd1..000000000000
--- a/games-strategy/spaz/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/spaz/spaz-1.605.ebuild b/games-strategy/spaz/spaz-1.605.ebuild
deleted file mode 100644
index 80749b2c42ce..000000000000
--- a/games-strategy/spaz/spaz-1.605.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit unpacker games
-
-DESCRIPTION="Space Pirates and Zombies"
-HOMEPAGE="http://spacepiratesandzombies.com"
-SRC_URI="${PN}-linux-humblebundle-09182012-bin"
-LICENSE="LOKI-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="alsa pulseaudio"
-RESTRICT="fetch strip"
-
-DEPEND="app-arch/unzip"
-RDEPEND=">=media-libs/openal-1.15.1[alsa?,pulseaudio?,abi_x86_32(-)]
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
-
-S="${WORKDIR}"/data
-
-QA_PREBUILT="opt/spaz/SPAZ"
-
-src_unpack() {
-	unpack_zip ${A}
-}
-
-src_install() {
-	local dir="${GAMES_PREFIX_OPT}/${PN}"
-
-	insinto "${dir}"
-	exeinto "${dir}"
-	doexe SPAZ
-	doins -r common game mods
-	doins audio.so
-	newicon SPAZ.png spaz.png
-	dodoc README-linux.txt
-
-	games_make_wrapper ${PN} ./SPAZ "${dir}" "${dir}"
-	make_desktop_entry ${PN} "Space Pirates and Zombies" ${PN}
-
-	prepgamesdirs
-}
diff --git a/games-strategy/tornado-1.4 b/games-strategy/tornado-1.4
new file mode 100644
index 000000000000..0ba53ed40894
--- /dev/null
+++ b/games-strategy/tornado-1.4
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DESCRIPTION=Clone of a C64 game - destroy the opponent's house
+EAPI=5
+HOMEPAGE=http://kiza.kcore.de/software/tornado/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=games-misc/games-envd
+SLOT=0
+SRC_URI=http://kiza.kcore.de/software/tornado/download/tornado-1.4.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_=78a9a07d12aeda81de2f91f2a4fe8771
diff --git a/games-strategy/tornado/Manifest b/games-strategy/tornado/Manifest
deleted file mode 100644
index 830934926e91..000000000000
--- a/games-strategy/tornado/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX tornado-1.4-gentoo.patch 955 BLAKE2B 923f1f8aff22a9ac20e67220c249e57fd80a028ab8f2f58106c1c7300a29cd97e2bf52cb6403150f645a8a91f565b2a853631d656ddf80d909bfc35dd508537b SHA512 16499538f588370026e05518d5f437599b9f1a291e47c681cb8f7c3c7a88ba4dd1aafb8b979bc8fc35640777be8b54bf209433c88ac9f1c667f97a39500973d9
-DIST tornado-1.4.tar.gz 54591 BLAKE2B 6a734730e987c6e0516f08e6b3a594b46285e86f3e9b967bd6ff575dc3a55c053b9e4bb7795b51914eebed87979e2a1a290a0273f68a045630b6255cc9714794 SHA512 764c18b228a24cdcaf1456af79d1bdb997f200c09bc33d8f54df28f1f995db1b1a3a328550c5561bc8ebd38d4187f472aa1c892d91889e613b9ff42b86bee322
-EBUILD tornado-1.4.ebuild 867 BLAKE2B e846e4a5ee6325cf8a175f5864bd2cc128195e101fcb87252c9f9913775e812ae56578b2f18c5311f29d33420df3e3f1b46922af176efe4c06902ba815040c37 SHA512 e260752c861452a53624b62579efdd8246c2f104a404f3197844f9c233218ac867b530b2082e145dc5a86d2d39c9abd33519fa102d5fa26a54dd8d2340a8d82b
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/tornado/files/tornado-1.4-gentoo.patch b/games-strategy/tornado/files/tornado-1.4-gentoo.patch
deleted file mode 100644
index fb8966841158..000000000000
--- a/games-strategy/tornado/files/tornado-1.4-gentoo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.old        2009-02-12 12:42:25.000000000 +0100
-+++ Makefile    2009-02-12 12:44:52.000000000 +0100
-@@ -1,10 +1,9 @@
--CC = gcc
- MAKE = make
--LDFLAGS = -lncurses
-+LDLIBS = -lncurses
- OBJFILES = main.o draw.o erwin.o network.o scores.o
--PREFIX = /usr/local
--LOCALEPATH = /usr/local/share/locale
--CFLAGS = -Wall -O2 -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
-+PREFIX = /usr
-+LOCALEPATH = /usr/share/locale
-+CFLAGS += -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
- VERSION = `grep " VERSION" version.h | sed s/\"//g | sed s/\#define\ VERSION\ //`
- LOCALES = de
- MAN = doc/man
-@@ -25,7 +24,7 @@
- $(MAKE) -C $(MAN) all
- 
- tornado: $(OBJFILES)
--	$(CC) $(LDFLAGS) $(OBJFILES) -o tornado
-+	$(CC) $(LDFLAGS) $(OBJFILES) $(LDLIBS) -o tornado
- 
- debug: tornado.6 locales
- 	gcc -g -ggdb -Wall -ansi -pedantic -o tornado draw.c main.c erwin.c network.c scores.c -lncurses -DPREFIX="\"$(PREFIX)\"" -DLOCALEPATH="\"$(LOCALEPATH)\""
diff --git a/games-strategy/tornado/metadata.xml b/games-strategy/tornado/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/tornado/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/tornado/tornado-1.4.ebuild b/games-strategy/tornado/tornado-1.4.ebuild
deleted file mode 100644
index 0c6638176e97..000000000000
--- a/games-strategy/tornado/tornado-1.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="Clone of a C64 game -  destroy the opponent's house"
-HOMEPAGE="http://kiza.kcore.de/software/tornado/"
-SRC_URI="http://kiza.kcore.de/software/tornado/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "s:PREFIX/bin:${GAMES_BINDIR}:" \
-		-e "s:PREFIX/man:/usr/man:" \
-		-e "s:/var/games:${GAMES_STATEDIR}:" \
-		-e "s:/usr/local:/usr:" \
-		doc/man/tornado.6.in \
-		|| die "sed failed"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	dogamesbin tornado
-	doman doc/man/tornado.6
-	dodoc AUTHOR CREDITS Changelog README TODO
-	insinto "${GAMES_STATEDIR}"
-	doins tornado.scores
-	prepgamesdirs
-	fperms 664 "${GAMES_STATEDIR}/tornado.scores"
-}
diff --git a/games-strategy/triplea-1.8.0.9-r1 b/games-strategy/triplea-1.8.0.9-r1
new file mode 100644
index 000000000000..06fa51898dc7
--- /dev/null
+++ b/games-strategy/triplea-1.8.0.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-java/oracle-javamail:0 dev-java/osgi-core-api:0 dev-java/upnplib:0 >=virtual/jdk-1.7 app-arch/unzip test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=An open source clone of the popular Axis and Allies boardgame
+EAPI=5
+HOMEPAGE=http://triplea.sourceforge.net/
+IUSE=test elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-java/apple-java-extensions-bin:0 dev-java/commons-httpclient:3 dev-java/oracle-javamail:0 dev-java/osgi-core-api:0 dev-java/upnplib:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/triplea/triplea_1_8_0_9_source_code_only.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6f049f12f809fb0e5cbac394d9ff32c4
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
deleted file mode 100644
index f8a208399d29..000000000000
--- a/games-strategy/triplea/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mkdir.sh 28 BLAKE2B e23eb97930e3fd2f5860a0acd5c5a79fd43ebb6577bb79c03b369b74172ec7110b39b5324580e2392c95e5235c86a8b786c67d97adfdd6ae804e4fcc36409973 SHA512 f49b4476521ad392ab91550ce1ef150b4fe4243020f7a173a3fe0d11e31476c22c11773058d4da1a013b63cb3b7017ac8ed38d4793d921a691546481c280ad37
-AUX paths.patch 3867 BLAKE2B 18c958a16855b39e8e800c62976aba0cebb42914a8b67cf3ff09e65dc4a3f505a2a0aa6f5d97a63281300788c2e425248c4319bcc69d3daa691a96a1b0786555 SHA512 bc411daa31e6d7a56a1c762eb785547d0be2f9dfc33dc1311f43e78c9d6337c0786860b52f63c817e61bf137fc71099a4019e6441fca1b469bc4f96a79b0300a
-AUX upnplib.patch 999 BLAKE2B 4fd4113eee4b1e695b4bfcada24b57dcf1aa49b346b896926b8ef18d6dc2db8da0720d3c572cb99c6d047cfc0a9256e08ba280096fdb1780fe16492bcbfaf2c9 SHA512 2195e3aec282935bce60017e99e8211bd153165b3359636517fbe518a4630f1e4464beef57015d92e522a399eb9ea79ad75ced36c4b87388905b16705e341283
-DIST triplea_1_8_0_9_source_code_only.zip 378475905 BLAKE2B b9266467d7a919cc4d6e25d30604a21c738761f4b2a31076fd7e2c98c004c5d7b80c98231d388adae619ce29281eec4a9590c6be31fecdbf547d240f81c8951c SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d
-EBUILD triplea-1.8.0.9-r1.ebuild 2328 BLAKE2B 550c6033bf98560da85a62dfc114b0c5cb4e2a826e01422931c9ced89cd6ff50e7e177f1875a4b19a7341e28b8fbac8293ed256ac25e9a14a6e52c7a6146574d SHA512 c5d9b751355b475429e1b96bd1dc1e45c1b60db0733c706dbf9a571fee566a3e90f1b78997672873779bb452866b70e8ea1eb67d2aa30f49aa302357c3edb2ef
-MISC metadata.xml 330 BLAKE2B e5affd70d163a58ffd63374d6a23a291f38eb5e27aa45d0d4f16857d3483b0a1cc64944ef5fe1284b5742ad5ee72ccb2d4ae0cb9a0c4a8470c8bb1e450dc0ff9 SHA512 25e53b4fda63cde7b2211a94b42804a0eb166fe5159eadcbaf5609645526064790a4b01483fe1e15b5b84fb90c73c55b66afe1c1039bb2dc8354e4c603588ea6
diff --git a/games-strategy/triplea/files/mkdir.sh b/games-strategy/triplea/files/mkdir.sh
deleted file mode 100644
index f1bd04d125c1..000000000000
--- a/games-strategy/triplea/files/mkdir.sh
+++ /dev/null
@@ -1 +0,0 @@
-mkdir -v "${HOME}/.triplea"
diff --git a/games-strategy/triplea/files/paths.patch b/games-strategy/triplea/files/paths.patch
deleted file mode 100644
index f0cd91e3abe6..000000000000
--- a/games-strategy/triplea/files/paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur a/src/games/strategy/engine/framework/GameRunner2.java b/src/games/strategy/engine/framework/GameRunner2.java
---- a/src/games/strategy/engine/framework/GameRunner2.java	2015-09-02 20:30:04.000000000 +0100
-+++ b/src/games/strategy/engine/framework/GameRunner2.java	2016-10-11 23:08:50.296813567 +0100
-@@ -952,9 +952,9 @@
-     // the default
-     File rootDir;
-     if (GameRunner.isMac()) {
--      rootDir = new File(new File(userHome, "Documents"), "triplea");
-+      rootDir = new File(new File(userHome, "Documents"), ".triplea");
-     } else {
--      rootDir = new File(userHome, "triplea");
-+      rootDir = new File(userHome, ".triplea");
-     }
-     return rootDir;
-   }
-diff -Naur a/src/games/strategy/engine/lobby/server/userDB/Database.java b/src/games/strategy/engine/lobby/server/userDB/Database.java
---- a/src/games/strategy/engine/lobby/server/userDB/Database.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/engine/lobby/server/userDB/Database.java	2016-10-11 23:08:50.296813567 +0100
-@@ -54,7 +54,7 @@
-     if (System.getProperties().containsKey(ServerLauncher.SERVER_ROOT_DIR_PROPERTY)) {
-       root = new File(System.getProperties().getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY));
-     } else {
--      root = GameRunner2.getRootFolder();
-+      root = GameRunner2.getUserRootFolder();
-     }
-     if (!root.exists()) {
-       throw new IllegalStateException("Root dir does not exist");
-diff -Naur a/src/games/strategy/util/AccessLogFileHandler.java b/src/games/strategy/util/AccessLogFileHandler.java
---- a/src/games/strategy/util/AccessLogFileHandler.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/AccessLogFileHandler.java	2016-10-11 23:10:31.219309604 +0100
-@@ -12,7 +12,7 @@
-   private static final String logFile;
- 
-   static {
--    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
-     if (!rootDir.exists()) {
-       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
-     }
-diff -Naur a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java
---- a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java	2016-10-11 23:10:40.227175356 +0100
-@@ -13,7 +13,7 @@
-   private static final String logFile;
- 
-   static {
--    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
-     if (!rootDir.exists()) {
-       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
-     }
-diff -Naur a/src/games/strategy/util/RotatingLogFileHandler.java b/src/games/strategy/util/RotatingLogFileHandler.java
---- a/src/games/strategy/util/RotatingLogFileHandler.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/RotatingLogFileHandler.java	2016-10-11 23:10:46.851076636 +0100
-@@ -12,7 +12,7 @@
-   private static final String logFile;
- 
-   static {
--    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+    final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
-     if (!rootDir.exists()) {
-       throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
-     }
diff --git a/games-strategy/triplea/files/upnplib.patch b/games-strategy/triplea/files/upnplib.patch
deleted file mode 100644
index f17b7891302a..000000000000
--- a/games-strategy/triplea/files/upnplib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/src/games/strategy/net/UniversalPlugAndPlayHelper.java b/src/games/strategy/net/UniversalPlugAndPlayHelper.java
---- a/src/games/strategy/net/UniversalPlugAndPlayHelper.java	2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/net/UniversalPlugAndPlayHelper.java	2016-10-11 22:10:37.287834187 +0100
-@@ -166,8 +166,8 @@
-     System.out.println("To " + m_local.getHostAddress() + ":" + internalPort);
-     boolean mapped = false;
-     try {
--      mapped = m_device.addPortMapping("TripleA Game Hosting", "TCP", null, externalPort, m_local.getHostAddress(),
--          internalPort, 0);
-+      mapped = m_device.addPortMapping("TripleA Game Hosting", null, internalPort, externalPort,
-+          m_local.getHostAddress(), 0, "TCP");
-     } catch (final IOException e) {
-       System.out.println("Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage());
-       return "Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage();
diff --git a/games-strategy/triplea/metadata.xml b/games-strategy/triplea/metadata.xml
deleted file mode 100644
index 6c83e2c3e451..000000000000
--- a/games-strategy/triplea/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">triplea</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild
deleted file mode 100644
index ad0f13584c8a..000000000000
--- a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 versionator
-
-MY_PV=$(replace_all_version_separators _)
-DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
-HOMEPAGE="http://triplea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Needs X11 maybe use virtualx.eclass
-
-RDEPEND="dev-java/apple-java-extensions-bin:0
-	dev-java/commons-httpclient:3
-	dev-java/oracle-javamail:0
-	dev-java/osgi-core-api:0
-	dev-java/upnplib:0"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.7
-	app-arch/unzip
-	test? ( dev-java/ant-junit:0 )"
-RDEPEND="${RDEPEND}
-	>=virtual/jre-1.7"
-
-S=${WORKDIR}/${PN}_${MY_PV}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib"
-
-java_prepare() {
-	# Use ~/.triplea, not ~/triplea.
-	# Don't write server files under /usr/share or ${PWD}.
-	# Fix to build against our packaged upnplib.
-	epatch "${FILESDIR}"/{paths,upnplib}.patch
-
-	# Remove packaged or unneeded libs. Unfortunately Apache Derby was
-	# last-rited due to packaging issues. See bug #561410.
-	find lib/* ! -name "derby-*.jar" -delete || die
-	rm -r old/ || die
-}
-
-src_compile() {
-	eant
-	echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties || die
-	# The only target creating this is zip which does unjar etc
-	jar cf ${PN}.jar -C classes . || die
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r assets data dice_servers maps
-
-	java-pkg_dojar ${PN}.jar
-	java-pkg_newjar lib/derby-*.jar derby.jar
-
-	java-pkg_dolauncher ${PN} \
-		--main games.strategy.engine.framework.GameRunner \
-		--java_args "-Xmx256m"
-	java-pkg_dolauncher ${PN}-server -pre "${FILESDIR}"/mkdir.sh \
-		--main games.strategy.engine.lobby.server.LobbyServer \
-		--java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true"
-
-	newicon icons/triplea_icon.png ${PN}.png
-	newicon icons/triplea_icon.png ${PN}-server.png
-	make_desktop_entry ${PN} TripleA
-	make_desktop_entry ${PN}-server TripleA-server
-
-	dodoc changelog.txt TripleA_RuleBook.pdf
-	docinto html
-	dodoc -r doc/* readme.html
-}
diff --git a/games-strategy/ufoai-2.5.0_p20180603 b/games-strategy/ufoai-2.5.0_p20180603
new file mode 100644
index 000000000000..9cd2dd2241f5
--- /dev/null
+++ b/games-strategy/ufoai-2.5.0_p20180603
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/xvid virtual/jpeg:0 virtual/opengl ) editor? ( dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/jpeg:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gtksourceview:2.0 ) server? ( media-libs/libsdl2[threads] ) app-arch/unzip sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=UFO: Alien Invasion - X-COM inspired strategy game
+EAPI=6
+HOMEPAGE=https://ufoai.org/
+IUSE=+client cpu_flags_x86_sse debug editor server
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT
+RDEPEND=net-misc/curl sys-libs/zlib client? ( media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libtheora media-libs/libvorbis media-libs/sdl2-mixer media-libs/sdl2-ttf media-libs/xvid virtual/jpeg:0 virtual/opengl ) editor? ( dev-libs/glib:2 dev-libs/libxml2:2 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2[joystick,opengl,sound,threads,video] media-libs/libvorbis media-libs/openal virtual/glu virtual/jpeg:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/gtkglext x11-libs/gtksourceview:2.0 ) server? ( media-libs/libsdl2[threads] )
+REQUIRED_USE=|| ( client editor server )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~chewi/distfiles/ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip mirror://sourceforge/ufoai/ufoai-2.5-data.tar editor? ( mirror://sourceforge/ufoai/ufoai-2.5-mappack.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=27aa020fae069b203d11a24b84d3f967
diff --git a/games-strategy/ufoai/Manifest b/games-strategy/ufoai/Manifest
deleted file mode 100644
index afc325d031c8..000000000000
--- a/games-strategy/ufoai/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX ufoai-2.5.0_p20180603-install.patch 1097 BLAKE2B b2c1f2761429dafd2ffad037e5adf981e5062eb75bffaac51c127fe056e00da59238d91a0b1916d6325ea7e643a87e0945ac3ef20d8f2b958cc88904d96ed9c3 SHA512 b8a61ca5be370bc7fec5d97317e950b2654e6ffe4ffef4473b64f1a37af5dfbfa9152ef4e5bb11e2217bdadae04e7499ef19b67bfdfb32c5ab4a200ac5798ffc
-DIST ufoai-2.5-data.tar 1277143040 BLAKE2B 20795ec6ebc976087f28fd0e912190bd9094494cc1b206bcc8e1956dec148cb7ab96f244db22e4836b91c0ecfae794cd206296e898015453d8ad6625d4e4ab32 SHA512 9a7be359c82cd633db657c8619cb488b5d41b9f93cd10bdeffd5896d8a1ba3bb828b5969acd14c2a69abb3f53f18113af4ca19435aea80ded94d8df68b11deec
-DIST ufoai-2.5-mappack.tar.bz2 12200150 BLAKE2B d20f96f74a4b71a4ff55e4e3f81380ee35a71c6e34d35e6300487c916f2d836e240428e8f8529cca13d46ccd5440e7f59d5bfe5f451a2cd84469f8f1e85dc796 SHA512 0f44cc3d99ceb80f91e5df0f7cbd57ce3170f5635feb082c002ab9a0f4f81216b05c346c698475c33e88f97032186f4620bad71d02bfa95ecb5c5d4f68c71994
-DIST ufoai-code-8b4533e85fdc0665889ff285e1521432084ee784.zip 33194032 BLAKE2B caebfe5ca0eaa6376659d4aa69132c29aa4af870135a769af3541bd919164d79ab9dfe8007a40bb95507a443f6f1d968bb85b1befe8b6999f9033a0d74d7a7fb SHA512 825ca6f8ac76a3a60746ac1be4406445dd18bab80372c21c2ddfcf4d999db8549614df41386e94197013bb7b4b342ac6d9be8c969b5e1be79e8ee25cf45719c6
-EBUILD ufoai-2.5.0_p20180603.ebuild 3972 BLAKE2B dc47c6537bbf7f4f824300bb639009b64d7cb27fe0f36a334c79617fdac03ab4c4c7d2ef1068121c8730c8775bdc988828496f9366507dde30154b756ecf78f8 SHA512 65256cda61fda4e051a859836841fa8575e8dd224242781e7b444c403bc51ef71807eed6ba919194a9d31719b64c67a430df3b92959ff0f4654b04bf7a38f6e6
-MISC metadata.xml 536 BLAKE2B d0037cae0706304da8c17767d8980eadd1b437bce5f75e980e3a42113b2596d6ed0017962720a9f0c1cc726ceb63028249d5b87b57cf1166dee03d4b884f5d42 SHA512 e02322e3077645800fdc90673261658fe0c33f5e20282cdf40a1867ce85e07e79967f38999031c652f259520489cc65942ae252f8a26182cbdeae6ac5024271d
diff --git a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch b/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch
deleted file mode 100644
index 5c92f433e279..000000000000
--- a/games-strategy/ufoai/files/ufoai-2.5.0_p20180603-install.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-* Prevent stripping
-* Prevent installation of useless wrappers
-* Install binaries to the right locations
-
-Chewi
-2018/06/05
-
-diff -Naur a/Makefile b/Makefile
---- a/Makefile	2018-06-03 21:55:40.000000000 +0100
-+++ b/Makefile	2018-06-05 22:29:08.666944853 +0100
-@@ -33,8 +33,8 @@
- CONFIGURE_PREFIX ?=
- 
- INSTALL         ?= install
--INSTALL_PROGRAM ?= $(INSTALL) -m 755 -s
--INSTALL_SCRIPT  ?= $(INSTALL) -m 755
-+INSTALL_PROGRAM ?= $(INSTALL) -m 755
-+INSTALL_SCRIPT  ?= true
- INSTALL_DIR     ?= $(INSTALL) -d
- INSTALL_MAN     ?= $(INSTALL) -m 444
- INSTALL_DATA    ?= $(INSTALL) -m 444
-@@ -162,8 +162,13 @@
- 
- install-$(1): $($(1)_FILE)
- 	@echo 'Install $$<'
--	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGDATADIR)/$(dir $($(1)_FILE))
--	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGDATADIR)/$$<
-+	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGBINDIR)/
-+	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGBINDIR)/
-+
-+install-game: $(game_FILE)
-+	@echo 'Install $$<'
-+	$(Q)$(INSTALL_DIR) $(DESTDIR)$(PKGLIBDIR)/
-+	$(Q)$(INSTALL_PROGRAM) $$< $(DESTDIR)$(PKGLIBDIR)/$(notdir $(game_FILE))
- 
- uninstall-$(1):
- 	@echo 'Uninstall $($(1)_FILE)'
diff --git a/games-strategy/ufoai/metadata.xml b/games-strategy/ufoai/metadata.xml
deleted file mode 100644
index 916e44355c73..000000000000
--- a/games-strategy/ufoai/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="client">Build the main game client</flag>
-    <flag name="editor">Build the map editor and compiler</flag>
-    <flag name="server">Build the dedicated server</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">ufoai</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild b/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
deleted file mode 100644
index 0fd98165739d..000000000000
--- a/games-strategy/ufoai/ufoai-2.5.0_p20180603.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop flag-o-matic gnome2-utils toolchain-funcs versionator
-
-# 2.5.0 requires several patches
-COMMIT="8b4533e85fdc0665889ff285e1521432084ee784"
-
-# UFO:AI v2.5.0 was uploaded to SourceForge as 2.5
-DIST_VERSION=$(get_version_component_range 1-2)
-
-# Install game data here
-DATADIR="/usr/share/${PN}"
-
-DESCRIPTION="UFO: Alien Invasion - X-COM inspired strategy game"
-HOMEPAGE="https://ufoai.org/"
-SRC_URI="
-	https://dev.gentoo.org/~chewi/distfiles/${PN}-code-${COMMIT}.zip
-	mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-data.tar
-	editor? ( mirror://sourceforge/${PN}/${PN}-${DIST_VERSION}-mappack.tar.bz2 )
-"
-
-# https://ufoai.org/licenses/
-LICENSE="GPL-2 GPL-3 public-domain CC-BY-3.0 CC-BY-SA-3.0 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client cpu_flags_x86_sse debug editor server"
-REQUIRED_USE="|| ( client editor server )"
-
-RDEPEND="
-	net-misc/curl
-	sys-libs/zlib
-
-	client? (
-		media-libs/libogg
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,opengl,sound,threads,video]
-		media-libs/libtheora
-		media-libs/libvorbis
-		media-libs/sdl2-mixer
-		media-libs/sdl2-ttf
-		media-libs/xvid
-		virtual/jpeg:0
-		virtual/opengl
-	)
-
-	editor? (
-		dev-libs/glib:2
-		dev-libs/libxml2:2
-		media-libs/libogg
-		media-libs/libpng:0=
-		media-libs/libsdl2[joystick,opengl,sound,threads,video]
-		media-libs/libvorbis
-		media-libs/openal
-		virtual/glu
-		virtual/jpeg:0
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:2
-		x11-libs/gtkglext
-		x11-libs/gtksourceview:2.0
-	)
-
-	server? (
-		media-libs/libsdl2[threads]
-	)
-"
-
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-code-${COMMIT}"
-PATCHES=( "${FILESDIR}"/${P}-install.patch )
-
-src_unpack() {
-	use editor && unpack ${PN}-${DIST_VERSION}-mappack.tar.bz2
-	unpack ${PN}-code-${COMMIT}.zip
-	cd "${S}" || die
-	unpack ${PN}-${DIST_VERSION}-data.tar
-}
-
-src_prepare() {
-	default
-
-	# Make the build system a bit happier, will be fixed upstream
-	mkdir -p base/{maps,models} contrib/installer/mojosetup/scripts || die
-}
-
-src_configure() {
-	# Avoid noise, will be present in 2.6
-	append-cxxflags -Wno-expansion-to-defined
-
-	# The configure script of UFO:AI is hand crafted and a bit special
-	# econf does not work: "invalid option --build=x86_64-pc-linux-gnu"
-	local config=(
-		--prefix="${EPREFIX}"/usr
-		--datadir="${EPREFIX}${DATADIR}"
-		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
-		--localedir="${EPREFIX}"/usr/share/locale
-		--disable-dependency-tracking
-		--disable-paranoid
-		--disable-memory
-		--disable-testall
-		--disable-ufomodel
-		--disable-ufoslicer
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable !debug release)
-		$(use_enable server ufoded)
-		$(use_enable client ufo)
-		$(use_enable editor uforadiant)
-		$(use_enable editor ufo2map)
-	)
-
-	if use client || use server; then
-		config+=( --enable-game )
-	else
-		config+=( --disable-game )
-	fi
-
-	echo ./configure "${config[@]}"
-
-	CC=$(tc-getCC) CXX=$(tc-getCXX) \
-	  ./configure "${config[@]}" || die "configure failed"
-}
-
-src_compile() {
-	emake all lang Q=
-}
-
-src_install() {
-	newicon -s 32 src/ports/linux/ufo.png ${PN}.png
-	emake install Q= DESTDIR="${D}"
-
-	if use client; then
-		doman debian/ufo.6
-		make_desktop_entry ufo "UFO: Alien Invasion" ${PN}
-	fi
-
-	if use server; then
-		doman debian/ufoded.6
-		make_desktop_entry ufoded "UFO: Alien Invasion Server" ${PN} "Game;StrategyGame" "Terminal=true"
-	fi
-
-	if use editor; then
-		doman debian/ufo{2map,radiant}.6
-		make_desktop_entry uforadiant "UFO: Alien Invasion Map editor" ${PN}
-
-		# Install map editor data (without the binary)
-		rm radiant/uforadiant || die
-		insinto "${DATADIR}"
-		doins -r radiant
-
-		# Install map sources
-		insinto "${DATADIR}"/base/maps
-		doins -r "${WORKDIR}"/${PN}-${DIST_VERSION}-mappack/*
-	fi
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/games-strategy/uqm-0.7.0-r4 b/games-strategy/uqm-0.7.0-r4
new file mode 100644
index 000000000000..59348449782f
--- /dev/null
+++ b/games-strategy/uqm-0.7.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0= media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl ) virtual/pkgconfig
+DESCRIPTION=The Ur-Quan Masters: Port of Star Control 2
+EAPI=6
+HOMEPAGE=http://sc2.sourceforge.net/
+IUSE=music opengl remix voice
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libmikmod media-libs/libogg >=media-libs/libpng-1.4:0= media-libs/libsdl[X,sound,joystick,video] media-libs/libvorbis media-libs/sdl-image[png] sys-libs/zlib opengl? ( virtual/opengl )
+SLOT=0
+SRC_URI=mirror://sourceforge/sc2/uqm-0.7.0-source.tgz mirror://sourceforge/sc2/uqm-0.7.0-content.uqm music? ( mirror://sourceforge/sc2/uqm-0.7.0-3domusic.uqm ) voice? ( mirror://sourceforge/sc2/uqm-0.7.0-voice.uqm ) remix? ( mirror://sourceforge/sc2/uqm-remix-disc1.uqm mirror://sourceforge/sc2/uqm-remix-disc2.uqm mirror://sourceforge/sc2/uqm-remix-disc3.uqm mirror://sourceforge/sc2/uqm-remix-disc4.uqm )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=9017540f548e049899417cff35387d98
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
deleted file mode 100644
index 9617b8304bd2..000000000000
--- a/games-strategy/uqm/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX uqm-0.7.0-tempdir.patch 510 BLAKE2B bed2ffb2c9051accfc971268efc9c5769a43f87c22a5ac5bbeda86d171e69e9927671c0b8aaa2d16981febc15f62fb47fb80fb2e5fb4e46434ba7b97b4b0993a SHA512 07dc48c646e6e3642a1c917aa763996eaef8bae21e72470159b445e20e3e3315663009b4fd30c93a7f5b04ec78bf12de254434094f3c62ca523466148a2a9594
-AUX uqm-0.7.0-warning.patch 862 BLAKE2B 8e07610eea56c3c778cff5143284551a8230b35fb20ba15c11ff8266b67cedfaaa3de3c72c3aa3bf936e4799ef62bba8524e7cbe911f81c4d183f45762a38779 SHA512 d15b09a13b82a888a5c50c5e561213e755f104cb1f7b42bf3fdc7c39350bb517111c8d212218126c89136a2a4a7c47bcc4354e7c53a9df72795ce123a619a256
-DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
-DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348 SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
-DIST uqm-0.7.0-source.tgz 1562003 BLAKE2B 682f87b4967b1aef298dd576dd37cef838f2eaf42f2212fc3af70bf7319e5284cc9bff616d8db3a36a7f2760d2f47f714bcaa2f4f3d35993892a78cdadc85e54 SHA512 443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815
-DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
-DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
-DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
-DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
-DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
-EBUILD uqm-0.7.0-r4.ebuild 2887 BLAKE2B b9bcdc61a47019fefe86f46453e7413efe252a7e7169d9fed3b4d93c00b045228bd0a3956b0d8013388128eb16b30ab2aab1010b8ebce093bd29f70dbd3a9b20 SHA512 2c551fcce44049917d348d04d011c095ed0e92ba2ba7ca38f0430c2ad83e5e13c1c96951b0be0e03a23a49cb044aee4a281815d5dd9c3de7e80b9febd176f58f
-MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1
diff --git a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch b/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
deleted file mode 100644
index dbb693c660a8..000000000000
--- a/games-strategy/uqm/files/uqm-0.7.0-tempdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# leaves files lying around bug #576098
-
-diff -ru uqm-0.7.0.orig/build/unix/config_functions uqm-0.7.0/build/unix/config_functions
---- uqm-0.7.0.orig/build/unix/config_functions	2011-05-20 15:25:22.000000000 -0400
-+++ uqm-0.7.0/build/unix/config_functions	2016-03-09 02:46:41.512465876 -0500
-@@ -16,7 +16,7 @@
- #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- BUILDLOG=/dev/null
--TEMPFILE="/tmp/build.$$.tmp"
-+TEMPFILE="${T:-/tmp}/build.$$.tmp"
- #KEEPTEMPFILES=keeptempfiles
- 
- 
diff --git a/games-strategy/uqm/files/uqm-0.7.0-warning.patch b/games-strategy/uqm/files/uqm-0.7.0-warning.patch
deleted file mode 100644
index 7f05ee5bd1eb..000000000000
--- a/games-strategy/uqm/files/uqm-0.7.0-warning.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./src/libs/sound/decoders/aiffaud.c.orig	2011-05-20 15:24:44.000000000 -0400
-+++ ./src/libs/sound/decoders/aiffaud.c	2016-03-10 00:53:37.336198208 -0500
-@@ -307,7 +307,7 @@
- {
- 	int bytes;
- 
--	memset(fmt, sizeof(*fmt), 0);
-+	memset(fmt, 0, sizeof(*fmt));
- 	if (size < AIFF_COMM_SIZE)
- 	{
- 		aifa->last_error = aifae_BadFile;
-@@ -369,7 +369,7 @@
- 	aifa->max_pcm = 0;
- 	aifa->data_ofs = 0;
- 	memset(&aifa->fmtHdr, 0, sizeof(aifa->fmtHdr));
--	memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
-+	memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
- 
- 	// read wave header
- 	if (!aifa_readFileHeader (aifa, &fileHdr))
-@@ -635,7 +635,7 @@
- 
- 	// reset previous values for SDX2 on seek ops
- 	// the delta will recover faster with reset
--	memset(aifa->prev_val, sizeof(aifa->prev_val), 0);
-+	memset(aifa->prev_val, 0, sizeof(aifa->prev_val));
- 
- 	return pcm_pos;
- }
diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
deleted file mode 100644
index 0a1a6fc92acb..000000000000
--- a/games-strategy/uqm/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="music">download and install music files (large)</flag>
-    <flag name="remix">download and install music remix files (large)</flag>
-    <flag name="voice">download and install voice files (large)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">sc2</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-strategy/uqm/uqm-0.7.0-r4.ebuild b/games-strategy/uqm/uqm-0.7.0-r4.ebuild
deleted file mode 100644
index f04136716330..000000000000
--- a/games-strategy/uqm/uqm-0.7.0-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop toolchain-funcs
-
-DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
-HOMEPAGE="http://sc2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
-	mirror://sourceforge/sc2/${P}-content.uqm
-	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
-	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
-	remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
-		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
-		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm \
-		mirror://sourceforge/sc2/${PN}-remix-disc4.uqm )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="music opengl remix voice"
-
-RDEPEND="
-	media-libs/libmikmod
-	media-libs/libogg
-	>=media-libs/libpng-1.4:0=
-	media-libs/libsdl[X,sound,joystick,video]
-	media-libs/libvorbis
-	media-libs/sdl-image[png]
-	sys-libs/zlib
-	opengl? ( virtual/opengl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	local myopengl
-
-	use opengl \
-		&& myopengl=opengl \
-		|| myopengl=pure
-
-	eapply \
-		"${FILESDIR}"/${P}-tempdir.patch \
-		"${FILESDIR}"/${P}-warning.patch
-
-	cat <<-EOF > config.state
-	CHOICE_debug_VALUE='nodebug'
-	CHOICE_graphics_VALUE='${myopengl}'
-	CHOICE_sound_VALUE='mixsdl'
-	CHOICE_accel_VALUE='plainc'
-	INPUT_install_prefix_VALUE='/usr/share'
-	INPUT_install_bindir_VALUE='\$prefix/bin'
-	INPUT_install_libdir_VALUE='\$prefix/lib'
-	INPUT_install_sharedir_VALUE='/usr/share/'
-	EOF
-
-	# Take out the read so we can be non-interactive.
-	sed -i \
-		-e '/read CHOICE/d' build/unix/menu_functions || die
-
-	# respect CFLAGS
-	sed -i \
-		-e "s/-O3//" build/unix/build.config || die
-
-	sed -i \
-		-e "s:@INSTALL_LIBDIR@:/usr/$(get_libdir)/:g" \
-		build/unix/uqm-wrapper.in || die
-
-	# respect CC
-	sed -i \
-		-e "s/PROG_gcc_FILE=\"gcc\"/PROG_gcc_FILE=\"$(tc-getCC)\"/" \
-		build/unix/config_proginfo_build || die
-}
-
-src_compile() {
-	MAKE_VERBOSE=1 ./build.sh uqm || die
-}
-
-src_install() {
-	# Using the included install scripts seems quite painful.
-	# This manual install is totally fragile but maybe they'll
-	# use a sane build system for the next release.
-	newbin uqm-wrapper uqm
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe uqm
-
-	insinto /usr/share/${PN}/content/packages
-	doins "${DISTDIR}"/${P}-content.uqm
-	echo ${P} > "${ED}"/usr/share/${PN}/content/version || die
-
-	insinto /usr/share/${PN}/content/addons
-	if use music; then
-		doins "${DISTDIR}"/${P}-3domusic.uqm
-	fi
-
-	if use voice; then
-		doins "${DISTDIR}"/${P}-voice.uqm
-	fi
-
-	if use remix; then
-		insinto /usr/share/${PN}/content/addons
-		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4}.uqm
-	fi
-
-	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
-	docinto devel
-	dodoc doc/devel/[!n]*
-	docinto devel/netplay
-	dodoc doc/devel/netplay/*
-	make_desktop_entry uqm "The Ur-Quan Masters"
-}
diff --git a/games-strategy/wargus-2.4.1 b/games-strategy/wargus-2.4.1
new file mode 100644
index 000000000000..bf5d0bbe02fe
--- /dev/null
+++ b/games-strategy/wargus-2.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Warcraft II for the Stratagus game engine
+EAPI=6
+HOMEPAGE=http://wargus.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+PDEPEND=games-strategy/wargus-data
+RDEPEND==games-engines/stratagus-2.4.1*[theora] media-libs/libpng:0= sys-libs/zlib:= x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/Wargus/wargus/archive/v2.4.1.tar.gz -> wargus-2.4.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	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21f9bf5beabef6e75ffd4aef26f7599e
diff --git a/games-strategy/wargus-data-0-r1 b/games-strategy/wargus-data-0-r1
new file mode 100644
index 000000000000..30d8671dc796
--- /dev/null
+++ b/games-strategy/wargus-data-0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install
+DEPEND=games-strategy/wargus media-sound/cdparanoia media-sound/timidity++ media-video/ffmpeg2theora
+DESCRIPTION=Warcraft II data for wargus (needs DOS CD)
+EAPI=6
+HOMEPAGE=http://wargus.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=all-rights-reserved
+PROPERTIES=interactive
+RESTRICT=userpriv
+SLOT=0
+_eclasses_=cdrom	c64e4c5e9cbf2a58be31431e015a6210	portability	2b88d3ecc35035a3b8ab628b49cafb0e
+_md5_=0f0563cee2808c9c204c3aff4b28dd27
diff --git a/games-strategy/wargus-data/Manifest b/games-strategy/wargus-data/Manifest
deleted file mode 100644
index cdc0c6b308dd..000000000000
--- a/games-strategy/wargus-data/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD wargus-data-0-r1.ebuild 951 BLAKE2B e03d8ca96a4dc70886269ef8ae36c33e73924cb45c80fdf49f62bb51847645d557f0d2ed1df298f70371d8a7b9351b25bf9e28114e5f1744a383b1315b734fc3 SHA512 dc3e4e3e44073d25236761b605ac892e513681d4088f8f202a02dede6559a59a68ab1e207f23b17d7bef01c1f44b54cd5108399e32e3503ecfcf672704801268
-MISC metadata.xml 329 BLAKE2B aad962070eacf1667ce2bed4939e290802eadb53bbb1e8ffe8ca13f9c006c45818f9dda522e6ba0d92d1404c8691a7d76a2636caee3657cd6ac3d947f0df2449 SHA512 fedeb73a5c2116db0073c51166b5c3fcf1c5667f5bb0db1b21f7643a6a8f247624738c883af3e457d6a6a7c2b5d39da6c26ffb2cecc847e64501bd659f1f119e
diff --git a/games-strategy/wargus-data/metadata.xml b/games-strategy/wargus-data/metadata.xml
deleted file mode 100644
index ee6903c19afc..000000000000
--- a/games-strategy/wargus-data/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">wargus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/wargus-data/wargus-data-0-r1.ebuild b/games-strategy/wargus-data/wargus-data-0-r1.ebuild
deleted file mode 100644
index 9636a8e03f33..000000000000
--- a/games-strategy/wargus-data/wargus-data-0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cdrom
-
-DESCRIPTION="Warcraft II data for wargus (needs DOS CD)"
-HOMEPAGE="http://wargus.sourceforge.net/"
-SRC_URI=""
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# wargus is needed for wartool (bug #578340)
-DEPEND="
-	games-strategy/wargus
-	media-sound/cdparanoia
-	media-sound/timidity++
-	media-video/ffmpeg2theora"
-# wrt bug #419331
-RESTRICT="userpriv"
-
-S=${WORKDIR}
-
-src_configure() {
-	export CDROM_NAME="WARCRAFT2"
-	cdrom_get_cds data/rezdat.war
-}
-
-src_compile() {
-	# cdparanoia needs write acces to the cdrom device
-	# this fixes sandbox violation wrt #418051
-	local save_sandbox_write=${SANDBOX_WRITE}
-	addwrite /dev
-	"${EPREFIX}"/usr/bin/wartool -v -r "${CDROM_ROOT}"/data "${S}"/ || die
-	SANDBOX_WRITE=${save_sandbox_write}
-}
-
-src_install() {
-	insinto /usr/share/stratagus/wargus
-	doins -r .
-}
diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest
deleted file mode 100644
index a543cdcaff82..000000000000
--- a/games-strategy/wargus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wargus-2.4.1.tar.gz 45981981 BLAKE2B 8d80e5d781a1be1edf602f13d77b84e85fe2592fb0a784f1b25b5c9656eaf10a11c3241dfa71388c9a01a9e8fad15b1805a67ddb3157c2a0e86d967f3852869a SHA512 d468d9ad08907fbbfd02af0bca069d6a95d5303cd4f3d838c12bbfe6af0d48f695f9f49d446dbddeae2a91deb1eaa17875954eefdfbe5e25cd840c4454dc6ea0
-EBUILD wargus-2.4.1.ebuild 1015 BLAKE2B 2ec460a15d26df522ead61b9863618d24057da3b48e73eedb8888017369b94458e87e4792f05d6eb965412c3fee8b21a8fbaf8868065d46948e1e8acfdc0f793 SHA512 4b5b967cfbd52156e3fbe32eb75829ef627ef69534fb5994ad3d0a76ad4280cb89026eed1a5eef643c198865781a32eccb3d9308b356b3b00ae936fe736fd9f8
-MISC metadata.xml 378 BLAKE2B ea732d1cff85972c33a4fef5281b71f5e3bcf7663e864b00891802ee353fab9b33bd93fc6e76ff8123ba4dd8e77dc4889f3a8d044d7c664782c07629b2f942e6 SHA512 ccc5c5ce04783ccd03e482797fd8941fae5c1ba32936641b762595a03606996157637f5155a80eb7284fa2f290b8883b12a1b9b9ba83cf2693876f3cd269617f
diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
deleted file mode 100644
index 734f09c524c3..000000000000
--- a/games-strategy/wargus/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">wargus</remote-id>
-		<remote-id type="sourceforge">wargus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/wargus/wargus-2.4.1.ebuild b/games-strategy/wargus/wargus-2.4.1.ebuild
deleted file mode 100644
index e88a97f6bba3..000000000000
--- a/games-strategy/wargus/wargus-2.4.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Warcraft II for the Stratagus game engine"
-HOMEPAGE="http://wargus.sourceforge.net/"
-SRC_URI="https://github.com/Wargus/wargus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	=games-engines/stratagus-${PV}*[theora]
-	media-libs/libpng:0=
-	sys-libs/zlib:=
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="games-strategy/wargus-data"
-
-src_configure() {
-	local mycmakeargs=(
-		-DGAMEDIR="${EPREFIX}/usr/bin"
-		-DBINDIR="${EPREFIX}/usr/bin"
-		-DSTRATAGUS="${EPREFIX}/usr/bin"/stratagus
-		-DICONDIR=/usr/share/icons/hicolor/64x64/apps
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	elog "Enabling OpenGL in-game seems to cause segfaults/crashes."
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/warmux-11.04.1-r1 b/games-strategy/warmux-11.04.1-r1
new file mode 100644
index 000000000000..aa9442070ed5
--- /dev/null
+++ b/games-strategy/warmux-11.04.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A free Worms clone
+EAPI=6
+HOMEPAGE=http://gna.org/projects/warmux/
+IUSE=debug nls unicode
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/libxml2 media-libs/libsdl[joystick,video,X] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx media-fonts/dejavu net-misc/curl x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
+SLOT=0
+SRC_URI=http://download.gna.org/warmux/warmux-11.04.1.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_=5dd3be27060fe7e515483284b7e23e74
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest
deleted file mode 100644
index 822667f27489..000000000000
--- a/games-strategy/warmux/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX warmux-11.04.1-action.patch 549 BLAKE2B d22e26bae34efd28729cbdb98e97365fb2e42de0bc8c464d2ccc9f2845a78d92716b8d432ae72deedd824938a5243aa3736baeccf7c12ec3cfba7c10573dd4d7 SHA512 c31ac142b43e593f4c7b9fff36a8dd0bb34b371a63935cf55627660d96eda8fe68af721254bd72a2168045a27b32a407df494eb6b216115a0bb0516478187ec9
-AUX warmux-11.04.1-fix-c++14.patch 488 BLAKE2B 0f60ce6c6d4238ec9eaa06428b4ff251fca1bfb8e3d05cb5c57a9a5d9e229c0775b76fffe33704aa6d8b636959cffc4f529d19cd09065e5842ccfd89745207cd SHA512 c8c6d5d070e926f7ffd03766c95481c0db8b43a8a0f3fad301e7e7210013098696ad5af0c5ab8c70f0081711b6b50847d8873af0ea79315c4c45c760e915eb88
-AUX warmux-11.04.1-gcc47.patch 335 BLAKE2B cfa1e6b42a00a0683c06257bd9156a8a85eef3181ba385f3eb4a82f944259cd2db1b0b56bccf0f68b6b09505f6825e02394fc07c8cd76bd8772340eefa43bc65 SHA512 33e403ce0dd69ae782ca3696838bfaf8126520b92b3b813ac491559dafd429ae3379131965a49e2c7ca2955a384ce41989f89db611696f999edf41c4abdd1270
-AUX warmux-11.04.1-gentoo.patch 1543 BLAKE2B 23c3cb85c720c0df37ed274dfe824f94ffce3362528bf2967b790bb51d7d8ec5bbd803d019dd0d4a68bc757cbe82bf4ca4f03745ffb6c91cbe76e17c34ce9e8e SHA512 30e565a3b212a3b54c29267b29a43343d21a3fbadf2bc70552fb074b0f174f08cf66a6565f19de4f0187dbfe68e9124fda42a0cd85d592f1d596f217f5c3c4f9
-AUX warmux-11.04.1-stat.patch 1746 BLAKE2B 886a8dc439e1546d823e27bbe2313aeff913d02f754abf4355221b99f504d8408ad1c652a3e61abd4fae10e832284f929c7d31767eca317174619f54eaf5f7db SHA512 f0af67d2109585e6cc02621a9ff249cfe5154783216d46d2c7641ec825a8e30d34767122d12ced8bfd916c3c966cadad49eeb43b44aa1954905950272c0c9902
-AUX warmux-11.04.1-zlib.patch 416 BLAKE2B a41b14d70de3c828368835825a240d8708b7d81cbd64fa0cc06540eee60e4f4bced5d7dd6566d4cec49e9e8ed2f2b03ec9578a334c7223d2b43e8c844f1b950a SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c
-DIST warmux-11.04.1.tar.bz2 110083622 BLAKE2B 50d575986d780e9e1bde2740297e11d3e720afe8396106ff05cd6051ed57315b8cd94d946b85956981743455c1013c8da91e5db0874db1e226b13bd72b3516eb SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d
-EBUILD warmux-11.04.1-r1.ebuild 1465 BLAKE2B 266e0cbed986da4ee8ccfcd6982eead0627e1f6d90fbdf4cbe1e4a9c915149ccf0d7a7f289436c4abce4a331325bc2b4977af5268b95e5dfdaba1246e20377e9 SHA512 2e0d118e1a9fbb86fdaeaaa6504629c0ab3d569b90609f7bba13b39476b3a042aa9dad73ae66fd40508af4ee8a5f7bd31d3cf3e21161deb4f48054a51861eeee
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/warmux/files/warmux-11.04.1-action.patch b/games-strategy/warmux/files/warmux-11.04.1-action.patch
deleted file mode 100644
index e1530337a259..000000000000
--- a/games-strategy/warmux/files/warmux-11.04.1-action.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr warmux-11.04.orig/lib/warmux/action/action.cpp warmux-11.04/lib/warmux/action/action.cpp

---- warmux-11.04.orig/lib/warmux/action/action.cpp      2012-03-27 15:18:08.440709875 +0200

-+++ warmux-11.04/lib/warmux/action/action.cpp   2012-03-27 15:17:44.871711354 +0200

-@@ -85,7 +85,7 @@

- {

-   m_creator = _creator;

-

--  m_header.len = SDLNet_Read32(buffer);

-+  m_header.len = SDLNet_Read32((void *)buffer);

-   ASSERT(m_header.len >= sizeof(Header));

-   buffer += 4;

-   // All of the following could be skipped for the actions we now,
\ No newline at end of file
diff --git a/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch b/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
deleted file mode 100644
index 223ee47ab5a2..000000000000
--- a/games-strategy/warmux/files/warmux-11.04.1-fix-c++14.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-In C++14, bool -> T* implicit conversions are not allowed anymore.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=598639
-
---- a/src/interface/weapon_menu.cpp
-+++ b/src/interface/weapon_menu.cpp
-@@ -391,7 +391,7 @@
- Weapon * WeaponsMenu::UpdateCurrentOverflyItem(const Polygon * poly)
- {
-   if (!show)
--    return false;
-+    return NULL;
-   const std::vector<PolygonItem *>& items = poly->GetItem();
-   WeaponMenuItem * tmp;
-   Interface::GetInstance()->SetCurrentOverflyWeapon(NULL);
diff --git a/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch b/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch
deleted file mode 100644
index 8460bcbd0b1c..000000000000
--- a/games-strategy/warmux/files/warmux-11.04.1-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Description: Fix FTBFS with gcc 4.7.
-Author: Felix Geyer <debfx-pkg@fobos.de>
-
---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
-+++ warmux-11.04.1+repack/tools/list_games/main.cpp
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <unistd.h>
- #include <WARMUX_types.h>
- #include <WARMUX_network.h>
- #include <WARMUX_index_server.h>
diff --git a/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch b/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch
deleted file mode 100644
index 62d22f84c82d..000000000000
--- a/games-strategy/warmux/files/warmux-11.04.1-gentoo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -ru warmux-11.04.orig/configure.ac warmux-11.04/configure.ac
---- warmux-11.04.orig/configure.ac	2011-04-18 16:46:12.000000000 -0400
-+++ warmux-11.04/configure.ac	2011-04-19 11:17:27.380256500 -0400
-@@ -43,8 +43,6 @@
-   AC_MSG_ERROR([*** No C++ compiler can be found!])
- fi
- 
--AX_CFLAGS_WARN_ALL([CXXFLAGS])
--
- # ==========================================================================
- # == Set flags for various environments                                    =
- # ==========================================================================
-@@ -348,14 +346,9 @@
-   exit 1
- fi
- 
--dnl === Add Werror flag for gcc/g++ if debug mode is enabled, ==============
--dnl === but allow RTTI (ie dynamic_cast, typeid/typeinfo unavailable) ======
--if test "x${debug}" = "xyes"; then
-+if test "x${debug}" != "xyes"; then
--  CFLAGS="$CFLAGS -Werror"
--  CXXFLAGS="$CXXFLAGS -Werror"
--else
-   CXXFLAGS="$CXXFLAGS -fno-rtti"
- fi
- 
- dnl === Forbid exceptions (Android platform requirement) ===================
- CXXFLAGS="$CXXFLAGS -fno-exceptions"
-diff -ru warmux-11.04.orig/data/Makefile.am warmux-11.04/data/Makefile.am
---- warmux-11.04.orig/data/Makefile.am	2011-04-18 16:46:11.000000000 -0400
-+++ warmux-11.04/data/Makefile.am	2011-04-19 11:17:45.134724536 -0400
-@@ -1,8 +1,2 @@
--xdg_appsdir = $(prefix)/share/applications
--xdg_apps_DATA = warmux.desktop warmux_files.desktop
--pixmapsdir = $(prefix)/share/pixmaps
--pixmaps_DATA = icon/warmux_128x128.png
--
- nobase_dist_pkgdata_DATA = @DATA_FILES@
- pkgdatadir = @DATADIR@
--EXTRA_DIST = $(pixmaps_DATA)
diff --git a/games-strategy/warmux/files/warmux-11.04.1-stat.patch b/games-strategy/warmux/files/warmux-11.04.1-stat.patch
deleted file mode 100644
index 487b3805ba6f..000000000000
--- a/games-strategy/warmux/files/warmux-11.04.1-stat.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ur warmux-11.04.orig/lib/warmux/tools/file_tools.cpp warmux-11.04/lib/warmux/tools/file_tools.cpp
---- warmux-11.04.orig/lib/warmux/tools/file_tools.cpp	2011-04-28 21:03:13.000000000 +0200
-+++ warmux-11.04/lib/warmux/tools/file_tools.cpp	2013-03-05 16:58:42.040443845 +0100
-@@ -33,6 +33,8 @@
- #  include <direct.h>
- #  undef DeleteFile  // windows.h defines it I think
- #else
-+#  include <sys/types.h>
-+#  include <sys/stat.h>
- #  include <stdlib.h> // getenv
- #  include <unistd.h> // not needed by mingw
- #endif
-@@ -275,18 +277,14 @@
- {
-   DIR           *dir;
-   struct dirent *file;
--#ifdef __SYMBIAN32__
-   std::string    dname;
--#endif
- };
- 
- FolderSearch* OpenFolder(const std::string& dirname)
- {
-   FolderSearch *f = new FolderSearch;
-   f->dir = opendir(dirname.c_str());
--#ifdef __SYMBIAN32__
-   f->dname = dirname;
--#endif
- 
-   if (!f->dir) {
-     delete f;
-@@ -300,11 +298,11 @@
- {
-   while ((f->file = readdir(f->dir)) != NULL) {
- 
-+    if (
- #ifdef __SYMBIAN32__
--    if (f->file->d_namlen && DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) {
--#else
--    if (f->file->d_type == DT_DIR) {
-+      f->file->d_namlen &&
- #endif
-+      DoesFolderExist(f->dname+"/"+std::string(f->file->d_name))) {
-       // If we are also looking for files, report it isn't one
-       if (file)
-         file = false;
-@@ -316,11 +314,11 @@
-       continue;
- 
-     // This is a file and we do search for file
-+    if (
- #ifdef __SYMBIAN32__
--    if (f->file->d_namlen && DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) {
--#else
--    if (f->file->d_type == DT_REG) {
-+      f->file->d_namlen &&
- #endif
-+      DoesFileExist(f->dname+"/"+std::string(f->file->d_name))) {
-       file = true;
-       return f->file->d_name;
-     }
diff --git a/games-strategy/warmux/files/warmux-11.04.1-zlib.patch b/games-strategy/warmux/files/warmux-11.04.1-zlib.patch
deleted file mode 100644
index c7e77aba11c8..000000000000
--- a/games-strategy/warmux/files/warmux-11.04.1-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
---- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
-+++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
-@@ -25,6 +25,7 @@
- #include <SDL_image.h>
- #include <SDL_rotozoom.h>
- #include <png.h>
-+#include <zlib.h>
- 
- #include "graphic/surface.h"
- #include "tool/math_tools.h"
diff --git a/games-strategy/warmux/metadata.xml b/games-strategy/warmux/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-strategy/warmux/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r1.ebuild
deleted file mode 100644
index c62645eee128..000000000000
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-DESCRIPTION="A free Worms clone"
-HOMEPAGE="http://gna.org/projects/warmux/"
-SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug nls unicode"
-
-RDEPEND="
-	dev-libs/libxml2
-	media-libs/libsdl[joystick,video,X]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-ttf
-	media-libs/sdl-net
-	media-libs/sdl-gfx
-	media-fonts/dejavu
-	net-misc/curl
-	x11-libs/libX11
-	nls? ( virtual/libintl )
-	unicode? ( dev-libs/fribidi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-11.04
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gentoo.patch
-	"${FILESDIR}"/${P}-zlib.patch
-	"${FILESDIR}"/${P}-action.patch
-	"${FILESDIR}"/${P}-gcc47.patch
-	"${FILESDIR}"/${P}-stat.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--with-localedir-name="${EPREFIX}"/usr/share/locale \
-		--with-datadir-name="${EPREFIX}"/usr/share/${PN} \
-		--with-font-path="${EPREFIX}"/usr/share/fonts/dejavu/DejaVuSans.ttf \
-		$(use_enable debug) \
-		$(use_enable nls) \
-		$(use_enable unicode fribidi)
-}
-
-src_install() {
-	default
-
-	rm -f "${ED%/}"/usr/share/${PN}/font/DejaVuSans.ttf || die
-	doicon data/icon/warmux.svg
-	make_desktop_entry warmux Warmux
-}
diff --git a/games-strategy/warzone2100-3.2.3 b/games-strategy/warzone2100-3.2.3
new file mode 100644
index 000000000000..4c2e6ef675cd
--- /dev/null
+++ b/games-strategy/warzone2100-3.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) !sdl? ( dev-qt/qtopengl:5 dev-qt/qtx11extras:5 ) sdl? ( media-libs/libsdl2[opengl,video,X] ) app-arch/zip dev-libs/fribidi media-libs/fontconfig virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=3D real-time strategy game
+EAPI=6
+HOMEPAGE=http://wz2100.net/
+IUSE=debug nls sdl videos
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ CC-BY-SA-3.0 public-domain
+RDEPEND=>=dev-games/physfs-2[zip] dev-libs/openssl:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 media-libs/freetype:2 media-libs/glew:= media-libs/harfbuzz media-libs/libogg media-libs/libpng:0 media-libs/libtheora media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXrandr nls? ( virtual/libintl ) !sdl? ( dev-qt/qtopengl:5 dev-qt/qtx11extras:5 ) sdl? ( media-libs/libsdl2[opengl,video,X] ) media-fonts/dejavu
+SLOT=0
+SRC_URI=mirror://sourceforge/warzone2100/warzone2100-3.2.3.tar.xz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz ) https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> warzone2100-3.2.3-qt_compile_fix.patch
+_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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b4c9a14ce3692eeb3b478f9c84247458
diff --git a/games-strategy/warzone2100/Manifest b/games-strategy/warzone2100/Manifest
deleted file mode 100644
index 2f2136539571..000000000000
--- a/games-strategy/warzone2100/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST warzone2100-3.2.3-qt_compile_fix.patch 680 BLAKE2B 1073ea1619640455326c63dc55bf031579c8e9cb0b1b159e4fb1f9e8aa63bfcc6985e91cb2667149e7cc4b354bf96726fc6b8f8a8f519375e0a88c4be21dcb69 SHA512 766698c25c02b4254424efdafb8aa7b37360c3c05d3cd2d6c7f9127cbdd6a25840f98e8e3aadd5d6af494b4632584e564214c1f20c0bd74eb637da305552e067
-DIST warzone2100-3.2.3.tar.xz 81314060 BLAKE2B 231be8c24d1c0967adb0a76ac9e441c2ea9f835720df9951f74227988473d100b24bccbfe4b5882a36c63a798368ed1a1f871751b6b363d90a82fea48c44ba65 SHA512 4b1bc0a0bb50a8b4726a2762a922ee233b92f9835e38bbab80c159a9cb301df7434a73ba5acfb17404031467c02a9b3480d6a0d44906d70896311b3468141746
-DIST warzone2100-videos-2.2.wz 571937134 BLAKE2B 60b70a71bd920e2d72ded5d519b17db2f3db4b0289edadeb58059a21aba7038b95219dc44cb807754461d1a9bdca60f0d7698be68622b8bd64a55efa949622d3 SHA512 ca1a1af51296afdaca137114821508c5783f077090e665eae0f6df895855f57c43f84434706309e819417f5f35d1c649bd14e96dc9fbbb1252d30a4f9a223cf6
-EBUILD warzone2100-3.2.3.ebuild 2609 BLAKE2B 05ae8aea178cb29c3776e5c0fcab5ba4442765ec76766689bc35f5cfc23c51bb7524f2dc6b12abdd07e77e87688f74fa13d8fbb705f7a76a7f3acea95b7151ea SHA512 9dcc1c4b6b095ee4ef895abf5b3a5a5d1c4d1e5c371baeced194a2592304aaf71b005a6ecdc0443d0b32f3cfb7998897f6c63d5cf909f5855f0127e91920294c
-MISC metadata.xml 674 BLAKE2B b0c40e88934cfbdbcbb7ffdbc277abcc3da3400de71f7508af51301f7ec5b6e00083ff2b59f59f7435a8e3f588291d7e5dbde19fa193b6fc78677b842cfb44ee SHA512 00aa4a109f41a0469e2b0e5daadcd33f9f3b255fdd2a724b7d116912ecb0b5fa4eb5e0dd7e4ae3e45f00c062c1034aa7d40143e48da0e66bab48da3d4e047dcc
diff --git a/games-strategy/warzone2100/metadata.xml b/games-strategy/warzone2100/metadata.xml
deleted file mode 100644
index ce7f3bcd92b0..000000000000
--- a/games-strategy/warzone2100/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<longdescription>
-	Warzone 2100 offers campaign, multi-player, and single-player
-	skirmish modes. An extensive tech tree with over 400 different
-	technologies, combined with the unit design system, allows for
-	a wide variety of possible units and tactics.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">warzone2100</remote-id>
-		<remote-id type="github">Warzone2100/warzone2100</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild b/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
deleted file mode 100644
index 5e292dc3dc77..000000000000
--- a/games-strategy/warzone2100/warzone2100-3.2.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools toolchain-funcs eutils versionator gnome2-utils
-
-MY_PV=$(get_version_component_range -2)
-VIDEOS_PV=2.2
-VIDEOS_P=${PN}-videos-${VIDEOS_PV}.wz
-DESCRIPTION="3D real-time strategy game"
-HOMEPAGE="http://wz2100.net/"
-SRC_URI="mirror://sourceforge/warzone2100/${P}.tar.xz
-	videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/${VIDEOS_PV}/high-quality-en/sequences.wz -> ${VIDEOS_P} )"
-
-SRC_URI+=" https://github.com/Warzone2100/warzone2100/commit/ef37bca38289f4f79c6533acd93ed326858a3f68.patch -> ${PN}-3.2.3-qt_compile_fix.patch"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0 public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# upstream requested debug support
-IUSE="debug nls sdl videos"
-
-# TODO: unbundle miniupnpc and quesoglc
-# quesoglc-0.7.2 is buggy: http://developer.wz2100.net/ticket/2828
-CDEPEND="
-	>=dev-games/physfs-2[zip]
-	dev-libs/openssl:0=
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/harfbuzz
-	media-libs/libogg
-	media-libs/libpng:0
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/openal
-	sys-libs/zlib
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXrandr
-	nls? ( virtual/libintl )
-	!sdl? (
-		dev-qt/qtopengl:5
-		dev-qt/qtx11extras:5
-	)
-	sdl? ( media-libs/libsdl2[opengl,video,X] )
-"
-DEPEND="
-	${CDEPEND}
-	app-arch/zip
-	dev-libs/fribidi
-	media-libs/fontconfig
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	media-fonts/dejavu
-"
-
-src_prepare() {
-	default
-
-	# https://developer.wz2100.net/ticket/4580
-	eapply "${DISTDIR}/${P}-qt_compile_fix.patch"
-
-	sed -i -e 's/#top_builddir/top_builddir/' po/Makevars || die
-	sed '/appdata\.xml/d' -i icons/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--docdir=/usr/share/doc/${PF}
-		--localedir=/usr/share/locale
-		--with-distributor="Gentoo ${PF}"
-		--with-icondir=/usr/share/icons/hicolor/128x128/apps
-		--with-applicationdir=/usr/share/applications
-		$(use_enable debug debug relaxed)
-		$(use_enable nls)
-		--with-backend=$(usex sdl "sdl" "qt")
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-	rm -f "${D}"/usr/share/doc/${PF}/COPYING*
-	if use videos ; then
-		insinto /usr/share/${PN}
-		newins "${DISTDIR}"/${VIDEOS_P} sequences.wz
-	fi
-	doman doc/warzone2100.6
-	dodoc doc/quickstartguide.pdf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-strategy/wesnoth-1.14.2 b/games-strategy/wesnoth-1.14.2
new file mode 100644
index 000000000000..6ed0861eb31d
--- /dev/null
+++ b/games-strategy/wesnoth-1.14.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=6
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IUSE=dbus dedicated doc fribidi libressl nls openmp server
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
+SLOT=0
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.2.tar.gz -> wesnoth-1.14.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9b3e44a7d6f241612dc9b74b21200f7
diff --git a/games-strategy/wesnoth-1.14.3 b/games-strategy/wesnoth-1.14.3
new file mode 100644
index 000000000000..5035d5d7559d
--- /dev/null
+++ b/games-strategy/wesnoth-1.14.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
+EAPI=6
+HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
+IUSE=dbus dedicated doc fribidi libressl nls openmp server
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0 dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
+SLOT=0
+SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.3.tar.gz -> wesnoth-1.14.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	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9b3e44a7d6f241612dc9b74b21200f7
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
deleted file mode 100644
index b4fb5a65e35e..000000000000
--- a/games-strategy/wesnoth/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX wesnothd.rc-r1 511 BLAKE2B 57e8b21313e5cb677dcdac3b046caf5b1e5f690f357373c48779afa9ea969de855e8ea4849298963891d0c2b029cc1897d97d0069b5087a1496db9061a468d7f SHA512 609c3c2eb2846735610904bcc913a0db9c8daeedde77da8911ea7e85deec805ba103519785cea1c767444c46df5985c6c630ceed550085ab5527e51ff01d65ab
-DIST wesnoth-1.14.2.tar.gz 489041516 BLAKE2B f38f3596edd97096e39ee1e87e13a3d0402d0f9f0f67f25ce1e4a28123abc62ca7b2410c8420a4091d505bf64219cdf92c1cfed562ae2f3705c37685d7c2c20e SHA512 010dcdeaf03d3855192d2480facbfce134459b71acb06515196968dd66b5e1fc40bd75eeeb8b7dd7fc30c9b43af004784d9907893c4b1d61e57436457afc30bb
-DIST wesnoth-1.14.3.tar.gz 489258637 BLAKE2B bc6c49a768d07387f8f4a285801964acd4476819075cedfd9dd2a0bbe36706e93badd78d4bd4468b687d3d34073c59e4a67dde7a578dabfd26f224233eb87413 SHA512 57c6766edce3b7984da9e6bc795913e1a582e4afac8c287b603ad2173f49d26095af903b3f10938a3b04d4f2921c3a2a5f2239c6c3a4d88222fabd9601a833aa
-EBUILD wesnoth-1.14.2.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
-EBUILD wesnoth-1.14.3.ebuild 2666 BLAKE2B 5cd566af18469c24be3771464dc25c72aa56a2f3cd5640df5f82d740c4dda2c3ec4743e3b2c25aa30fe10604d9ef58ad5c4f01417b2118329f3840f41879fa54 SHA512 0608ca01af7838cdeac1e979bd3d248e97951248b70379d566a2b7950f286c191024661045213871ad94677019ab594e5e1595b8114259c6431c0746bad87f30
-MISC metadata.xml 485 BLAKE2B f9a78a24d1cd5ddc70fb2e8c6b9b0fa081409d99523cb9a14b890b36866576afa2ab33cb11986b364ee34aac3e4ea30f0908692ba99d56f32199860c5b65e707 SHA512 ccc12cec7aa66b59d11f65d4b8b6127c86eab2e998c31587f4323020231b55c6460d0c1fad04d7298ccdb2fe1bd9abc43e3b93716a379cbbc46f60f6bcd68ef3
diff --git a/games-strategy/wesnoth/files/wesnothd.rc-r1 b/games-strategy/wesnoth/files/wesnothd.rc-r1
deleted file mode 100644
index c1a0d9d20167..000000000000
--- a/games-strategy/wesnoth/files/wesnothd.rc-r1
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use net
-}
-
-start() {
-	checkpath -q -d -m 0750 -o wesnoth:wesnoth /run/wesnothd
-	ebegin "Starting wesnothd"
-	start-stop-daemon --start --quiet -b -m \
-		--pidfile /run/wesnothd/wesnothd.pid \
-		-c wesnoth:wesnoth \
-		--exec /usr/bin/wesnothd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping wesnothd"
-	start-stop-daemon --stop --quiet --pidfile /run/wesnothd/wesnothd.pid
-	eend $?
-}
diff --git a/games-strategy/wesnoth/metadata.xml b/games-strategy/wesnoth/metadata.xml
deleted file mode 100644
index cb9b89b8b017..000000000000
--- a/games-strategy/wesnoth/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="server">Enable compilation of server</flag>
-    <flag name="fribidi">Support for right-to-left languages</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">wesnoth</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild b/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
deleted file mode 100644
index 27cde05f1ad0..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
-		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
-		done
-		echo "$langs" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_OMP="$(usex openmp)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	DOCS="README.md changelog.md players_changelog.md" cmake-utils_src_install
-	if use dedicated || use server; then
-		rmdir "${ED%/}/run/wesnothd" || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-strategy/wesnoth/wesnoth-1.14.3.ebuild b/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
deleted file mode 100644
index 27cde05f1ad0..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.3.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
-	https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
-	>=dev-libs/boost-1.50:=[nls,threads,icu]
-	>=media-libs/libsdl2-2.0.4:0[joystick,video,X]
-	!dedicated? (
-		dev-libs/glib:2
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-		>=media-libs/fontconfig-2.4.1
-		>=media-libs/sdl2-image-2.0.0[jpeg,png]
-		>=media-libs/sdl2-mixer-2.0.0[vorbis]
-		>=media-libs/sdl2-ttf-2.0.12
-		media-libs/libvorbis
-		>=x11-libs/pango-1.22.0
-		>=x11-libs/cairo-1.10.0
-		sys-libs/readline:0
-		dbus? ( sys-apps/dbus )
-		fribidi? ( dev-libs/fribidi )
-	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-libs/libX11
-"
-
-pkg_setup() {
-	if use openmp; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt || die
-	fi
-
-	# respect LINGUAS (bug #483316)
-	if [[ ${LINGUAS+set} ]] ; then
-		local langs
-		for lang in $(cat po/LINGUAS)
-		do
-			has $lang $LINGUAS && langs+="$lang "
-		done
-		echo "$langs" > po/LINGUAS || die
-	fi
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-
-	# Work around eclass
-	append-flags -UNDEBUG
-
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="ON"
-			-DENABLE_SERVER="ON"
-			-DSERVER_UID="${PN}"
-			-DSERVER_GID="${PN}"
-			-DFIFO_DIR="/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			-DENABLE_CAMPAIGN_SERVER="OFF"
-			-DENABLE_SERVER="OFF"
-			)
-	fi
-	mycmakeargs+=(
-		-Wno-dev
-		-DENABLE_GAME="$(usex !dedicated)"
-		-DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
-		-DENABLE_NLS="$(usex nls)"
-		-DENABLE_NOTIFICATIONS="$(usex dbus)"
-		-DENABLE_FRIBIDI="$(usex fribidi)"
-		-DENABLE_OMP="$(usex openmp)"
-		-DENABLE_STRICT_COMPILATION="OFF"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	DOCS="README.md changelog.md players_changelog.md" cmake-utils_src_install
-	if use dedicated || use server; then
-		rmdir "${ED%/}/run/wesnothd" || die
-		newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
-	fi
-}
diff --git a/games-strategy/widelands-0.18-r1 b/games-strategy/widelands-0.18-r1
new file mode 100644
index 000000000000..f2b01a84958d
--- /dev/null
+++ b/games-strategy/widelands-0.18-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip] sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=A game similar to Settlers 2
+EAPI=6
+HOMEPAGE=http://www.widelands.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/lua:0 >=dev-libs/boost-1.48:= media-libs/glew:0= media-libs/libpng:0= media-libs/libsdl[video] media-libs/sdl-gfx media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-net media-libs/sdl-ttf sys-libs/zlib[minizip]
+SLOT=0
+SRC_URI=https://launchpad.net/widelands/build18/build-18/+download/widelands-build18-src.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	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=256643811005a24e5261ba8b629f9c32
diff --git a/games-strategy/widelands/Manifest b/games-strategy/widelands/Manifest
deleted file mode 100644
index 412c4bbcc75b..000000000000
--- a/games-strategy/widelands/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX widelands-0.18-cxxflags.patch 1061 BLAKE2B e1cacaeebd60325cf79549f55b2968a77862cc34caac79dd86f4fae47d755730851c1f8b60c347ab69aeffcdacba39921fc5790c07cd0ed64c157f509170ea96 SHA512 ad911122384af9c07f3fc35446ed6f7e7bda86768983ee17668dbedcea2bc20eb88d4c43b051860553b6f455bc8655b226223b45b4d4f421ee5032cc380ad591
-DIST widelands-build18-src.tar.bz2 183443325 BLAKE2B 100555b7a800cac1094a768edd40e6b44d6bd0d36386c6f057e0cd81f9b03404b249f259c85d3fae655d7343bb50c41a70f228651530c13092e50190fdd2f9b8 SHA512 9b01c0a7e197360ddd7e21292fc8ba5d1102e24f3a9ec35cfbbf67413a0e9d69abeccd2bc3f6aad05b42cabff32112466803738b41f61562d843779e0c974e72
-EBUILD widelands-0.18-r1.ebuild 1570 BLAKE2B e580356d83d1698a8943428a811ba154d1582ad13b9fbb8e3004e20be18344e233e2934c03b05fc161afced21493f76e3b422238f3ac3637ba23978d2c7613a9 SHA512 2c3e11eadbe6d26e8d3f176ce2666f37c7e4d1315ecc48abc711c9e5a54de91840ab9322eef1746cc43ffde404cad3aac9f5b928dd8dd122e66d548f2f33a309
-MISC metadata.xml 330 BLAKE2B 40ce3c95a2be4fd32bc1d9cc214fb4a61435b869c5d0c6406094ddab24a1e4a7b64f28b866e4c712d1d7020a047f28a239e9b8d51092242f2a43269d13934cc4 SHA512 a56671f43b3ce3e6274b9101b7c5ea1a4b2ff261fb94366e80d2655519a07c52fa0629b762d3ca76f82693075a1c717795bff2a69122938c9749ea249dc1e75d
diff --git a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch b/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
deleted file mode 100644
index f6b65400bf82..000000000000
--- a/games-strategy/widelands/files/widelands-0.18-cxxflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru widelands-build18-src.orig/CMakeLists.txt widelands-build18-src/CMakeLists.txt
---- widelands-build18-src.orig/CMakeLists.txt	2014-02-22 04:06:51.000000000 -0500
-+++ widelands-build18-src/CMakeLists.txt	2016-03-23 23:04:50.536259815 -0400
-@@ -271,7 +271,7 @@
-   ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- ENDIF (CMAKE_COMPILER_IS_GNUCXX)
- 
--set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} ${WL_COMPILERFLAG_OPTIMIZATIONS} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-+set (CMAKE_CXX_FLAGS_RELEASE "${WL_COMPILERFLAG_CXXSTD} -DNDEBUG${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
- 
- #If building with MSVC, then check for 3rdparty libs
- if (DEFINED MSVC)
diff --git a/games-strategy/widelands/metadata.xml b/games-strategy/widelands/metadata.xml
deleted file mode 100644
index 8910ce0417b5..000000000000
--- a/games-strategy/widelands/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">widelands</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
deleted file mode 100644
index adee0947e0bc..000000000000
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils versionator cmake-utils
-
-MY_PV=build$(get_version_component_range 2)
-MY_P=${PN}-${MY_PV}-src
-
-DESCRIPTION="A game similar to Settlers 2"
-HOMEPAGE="http://www.widelands.org/"
-SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/lua:0
-	>=dev-libs/boost-1.48:=
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	media-libs/libsdl[video]
-	media-libs/sdl-gfx
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[vorbis]
-	media-libs/sdl-net
-	media-libs/sdl-ttf
-	sys-libs/zlib[minizip]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cxxflags.patch
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
-	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWL_VERSION_STANDARD=true
-
-		# Game is NOT happy being moved from /usr/share/games
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
-
-		-DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
-		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
-		-DWL_INSTALL_LOCALEDIR="${EPREFIX}"/usr/share/games/${PN}/locale
-		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^}
-}
diff --git a/games-strategy/xbattleai-1.2.2-r2 b/games-strategy/xbattleai-1.2.2-r2
new file mode 100644
index 000000000000..126c72ecba74
--- /dev/null
+++ b/games-strategy/xbattleai-1.2.2-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext !games-strategy/xbattle app-text/rman x11-misc/imake x11-base/xorg-proto
+DESCRIPTION=A multi-player game of strategy and coordination
+EAPI=6
+HOMEPAGE=https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/
+KEYWORDS=~amd64 ~x86
+LICENSE=xbattle
+RDEPEND=dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXext !games-strategy/xbattle
+SLOT=0
+SRC_URI=https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/xbattleai-1.2.2.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=eeb33682008afa8a840736614266eddf
diff --git a/games-strategy/xbattleai/Manifest b/games-strategy/xbattleai/Manifest
deleted file mode 100644
index 3ced68c2c9b2..000000000000
--- a/games-strategy/xbattleai/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX xbattleai-1.2.2-sandbox.patch 4167 BLAKE2B e6336e72f4c466475e164e997bcef44d4c5fd96f457d08f2d1326761fade15e911ab048f05e63e4cadfdd955a90adce763c9b1facace8c33145e49b61482ad54 SHA512 013bd282c53f9a99b530b5a75907f7cc7b6829a0b20b7f77668325e1e12f2d8257019f68d1ccd147ac69d14d217412a31a3dcb3feaf2b55c39ae80545f956076
-DIST xbattleai-1.2.2.tgz 1511991 BLAKE2B f4372d9521ba878b53132a00392b3254d90642e0993920b44235eeb6ef1d874a32c7583983aecabf96ad245795820bb42c59a07c850db655ef7803f9216b61ed SHA512 41ac0f558b3adc697897903f5c9ed0d411867c405f0452282958083db7637c97a19f0ac9727e5123648a12dd2dcc5a304031efaab6089068b9f542e5db185e18
-EBUILD xbattleai-1.2.2-r2.ebuild 989 BLAKE2B 483226fc6c987f27424b9b211049cde75bc2097bd65b56d7cdba96cbad66ea881bafda0c633b87ea7dd1e230efdab8735bbe68b6e9e489b39e0a78ded1389f75 SHA512 60ecbc9efe6394b2527d4d7dda9ea767fd8818e51a5942f5e2661b00997ef78d2a46b7bc75b38f7d3f9061f448603ccded22e35e430862c1d4fc9cb3369d30a7
-MISC metadata.xml 1356 BLAKE2B 13ecdee27af4359fa0052f3db53c55243a92de5fb9419272f8f97cb576ebbb8bdc04734bb10b72088e6ba31ea6ec9d32c129fb6704f037d30bd41f2a0b81db96 SHA512 fca551005a6b3e52d30e6a53b82e8d961debba3654a4e4f99e8cd23818a15bf4adfbcc1ffbd19cbe892c0118e5b24a5e83846ab7d72f8613c2e02cd58327cf7f
diff --git a/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch b/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
deleted file mode 100644
index 56d63ac694e4..000000000000
--- a/games-strategy/xbattleai/files/xbattleai-1.2.2-sandbox.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -200,87 +200,87 @@
- .PHONY: install-bin
- 
- install-bin: ${TARGET} ${SCRIPTS}
--	${INSTALL_DIRS} ${bindir}
-+	${INSTALL_DIRS} ${DESTDIR}/${bindir}
- 	@list='${TARGET} ${SCRIPTS}'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_PROGRAM} $$p ${bindir}"; \
--	    ${INSTALL_PROGRAM} $$p ${bindir}; \
-+	    ${INSTALL_PROGRAM} $$p ${DESTDIR}/${bindir}; \
- 	  else :; fi; \
- 	done
- 
- .PHONY: install-man
- 
- install-man:
--	${INSTALL_DIRS} ${mandir}
-+	${INSTALL_DIRS} ${DESTDIR}/${mandir}
- 	@list='${MAN1}'; for p in $$list; do \
- 	  ${INSTALL_DIRS} ${mandir}/man1; \
- 	  if test -f ${SRC_DIR}/$${p}.man; then \
- 	    ${ECHO} "${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man1/$${p}.1"; \
--	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man1/$${p}.1; \
-+	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${DESTDIR}/${mandir}/man1/$${p}.1; \
- 	  else :; fi; \
- 	done
- 	@list='${MAN6}'; for p in $$list; do \
--	  ${INSTALL_DIRS} ${mandir}/man6; \
-+	  ${INSTALL_DIRS} ${DESTDIR}/${mandir}/man6; \
- 	  if test -f ${SRC_DIR}/$${p}.man; then \
- 	    ${ECHO} "${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man6/$${p}.6"; \
--	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${mandir}/man6/$${p}.6; \
-+	    ${INSTALL_DATA} ${SRC_DIR}/$${p}.man ${DESTDIR}/${mandir}/man6/$${p}.6; \
- 	  else :; fi; \
- 	done
- 
- .PHONY: install-share
- 
- install-share:
--	${INSTALL_DIRS} ${XBO_DIR}
-+	${INSTALL_DIRS} ${DESTDIR}/${XBO_DIR}
- 	@list='${SRC_DIR}/xbos/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${XBO_DIR}"; \
--	    ${INSTALL_DATA} $$p ${XBO_DIR}; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBO_DIR}; \
- 	  else :; fi; \
- 	done
--	${INSTALL_DIRS} ${XBT_DIR}
-+	${INSTALL_DIRS} ${DESTDIR}/${XBT_DIR}
- 	@list='${SRC_DIR}/xbts/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${XBT_DIR}"; \
--	    ${INSTALL_DATA} $$p ${XBT_DIR}; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBT_DIR}; \
- 	  else :; fi; \
- 	done
--	${INSTALL_DIRS} ${XBA_DIR}
-+	${INSTALL_DIRS} ${DESTDIR}/${XBA_DIR}
- 	@list='${SRC_DIR}/xbas/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${XBA_DIR}"; \
--	    ${INSTALL_DATA} $$p ${XBA_DIR}; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBA_DIR}; \
- 	  else :; fi; \
- 	done
--	${INSTALL_DIRS} ${IMG_DIR}
-+	${INSTALL_DIRS} ${DESTDIR}/${IMG_DIR}
- 	@list='${SRC_DIR}/images/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${IMG_DIR}"; \
--	    ${INSTALL_DATA} $$p ${IMG_DIR}; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${IMG_DIR}; \
- 	  else :; fi; \
- 	done
--	${INSTALL_DIRS} ${SND_DIR}
-+	${INSTALL_DIRS} ${DESTDIR}/${SND_DIR}
- 	@list='${SRC_DIR}/snd/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${SND_DIR}"; \
--	    ${INSTALL_DATA} $$p ${SND_DIR}; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${SND_DIR}; \
- 	  else :; fi; \
- 	done
--	${INSTALL_DIRS} ${XBC_DIR}
-+	${INSTALL_DIRS} ${DESTDIR}/${XBC_DIR}
- 	@list='${SRC_DIR}/xbcs/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${XBC_DIR}"; \
--	    ${INSTALL_DATA} $$p ${XBC_DIR}; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${XBC_DIR}; \
- 	  else :; fi; \
- 	done
--	${INSTALL_DIRS} ${GC_DIR}
--	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.dat ${GC_DIR};
--	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.xbo ${GC_DIR};
--	${INSTALL_PROGRAM} ${SRC_DIR}/gauntlet/gauntlet_interp.awk ${GC_DIR};
--	${INSTALL_DIRS} ${GC_DIR}/gauntlet_levels
-+	${INSTALL_DIRS} ${DESTDIR}/${GC_DIR}
-+	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.dat ${DESTDIR}/${GC_DIR};
-+	${INSTALL_DATA} ${SRC_DIR}/gauntlet/gauntlet.xbo ${DESTDIR}/${GC_DIR};
-+	${INSTALL_PROGRAM} ${SRC_DIR}/gauntlet/gauntlet_interp.awk ${DESTDIR}/${GC_DIR};
-+	${INSTALL_DIRS} ${DESTDIR}/${GC_DIR}/gauntlet_levels
- 	@list='${SRC_DIR}/gauntlet/gauntlet_levels/*'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    ${ECHO} "${INSTALL_DATA} $$p ${GC_DIR}/gauntlet_levels"; \
--	    ${INSTALL_DATA} $$p ${GC_DIR}/gauntlet_levels; \
-+	    ${INSTALL_DATA} $$p ${DESTDIR}/${GC_DIR}/gauntlet_levels; \
- 	  else :; fi; \
- 	done
- 
diff --git a/games-strategy/xbattleai/metadata.xml b/games-strategy/xbattleai/metadata.xml
deleted file mode 100644
index d5cbe36e0094..000000000000
--- a/games-strategy/xbattleai/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-<email>games@gentoo.org</email>
-<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription>
-From the HOMEPAGE:
-XBattle is a concurrent multi-player arcade/strategy game that captures
-the dynamics of a wide range of military situations through numerous
-options. The game board is a matrix of game cells which can be occupied
-by troops of various colors, with troop strength indicated by the size of
-colored markers within a cell. Troops are commanded by clicking the mouse
-near the edge of an occupied cell in the direction that movement is to take
-place. XBattle is concurrent, so that commands are given continuously by
-all players without waiting for turns. A command will be acknowledged by
-the appearance of a command vector, and thereafter, in each update cycle,
-a certain proportion of the troops will move from the source cell to the
-destination cell. In this way, troops can be slowly redistributed via
-supply lines which steadily deliver troops to their endpoints. Troops
-of different colors engage in battle whenever they come to occupy the
-same cell. A wide variety of options are available for configuring troop
-movement, distribution, and production.
-</longdescription>
-</pkgmetadata>
diff --git a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild b/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
deleted file mode 100644
index e7b53bcc541e..000000000000
--- a/games-strategy/xbattleai/xbattleai-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="A multi-player game of strategy and coordination"
-HOMEPAGE="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/"
-SRC_URI="https://inf.ug.edu.pl/~piotao/xbattle/mirror/www.lysator.liu.se/XBattleAI/${P}.tgz"
-
-LICENSE="xbattle"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Since this uses similar code and the same binary name as the original XBattle,
-# we want to make sure you can't install both at the same time
-RDEPEND="
-	dev-lang/tcl:0
-	dev-lang/tk:0
-	x11-libs/libX11
-	x11-libs/libXext
-	!games-strategy/xbattle"
-DEPEND="${RDEPEND}
-	app-text/rman
-	x11-misc/imake
-	x11-base/xorg-proto"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-sandbox.patch
-)
-
-src_prepare() {
-	default
-	rm -f xbcs/foo.xbc~ || die
-}
-
-src_install() {
-	DOCS="CONTRIBUTORS README README.AI TODO xbattle.dot" \
-		default
-	mv "${D}/usr/bin/"{,xb_}gauntletCampaign || die
-}
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index ec51ee7413e7..62712b9e7f98 100644
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
diff --git a/games-util/antimicro-2.20.2 b/games-util/antimicro-2.20.2
new file mode 100644
index 000000000000..8013d11498ce
--- /dev/null
+++ b/games-util/antimicro-2.20.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 media-libs/libsdl2[X,joystick] x11-libs/libX11 x11-libs/libXtst dev-qt/linguist-tools:5 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Map keyboard and mouse buttons to gamepad buttons
+EAPI=5
+HOMEPAGE=https://github.com/Ryochan7/antimicro
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 media-libs/libsdl2[X,joystick] x11-libs/libX11 x11-libs/libXtst
+SLOT=0
+SRC_URI=https://github.com/Ryochan7/antimicro/archive/2.20.2.tar.gz -> antimicro-2.20.2.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=80be9fb8a713a571a3134300abaf1014
diff --git a/games-util/antimicro/Manifest b/games-util/antimicro/Manifest
deleted file mode 100644
index 8bbd4e2c0a7a..000000000000
--- a/games-util/antimicro/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST antimicro-2.20.2.tar.gz 1069469 BLAKE2B 8507c4f46e3e016c54d6cc0081ad5e90a0473bd1b99c30e6ceb74804564fdde6cd4bcb4897be5ae06272ae0aa55f36976d91ee9b1d531fce2013dad81379c1bb SHA512 09847c804b6a1d022f2990d269c9124cfdfab821e0fd1cb1ab5e27e4c6a3bd250fab5977ca614f03c46456ca6e1c7111135b9b4d8f75e54c435e0b712653e282
-EBUILD antimicro-2.20.2.ebuild 707 BLAKE2B 9ed42f69bc1865cae0e080bcf4a5a319c55ed23ff1798b992670ac27f3e64e560f8472fd2502852af8f42801f5f1d03a71ccfe4fd6133b010a32b1481994e6fd SHA512 18e36314e3be0461d4b3c3b729953df70f354e4ee8c92054fbed1b57768dd42e03e7c1000403e02358c157cc8bc36ad3c5461db62880bcaba95d443751f9f7e9
-MISC metadata.xml 336 BLAKE2B 356b2f4e6c4e30467d1d84264432d49a2bc60d6dcfdde3f7e019c8191b91d2f105016832990d188cfa0451509c88b543a7f5f0b99a843295dd92d1d838268ce8 SHA512 6df67abd609cd6d4e29875695481bca8857c6a1d1c8f4803c40d584cacd47a46ed3f9fdaa6a7369950a795ce07cc61ad47fa096ea35a463a6594916ae52a4968
diff --git a/games-util/antimicro/antimicro-2.20.2.ebuild b/games-util/antimicro/antimicro-2.20.2.ebuild
deleted file mode 100644
index c720d534fcee..000000000000
--- a/games-util/antimicro/antimicro-2.20.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils cmake-utils
-
-DESCRIPTION="Map keyboard and mouse buttons to gamepad buttons"
-HOMEPAGE="https://github.com/Ryochan7/antimicro"
-SRC_URI="https://github.com/Ryochan7/antimicro/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	media-libs/libsdl2[X,joystick]
-	x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SDL_2=ON
-	)
-
-	QT_SELECT=5 cmake-utils_src_configure
-}
diff --git a/games-util/antimicro/metadata.xml b/games-util/antimicro/metadata.xml
deleted file mode 100644
index 68a912826f90..000000000000
--- a/games-util/antimicro/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Ryochan7/antimicro</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/atlas-0.5.1_beta_pre20160907 b/games-util/atlas-0.5.1_beta_pre20160907
new file mode 100644
index 000000000000..0465c000f5bd
--- /dev/null
+++ b/games-util/atlas-0.5.1_beta_pre20160907
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst prepare
+DEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=dev-games/simgear-3.0.0 media-libs/plib >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Chart Program to use with Flightgear Flight Simulator
+EAPI=6
+HOMEPAGE=http://atlas.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/freeglut media-libs/glew:0= media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl >=games-simulation/flightgear-3.0.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~reavertm/atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b31d708d941ba0bac26d9b1d766e8157
diff --git a/games-util/atlas/Manifest b/games-util/atlas/Manifest
deleted file mode 100644
index fa8e46e4cffb..000000000000
--- a/games-util/atlas/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX atlas-0.5.1_beta_pre20160907-jpeg-9.patch 746 BLAKE2B 686bf154fd43d68f42c97d65ce0c0207cf65a206e9f931f0b5280149768d07a589248209e8286e9b80387c1af6e9d0a8d86d0f2213d640c828daba0ed58243d1 SHA512 0291dd266d23f6a5963a5095dac79cd001e16449fbbb5f5b3113253f3d252932be915f7afc0e4efa52f0e65f9117c446dabe9850ca9d8550219657916c3efd7a
-AUX atlas-0.5.1_beta_pre20160907-simgear-compilation.patch 8125 BLAKE2B f5b0b2e27e191ff32a6006b4d2d4f200d4a1a6f387adace607a9e421cf16c55a15d2182691d3bbb5994de9870176da80b520d8de70d2532a11b9febb9a10245a SHA512 871e576cb95565b658379d76c285067c820f591f97bd1826a11f396742651aa7e783f85b9278039ab4bd2c8e6f9f0268323185a8219408c8f01fa67db65f856f
-DIST atlas-hgcode-e183e3b3a0412b504edcb3664445b3e04fd484a2.zip 530005 BLAKE2B 3069f743ee83a1892283eebe27698c6360a90f67a05999f3f5cab8b786d976a4cd15151cbe8c7c1165b43cfb9e3265868a5b55b9364a82c5f78b1fe5f69dffcc SHA512 5f4453c81b01451ce69f4f1340a7c34736be3a9ecf638aa340455d0bb0af7a5d1a7e05d0b51e8b75f5c3acef4787d208ace75d4c686e8be7eafb8f81c71df360
-EBUILD atlas-0.5.1_beta_pre20160907.ebuild 1428 BLAKE2B 69a8ba0ea8f52eed8ec772f6c9b814cf1723d130a7c379bd52a651a9acce94214219fb85b2fd6ae455023034adc220bcd9af545744e34dd6c8d1232df6815083 SHA512 b9b3d336c011fdade103dbdf978a74bd9b280750bd51d5b24aa377c00f60bc6f06277497d8f91a9615d87b63e5fb9c3a03867bb4981170fe1ade0e5c5d626fd1
-MISC metadata.xml 440 BLAKE2B b07c76b0e7d3866e8a6f6e7ef2d73ea39a29e81c57cab9e77945124bf3817182434b504e9ec5022c40a764ce8d63e034b59eb92829e982c28db4d849f006d912 SHA512 761058431181d1ca1367ef68e464e7ee1a19a69576b46768a652be280ce7d161bcdf8f5d8b993a7d8a7ababe4a8e436f11ff3ee4ad1661b50e8a8c6edbf62158
diff --git a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild b/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
deleted file mode 100644
index 4fed6a08e4a1..000000000000
--- a/games-util/atlas/atlas-0.5.1_beta_pre20160907.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_PN=atlas-hgcode
-MY_PV=e183e3b3a0412b504edcb3664445b3e04fd484a2
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Chart Program to use with Flightgear Flight Simulator"
-HOMEPAGE="http://atlas.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	media-libs/freeglut
-	media-libs/glew:0=
-	media-libs/libpng:0=
-	net-misc/curl
-	sys-libs/zlib
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-games/simgear-3.0.0
-	media-libs/plib
-"
-RDEPEND="${COMMON_DEPEND}
-	>=games-simulation/flightgear-3.0.0
-"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${P}-simgear-compilation.patch"
-	"${FILESDIR}/${P}-jpeg-9.patch"
-)
-
-src_prepare() {
-	default
-
-	# -Wnarrowing failure, #612986
-	sed -i -e 's:0x:(char)0x:g' src/tiles.h || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--datadir="${EPREFIX}"/usr/share/flightgear \
-		--enable-simgear-shared \
-		--with-fgbase="${EPREFIX}"/usr/share/flightgear
-}
-
-pkg_postinst() {
-	elog "To run Atlas concurrently with FlightGear use the following:"
-	elog "Atlas --path=[path of map images] --udp=[port number]"
-	elog "and start fgfs with the following switch (or in .fgfsrc):"
-	elog "--nmea=socket,out,0.5,[host that you run Atlas on],[port number],udp"
-}
diff --git a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch
deleted file mode 100644
index 639ff8217546..000000000000
--- a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-jpeg-9.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Fix build with jpeg-9. Bug # 520908
-
---- a/src/Image.cxx	2018-02-07 03:19:18.538699623 +0100
-+++ b/src/Image.cxx	2018-02-07 03:20:15.105160934 +0100
-@@ -29,11 +29,12 @@
- 
- // Other libraries' include files
- #include <png.h>
--#include <jpeglib.h>
- 
- // Our project's include files
- #include "misc.hxx"
- 
-+#include <jpeglib.h>
-+
- // This is a constant representing "Not an Elevation" - it is
- // guaranteed to be less than any possible real elevation value.
- static const float NanE = -std::numeric_limits<float>::max();
-@@ -266,7 +267,7 @@
-     cinfo.in_color_space = JCS_RGB;
- 
-     jpeg_set_defaults(&cinfo);
--    jpeg_set_quality(&cinfo, quality, true);
-+    jpeg_set_quality(&cinfo, quality, TRUE);
- 
-     jpeg_start_compress(&cinfo, TRUE);
- 
diff --git a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch b/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch
deleted file mode 100644
index f6e4d58bf3b2..000000000000
--- a/games-util/atlas/files/atlas-0.5.1_beta_pre20160907-simgear-compilation.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-diff -r e183e3b3a041 configure.ac
---- a/configure.ac	Tue Sep 06 22:12:05 2016 -0700
-+++ b/configure.ac	Sat Mar 18 05:09:04 2017 +0100
-@@ -10,6 +10,8 @@
- AC_PREREQ(2.52)
- AM_INIT_AUTOMAKE
- 
-+CXXFLAGS="-std=c++11"
-+
- dnl Checks for programs.
- AC_PROG_MAKE_SET
- AC_PROG_CC
-diff -r e183e3b3a041 src/FlightTrack.cxx
---- a/src/FlightTrack.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/FlightTrack.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -81,7 +81,7 @@
- 	throw runtime_error("flight file open failure");
-     }
- 
--    _file.set(filePath);
-+    _file = SGPath(filePath);
- 
-     _port = -1;
-     _device = "";
-@@ -101,7 +101,7 @@
-     _input_channel = new SGSocket("", portStr.str(), "udp");
-     _input_channel->open(SG_IO_IN);
- 
--    _file.set("");
-+    _file = SGPath();
- 
-     _port = port;
-     _device = "";
-@@ -123,7 +123,7 @@
-     _input_channel = new SGSerial(device, baudStr.str());
-     _input_channel->open(SG_IO_IN);
- 
--    _file.set("");
-+    _file = SGPath();
- 
-     _port = -1;
-     _device = device;
-@@ -399,11 +399,11 @@
-     return _name.str();
- }
- 
--void FlightTrack::setFilePath(char *path)
-+void FlightTrack::setFilePath(const char *path)
- {
-     // EYE - check for existing name?  overwriting?
-     // EYE - call this (and other accessors) from constructors?
--    _file.set(path);
-+    _file = SGPath(path);
-     // We count this as a change.
-     _version++;
-     _versionAtLastSave = 0;
-diff -r e183e3b3a041 src/FlightTrack.hxx
---- a/src/FlightTrack.hxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/FlightTrack.hxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -141,7 +141,7 @@
-     const char *fileName();	// File name
-     const char *filePath();	// Full path, including file
-     const char *niceName();	// Nicely formatted name
--    void setFilePath(char *path);
-+    void setFilePath(const char *path);
-     void save();
-     bool modified();
- 
-diff -r e183e3b3a041 src/Geographics.cxx
---- a/src/Geographics.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/Geographics.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -25,6 +25,7 @@
- #include "Geographics.hxx"
- 
- // C++ system files
-+#include <cmath>
- #include <stdexcept>
- 
- // Our project's include files
-@@ -431,11 +432,11 @@
- bool AtlasCoord::_geodValid() const
- {
-     // Note: this has to agree with the value set in invalidate()!
--    return !isnan(_geod.getLatitudeDeg());
-+    return !std::isnan(_geod.getLatitudeDeg());
- }
- 
- bool AtlasCoord::_cartValid() const
- {
-     // Note: this has to agree with the value set in invalidate()!
--    return !isnan(_cart.x());
-+    return !std::isnan(_cart.x());
- }
-diff -r e183e3b3a041 src/Map.cxx
---- a/src/Map.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/Map.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -168,13 +168,13 @@
- bool parse_arg(char* arg) 
- {
-     if (strncmp(arg, "--fg-root=", 10) == 0) {
--	fg_root.set(arg + 10);
-+	fg_root = SGPath(arg + 10);
-     } else if (strncmp(arg, "--fg-scenery=", 13) == 0) {
--	scenery.set(arg + 13);
-+	scenery = SGPath(arg + 13);
-     } else if (strncmp(arg, "--atlas=", 8) == 0) {
--	atlas.set(arg + 8);
-+	atlas = SGPath(arg + 8);
-     } else if (strncmp(arg, "--palette=", 10) == 0) {
--	palette.set(arg + 10);
-+	palette = SGPath(arg + 10);
-     } else if (strcmp(arg, "--png") == 0) {
- 	imageType = TileMapper::PNG;
-     } else if (strcmp(arg, "--jpeg") == 0) {
-@@ -272,23 +272,14 @@
-     // Read the FG_ROOT and FG_SCENERY environment variables before
-     // processing .atlasmaprc and command args, so that we can
-     // override them if necessary.
--    char *env = getenv("FG_ROOT");
--    if (env == NULL) {
--	// EYE - is it possible for this to not be defined?
--	fg_root.set(FGBASE_DIR);
--    } else {
--	fg_root.set(env);
--    }
- 
--    env = getenv("FG_SCENERY");
--    if (env == NULL) {
--	fg_scenery.set(fg_root.str() + "/Scenery");
--    } else {
--	fg_scenery.set(env);
--    }
-+    // EYE - is it possible for this to not be defined?
-+    fg_root = SGPath::fromEnv("FG_ROOT", SGPath(FGBASE_DIR));
-+
-+    fg_scenery = SGPath::fromEnv("FG_SCENERY", fg_root.str() + "/Scenery");
- 
-     // Set a default palette.
--    palette.set("default.ap");
-+    palette = SGPath("default.ap");
- 
-     // Process ~/.atlasmaprc.
-     char* homedir = getenv("HOME");
-@@ -332,10 +323,10 @@
- 	// 'scenery'.  We're done.
-     } else if (!fg_scenery.str().empty()) {
- 	// From FG_SCENERY
--	scenery.set(fg_scenery.str());
-+	scenery = SGPath(fg_scenery.str());
-     } else if (!fg_root.str().empty()) {
- 	// Default: $FG_ROOT/Scenery
--	scenery.set(fg_root.str());
-+	scenery = SGPath(fg_root.str());
- 	scenery.append("Scenery");
-     } else {
- 	fprintf(stderr, "%s: No scenery directory specified.", appName);
-@@ -356,7 +347,7 @@
-     } else if (!fg_root.str().empty()) {
- 	// EYE - make default $HOME/Atlas?
- 	// Default: $FG_ROOT/Atlas
--	atlas.set(fg_root.str());
-+	atlas = SGPath(fg_root.str());
- 	atlas.append("Atlas");
-     } else {
- 	fprintf(stderr, "%s: No map directory specified.", appName);
-@@ -394,11 +385,11 @@
-     SGPath palettePath;
-     palettePath.append(palette.str());
-     if ((atlasPalette = loadPalette(palettePath.c_str())) == NULL) {
--	palettePath.set(atlas.str());
-+	palettePath = SGPath(atlas.str());
- 	palettePath.append("Palettes");
- 	palettePath.append(palette.str());
- 	if ((atlasPalette = loadPalette(palettePath.c_str())) == NULL) {
--	    palettePath.set(fg_root.str());
-+	    palettePath = SGPath(fg_root.str());
- 	    palettePath.append("Atlas");
- 	    palettePath.append("Palettes");
- 	    palettePath.append(palette.str());
-diff -r e183e3b3a041 src/Preferences.cxx
---- a/src/Preferences.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/Preferences.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -317,7 +317,7 @@
- {
-     string buf;
-     is >> buf;
--    p.set(buf);
-+    p = SGPath(buf);
- 
-     return is;
- }
-@@ -638,7 +638,7 @@
-     // EYE - just get()?
-     SGPath p(fg_root.get(Pref::FACTORY));
-     if (p.isNull()) {
--	p.set(FGBASE_DIR);
-+	p = SGPath(FGBASE_DIR);
-     }
-     p.append("Atlas");
-     path.set(p, Pref::FACTORY);
-@@ -770,10 +770,10 @@
-     char* homedir = getenv("HOME");
-     SGPath rcpath;
-     if (homedir != NULL) {
--	rcpath.set(homedir);
-+	rcpath = SGPath(homedir);
- 	rcpath.append(atlasrc);
-     } else {
--	rcpath.set(atlasrc);
-+	rcpath = SGPath(atlasrc);
-     }
- 
-     ifstream rc(rcpath.c_str());
-@@ -946,7 +946,7 @@
-     }
-     SGPath p;
-     while (optind < argc) {
--	p.set(argv[optind++]);
-+	p = SGPath(argv[optind++]);
- 	flightFiles.push_back(p);
-     }
- 
-diff -r e183e3b3a041 src/Scenery.cxx
---- a/src/Scenery.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/Scenery.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -198,7 +198,7 @@
- 	data = (GLubyte *)loadJPEG(f.c_str(), &width, &height, &depth, 
- 				   maximumElevation);
- 	if (!data) {
--	    f.set(f.base());
-+	    f = SGPath(f.base());
- 	    f.concat(".png");
- 	    data = (GLubyte *)loadPNG(f.c_str(), &width, &height, &depth,
- 				      maximumElevation);
-diff -r e183e3b3a041 src/Subbucket.cxx
---- a/src/Subbucket.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/Subbucket.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -346,10 +346,10 @@
-     // http://wiki.flightgear.org/index.php/BTG_File_Format
- 
-     SGBinObject btg;
--    if (!btg.read_bin(_path.c_str())) {
--	// EYE - throw an error?
--	// EYE - will the cache continue to call load() then?
--	return false;
-+    if (!btg.read_bin(SGPath(_path))) {
-+        // EYE - throw an error?
-+        // EYE - will the cache continue to call load() then?
-+        return false;
-     }
- 
-     //////////////////////////////////////////////////////////////////////
-diff -r e183e3b3a041 src/Tiles.cxx
---- a/src/Tiles.cxx	Tue Sep 06 22:12:05 2016 -0700
-+++ b/src/Tiles.cxx	Sat Mar 18 05:09:04 2017 +0100
-@@ -464,7 +464,7 @@
- const SGPath& TileManager::mapPath(unsigned int level)
- {
-     static SGPath result;
--    result.set(_maps.str());
-+    result = SGPath(_maps.str());
- 
-     char str[3];
-     snprintf(str, 3, "%d", level);
-@@ -821,7 +821,7 @@
- const SGPath& Tile::sceneryDir()
- {
-     if (_sceneryIndex == TileManager::NaPI) {
--	__sceneryPath = "";
-+	__sceneryPath = SGPath();
-     } else {
- 	__sceneryPath = _tm->sceneryPaths()[_sceneryIndex];
- 	__sceneryPath.append(chunk()->name());
diff --git a/games-util/atlas/metadata.xml b/games-util/atlas/metadata.xml
deleted file mode 100644
index 2b6588a24cac..000000000000
--- a/games-util/atlas/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>reavertm@gentoo.org</email>
-		<name>Maciej Mrozowski</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">atlas</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/biounzip-1.1a b/games-util/biounzip-1.1a
new file mode 100644
index 000000000000..f444e760d5ba
--- /dev/null
+++ b/games-util/biounzip-1.1a
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib
+DESCRIPTION=Unpacks BioZip archives
+EAPI=5
+HOMEPAGE=http://biounzip.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://sourceforge/biounzip/biounzip-1.1a.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6999aacc40642f87d0833e0ec65b8274
diff --git a/games-util/biounzip/Manifest b/games-util/biounzip/Manifest
deleted file mode 100644
index c5868f86b8e5..000000000000
--- a/games-util/biounzip/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX biounzip-1.1a-64bit.patch 462 BLAKE2B 2c762b12ad665f48657419534307319d27efbc91929bd0795ea738f5f8214cc1b2ba3df6c00e8bd8f5eee9db9ada6bd14dd71165e6eb1666d90bb766ad80f901 SHA512 751078079fb663f7f229ccfbbb8e8ea2f779f6739144a75415d73937559ef08886156c8a9ae6e354269b4e0363b34b06bd2979400d671c6c4f7c646abc2b5328
-DIST biounzip-1.1a.tar.bz2 9894 BLAKE2B 950216a1b0b994b2ec271d836c7cf86471a2eca5ac0c259885e21a4df7b20425b74ae2ffb08610ed0841caced5d8b6783c448857df3a2a9030c788ee9b88db3b SHA512 4eaea5459cf6edaf289951f9048123496a4eb83fcfc39b3efcd2a81894f877d5db843d7448e2c0e3b797b09a70f6f3c133c53525d4f83408306089bd37796a8c
-EBUILD biounzip-1.1a.ebuild 588 BLAKE2B 1f1790eda791a50f937995da2854e80c8d4838146b963152b9df016e444b406b07fe9a89eae56031aa25302ecbc9ce507a51c60774e177438f85438f1dccd8fc SHA512 19df79ea2fdaf16e6b27016fc1624c0a83739165c7770ef34a64d8b5a20ffc45d0f3d581d9f9c3df293e7179f06750733474fe52b87a887f2eed2bc4ba70dd95
-MISC metadata.xml 331 BLAKE2B 0a7243a32e0bc9b5e20d89b4b62c0199413de7c1f0c11dab9b32d925ac1dce7f65e7b74ca0d7ba78fa02a0faaf5e651fe9e6319a240189a7f934bbad8e700118 SHA512 2cb5bc86ab42d6bacdf6a1991c9c54cb3c313dd3a7dd8a2aee4d25ab899dd20d88c5db6a340e2c56e21dc1725fc6b24c55ba212e23ec2ca03230e9a6ac023b53
diff --git a/games-util/biounzip/biounzip-1.1a.ebuild b/games-util/biounzip/biounzip-1.1a.ebuild
deleted file mode 100644
index 8864926d8034..000000000000
--- a/games-util/biounzip/biounzip-1.1a.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Unpacks BioZip archives"
-HOMEPAGE="http://biounzip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/biounzip/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P/a/}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-64bit.patch
-}
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} *.c -lz || die
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc biozip.txt
-}
diff --git a/games-util/biounzip/files/biounzip-1.1a-64bit.patch b/games-util/biounzip/files/biounzip-1.1a-64bit.patch
deleted file mode 100644
index a8522189d31f..000000000000
--- a/games-util/biounzip/files/biounzip-1.1a-64bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- biounzip-1.1-old/biounzip.c	2007-03-08 02:06:16.000000000 +0200
-+++ biounzip-1.1/biounzip.c	2007-03-08 02:06:50.000000000 +0200
-@@ -127,7 +127,7 @@
- void writefile(bzfile *ptr, FILE *fp, char *destdir)
- {
-   int startpos,returnval,n,debug=0;
--  unsigned long size_uncompressed,size_compressed;
-+  unsigned long size_uncompressed = 0, size_compressed = 0;
-   char *fname,*dirname,*fullname,*fullpath;
-   unsigned char *srcbuffer,*dstbuffer;
-   FILE *outfile;
diff --git a/games-util/biounzip/metadata.xml b/games-util/biounzip/metadata.xml
deleted file mode 100644
index 0fb77f58b247..000000000000
--- a/games-util/biounzip/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">biounzip</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/catcodec-1.0.5 b/games-util/catcodec-1.0.5
new file mode 100644
index 000000000000..5936270e8c7e
--- /dev/null
+++ b/games-util/catcodec-1.0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Decodes and encodes sample catalogues for OpenTTD
+EAPI=6
+HOMEPAGE=http://www.openttd.org/en/download-catcodec
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-1.0.5-source.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8e78a023dafea79bf33dc9d2616d140f
diff --git a/games-util/catcodec/Manifest b/games-util/catcodec/Manifest
deleted file mode 100644
index 49fcb562ffff..000000000000
--- a/games-util/catcodec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST catcodec-1.0.5-source.tar.xz 17952 BLAKE2B e828e52426b26c0021365bb961d16028a52a8c8cedac06db6b825947562e6eb513d0c9f7b455710f05dc20b88a86b0cdab3123ede38c2f785709c1b76964e1b4 SHA512 e6e17da17f2449ff5d3a18c34ba3125d475a481ef1dc73ba03dac32fc8523a8929d2cbdfda5f647a0226aa007a217fc90c85ec4cc46937f75e15a596277e0db5
-EBUILD catcodec-1.0.5.ebuild 587 BLAKE2B 1027079128acb8523e471b98653a553e65324ba8c1f7adc55209aa7117946499bde772285d4482fad3697d7f0c94502edf7e63b5943bc9472b164ab7ba80dfe3 SHA512 d65a512c965cc716411ed1e5644b7f2f8c0910a0d4bf8e2fe6247796ff49b9dde4da02656f0bdc957fdae006e4f0734e8ce192eb82ef9490de432f12800e045a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/catcodec/catcodec-1.0.5.ebuild b/games-util/catcodec/catcodec-1.0.5.ebuild
deleted file mode 100644
index 3f5828e10959..000000000000
--- a/games-util/catcodec/catcodec-1.0.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Decodes and encodes sample catalogues for OpenTTD"
-HOMEPAGE="http://www.openttd.org/en/download-catcodec"
-SRC_URI="http://binaries.openttd.org/extra/catcodec/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-src_prepare() {
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	emake VERBOSE=1
-}
-
-src_install() {
-	dobin catcodec
-	dodoc changelog.txt docs/readme.txt
-	doman docs/catcodec.1
-}
diff --git a/games-util/catcodec/metadata.xml b/games-util/catcodec/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/catcodec/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/datutil-2.46 b/games-util/datutil-2.46
new file mode 100644
index 000000000000..f2b91ffd7708
--- /dev/null
+++ b/games-util/datutil-2.46
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Converter for dat files for Rom Managers
+EAPI=5
+HOMEPAGE=http://www.logiqx.com/Tools/DatUtil/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=all-rights-reserved
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=http://www.logiqx.com/Tools/DatUtil/dutil246.zip http://www.logiqx.com/Tools/DatLib/datlib236.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=b521cc9572704218b009badd677e522f
diff --git a/games-util/datutil/Manifest b/games-util/datutil/Manifest
deleted file mode 100644
index 19579502bc42..000000000000
--- a/games-util/datutil/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST datlib236.zip 109484 BLAKE2B 63dbaf4c70b5cd4259fbbe77a36e8608edb62d4a3663d836f237cb23ba85e2128cdb5ec055cd48913a7316c6334689e898fbd37c54a3eaae3428f6b2d54d7544 SHA512 0c601fe243c8ea4186abb6181cf70e749226a5eed871d7391b3686e7eb58195d1aab40305d498d1419c6fa49bf56c59fb74d032642822045cc7e36f8a5fe96b4
-DIST dutil246.zip 209577 BLAKE2B bd806974780bf03d89353a93dfc240dcec00aada4ffa7a3848d2b4e07cc8cb317834115b55b5074ee104db3df975bfc4c5ebbb2591cb9fda6a716bc49f2bb454 SHA512 f9e55eac41894681caaee7d6e3247d4e4d053ac6985d42708623fad415afeb8ece588dd728edc31cbd31bf6df1d9a06ec80f1b45979b0f77763c12e6627434b2
-EBUILD datutil-2.46.ebuild 1093 BLAKE2B d177170dcdc3873e3237e7d59c60be1e15983c8db64497d084e36586e74607dd05d1c94fccd83196e58abfdcde129a4a7a38733a858f1ce6f7d992ce6453aab8 SHA512 04404a03b78154810177ccce2e1b47fb43f91f4d68cc4e002f27d37f675e07d0b8cc11c32fa2b28b71fd953e6cd382affad1ddecb7a1d1bcdc33d35827e703a5
-MISC metadata.xml 577 BLAKE2B 2f3a9e5a6a73c6431efff8ddae66cbddf59b39d36ff30b6d4d243f150612d77e18887e3ab8f597b087f9cccb733b30abae69f7780f2ec636e647b98107699d3f SHA512 30770c001a7d5a072a6db5d913f010cbed6ae0cbe24b2ada950d14585fb1d5c9d4675023e491b6a43130dfcacaf24e4061c2a330d2a9e97fb4324f94e248861d
diff --git a/games-util/datutil/datutil-2.46.ebuild b/games-util/datutil/datutil-2.46.ebuild
deleted file mode 100644
index acf880241a00..000000000000
--- a/games-util/datutil/datutil-2.46.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DL_PV=2.36
-DESCRIPTION="Converter for dat files for Rom Managers"
-HOMEPAGE="http://www.logiqx.com/Tools/DatUtil/"
-SRC_URI="http://www.logiqx.com/Tools/DatUtil/dutil${PV//.}.zip
-	http://www.logiqx.com/Tools/DatLib/datlib${DL_PV//.}.zip"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-RESTRICT="mirror bindist"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack dutil${PV//.}.zip
-	cd "${S}"
-	mkdir -p dev/datlib
-	cd dev/datlib
-	unpack datlib${DL_PV//.}.zip
-}
-
-src_compile() {
-	# Parallel make issue, see bug #244879 (so make the dirs first)
-	emake -j1 CC="$(tc-getCC)" LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
-	CFLAGS="${CFLAGS} -Idev" LOGIQX=. EXT= UPX=@# dlmaketree maketree || die "emake failed"
-	emake CC="$(tc-getCC)" LD="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \
-	CFLAGS="${CFLAGS} -Idev" LOGIQX=. EXT= UPX=@# || die "emake failed"
-}
-
-src_install() {
-	dobin datutil
-	dodoc readme.txt whatsnew.txt
-}
diff --git a/games-util/datutil/metadata.xml b/games-util/datutil/metadata.xml
deleted file mode 100644
index 8840fa601df7..000000000000
--- a/games-util/datutil/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-<longdescription lang="en">
-DatUtil was created to aid in the creation of dat files for Rom Managers such as
-ClrMamePro and RomCenter (Roman Scherzer / Eric Bole-Feysot). It can convert
-between formats, extract individual games (and optionally their clones) and
-cleanse dats. It supports a variety of formats
-</longdescription>
-</pkgmetadata>
diff --git a/games-util/deutex-4.4.0 b/games-util/deutex-4.4.0
new file mode 100644
index 000000000000..9afe3155555c
--- /dev/null
+++ b/games-util/deutex-4.4.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=A wad composer for Doom, Heretic, Hexen and Strife
+EAPI=5
+HOMEPAGE=http://www.teaser.fr/~amajorel/deutex/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ LGPL-2+ HPND
+SLOT=0
+SRC_URI=http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4a18f39a92a49567abf2a952a201e6de
diff --git a/games-util/deutex/Manifest b/games-util/deutex/Manifest
deleted file mode 100644
index ffcef0eb43a3..000000000000
--- a/games-util/deutex/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX deutex-4.4.0-64bit.patch 524 BLAKE2B 4d95f5cdf0e184b56ed56d0039e38caaebd9ebfcfa1673f72d0182f4eb618540905ae614e7d388c7cf0ab10c00dddbd0918b91ecb929520cca042a5f3d3d1fa4 SHA512 c9ea2a50e5f3fe0cedfd1fb2494a3d4ab11a0d2d4505a9bcbc262ae8934db29f15ec2342d45d812e582380f3831b5f825c293b8bedb529373a903ea0393e88cd
-AUX deutex-4.4.0-makefile.patch 621 BLAKE2B 90d3f8fdd25a01ddd36bc23668a4ace971e16a92de10cd44b46331c26cf8ac5c1fa0ac4b8ab69a0e4df80c15f359a683185b0f8149d289ea118241b2b30efa75 SHA512 57872ee7c41f50db0d62385af10c1c27b6460050520c1403db075ea7e8b418000f2356f7db5b7393071708936e78728d5d23aea782dfa72a9ca355214f24fc6a
-AUX deutex-4.4.0-ovflfix.patch 695 BLAKE2B f3ae1908aa72797317aba2fa3e4d814e7a0f605817508336cecb9b846fd3b4b5e645dda7880da8fd1fbcaa7d0b2f4da2dd5c1795d6b55b49eccb55ea67d37765 SHA512 25e7930b422a565e732da80b183cb3270e7072ae77858319dde657c9439f0854c175f7fe93b4ca3627eda52b4e433a62369163537db396a1c8412c8678fc07e4
-DIST deutex-4.4.0.tar.gz 215945 BLAKE2B f1f2fffa5655cde9ccd04e4045890a41878d85ec76b9c0a3e13e5d67d4e312b13e7b83916961709863fceede90a94731e8351737f94928ef465681d1a7abcdd0 SHA512 fc9aaf399bc9d8ea812102decdf6b3c6d5f4c4a69e925e02fe0e75fa8dc9e54ad36afc352e83819ba13b9ae5dda90bb65c1856825c3ee17c7bd370909b866fb5
-EBUILD deutex-4.4.0.ebuild 648 BLAKE2B 196ffc33dd805ec37aa7193ca0cfa344b1b5a72dac19f25814947efb884600fa1589fabe6f19d2077a8aa1a523e075ab04bf71aff9b9672c24c7e4372413ecf4 SHA512 a26f6c621bb36040626f2edae7ed5330e0bc67c7c8ef129089e335da18af743e253b40db7543f11dd38b329f703f7ff65373dc014ae9de7cec7a2c5229da63d6
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/deutex/deutex-4.4.0.ebuild b/games-util/deutex/deutex-4.4.0.ebuild
deleted file mode 100644
index 9ef3310f618d..000000000000
--- a/games-util/deutex/deutex-4.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs eutils
-
-DESCRIPTION="A wad composer for Doom, Heretic, Hexen and Strife"
-HOMEPAGE="http://www.teaser.fr/~amajorel/deutex/"
-SRC_URI="http://www.teaser.fr/~amajorel/deutex/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-ovflfix.patch
-	tc-export CC
-}
-
-src_install() {
-	dobin deusf deutex
-	doman deutex.6
-	dodoc CHANGES README TODO
-}
diff --git a/games-util/deutex/files/deutex-4.4.0-64bit.patch b/games-util/deutex/files/deutex-4.4.0-64bit.patch
deleted file mode 100644
index b5028cd4ffbd..000000000000
--- a/games-util/deutex/files/deutex-4.4.0-64bit.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/deutex.h b/src/deutex.h
-index 0a26df5..7af321c 100644
---- a/src/deutex.h
-+++ b/src/deutex.h
-@@ -31,7 +31,7 @@ Place, Suite 330, Boston, MA 02111-1307, USA.
- #define DeuSF   for DOS .EXE  Unix Linux OS/2
- *********************************************/
- 
--#if defined (__alpha)        /*__ALPHA__ for Alpha processor?*/
-+#if defined (__alpha) || defined (__x86_64__)        /*__ALPHA__ for Alpha processor?*/
- /*long = int64 on a 64bit processor*/
- typedef char           Int8;
- typedef short          Int16;
diff --git a/games-util/deutex/files/deutex-4.4.0-makefile.patch b/games-util/deutex/files/deutex-4.4.0-makefile.patch
deleted file mode 100644
index 49265e14f3fb..000000000000
--- a/games-util/deutex/files/deutex-4.4.0-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru deutex-4.4.0.orig/Makefile deutex-4.4.0/Makefile
---- deutex-4.4.0.orig/Makefile	1999-12-24 07:50:16.000000000 -0500
-+++ deutex-4.4.0/Makefile	2010-03-05 14:53:23.763604022 -0500
-@@ -16,11 +16,6 @@
- 
- PREFIX=/usr/local
- 
--# Compiled by users
--CFLAGS   = -O2
--CC       = cc
--LDFLAGS  =
--
- # Compiled by developers
- DCFLAGS  = -g -Wall -Wpointer-arith -Wstrict-prototypes
- DCC      = gcc
-@@ -182,11 +177,11 @@
- 	(sleep 1; mkdir -p tmp; touch tmp/_deusf) &
- 
- tmp/_deutex:
--	-mkdir tmp
-+	@mkdir tmp 2> /dev/null || true
- 	touch $@
- 
- tmp/_deusf:
--	-mkdir tmp
-+	@mkdir tmp 2> /dev/null || true
- 	touch $@
- 
- install:
diff --git a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch b/games-util/deutex/files/deutex-4.4.0-ovflfix.patch
deleted file mode 100644
index 32a7dce0d97c..000000000000
--- a/games-util/deutex/files/deutex-4.4.0-ovflfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/sound.c.old	2010-10-27 12:32:28.000000000 +0200
-+++ src/sound.c	2010-10-27 12:32:52.000000000 +0200
-@@ -309,7 +309,7 @@
-   if(fread(&headv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read header");
-   if(strncmp(VocId,headv.ident,VOCIDLEN)!=0) ProgError("VOC: bad header");
-   if(fseek(fp,headv.block1,SEEK_SET)) ProgError("VOC: bad header");
--  if(fread(&blockv,sizeof(struct VOCHEAD),1,fp)!=1) ProgError("VOC: can't read block");
-+  if(fread(&blockv,sizeof(struct VOCBLOCK1),1,fp)!=1) ProgError("VOC: can't read block");
-   if(blockv.type!=1) ProgError("VOC: first block is not sound");
-   datasize= ((blockv.sizeU)<<16)&0xFF0000L;
-   datasize+=((blockv.sizeM)<<8)&0xFF00L;
diff --git a/games-util/deutex/metadata.xml b/games-util/deutex/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/deutex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/dfarc-3.12-r1 b/games-util/dfarc-3.12-r1
new file mode 100644
index 000000000000..9869c57e36b2
--- /dev/null
+++ b/games-util/dfarc-3.12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X] nls? ( >=dev-util/intltool-0.31 ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Frontend and .dmod installer for GNU FreeDink
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 BZIP2
+RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=mirror://gnu/freedink/dfarc-3.12.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f00ba941c18d951d29ec19108c34f992
diff --git a/games-util/dfarc-3.14 b/games-util/dfarc-3.14
new file mode 100644
index 000000000000..6053523309a7
--- /dev/null
+++ b/games-util/dfarc-3.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X] nls? ( >=dev-util/intltool-0.31 ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Frontend and .dmod installer for GNU FreeDink
+EAPI=6
+HOMEPAGE=http://www.freedink.org/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 BZIP2
+RDEPEND=app-arch/bzip2 x11-misc/xdg-utils x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=mirror://gnu/freedink/dfarc-3.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0e915a4d883f5d99cd06be204cd7f6ce
diff --git a/games-util/dfarc/Manifest b/games-util/dfarc/Manifest
deleted file mode 100644
index 9c336d90b160..000000000000
--- a/games-util/dfarc/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX dfarc-3.12-nowindres.patch 648 BLAKE2B 0bc6d823c7bc44ff69730473a55542d974e1695086fef27a6b235306c20978b4645e00878123cadfa10202301b52f3e6731384c9bba140c76312e6cf9ab31b9d SHA512 1ac6a7b889a271b70a2ab606dfa7475c3053aca5f72192cae2b161db9d7ef955df74e7cf94e2db4ac89bee3ada433e20a4dc8ec37f836a12e2810ab61351bdc4
-DIST dfarc-3.12.tar.gz 329925 BLAKE2B ebebfdf42fbd8bcc53696777f5fb06a54635e269dafb59c888990250343e0bca0b20d46b051e753b047f008061ef74070456d83ee72eb37018a2bc1b386d1c9f SHA512 e87e89e67e383c3d25a6620edc38c6ab6f90b9df52b84d6e6de20af1ac3b50588b3037575f2f89a14c90c14151053c08a7bb97143f24471e33326f3f2d2574ab
-DIST dfarc-3.14.tar.gz 336910 BLAKE2B 50f0ad1af2d91a562ba6a7b1e0e5e1821c900fe8ab3cf48f3585ca10ea12d9f7e3125ae85bc2e31c1539bf13d5a950e30a467b05259a7df6e2bda35544820933 SHA512 536c1cb5d1c8bf7012920e39d69fafbb790da78acb89a18f8ab1a3ad985220c74da61adda238e39395b4d7fd8fc62894fb5579691b744fe17600a8fccabc3c13
-EBUILD dfarc-3.12-r1.ebuild 878 BLAKE2B 1015af2a3ad1bd03aed5659c3cd9e09040d4d6830dffa96bd75feeafa5e64ee1c88745b042edda83f4c0f978c804856c8e025ed027c8c99b24494a29e3b04b9a SHA512 dcbeb8a65243501a72dbf861adee7ba1efd771b9d7777992286674e7d5cbfc0db50be9e689e7083760cb5cf57e1545ec410a47d33ce73a8d39126b23e7ac5a1a
-EBUILD dfarc-3.14.ebuild 884 BLAKE2B 1ad3f1122cf29b8927f49b6d95ab151faf58649344027cf94bf313dd9951c082eea85d676f2b4039b14b2d5558e39cd58cd9513eed3a693f7cac48e813825d9d SHA512 9a5b85d95ba5999e289409f17883a1b1a9c9f88a33e872fb2cb73bf40a19193db821094eaeeaa36146cf9f68b0ea69ae47c0bdc8c145cafba0960aa4706f2565
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/dfarc/dfarc-3.12-r1.ebuild b/games-util/dfarc/dfarc-3.12-r1.ebuild
deleted file mode 100644
index c996a7d3172d..000000000000
--- a/games-util/dfarc/dfarc-3.12-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-inherit eutils gnome2-utils wxwidgets xdg
-
-DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="GPL-3 BZIP2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	app-arch/bzip2
-	x11-misc/xdg-utils
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.31 )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-nowindres.patch )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-desktopfiles
-}
-
-src_install() {
-	default
-	dodoc TRANSLATIONS.txt
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/games-util/dfarc/dfarc-3.14.ebuild b/games-util/dfarc/dfarc-3.14.ebuild
deleted file mode 100644
index 96118b386c92..000000000000
--- a/games-util/dfarc/dfarc-3.14.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-inherit eutils gnome2-utils wxwidgets xdg
-
-DESCRIPTION="Frontend and .dmod installer for GNU FreeDink"
-HOMEPAGE="http://www.freedink.org/"
-SRC_URI="mirror://gnu/freedink/${P}.tar.gz"
-
-LICENSE="GPL-3 BZIP2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	app-arch/bzip2
-	x11-misc/xdg-utils
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-"
-DEPEND="${RDEPEND}
-	nls? ( >=dev-util/intltool-0.31 )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.12-nowindres.patch )
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--disable-desktopfiles
-}
-
-src_install() {
-	default
-	dodoc TRANSLATIONS.txt
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/games-util/dfarc/files/dfarc-3.12-nowindres.patch b/games-util/dfarc/files/dfarc-3.12-nowindres.patch
deleted file mode 100644
index 9c4a74e52592..000000000000
--- a/games-util/dfarc/files/dfarc-3.12-nowindres.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -100,7 +100,6 @@
- 	Package.$(OBJEXT) RecursiveDelete.$(OBJEXT) Tar.$(OBJEXT) \
- 	DFArcFrame_Base.$(OBJEXT) Options_Base.$(OBJEXT) \
- 	Package_Base.$(OBJEXT) InstallVerifyFrame_Base.$(OBJEXT)
--@HAVE_WINDRES_TRUE@nodist_dfarc_OBJECTS = woeres.$(OBJEXT)
- dfarc_OBJECTS = $(am_dfarc_OBJECTS) $(nodist_dfarc_OBJECTS)
- dfarc_LDADD = $(LDADD)
- AM_V_P = $(am__v_P_@AM_V@)
-@@ -346,7 +345,6 @@
- 	InstallVerifyFrame_Base.wxg dink.ico
- 
- # How do we handle resources embedded in the executable binary?
--@HAVE_WINDRES_TRUE@nodist_dfarc_SOURCES = woeres.rc
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
diff --git a/games-util/dfarc/metadata.xml b/games-util/dfarc/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-util/dfarc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-util/dzip-2.9-r3 b/games-util/dzip-2.9-r3
new file mode 100644
index 000000000000..ff185ac745cb
--- /dev/null
+++ b/games-util/dzip-2.9-r3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=compressor/uncompressor for demo recordings from id's Quake
+EAPI=5
+HOMEPAGE=http://speeddemosarchive.com/dzip/
+KEYWORDS=~amd64 ~x86
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=http://speeddemosarchive.com/dzip/dz29src.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0a4cc68b2ff6a9125024e352ed817a60
diff --git a/games-util/dzip/Manifest b/games-util/dzip/Manifest
deleted file mode 100644
index 2bb02e7a6b5b..000000000000
--- a/games-util/dzip/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX dzip-2.9-scrub-names.patch 1816 BLAKE2B e56b4086e70ff682e8163dc8f6c7620882f7b4ee9245111da93faca8a5cee1fb0aa9422dc03451ff1c147664adc6dec34da0a1a99ec31c4f56179b37fcd6ea10 SHA512 94fceecee4538bb0d0aac460d864ebb4bbbb3ad3aa6be7593115bc850e19b1630bceb2df9268e569a30457e8b2483b3678199629b78d192dcdf3bee0b00178c8
-AUX dzip-2.9-system-zlib-r2.patch 1844 BLAKE2B ebaa30eb9100cd616c4986240d6ba2c360a2cbd17d16aa67172bbae41da1be92aeb77ec3af942a8f0c86029c29ad92900ba991020388a43eab050ca28d799a5f SHA512 04e95334b03b1590bfd73cd5905186a8ba28a36655b9c829dcd913842c0f2c2802133d453134080f3a4664ec106e7693482b43981c5849ecc1a781a7f37b0625
-AUX dzip-amd64.diff 643 BLAKE2B 6752ccdab94f080cc0905bceabfe4d49fdd007c366fb10f833e5d85935ce1f206c5ba39be7f7414ed1dd0f01f16995ed17e36c341e8accc4530ff75a5c88f43f SHA512 30a381f95807cc61b8c393f3e5fb5c1f250e4578b1601f5ee8944c7b94a3d3f983478075cee3c76858b5d0df768b6bd3e91578e6679f443fb8d6f7fa30b48f18
-DIST dz29src.zip 100354 BLAKE2B 1b0ab969daa030c135dab049f9950079f0337ca64636765298316e699614dfe3c139b0b88321c29278aadbe6b93ca75f2d656e82ae2dbf54b98f19d9fd3053d9 SHA512 3e1071da6ae5c9064b7222f1bb553b787ded4acbfe8463a7a94f17e60748b68cdfc17672ef7220deddd394c6709efe632e53e61508fd48bfa9001e43a37e788f
-EBUILD dzip-2.9-r3.ebuild 648 BLAKE2B 98bb809f8fc9e6232aa3ae0ff43af43c2661e0d523db63bc7f42f36af5059817362dc8a188833b262fbe9f08547c2830969dbd495658adf7ff381b559bd90fca SHA512 44cc75228481fabec5366375bb2418624fc26784df93894e42f1a28195109ab2a112b70cc3fcd29578c22ab2065f247425117a49d80839319411d079d8f8596c
-MISC metadata.xml 326 BLAKE2B 24ee80a289a9dc670ba0592e623568a083bff065c740db1dfeb877329aa2f12b59eb20491f488f6311afd3e8df849c123013503fdf2ef739ee9c357f965e5797 SHA512 a1550e2953010f4593e3c7cbe54783f4e0a5859f58e756b6cde50c0d404ca10f8eb0f43df223c6f7df454429d90f496a99aee08f68c8830a1aa396e1febcbe7c
diff --git a/games-util/dzip/dzip-2.9-r3.ebuild b/games-util/dzip/dzip-2.9-r3.ebuild
deleted file mode 100644
index a58b74eb99b2..000000000000
--- a/games-util/dzip/dzip-2.9-r3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="compressor/uncompressor for demo recordings from id's Quake"
-HOMEPAGE="http://speeddemosarchive.com/dzip/"
-SRC_URI="http://speeddemosarchive.com/dzip/dz${PV/./}src.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-system-zlib-r2.patch
-	epatch "${FILESDIR}"/${P}-scrub-names.patch #93079
-	epatch "${FILESDIR}/dzip-amd64.diff"
-	mv -f Makefile{.linux,}
-}
-
-src_install () {
-	dobin dzip
-	dodoc Readme
-}
diff --git a/games-util/dzip/files/dzip-2.9-scrub-names.patch b/games-util/dzip/files/dzip-2.9-scrub-names.patch
deleted file mode 100644
index 079fae3fd070..000000000000
--- a/games-util/dzip/files/dzip-2.9-scrub-names.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Fix directory traversals issues.
-
-Since .dz files normally just have relative directory trees:
-pak/
-pak/file
-pak/subdir/file
-
-we strip out all the components which ascend in the directory tree
-
-http://bugs.gentoo.org/93079
-
---- main.c
-+++ main.c
-@@ -77,6 +77,48 @@ int dzRead (int inlen)
- 	return 1;

- }
- 

-+#define IS_SEP(c) (c == '/' || c == ':' || c == '\\')
-+void scrub_name(char *smee)
-+{
-+	char *paths[] = { "../", "..\\", "..:", NULL};
-+	size_t p, i, len;
-+	char scrubit, scrubbed;
-+
-+	scrubbed = 0;
-+	len = strlen(smee);
-+	i = 0;
-+	scrubit = 1;
-+
-+	/* search the path and scrub out all relative paths */
-+	while (i + 3 < len) {
-+		for (p = 0; paths[p]; ++p) {
-+			if (scrubit && !strncmp(paths[p], smee+i, 3)) {
-+				scrubbed = 1;
-+				memset(smee+i, '\0', 3);
-+				i += 2;
-+				break;
-+			}
-+		}
-+		scrubit = IS_SEP(smee[i]) || smee[i] == '\0';
-+		++i;
-+	}
-+
-+	if (!scrubbed)
-+		return;
-+
-+	/* condense the string over all the scrubbed bits */
-+	p = 0;
-+	for (i = 0; i < len; ++i) {
-+		while (p < len && smee[p] == '\0')
-+			++p;
-+		if (p == len) {
-+			smee[i] = '\0';
-+			break;
-+		}
-+		smee[i] = smee[p++];
-+	}
-+}
-+

- int dzReadDirectoryEntry (direntry_t *de)
- {
- 	char *s;
-@@ -102,6 +144,7 @@ int dzReadDirectoryEntry (direntry_t *de
- 	s = Dzip_malloc(de->len);

- 	dzFile_Read(s, de->len);

- 	de->name = s;
-+	scrub_name(de->name);
- 	if (de->pak && de->type != TYPE_PAK)
- 		return 1;	/* dont mess with dirchar inside pakfiles */
- 	do
---- v1code.c
-+++ v1code.c
-@@ -201,6 +201,7 @@ void demv1_dxentities(void)
- 
- }
- 

-+extern void scrub_name(char *smee);
- void dzUncompressV1 (int testing)

- {

- 	int i, inlen = 0;

-@@ -221,6 +222,7 @@ void dzUncompressV1 (int testing)

- 	{

- 		de = directory + i;

- 		crcval = INITCRC;

-+		scrub_name(de->name);
- 		printf("%s %s",action,de->name);

- 		fflush(stdout);

- 

diff --git a/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch b/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
deleted file mode 100644
index 4bf10f8b98f6..000000000000
--- a/games-util/dzip/files/dzip-2.9-system-zlib-r2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- dzip.h
-+++ dzip.h
-@@ -2,7 +2,7 @@
- #include <stdlib.h>

- #include <string.h>

- 

--#include "zlib/zlib.h"

-+#include <zlib.h>

- 

- typedef unsigned char uchar;

- 

-@@ -177,4 +177,4 @@
- #else

- #define DIRCHAR '/'

- #define WRONGCHAR '\\'

--#endif
-\ No newline at end of file
-+#endif

---- Makefile.linux
-+++ Makefile.linux
-@@ -1,18 +1,17 @@
- # Makefile for linux

- 

--CC = gcc

--CFLAGS = -Wall -O3

-+CC ?= gcc

-+CFLAGS ?= -O3

-+CFLAGS += -Wall

- TARGET = dzip

- OBJECTS = main.o compress.o uncompress.o list.o crc32.o \

--	  encode.o decode.o v1code.o conmain.o delete.o \

--	  zlib/adler32.o zlib/deflate.o zlib/trees.o \

--	  zlib/inflate.o zlib/infblock.o zlib/inftrees.o zlib/infcodes.o \

--	  zlib/infutil.o zlib/inffast.o

-+	  encode.o decode.o v1code.o conmain.o delete.o

-+LIBS = -lz

- 

- TMPFILES = gmon.out frag*

- 

- $(TARGET): $(OBJECTS)

--	$(CC) $(CFLAGS) $(OBJECTS) -o $(TARGET) $(LDFLAGS)

-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)

- 

- clean:

- 	rm -f $(TARGET) $(OBJECTS) $(TMPFILES)

-@@ -24,4 +23,4 @@
- encode.o: encode.c dzip.h

- list.o: list.c dzip.h dzipcon.h

- decode.o: decode.c dzip.h dzipcon.h

--v1code.o: v1code.c dzip.h dzipcon.h
-\ No newline at end of file
-+v1code.o: v1code.c dzip.h dzipcon.h

---- conmain.c.orig	2010-01-17 15:10:20.938605770 +0000
-+++ conmain.c	2010-01-17 15:10:34.180603846 +0000
-@@ -507,8 +507,8 @@
- 		if (!strcmp(argv[i],"-o")) i++;

- 	}

- 

--	zs.zalloc = Dzip_calloc;

--	zs.zfree = free;

-+	zs.zalloc = Z_NULL; // Dzip_calloc; <- wrong number of arguments, reverting to default

-+	zs.zfree = Z_NULL;  // free; 	    <- wrong number of arguments, reverting to default

- 

- 	if (flag[SW_LIST] || flag[SW_EXTRACT] || flag[SW_VERIFY])

- 	{

-@@ -618,4 +618,4 @@
- 		dzDeleteFiles_MakeList(files + 1, fileargs - 1);

- 	free(files);

- 	exit(0);

--}
-\ No newline at end of file
-+}

diff --git a/games-util/dzip/files/dzip-amd64.diff b/games-util/dzip/files/dzip-amd64.diff
deleted file mode 100644
index ef49ff330570..000000000000
--- a/games-util/dzip/files/dzip-amd64.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- dzip/crc32.c	2002-07-12 06:07:54.000000000 +0200
-+++ dz/crc32.c	2010-01-20 23:23:43.000000000 +0100
-@@ -1,10 +1,12 @@
-+#include <stdint.h>
-+
- unsigned long crcval;
- unsigned long crctable[256];
- 
--unsigned long crc_reflect(unsigned long x, int bits)
--{

--	int i;
--	unsigned long v = 0, b = 1 << (bits - 1);
-+unsigned long crc_reflect(uint32_t x, int bits)
-+{
-+	uint32_t i;
-+	uint32_t v = 0, b = 1 << (bits - 1);
- 
- 	for (i = 0; i < bits; i++)
- 	{
-@@ -16,8 +18,8 @@
- 
- void crc_init(void)
- {
--	unsigned long crcpol = 0x04c11db7;
--	unsigned long i, j, k;
-+	uint32_t crcpol = 0x04c11db7;
-+	uint32_t i, j, k;
- 
- 	for (i = 0; i < 256; i++)
- 	{
diff --git a/games-util/dzip/metadata.xml b/games-util/dzip/metadata.xml
deleted file mode 100644
index d3c0508f60cd..000000000000
--- a/games-util/dzip/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-  <email>hanno@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-  <email>games@gentoo.org</email>
-  <name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/etswitch-0.1.14-r1 b/games-util/etswitch-0.1.14-r1
new file mode 100644
index 000000000000..e0e8dcf86a66
--- /dev/null
+++ b/games-util/etswitch-0.1.14-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm x11-libs/libXt x11-base/xorg-proto
+DESCRIPTION=*nix minimizer for a few games
+EAPI=6
+HOMEPAGE=http://hem.bredband.net/b400150/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/libXxf86vm x11-libs/libXmu x11-libs/libXpm
+SLOT=0
+SRC_URI=http://hem.bredband.net/b400150/etswitch/etswitch-0.1.14.tar.gz
+_md5_=4407ff455dbc7a77b085ffc520162f93
diff --git a/games-util/etswitch/Manifest b/games-util/etswitch/Manifest
deleted file mode 100644
index 57fb6c90efd9..000000000000
--- a/games-util/etswitch/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX etswitch-0.1.14-desktop-entry.patch 464 BLAKE2B 5058044958c26fdb6c062f3ea6d2a9d2d8a42421de016ab7c4d7263b638fb323d02771cd789bd57d35897b4a08a9e03031e0b6602edf241068d0574be72f2aa3 SHA512 aa21d15ce672f51903e8cd86df3d8794231037d8eb8cb97a8313dc6f3c7212b7bb89d8f78ecc249a589ad03b38ef41f5d346f41dc9f929d130eb83794b19b9ec
-AUX etswitch-0.1.14-glibc.patch 628 BLAKE2B e6a7228a90417cda917cd4218496643e6bb2fa6b41886b48cdbb17758591d6a5742f6f427ccb6dd75d78403d1d394bb5324fd63848260e35808ba5d232a4e2b9 SHA512 27249584033beb4cf81b37e387a814a7b213d4108f530bc21494196916fe395c15767e384c62257dd3abb1d04eb104c0863b7e2d80cfae4927912a836b181019
-DIST etswitch-0.1.14.tar.gz 165811 BLAKE2B 3d52b9dbddec9ddba914cf8e3ecb5013b2b7eac0b9a655d1be60c01cb77639d8ca2906140fc3ecd097005aaef5b11bf4ddd2ac88a5d2e0ba26aac9f2f1593248 SHA512 15447e728b8c6783e663bb76dd64a03b57ecfea6845991f4deca73ee5c5b8c2f87e92d842a46948e48468898eb036f17cbaf365887ea30c1b724db9133f9620c
-EBUILD etswitch-0.1.14-r1.ebuild 597 BLAKE2B ee3a7e7c2a51053cfd6abe75882253fa70ace235137ed9a2f756c6103cfc5e102451034fb5a6dcdd58c3d2084598b2be2fe49e1c8e5b01464968ca122c3a4210 SHA512 cd53988bc5ec85ff2882f458f6a349bad34712c6adf2be2a9cbe14c010270f889eacc22dca19f6adf82880092742334e2660ce7deecea829d108e7748035db52
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/etswitch/etswitch-0.1.14-r1.ebuild b/games-util/etswitch/etswitch-0.1.14-r1.ebuild
deleted file mode 100644
index da46e7ba4978..000000000000
--- a/games-util/etswitch/etswitch-0.1.14-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="*nix minimizer for a few games"
-HOMEPAGE="http://hem.bredband.net/b400150/"
-SRC_URI="http://hem.bredband.net/b400150/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXxf86vm
-	x11-libs/libXmu
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-base/xorg-proto"
-
-PATCHES=(
-		"${FILESDIR}"/${P}-desktop-entry.patch
-		"${FILESDIR}"/${P}-glibc.patch
-)
-
-src_configure() {
-	econf --datadir=/usr/share
-}
diff --git a/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch b/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
deleted file mode 100644
index f3e6b5dcd805..000000000000
--- a/games-util/etswitch/files/etswitch-0.1.14-desktop-entry.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/etswitch.desktop.in	2008-02-02 10:54:51.000000000 -0500
-+++ b/etswitch.desktop.in	2008-02-02 11:17:40.000000000 -0500
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Version=1.0
- 
- Name=ETSwitch
-@@ -15,9 +14,9 @@
- Comment[fi_FI]=ETSwitch versio @VERSION@
- 
- Exec=etswitch --no-delay
--Icon=etswitch.png
-+Icon=etswitch
- Terminal=false
- Type=Application
--Categories=Application;Game;Tool
-+Categories=Game;Utility;
- StartupNotify=true
- StartupWMClass=ETSwitch
diff --git a/games-util/etswitch/files/etswitch-0.1.14-glibc.patch b/games-util/etswitch/files/etswitch-0.1.14-glibc.patch
deleted file mode 100644
index a51862d6722d..000000000000
--- a/games-util/etswitch/files/etswitch-0.1.14-glibc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr etswitch-old/src/etswitch.c etswitch-0.1.14/src/etswitch.c
---- etswitch-old/src/etswitch.c	2009-02-24 11:20:29.594339029 +0100
-+++ etswitch-0.1.14/src/etswitch.c	2009-02-24 11:28:12.100463404 +0100
-@@ -461,7 +461,7 @@ int main(int argc, char *argv[]){
-     /* setup lock, fixme */
-     /* use temp var */
-     lock_file = "/tmp/.etswitch.pid";    /* now this isnt failsafe but at least something */
--    lock_fd = open(lock_file, O_CREAT | O_RDWR);
-+    lock_fd = open(lock_file, O_CREAT | O_RDWR, 0600);
-     if (lock_fd < 0) {
- 	#ifdef DEBUG
- 	fprintf(stdout, "'%s' allready exits, will try to open.\n",lock_file);
diff --git a/games-util/etswitch/metadata.xml b/games-util/etswitch/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-util/etswitch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-util/fteqcc-2501 b/games-util/fteqcc-2501
new file mode 100644
index 000000000000..1b835504e38d
--- /dev/null
+++ b/games-util/fteqcc-2501
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=QC compiler
+EAPI=5
+HOMEPAGE=http://fteqw.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://sourceforge/fteqw/qclibsrc2501.zip
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e40540f454381fbaa0779714847cb542
diff --git a/games-util/fteqcc/Manifest b/games-util/fteqcc/Manifest
deleted file mode 100644
index f615138f3b66..000000000000
--- a/games-util/fteqcc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX fteqcc-2501-cleanup-source.patch 2655 BLAKE2B 3c0af9e2663e9f18aee250f79b1315744fe8aaf818d3b7aaa590a6dbe2eaf62d44280507d5a4a4796b6ede78ed76c89f4153998cca4a0cca2f3b4553763f1db1 SHA512 978f3fc8238383ba63be4095fb7ebe30b0a6a0220b2d0f28033ab61ed23251de3757414fecdda2d987996094e3953797d0d89f3b4cc812c4ce7e15335f06035c
-DIST qclibsrc2501.zip 204047 BLAKE2B 3e9b6aeeaadf44adf8ea32c7f1f627082cc5e98f6ea84f339d44a6e34adda5dbf01add1fb2957866323ab93b8f07393bb79d94cf0d5819cc8b48376d68fefc0d SHA512 60740e55c470dcb8deb235b49b5e8bd56f3c932fd9290808224b4d0ff2d6d8eb95302fdd1c972f36c992ac046fdbbc6a34c6de2fc67e1e7de54f23fd10de89d7
-EBUILD fteqcc-2501.ebuild 770 BLAKE2B b88373414e91d51c179faa8bc2b872ededd31446d12d1028bf0e598478207635c8a87324330df9ad6483e218bf85f074d42d129eaf346ef2ad18b5d939752bb9 SHA512 3528807c8d81e5243f16ee5c605e4c780b3a1e1fdcba05d9c29e8a64e3dcfa8da613beb162855433be1a786e7d64b84bd7586acdf25cf49050cda904972ca888
-MISC metadata.xml 328 BLAKE2B 3cf3ef53d251c16dbdf4dac64df6b6f61d39259def9e37191d28449b1eb733c89f1496a69eca590c536541e3763b5870880eec8f4b27e0a370d430c75dda9712 SHA512 9a114bb9f7d3e6d5995830c71662bc58b78bee8a1d104399b9f7a53efaf3410a6da94486e8a5a9a2b25677eb79327b1fad4b135c8ed63429e21fee500853a78f
diff --git a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch b/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
deleted file mode 100644
index 35f3dcf100ae..000000000000
--- a/games-util/fteqcc/files/fteqcc-2501-cleanup-source.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- qcc_pr_comp.c
-+++ qcc_pr_comp.c
-@@ -7322,7 +7322,7 @@
- 	QCC_def_t		*def, *d;

- 	QCC_function_t	*f;

- 	QCC_dfunction_t	*df;

--	int			i;

-+	int			i = 0;

- 	pbool shared=false;

- 	pbool externfnc=false;

- 	pbool isconstant = false;

-@@ -8541,8 +8545,6 @@
- 	struct qcc_includechunk_s *oldcurrentchunk;

- 	extern struct qcc_includechunk_s *currentchunk;

- 

--	extern char qccmsourcedir[];

--

- 	ocompilingfile = compilingfile;

- 	os_file = s_file;

- 	os_file2 = s_file2;

---- hash.h
-+++ hash.h
-@@ -19,12 +19,12 @@
- int Hash_Key(char *name, int modulus);

- void *Hash_Get(hashtable_t *table, char *name);

- void *Hash_GetInsensative(hashtable_t *table, char *name);

--void *Hash_GetKey(hashtable_t *table, int key);

-+void *Hash_GetKey(hashtable_t *table, long key);

- void *Hash_GetNext(hashtable_t *table, char *name, void *old);

- void *Hash_GetNextInsensative(hashtable_t *table, char *name, void *old);

- void *Hash_Add(hashtable_t *table, char *name, void *data, bucket_t *buck);

- void *Hash_AddInsensative(hashtable_t *table, char *name, void *data, bucket_t *buck);

- void Hash_Remove(hashtable_t *table, char *name);

- void Hash_RemoveData(hashtable_t *table, char *name, void *data);

--void Hash_RemoveKey(hashtable_t *table, int key);

--void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck);

-+void Hash_RemoveKey(hashtable_t *table, long key);

-+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck);

---- hash.c
-+++ hash.c
-@@ -68,7 +68,7 @@
- 	}

- 	return NULL;

- }

--void *Hash_GetKey(hashtable_t *table, int key)

-+void *Hash_GetKey(hashtable_t *table, long key)

- {

- 	int bucknum = key%table->numbuckets;

- 	bucket_t *buck;

-@@ -77,7 +77,7 @@
- 

- 	while(buck)

- 	{

--		if ((int)buck->keystring == key)

-+		if ((long)buck->keystring == key)

- 			return buck->data;

- 

- 		buck = buck->next;

-@@ -168,7 +168,7 @@
- 

- 	return buck;

- }

--void *Hash_AddKey(hashtable_t *table, int key, void *data, bucket_t *buck)

-+void *Hash_AddKey(hashtable_t *table, long key, void *data, bucket_t *buck)

- {

- 	int bucknum = key%table->numbuckets;

- 

-@@ -237,14 +237,14 @@
- }

- 

- 

--void Hash_RemoveKey(hashtable_t *table, int key)

-+void Hash_RemoveKey(hashtable_t *table, long key)

- {

- 	int bucknum = key%table->numbuckets;

- 	bucket_t *buck;	

- 

- 	buck = table->bucket[bucknum];

- 

--	if ((int)buck->keystring == key)

-+	if ((long)buck->keystring == key)

- 	{

- 		table->bucket[bucknum] = buck->next;

- 		return;

-@@ -253,7 +253,7 @@
- 

- 	while(buck->next)

- 	{

--		if ((int)buck->next->keystring == key)

-+		if ((long)buck->next->keystring == key)

- 		{

- 			buck->next = buck->next->next;

- 			return;

diff --git a/games-util/fteqcc/fteqcc-2501.ebuild b/games-util/fteqcc/fteqcc-2501.ebuild
deleted file mode 100644
index c03aa1ac4ee1..000000000000
--- a/games-util/fteqcc/fteqcc-2501.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="QC compiler"
-HOMEPAGE="http://fteqw.sourceforge.net/"
-SRC_URI="mirror://sourceforge/fteqw/qclibsrc${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-cleanup-source.patch
-	sed -i \
-		-e '/^CC/d' \
-		-e "s: -O3 : :g" \
-		-e "s: -s : :g" \
-		-e 's/-o fteqcc.bin/$(LDFLAGS) -o fteqcc.bin/' \
-		Makefile || die "sed failed"
-	edos2unix readme.txt
-	append-flags -DQCCONLY
-}
-
-src_compile() {
-	emake BASE_CFLAGS="${CFLAGS} -Wall"
-}
-
-src_install() {
-	newbin fteqcc.bin fteqcc
-	dodoc readme.txt
-}
diff --git a/games-util/fteqcc/metadata.xml b/games-util/fteqcc/metadata.xml
deleted file mode 100644
index c93ba6816bc6..000000000000
--- a/games-util/fteqcc/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fteqw</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/gamepick-0.35-r1 b/games-util/gamepick-0.35-r1
new file mode 100644
index 000000000000..92582be9f064
--- /dev/null
+++ b/games-util/gamepick-0.35-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/gtk+:2 virtual/pkgconfig
+DESCRIPTION=Launch opengl games with custom graphic settings
+EAPI=6
+HOMEPAGE=http://www.rillion.net/gamepick/index.html
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2
+SLOT=0
+SRC_URI=http://www.rillion.net/gamepick/gamepick-0.35.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7ab54c67ad2792b73bc8e2b36a257e2b
diff --git a/games-util/gamepick/Manifest b/games-util/gamepick/Manifest
deleted file mode 100644
index a81ef0e6ac64..000000000000
--- a/games-util/gamepick/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gamepick-0.35.tar.gz 156725 BLAKE2B e761fead9528397d0819ff00ca0153d63ee7fcc7ecf2d8bd39c3f63e937d13a72be23758a53e415d8020466c3500abc64ae10c09384682f4e8bd2dea3305fdda SHA512 bd77d6584cb9bb5c358179226d20a1995badd7603332bde6692ecca6c30f26fe06e6ea202e04bd40c006e9f43ae8fcd885a09bcb696227be3da823dd68d5053c
-EBUILD gamepick-0.35-r1.ebuild 597 BLAKE2B 2a4fb4541ef66c31c44412b17750f198bd6b844b1cab9610d3ced2af2c943d519d534f103b9763dbca74d83466ed57a5cb4b55507db273033bbcdbc59a49f2ca SHA512 fd48d4116fe444201f7065406063b31f37399f121f60971f7e9c48a49e752d4222c4e7b6ea5483e5b0713de54514d5fb0b4671f1503a50a9dff74c2f34877dcb
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/gamepick/gamepick-0.35-r1.ebuild b/games-util/gamepick/gamepick-0.35-r1.ebuild
deleted file mode 100644
index 0929757f8c47..000000000000
--- a/games-util/gamepick/gamepick-0.35-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils
-
-DESCRIPTION="Launch opengl games with custom graphic settings"
-HOMEPAGE="http://www.rillion.net/gamepick/index.html"
-SRC_URI="http://www.rillion.net/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's/-O2//' \
-		src/Makefile.in || die
-}
-
-src_install() {
-	default
-	newicon ${PN}-48x48.xpm ${PN}.xpm
-	make_desktop_entry ${PN} ${PN}
-}
diff --git a/games-util/gamepick/metadata.xml b/games-util/gamepick/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/gamepick/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/glbsp-2.24 b/games-util/glbsp-2.24
new file mode 100644
index 000000000000..66eb76b14880
--- /dev/null
+++ b/games-util/glbsp-2.24
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=fltk? ( x11-libs/fltk:1 )
+DESCRIPTION=A node builder specially designed for OpenGL ports of the DOOM game engine
+EAPI=5
+HOMEPAGE=http://glbsp.sourceforge.net/
+IUSE=fltk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=fltk? ( x11-libs/fltk:1 )
+SLOT=0
+SRC_URI=mirror://sourceforge/glbsp/glbsp_src_224.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=92bfa50894aab7a85691a96b7daf8437
diff --git a/games-util/glbsp/Manifest b/games-util/glbsp/Manifest
deleted file mode 100644
index 35756228aea6..000000000000
--- a/games-util/glbsp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX glbsp-2.24-ldflags.patch 737 BLAKE2B 8450c3fc7d83aa5444802de8e415f1776c82422ced5a4c2320f39ee7989ce601a6fc0b97cc1a94e548d7b8a6bd40d5e53644c0725a694ddea2c0e782515a8b6c SHA512 78425825ea6049299afae48c2de89e9fa3e8f4994f176b7a42785eb3fcff625c69a2b3230f5aa624987fa4290f83eb9cf298d397b74171a2b0d94b70ab446d4f
-DIST glbsp_src_224.tar.gz 230977 BLAKE2B a8fce559e2d37e0662dd773f94d781a63bbce66d7fca87b785b7ba095670844fe441093d721eba95eb679457d6217327e93002e54848ed919cf34e552e152030 SHA512 562201093b69ae1db113479f8dd71e474d2d4ea7798b5e156dc096660e0b725a16ba44e8d2bfd332eba89b66d07ac2a1ddd803e75802c8fb3739a420701b2e1a
-EBUILD glbsp-2.24.ebuild 1524 BLAKE2B d34b5efb35b791b9409014c4e92f5c6e7f7873759e38a5084bd8444ad7e391da50a0b4d9769b2e04fbb181273035a3a688fe13d19963f4ecec5e67a5522df637 SHA512 753f32d0be4271e40d992dade06d5a61cabace99334568ebcf4776248b03804fe98cdd9b6fb4235559c51e48b62e9ef64a3102964573c9c6ef3bcf40689506fc
-MISC metadata.xml 328 BLAKE2B 642bdaa12af0d72ec65674304abdf376413e4721907ff967369be6234f46fc053792bee05d921d14e86d7432f8f355c8329ace8dab8464bdd8332c0e93c4f624 SHA512 ec7fab9de36fc312330b2e8251da6909a7d6ec1350145a7ef9681085993173f8ff8da796d4c868605c4391c7ad8ea4a11fb40e00b4fde754711dd060e0486347
diff --git a/games-util/glbsp/files/glbsp-2.24-ldflags.patch b/games-util/glbsp/files/glbsp-2.24-ldflags.patch
deleted file mode 100644
index e6adb0ff035c..000000000000
--- a/games-util/glbsp/files/glbsp-2.24-ldflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.unx.old	2010-11-25 11:24:48.000000000 +0100
-+++ Makefile.unx	2010-11-25 11:25:10.000000000 +0100
-@@ -79,8 +79,7 @@
- 	$(CC) $(CMD_FLAGS) -c $^ -o $@
- 
- $(CMD_NAME): $(LIB_NAME) $(CMD_OBJS)
--	$(CC) $(CMD_FLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
--	$(STRIP) $@
-+	$(CC) $(CMD_FLAGS) $(LDFLAGS) $(CMD_OBJS) -o $@ $(LIB_NAME) $(CMD_LIBS)
- 
- install: $(CMD_NAME)
- 	cp $(CMD_NAME) $(INSTALL_PREFIX)/bin/
---- Makefile.unx.old	2010-11-25 11:31:27.000000000 +0100
-+++ Makefile.unx	2010-11-25 11:31:31.000000000 +0100
-@@ -125,7 +125,6 @@
- 
- $(GUI_NAME): $(LIB_NAME) $(GUI_OBJS)
- 	$(CXX) $(GUI_FLAGS) $(GUI_OBJS) -o $@ $(LIB_NAME) $(GUI_LIBS)
--	$(STRIP) $@
- 
- 
- # ----- DOCUMENTATION ---------------------------------------------
diff --git a/games-util/glbsp/glbsp-2.24.ebuild b/games-util/glbsp/glbsp-2.24.ebuild
deleted file mode 100644
index e6c982167ae0..000000000000
--- a/games-util/glbsp/glbsp-2.24.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs versionator
-
-MY_PV=$(delete_version_separator 1)
-DESCRIPTION="A node builder specially designed for OpenGL ports of the DOOM game engine"
-HOMEPAGE="http://glbsp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/glbsp/${PN}_src_${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fltk"
-
-DEPEND="fltk? ( x11-libs/fltk:1 )"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${P}-source
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "/^CC=/s:=.*:=$(tc-getCC):" \
-		-e "/^CXX=/s:=.*:=$(tc-getCXX):" \
-		-e "/^AR=/s:ar:$(tc-getAR):" \
-		-e "/^RANLIB=/s:=.*:=$(tc-getRANLIB):" \
-		-e "s:-O2:${CFLAGS}:" \
-		-e "s:-O -g3:${CFLAGS}:" \
-		Makefile.unx \
-		nodeview/Makefile.unx || die
-}
-
-src_compile() {
-	emake -f Makefile.unx
-	if use fltk ; then
-		emake -f Makefile.unx glBSPX \
-			FLTK_FLAGS="$(fltk-config --cflags)" \
-			FLTK_LIBS="$(fltk-config --use-images --ldflags)"
-		emake -f Makefile.unx -C nodeview \
-			FLTK_CFLAGS="$(fltk-config --cflags)" \
-			FLTK_LIBS="$(fltk-config --use-images --ldflags)"
-	fi
-}
-
-src_install() {
-	dobin glbsp
-	dolib.a libglbsp.a
-	doman glbsp.1
-	dodoc AUTHORS.txt glbsp.txt
-	insinto "/usr/include"
-	doins "src/glbsp.h"
-
-	if use fltk ; then
-		newbin glBSPX glbspx
-		newicon gui/icon.xpm glbspx.xpm
-		make_desktop_entry glbspx glBSPX glbspx
-
-		dobin nodeview/nodeview
-		docinto nodeview
-		dodoc nodeview/{README,TODO}.txt
-	fi
-}
diff --git a/games-util/glbsp/metadata.xml b/games-util/glbsp/metadata.xml
deleted file mode 100644
index e71bd1594768..000000000000
--- a/games-util/glbsp/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">glbsp</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/grfcodec-6.0.6 b/games-util/grfcodec-6.0.6
new file mode 100644
index 000000000000..baa2a3724026
--- /dev/null
+++ b/games-util/grfcodec-6.0.6
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=media-libs/libpng:0 !games-util/nforenum dev-lang/perl dev-libs/boost
+DESCRIPTION=A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files
+EAPI=6
+HOMEPAGE=https://dev.openttdcoop.org/projects/grfcodec
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
+LICENSE=GPL-2+
+RDEPEND=media-libs/libpng:0
+SLOT=0
+SRC_URI=https://binaries.openttd.org/extra/grfcodec/6.0.6/grfcodec-6.0.6-source.tar.xz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=2f3a975db6563d28fbad9631a2622634
diff --git a/games-util/grfcodec/Manifest b/games-util/grfcodec/Manifest
deleted file mode 100644
index 76ae1902c91f..000000000000
--- a/games-util/grfcodec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST grfcodec-6.0.6-source.tar.xz 166820 BLAKE2B ba81e31477fb15bb5273add4d993ee7de88cfd47fd8300743e97c4abd19b0daf736d78b5bafc82569ff110757131501c07d7365a4e7ffde8d3a7fcc2e277bada SHA512 543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480
-EBUILD grfcodec-6.0.6.ebuild 1066 BLAKE2B ca41f8822b55fba5dac610e2bb9efcd786b5ee9bda3084407953cbade5c450f383337ef11c354e44a4ebd7c42ef60ab55a614c94f204602c17c7d6bb7dcaaa08 SHA512 6ac4994f25b2cfe551e56d9d9d828797928ae3a205e440a743213a468cd697d15d7442af0313744a296fa6d1a4b37baf295f696b9434a4fa5dc8c9757c847921
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/grfcodec/grfcodec-6.0.6.ebuild b/games-util/grfcodec/grfcodec-6.0.6.ebuild
deleted file mode 100644
index ebfb9b894f6b..000000000000
--- a/games-util/grfcodec/grfcodec-6.0.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [ "${PV%9999}" != "${PV}" ] ; then
-	SCM=mercurial
-	EHG_REPO_URI="http://hg.openttdcoop.org/${PN}"
-fi
-
-inherit toolchain-funcs ${SCM}
-
-DESCRIPTION="A suite of programs to modify openttd/Transport Tycoon Deluxe's GRF files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/grfcodec"
-[[ -z ${SCM} ]] && SRC_URI="https://binaries.openttd.org/extra/${PN}/${PV}/${P}-source.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0"
-DEPEND="
-	${RDEPEND}
-	!games-util/nforenum
-	dev-lang/perl
-	dev-libs/boost
-"
-
-src_prepare() {
-	default
-
-	# Set up Makefile.local so that we respect CXXFLAGS/LDFLAGS
-	cat > Makefile.local <<-__EOF__
-		CXX=$(tc-getCXX)
-		BOOST_INCLUDE=/usr/include
-		CXXFLAGS=${CXXFLAGS}
-		LDOPT=${LDFLAGS}
-		UPX=
-		V=1
-		FLAGS=
-		EXE=
-	__EOF__
-	sed -i -e 's/-O2//g' Makefile || die
-}
-
-src_install() {
-	dobin grfcodec grfid grfstrip nforenum
-	doman docs/*.1
-	dodoc changelog.txt docs/*.txt
-}
diff --git a/games-util/grfcodec/metadata.xml b/games-util/grfcodec/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/grfcodec/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/gslist-0.8.11a-r1 b/games-util/gslist-0.8.11a-r1
new file mode 100644
index 000000000000..3a04b4d4466f
--- /dev/null
+++ b/games-util/gslist-0.8.11a-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/geoip app-arch/unzip
+DESCRIPTION=A GameSpy server browser
+EAPI=6
+HOMEPAGE=http://aluigi.altervista.org/papers.htm#gslist
+IUSE=web
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/geoip
+SLOT=0
+SRC_URI=mirror://gentoo/gslist-0.8.11a.zip
+_md5_=6a3efca613eb4d37f26220266ea9dcdc
diff --git a/games-util/gslist/Manifest b/games-util/gslist/Manifest
deleted file mode 100644
index 021c91406d8c..000000000000
--- a/games-util/gslist/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gslist-0.8.11a-build.patch 1178 BLAKE2B ab697e84bb08416e799eb9716bbfe87ef53d30957ab3eb27a79411920f62d9533773ddf17e5351c4d09a324645ad836e3be889fdfcde632fe926eb18491d16b0 SHA512 c938ce951c6042baa769019d274583610a9a5506c4ceeb2816ed372cae08bdfd5b228f3027064b6d92a5bf8beac88ad34f5fd8285ea0512baac7fcbbf6ae076c
-DIST gslist-0.8.11a.zip 2599227 BLAKE2B ff469f74d2cb5436adc0ad95d18fe7806eb726c3856b7e87e97233dc5fca3433a6aa12e94b38ba531ca5296c9c0ffca036cd2056f7dd3e1e611cd7f5e6b1c2da SHA512 082cda97bf82ba4763236ce142d65a90b3372a430436cdc9fdccd1101feb5a2741807dff5a00e81fc833048e81468473d90851d23574167e78166beef08d0734
-EBUILD gslist-0.8.11a-r1.ebuild 616 BLAKE2B be1442b3e2d52ef04719ab75315ffec0ba56894a77bd8ddb63e9e29dc304a3e784fefc76d001d1b15cc739692a1f15473ee0cb7efd714ee60066a7c5493d00dc SHA512 b8c3eddae6b24cc26fd655d45158f9b40c820c96499c4988fe41e617bdcbb6a7b703d072f61d55f150ff7bca1052d9b4a4d0fe920a24b97081285929b68b3251
-MISC metadata.xml 319 BLAKE2B 3de65996c84200d418de6cb2e8beac86afed640f3f3bb6d9d9e9faab5eac156ff6ae05dad539ed6ccf7bdbac3954b821ed03a8972222a5a0e027c4b30b4c6981 SHA512 346a94d5d5aac11f3fcbd7ceac55b80462999debf98aa95d17479944873a0c08e1256def22b0e8225ef57b70deb249db0d93fe76a85a8897bb8b9f92750ea43f
diff --git a/games-util/gslist/files/gslist-0.8.11a-build.patch b/games-util/gslist/files/gslist-0.8.11a-build.patch
deleted file mode 100644
index 4ffbfd94e012..000000000000
--- a/games-util/gslist/files/gslist-0.8.11a-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- work.orig/Makefile
-+++ work/Makefile
-@@ -1,26 +1,30 @@
--CFLAGS	+= -O2 -s -fstack-protector-all
-+CFLAGS	+= -Wall -D_GNU_SOURCE
- PREFIX	= /usr/local
- BINDIR	= $(PREFIX)/bin
- SRC	= src/gslist.c src/enctype1_decoder.c src/enctype2_decoder.c src/enctype_shared.c src/mydownlib.c
- #LIBS	= -lpthread /usr/lib/libGeoIP.a /usr/lib/i386-linux-gnu/libz.a
- #SQLIBS	= /usr/lib/i386-linux-gnu/libmysqlclient.a /usr/lib/i386-linux-gnu/libm.a -ldl
- LIBS	= -lpthread -lGeoIP -lz
--SQLIBS	= -lmysqlclient
- O	= $(SRC:.c=.o)
- 
--all:	gslist gslistsql
-+ifneq ($(GSWEB),0)
-+CFLAGS += -DGSWEB
-+endif
- 
--gslist:	
--	$(CC) $(SRC) $(CFLAGS) -o gslist $(LIBS) -DGSWEB
--	$(CC) $(SRC) $(CFLAGS) -o gslistsql $(SQLIBS) $(LIBS) -DGSWEB -DSQL
-+ifneq ($(SQL),0)
-+CFLAGS += -DSQL
-+LIBS   += -lmysqlclient
-+endif
-+
-+gslist:	$(O)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o gslist $(O) $(LIBS)
- 
- clean:
--	rm -f gslist gslistsql src/gslist.o src/enctype1_decoder.o src/enctype2_decoder.o src/enctype_shared.o src/enctypex_decoder.o src/mydownlib.o
-+	rm -f gslist $(O)
- 
- install:
- 	install -m 755 -d $(BINDIR)
- 	install -m 755 gslist $(BINDIR)/gslist
--	install -m 755 gslistsql $(BINDIR)/gslistsql
- 
- .PHONY:
- 	clean install
diff --git a/games-util/gslist/gslist-0.8.11a-r1.ebuild b/games-util/gslist/gslist-0.8.11a-r1.ebuild
deleted file mode 100644
index cbe916e10a66..000000000000
--- a/games-util/gslist/gslist-0.8.11a-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A GameSpy server browser"
-HOMEPAGE="http://aluigi.altervista.org/papers.htm#gslist"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="web"
-
-RDEPEND="dev-libs/geoip"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-)
-
-src_prepare() {
-	default
-	rm -f gslist gslistsql *.exe *.dll || die
-}
-
-src_compile() {
-	emake SQL=0 $(use web || echo GSWEB=0)
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ${PN}.txt
-}
diff --git a/games-util/gslist/metadata.xml b/games-util/gslist/metadata.xml
deleted file mode 100644
index aea04961416e..000000000000
--- a/games-util/gslist/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<use>
-		<flag name="web">Enable the web interface</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-util/gtkevemon-1.10 b/games-util/gtkevemon-1.10
new file mode 100644
index 000000000000..018f3fe761f2
--- /dev/null
+++ b/games-util/gtkevemon-1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2 dev-libs/openssl:0 virtual/pkgconfig
+DESCRIPTION=A standalone skill monitoring application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/gtkevemon/gtkevemon
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-cpp/gtkmm:2.4 dev-libs/libxml2 dev-libs/openssl:0
+SLOT=0
+SRC_URI=https://github.com/gtkevemon/gtkevemon/archive/v1.10.tar.gz -> gtkevemon-1.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=091ba41a662faaa90f798c4e356b7f6f
diff --git a/games-util/gtkevemon-9999 b/games-util/gtkevemon-9999
new file mode 100644
index 000000000000..15116b1c9332
--- /dev/null
+++ b/games-util/gtkevemon-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare unpack
+DEPEND=dev-cpp/gtkmm:3.0 dev-libs/libxml2 net-misc/curl[ssl] virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=A standalone skill monitoring application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/gtkevemon/gtkevemon
+LICENSE=GPL-3
+RDEPEND=dev-cpp/gtkmm:3.0 dev-libs/libxml2 net-misc/curl[ssl]
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d295573a67b31f1b7d3ddad61bce4dc7
diff --git a/games-util/gtkevemon/Manifest b/games-util/gtkevemon/Manifest
deleted file mode 100644
index 5a8506c9b4da..000000000000
--- a/games-util/gtkevemon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gtkevemon-1.10.tar.gz 240225 BLAKE2B cd2b64577e85d36e63ecd35c644c0a22da88caa3cd8587a703d4e4e95bfca6b4007fdb0a9e9bc4545e057e6ecf8b6f3c99e84ea7b91ab24fd4f603b91d9bc076 SHA512 c3fad5ba1947be527adf9c90bfad60eb505fd6b3bb3379f960748ccb529381b34b5c5c653516220d17998c95ce2b53105834f7d79053bc1e8ccc9094c8b974c9
-EBUILD gtkevemon-1.10.ebuild 955 BLAKE2B 136d44764e42698e9f6608f9be5ace24f969922c0b6dd401ef1ac673d43c9d2a1972948f3d6b2100bcfa52efe6cfc979a180c9899abddc5f0d554d279fb1c733 SHA512 bb86529e37acf59288555ccbf6f9eababa65b485b5d0db10e0e57c7e0f563a756bb7fce7dd38763cfd804ec7cc674cfc448fedd036077b154e425f56d3244590
-EBUILD gtkevemon-9999.ebuild 917 BLAKE2B 8b333889a59920ede2f3f1940f8945ee5e17c3c83f00a873ea0d41b260a72107a252c02b4b1d058a90602119edbc75b607810e37a557327a24b0d235d291ce22 SHA512 cf0a4cf8c347b1d4a552d7c0f9d6dc5b314fc565dd70f5adecd0e90957d60174a43493b937b2af440c91d00c8a59498db74536f33403d6b1c2bd12e2cb4f5243
-MISC metadata.xml 566 BLAKE2B 2595bd5070fc73f93e2ef0a618cfd4059572360f18108f9759c8320d5ba3c5f20b2b51094ef696993463cb8eea122b4149c17ecedcc8141e13a4b5be8041b12e SHA512 729d349d1f8a3ef31a3bb6413ecd9ca1069e57fe0e34d98e56fde84cbc2a9a8565a832ad27c07b0a05452fbbb63348ec48c369b02c1367aa2cb487fd1784d0ad
diff --git a/games-util/gtkevemon/gtkevemon-1.10.ebuild b/games-util/gtkevemon/gtkevemon-1.10.ebuild
deleted file mode 100644
index c753cae2122b..000000000000
--- a/games-util/gtkevemon/gtkevemon-1.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A standalone skill monitoring application for EVE Online"
-HOMEPAGE="https://github.com/gtkevemon/gtkevemon"
-SRC_URI="https://github.com/gtkevemon/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/gtkmm:2.4
-	dev-libs/libxml2
-	dev-libs/openssl:0
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-src_prepare() {
-	default
-
-	sed -e 's:Categories=Game;$:Categories=Game;RolePlaying;GTK;:' \
-		-i "icon/${PN}.desktop" \
-		|| die "failed fix categories in icon/${PN}.desktop"
-
-	# Fixes a QA notice.
-	sed -i "/^Encoding/d" "icon/${PN}.desktop" \
-		|| die "failed to remove the Encoding from icon/${PN}.desktop"
-
-	append-cxxflags -std=c++11
-}
-
-src_install() {
-	dobin "src/${PN}"
-	doicon "icon/${PN}.svg"
-	domenu "icon/${PN}.desktop"
-	einstalldocs
-}
diff --git a/games-util/gtkevemon/gtkevemon-9999.ebuild b/games-util/gtkevemon/gtkevemon-9999.ebuild
deleted file mode 100644
index 3a8c5bb264d8..000000000000
--- a/games-util/gtkevemon/gtkevemon-9999.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic git-r3
-
-DESCRIPTION="A standalone skill monitoring application for EVE Online"
-HOMEPAGE="https://github.com/gtkevemon/gtkevemon"
-EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	dev-cpp/gtkmm:3.0
-	dev-libs/libxml2
-	net-misc/curl[ssl]
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -e 's:Categories=Game;$:Categories=Game;RolePlaying;GTK;:' \
-		-i "icon/${PN}.desktop" \
-		|| die "failed fix categories in icon/${PN}.desktop"
-
-	# Fixes a QA notice.
-	sed -i "/^Encoding/d" "icon/${PN}.desktop" \
-		|| die "failed to remove the Encoding from icon/${PN}.desktop"
-
-	append-cxxflags -std=c++11
-}
-
-src_install() {
-	dobin "src/${PN}"
-	doicon "icon/${PN}.svg"
-	domenu "icon/${PN}.desktop"
-	einstalldocs
-}
diff --git a/games-util/gtkevemon/metadata.xml b/games-util/gtkevemon/metadata.xml
deleted file mode 100644
index d9cd7a74ba33..000000000000
--- a/games-util/gtkevemon/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-	GtkEveMon is a standalone skill monitoring application for EVE Online.
-	It allows monitoring characters' skills and skill training process without
-	starting EVE Online. It is intended as a lightweight, cross-platform
-	alternative to EveMon, a popular skill monitoring application for Windows.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">gtkevemon/gtkevemon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/higan-purify-03 b/games-util/higan-purify-03
new file mode 100644
index 000000000000..5bb7089e4d31
--- /dev/null
+++ b/games-util/higan-purify-03
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-games/higan-ananke x11-libs/gtk+:2 x11-libs/libX11 virtual/pkgconfig
+DESCRIPTION=Rom purifier for higan
+EAPI=5
+HOMEPAGE=http://byuu.org/higan/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-games/higan-ananke x11-libs/gtk+:2 x11-libs/libX11
+SLOT=0
+SRC_URI=https://higan.googlecode.com/files/purify_v03-source.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7d4cd29c6d29e56d105ff78dee7d5df7
diff --git a/games-util/higan-purify/Manifest b/games-util/higan-purify/Manifest
deleted file mode 100644
index 4c87e06c40d0..000000000000
--- a/games-util/higan-purify/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX higan-purify-03-QA.patch 1404 BLAKE2B 670d0897fb3d3fb565c36ec30c5dedefdb71bc13770e49a3532059356f3caf652df3a11e00c35e27724ea75e033a248124abca2fc60aa33140d2f858138e39a4 SHA512 31e1fdcd147e75fcaedd1778ef636edc97552fdf520468dd4723112f6557fde0d01a1f476c451e638ca05988543549fa1c76fd83ea70b7f0dbb03a61a4ff02b9
-DIST purify_v03-source.tar.xz 196924 BLAKE2B f4d22ccc34d1c345a2dee20c14bab2614b71b0df2660f3f0883df1b56b5e5fc7fc99872f73ebe674faca8bb455f1a90e5bf79ce9b893f980e99b94546bbcf400 SHA512 095b62013f5a33e720b87c48f32c41239d8cef4c6ddc2b6d119d15b3f8b92bc15d744afa0b2bc8d7a49ef53f8f3fa7f2247be490499a9b194863534f9c1a4b3d
-EBUILD higan-purify-03.ebuild 774 BLAKE2B 09397611fc72e84e516b87f98f7773795bc3273c59d52cc4b68cc6045b8a6e9bcd36af5791ab0cd3bc07701d5c087825ac2a2336c14f69f399e7911051eea093 SHA512 e90d83850caf9f0fa3485763b90652767d8a6eceb5ddcfcc7282a2d6362c24948c02c7434ffbb6f471d7ebb57bc25b1a9685fc58a964a1093e444dff96082598
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/higan-purify/files/higan-purify-03-QA.patch b/games-util/higan-purify/files/higan-purify-03-QA.patch
deleted file mode 100644
index e523ba4cad95..000000000000
--- a/games-util/higan-purify/files/higan-purify-03-QA.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- purify_v03-source/purify/Makefile
-+++ purify_v03-source/purify/Makefile
-@@ -2,8 +2,8 @@
- include phoenix/Makefile
- 
- path := /usr/local/bin
--flags := -I. -O3 -fomit-frame-pointer
--link := -s
-+flags := -I. $(CXXFLAGS)
-+link := $(LDFLAGS)
- objects := obj/phoenix.o obj/purify.o
- 
- ifeq ($(platform),x)
-@@ -22,7 +22,7 @@
- 
- build: $(objects)
- ifeq ($(platform),x)
--	$(cpp) -pthread $(link) -o purify $(objects) $(phoenixlink)
-+	$(cpp) $(flags) -pthread $(link) -o purify $(objects) $(phoenixlink)
- else ifeq ($(platform),win)
- 	windres phoenix/windows/phoenix.rc obj/phoenix-resource.o
- 	$(cpp) -shared -o phoenix.dll obj/phoenix.o $(phoenixlink)
---- purify_v03-source/purify/phoenix/Makefile
-+++ purify_v03-source/purify/phoenix/Makefile
-@@ -4,13 +4,13 @@
-   endif
- 
-   ifeq ($(phoenix),gtk)
--    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0`
--    phoenixlink := `pkg-config --libs gtk+-2.0`
-+    phoenixflags := -DPHOENIX_GTK `pkg-config --cflags gtk+-2.0 x11`
-+    phoenixlink := `pkg-config --libs gtk+-2.0 x11` -ldl
-   endif
- 
-   ifeq ($(phoenix),qt)
--    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui`
--    phoenixlink := `pkg-config --libs QtCore QtGui`
-+    phoenixflags := -DPHOENIX_QT `pkg-config --cflags QtCore QtGui x11`
-+    phoenixlink := `pkg-config --libs QtCore QtGui x11` -ldl
-   endif
- else ifeq ($(platform),win)
-   phoenixflags := -DPHOENIX_WINDOWS
diff --git a/games-util/higan-purify/higan-purify-03.ebuild b/games-util/higan-purify/higan-purify-03.ebuild
deleted file mode 100644
index e9613fa1ec22..000000000000
--- a/games-util/higan-purify/higan-purify-03.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-MY_P=purify_v${PV}-source
-
-DESCRIPTION="Rom purifier for higan"
-HOMEPAGE="http://byuu.org/higan/"
-SRC_URI="https://higan.googlecode.com/files/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-games/higan-ananke
-	x11-libs/gtk+:2
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}/purify
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-QA.patch
-	sed -i \
-		-e "/handle/s#/usr/local/lib#/usr/$(get_libdir)#" \
-		nall/dl.hpp || die
-}
-
-src_compile() {
-	emake \
-		platform="x" \
-		compiler="$(tc-getCXX)" \
-		phoenix="gtk"
-}
-
-src_install() {
-	dobin purify
-}
diff --git a/games-util/higan-purify/metadata.xml b/games-util/higan-purify/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-util/higan-purify/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-util/joystick-1.6.0 b/games-util/joystick-1.6.0
new file mode 100644
index 000000000000..647ac01125e0
--- /dev/null
+++ b/games-util/joystick-1.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2
+DESCRIPTION=joystick testing utilities
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
+IUSE=sdl udev
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
+SLOT=0
+SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.6.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=26c6cb9a74b236560794f61dfc280266
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
deleted file mode 100644
index 438275836543..000000000000
--- a/games-util/joystick/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX joystick-1.4.8-udev.patch 1724 BLAKE2B 63fd913ee85bbcdb00ccf8150dcccca4f2f6c36ef274b04dffd78aaaf9906048368495855edaa8809f371b7f63320ad89b3c40f94242b8d1f4316ab04a4eece6 SHA512 8a00825c9fb293e174eace79b1ce08af9eb2c6e18450daa62ae67b7c6a49ebe6b2490de4ccc7c1177edb300ed361a0920773b14d90c1aae4a34062ca16ad76de
-AUX joystick-1.6.0-build.patch 831 BLAKE2B 942038f6997caa84cdbc8c05a6353dd448c1b70f9229f38084e2b8c80df2f8d3df3eb8a0da754a7ba56863aaed58375eec22267f08d304bd550d2237054f6e16 SHA512 071b15e16a1688e2d743dbf0bc44c784184ee93698b660394c83bed719d579952c9d73680e3e24754a41d5de69a65559b61255b0366c3437a193fc526c3d6064
-DIST linuxconsoletools-1.6.0.tar.bz2 50563 BLAKE2B 26f68f4a9a4af5b875bc7efcc70edd80978a560f62c415b4957ee851260a2f6e6227c5a3001fb009777eac7e19d0449a8335486290ae0aaa9467ad8e1e9a89fb SHA512 35ca923cceca729bcbab95dff18682abd0d87a297e70aa8707fbabccde018fef0775a99195af4bf9111ba33210a14c10d1a766f83112cd535930a1ae430c7c75
-EBUILD joystick-1.6.0.ebuild 887 BLAKE2B 4884fd349de63ed785b16f5f094463619560a4bfeb59ad5b9b9a4b24fd3d47eb00dd285ec2b4957e544828e846a953b5c5b77a8dad1a65564ad38a84a10e0982 SHA512 53c67ffa860135221e573741ca2352fefed4b8284022b906383bf63775ea62b751792218c3f9dd36448c20346683d6ee657d9a91dc7f748506c2827b2db0c3f5
-MISC metadata.xml 335 BLAKE2B e83ffecd1afda0861555f62d9bad50f99c8e1bebb296f303bbdb8624ea283eb04d30d76a74d9970f519e303e851991ae33b232f74c9d2fdacce16b59fccdf9f5 SHA512 6440a6652a98c7439b22df51f22089ddd867be3e07e6c04001aa15b1fc01fd84dc8d3244f106abe4ae89caf7561aa45fe2526f2f9e8e8844a5e44f9f8a51df41
diff --git a/games-util/joystick/files/joystick-1.4.8-udev.patch b/games-util/joystick/files/joystick-1.4.8-udev.patch
deleted file mode 100644
index c0032493ebf7..000000000000
--- a/games-util/joystick/files/joystick-1.4.8-udev.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1.4.8/utils/jscal-restore.in
---- linuxconsoletools-1.4.8.orig/utils/jscal-restore.in	2011-12-15 10:49:01.000000000 -0500
-+++ linuxconsoletools-1.4.8/utils/jscal-restore.in	2015-05-16 01:54:00.799168225 -0400
-@@ -6,8 +6,13 @@
-     exit 1
- fi
- 
--if [ ! -x /sbin/udevadm ]; then
--    echo Restoring joystick configuration requires udev! >&2
-+for f in /sbin/udevadm /bin/udevadm ;
-+do
-+    [ -x $f ] && UDEVADM=$f
-+done
-+
-+if [ -z "$UDEVADM" ] ; then
-+    echo Storing joystick configuration requires udev! >&2
-     exit 1
- fi
- 
-@@ -30,7 +35,7 @@
- # in the NAME value
- IFS=$'\x0A'
- 
--for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
-+for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
-     ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
-     VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
-     case $ID in
-diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-store.in linuxconsoletools-1.4.8/utils/jscal-store.in
---- linuxconsoletools-1.4.8.orig/utils/jscal-store.in	2011-12-15 10:49:01.000000000 -0500
-+++ linuxconsoletools-1.4.8/utils/jscal-store.in	2015-05-16 01:53:18.725607838 -0400
-@@ -11,14 +11,18 @@
-     echo "Stores the device's calibration for future use."
-     exit 1
- fi
-+for f in /sbin/udevadm /bin/udevadm ;
-+do
-+    [ -x $f ] && UDEVADM=$f
-+done
- 
--if [ ! -x /sbin/udevadm ]; then
-+if [ -z "$UDEVADM" ] ; then
-     echo Storing joystick configuration requires udev! >&2
-     exit 1
- fi
- 
- ident=$(mktemp)
--/sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
-+${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident > $ident
- . $ident
- rm $ident
- 
diff --git a/games-util/joystick/files/joystick-1.6.0-build.patch b/games-util/joystick/files/joystick-1.6.0-build.patch
deleted file mode 100644
index fa60ec719917..000000000000
--- a/games-util/joystick/files/joystick-1.6.0-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- linuxconsoletools-1.6.0/docs/Makefile
-+++ linuxconsoletools-1.6.0/docs/Makefile
-@@ -20,9 +20,13 @@
- # 02110-1301 USA.
- 
- MANPAGES	= inputattach.1 jstest.1 jscal.1 fftest.1 \
--		  ffmvforce.1 ffset.1 ffcfstress.1 jscal-store.1 \
-+		  ffset.1 ffcfstress.1 jscal-store.1 \
- 		  jscal-restore.1 evdev-joystick.1
- 
-+ifneq ($(USE_SDL),no)
-+MANPAGES += ffmvforce.1
-+endif
-+
- PREFIX          ?= /usr/local
- 
- install:
---- linuxconsoletools-1.6.0/utils/Makefile
-+++ linuxconsoletools-1.6.0/utils/Makefile
-@@ -27,9 +27,13 @@
- 
- CFLAGS		?= -g -O2 -Wall
- 
--PROGRAMS	= inputattach jstest jscal fftest ffmvforce ffset \
-+PROGRAMS	= inputattach jstest jscal fftest ffset \
- 		  ffcfstress jscal-restore jscal-store evdev-joystick
- 
-+ifneq ($(USE_SDL),no)
-+PROGRAMS += ffmvforce
-+endif
-+
- PREFIX          ?= /usr/local
- 
- compile: $(PROGRAMS)
diff --git a/games-util/joystick/joystick-1.6.0.ebuild b/games-util/joystick/joystick-1.6.0.ebuild
deleted file mode 100644
index ce8acc0a4ad6..000000000000
--- a/games-util/joystick/joystick-1.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-MY_P="linuxconsoletools-${PV}"
-DESCRIPTION="joystick testing utilities"
-HOMEPAGE="https://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/"
-SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="sdl udev"
-
-DEPEND="sdl? ( media-libs/libsdl:0[video] )
-	!<x11-libs/tslib-1.0-r2"
-RDEPEND="${DEPEND}
-	udev? ( virtual/udev )"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-build.patch
-	"${FILESDIR}"/${PN}-1.4.8-udev.patch
-)
-
-src_prepare() {
-	default
-
-	export PREFIX=/usr
-	tc-export CC PKG_CONFIG
-	export USE_SDL=$(usex sdl)
-}
-
-src_install() {
-	default
-	if use !udev ; then
-		rm "${D}"/usr/bin/jscal-{re,}store || die
-	fi
-}
diff --git a/games-util/joystick/metadata.xml b/games-util/joystick/metadata.xml
deleted file mode 100644
index 677407539cc4..000000000000
--- a/games-util/joystick/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">linuxconsole</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/lgogdownloader-3.3 b/games-util/lgogdownloader-3.3
new file mode 100644
index 000000000000..d464ea85fcd1
--- /dev/null
+++ b/games-util/lgogdownloader-3.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl] sys-apps/help2man virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Unofficial GOG.com downloader for Linux
+EAPI=6
+HOMEPAGE=https://sites.google.com/site/gogdownloader/
+IUSE=+debug
+KEYWORDS=~amd64 ~x86
+LICENSE=WTFPL-2
+RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl]
+SLOT=0
+SRC_URI=https://sites.google.com/site/gogdownloader/lgogdownloader-3.3.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1fb96a651c6268bd7f0343444b113c6f
diff --git a/games-util/lgogdownloader-9999 b/games-util/lgogdownloader-9999
new file mode 100644
index 000000000000..90f65d3fc04c
--- /dev/null
+++ b/games-util/lgogdownloader-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl] sys-apps/help2man virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Unofficial GOG.com downloader for Linux
+EAPI=6
+HOMEPAGE=https://sites.google.com/site/gogdownloader/
+IUSE=+debug
+LICENSE=WTFPL-2
+RDEPEND=>=app-crypt/rhash-1.3.3-r2:0= dev-cpp/htmlcxx:0= dev-libs/boost:0= >=dev-libs/jsoncpp-1.7:0= dev-libs/tinyxml2:0= net-libs/liboauth:0= >=net-misc/curl-7.32:0=[ssl]
+SLOT=0
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=01ee3567b780393911de683735f53d35
diff --git a/games-util/lgogdownloader/Manifest b/games-util/lgogdownloader/Manifest
deleted file mode 100644
index 0e172b46e3b5..000000000000
--- a/games-util/lgogdownloader/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST lgogdownloader-3.3.tar.gz 73873 BLAKE2B c2c4c56d6afcc4c103cc32a308be25252888f7668d7488d3aa2eec860f8e2694c62fe25a27e1f24132895d0a8683a226ca95667dac4e7837886b07cfd0821855 SHA512 7af67c440e88bcfbbd6f59b44b8cfd81fe9cee041715d4da968be3aedfe4301a5377ce61354a5cc093588d89300c88c862d9228672a2d79613419dce3619f4c9
-EBUILD lgogdownloader-3.3.ebuild 617 BLAKE2B fcc5b4667ea14cb9ed71edcec85a67778a4f8a26c4c2cbb0bd6db7d4236b1679605286d6cb4de5c7d8f640b98bf4934cefc11b4ef90f331e9c9ec9e8d4643ccc SHA512 1ba1653d7b228c0d30496209bc422d57cc08af72cb978e69f95e5caebf97ec080b8d2cecc99f491040d54c40c8b0cf507d60b3c70c7ef628e40d2ba98f2d0537
-EBUILD lgogdownloader-9999.ebuild 595 BLAKE2B 6952d20f49e8de4192580f817ed40ed75e9b4b4350ca4386d3ae833d7754ce64229dad443d65c8bbf16e97d5cce5aef9bdcb0e9b78f5e58c26d90f052ac82051 SHA512 96abd62dd1be6f345ea2aeae400c843eff0e68caa38bfed0e38b7fdd09957dfa170b988886a2144066c545e05845604d54af31d05f622ea1346c520f80f048ac
-MISC metadata.xml 1009 BLAKE2B 4a7828bf14d896ea37cc6091c2d019bb96e4c97e0ae3f2b48045a92aa9ec2a648058fe817b5cc0fc2bb98379365b9d94f9529ba5de1b3f5dca67dcb313f87cb9 SHA512 cc64f740c4b3ab4a5c4d87b60b2146b6b5a64869d19f6283428d365c7a6f79a6697b8bd63bd31c2cad63bb065d32ac751c643ff794adf966edfc8663debdd4af
diff --git a/games-util/lgogdownloader/lgogdownloader-3.3.ebuild b/games-util/lgogdownloader/lgogdownloader-3.3.ebuild
deleted file mode 100644
index 0ac33eae5786..000000000000
--- a/games-util/lgogdownloader/lgogdownloader-3.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Unofficial GOG.com downloader for Linux"
-HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-SRC_URI="https://sites.google.com/site/gogdownloader/${P}.tar.gz"
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+debug"
-
-RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
-	dev-cpp/htmlcxx:0=
-	dev-libs/boost:0=
-	>=dev-libs/jsoncpp-1.7:0=
-	dev-libs/tinyxml2:0=
-	net-libs/liboauth:0=
-	>=net-misc/curl-7.32:0=[ssl]"
-
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig"
diff --git a/games-util/lgogdownloader/lgogdownloader-9999.ebuild b/games-util/lgogdownloader/lgogdownloader-9999.ebuild
deleted file mode 100644
index 478ab0eee166..000000000000
--- a/games-util/lgogdownloader/lgogdownloader-9999.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils git-r3
-
-DESCRIPTION="Unofficial GOG.com downloader for Linux"
-HOMEPAGE="https://sites.google.com/site/gogdownloader/"
-EGIT_REPO_URI="https://github.com/Sude-/lgogdownloader.git"
-LICENSE="WTFPL-2"
-SLOT="0"
-IUSE="+debug"
-
-RDEPEND=">=app-crypt/rhash-1.3.3-r2:0=
-	dev-cpp/htmlcxx:0=
-	dev-libs/boost:0=
-	>=dev-libs/jsoncpp-1.7:0=
-	dev-libs/tinyxml2:0=
-	net-libs/liboauth:0=
-	>=net-misc/curl-7.32:0=[ssl]"
-
-DEPEND="${RDEPEND}
-	sys-apps/help2man
-	virtual/pkgconfig"
diff --git a/games-util/lgogdownloader/metadata.xml b/games-util/lgogdownloader/metadata.xml
deleted file mode 100644
index 8a63172d961f..000000000000
--- a/games-util/lgogdownloader/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Sude-/lgogdownloader</remote-id>
-	</upstream>
-	<longdescription>
-		LGOGDownloader is open source downloader to GOG.com for Linux
-		users using the same API as the official GOGDownloader.
-
-		Features:
-		* List available games
-		* Resume downloads
-		* Batch downloading
-		* Repair downloaded files
-		* Read/create XML files used by the official GOG Downloader
-		* Download cover art
-		* Check for orphaned files
-		* Check status of files
-		* Download individual files by id number
-		* List/download updated files
-		* Blacklist unwanted files
-		* Perl regular expressions for filtering games
-	</longdescription>
-</pkgmetadata>
diff --git a/games-util/linux-wbfs-manager-0.1.12 b/games-util/linux-wbfs-manager-0.1.12
new file mode 100644
index 000000000000..416fc8bd03a9
--- /dev/null
+++ b/games-util/linux-wbfs-manager-0.1.12
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig
+DESCRIPTION=WBFS manager for Linux using GTK+
+EAPI=5
+HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
+SLOT=0
+SRC_URI=https://linux-wbfs-manager.googlecode.com/files/linux-wbfs-manager-0.1.12.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=f7882b5aee292f3f826a4cb53deef04e
diff --git a/games-util/linux-wbfs-manager-9999 b/games-util/linux-wbfs-manager-9999
new file mode 100644
index 000000000000..d6a80f87f3fe
--- /dev/null
+++ b/games-util/linux-wbfs-manager-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install preinst prepare unpack
+DEPEND=dev-libs/glib:2 gnome-base/libglade:2.0 virtual/pkgconfig || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DESCRIPTION=WBFS manager for Linux using GTK+
+EAPI=5
+HOMEPAGE=https://code.google.com/p/linux-wbfs-manager/
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 gnome-base/libglade:2.0
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c1151a9144f151ada9dd19b56bb22ba8
diff --git a/games-util/linux-wbfs-manager/Manifest b/games-util/linux-wbfs-manager/Manifest
deleted file mode 100644
index 5fc94351162e..000000000000
--- a/games-util/linux-wbfs-manager/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST linux-wbfs-manager-0.1.12.tar.gz 34251 BLAKE2B 57a3e5c405318ab128455455e6e45fb58b397c6b3135d97b54642569b26fd9f388d65250723818795fc310704afb59db7a682dbcaaea9c26e113bf0a28998e5d SHA512 58ac4d110e27123d04261d618df8734a0471bcad63171025aa4766a73bcc4a9240fceec59b1ba91fff71230e98f57b5fdd12390d380dc0c41d08740b7076bf6f
-EBUILD linux-wbfs-manager-0.1.12.ebuild 916 BLAKE2B dd786f471afb037d1d4a5f50c311e30322995ad114d7b0c8b5cf16dfbbef1af9f7ad6b8e3434d53824f9f0a557e0af7597400631a8a6d46a0413ce8a0837faa2 SHA512 09e8aab18b18c8b8eb001c844ae589e44ee04c04a668b158dbd6da07891812170f4d4a8d3f945876bce3a9ad6e39859c324ef8a43f2068a5208a6d697036293f
-EBUILD linux-wbfs-manager-9999.ebuild 916 BLAKE2B 060cad1ce2e2e3b1982df08efdefe1d5fbff75b03ce4cb6d14d26040b1737d721f738fa3e1c019c7067e1dd3678ea07e9e88270578b236ac45f0ca57f18fc830 SHA512 a56bb18d7466c517aea67a668bc30b91b8d59773127699963ee5aefc24b706a74751ecfa75fb94b33787ba8979d04bab8980cb7d76c85a2b0652ed065a0b8496
-MISC metadata.xml 341 BLAKE2B 6dfa68b48d7d834af0a719e930d49fca895d7f929780e087882b9e5889ab492f02ad3f3ebaa990e4c995b80ef43e714fce299ff16181426138dcbe5fe1a6c211 SHA512 46913ec989d81928c2faf97ef1a4e57e19f412189b9acf6de875fea5a9615e808dde58ad29df401fa8d125dd1be232f76800dd2497c60a160db752a13f2ff8cd
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
deleted file mode 100644
index ac70b1fc110d..000000000000
--- a/games-util/linux-wbfs-manager/linux-wbfs-manager-0.1.12.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-if [[ "${PV}" == "9999" ]]; then
-	ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
-	inherit toolchain-funcs subversion
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	inherit toolchain-funcs
-	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi;
-
-DESCRIPTION="WBFS manager for Linux using GTK+"
-HOMEPAGE="https://code.google.com/p/linux-wbfs-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${ECVS_MODULE}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		subversion_src_unpack
-	else
-		default
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin wbfs_gtk
-	dodoc README
-}
diff --git a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild b/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
deleted file mode 100644
index 59c3678a99f2..000000000000
--- a/games-util/linux-wbfs-manager/linux-wbfs-manager-9999.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-if [[ "${PV}" == "9999" ]]; then
-	ESVN_REPO_URI="https://linux-wbfs-manager.googlecode.com/svn/trunk/"
-	inherit toolchain-funcs subversion
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	inherit toolchain-funcs
-	SRC_URI="https://linux-wbfs-manager.googlecode.com/files/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi;
-
-DESCRIPTION="WBFS manager for Linux using GTK+"
-HOMEPAGE="https://code.google.com/p/linux-wbfs-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${ECVS_MODULE}
-else
-	S=${WORKDIR}/${PN}
-fi
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		subversion_src_unpack
-	else
-		default
-	fi
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)"
-}
-
-src_install() {
-	dobin wbfs_gtk
-	dodoc README
-}
diff --git a/games-util/linux-wbfs-manager/metadata.xml b/games-util/linux-wbfs-manager/metadata.xml
deleted file mode 100644
index 42bfc468b26b..000000000000
--- a/games-util/linux-wbfs-manager/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">linux-wbfs-manager</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/loki_patch-20091105 b/games-util/loki_patch-20091105
new file mode 100644
index 000000000000..4b70ec99ad7a
--- /dev/null
+++ b/games-util/loki_patch-20091105
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Loki Software binary patch tool
+EAPI=5
+HOMEPAGE=http://www.icculus.org/loki_setup/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
+SLOT=0
+SRC_URI=mirror://gentoo/loki_patch-20091105.tar.bz2 mirror://gentoo/loki_setupdb-20091105.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1d4db28fc08d1336e9c864d1efa57c4a
diff --git a/games-util/loki_patch/Manifest b/games-util/loki_patch/Manifest
deleted file mode 100644
index 9e09480a90f5..000000000000
--- a/games-util/loki_patch/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX loki_patch-20091105-build.patch 4617 BLAKE2B 2dd2804ee90c88e8cc055a26dcf75ade6fc96d7e194a25909b97df745b74d8a67e80190b60af824538e82458e67648f7fa9390456000d31cc071001481bde5e0 SHA512 eabc0db3f6594b99ef76d57e1fdd738c96e4ef45c0bb67127907fa6a19d19002e2a97acc2735e7353915047ecf626bacd6bcdc7bf42446cd42c6b10f79dc6ca7
-AUX loki_patch-20091105-patchdata.patch 257 BLAKE2B 0bab64cabdfc931e06f61b140a5a079267028c7e975a742344cb593b5144776152f2b88c12877de26fef23e1b8efe8db5448b123d889c19eaf61ccc229e640ab SHA512 e21da8ce772f38c1bc2acb52bedeb96042e5bb2168c76ec3efde995bfd4b113000a20b4c6efba92fc79f7ebc16486cc7871d628bf71494bf4bb8ce7dfd7dfed4
-DIST loki_patch-20091105.tar.bz2 331725 BLAKE2B a3fa2e1c594d3484830527276ebd24f6e1c56f924b815fd3e2a12f802bccfd556017084a094508c531badd568158eb68fa3d608c30a55110de24410088fc5275 SHA512 9db40b1746ecf5603c09be3ddf01bf92cfc6b3d1c35ac7153751e1871840175c538af98c22f458658bcbebac65ccddccc1aee92a88300a243b8e68bda13ca323
-DIST loki_setupdb-20091105.tar.bz2 60725 BLAKE2B d3bed3d6b9123093b307f9c735f14c630f8ebfd2b228d6268cf97e8016ec83fa18b3b390e84facd42afe5d3f707bfb63a48e21a6b002a7d0583fdbde907567dc SHA512 ba55b24a6e2b2b6268dec9df8ec0581d852461b5c07ca97a24ebee3e55fe5764dffbbcfdb6b18a80677f2fae1e7701df4fbca0f6af8ef8050c662f5a39daf25d
-EBUILD loki_patch-20091105.ebuild 874 BLAKE2B c67c080b6639c66bf20d26522b13bfdabfd169ac6696092e03a9aa44d222428b7aaf2cb94aa29835b4ee6e43b15ef53d40f128fbdd0cdd6eac215286528f4638 SHA512 4e6e08b74cb19c7dd3e20a5b7a35bae1d25140ed1e41af95af2d106534aef94a5b2a37cce2f3085ac3c23b0548cc216fdcc6fec6438604d27332c6ae41003543
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/loki_patch/files/loki_patch-20091105-build.patch b/games-util/loki_patch/files/loki_patch-20091105-build.patch
deleted file mode 100644
index 8e2b5bbf1557..000000000000
--- a/games-util/loki_patch/files/loki_patch-20091105-build.patch
+++ /dev/null
@@ -1,179 +0,0 @@
---- loki_patch/configure.in
-+++ loki_patch/configure.in
-@@ -1,4 +1,4 @@
--AC_INIT(README)
-+AC_INIT(loki_patch, 1.0.2)
- 
- dnl Define the release numbers here
- 
-@@ -10,13 +10,14 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
-+AM_INIT_AUTOMAKE(foreign no-dependencies)
- AC_PROG_CC
- AC_PROG_MAKE_SET
- AC_PROG_INSTALL
- 
- AC_CHECK_HEADERS(unistd.h)
- 
--CFLAGS="-fsigned-char -funroll-loops -Wall -g -O2"
-+CFLAGS="$CFLAGS -fsigned-char -Wall"
- 
- case "$target" in
-     *i?86*)
-@@ -32,17 +33,12 @@
- OS=`uname -s`
- 
- dnl Look for the XML libraries
-+PKG_CHECK_MODULES(XML, libxml-2.0)
-+AC_SUBST(XML_LIBS)
- 
--AC_PATH_PROG(HAVEXML, xml-config, $PATH)
--if test ! -z "$HAVEXML"; then
--    XML_CFLAGS=`$HAVEXML --cflags`
--    XML_PREFIX=`$HAVEXML --prefix`
--
--    CFLAGS="$CFLAGS $XML_CFLAGS"
--    LIBS="$LIBS $XML_PREFIX/lib/libxml.a"
--else
--    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
--fi
-+PKG_CHECK_MODULES(XDELTA, xdelta)
-+AC_SUBST(XDELTA_CFLAGS)
-+AC_SUBST(XDELTA_LIBS)
- 
- SETUPDB_VERSION=1.0.0
- SETUPDB="`pwd`/../loki_setupdb-$SETUPDB_VERSION"
-@@ -57,14 +53,6 @@
-         SETUPDB=$with_setupdb
- fi
- 
--dnl Check for correct setupdb installation
--
--if test -f $SETUPDB/$ARCH/libsetupdb.a; then
--    AC_MSG_RESULT([SetupDB library found in $SETUPDB/$ARCH])
--else
--    AC_MSG_ERROR([*** Please compile setupdb first!])
--fi
--
- CFLAGS="$CFLAGS -I$SETUPDB"
- 
- AC_SUBST(SETUPDB)
---- loki_patch/loki_xdelta.c
-+++ loki_patch/loki_xdelta.c
-@@ -49,7 +49,7 @@
- 
- #define LOKI_PATCH
- 
--#include "xdelta_inc/xdelta.h"
-+#include <xdelta.h>
- 
- static HandleFuncTable xd_handle_table;
- 
---- loki_patch/Makefile.am
-+++ loki_patch/Makefile.am
-@@ -0,0 +1,12 @@
-+COMMONSRC = load_patch.c size_patch.c print_patch.c \
-+	loki_xdelta.c mkdirhier.c log_output.c
-+
-+bin_PROGRAMS = make_patch loki_patch
-+
-+make_patch_SOURCES = $(COMMONSRC) make_patch.c tree_patch.c save_patch.c
-+
-+loki_patch_SOURCES = $(COMMONSRC) loki_patch.c apply_patch.c registry.c
-+
-+AM_CPPFLAGS = $(XDELTA_CFLAGS)
-+
-+LDADD = $(top_builddir)/../loki_setupdb/libsetupdb.a $(XDELTA_LIBS) $(XML_LIBS) -lz
---- loki_setupdb/configure.in
-+++ loki_setupdb/configure.in
-@@ -1,4 +1,4 @@
--AC_INIT
-+AC_INIT(setupdb, 1.6.5)
- AC_CONFIG_HEADER(config.h)
- 
- dnl Define the release numbers here
-@@ -12,8 +12,7 @@
- PACKAGE_VERSION="$SETUPDB_VERSION_MAJOR.$SETUPDB_VERSION_MINOR.$SETUPDB_VERSION_RELEASE"
- PACKAGE_STRING="$PACKAGE_NAME v$PACKAGE_VERSION"
- 
--test "x$CFLAGS" = x && CFLAGS="-O2"
--CFLAGS="$CFLAGS -fsigned-char -Wall -g -I."
-+CFLAGS="$CFLAGS -fsigned-char -Wall"
- REENTRANT="-D_REENTRANT"
- 
- if test -d /usr/codehost/lib; then
-@@ -33,9 +32,11 @@
- AC_CANONICAL_HOST
- AC_CANONICAL_TARGET
- 
-+AM_INIT_AUTOMAKE(foreign no-dependencies)
- AC_PROG_CC
- AC_PROG_MAKE_SET
- AC_PATH_PROGS(AR, [ar gar])
-+AC_PROG_RANLIB
- 
- AC_CHECK_HEADERS(unistd.h)
- AC_CHECK_HEADERS(strings.h)
-@@ -128,7 +129,7 @@
- 
- AC_CHECK_FUNCS(getopt, , GETOPT_C="getopt.c")
- AC_CHECK_FUNCS(getopt_long, , GETOPT_C="getopt.c")
--AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS $BSTATIC -lgnugetopt"; GETOPT_C="")
-+AC_CHECK_LIB(gnugetopt, getopt_long, LIBS="$LIBS -lgnugetopt"; GETOPT_C="")
- 
- AC_SUBST(ARCH)
- AC_SUBST(STATIC)
-@@ -139,37 +140,8 @@
- 
- dnl Look for the XML libraries
- 
--XMLVER=""
--AC_ARG_WITH(libxml2,
--[  --with-libxml2          use libxml2 [default=libxml1]],
--	,	with_libxml2=no)
--if test x$with_libxml2 != xno; then
--	XMLVER="2"
--fi
--
--AC_PATH_PROG(HAVEXML, xml${XMLVER}-config, $PATH)
--if test ! -z "$HAVEXML"; then
--    XML_CFLAGS=`$HAVEXML --cflags`
--    XML_PREFIX=`$HAVEXML --prefix`
--
--	if "$HAVEXML" --help|grep libtool-libs > /dev/null; then
--		XML_LIBTOOL=`$HAVEXML --libtool-libs`
--		if test -f "$XML_LIBTOOL"; then
--			. "$XML_LIBTOOL"
--			XML_LIBS="$dependency_libs"
--		else
--			XML_LIBS="-lm"
--		fi
--	elif "$HAVEXML" --libs | grep thread > /dev/null; then
--		XML_LIBS="$PTHREAD -lm"
--	fi
--	EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
--
--    CFLAGS="$CFLAGS $XML_CFLAGS"
--    LIBS="$LIBS $XML_PREFIX/lib$LIBSUFFIX/libxml${XMLVER}.a $BSTATIC $ZLIB $BDYNAMIC $EXTRA_LIBS"
--else
--    AC_MSG_ERROR([*** xml-config not found. You need a working libxml installation.])
--fi
-+PKG_CHECK_MODULES(XML, libxml-2.0)
-+AC_SUBST(XML_CFLAGS)
- 
- AC_ARG_WITH(vendor,
- [  --with-vendor           with specified vendor prefix  [default=loki]], 
---- loki_setupdb/Makefile.am
-+++ loki_setupdb/Makefile.am
-@@ -0,0 +1,9 @@
-+noinst_LIBRARIES = libsetupdb.a
-+
-+libsetupdb_a_SOURCES = \
-+	arch.c brandelf.c convert.c md5.c register.c setupdb.c
-+
-+libsetupdb_a_CPPFLAGS = \
-+	-DSETUPDB_VERSION_MAJOR=$(SETUPDB_VERSION_MAJOR) \
-+	-DSETUPDB_VERSION_MINOR=$(SETUPDB_VERSION_MINOR) \
-+	$(XML_CFLAGS)
diff --git a/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch b/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
deleted file mode 100644
index 74ec3dae7568..000000000000
--- a/games-util/loki_patch/files/loki_patch-20091105-patchdata.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- loki_patch/load_patch.c
-+++ loki_patch/load_patch.c
-@@ -8,7 +8,7 @@
- #include "load_patch.h"
- #include "log_output.h"
- 
--#define BASE "patchdata"
-+#define BASE "data"
- 
- 
- int load_add_file(FILE *file, int *line_num, const char *dst, loki_patch *patch)
diff --git a/games-util/loki_patch/loki_patch-20091105.ebuild b/games-util/loki_patch/loki_patch-20091105.ebuild
deleted file mode 100644
index b3084027a98d..000000000000
--- a/games-util/loki_patch/loki_patch-20091105.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Loki Software binary patch tool"
-HOMEPAGE="http://www.icculus.org/loki_setup/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/loki_setupdb-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-util/xdelta:0
-	dev-libs/libxml2
-	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-patchdata.patch
-	cd loki_setupdb
-	eautoreconf
-	cd "${S}"/${PN}
-	eautoreconf
-}
-
-src_configure() {
-	cd loki_setupdb
-	econf
-	cd "${S}"/${PN}
-	econf
-}
-
-src_compile() {
-	emake -C loki_setupdb
-	emake -C loki_patch
-}
-
-src_install() {
-	cd ${PN}
-	dobin loki_patch make_patch
-	dodoc CHANGES NOTES README TODO
-}
diff --git a/games-util/loki_patch/metadata.xml b/games-util/loki_patch/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/loki_patch/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/lutris-0.4.14 b/games-util/lutris-0.4.14
new file mode 100644
index 000000000000..f559956c62da
--- /dev/null
+++ b/games-util/lutris-0.4.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=Lutris is an open source gaming platform for GNU/Linux.
+EAPI=6
+HOMEPAGE=https://lutris.net/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-evdev[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-libs/libsoup x11-apps/xrandr x11-apps/xgamma python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/lutris/lutris/archive/v0.4.14.tar.gz -> lutris-0.4.14.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9e868639fcdce736e244929a0616209
diff --git a/games-util/lutris-9999 b/games-util/lutris-9999
new file mode 100644
index 000000000000..6779fc9926ec
--- /dev/null
+++ b/games-util/lutris-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Lutris is an open source gaming platform for GNU/Linux.
+EAPI=6
+HOMEPAGE=https://lutris.net/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-3
+RDEPEND=dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-evdev[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-libs/libsoup x11-apps/xrandr x11-apps/xgamma python_targets_python3_4? ( dev-lang/python:3.4[sqlite,threads] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite,threads] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9e868639fcdce736e244929a0616209
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
deleted file mode 100644
index 3842086bdb15..000000000000
--- a/games-util/lutris/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST lutris-0.4.14.tar.gz 1617493 BLAKE2B c97d0e31657252c4ae5c6718151f028d273831cdb9f21b748ada651686cf3aa51a618a007db87528d84f21dca292509399f9bb1f0c0444c57e369b13b9ae79a0 SHA512 d229d7f79b3395db22ad49abc02ca5e08db9465258be33fcefe743c0a099e1ca507b6b9c28f03d2a6857489f7f2e19fca38803f6876df88a96b060ed5f7f94bc
-EBUILD lutris-0.4.14.ebuild 1377 BLAKE2B 6228490d33bc2e502ed40995bf281813e5367300b7d189f68b287908bc4905001a4e6fb650f2d3c44aa763b1e4e28ba803d466ec8f344c62c8295133105812a7 SHA512 9894d39b9504ee331f7b171509b6cb7bafcec16e10613fe0742da169d82d3290df912bf8eecfa67cb24991d13a39f138f3dcdd59aa93123c6ed8cdf839b1be62
-EBUILD lutris-9999.ebuild 1377 BLAKE2B 6228490d33bc2e502ed40995bf281813e5367300b7d189f68b287908bc4905001a4e6fb650f2d3c44aa763b1e4e28ba803d466ec8f344c62c8295133105812a7 SHA512 9894d39b9504ee331f7b171509b6cb7bafcec16e10613fe0742da169d82d3290df912bf8eecfa67cb24991d13a39f138f3dcdd59aa93123c6ed8cdf839b1be62
-MISC metadata.xml 879 BLAKE2B 082e00a4612390060819b18444b1cb45bc2bf1506ff97306aaeb9adbf6aaa955da7babcff1e2a6841900f320406253834cebe2f2c796e86adea31c99e04b5955 SHA512 fadab7841251b491ebe8407645f10bb998ec26668f66f1ead21b11b9eead466648e49fe7f1054bc7d28bcf5a9bb2beddc0899e2047051c6c1e71f0b95408198d
diff --git a/games-util/lutris/lutris-0.4.14.ebuild b/games-util/lutris/lutris-0.4.14.ebuild
deleted file mode 100644
index 960cafec846a..000000000000
--- a/games-util/lutris/lutris-0.4.14.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit distutils-r1 gnome2-utils python-r1
-
-DESCRIPTION="Lutris is an open source gaming platform for GNU/Linux."
-HOMEPAGE="https://lutris.net/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lutris/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/lutris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-libs/libsoup
-	x11-apps/xrandr
-	x11-apps/xgamma"
-
-python_install() {
-	distutils-r1_python_install
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	# README.rst contains list of optional deps
-	DOCS=( AUTHORS README.rst INSTALL.rst )
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-
-	elog "For a list of optional dependencies (runners) see:"
-	elog "/usr/share/doc/${PF}/README.rst.bz2"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
deleted file mode 100644
index 960cafec846a..000000000000
--- a/games-util/lutris/lutris-9999.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit distutils-r1 gnome2-utils python-r1
-
-DESCRIPTION="Lutris is an open source gaming platform for GNU/Linux."
-HOMEPAGE="https://lutris.net/"
-
-if [[ "${PV}" == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/lutris/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/lutris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/python-evdev[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	net-libs/libsoup
-	x11-apps/xrandr
-	x11-apps/xgamma"
-
-python_install() {
-	distutils-r1_python_install
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	# README.rst contains list of optional deps
-	DOCS=( AUTHORS README.rst INSTALL.rst )
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-
-	elog "For a list of optional dependencies (runners) see:"
-	elog "/usr/share/doc/${PF}/README.rst.bz2"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/games-util/lutris/metadata.xml b/games-util/lutris/metadata.xml
deleted file mode 100644
index 036f019d61d2..000000000000
--- a/games-util/lutris/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>fdsfgs@krutt.org</email>
-		<name>soredake</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
-		Lutris is a gaming platform for GNU/Linux. Its goal is to make
-		gaming on Linux as easy as possible by taking care of installing
-		and setting up the game for the user. The only thing you have to
-		do is play the game. It aims to support every game that is playable
-		on Linux.
-	</longdescription>
-	<upstream>
-		<remote-id type="github">lutris/lutris</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/mcrcon-0.0.5-r1 b/games-util/mcrcon-0.0.5-r1
new file mode 100644
index 000000000000..33a0d0fa50b2
--- /dev/null
+++ b/games-util/mcrcon-0.0.5-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Remote connection client for Minecraft servers
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/mcrcon/
+KEYWORDS=~amd64
+LICENSE=ZLIB
+SLOT=0
+SRC_URI=mirror://sourceforge/mcrcon/mcrcon-0.0.5-src.zip
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=1d4fdc7b809b4133c41a9c52957e5c50
diff --git a/games-util/mcrcon/Manifest b/games-util/mcrcon/Manifest
deleted file mode 100644
index a309b006c5ea..000000000000
--- a/games-util/mcrcon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mcrcon-0.0.5-src.zip 9748 BLAKE2B 27f209a51e0131f00a1d84b859301a5e0440c9fb857c9112c98c34749c9ab1dda3065d7d748e7a6385e034d3d349a9394cf547a42d2bf5ae3376276695c60994 SHA512 590da8007d630a9ff5332b5fda9e2498e949b4085e16fd00a4b1f693251980bc2d91736ea8ca7c649ee34b28484d165c8b5f45b1830e9fb661bec3a10af080d2
-EBUILD mcrcon-0.0.5-r1.ebuild 564 BLAKE2B c927d344ac0b18430605b6d12c199c9d292bd0676c02051df3be2569490acf7c3065b893af226aee90d5bdaf29a616a38762daa8f5a0d4eebc3a1556e5cc83e6 SHA512 9dd2b75ed31a5f16855152e9a8e0c9d92d877e14c9c9963054503adf5ff11fbcc392dd067d89392c6ef8bdd694bccf6abdb763355362711f37399274f8665b09
-MISC metadata.xml 641 BLAKE2B c49d0cee907fab7f95d8161935dde49ba43d9fcc115f98f909b35f505ed593822bc9f3666f2efc339cffd7f7b3d01b6700bb893e22d9d4c8b45f9d0dffa12dcb SHA512 adb906c501126b769de78c11ebb7bc36555327696f9d68ecdf6d8a311b4ddc89fdc370640eea04591349087e9d386e5ed99e95b71bc1380fa04f9a0072387bf4
diff --git a/games-util/mcrcon/mcrcon-0.0.5-r1.ebuild b/games-util/mcrcon/mcrcon-0.0.5-r1.ebuild
deleted file mode 100644
index 01c42e501eda..000000000000
--- a/games-util/mcrcon/mcrcon-0.0.5-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Remote connection client for Minecraft servers"
-HOMEPAGE="https://sourceforge.net/projects/mcrcon/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_compile() {
-	# Flags taken from COMPILING.txt.
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -std=gnu11 -pedantic -Wall -Wextra -o "${PN}" "${PN}.c" || die
-}
-
-src_install() {
-	default
-	dobin "${PN}"
-}
diff --git a/games-util/mcrcon/metadata.xml b/games-util/mcrcon/metadata.xml
deleted file mode 100644
index e7f8f4b0d06d..000000000000
--- a/games-util/mcrcon/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>chewi@gentoo.org</email>
-		<name>James Le Cuirot</name>
-	</maintainer>
-	<longdescription>mcrcon is an IPv6 compliant Minecraft rcon client with Bukkit coloring support. It is well suited for remote administration and to be used as part of automated server maintenance scripts. Does not trigger the "IO: Broken pipe" or "IO: Connection reset" spam bug on the server side.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">mcrcon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/metadata.xml b/games-util/metadata.xml
deleted file mode 100644
index e3106a742d7d..000000000000
--- a/games-util/metadata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The games-util category contains various game-related utilities.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie games-util enthält verschiede Tools rund um Spiele.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría games-util contiene varias utilidades relacionadas con
-		juegos.
-	</longdescription>
-	<longdescription lang="ja">
-		games-utilカテゴリーにはゲームに関連した様々なユーティリティが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De games-util categorie bevat hulpmiddelen voor bepaalde spellen.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm games-util chứa các tiện ích linh tinh liên quan đến các trò chơi.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria games-util contiene varie utilità per i giochi.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria games-util contém vários utilitários relacionados a
-		jogos.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria games-util zawiera narządzia związane z grami.
-	</longdescription>
-</catmetadata>
-
diff --git a/games-util/nml-0.4.4-r1 b/games-util/nml-0.4.4-r1
new file mode 100644
index 000000000000..79ce23f0baef
--- /dev/null
+++ b/games-util/nml-0.4.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Compiler of NML files into grf/nfo files
+EAPI=6
+HOMEPAGE=https://dev.openttdcoop.org/projects/nml
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.4/nml-0.4.4.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=abba9b2d8c5d56d05cd8fd3f28df5bc8
diff --git a/games-util/nml-0.4.5 b/games-util/nml-0.4.5
new file mode 100644
index 000000000000..5a91a4e18d5c
--- /dev/null
+++ b/games-util/nml-0.4.5
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Compiler of NML files into grf/nfo files
+EAPI=7
+HOMEPAGE=https://dev.openttdcoop.org/projects/nml
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-python/pillow[zlib,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://bundles.openttdcoop.org/nml/releases/0.4.5/nml-0.4.5.tar.gz
+_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=928d5d2092bede9f2bdf2902e16a5588
diff --git a/games-util/nml/Manifest b/games-util/nml/Manifest
deleted file mode 100644
index 9bf7299e2e8a..000000000000
--- a/games-util/nml/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX nml-0.4.4-pillow3.patch 288 BLAKE2B 5d1446821d75432002a36439c6e39fa7f644f9a63be0da178c33287893fe65637d6ce66aa55df916227636cb8e0228a08e363a0b682b02dc63823a671b50849c SHA512 cdb6113102fadbf3b3d9cab930b15cfd88d609c9bb09048a3fb247051169933a0796c10d0c29b9d6bf9320ddcf73a4681255d8e1465a7a98268029d3433ba524
-DIST nml-0.4.4.tar.gz 377998 BLAKE2B a65df2c371c1b1dda2469a968372f21f9f27e9739c8d8a9a0f582c126169921ee3ffc9745f6ef4ac21aebdeea35fd26385d3149e84d50381c4796b71b378571f SHA512 fd7b8d7abfc8b5ea694eedf00bbc4069a82de942178a58ec05e9d3efe7c8663103ffb6b98f7614ce165eb7cba42cb4c7589f77fb67dd95eb6293f62b3179c7b0
-DIST nml-0.4.5.tar.gz 378578 BLAKE2B 1283cdcabd4cbaf12dda926b89c88a3942e9e4469879812abe372facd2c41ff20af0df792bbdadf71d9d3ad8d72e98e293fd903c880e77d3e4ee8a1b73e36ca9 SHA512 64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952
-EBUILD nml-0.4.4-r1.ebuild 699 BLAKE2B 73334bef1122002b0aecbe5834c4f09ef093774ef9cf09872bdf1a934d1d748d671e07fa70734e77a014c9d226daae95bc9180300ef0a2a92464129f801f8d60 SHA512 e2b0db49d56dc6e3df8ddf90cacd8e71b9a6d6231cb5e1789ece9d683183c49831f5f0b2a4d5f34706189e4d159732efc7a3002f03cfdd26874e856aba08512b
-EBUILD nml-0.4.5.ebuild 706 BLAKE2B b8f3ebffc7d7d04d83b7dbc1a3a2c9862fa610f34c3eb34099db526fcafee67487f76787a5e3bdbd5185194e00f7d3b8f1753a975893ace6b5d62870c33ccc7c SHA512 c177b8a6213cb3b39205819fa0fbd26e4af921cb48d71ee3a5ec6ec831700b56b34cc735de59c45729c4280c6fffc70462c423cd9e01e2fcd6f0dd6604799625
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/nml/files/nml-0.4.4-pillow3.patch b/games-util/nml/files/nml-0.4.4-pillow3.patch
deleted file mode 100644
index e55d989fbc1b..000000000000
--- a/games-util/nml/files/nml-0.4.4-pillow3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nml-0.4.4.orig/nml/lz77.py
-+++ nml-0.4.4/nml/lz77.py
-@@ -25,7 +25,7 @@
-     @return: Compressed data.
-     @rtype:  C{bytearray}
-     """
--    stream = data.tostring()
-+    stream = data.tobytes()
-     position = 0
-     output = array.array('B')
-     literal_bytes = array.array('B')
diff --git a/games-util/nml/metadata.xml b/games-util/nml/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/nml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/nml/nml-0.4.4-r1.ebuild b/games-util/nml/nml-0.4.4-r1.ebuild
deleted file mode 100644
index b50f0471e311..000000000000
--- a/games-util/nml/nml-0.4.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into grf/nfo files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
-SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/{changelog,readme}.txt )
-PATCHES=( "${FILESDIR}"/${P}-pillow3.patch )
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/nmlc.1
-}
diff --git a/games-util/nml/nml-0.4.5.ebuild b/games-util/nml/nml-0.4.5.ebuild
deleted file mode 100644
index ce56b6ea5532..000000000000
--- a/games-util/nml/nml-0.4.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Compiler of NML files into grf/nfo files"
-HOMEPAGE="https://dev.openttdcoop.org/projects/nml"
-SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="dev-python/pillow[zlib,${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( docs/{changelog,readme}.txt )
-PATCHES=( "${FILESDIR}"/${PN}-0.4.4-pillow3.patch )
-
-src_install() {
-	distutils-r1_src_install
-	doman docs/nmlc.1
-}
diff --git a/games-util/pogo-manager-bin-0.1.6 b/games-util/pogo-manager-bin-0.1.6
new file mode 100644
index 000000000000..a1f0c57c0cb5
--- /dev/null
+++ b/games-util/pogo-manager-bin-0.1.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Pokemon Go manager
+EAPI=6
+HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
+KEYWORDS=amd64 ~x86
+LICENSE=CC-BY-NC-SA-4.0
+RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
+SLOT=0
+SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.6/BPGM_v0.1.6.zip -> pogo-manager-bin-0.1.6.zip
+_md5_=a110d7c5dc2c6c4e1e926275b5d7feba
diff --git a/games-util/pogo-manager-bin-0.1.7 b/games-util/pogo-manager-bin-0.1.7
new file mode 100644
index 000000000000..7b6c8cf52ab5
--- /dev/null
+++ b/games-util/pogo-manager-bin-0.1.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install postinst
+DEPEND=app-arch/unzip
+DESCRIPTION=Pokemon Go manager
+EAPI=6
+HOMEPAGE=https://github.com/Wolfsblvt/BlossomsPokemonGoManager
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-NC-SA-4.0
+RDEPEND=|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )
+SLOT=0
+SRC_URI=https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v0.1.7/BPGM_v0.1.7.zip -> pogo-manager-bin-0.1.7.zip
+_md5_=5ba5da3cc06312fc7cf7953a7bfe8eb8
diff --git a/games-util/pogo-manager-bin/Manifest b/games-util/pogo-manager-bin/Manifest
deleted file mode 100644
index d6b512db1be0..000000000000
--- a/games-util/pogo-manager-bin/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX pogo-manager 485 BLAKE2B adfc003c723b021685f9d0f5d1dd8201a1bc433091992a651c9008e6249738df81f910229cafeb85199c4818336dff78d268a9a441541e3fb1a8aa9b7cd16043 SHA512 d95abdc10df5aefca0e84a4fc39d2da62a78d82cd076ad899c0b602f639f500a13ddd3f0c1477b6ef9cc8524859cd5d72aeb827d4f1cf0b805c6a247d45c8edf
-DIST pogo-manager-bin-0.1.6.zip 7703380 BLAKE2B f50c8a96a3b93a1c0036918a24ae8b7426659327648fb249db7460d83f053393c7e7d5723abb8553135bb46c4fdea2fcf07297aa77b870d0de9a4749596a71fe SHA512 d09e5f905fad659b5f380c25e8ccb7f9423430a1210ebb15e233f7f9436dff0307897ce372fdedf1b44ff48bd682b1f991a5fa3ac28a98af18d2a2bec72b08b0
-DIST pogo-manager-bin-0.1.7.zip 7978366 BLAKE2B a9e9b9460a50adb7964ba887a89c427b7344745c84d70711dbf372c942fb6829437eddb093fbef9b2c8b2231f3c06689d163c6ec0418d3ca9a7d8f105d35306b SHA512 6d43626d0b7edb756d0a36b8114782ea78bd87fe1f4bdcd78c8d724961ad1635042ab8e0e7f489c5c5cf8b09fa14788c701a14eb5bdce1cf21ed95c3e97fa90a
-EBUILD pogo-manager-bin-0.1.6.ebuild 813 BLAKE2B 77348ed0188581e2a4702bc22630376d97fe11feb42bb471d0c96d161830dca8072825bfcb0e063eaf76dd9d9966add92bfdf9c432e1d1ac6884c47a212de905 SHA512 02e77126376f2b4877c48dee79177b71df2b0f1a18b2d93aa2f88dc28dd2612a2ba40c0929a6ed8398668ba61b641ca4efc6486aa28c777f3dabade49658355d
-EBUILD pogo-manager-bin-0.1.7.ebuild 814 BLAKE2B 9d45605e1fbc2b3ad46362800f16a1615b2865169af60737450139017981b437c549dcfb06df5f93d6ab06680aeb530b2d78eadd9fb64351e32b53a5f9b5f3ef SHA512 2c530bc42be1263c008a71c980947ea3460f473525b1175f559b4c1e60140e94243913249edbe9a6722f6507bc7544406f252c89c5a692dc1dfb7806d371f88c
-MISC metadata.xml 490 BLAKE2B cd6b153e8bbdf8c7b75c67e7236a107044ec2d9bee6db08256262b45457673bf9d55671da6d4bdb707f0187860e812f871c1f7769708544fc32ff30d014876c3 SHA512 e2b41bf4dbebfa0f1f26f0856fe291dedf7553c059b9d2d2049dc97eb9a6e0655d631fe41efc52aa67dfad5d6338548ff4602f3c6695ffbc5eb0068ce5ed446c
diff --git a/games-util/pogo-manager-bin/files/pogo-manager b/games-util/pogo-manager-bin/files/pogo-manager
deleted file mode 100644
index 9866fec91a84..000000000000
--- a/games-util/pogo-manager-bin/files/pogo-manager
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# Config files are written to current directory, so make a config dir and pushd there
-
-if [[ ! -z "${XDG_CONFIG_DIR}" ]] ; then
-    config_dir="${XDG_CONFIG_DIR}/pogo-manager"
-elif [[ ! -z "${HOME}" ]] ; then
-    config_dir="${HOME}/.config/pogo-manager"
-else
-    config_dir="$(mktemp -d)"
-fi
-
-echo "Using ${config_dir} for configuration files"
-mkdir -p "${config_dir}"
-pushd "${config_dir}" > /dev/null
-java -Dfile.encoding=UTF-8 -jar /opt/pogo-manager/pogo-manager.jar
-
diff --git a/games-util/pogo-manager-bin/metadata.xml b/games-util/pogo-manager-bin/metadata.xml
deleted file mode 100644
index 591d99816ca6..000000000000
--- a/games-util/pogo-manager-bin/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
-  <longdescription>
- Utility to manage Pokemon Go accounts. Not sanctioned by Niantic, use at your own risk.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">Wolfsblvt/BlossomsPokemonGoManager</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
deleted file mode 100644
index a58f94b84142..000000000000
--- a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.6.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin}"
-
-DESCRIPTION="Pokemon Go manager"
-HOMEPAGE="https://github.com/Wolfsblvt/BlossomsPokemonGoManager"
-SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v${PV}/BPGM_v${PV}.zip -> ${P}.zip"
-
-LICENSE="CC-BY-NC-SA-4.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/BPGM_v${PV}"
-
-src_install()
-{
-	insinto /opt/${MY_PN}
-	newins BlossomsPogoManager.jar ${MY_PN}.jar
-
-	dobin "${FILESDIR}/pogo-manager"
-}
-
-pkg_postinst()
-{
-	ewarn "Use of this tool is not sanctioned by Niantic and could get you banned."
-	ewarn "You have been warned!"
-}
diff --git a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.7.ebuild b/games-util/pogo-manager-bin/pogo-manager-bin-0.1.7.ebuild
deleted file mode 100644
index 5d4eb27d04bc..000000000000
--- a/games-util/pogo-manager-bin/pogo-manager-bin-0.1.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/-bin}"
-
-DESCRIPTION="Pokemon Go manager"
-HOMEPAGE="https://github.com/Wolfsblvt/BlossomsPokemonGoManager"
-SRC_URI="https://github.com/Wolfsblvt/BlossomsPokemonGoManager/releases/download/v${PV}/BPGM_v${PV}.zip -> ${P}.zip"
-
-LICENSE="CC-BY-NC-SA-4.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( dev-java/oracle-jdk-bin:1.8[javafx] dev-java/oracle-jre-bin:1.8[javafx] )"
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/BPGM_v${PV}"
-
-src_install()
-{
-	insinto /opt/${MY_PN}
-	newins BlossomsPogoManager.jar ${MY_PN}.jar
-
-	dobin "${FILESDIR}/pogo-manager"
-}
-
-pkg_postinst()
-{
-	ewarn "Use of this tool is not sanctioned by Niantic and could get you banned."
-	ewarn "You have been warned!"
-}
diff --git a/games-util/pyfa-1.34.0 b/games-util/pyfa-1.34.0
new file mode 100644
index 000000000000..f1ac69bbaf10
--- /dev/null
+++ b/games-util/pyfa-1.34.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/zip >=sys-apps/sed-4
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+graph python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.34.0.tar.gz -> pyfa-1.34.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=194ca9d03f8e46b6b06bcd7024fe45c1
diff --git a/games-util/pyfa-1.35.0 b/games-util/pyfa-1.35.0
new file mode 100644
index 000000000000..4148b328a73c
--- /dev/null
+++ b/games-util/pyfa-1.35.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/zip >=sys-apps/sed-4
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+graph python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.0.tar.gz -> pyfa-1.35.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/games-util/pyfa-1.35.1 b/games-util/pyfa-1.35.1
new file mode 100644
index 000000000000..9bc58c4f3813
--- /dev/null
+++ b/games-util/pyfa-1.35.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=app-arch/zip >=sys-apps/sed-4
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+graph python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
+RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.35.1.tar.gz -> pyfa-1.35.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a8bb210125c6b341cb4b0d5ce8dcfa2d
diff --git a/games-util/pyfa-1.37.0 b/games-util/pyfa-1.37.0
new file mode 100644
index 000000000000..eb51fe5ffc4f
--- /dev/null
+++ b/games-util/pyfa-1.37.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prepare
+DEPEND=app-arch/zip >=sys-apps/sed-4
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+graph python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ all-rights-reserved
+RDEPEND=>=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=https://github.com/pyfa-org/Pyfa/archive/v1.37.0.tar.gz -> pyfa-1.37.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=03715b56af326c78713929b5609311a7
diff --git a/games-util/pyfa-9999 b/games-util/pyfa-9999
new file mode 100644
index 000000000000..4b2d8664d6cd
--- /dev/null
+++ b/games-util/pyfa-9999
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm prepare unpack
+DEPEND=app-arch/zip >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Python Fitting Assistant - a ship fitting application for EVE Online
+EAPI=6
+HOMEPAGE=https://github.com/pyfa-org/Pyfa
+IUSE=+graph python_targets_python2_7
+LICENSE=GPL-3+ all-rights-reserved
+RDEPEND=>=dev-python/logbook-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/requests[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+RESTRICT=mirror bindist
+SLOT=0
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=03715b56af326c78713929b5609311a7
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
deleted file mode 100644
index ec7bc4df56c3..000000000000
--- a/games-util/pyfa/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX configforced-1.15.1.py 153 BLAKE2B 135edf54e69c985693bcdde747eba5e46f7ed1390a77e1a1d40c0a624f3605c3ec8dad2f3526cbd8f406ed39fc67d3b027b7e7e462bbfa48c5649c71f0692da6 SHA512 632576b9fbff3e93c26b6c2d4be74298aa8657affe82d2c5d571a645d733a7b96d5db6b89b819d3aec9ca68e4bef11e368f7c1cbac416e9bfed88a1025a46bfe
-AUX pyfa-1.33.1-import-pyfa.patch 685 BLAKE2B a3d45d5438203233993ca3d8edd5061ccced36e550ef47ca8c9dfae9343c2cb7c4c952a961d5f7847c21bda27aefe30d6fd38b0875c3ccc1bda8313e519c471d SHA512 a7a6d18183c3494aa4e0436c7f527312be36a298f8fc31cfac7df3d60157c1ef501f725c0c79f1ade9b053d711e14ede9a2892b824530e1cf431590c6b56395e
-AUX pyfa-1.33.1-staticdata.patch 1571 BLAKE2B ffa07ba329d3cbb5f198755fe814f431144fb30667fcfbc1102a0456c49601af37bc9ce141d80db8b961b018726acb78f38339793dee4ed654b70fd411a66bd8 SHA512 cd2c56f3805af70cc3fe294c21af5b32eea614292b8eeb856d2f36f2d7e46ce7a2f33f24115ac8af1cc2d77d39b2f7f397b495734f0ace954c61efb63b609128
-AUX pyfa.desktop 155 BLAKE2B bccfc81c4bc7dd9099ac4bd11fdb0d5f8d72b53b5dc8a700147e7e5996b14aac9e4b46e2884a473ecc8d8b1f49305e66c46cbc7e6c5e43e93e5a3fa71c5efa08 SHA512 d62a44e4e724057581a360cc1eb10aa4c7a0c50cb1d95137e58ba14db17644c852da2582be8d508c50b7359e7f99dc893d78d15cb11c46967a9b7896ff667781
-DIST pyfa-1.34.0.tar.gz 8629709 BLAKE2B 5b16296b675383a446bb21133c9e83726a92beb221babbf8fbe4b19f0f7e95bb19fd6050a5c2e3d5e602df4bbb83debfeefd6ec7efdbff35a47934ef9b29979f SHA512 4642efd4de5be4add3c3f994d7be9dbeeb231fe86229f7944d52f265527c7a79698d3da5ccac3018e02c6000b0da888ad0e64382e12f74b7dd7b3398e7bb2d48
-DIST pyfa-1.35.0.tar.gz 8743938 BLAKE2B 623a70ea8d28c41f94b5c54c3b8b57ddc6b6604f0eccaa1d9716f8b47295bfca12e2db068d3283448b2a6719a3ef73c74d42a98550a1b062e93e6d1091a45797 SHA512 28b3294e8c1d611402d4123d184d6ddf57886a51264fc25529ca3e0cd8af6d41dbe28b15c4714e591f940427651249761db8d2353006b169d358974bc691f121
-DIST pyfa-1.35.1.tar.gz 8746324 BLAKE2B f224f78c97f15d37e2276512541985bfd2ae80c031233261837cd142eddc16a853688a4f1f1f8684736f757d60fd57c41fb14987f336274b2284bd1de26239b3 SHA512 6da5e2d3351157f35c32c7b210d8bfb86a9dc2ea3a3df02449950c498ffabecff3a48fe38086dce75ec5a2cc2549dd28b474015edc0ea01c56a2ff58d1ba3f69
-DIST pyfa-1.37.0.tar.gz 8795428 BLAKE2B 33aa0159b41fe2f228be13788f4e91933205a1883af229ffa97af0816dbce307fa8ce9ebc53b335a99decb84f9a28e83b977daf3c600df1cdd0336ba2c413ba3 SHA512 21094a1c374a60447e38261762ee13cd212f6af5f8d757c8b626774fb5a10d10e99267da1311d3164664b62169edd2772519a7b4ebd7414db2493f5121df5c8c
-EBUILD pyfa-1.34.0.ebuild 2697 BLAKE2B 71befdff7b877943da1c58af9905f9318539956c703f0d6fccf195138842b9e4fc7a57f04dd3de1d6be01d2bd2efc28cfb659612b723a3bf422ca72e51224358 SHA512 5184f4207c8c0d02c52b5265fff0f393f6f871c2b8b1ba0d29835a252d57305bdcf5957053e705b49b2e2a6ec5db8c7f953f3b884ff848ef5a7643d10c3ddb28
-EBUILD pyfa-1.35.0.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6
-EBUILD pyfa-1.35.1.ebuild 2693 BLAKE2B cfad57e838b2f6fb1f5071a750bba9a6eca9da1d7c8a5306017d1f9486c14948ba6a84cc2be706d360e134da7ac81b51f914d4342769043d884dce4c5b091985 SHA512 46d5c45fc04385cca35eea00c12d6ac0356ebf2e4bb721334b89c21a556f9d45c37fa29d61546062055beca041a6af63431fbee3fa701a18d722d50a5db2bce6
-EBUILD pyfa-1.37.0.ebuild 2623 BLAKE2B dfdab3bb7422a9006d515d9896ab5820c91a398a6e6c18734acdbbe4771ed796f4c961fa4e20d40df8b97153ed3c6749e225521f9a733999e07fe28368fdbf04 SHA512 bbf89fb71da7084075a26f058d82bacb5216c3f42f23645ce6dbd56edbf676ee3194034216bdf0baf862ec822d49911c4c53d4eacfcdc35cf29610e21911b7cc
-EBUILD pyfa-9999.ebuild 2623 BLAKE2B dfdab3bb7422a9006d515d9896ab5820c91a398a6e6c18734acdbbe4771ed796f4c961fa4e20d40df8b97153ed3c6749e225521f9a733999e07fe28368fdbf04 SHA512 bbf89fb71da7084075a26f058d82bacb5216c3f42f23645ce6dbd56edbf676ee3194034216bdf0baf862ec822d49911c4c53d4eacfcdc35cf29610e21911b7cc
-MISC metadata.xml 817 BLAKE2B 3756e4c4cd95064bfdfb74ffccbc1162b457e620cd4b99f1c4c04943443a83cec1a5642056f219dfc090c37a230dfadc07dacd0e6f2d7a9380804e951c1d8c86 SHA512 3323fe99b3a0768fddc07ae1ca23e099e8097717c382ec9a9cd2f63b293f6caf8d9164140548f2a4b2754e925d1e1302ba1a56c0320eb343f5a7ff0206d88811
diff --git a/games-util/pyfa/files/configforced-1.15.1.py b/games-util/pyfa/files/configforced-1.15.1.py
deleted file mode 100644
index 51fcb958cedc..000000000000
--- a/games-util/pyfa/files/configforced-1.15.1.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Gentoo-specific settings
-pyfaPath = u'%%SITEDIR%%/pyfa'
-gameDB = u'%%EPREFIX%%/usr/share/pyfa/eve.db'
-imgsZIP = u'%%EPREFIX%%/usr/share/pyfa/imgs.zip'
diff --git a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch b/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
deleted file mode 100644
index 0c71ce69f720..000000000000
--- a/games-util/pyfa/files/pyfa-1.33.1-import-pyfa.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c35467378232b1b21cca304f5dba37c687e51bca Mon Sep 17 00:00:00 2001
-From: Andreas Zuber <zuber@puzzle.ch>
-Date: Mon, 30 Oct 2017 09:52:32 +0100
-Subject: [PATCH 2/3] import pyfa
-
-Append $(python_get_sitedir)/pyfa to import path
-
-Ensures that pyfa's import statements continue to work for systemwide
-installation.
----
- pyfa.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pyfa.py b/pyfa.py
-index 4faa1edd..9cfa5e23 100755
---- a/pyfa.py
-+++ b/pyfa.py
-@@ -23,6 +23,7 @@ import os
- import platform
- import re
- import sys
-+sys.path.append(os.path.join("%%SITEDIR%%", "pyfa"))
- import traceback
- from optparse import AmbiguousOptionError, BadOptionError, OptionParser
- 
--- 
-2.14.3
-
diff --git a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch b/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
deleted file mode 100644
index 76a705e2c832..000000000000
--- a/games-util/pyfa/files/pyfa-1.33.1-staticdata.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 54f0cd42c6f022e010c63ba7b1f123f78001b490 Mon Sep 17 00:00:00 2001
-From: Andreas Zuber <zuber@puzzle.ch>
-Date: Mon, 30 Oct 2017 09:53:31 +0100
-Subject: [PATCH 3/3] staticdata
-
-make gameDB and imgs.zip paths settable from configforced
----
- config.py           | 7 +++++++
- gui/bitmapLoader.py | 2 +-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/config.py b/config.py
-index b15c30a3..a5a07acb 100644
---- a/config.py
-+++ b/config.py
-@@ -30,6 +30,7 @@ savePath = None
- saveDB = None
- gameDB = None
- logPath = None
-+imgsZIP = None
- 
- 
- def isFrozen():
-@@ -61,6 +62,7 @@ def defPaths(customSavePath):
-     global savePath
-     global saveDB
-     global gameDB
-+    global imgsZIP
-     global saveInRoot
- 
-     pyfalog.debug("Configuring Pyfa")
-@@ -100,6 +102,11 @@ def defPaths(customSavePath):
-     if not gameDB:
-         gameDB = os.path.join(pyfaPath, "eve.db")
- 
-+    imgsZIP = getattr(configforced, "imgsZIP", imgsZIP)
-+    if not imgsZIP:
-+        imgsZIP = os.path.join(pyfaPath, "imgs.zip")
-+
-+
-     # DON'T MODIFY ANYTHING BELOW
-     import eos.config
- 
-diff --git a/gui/bitmapLoader.py b/gui/bitmapLoader.py
-index eb53b1f1..86036001 100644
---- a/gui/bitmapLoader.py
-+++ b/gui/bitmapLoader.py
-@@ -37,7 +37,7 @@ except ImportError:
- 
- class BitmapLoader(object):
-     try:
--        archive = zipfile.ZipFile(os.path.join(config.pyfaPath, 'imgs.zip'), 'r')
-+        archive = zipfile.ZipFile(config.imgsZIP, 'r')
-         logging.info("Using zipped image files.")
-     except IOError:
-         logging.info("Using local image files.")
--- 
-2.14.3
-
diff --git a/games-util/pyfa/files/pyfa.desktop b/games-util/pyfa/files/pyfa.desktop
deleted file mode 100644
index 07f3f0ee22a7..000000000000
--- a/games-util/pyfa/files/pyfa.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Pyfa
-Comment=Ship fitting application for EVE Online
-Icon=pyfa
-Terminal=false
-Type=Application
-Categories=Game;RolePlaying;
-Exec=pyfa
diff --git a/games-util/pyfa/metadata.xml b/games-util/pyfa/metadata.xml
deleted file mode 100644
index c556f4ff0717..000000000000
--- a/games-util/pyfa/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>a.zuber@gmx.ch</email>
-    <name>Andreas Zuber</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <longdescription lang="en">
-Pyfa is the Python Fitting Assistant, a standalone application for creating
-fittings for the EVE Online SciFi MMORPG. It provides many advanced features
-such as graphs and full calculations of any possible combination of modules,
-fits, etc.
-</longdescription>
-  <use>
-    <flag name="graph">Enable support for graphs</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">pyfa-org/Pyfa</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/games-util/pyfa/pyfa-1.34.0.ebuild b/games-util/pyfa/pyfa-1.34.0.ebuild
deleted file mode 100644
index e5a519fb0a62..000000000000
--- a/games-util/pyfa/pyfa-1.34.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS="amd64 x86"
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-IUSE="+graph"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/zip"
-
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
-
-	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
-
-	eapply_user
-
-	touch __init__.py
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		local packagedir=$(python_get_sitedir)/${PN}
-		insinto "${packagedir}"
-		doins -r eos gui service utils config*.py __init__.py
-		[[ -e info.py ]] && doins info.py # only in zip releases
-		doins "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-		python_optimize
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.35.0.ebuild b/games-util/pyfa/pyfa-1.35.0.ebuild
deleted file mode 100644
index 566b23ecc2d1..000000000000
--- a/games-util/pyfa/pyfa-1.35.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS="x86"
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="+graph"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/zip"
-
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
-
-	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
-
-	eapply_user
-
-	touch __init__.py
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		local packagedir=$(python_get_sitedir)/${PN}
-		insinto "${packagedir}"
-		doins -r eos gui service utils config*.py __init__.py
-		[[ -e info.py ]] && doins info.py # only in zip releases
-		doins "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-		python_optimize
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.35.1.ebuild b/games-util/pyfa/pyfa-1.35.1.ebuild
deleted file mode 100644
index 566b23ecc2d1..000000000000
--- a/games-util/pyfa/pyfa-1.35.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-LICENSE="GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS="x86"
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> pyfa-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="+graph"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/zip"
-
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
-
-	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
-
-	eapply_user
-
-	touch __init__.py
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py"
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		local packagedir=$(python_get_sitedir)/${PN}
-		insinto "${packagedir}"
-		doins -r eos gui service utils config*.py __init__.py
-		[[ -e info.py ]] && doins info.py # only in zip releases
-		doins "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-		python_optimize
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-1.37.0.ebuild b/games-util/pyfa/pyfa-1.37.0.ebuild
deleted file mode 100644
index 32200ccbee19..000000000000
--- a/games-util/pyfa/pyfa-1.37.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit desktop eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-RESTRICT="mirror bindist"
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="+graph"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/zip"
-
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
-
-	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
-
-	eapply_user
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa" || die
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		python_moduleinto ${PN}
-		python_domodule eos gui service utils config*.py __init__.py
-		python_domodule "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/pyfa/pyfa-9999.ebuild b/games-util/pyfa/pyfa-9999.ebuild
deleted file mode 100644
index 32200ccbee19..000000000000
--- a/games-util/pyfa/pyfa-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit desktop eutils gnome2-utils python-r1
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="https://github.com/pyfa-org/Pyfa"
-
-RESTRICT="mirror bindist"
-LICENSE="GPL-3+ all-rights-reserved"
-SLOT="0"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/pyfa-org/Pyfa.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/pyfa-org/Pyfa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-IUSE="+graph"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-python/logbook-1.0.0[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-1.0.5[${PYTHON_USEDEP}]
-	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
-	graph? (
-		dev-python/matplotlib[wxwidgets,${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-DEPEND="app-arch/zip"
-
-[[ ${PV} = 9999 ]] || S=${WORKDIR}/Pyfa-${PV}
-
-src_prepare() {
-	# get rid of CRLF line endings introduced in 1.1.10 so patches work
-	edos2unix config.py pyfa.py gui/bitmapLoader.py service/settings.py
-
-	# load gameDB and images from separate staticdata directory
-	eapply "${FILESDIR}/${PN}-1.33.1-staticdata.patch"
-
-	# fix import path in the main script for systemwide installation
-	eapply "${FILESDIR}/${PN}-1.33.1-import-pyfa.patch"
-
-	eapply_user
-
-	# make python recognize pyfa as a package
-	touch __init__.py || die
-
-	pyfa_make_configforced() {
-		mkdir -p "${BUILD_DIR}" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			-e "s:%%EPREFIX%%:${EPREFIX}:" \
-			"${FILESDIR}/configforced-1.15.1.py" > "${BUILD_DIR}/configforced.py" || die
-		sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-			pyfa.py > "${BUILD_DIR}/pyfa" || die
-	}
-	python_foreach_impl pyfa_make_configforced
-}
-
-src_install() {
-	pyfa_py_install() {
-		python_moduleinto ${PN}
-		python_domodule eos gui service utils config*.py __init__.py
-		python_domodule "${BUILD_DIR}/configforced.py"
-		python_doscript "${BUILD_DIR}/pyfa"
-	}
-	python_foreach_impl pyfa_py_install
-
-	insinto /usr/share/${PN}
-	doins eve.db
-
-	einfo "Compressing images ..."
-	pushd imgs > /dev/null || die
-	zip -r imgs.zip * || die "zip failed"
-	doins imgs.zip
-	popd > /dev/null || die
-
-	dodoc README.md
-	doicon -s 32 imgs/gui/pyfa.png
-	newicon -s 64 imgs/gui/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/qjoypad-4.3.0 b/games-util/qjoypad-4.3.0
new file mode 100644
index 000000000000..1bd7f2b350e1
--- /dev/null
+++ b/games-util/qjoypad-4.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst dev-qt/linguist-tools:5 x11-base/xorg-proto sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Translate gamepad/joystick input into key strokes/mouse actions in X
+EAPI=6
+HOMEPAGE=https://github.com/panzi/qjoypad
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev x11-libs/libxcb x11-libs/libXtst
+SLOT=0
+SRC_URI=https://github.com/panzi/qjoypad/archive/v4.3.0.tar.gz -> qjoypad-4.3.0.tar.gz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b892b0941b4e19ece0b2c5e1d459abf
diff --git a/games-util/qjoypad/Manifest b/games-util/qjoypad/Manifest
deleted file mode 100644
index d2257015f60f..000000000000
--- a/games-util/qjoypad/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qjoypad-4.3.0.tar.gz 89134 BLAKE2B f035ac024176e352f2c0f88f0677cb4f30e643f64fd2f1214808c0273b0db8cf0a8b133e216b39fddf0ed9717c3e18955357e459ff30c494176ea7cf979b6943 SHA512 99febfc67fff149c476fffeed47eddd9e626e448afcb179eadc8dbe071da42ac692d153f3f43419c4280265527f5e84ede72cb4d59ba574819f7755e3d090e51
-EBUILD qjoypad-4.3.0.ebuild 789 BLAKE2B 23bf48307ca8cace22732d7139b08830f148d9e807df593cba2fb6799fbb9d8a22ccf8583ab647415e938f709abeaf586988754a250cf500dc3d390b12b8f660 SHA512 2dab1f02f39c7175e8776b8a3c2b1c7601fc578ba50380333cac5ff8f5ca7b76790eddc10e6035da18ffa31d603e85dbc330d80e419a6c69059d554f8757abda
-MISC metadata.xml 330 BLAKE2B 60b6d79e8bd61ce2911a3ca77273e844d36cad02c50e88d7c0cb67fd30181f237a0c763ae53c79fe29d4f03f4c4e5d7fd2122af6156c3ee28902c2821099faf4 SHA512 007937b334543dcc52d271b9dd594d167b9f003af545c346c81aab34cdfdf5e3f13a7dca30d67044d41d092539e7f9c589e6cd0a6c026b32ac2d7e7b321f2bb3
diff --git a/games-util/qjoypad/metadata.xml b/games-util/qjoypad/metadata.xml
deleted file mode 100644
index 38b576bdaefb..000000000000
--- a/games-util/qjoypad/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">qjoypad</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/qjoypad/qjoypad-4.3.0.ebuild b/games-util/qjoypad/qjoypad-4.3.0.ebuild
deleted file mode 100644
index a1572020293d..000000000000
--- a/games-util/qjoypad/qjoypad-4.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils desktop
-
-DESCRIPTION="Translate gamepad/joystick input into key strokes/mouse actions in X"
-HOMEPAGE="https://github.com/panzi/qjoypad"
-SRC_URI="https://github.com/panzi/qjoypad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	virtual/libudev
-	x11-libs/libxcb
-	x11-libs/libXtst
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	x11-base/xorg-proto
-"
-
-src_install() {
-	cmake-utils_src_install
-
-	local i
-	cd icons || die
-	for i in *.png; do
-		newicon ${i} ${i/gamepad/qjoypad}
-	done
-	make_desktop_entry ${PN} QJoypad ${PN}
-}
diff --git a/games-util/qstat-2.11 b/games-util/qstat-2.11
new file mode 100644
index 000000000000..6699e397d68d
--- /dev/null
+++ b/games-util/qstat-2.11
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!sys-cluster/torque
+DESCRIPTION=Server statics collector supporting many FPS games
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/qstat/
+IUSE=debug
+KEYWORDS=~alpha amd64 ~arm hppa ppc64 x86
+LICENSE=Artistic
+SLOT=0
+SRC_URI=mirror://sourceforge/qstat/qstat-2.11.tar.gz
+_md5_=53a1c2a1724bfdc9d7615c91aadcbaf5
diff --git a/games-util/qstat-2.14 b/games-util/qstat-2.14
new file mode 100644
index 000000000000..19d9fe670914
--- /dev/null
+++ b/games-util/qstat-2.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!sys-cluster/torque >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Server statics collector supporting many FPS games
+EAPI=6
+HOMEPAGE=https://github.com/multiplay/qstat
+IUSE=debug
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86
+LICENSE=Artistic
+SLOT=0
+SRC_URI=https://github.com/multiplay/qstat/archive/v2.14.tar.gz -> qstat-2.14.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3baad9967bebd6146acbd5a38191f58d
diff --git a/games-util/qstat/Manifest b/games-util/qstat/Manifest
deleted file mode 100644
index a4dfc2ac60f9..000000000000
--- a/games-util/qstat/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST qstat-2.11.tar.gz 258335 BLAKE2B f12d0f69c8a73f9eeb273c46aefe2008b8c724b132e02d2fa156c2456f537d2162ae7db6acd0007c7db8bc87dafcfb41355466008c74ce3e912023a7c8cb42cc SHA512 e3ff732c6fc45300eb2f32b3f3e8e1e5f8ee32234535e8d2ca19cf95cf6d4a6de5b6f1e48a5c64315d60a8b388521106b2de9d307f718f6150ad2cf40ba75a22
-DIST qstat-2.14.tar.gz 210440 BLAKE2B 2a33287a69fe63c59a1cb136e84ea29cccd27f4468cb4b38b4e9ce49f28a558dc67793eaa7ead7addd828730e084a15f9684ccba7753852ce1c2795c7c94cb78 SHA512 f2054d74399fe1773a19ca43629e10364fdd87e551459719685c11f38245a05906631b456848b1a3764b4e6843baf654af6a9b174c7b16908b6bcb97ac64c6d6
-EBUILD qstat-2.11.ebuild 677 BLAKE2B d5997ad9bf5dcb6e9e5d689080f2056c310b8924e636e4e1b61d8c7a5362c4dd46301e34ffd11500e01753692af86e897facc2185ad9713ee0fcd7605ea33b03 SHA512 14bd978d242400b4929997011f8c4bb55171504f132400d71d2b4723569385779f0b6d6017675b67a90ffe8418d80ba0a4605c7a71de5b4a3325bc66cc601b95
-EBUILD qstat-2.14.ebuild 775 BLAKE2B d410af9edf50b7a31d5be7d1306db8e9fab011a3cba172b849f842822ed944feda75691335281a038b49b88d8884636d7c092d543993291c6569474b11696dcb SHA512 5b82f8c8182b1c01f9e46fb83fc7ad87a22b34d8c1cb18cea2f8c010202fcec274d9742ecb97eae7b82800eb5ae91fff299c38303854e067c1869ae20fa65a62
-MISC metadata.xml 328 BLAKE2B 05e29df4e66acb89893251aec455d3f05f38344bd12414e74ac46d23573afcd8c7e4d7b2e03d217c443a32e31beaea3d122cd474e317e3490c1d6bbdb7de4c4d SHA512 1f3cbc63b69d59880ff6fe131bf838f69bfd259a93882ef9b38c1d101d4048c2894cf99725d3ce683f9f05da035567d6e4bdafa9d4349844f7b8af98c13f999f
diff --git a/games-util/qstat/metadata.xml b/games-util/qstat/metadata.xml
deleted file mode 100644
index a8c2e30da965..000000000000
--- a/games-util/qstat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">qstat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/qstat/qstat-2.11.ebuild b/games-util/qstat/qstat-2.11.ebuild
deleted file mode 100644
index 3ec2d6de4ffc..000000000000
--- a/games-util/qstat/qstat-2.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DESCRIPTION="Server statics collector supporting many FPS games"
-HOMEPAGE="https://sourceforge.net/projects/qstat/"
-SRC_URI="mirror://sourceforge/qstat/${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ppc64 x86"
-IUSE="debug"
-
-DEPEND="!sys-cluster/torque"
-
-src_prepare() {
-	# bug #530952
-	sed -i -e 's/strndup/l_strndup/g' qstat.c || die
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	DOCS="CHANGES.txt COMPILE.txt template/README.txt" default
-	dosym qstat /usr/bin/quakestat
-	dohtml template/*.html qstatdoc.html
-}
diff --git a/games-util/qstat/qstat-2.14.ebuild b/games-util/qstat/qstat-2.14.ebuild
deleted file mode 100644
index 3dbdb38a119f..000000000000
--- a/games-util/qstat/qstat-2.14.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Server statics collector supporting many FPS games"
-HOMEPAGE="https://github.com/multiplay/qstat"
-SRC_URI="https://github.com/multiplay/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-IUSE="debug"
-
-DEPEND="!sys-cluster/torque"
-
-DOCS=( CHANGES.txt COMPILE.txt template/README.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-
-	# bug #530952
-	sed -i -e 's/strndup/l_strndup/g' qstat.c || die
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	default
-	dosym qstat /usr/bin/quakestat
-	docinto html
-	dodoc template/*.html qstatdoc.html
-}
diff --git a/games-util/springlobby-0.264 b/games-util/springlobby-0.264
new file mode 100644
index 000000000000..0ac0138425ec
--- /dev/null
+++ b/games-util/springlobby-0.264
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= sound? ( media-libs/alure media-libs/openal ) net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify ) nls? ( sys-devel/gettext ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=The official lobby client for SpringRTS community games
+EAPI=6
+HOMEPAGE=https://springlobby.info
+IUSE=debug +libnotify +nls +sound
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/boost-1.35:= dev-libs/openssl:= sound? ( media-libs/alure media-libs/openal ) net-misc/curl sys-libs/zlib[minizip] x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/wxGTK:3.0[X] libnotify? ( x11-libs/libnotify )
+SLOT=0
+SRC_URI=https://www.springlobby.info/tarballs/springlobby-0.264.tar.bz2
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dbf64a0356decefa8d87a09443c82a15
diff --git a/games-util/springlobby/Manifest b/games-util/springlobby/Manifest
deleted file mode 100644
index 6336cd6381b3..000000000000
--- a/games-util/springlobby/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST springlobby-0.264.tar.bz2 2626180 BLAKE2B 01ff51703c3c10c1aaeb342d2644012a6037b1271ba7e36ab7663cde7646d1c9c6bd823fe65c91a8a9e754bbcf1000ce486eeab2d1641c64fad08773c491f9a6 SHA512 f8024a98be7d6ea755c4380494415813084aadb6dcf72ed0aaeba0ddf9fbaf992ccd5455713c807c0d6feb7db606068be62d4bb2cfcb4697f0406a2ec4f404eb
-EBUILD springlobby-0.264.ebuild 1071 BLAKE2B 0e04cf3827794b354dabf9708ffe96f4de7b73bc06340429b048c794ba65d4647a3368d911eed2f277c754431a68949e6a6cb8833f6d5f64a3947d058d5c137c SHA512 88c5161c566ad511db04ea36253fa46facc06731611addc385ed8c8fd906a4456f33ad3996086aae39ce8f66ad907324c602d5d1189226375be62e64cdc80794
-MISC metadata.xml 1168 BLAKE2B 52a394c332bed809d549cf76a750a35cb0c0bcb6af1cf2276d81958abafa6272e58d59d07762929ef05ccece16d5465d5c353dd71974b4ec2657ae99e3d607a5 SHA512 901e3865f60e798625d59085e38e191a256819e5aa0778210190ebc0a08f183b263c3391409079c499a2e2cb6740503371642f0c13eec1e59a8699060c00b59c
diff --git a/games-util/springlobby/metadata.xml b/games-util/springlobby/metadata.xml
deleted file mode 100644
index eabc7ba13bca..000000000000
--- a/games-util/springlobby/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<longdescription lang="en">
-The official lobby client for SpringRTS community games: Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
-	</longdescription>
-	<longdescription lang="fr">
-Le client officiel du lobby pour les jeux de la communauté SpringRTS : Balanced Annihilation; Journeywar; Metal Factions; Spring:1944 World War II; Star Wars: Imperial Winter; Tech Annihilation; The Cursed; Evolution RTS; ...
-	</longdescription>
-	<maintainer type="person">
-		<email>totocoq@yahoo.fr</email>
-		<name>Thomas Coquelin</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>fedja@protonmail.ch</email>
-		<name>Fedja Beader</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">springlobby/springlobby</remote-id>
-		<bugs-to>https://github.com/springlobby/springlobby/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/springlobby/springlobby-0.264.ebuild b/games-util/springlobby/springlobby-0.264.ebuild
deleted file mode 100644
index 510738cb07bd..000000000000
--- a/games-util/springlobby/springlobby-0.264.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-inherit cmake-utils gnome2-utils wxwidgets
-
-DESCRIPTION="The official lobby client for SpringRTS community games"
-HOMEPAGE="https://springlobby.info"
-SRC_URI="https://www.springlobby.info/tarballs/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libnotify +nls +sound"
-
-RDEPEND="
-	>=dev-libs/boost-1.35:=
-	dev-libs/openssl:=
-	sound? ( media-libs/alure
-		media-libs/openal
-	)
-	net-misc/curl
-	sys-libs/zlib[minizip]
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXext
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	libnotify? ( x11-libs/libnotify )
-"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-src_configure() {
-	setup-wxwidgets
-	local mycmakeargs=(
-		-DOPTION_NOTIFY=$(usex libnotify)
-		-DOPTION_SOUND=$(usex sound)
-		-DOPTION_TRANSLATION_SUPPORT=$(usex nls)
-		-DAUX_VERSION="(Gentoo,${ARCH})"
-		)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-util/ucon64-2.0.0 b/games-util/ucon64-2.0.0
new file mode 100644
index 000000000000..8ff17852a1f0
--- /dev/null
+++ b/games-util/ucon64-2.0.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install postinst prepare
+DESCRIPTION=The backup tool and wonderful emulator's Swiss Army knife program
+EAPI=5
+HOMEPAGE=http://ucon64.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/ucon64/ucon64-2.0.0-src.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d6a2da07e2641a4b5587084c818832f1
diff --git a/games-util/ucon64/Manifest b/games-util/ucon64/Manifest
deleted file mode 100644
index c33e021261c1..000000000000
--- a/games-util/ucon64/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX ucon64-2.0.0-ovflfix.patch 681 BLAKE2B 7244c12a6e2cae4fe5bc2e8dd0325aa04098b638eaf11b7040dbcad342080a522241f7b3d76b522eb632fef7d0a3bc6d020d1d0669e177b779a9c32e494e3189 SHA512 050ad442ce4e2dfa45ef2cbe3245e623d965e922528a4c64c2652de07934d255d0581ceb536f0883c8f3291a30f9f1807d4078a14f9b29178495dab75a277402
-AUX ucon64-2.0.0-zlib.patch 1274 BLAKE2B 8e53d1c559f75a6b0a4e40a510ed4eccd6ff7d1b5b3ae8f81061503ea7aadc1ec36d35fc670f1afed6e85fb5daf601d49650f1e2e2de5e2942a8f359e7dc2f89 SHA512 708034434a809f65c7cc05fcbae474a8dd5d473ae11458a4bb8510fd553da50691911c1e9fc8ee8457989192ad2b350ab6667214946d5d1f89bd64af8df7272f
-DIST ucon64-2.0.0-src.tar.gz 1188488 BLAKE2B 846ea6142eb50abc8165c9abb3cc05245f891b78d786798758e393032cc59c1f3cccc0fe0e70e256e308f709870bc1cc2754df30a8fababea30eda84fd1b2b64 SHA512 d021fe6db9530405773e1e209bdfafe41a2bd997f275ca7fb387f9b3d8639f4581c2761cbdce859a1831d6eba9dab4d5df1019605698c6cb6a4695ab091b001c
-EBUILD ucon64-2.0.0.ebuild 1428 BLAKE2B 4a7df9af94c6b1802f77d7ea947447ddc08eb17a134992a36c60cd516fd9dc5e5b727f22c09092305a8049442795a9dcb9793b7fb806148c4f384daa83f9f03b SHA512 7ade0622278b5fab6b6fd6a7319ac6d29329c376c55efbc902c151c11720793e352359d5c78029681e5ae4fa063921935f3a39d6cda3181ea36162a46646bc83
-MISC metadata.xml 329 BLAKE2B 7e77481b48419ef3da77a1b758a5e49c3f6686bdec3c14f81fe4f5051aec4b63433b970b6bb8ea5fc3ca4f98893a372cf3fb32c0e8bc3098379729cfd6672995 SHA512 eeaeb79bd3f8931262b87f4956705aea7408f5afd8879e6b8c5d5436a851be22a2e9a9e22ccd5250ea270db0c2876633fbf3d160df47cff9be490e203619ed7f
diff --git a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch b/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
deleted file mode 100644
index 0a1668f2d09f..000000000000
--- a/games-util/ucon64/files/ucon64-2.0.0-ovflfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- backup/lynxit.c.old	2010-11-04 09:07:18.000000000 +0100
-+++ backup/lynxit.c	2010-11-04 09:08:17.000000000 +0100
-@@ -561,7 +561,7 @@
-       return FALSE;
-     }
- 
--  if (strcmp (header.magic, "LYNX") != 0)
-+  if (memcmp (header.magic, "LYNX", sizeof(header.magic)) != 0)
-     {
-       MESSAGE (("ERROR    : %s is not a lynx image\n", filename));
-       fclose (fp);
-@@ -682,7 +682,7 @@
- #endif
- 
-   memset (&header, 0, sizeof (st_lnx_header_t));
--  strcpy (header.magic, MAGIC_STRING);
-+  memcpy (header.magic, MAGIC_STRING, sizeof(header.magic));
-   strcpy (header.cartname, cartname);
-   strcpy (header.manufname, manufname);
-   header.page_size_bank0 = cart_analyse (BANK0);
diff --git a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch b/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
deleted file mode 100644
index 7a122713d232..000000000000
--- a/games-util/ucon64/files/ucon64-2.0.0-zlib.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- misc/unzip.h.old	2011-09-23 19:53:09.708884325 +0200
-+++ misc/unzip.h	2011-09-23 19:54:00.012878355 +0200
-@@ -49,6 +49,10 @@
- #include "zlib.h"
- #endif
- 
-+#ifndef OF
-+#define OF(x) x
-+#endif
-+
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
-     from (void*) without cast */
---- libdiscmage/unzip.h.old	2011-09-23 19:59:47.319837133 +0200
-+++ libdiscmage/unzip.h	2011-09-23 20:00:07.230834769 +0200
-@@ -48,6 +48,9 @@
- #ifndef _ZLIB_H
- #include "zlib.h"
- #endif
-+#ifndef OF
-+#define OF(x) x
-+#endif
- 
- #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
- /* like the STRICT of WIN32, we define a pointer that cannot be converted
---- libdiscmage/misc_z.c.old	2012-03-19 08:39:41.975022496 +0100
-+++ libdiscmage/misc_z.c	2012-03-19 08:40:13.109803301 +0100
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#define Z_SOLO
- #include <zlib.h>
- #include "misc_z.h"
- #include "misc.h"
---- misc/archive.c.old	2012-03-19 08:41:06.478999810 +0100
-+++ misc/archive.c	2012-03-19 08:41:24.134741668 +0100
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#define Z_SOLO
- #include <zlib.h>
- #ifdef  HAVE_BYTESWAP_H
- #include <byteswap.h>
diff --git a/games-util/ucon64/metadata.xml b/games-util/ucon64/metadata.xml
deleted file mode 100644
index 04401fa31ab8..000000000000
--- a/games-util/ucon64/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ucon64</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/ucon64/ucon64-2.0.0.ebuild b/games-util/ucon64/ucon64-2.0.0.ebuild
deleted file mode 100644
index 694c0f57261b..000000000000
--- a/games-util/ucon64/ucon64-2.0.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="The backup tool and wonderful emulator's Swiss Army knife program"
-HOMEPAGE="http://ucon64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ucon64/${P}-src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}/${P}-src/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ovflfix.patch \
-		"${FILESDIR}"/${P}-zlib.patch
-	sed -i \
-		-e "/^CFLAGS/s/-O3/${CFLAGS}/" \
-		-e "/^LDFLAGS/s/-s$/${LDFLAGS}/" \
-		{,libdiscmage/}Makefile.in || die
-}
-
-src_configure() {
-	local myconf
-
-	if [[ ! -e /usr/include/sys/io.h ]] ; then
-		ewarn "Disabling support for parallel port"
-		myconf="${myconf} --disable-parallel"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	dobin ucon64
-	dolib.so libdiscmage/discmage.so
-	cd ..
-	dohtml -x src -r -A png,jpg *
-}
-
-pkg_postinst() {
-	echo
-	elog "In order to use ${PN}, please create the directory ~/.ucon64/dat"
-	elog "The command to do that is:"
-	elog "    mkdir -p ~/.ucon64/dat"
-	elog "Then, you can copy your DAT file collection to ~/.ucon64/dat"
-	elog
-	elog "To enable Discmage support, cp /usr/lib/discmage.so to ~/.ucon64"
-	elog "The command to do that is:"
-	elog "    cp /usr/lib/discmage.so ~/.ucon64/"
-	elog
-	elog "Be sure to check ~/.ucon64rc for some options after"
-	elog "you've run uCON64 for the first time"
-}
diff --git a/games-util/uglygs-0_rc11-r1 b/games-util/uglygs-0_rc11-r1
new file mode 100644
index 000000000000..99520cb90cdc
--- /dev/null
+++ b/games-util/uglygs-0_rc11-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=net-analyzer/rrdtool[graph] dev-lang/perl
+DESCRIPTION=Quickly searches the network for game servers
+EAPI=6
+HOMEPAGE=http://uglygs.uglypunk.com/
+KEYWORDS=~amd64 ~alpha ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=net-analyzer/rrdtool[graph] dev-lang/perl
+SLOT=0
+SRC_URI=ftp://ftp.uglypunk.com/uglygs/current/uglygs-rc11.tar.gz
+_md5_=1e54e366634cdab26ff210fcff85abba
diff --git a/games-util/uglygs/Manifest b/games-util/uglygs/Manifest
deleted file mode 100644
index 2b29c17cd775..000000000000
--- a/games-util/uglygs/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 0_rc11-uglygs.conf.patch 2217 BLAKE2B 545fde785e66039180b3deed5fd79e8d4b87c82231da03d6fb047fc72b4f2be3e7534855c77888e8c57a15ee71e35d289fe369e55ea28ed01ac87398d3aef42e SHA512 f7a465d28c042637af1ea45d6f04d809384c0d06d582270cc914cea1bcfed476798c65abf1e18ad5743cff33914bd4f8755cddbb727da6346cb0942d43401756
-AUX 0_rc11-uglygs.pl.patch 7048 BLAKE2B ddff45fb72140f68fd5096dfce9930b6fa4a11fa13584841d84bf9600858e60cbf2e56d910fdeb1605ace6afdd290eb7d1dd135f6541cb501ba496259a240da2 SHA512 98fc61108bc660be487419485a0bcd01b6d9cc8ab8986807a349d6da3cbcf97707b6c9561c88ab268e53ad503ae0fae50e36021943737298a628c88b74d5c36c
-DATA servers.cfg 0 BLAKE2B 786a02f742015903c6c6fd852552d272912f4740e15847618a86e217f71f5419d25e1031afee585313896444934eb04b903a685b1448b755d56f701afe9be2ce SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
-DIST uglygs-rc11.tar.gz 9066873 BLAKE2B 91cc02ecfd6ccb98ac765e5702e13fffc231cce9938fc01950eb7691bc3bef03dee51489cacf3526939ebccfafe06a7cbbb97c653a27a0d9dff19e67b73ab4e0 SHA512 2a57eb7a4562525c00c69a7874d32fa52d5f12cb2926dffcf4bc8ad74e5847a962c464426b476412bff369963ee40120c3dfc9c0b506606f8a4668bca88d1970
-EBUILD uglygs-0_rc11-r1.ebuild 1252 BLAKE2B a1074d3984b3c086215d8f6384e9138115b5ba33fc0e8efa9170c91658af607543fc57bb32ddc228d1c3c150e56f4acc9619b6b785fdf90c98b679cb69ec212a SHA512 9d91148ecc0e5bed6474db3c9d6a25c982b41c5eb4e07249d4359db5acc1e7f80c716c5734d7fbf9f264960aaaff7231414bd2cb84afa73ef976de6562d4dd37
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/uglygs/files/0_rc11-uglygs.conf.patch b/games-util/uglygs/files/0_rc11-uglygs.conf.patch
deleted file mode 100644
index f85c6a3c3198..000000000000
--- a/games-util/uglygs/files/0_rc11-uglygs.conf.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/uglygs.conf.orig	2003-06-30 11:16:57.000000000 -0400
-+++ b/uglygs.conf	2003-06-30 11:22:50.000000000 -0400
-@@ -12,22 +12,23 @@
- $runmode = "loop";                                              # Run mode, Run as a loop or as a cron Executable
- 
- $configfile = "servers.cfg";                                    # The Result file to be passed to other programs
--$qstat = "qstat/qstat";                                         # The modified qstat file
-+$qstat = "GENTOO_DIR/qstat";                                         # The modified qstat file
- $cat = "/bin/cat";                                              # The cat file location
--$data = "./data";                                               # Data Directory
--$tmp = "./tmp";                                                 # Temp Directory
-+$data = "GENTOO_DIR/data";                                               # Data Directory
-+$tmp = "GENTOO_DIR/tmp";                                                 # Temp Directory
- $template = "default";						# Template Directory
-+$templates = "GENTOO_DIR/templates";				# Template base directory
- $staticcfgfile = "$data/servers.static";                        # A Static output file to append to final output 
- 
- $refresh = "180";						# # If loop is on what is your update rate in sec 
- 		
- $serverquery = "n";                                             # Do u want Server Query output y or n
--$serverqueryfile = "/var/www/html/servers.cfg";                 # The output file for server query 
-+$serverqueryfile = "/home/httpd/htdocs/servers.cfg";                 # The output file for server query 
- 
- $html = "n";							# Do you want HTML output 
- $htmlgame="l";							# Game List Sort Order p=by-ping, g=by-game, i=by-IP-address, h=by-hostname, n=by-#-players, l=by-list-order
- $htmlplayer="F";						# Player List Sort Order P=by-ping, F=by-frags, T=by-team
--$htmldir = "/var/www/html/uglygs";				# The html output Directory
-+$htmldir = "/home/httpd/htdocs/uglygs";				# The html output Directory
- $htmlfile = "servers";						# The html output file
- $htmlext = "html";						# THe file Ext eg. html, php, pl, asp
- $htmlalias = "/uglygs";                                         # The html Directory Alias
diff --git a/games-util/uglygs/files/0_rc11-uglygs.pl.patch b/games-util/uglygs/files/0_rc11-uglygs.pl.patch
deleted file mode 100644
index 61758e621a9a..000000000000
--- a/games-util/uglygs/files/0_rc11-uglygs.pl.patch
+++ /dev/null
@@ -1,131 +0,0 @@
---- a/uglygs.pl.orig	2003-06-30 11:37:59.000000000 -0400
-+++ b/uglygs.pl	2003-06-30 11:38:30.000000000 -0400
-@@ -8,7 +8,8 @@
- ##########                                      Contact uglygs@uglypunk.com                                    ##########
- #########################################################################################################################
- #########################################################################################################################
--require 'uglygs.conf';
-+$qstatcfg = 'GENTOO_DIR/qstat.cfg';
-+require 'GENTOO_DIR/uglygs.conf';
- 
- $VERSION = "rc10";
- 
-@@ -23,7 +24,7 @@
- if (!-f $qstat) { die "Sorry the Qstat file doesn't exist, you may no have compiled it yet"};
- if (!-d  $data) { die "Sorry the data directory doesn't exist, it should be located here:  $data"};
- if (!-d  $tmp)  { die "Sorry the temp directory doesn't exist, it should be located here:  $tmp"};
--if (!-d  "./templates/$template") { die "Sorry the templates/template directory doesnt exist, it should be located here:  templates/$template"};
-+if (!-d  "$templates/$template") { die "Sorry the templates/template directory doesnt exist, it should be located here:  $templates/$template"};
- 
- if ($html eq "y"){
-         if (!-f $rrdtool) { die "Sorry the rrdtool file doesn't exist, Please install RRDTOOL"};
-@@ -88,7 +89,7 @@
- $timemonth = $time - 2592000;
- $timeyear = $time - 31536000;
- system(`rm $tmp/*.tmp`);
--require "templates/$template/graphs.conf";
-+require "$templates/$template/graphs.conf";
- 
- 
- ################################# Seach everything VERY MESSY #########################
-@@ -96,7 +97,7 @@
- if ($doscan eq "y"){
- 
- 
-- 	open(QSTAT, "|$qstat -cfg qstat/qstat.cfg -maxsim 60 -timeout 8 -Ts ./templates/qstat $qstatcom $addports >> $tmp/serversannounce.tmp" );
-+ 	open(QSTAT, "|$qstat -cfg $qstatcfg -maxsim 60 -timeout 8 -Ts $templates/qstat $qstatcom $addports >> $tmp/serversannounce.tmp" );
-  	close(QSTAT);
- 
- 	if (-s "$tmp/serversannounce.tmp"){
-@@ -121,7 +122,7 @@
-   $defport = $tabledata[2];
-   $defport =~ s/\n//;
-   if ($tabledata[0] eq "Q3S") {
--    open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -q3s $tabledata[1]:$defport|");
-+    open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -q3s $tabledata[1]:$defport|");
-     @qstatoutput = <QSTAT>;
-     $qstatoutput = $qstatoutput[1];
-     if ($qstatoutput =~m/version=Wolf /) {
-@@ -172,7 +173,7 @@
- 
- ############################# SERVER QUERY PROCESSING ###############################
- 
--system( "$qstat -cfg qstat/qstat.cfg -maxsim 60 -timeout 8 -Ts ./templates/sqdata -of $tmp/sqservers.tmp -f $configfile" );
-+system( "$qstat -cfg $qstatcfg -maxsim 60 -timeout 8 -Ts $templates/sqdata -of $tmp/sqservers.tmp -f $configfile" );
-     
- open (PROCESS, "< $tmp/sqservers.tmp");
- @name = <PROCESS>;
-@@ -194,7 +195,7 @@
-                 $defport = $tabledata[2];
-                 $defport =~ s/\n//;
-                 if ($tabledata[0] eq "GPS") {
--                        open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -gps $tabledata[1]:$defport|");
-+                        open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -gps $tabledata[1]:$defport|");
-                         @qstatoutput = <QSTAT>;
-                         $qstatoutput = $qstatoutput[1];
- 
-@@ -206,7 +207,7 @@
-                         close(QSTAT);
- 
-                 } elsif ($tabledata[0] eq "RWS") {
--                        open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -rws $tabledata[1]:$defport|");
-+                        open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -rws $tabledata[1]:$defport|");
-                         @qstatoutput = <QSTAT>;
-                         $qstatoutput = $qstatoutput[1];
-                                 if ($qstatoutput =~m/protocol=17,/) {
-@@ -218,7 +219,7 @@
- 
-                         
-                  } elsif ($tabledata[0] eq "RGS") {
--                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -rgs $tabledata[1]:$defport|");
-+                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -rgs $tabledata[1]:$defport|");
-                          @qstatoutput = <QSTAT>;
-                          $qstatoutput = $qstatoutput[1];
- 
-@@ -231,7 +232,7 @@
-                         close(QSTAT);
- 
-                  } elsif ($tabledata[0] eq "SMS") {
--                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -sms $tabledata[1]:$defport|");
-+                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -sms $tabledata[1]:$defport|");
-                          @qstatoutput = <QSTAT>;
-                          $qstatoutput = $qstatoutput[1];
- 
-@@ -247,7 +248,7 @@
- 
- 
-                  } elsif ($tabledata[0] eq "GOS") {
--                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -gos $tabledata[1]:$defport|");
-+                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -gos $tabledata[1]:$defport|");
-                          @qstatoutput = <QSTAT>;
-                          $qstatoutput = $qstatoutput[1];
- 
-@@ -261,7 +262,7 @@
- 
- 
-                  } elsif ($tabledata[0] eq "SF2S") {
--                         open (QSTAT, "$qstat -cfg qstat/qstat.cfg -nh -R -sf2s $tabledata[1]:$defport|");
-+                         open (QSTAT, "$qstat -cfg $qstatcfg -nh -R -sf2s $tabledata[1]:$defport|");
-                          @qstatoutput = <QSTAT>;
-                          $qstatoutput = $qstatoutput[1];
-                                 if ($qstatoutput =~m/version=SOF2MP V1.02t/) {
-@@ -301,7 +302,7 @@
- 
- 
- if ($html eq "y"){
--  open(TOTALOUT, "$qstat -cfg qstat/qstat.cfg -R -sort $htmlgame  -maxsim 60 -timeout 4 -Th ./templates/$template/header.html -Tt ./templates/$template/footer.html -Ts ./templates/$template/data.html -f $configfile 2> /dev/null |");
-+  open(TOTALOUT, "$qstat -cfg $qstatcfg -R -sort $htmlgame  -maxsim 60 -timeout 4 -Th $templates/$template/header.html -Tt $templates/$template/footer.html -Ts $templates/$template/data.html -f $configfile 2> /dev/null |");
-   while( $totalline = <TOTALOUT> ){
-     my @totaldata = split(/ /,$totalline);
-      if ($totaldata[0] eq "<!--" and $totaldata[1] eq "gamedetails"){
-@@ -372,7 +373,7 @@
-     $graph = "$tabledata[0]$tabledata[1]$port";
- 
-       
--    open(QSTAT, "$qstat -cfg qstat/qstat.cfg -R -P -sort $htmlplayer -maxsim 60 -timeout 4 -Th ./templates/$template/gameheader.html -Tt ./templates/$template/gamefooter.html -Ts ./templates/$template/gamedata.html -Tp ./templates/$template/gameplayer.html -$gametype $tabledata[1]:$port | "); 
-+    open(QSTAT, "$qstat -cfg $qstatcfg -R -P -sort $htmlplayer -maxsim 60 -timeout 4 -Th $templates/$template/gameheader.html -Tt $templates/$template/gamefooter.html -Ts $templates/$template/gamedata.html -Tp $templates/$template/gameplayer.html -$gametype $tabledata[1]:$port | "); 
-      while($serverline = <QSTAT>){
-      my @data = split(/ /,$serverline);
-      if ($data[0] eq "<!--" and $data[1] eq "gamedetails"){
---- a/uglygs.pl.orig	2003-06-30 13:56:01.000000000 -0400
-+++ b/uglygs.pl	2003-06-30 13:59:17.000000000 -0400
diff --git a/games-util/uglygs/metadata.xml b/games-util/uglygs/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/uglygs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/uglygs/servers.cfg b/games-util/uglygs/servers.cfg
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/games-util/uglygs/servers.cfg
+++ /dev/null
diff --git a/games-util/uglygs/uglygs-0_rc11-r1.ebuild b/games-util/uglygs/uglygs-0_rc11-r1.ebuild
deleted file mode 100644
index a431e691ff30..000000000000
--- a/games-util/uglygs/uglygs-0_rc11-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/0_/}"
-DESCRIPTION="Quickly searches the network for game servers"
-HOMEPAGE="http://uglygs.uglypunk.com/"
-SRC_URI="ftp://ftp.uglypunk.com/uglygs/current/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~alpha ~hppa ~x86"
-IUSE=""
-
-DEPEND="net-analyzer/rrdtool[graph]
-	dev-lang/perl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-uglygs.conf.patch
-	sed -i \
-		-e "s:GENTOO_DIR:/usr/$(get_libdir)/${PN}:" uglygs.conf || die
-	eapply "${FILESDIR}"/${PV}-uglygs.pl.patch
-	sed -i \
-		-e "s:GENTOO_DIR:/etc:" uglygs.pl || die
-	sed -i \
-		-e "s/strndup/${PN}_strndup/" qstat/qstat.c || die
-}
-
-src_compile() {
-	emake -C qstat CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto /etc
-	doins uglygs.conf qstat/qstat.cfg
-
-	dobin uglygs.pl
-
-	insinto /usr/"$(get_libdir)"/${PN}
-	doins -r data templates tmp
-	insinto /usr/"$(get_libdir)"/${PN}/images
-	doins -r images/{avp2,bds,default.gif,hls,j2s,mhs,q3s,rws,sf2s,uns,vcs}
-	dosym bds /usr/"$(get_libdir)"/${PN}/images/bdl
-	keepdir /usr/"$(get_libdir)"/${PN}/tmp
-
-	exeinto /usr/"$(get_libdir)"/${PN}
-	doexe qstat/qstat
-
-	einstalldocs
-}
diff --git a/games-util/umodpack-0.5_beta16-r2 b/games-util/umodpack-0.5_beta16-r2
new file mode 100644
index 000000000000..71395183ca7b
--- /dev/null
+++ b/games-util/umodpack-0.5_beta16-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/Tie-IxHash tk? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=portable and useful [un]packer for Unreal Tournament's Umod files
+EAPI=5
+HOMEPAGE=http://www.oldunreal.com/wiki/index.php?title=UmodPack
+IUSE=tk
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic
+RDEPEND=virtual/perl-IO-Compress dev-perl/Archive-Zip dev-perl/Tie-IxHash tk? ( dev-perl/Tk ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://gentoo/umodpack-0.5b16-allinone.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a2f88f616f2119e7f9628923865cd537
diff --git a/games-util/umodpack/Manifest b/games-util/umodpack/Manifest
deleted file mode 100644
index 88f4fb7cc9ba..000000000000
--- a/games-util/umodpack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST umodpack-0.5b16-allinone.tar.gz 3605080 BLAKE2B 718208835f318c85305f266a23f9fa5c2966031924d4d4e3a5cdee649afaee64ed5ac753e630ef6783a49581b932a44d8b0dafa3e97603eb1706190f3c7e10d5 SHA512 3678507c7aec30043f50f5519935e2d5eb7471b5e0692ba8b27c506bdd7a067fdb055e6731a6bffb04bb3008020c889f3486624a1466a77e0eab3e5139003ff0
-EBUILD umodpack-0.5_beta16-r2.ebuild 968 BLAKE2B 23eaa1f37092fd58f7b01f8f3c9549f7b5e80ec20be6910cc91e803896fc8b7bfd95372c3c6da02473ae27df2c973f72c35879d7f2dfb88b34acfdddf8a5e1fa SHA512 e97de8824e672d0a6812868133cee06b3452a35f595b88a0f9fea06f2fd7a96b0d557a7081cda9d16283855d1cc76b33eb6607a6dabb664989b7817950943b41
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/umodpack/metadata.xml b/games-util/umodpack/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/umodpack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild b/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
deleted file mode 100644
index 772fe6487292..000000000000
--- a/games-util/umodpack/umodpack-0.5_beta16-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-module toolchain-funcs
-
-MY_P=${P/_beta/b}
-DESCRIPTION="portable and useful [un]packer for Unreal Tournament's Umod files"
-HOMEPAGE="http://www.oldunreal.com/wiki/index.php?title=UmodPack"
-SRC_URI="mirror://gentoo/${MY_P}-allinone.tar.gz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-DEPEND="virtual/perl-IO-Compress
-	dev-perl/Archive-Zip
-	dev-perl/Tie-IxHash
-	tk? ( dev-perl/Tk )"
-RDEPEND=${DEPEND}
-
-S=${WORKDIR}/${MY_P}
-SRC_TEST="do parallel"
-
-src_prepare() {
-	# remove the stupid perl modules since we already installed em
-	rm -rf {Archive-Zip,Compress-Zlib,Tie-IxHash,Tk}* || die
-}
-
-src_compile() {
-	perl-module_src_compile
-
-	cd umr-0.3 || die
-	emake DEBUG=0 CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
-}
-
-src_install() {
-	mydoc="Changes"
-	perl-module_src_install
-	dobin umod umr-0.3/umr
-	if use tk ; then
-		dobin xumod
-	fi
-}
diff --git a/games-util/uz2unpack-0.1 b/games-util/uz2unpack-0.1
new file mode 100644
index 000000000000..d7c42481369f
--- /dev/null
+++ b/games-util/uz2unpack-0.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-libs/zlib
+DESCRIPTION=UZ2 Decompressor for UT2003/UT2004
+EAPI=5
+HOMEPAGE=http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?42:mss:1013:200406:kikgppboefcimdbadcdo
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=sys-libs/zlib
+SLOT=0
+SRC_URI=mirror://gentoo/uz2unpack-0.1.tar.bz2
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=ab1940ad956cc8031a99d6a8a8403e5c
diff --git a/games-util/uz2unpack/Manifest b/games-util/uz2unpack/Manifest
deleted file mode 100644
index 13d57f9bc312..000000000000
--- a/games-util/uz2unpack/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST uz2unpack-0.1.tar.bz2 1483 BLAKE2B b349aa9d04719364227da8c9074845527eff938805c27ab484e485d4ff8f8203320ed8e5772408b325dc10ea8662a37710cd8d62d51c498074f97b064b4ee800 SHA512 b3876a54dfd4729399dc768f9e096aa9eed3af9d7a0a5ad68777159244a7f3f4a7ff113d2da00ca9dba60c731e8abc3b88888aab3c0aa2b934decfee9312654b
-EBUILD uz2unpack-0.1.ebuild 528 BLAKE2B efb2e4309c7dbd4722da7e42072c677930955016c344a7274cc3b28bac19f86693f46c4d21cdcee2a588a819fa50a1dfddeae0b12bcfd0fe24736f8a6f52e5ca SHA512 35dabf8ab3202717a33bb89a37d3dc4e8b60bdb23c901c1b0c6de18357b602cc8d9f574ac96fbed404f9a48fad0928a57a3d9827d01059a87176930ca1c1f221
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/uz2unpack/metadata.xml b/games-util/uz2unpack/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/uz2unpack/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/uz2unpack/uz2unpack-0.1.ebuild b/games-util/uz2unpack/uz2unpack-0.1.ebuild
deleted file mode 100644
index 494df27d5a68..000000000000
--- a/games-util/uz2unpack/uz2unpack-0.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="UZ2 Decompressor for UT2003/UT2004"
-HOMEPAGE="http://icculus.org/cgi-bin/ezmlm/ezmlm-cgi?42:mss:1013:200406:kikgppboefcimdbadcdo"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-libs/zlib"
-RDEPEND=${DEPEND}
-
-src_compile() {
-	emake CC="$(tc-getCC)" LDLIBS=-lz ${PN}
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc README
-}
diff --git a/games-util/vispatch-1.4.6 b/games-util/vispatch-1.4.6
new file mode 100644
index 000000000000..63ed0be642cd
--- /dev/null
+++ b/games-util/vispatch-1.4.6
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=WaterVIS utility for glquake
+EAPI=5
+HOMEPAGE=http://vispatch.sourceforge.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/vispatch/vispatch-1.4.6.tgz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=55ccd06383796f9ec209b646b7670a5c
diff --git a/games-util/vispatch/Manifest b/games-util/vispatch/Manifest
deleted file mode 100644
index 299d4ef76a7f..000000000000
--- a/games-util/vispatch/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vispatch-1.4.6.tgz 227850 BLAKE2B 5d403807d4c276e555c15da2e808fa408a54b766ac3db27f4159676689ebcfd8fedf4c43a3d8a7d39d80c29c20588d1805476ea61f4e88322b3d27f3e103b6ae SHA512 0034660c1ba238360cc5b71e846d2117f76af2340fcee2a0a25b42d1e200ec7231796b45d89335bf7e303379d9f5c03f4f0a9b22a1a54da356ac9a41b24abcc1
-EBUILD vispatch-1.4.6.ebuild 510 BLAKE2B 8fcd7553d01e818740ecdd08ddcc5f19cbe2df73ee952fb31a918f87870e776b974b8ed6b35440cb8f2bd5d8d869935f1561aba4673153864bcfa81202b3bf52 SHA512 aa22d38e18ee768b5d45ef68451d4426a6f04aafd28e2d2ceae9a08606ad5fceee4a8d2af7e8be2b5b39a18d5fe343e7fc4d8bf635ec2d629f19791b3d836ce6
-MISC metadata.xml 331 BLAKE2B ed3374770026f8ec9617349d81d1b7d6a1caaf942be3a98ee22b5385d4edf086834e0311b06a04cdfa0749443393049f50be9c5389cf81a0c155598588100b14 SHA512 a6016f990397a930eeb6fb10b1676ee26a299b3900f5937729783c80927912ee8522b4cd6641f2a71855cd75bdd92b4d0c72ad498c48f2bc5791dca1b6b4dac1
diff --git a/games-util/vispatch/metadata.xml b/games-util/vispatch/metadata.xml
deleted file mode 100644
index f12f3872db6d..000000000000
--- a/games-util/vispatch/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">vispatch</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/vispatch/vispatch-1.4.6.ebuild b/games-util/vispatch/vispatch-1.4.6.ebuild
deleted file mode 100644
index 1bb5067893ac..000000000000
--- a/games-util/vispatch/vispatch-1.4.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="WaterVIS utility for glquake"
-HOMEPAGE="http://vispatch.sourceforge.net/"
-SRC_URI="mirror://sourceforge/vispatch/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${P}/source
-
-src_prepare() {
-	sed -i \
-		-e '/^CFLAGS/d' \
-		-e '/^LDFLAGS/d' \
-		makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	dodoc ${PN}.txt
-}
diff --git a/games-util/wiiload-0.5 b/games-util/wiiload-0.5
new file mode 100644
index 000000000000..db0b77c08e85
--- /dev/null
+++ b/games-util/wiiload-0.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=load homebrew apps over the network to your Wii
+EAPI=5
+HOMEPAGE=http://wiibrew.org/wiki/Wiiload
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/wiiload-0.5.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=3330f5df4d242a5d98c9e47158dbb412
diff --git a/games-util/wiiload/Manifest b/games-util/wiiload/Manifest
deleted file mode 100644
index 789d7042388b..000000000000
--- a/games-util/wiiload/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wiiload-0.5.tar.gz 5291 BLAKE2B e8e8e23569ee625648e222e2b1cf919f4304941303af19b33925a9647706dd9683fe93cb3a101c4bdd52525b19533f7bf357864c337e84053a45196a74287c15 SHA512 2c13490e5034078fef658ca3f9743be04fd6c870e485aae7be21a80967f2d1f1075fee016bf7945b20004bc5d96d0b3244f8a997c4410299f1f6afca002360e4
-EBUILD wiiload-0.5.ebuild 463 BLAKE2B 5ef313d5ec0b454f701c0bc7116e3d391ed94d7ae82a8b270a28ca5f93f6d57aaa9c9bbf06944fcb293bbe242499ec77645c88facc048c249c14649c67dfacd2 SHA512 34543b71e5d80d4c8000f406e8229ec207e9bee7590c8500143d668b906af5d6f60af9d38aeb7352aea56dc24ea8943f0e112199aa67b2c44d93440cfa391b17
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/wiiload/metadata.xml b/games-util/wiiload/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/wiiload/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/wiiload/wiiload-0.5.ebuild b/games-util/wiiload/wiiload-0.5.ebuild
deleted file mode 100644
index 43aa072d0fb7..000000000000
--- a/games-util/wiiload/wiiload-0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="load homebrew apps over the network to your Wii"
-HOMEPAGE="http://wiibrew.org/wiki/Wiiload"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}" || die
-}
-
-src_install() {
-	dobin wiiload
-}
diff --git a/games-util/wit-2.40a b/games-util/wit-2.40a
new file mode 100644
index 000000000000..aabd0f5665c7
--- /dev/null
+++ b/games-util/wit-2.40a
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile
+DEPEND=app-arch/bzip2 fuse? ( sys-fs/fuse ) zlib? ( sys-libs/zlib )
+DESCRIPTION=command line tools to manipulate Wii/GameCube ISO images and WBFS containers
+EAPI=6
+HOMEPAGE=https://wit.wiimm.de/
+IUSE=+fuse +zlib
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 fuse? ( sys-fs/fuse ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~radhermit/distfiles/wit-2.40a.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=33d2d1cc1c4e43ac7fa4080d63bb0ef1
diff --git a/games-util/wit/Manifest b/games-util/wit/Manifest
deleted file mode 100644
index ab96e982359c..000000000000
--- a/games-util/wit/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX wit-2.30a-makefile.patch 3579 BLAKE2B 1aa87c7323c67fb9b35a99cce4eb54332b64e7662410552a9762f8740b23f5674b4cea17145aa302e2ad23875bbb822651670f4010e32826c5f25e797b99ccdd SHA512 e3c98f47e10fe8771dabea091032625448d85adde125a93cc786a49def4f165e164eb71dc7612aee3eea47a9e11dfc0577c223c79eeae5d6832be44b055eed7b
-AUX wit-2.30a-no-exec-stack.patch 232 BLAKE2B 2af2bfe707d22b95f40f2f0e5675fef3e5a153615c327c1638e55651f1fa4cf61b2b868ff86ac899c64f1526f1093e044f32ca853ad0c11c5f505924ee8f1d4d SHA512 958f1fbeda1f29ad704d2eeb3c2a1281f71957fbbb07a7258e6e69af1552e13d135ed61864ef92b9a1334b91990f79366b5b235a8865c424414e46a9305762b0
-AUX wit-2.40a-sizeof-pointer-memaccess.patch 466 BLAKE2B 08c0ac490c63c4d8808ffb06470f96fa6d4f20ddad37662de2cd1c5c535a02b3fb50cbfa65d05b70c3b616522bcaceb37f8ee516abeb5727dc931948ad1bb6d6 SHA512 674052e924d81ab7a893e3ff5367e446e9498f3dbf0900fb7ff33a7c5dafda3c234d60238b1a30aa4865ff0d8f01ea9d3b882b567ac6886f2d875c797c398e3b
-DIST wit-2.40a.tar.xz 723448 BLAKE2B 3201000b86684b781e4dfbd738af22fbf87884110740a3b194028262deaf0617b44bcc4095fa60ee22e510e41cdd336f6bbcdeac076f49eda0d374cef2f457d7 SHA512 f119ed9dffbb42ba9037444aaa992adaa812c176d1e412f9df6c5b59efff51a24cca0141700939efec7845ac1d42cc9a30100e19ef39adee0306872181b28b5b
-EBUILD wit-2.40a.ebuild 817 BLAKE2B 5fbe8482f85e44b56dac474f5717d12c7b4d4d5da66fd5f9e6561b434408002585402daea229682b5c821d1e175faa1ea49450369b6867dc62c8c72ec2fb1c84 SHA512 5a7d6d6bb3c43e221c8b1ae606a66e5dab400067a234671ba64e7fcb8701de7f69898d9e937dcf22024c6a27579f4b37dac95f20194945258d4e74f27e89c756
-MISC metadata.xml 324 BLAKE2B ac8ddc6d26589b3d1421ae81c7ee04982b7604b91e89c3b39b83253d41ceeb298ff2ba402097438eb49c1fc48e6d673d60172b8c9a1108a53b8381bc5210cecc SHA512 e95891f8df24d69c9a567049fc3bb6888372eb69845cfccd62056fcde57d882f5344934dd3354e79b6b05ebefdd3c1c2183ea1cc4f473633c57becf0fb08a469
diff --git a/games-util/wit/files/wit-2.30a-makefile.patch b/games-util/wit/files/wit-2.30a-makefile.patch
deleted file mode 100644
index d705487cd8ba..000000000000
--- a/games-util/wit/files/wit-2.30a-makefile.patch
+++ /dev/null
@@ -1,120 +0,0 @@
---- wit-2.30a/Makefile
-+++ wit-2.30a/Makefile
-@@ -190,8 +190,8 @@
- endif
- 
- # lib summary
--LIB_LIST	+= libbz2 lzma
--LIB_OBJECTS	+= $(LIBBZ2_OBJ) $(LZMA_OBJ)
-+LIB_LIST	+= lzma
-+LIB_OBJECTS	+= $(LZMA_OBJ)
- RM_FILES	+= $(foreach l,$(LIB_LIST),src/$(l)/*.{d,o})
- 
- 
-@@ -273,10 +274,8 @@
- DEFINES1	+= -D_LZMA_PROB32=1	# LZMA option
- DEFINES		=  $(strip $(DEFINES1) $(MODE) $(XDEF))
- 
--CFLAGS		+= -fomit-frame-pointer -fno-strict-aliasing -funroll-loops
- CFLAGS		+= -Wall -Wno-parentheses -Wno-unused-function
--#CFLAGS		+= -O3 -Isrc/libwbfs -Isrc/lzma -Isrc -I$(UI) -I. -Iwork
--CFLAGS		+= -O3 -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
-+CFLAGS		+= -Isrc/libwbfs -Isrc -I$(UI) -I. -Iwork
- ifeq ($(SYSTEM),mac)
-  CFLAGS		+= -I/usr/local/include
- endif
-@@ -291,7 +290,7 @@
- ifeq ($(HAVE_ZLIB),1)
-  LIBS		+= -lz
- endif
--LIBS		+= $(XLIBS)
-+LIBS		+= $(XLIBS) -lbz2
- 
- DISTRIB_RM	= ./wit-v$(VERSION)-r
- DISTRIB_BASE	= wit-v$(VERSION)-r$(REVISION_NEXT)
-@@ -344,71 +343,60 @@
- # general rules
- 
- $(ALL_TOOLS_X): %: %.o $(ALL_OBJECTS) $(TOBJ_ALL) Makefile | $(HELPER_TOOLS)
--	@printf "$(LOGFORMAT)" tool "$@" "$(MODE) $(TOPT_$@) $(TOBJ_$@)"
--	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
-+	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
- 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) $(TOPT_$@) -o $@
--	@if test -f $@.exe; then $(STRIP) $@.exe; else $(STRIP) $@; fi
- 
--	@mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
--	@if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
-+	mkdir -p bin/$(SYSTEM) bin/$(SYSTEM)/debug
-+	if test -s $(MODE_FILE) && grep -Fq -e -DDEBUG $(MODE_FILE); \
- 		then cp -p $@ bin/$(SYSTEM)/debug/; \
- 		else cp -p $@ bin/; cp -p $@ bin/$(SYSTEM)/; fi
- 
- #--------------------------
- 
- $(HELPER_TOOLS): %: %.o $(ALL_OBJECTS) $(UI_TABS) Makefile
--	@printf "$(LOGFORMAT)" helper "$@ $(TOBJ_$@)" "$(MODE)"
--	@$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
-+	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $@.o \
- 		$(ALL_OBJECTS) $(TOBJ_$@) $(LIBS) -o $@
- 
- #--------------------------
- 
- $(WDF_LINKS): wdf
--	@printf "$(LOGFORMAT)" "link" "wdf -> $@" ""
--	@ln -f wdf "$@"
-+	ln -f wdf "$@"
- 
- #--------------------------
- 
- $(UI_OBJECTS): %.o: %.c ui-%.c ui-%.h version.h Makefile
--	@printf "$(LOGFORMAT)" +object "$@" "$(MODE)"
--	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
- 
- #--------------------------
- 
- $(C_OBJECTS): %.o: %.c version.h Makefile $(TEXT_FILES)
--	@printf "$(LOGFORMAT)" object "$@" "$(MODE)"
--	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
- 
- #--------------------------
- 
- $(ASM_OBJECTS): %.o: %.S Makefile
--	@printf "$(LOGFORMAT)" asm "$@" "$(MODE)"
--	@$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
-+	$(CC) $(CFLAGS) $(DEPFLAGS) $(DEFINES) -c $< -o $@
- 
- #--------------------------
- 
- $(SETUP_FILES): templates.sed $(SETUP_DIR)/$@
--	@printf "$(LOGFORMAT)" create "$@" ""
--	@chmod 775 $(GEN_TEMPLATE)
--	@$(GEN_TEMPLATE) $@
-+	chmod 775 $(GEN_TEMPLATE)
-+	$(GEN_TEMPLATE) $@
- 
- #--------------------------
- 
- $(TEXT_FILES): $(GEN_TEXT_FILE) $(TEXT_DIR)/$@
--	@printf "$(LOGFORMAT)" text "$@" ""
--	@chmod 775 $(GEN_TEXT_FILE)
--	@$(GEN_TEXT_FILE) $(TEXT_DIR) $@
-+	chmod 775 $(GEN_TEXT_FILE)
-+	$(GEN_TEXT_FILE) $(TEXT_DIR) $@
- 
- #--------------------------
- 
- $(UI_FILES): gen-ui.c tab-ui.c ui.h $(UI_TABS) | gen-ui
--	@printf "$(LOGFORMAT)" run gen-ui ""
--	@./gen-ui
-+	./gen-ui
- 
- .PHONY : ui
- ui : gen-ui
--	@printf "$(LOGFORMAT)" run gen-ui ""
--	@./gen-ui
-+	./gen-ui
- 
- #
- ###############################################################################
diff --git a/games-util/wit/files/wit-2.30a-no-exec-stack.patch b/games-util/wit/files/wit-2.30a-no-exec-stack.patch
deleted file mode 100644
index db91b45cfcb1..000000000000
--- a/games-util/wit/files/wit-2.30a-no-exec-stack.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- wit-2.30a/src/crypto/ssl-asm.S
-+++ wit-2.30a/src/crypto/ssl-asm.S
-@@ -37,3 +37,6 @@
- #define WIT_INCLUDE_SSL_ASM
- #include "ssl-asm.h"
- 
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
diff --git a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch
deleted file mode 100644
index a6083103b857..000000000000
--- a/games-util/wit/files/wit-2.40a-sizeof-pointer-memaccess.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- wit-2.40a/src/wfuse.c
-+++ wit-2.40a/src/wfuse.c
-@@ -340,7 +340,7 @@
- 	    }
- 	    ResetWBFS(df->wbfs);
- 	    FREE(df->wbfs);
--	    memset(df,0,sizeof(df));
-+	    memset(df,0,sizeof(*df));
- 	    n_dfile--;
- 	}
- 
-@@ -352,7 +352,7 @@
- 
-     if (found_df)
-     {
--	memset(found_df,0,sizeof(found_df));
-+	memset(found_df,0,sizeof(*found_df));
- 	WBFS_t * wbfs = MALLOC(sizeof(*wbfs));
- 	InitializeWBFS(wbfs);
- 	enumError err = OpenWBFS(wbfs,source_file,false,true,0);
diff --git a/games-util/wit/metadata.xml b/games-util/wit/metadata.xml
deleted file mode 100644
index baf90ff6dc62..000000000000
--- a/games-util/wit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
-	<use>
-		<flag name="fuse">Enable image mount support via fuse</flag>
-	</use>
-</pkgmetadata>
diff --git a/games-util/wit/wit-2.40a.ebuild b/games-util/wit/wit-2.40a.ebuild
deleted file mode 100644
index cb5a55fdabdc..000000000000
--- a/games-util/wit/wit-2.40a.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="command line tools to manipulate Wii/GameCube ISO images and WBFS containers"
-HOMEPAGE="https://wit.wiimm.de/"
-SRC_URI="https://dev.gentoo.org/~radhermit/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+fuse +zlib"
-
-RDEPEND="
-	app-arch/bzip2
-	fuse? ( sys-fs/fuse )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-DOCS="doc/*.txt"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.30a-makefile.patch
-	"${FILESDIR}"/${PN}-2.30a-no-exec-stack.patch
-	"${FILESDIR}"/${P}-sizeof-pointer-memaccess.patch
-)
-
-src_compile() {
-	export NO_FUSE=$(usex fuse 0 1)
-	export NO_ZLIB=$(usex zlib 0 1)
-
-	emake INSTALL_PATH="${D}"/usr CC="$(tc-getCC)"
-	emake doc
-}
diff --git a/games-util/wxchtdecoder-1.5a-r1 b/games-util/wxchtdecoder-1.5a-r1
new file mode 100644
index 000000000000..c7b39e00f647
--- /dev/null
+++ b/games-util/wxchtdecoder-1.5a-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=x11-libs/wxGTK:3.0[X]
+DESCRIPTION=A program to decode .CHT files in Snes9x and ZSNES to plain text
+EAPI=5
+HOMEPAGE=http://games.technoplaza.net/chtdecoder/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/wxGTK:3.0[X]
+SLOT=0
+SRC_URI=mirror://gentoo/wxchtdecoder-1.5a.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=738b87742a61037f1ff2350466d04c16
diff --git a/games-util/wxchtdecoder/Manifest b/games-util/wxchtdecoder/Manifest
deleted file mode 100644
index f6431906ebc3..000000000000
--- a/games-util/wxchtdecoder/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wxchtdecoder-1.5a-wxgtk.patch 1379 BLAKE2B 7a2c528a3a360148c78dae47beff3af43c97c1cb96108af80ba38ddb217e84d2e28539e4d3550b5b0d95119c3c6c7d332a2aeef9c059dded918627ac4c867869 SHA512 96fc2236b7f99f5cc3df1672174c332cb568ad0899a209a7e022bd24617b31854338435db4fbef1523f5d67ae466f2de3da29ac417ae8ad948f4e90326727a3b
-DIST wxchtdecoder-1.5a.tar.bz2 84088 BLAKE2B 1bff9a352a80d3f89b9963540e4a1a0ea79bffa8220c1c1a940068180a294a5518edd6fda13083d0d5fe3baa5f64813b6c925257e23d306a0de625817839c908 SHA512 edb606d1b88cedcb725a1dca2c82f4a81ebff5a1b8786a4127505e021b1fc8cc351363d05963a68c7d555f895b3b762fbd34dfc3f26640759619daecce1097df
-EBUILD wxchtdecoder-1.5a-r1.ebuild 636 BLAKE2B 96ea412aac88b5964aa6b6bc4f2d943d1934d59e9492afb44b11d8afbafb71823a9a97e77f1753bca3563470dbdf93bf591d7967c4ed3e7c02e09848efc2c0f4 SHA512 68f202580b719571d81f2ccc6374e13366e2846e9740a725f922a005608ff651b7f221b00c24ab344c8847314636d455a5a46010c7ebaa8bf97cda871a699540
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch b/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch
deleted file mode 100644
index 1eb61febe1bb..000000000000
--- a/games-util/wxchtdecoder/files/wxchtdecoder-1.5a-wxgtk.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- wxchtdecoder-1.5a.orig/source/chtdecoder.cc
-+++ wxchtdecoder-1.5a/source/chtdecoder.cc
-@@ -64,26 +64,26 @@
- const wxSize *CHTDecoder::APP_SIZE = new wxSize(640, 480);
- 
- namespace {
--    const wxCmdLineEntryDesc CMDLINE_DESC[] = {
-+    wxCmdLineEntryDesc CMDLINE_DESC[] = {
-         { 
--            wxCMD_LINE_SWITCH, wxT("h"), wxT("help"),
--            wxT("display usage information"), wxCMD_LINE_VAL_STRING,
-+            wxCMD_LINE_SWITCH, "h", "help",
-+            "display usage information", wxCMD_LINE_VAL_STRING,
-             wxCMD_LINE_OPTION_HELP
-         },
-           
-         { 
--            wxCMD_LINE_SWITCH, wxT("v"), wxT("version"),
--            wxT("display version information"), wxCMD_LINE_VAL_STRING,
-+            wxCMD_LINE_SWITCH, "v", "version",
-+            "display version information", wxCMD_LINE_VAL_STRING,
-             wxCMD_LINE_OPTION_HELP 
-         },
-           
-         {
--            wxCMD_LINE_SWITCH, wxT("f"), wxT("force-open"),
--            wxT("force opening of possibly invalid .CHT files")
-+            wxCMD_LINE_SWITCH, "f", "force-open",
-+            "force opening of possibly invalid .CHT files"
-         },
-         
-         {
--            wxCMD_LINE_PARAM, 0, 0, wxT(".CHT file(s)"),
-+            wxCMD_LINE_PARAM, 0, 0, ".CHT file(s)",
-             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE
-         },
-         
diff --git a/games-util/wxchtdecoder/metadata.xml b/games-util/wxchtdecoder/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/wxchtdecoder/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild b/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
deleted file mode 100644
index 0a8fbabae6b4..000000000000
--- a/games-util/wxchtdecoder/wxchtdecoder-1.5a-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-inherit eutils wxwidgets
-
-DESCRIPTION="A program to decode .CHT files in Snes9x and ZSNES to plain text"
-HOMEPAGE="http://games.technoplaza.net/chtdecoder/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wxgtk.patch
-}
-
-src_configure() {
-	econf --with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
-	dobin source/wxchtdecoder
-	dodoc docs/wxchtdecoder.txt
-}
diff --git a/games-util/xboxdrv-0.8.8 b/games-util/xboxdrv-0.8.8
new file mode 100644
index 000000000000..634763eeeb28
--- /dev/null
+++ b/games-util/xboxdrv-0.8.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst setup
+DEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:= virtual/pkgconfig dev-util/scons[python_targets_python2_7] virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Userspace Xbox 360 Controller driver
+EAPI=6
+HOMEPAGE=https://pingus.seul.org/~grumbel/xboxdrv/
+IUSE=kernel_linux
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost:= dev-libs/dbus-glib:= virtual/libudev:= sys-apps/dbus:= dev-libs/glib:2= virtual/libusb:1= x11-libs/libX11:=
+SLOT=0
+SRC_URI=https://pingus.seul.org/~grumbel/xboxdrv/xboxdrv-linux-0.8.8.tar.bz2
+_eclasses_=eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	abbc7625ff457854eae0edaa1fd55cc7	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88
+_md5_=c2be9b9c1b542286c8364c727528863b
diff --git a/games-util/xboxdrv/Manifest b/games-util/xboxdrv/Manifest
deleted file mode 100644
index e28e31338358..000000000000
--- a/games-util/xboxdrv/Manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-AUX github-144.patch 491 BLAKE2B d644c7af466ee4c0e661292509b614f6a36f69a2bdf2919a4fd26baf07571655f52681eb9787adaefb1f853fd31c71e8156a0df5e65d9e92e72ae531aa93c768 SHA512 058eb9515a74742d6aef1de3acc76b8731947fe4a3aa1179243d0b14cab5f978aef98d9b140371dd03a5165f96e167b1dc7297378545f266e887ea0b3188c79e
-AUX org.seul.Xboxdrv.conf 247 BLAKE2B 0829d1e65203f56efc0442c798070cf8c9f6b53792b5eb4fd8cc0671068d5d66d281b2c53c5cdb06474b635c2c9c5076d3a64364afdffc87a0c1bf052015f9ff SHA512 1416e80d326481e224ce3381a8feeacf304107f945d787183c74118aae955e191cc89269e8de44d6ce4efc2502def6957b690e9bad70072fcf0bbd47c8ab12cc
-AUX xboxdrv-0.8.8-fix-c++14.patch 337 BLAKE2B 5fc250da71e11432c215fa42751be07a5eef37036a4a406601619f8b07554d9b349ba66196b84090e23d807687379b64710218d8b0b6c63036e189c2331a14c0 SHA512 97b504a0acf7fd52ef0f4accacd89e9211136809c7559bd8958d2b235d732df2659fb5b794512e2ff3aaf33f22d97e2f4b42187eab9406a36e7b6cb9fd651832
-AUX xboxdrv-0.8.8-scons.patch 584 BLAKE2B cbe8d12773b2f5c6051291fda2c8df23811d12c5440d7dd7f50777bdc01f474f971713ec513a245787a2b113e32cb03b202bf28619e96315fa2992edc21083cb SHA512 25b7b1e57f7ad9b48ad566c81b97b9354a353535564462e8c4b550190c920718165044508d28b3d5fee6155bb41752afbd8038fab59239c58e1aee82d62c5910
-AUX xboxdrv.confd 211 BLAKE2B 7a79059b29edbfbde33fe3daf9c89346246ac4323d7053ea4b26b6dd1fff07d731f8f7faa6a79f152f76eb1722606655f1d8d1026a3a83b0520e1909915039db SHA512 4c8a784a18979746a45653244e451fe1ba9e7cbb14301cc18f58e474e51f7569177364c5a96cbe0275db2b359424febd27c040ede5820148aadb80e90ebf8178
-AUX xboxdrv.initd 446 BLAKE2B f78cf4af5cca703efc0a480c2ba34b0189d2b86a64aa89533e59a4d325ca03592bc911a9c85ff1fe5801ef2ade537dcfcc7266052a77f64ff05dad5f43630167 SHA512 e87d4b4b4313cb4ae983aef4ab7fa799f6b466e0f504eb15905b82f5b8bca2f0ff6f3d9a7d9963c048b6189e2a4c4b862a3f39d4201c2f5f02234362ad7b3af1
-AUX xboxdrv.service 371 BLAKE2B afd5f5397f4ae15af69d8e12865201fe159691ba2a36c00fe207304afe5126814fafd0394e7618e9f4d27611bd2c0dd7371717c7a07a57d27c3a4ab8e6e40140 SHA512 80e7657edae9c771740628ef5f9752b79d50288ead33afe97e71ffc6e7d7c24343eeb213668cdc823b28742976e2e56f4defdcd823716897f3262be1fc7832e9
-AUX xboxdrv.udev-rules 225 BLAKE2B 0f027c332b58d7ec3c289d23192355dae8d44f50c7cbf9de42a2023a2db6c29943fc7eecc85a0e802f5925ffdfc145584909140df8c030a120fe3da79c91641e SHA512 eb9e535bb18077e4c61db8fa5020a779b856a6df29eb4daa72a2ab9675720f809a981b0e4706fbbc6bf5a368cc162c7151cd6ae10399d091f10d2f75b1c48a3e
-DIST xboxdrv-linux-0.8.8.tar.bz2 267919 BLAKE2B b6f09fc929ba561f0c18a777ca94f6972f366d29709d5fdcb168988311ca53eb813761df0f87d148795aa14d2d89b200e8123502c0b255ebe20e5f9caa18f8f1 SHA512 2978b33d23636431ee0cc393ea32d3d26ebe9f2b914f0bf8bc0e096f98202726768142e653bc5765ac55084b105ff3a6214bdf6e745fdd8aa167260c54c10494
-EBUILD xboxdrv-0.8.8.ebuild 1405 BLAKE2B 5636721b89c91b62ac51695148920a0cd1641e5a8f847225a627dc71009a7480fbb02fa884ca590a1f375aca820fe3d3266c814afd1723717cf0b486b8eeffc2 SHA512 f91abd7d9370f4d2e6c79ed38da4eb93592e672dbe0ed2eac377da6fb927ed83e8ffb6eecff29a45926258950ea4da52f53bf619deb9ebedbb383495ca9b5e1a
-MISC metadata.xml 252 BLAKE2B 1b951d2e730631865ae5f379b19ed9de2c8adf2f2786da3f75d0871d967374198ddd9106433f388bdc7050c37063fb28cda4320ae7bdc9a03854838693d9f952 SHA512 90798aff93ec7e3881b882e7b10bb1680e8cb7d82b0ef4280e562ab0c9e8a2daba8afe57333dc64697322267a4b651c00ee9b4fdeb56278ff70c073da7b91638
diff --git a/games-util/xboxdrv/files/github-144.patch b/games-util/xboxdrv/files/github-144.patch
deleted file mode 100644
index 5782e1a8cd52..000000000000
--- a/games-util/xboxdrv/files/github-144.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp xboxdrv-linux-0.8.5/src/usb_gsource.cpp
---- xboxdrv-linux-0.8.5.orig/src/usb_gsource.cpp	2013-04-07 18:27:49.000000000 +0100
-+++ xboxdrv-linux-0.8.5/src/usb_gsource.cpp	2016-07-02 12:35:41.692355904 +0100
-@@ -174,7 +174,10 @@
- gboolean
- USBGSource::on_source()
- {
--  libusb_handle_events(NULL);
-+  struct timeval to;
-+  to.tv_sec = 0;
-+  to.tv_usec = 0;
-+  libusb_handle_events_timeout_completed(NULL, &to, NULL);
-   return TRUE;
- }
- 
diff --git a/games-util/xboxdrv/files/org.seul.Xboxdrv.conf b/games-util/xboxdrv/files/org.seul.Xboxdrv.conf
deleted file mode 100644
index fc685d6e8e83..000000000000
--- a/games-util/xboxdrv/files/org.seul.Xboxdrv.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <policy context="default">
-    <allow own="org.seul.Xboxdrv"/>
-  </policy>
-</busconfig>
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch
deleted file mode 100644
index 80a8d8f550e1..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-fix-c++14.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Cast boost::shared_ptr explicitly for C++14.
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594674
-
---- a/src/controller_slot.cpp
-+++ b/src/controller_slot.cpp
-@@ -67,9 +67,9 @@ ControllerSlot::disconnect()
- }
- 
- bool
- ControllerSlot::is_connected() const
- {
--  return m_thread;
-+  return static_cast<bool>(m_thread);
- }
- 
- /* EOF */
diff --git a/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch b/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
deleted file mode 100644
index d6df8d99e32e..000000000000
--- a/games-util/xboxdrv/files/xboxdrv-0.8.8-scons.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://dev.gentoo.org/~vapier/scons-blows.txt
-
-diff -Naur xboxdrv-linux-0.8.8.orig/SConstruct xboxdrv-linux-0.8.8/SConstruct
---- xboxdrv-linux-0.8.8.orig/SConstruct	2015-11-09 10:19:35.000000000 +0000
-+++ xboxdrv-linux-0.8.8/SConstruct	2016-07-02 16:13:52.560961836 +0100
-@@ -84,6 +84,7 @@
- opts.Add('CXXFLAGS', 'C++ Compiler flags')
- opts.Add('LINKFLAGS', 'Linker Compiler flags')
- opts.Add('AR', 'Library archiver')
-+opts.Add('RANLIB', 'Archive indexer')
- opts.Add('CC', 'C Compiler')
- opts.Add('CXX', 'C++ Compiler')
- opts.Add('BUILD', 'Build type: release, custom, development')
diff --git a/games-util/xboxdrv/files/xboxdrv.confd b/games-util/xboxdrv/files/xboxdrv.confd
deleted file mode 100644
index 99363c95dafb..000000000000
--- a/games-util/xboxdrv/files/xboxdrv.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-XBOXDRV_OPTS=""
-#XBOXDRV_OPTS="${XBOXDRV_OPTS} --next-controller --config /etc/xboxdrv/controller.ini"
diff --git a/games-util/xboxdrv/files/xboxdrv.initd b/games-util/xboxdrv/files/xboxdrv.initd
deleted file mode 100644
index 8602c7e12531..000000000000
--- a/games-util/xboxdrv/files/xboxdrv.initd
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDFILE="/var/run/${SVCNAME}.pid"
-
-start() {
-	ebegin "Starting xboxdrv"
-	start-stop-daemon --start --pidfile "${PIDFILE}" --exec /usr/bin/xboxdrv -- \
-		--daemon --detach --pid-file "${PIDFILE}" ${XBOXDRV_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping xboxdrv"
-	start-stop-daemon --stop --pidfile "${PIDFILE}"
-	eend $?
-}
diff --git a/games-util/xboxdrv/files/xboxdrv.service b/games-util/xboxdrv/files/xboxdrv.service
deleted file mode 100644
index b0d372696e0a..000000000000
--- a/games-util/xboxdrv/files/xboxdrv.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Userspace Xbox 360 Controller driver
-BindsTo=sys-subsystem-usb-xbox-controller0.device
-After=sys-subsystem-usb-xbox-controller0.device
-
-[Service]
-BusName=org.seul.Xboxdrv
-ExecStart=/usr/bin/xboxdrv --silent --daemon
-KillSignal=SIGINT
-# xboxdrv can not stop gracefully if controller gets unplugged
-TimeoutStopSec=2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/games-util/xboxdrv/files/xboxdrv.udev-rules b/games-util/xboxdrv/files/xboxdrv.udev-rules
deleted file mode 100644
index c571b2b5ab02..000000000000
--- a/games-util/xboxdrv/files/xboxdrv.udev-rules
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBSYSTEM=="usb", ACTION=="add",\
-	ENV{ID_MODEL_FROM_DATABASE}=="Xbox*Controller|Xbox*Controller S",\
-	TAG+="systemd",\
-	ENV{SYSTEMD_ALIAS}="/sys/subsystem/usb/xbox/controller$number",\
-	ENV{SYSTEMD_WANTS}+="xboxdrv.service"
diff --git a/games-util/xboxdrv/metadata.xml b/games-util/xboxdrv/metadata.xml
deleted file mode 100644
index 3c186688e265..000000000000
--- a/games-util/xboxdrv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild b/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
deleted file mode 100644
index a9324ad2dffe..000000000000
--- a/games-util/xboxdrv/xboxdrv-0.8.8.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info scons-utils toolchain-funcs systemd udev
-
-MY_P=${PN}-linux-${PV}
-DESCRIPTION="Userspace Xbox 360 Controller driver"
-HOMEPAGE="https://pingus.seul.org/~grumbel/xboxdrv/"
-SRC_URI="https://pingus.seul.org/~grumbel/xboxdrv/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/boost:=
-	dev-libs/dbus-glib:=
-	virtual/libudev:=
-	sys-apps/dbus:=
-	dev-libs/glib:2=
-	virtual/libusb:1=
-	x11-libs/libX11:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-scons.patch
-	"${FILESDIR}"/github-144.patch
-	"${FILESDIR}"/${P}-fix-c++14.patch
-)
-
-CONFIG_CHECK="~INPUT_EVDEV ~INPUT_JOYDEV ~INPUT_UINPUT ~!JOYSTICK_XPAD"
-
-src_compile() {
-	escons \
-		BUILD=custom \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CXXFLAGS="-Wall ${CXXFLAGS}" \
-		LINKFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin xboxdrv
-	doman doc/xboxdrv.1
-	dodoc AUTHORS NEWS PROTOCOL README.md TODO
-
-	newinitd "${FILESDIR}"/xboxdrv.initd xboxdrv
-	newconfd "${FILESDIR}"/xboxdrv.confd xboxdrv
-
-	insinto /etc/dbus-1/system.d/
-	doins "${FILESDIR}/org.seul.Xboxdrv.conf"
-
-	udev_newrules "${FILESDIR}"/xboxdrv.udev-rules 99-xbox-controller.rules
-	systemd_dounit "${FILESDIR}"/xboxdrv.service
-}
-
-pkg_postinst() {
-	udev_reload
-}
diff --git a/games-util/xboxgw-1.082 b/games-util/xboxgw-1.082
new file mode 100644
index 000000000000..ca1cedd53767
--- /dev/null
+++ b/games-util/xboxgw-1.082
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Tunnels XBox system link games over the net
+EAPI=5
+HOMEPAGE=http://www.xboxgw.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=freedist
+SLOT=0
+SRC_URI=http://www.xboxgw.com/rel/dist2.1/tarballs/i386/xboxgw-1.08-2.tgz http://www.xboxgw.com/rel/dist2.1/tarballs/i386/hmlibs-1.07-2.i386.tgz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=82f8df5447af0e8360f1a3fd82b4da29
diff --git a/games-util/xboxgw/Manifest b/games-util/xboxgw/Manifest
deleted file mode 100644
index 4ab83a1e0ee4..000000000000
--- a/games-util/xboxgw/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST hmlibs-1.07-2.i386.tgz 120364 BLAKE2B 3c2ffa9968ac3c39962314b41f19dc3071a0921f68f35ac1b20908fb496398e4957b7112f81a9658fb4ebb69f637039dfce0a180039ee787df850cfb9153eb04 SHA512 2624c44bee7985586288f3c3e2c27e30fb23735a555635ec5a2813a40a54eb7ae1ec0e6f691d883832ec2790ad88a7f03e15ebbaea464db20e2107635463c96c
-DIST xboxgw-1.08-2.tgz 91488 BLAKE2B 104f057e5f29d03525ad2460fa427cb32adadd8ee54d49c82e8ed61c976728494076cdc1b0fffb5f766f9f67a5045aecf2ce0022f2c68af10d8eb06573732693 SHA512 dd4b97fd535e84b4cae34135ab8220399e410a0ca3c73e3fff244ba6ec7f6944f40a7e33c74f3872496cae03fb87dc90e11b7fd4b788ee061d32f86ad36b0617
-EBUILD xboxgw-1.082.ebuild 971 BLAKE2B f70efb4fb3267d0e9d1ad7becb165de56d5ecbb62921443d748f7baff5edea21810b19c4cf740da72adc7247eaa961cb4893985eadfca1adc93b0f042dbb7bf5 SHA512 20509489a6e785937273a24bc026c7a1482edfb5240bf6ed0a0062a0fa31dd328dca771731f667b5625cf92fee32b23f35539b1fad90b09cd246fdf441c1893a
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-util/xboxgw/metadata.xml b/games-util/xboxgw/metadata.xml
deleted file mode 100644
index 78274e0fa550..000000000000
--- a/games-util/xboxgw/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/games-util/xboxgw/xboxgw-1.082.ebuild b/games-util/xboxgw/xboxgw-1.082.ebuild
deleted file mode 100644
index ef0a637ca80a..000000000000
--- a/games-util/xboxgw/xboxgw-1.082.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-XBOXGW_P="${PN}-1.08-2"
-HMLIBS_P="hmlibs-1.07-2"
-
-DESCRIPTION="Tunnels XBox system link games over the net"
-HOMEPAGE="http://www.xboxgw.com/"
-SRC_URI="http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${XBOXGW_P}.tgz
-	http://www.xboxgw.com/rel/dist2.1/tarballs/i386/${HMLIBS_P}.i386.tgz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-QA_PREBUILT="opt/${PN}/lib/libhmdb.so
-	opt/${PN}/lib/libhmsched.so
-	opt/${PN}/lib/libhmcli.so
-	opt/${PN}/lib/libhmsdb.so
-	opt/${PN}/bin/hmdbdump
-	opt/${PN}/bin/xboxgw
-	opt/${PN}/bin/xbifsetup"
-
-S=${WORKDIR}
-
-src_install() {
-	into /opt/${PN}
-
-	cd "${WORKDIR}/${HMLIBS_P}"
-	dolib.so *.so
-	dobin hmdbdump
-	insinto /usr/include/hmlibs
-	doins *.h
-
-	cd "${WORKDIR}/${XBOXGW_P}"
-	dobin xboxgw xbifsetup
-	dodoc *.txt
-
-	if use amd64 ; then
-		mv "${D}"/opt/${PN}/lib64 "${D}"/opt/${PN}/lib || die
-	fi
-}
diff --git a/games-util/xgame-1.7.1-r1 b/games-util/xgame-1.7.1-r1
new file mode 100644
index 000000000000..e79975e27636
--- /dev/null
+++ b/games-util/xgame-1.7.1-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Run games in a separate X session
+EAPI=6
+HOMEPAGE=http://xgame.tlhiv.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=http://downloads.tlhiv.com/xgame/xgame-1.7.1.tar.gz
+_md5_=e6c641335a77fedc06588b256274bae7
diff --git a/games-util/xgame-gtk2-2.0.2-r1 b/games-util/xgame-gtk2-2.0.2-r1
new file mode 100644
index 000000000000..9d5ff050fd5b
--- /dev/null
+++ b/games-util/xgame-gtk2-2.0.2-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Run games in a separate X session
+EAPI=6
+HOMEPAGE=http://xgame.tlhiv.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl >=dev-perl/Gtk2-1.040
+SLOT=0
+SRC_URI=http://downloads.tlhiv.com/xgame/xgame-gtk2-2.0.2.tar.gz
+_md5_=95d69a5dd2c2de14af43252b62655552
diff --git a/games-util/xgame-gtk2/Manifest b/games-util/xgame-gtk2/Manifest
deleted file mode 100644
index 2538323022d7..000000000000
--- a/games-util/xgame-gtk2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xgame-gtk2-2.0.2.tar.gz 6055 BLAKE2B 31f95f1496fbc3b064fc54d9eeaa5b164218bcf77b0f49b6120d4fdd91bef54ebda8a2b9b3012a459d430730dbe02819b89c98c0841375639ad7bfef7986da02 SHA512 708a831f78866356e6fb5d2aa0926562eaf0a247e88b7971505f41aaa71ad7d30d5f4d2fefc57030fe1e27138a58799e7396da2026a01bd130febd8e5170c25b
-EBUILD xgame-gtk2-2.0.2-r1.ebuild 405 BLAKE2B 4f9cf44e8a96c7132a7aa42d5e483f6918b65dcde67b5ec1a89a571a5fc24be6434c494d22e31d7cf5a2d9794492f48669bd47a0120ecd92fc58a20eff7bd26b SHA512 41c271861b7d7f5e91c287d4e7dc5508ea789b4c92c80ee4b1a993a999bbef9dc35ca39159df4569b3f7a091d307eba8ddfb7bda690298d38183a24a6fd934e3
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/xgame-gtk2/metadata.xml b/games-util/xgame-gtk2/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-util/xgame-gtk2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-util/xgame-gtk2/xgame-gtk2-2.0.2-r1.ebuild b/games-util/xgame-gtk2/xgame-gtk2-2.0.2-r1.ebuild
deleted file mode 100644
index f080ea4c8fab..000000000000
--- a/games-util/xgame-gtk2/xgame-gtk2-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Run games in a separate X session"
-HOMEPAGE="http://xgame.tlhiv.com/"
-SRC_URI="http://downloads.tlhiv.com/xgame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/perl
-	>=dev-perl/Gtk2-1.040"
-
-src_install() {
-	default
-	dobin xgame-gtk2
-}
diff --git a/games-util/xgame/Manifest b/games-util/xgame/Manifest
deleted file mode 100644
index 2d9e318f9843..000000000000
--- a/games-util/xgame/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xgame-1.7.1.tar.gz 4657 BLAKE2B de9a7d470ab6577264cfa72d232c5cd70f6d2b2fd161d849d3f74439c236247be0c737281cd73f3f5f9b24eab301ac806e60aa372d2a35985118bf8b382c5f9b SHA512 1efe88dcac3ce6290220f60d664b3afa0e76901b9708502d954a3edca2ee73b3686af7639213067b2164990313db7eee66a404b9184440891a9f44a294008738
-EBUILD xgame-1.7.1-r1.ebuild 385 BLAKE2B b079cc10e5640b1d2d68cab7883cad33e4c1258f39fa512b479cb5ed9ec979f9be21ff7cbb3aa7310778c3a337f4e453ad9970363f9d03601de3652270928ce1 SHA512 dba77a6e47e00bec4d9d34636318e232538b593a72ce0dae07cab898694b33f265b5eac6c7188af4e537dd87008aa69c0a478ae835d6ebfa5ca7c5fddb233d4a
-MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-util/xgame/metadata.xml b/games-util/xgame/metadata.xml
deleted file mode 100644
index 26079e608bed..000000000000
--- a/games-util/xgame/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/games-util/xgame/xgame-1.7.1-r1.ebuild b/games-util/xgame/xgame-1.7.1-r1.ebuild
deleted file mode 100644
index 22754c67d800..000000000000
--- a/games-util/xgame/xgame-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Run games in a separate X session"
-HOMEPAGE="http://xgame.tlhiv.com/"
-SRC_URI="http://downloads.tlhiv.com/xgame/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=
-RDEPEND="dev-lang/perl"
-
-src_install() {
-	default
-	dobin xgame
-}
diff --git a/games-util/xgamer-0.6.2 b/games-util/xgamer-0.6.2
new file mode 100644
index 000000000000..b7d112011e2d
--- /dev/null
+++ b/games-util/xgamer-0.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-lang/perl-5.10 >=x11-libs/gtk+-2.18:2 >=dev-perl/Gtk2-1.120 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-BaseDir dev-perl/XML-Twig dev-perl/glib-perl x11-misc/numlockx media-gfx/feh dev-perl/Module-Build dev-lang/perl:=
+DESCRIPTION=A launcher for starting games in a second X session
+EAPI=6
+HOMEPAGE=https://code.google.com/p/xgamer/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/perl-5.10 >=x11-libs/gtk+-2.18:2 >=dev-perl/Gtk2-1.120 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-File-Temp dev-perl/File-BaseDir dev-perl/XML-Twig dev-perl/glib-perl x11-misc/numlockx media-gfx/feh dev-lang/perl:=
+SLOT=0
+SRC_URI=https://xgamer.googlecode.com/files/xgamer-0.6.2.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=8cc9dd001b113fd67be2fbcf23cb5643
diff --git a/games-util/xgamer/Manifest b/games-util/xgamer/Manifest
deleted file mode 100644
index 1ecff1568faa..000000000000
--- a/games-util/xgamer/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xgamer-0.6.2-desktopfile.patch 236 BLAKE2B 9d4cc7ce26065fd9692f9348347ae0b816021970811b1ac2471692b6b60d357139794501b23a04eb95080b63850ea35f0166b54c7debe6640fe071d4ecadd6eb SHA512 d2c378c955358067883ebe845be3f183ec2c0f52a712e0548dc80a8f0d12b38baea0ef57674fd7897c4102cbc1f24d48034dc7fd3fe814a1271a2961bdcd9210
-AUX xgamer-0.6.2-perl526.patch 284 BLAKE2B 8d2f85e21ab5ff7b189ee38a04a9e8fb52462cb50de2b12f44e49510d87d354164a0e3dc4ae27beb318d4c2f07a64cc3b0b7d819a7193f59f043230dc3fbe953 SHA512 54b3662ef1fc054ec7316529617320cabd400f1d7357d986d577c2049e9f27e543affd797eecb685761a3f982d17deabfb126261c5704bd79325e0e395578ca3
-DIST xgamer-0.6.2.tar.gz 43222 BLAKE2B cc5d4ea8505966a3312f7fed77088112e1015f61f2c0a7547dee15ecff232fb1a6b0175ac79348dba4d2bcf3172199b8d3caaa03da8c0889c6d0597d2e0047fa SHA512 caffebe5d4f07f532366e3a5f6ff717251f254d012bb5c33c431538720a2fa301ab8b9cf277771659655cac6fbe2734534146c224ef881486f7dfc51ac992315
-EBUILD xgamer-0.6.2.ebuild 851 BLAKE2B ee439d31e2d98e47355ea56022aa95b5fa3d94ae16c91f08d58d51e09dfdb8d895d4e050eb03d12e7ef86b4580f4a465a438a38e5c910e451e69d68252be5525 SHA512 f78be62fd95d304b31a844b0fc33757845fbca43738d54c022448861b7b5851004929c0aeeec7553b94c68fa22e4dce947be2dc8db976a8d2110b68341c5e7dd
-MISC metadata.xml 329 BLAKE2B a5b0eb6010325f787d6167267067c7029414b2323e000a493da0b4bdd7f67bb02f2d543fc29784586e038e06353dc15a9c28cddf41cd62bb8fbd1f578dd977ae SHA512 89fdd2dc97da98821c9c0f17899c15d50cda0d0887309a3406d9eae0159cc775ee4b070e5721c941e497d18711d3894d52ab35494b20c7a3e87ef315fadd1ee5
diff --git a/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch b/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch
deleted file mode 100644
index 3639de18e5e1..000000000000
--- a/games-util/xgamer/files/xgamer-0.6.2-desktopfile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xgamer/share/applications/xgamer.desktop
-+++ xgamer/share/applications/xgamer.desktop
-@@ -5,6 +5,6 @@
- Icon=xgamer
- StartupNotify=true
- Terminal=false
--Categories=GTK;Game
-+Categories=GTK;Game;
- Name=XGamer
- Comment=X Game Launcher
diff --git a/games-util/xgamer/files/xgamer-0.6.2-perl526.patch b/games-util/xgamer/files/xgamer-0.6.2-perl526.patch
deleted file mode 100644
index d59ba05263fb..000000000000
--- a/games-util/xgamer/files/xgamer-0.6.2-perl526.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN xgamer.orig/Build.PL xgamer/Build.PL
---- xgamer.orig/Build.PL	2012-09-21 17:23:27.000000000 +0200
-+++ xgamer/Build.PL	2017-07-08 20:33:44.566199833 +0200
-@@ -2,7 +2,8 @@
-  
- use strict;
- use warnings;
-- 
-+
-+use lib q[.]; 
- use inc::MyBuilder;
- use File::Spec::Functions;
-  
diff --git a/games-util/xgamer/metadata.xml b/games-util/xgamer/metadata.xml
deleted file mode 100644
index 32950d8b9a44..000000000000
--- a/games-util/xgamer/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">xgamer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/xgamer/xgamer-0.6.2.ebuild b/games-util/xgamer/xgamer-0.6.2.ebuild
deleted file mode 100644
index ab29f4ccbd52..000000000000
--- a/games-util/xgamer/xgamer-0.6.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit perl-module
-
-DESCRIPTION="A launcher for starting games in a second X session"
-HOMEPAGE="https://code.google.com/p/xgamer/"
-SRC_URI="https://xgamer.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.10
-	>=x11-libs/gtk+-2.18:2
-	>=dev-perl/Gtk2-1.120
-	virtual/perl-File-Path
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	dev-perl/File-BaseDir
-	dev-perl/XML-Twig
-	dev-perl/glib-perl
-	x11-misc/numlockx
-	media-gfx/feh"
-DEPEND="${RDEPEND}
-	dev-perl/Module-Build"
-
-S=${WORKDIR}/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-desktopfile.patch
-	"${FILESDIR}"/${P}-perl526.patch
-)
-
-pkg_postinst() {
-	elog "optional dependencies:"
-	elog "  x11-wm/openbox (integrates well)"
-}
diff --git a/games-util/xqf-1.0.6.2 b/games-util/xqf-1.0.6.2
new file mode 100644
index 000000000000..64856cb67e1c
--- /dev/null
+++ b/games-util/xqf-1.0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/gtk+:2 >=games-util/qstat-2.11 nls? ( virtual/libintl ) geoip? ( dev-libs/geoip ) bzip2? ( app-arch/bzip2 ) virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A server browser for many FPS games (frontend for qstat)
+EAPI=5
+HOMEPAGE=http://xqf.github.io/en/
+IUSE=bzip2 geoip nls
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/gtk+:2 >=games-util/qstat-2.11 nls? ( virtual/libintl ) geoip? ( dev-libs/geoip ) bzip2? ( app-arch/bzip2 )
+SLOT=0
+SRC_URI=https://github.com/XQF/xqf/archive/xqf-1.0.6.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=955cad181902ef80fef47f6634fd89e0
diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest
deleted file mode 100644
index 365be0d9f392..000000000000
--- a/games-util/xqf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xqf-1.0.6.2-underlink.patch 300 BLAKE2B 24205c2328355fd9e5ee187c3c7e7a3b1875f8020f1afbd7ced7bf6b2f3c57ce1d3485cad6c2d23a70ee830e7cad2ec7060554bb70fb0dbfbe26bc2c339afb9b SHA512 e35c62bf83ccbaaf8ca775978acf33ed419c881158f607e44032a2329b88443512a65603d0797ede1be38edaa66de1318d7c8275f276cd5988d74ef7430b51de
-AUX xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch 190 BLAKE2B 3c4a52c059392596c082c4ae3f4259073dc49fd5c94424ef80e4f22076e4b5473eabc60d763eabb3f73177155692db7d722d7ab8cf1f7acc9c285fdfc9d12390 SHA512 11677294d042d8303b72085867855e1795a9995e29f4b5145e415434c8c6188fa20e19c95f02d804a2b3e481f1f827cad9fa865d77f4f1f0880a3a66d69460d8
-DIST xqf-1.0.6.2.tar.gz 595096 BLAKE2B 36c135c064ae61af12daa70e9c78fe2a377ebcaf91b0f36fac43865b6b0601f104d8b09bd84b9d9699afdab7f3d4d3a0e67f3251f20d6ce025e92db2302d21a8 SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c
-EBUILD xqf-1.0.6.2.ebuild 940 BLAKE2B e58e3632573416bd915657d88e44a850e03a45a02b16271c9bb8ef9a3eecc63b2a8e6f2e85367a4c846413aae4fde7b04d46e7374b10b54d8df10c1734ba0095 SHA512 77b887d3e70c340cf6e8f4d977c996f26976cf16576888fc0ac7bafab22283b512fb7ab5adb8e93f4c3d6a69d5a419d843a8f6fd7bb42fdf904a8a619b30ec18
-MISC metadata.xml 373 BLAKE2B d2337bac8791a2a8985237089b723183ba428527db288b5f98e37499e0dde32503f09eca2fa6d320b354fe8507fb4cd98c12f866f77e2c0f85ee52739758fa05 SHA512 b904d8495fb9fd79c072f12570ef67cb28396ba215e0cbc70f184c64dcd1b1a7c028274bb7927acf8b7012ff55cb22564fa52252d6bc41e75e86d5562761539a
diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
deleted file mode 100644
index fe93c7624675..000000000000
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xqf-xqf-1.0.6.2/src/Makefile.am
-+++ xqf-xqf-1.0.6.2/src/Makefile.am
-@@ -41,6 +41,7 @@
- 	    $(GEOIP_LIB) \
- 	    $(PACKAGE_LIBS) \
- 	    $(GDK_PIXBUF_LIBS) \
-+	    -lX11 \
- 	    -lz -ldl
- 
- xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map
diff --git a/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
deleted file mode 100644
index 9bd433b3b27e..000000000000
--- a/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xqf-1.0.5/src/zip/ioapi.h
-+++ xqf-1.0.5/src/zip/ioapi.h
-@@ -6,6 +6,8 @@
-    Copyright (C) 1998-2003 Gilles Vollant
- */
- 
-+#define OF(x) x
-+
- #ifndef _ZLIBIOAPI_H
- #define _ZLIBIOAPI_H
- 
diff --git a/games-util/xqf/metadata.xml b/games-util/xqf/metadata.xml
deleted file mode 100644
index 12c2d2df28fe..000000000000
--- a/games-util/xqf/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>games@gentoo.org</email>
-		<name>Gentoo Games Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">xqf</remote-id>
-		<remote-id type="github">XQF/xqf</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild
deleted file mode 100644
index 5ea89476375a..000000000000
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
-HOMEPAGE="http://xqf.github.io/en/"
-SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-IUSE="bzip2 geoip nls"
-
-RDEPEND="x11-libs/gtk+:2
-	>=games-util/qstat-2.11
-	nls? ( virtual/libintl )
-	geoip? ( dev-libs/geoip )
-	bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${PN}-${P}
-
-# bug #288853
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
-	sed -i \
-		-e '/Icon/s/.png//' \
-		xqf.desktop.in || die
-
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable geoip) \
-		$(use_enable bzip2)
-}
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index a8a57e48be3e..bd104df9729e 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/dconf-0.26.1 b/gnome-base/dconf-0.26.1
new file mode 100644
index 000000000000..03d4cfd61865
--- /dev/null
+++ b/gnome-base/dconf-0.26.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.15 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Simple low-level configuration system
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Projects/dconf
+IUSE=test
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.44.0:2 sys-apps/dbus
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf/0.26/dconf-0.26.1.tar.xz
+_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf855317a107d231343a8cfa14ed9b51
diff --git a/gnome-base/dconf-editor-3.24.3 b/gnome-base/dconf-editor-3.24.3
new file mode 100644
index 000000000000..2d5ce202bb73
--- /dev/null
+++ b/gnome-base/dconf-editor-3.24.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Graphical tool for editing the dconf configuration database
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/dconf-editor
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.46.0:2 >=gnome-base/dconf-0.25.1 >=x11-libs/gtk+-3.22.0:3 !<gnome-base/dconf-0.22[X]
+SLOT=0
+SRC_URI=mirror://gnome/sources/dconf-editor/3.24/dconf-editor-3.24.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=164546ed992445cd6e913b59abec5161
diff --git a/gnome-base/dconf-editor/Manifest b/gnome-base/dconf-editor/Manifest
deleted file mode 100644
index 8ef0066a6143..000000000000
--- a/gnome-base/dconf-editor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dconf-editor-3.24.3.tar.xz 503520 BLAKE2B 57b0b0de36e2bb5cef33e0171e77f506f16f240d5ab4ab79d7689b7541ce445bce4d87753f312cf9353b2aa44d5cb2f7c734050a5f57ba2b7eae9894fb74d0e3 SHA512 10c98df210cd465e21601342963a19cd5a255abfaa6e96c833070db52d13531288237a129471bf9424d7ea8fef4c2cd4954652850bbb57dd161ce9cf99265361
-EBUILD dconf-editor-3.24.3.ebuild 720 BLAKE2B e172d4b725df1313465113df6b9c3e2a3147c751b80546ed76bb5d895799ce6e6ed8d747cc268bb6cfb80977edf30f21587b169bee7e1fc53bb8b3fb5c584577 SHA512 8092ff30e165e70ce074f3cd5ca08b6a8bb5f1717bdc467ab498a8716c59c750a5c968e99e0b876cc1ae829636a30f15567e7cf9543f5d6fa67835f7b3aef1fb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild b/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
deleted file mode 100644
index 26ce95003d67..000000000000
--- a/gnome-base/dconf-editor/dconf-editor-3.24.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Graphical tool for editing the dconf configuration database"
-HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/appstream-glib
-	>=dev-libs/glib-2.46.0:2
-	>=gnome-base/dconf-0.25.1
-	>=x11-libs/gtk+-3.22.0:3
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/dconf-0.22[X]
-"
-
-src_configure() {
-	gnome2_src_configure \
-		VALAC="$(type -P true)"
-}
diff --git a/gnome-base/dconf-editor/metadata.xml b/gnome-base/dconf-editor/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/dconf-editor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/dconf/Manifest b/gnome-base/dconf/Manifest
deleted file mode 100644
index 2c1a7f32d9de..000000000000
--- a/gnome-base/dconf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST dconf-0.26.1.tar.xz 218516 BLAKE2B ddb23a1f6519b5460903b1a91ba48242f144a768f7ec5b9e82953589474df998061a4fbfb3605027cb51db44f7e49f88c774a735600de2bedaf8889b58e050bc SHA512 4d2b4afce189e448e3bd4e9c2f9d3d5eec6c694748aec87a9a8de047296c858772a5234dbcace8e84d99c5378d2d1ba35cafb5e5ea7efca25c10a53a55b8b6da
-EBUILD dconf-0.26.1.ebuild 1524 BLAKE2B 939422aa7f6d0c02a36dc3cc1384c223f88b87d6a49cf8a05657280acbcf811641cfee0eabba70bba3aa3f00563523711840251a9454de617bbf8d568a76cbc0 SHA512 aea1a40fbe95e4c38687aef9f6e77d04fbc26c95ef9a54f1c59765cd3367ee95c2a43c05e4eb9b9ffc73fe7f44b30e6674ee8af523e6a194af4bc8f2b9ee1543
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/dconf/dconf-0.26.1.ebuild b/gnome-base/dconf/dconf-0.26.1.ebuild
deleted file mode 100644
index dba082d37e7e..000000000000
--- a/gnome-base/dconf/dconf-0.26.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 bash-completion-r1 virtualx
-
-DESCRIPTION="Simple low-level configuration system"
-HOMEPAGE="https://wiki.gnome.org/action/show/Projects/dconf"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.44.0:2
-	sys-apps/dbus
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.15
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gcov \
-		--enable-man \
-		VALAC=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# GSettings backend may be one of: memory, gconf, dconf
-	# Only dconf is really considered functional by upstream
-	# must have it enabled over gconf if both are installed
-	echo 'CONFIG_PROTECT_MASK="/etc/dconf"' >> 51dconf
-	echo 'GSETTINGS_BACKEND="dconf"' >> 51dconf
-	doenvd 51dconf
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	# Kill existing dconf-service processes as recommended by upstream due to
-	# possible changes in the dconf private dbus API.
-	# dconf-service will be dbus-activated on next use.
-	pids=$(pgrep -x dconf-service)
-	if [[ $? == 0 ]]; then
-		ebegin "Stopping dconf-service; it will automatically restart on demand"
-		kill ${pids}
-		eend $?
-	fi
-}
diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/dconf/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gconf-3.2.6-r4 b/gnome-base/gconf-3.2.6-r4
new file mode 100644
index 000000000000..675c4800c6bc
--- /dev/null
+++ b/gnome-base/gconf-3.2.6-r4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6.18-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) policykit? ( sys-auth/polkit:= ) dev-libs/libxslt dev-util/gtk-doc-am >=dev-util/intltool-0.35 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME configuration system and daemon
+EAPI=5
+HOMEPAGE=https://projects.gnome.org/gconf/
+IUSE=debug +introspection ldap policykit debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/dbus-glib-0.100.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1.6.18-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) ldap? ( >=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) policykit? ( sys-auth/polkit:= )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=2
+SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1bff13fbc896aaa97cf40bb3b17d3eeb
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
deleted file mode 100644
index ee4a9f59ca61..000000000000
--- a/gnome-base/gconf/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gconf-2.24.0-no-gconfd.patch 787 BLAKE2B d37a7b8c4833ba32406dea408e6c1ab65687ca9ecd6743ccdc0375432d569c4cd9b02e3011cd340f72ce2eae683381f58744cbabf556bd259216f9f3807ab9b7 SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8
-AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 BLAKE2B 004abc644ba4ef6f839ba6179152d2de7d3b709aff8aca37609c1da5d2fa6fb20c54faad0895d5bcb972c8826a58743c01a87ccf54c450fe1734f81219a9c126 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa
-AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 BLAKE2B 9fdb3c665c8515cace2325479735fec4b024adea8f2ab1fb89e76ef594eeebda897a3d3f52c8e7c48a21d03e2097211d90ed45887c6542ca6cc93a22ae8e6a15 SHA512 f4d7cc2261f82f7a28e574ec3b732a56bb3f067048312e318f8d23df93046489fdd5ad39d669cf0d9ada6cc07617524511c537a4f2fd0a37cd03788e84b9803b
-AUX gconf-3.2.6-mconvert-crasher.patch 1514 BLAKE2B 3e48d07777268faa3a1c98f168d33baded66df06185e8e1c77ae8f66f0c689c5a358018d1d3c060e5a4796c3f692acf346141db87f3cb6784ddabbe461432a69 SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b
-AUX gconf-3.2.6-spew-console-error.patch 2594 BLAKE2B 6a6f27024289b1c578f6718c184e7604f0f1dc285ea58a8095fac06f5fa38273329c8b2535b4de8c17c8359f09f82aa474fa5ebcef739b0e2dd6e7d6fb7726d7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602
-DIST GConf-3.2.6.tar.xz 1559904 BLAKE2B dc71bfc6e334b0a3545b6009fc1a592f3ba6adb1471aacc98aaa1ded9e89676f97415c26a3d17e297a846a7efca7ee695107c136ea28b2431f90dc966a3d64cc SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58
-EBUILD gconf-3.2.6-r4.ebuild 3662 BLAKE2B 85f27f5b34ef68f5ebc40c3f84fb4d77cd9d8c864f7c43f3204898e216a00cca6109f28918f6dc3596c7e66f987eebeb3244f14deae661eb2f99db62f29cf2e5 SHA512 7741ff144e14a6873886c714b1a3ee7558093c5ef936aaa21b1d5868e394d2e5b350219cb8bc2bf66b44d9830e81dae24dca7ac4dcabce53c29fa27b00ba492c
-MISC metadata.xml 430 BLAKE2B e2fce04aae8a1df05cb55972ab86e903186e034c0c48115f29d754f215e0be20a9b204aa2be12ed045b3dfc2010eea78be83252a3b86aa7cbbb8cde9b7433923 SHA512 820c350a185014ad888ba9cb43afb5ae7f21a0000a224d68461abbee4efefcbd972db79d7086b8f7f023de0828fa6f01a32502cbf74439160003fad146d33ca4
diff --git a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch b/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch
deleted file mode 100644
index 8ca6a0d4fc09..000000000000
--- a/gnome-base/gconf/files/gconf-2.24.0-no-gconfd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN GConf-2.23.2.old/gconf/gconftool.c GConf-2.23.2/gconf/gconftool.c
---- GConf-2.23.2.old/gconf/gconftool.c	2008-06-28 05:27:33.000000000 -0400
-+++ GConf-2.23.2/gconf/gconftool.c	2008-09-23 10:20:00.000000000 -0400
-@@ -856,6 +856,7 @@ main (int argc, char** argv)
-     {
-       g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, not installing schemas\n"));
-       makefile_install_mode = FALSE;
-+	  return 0;
-     }
- 
-   if (makefile_uninstall_mode &&
-@@ -863,6 +864,7 @@ main (int argc, char** argv)
-     {
-       g_print (_("GCONF_DISABLE_MAKEFILE_SCHEMA_UNINSTALL is set, not uninstalling schemas\n"));
-       makefile_uninstall_mode = FALSE;
-+	  return 0;
-     }
- 
-   if (makefile_install_mode || makefile_uninstall_mode)
diff --git a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch b/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch
deleted file mode 100644
index 680b1a159b4a..000000000000
--- a/gnome-base/gconf/files/gconf-2.28.0-entry-set-value-sigsegv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Romain Perier <mrpouet@gentoo.org>
-Date: Wed, 4 Nov 2009 11:58:25 +0100
-Subject: Do not segfault when entry is NULL
-
----
- gconf/gconf-value.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
---- a/gconf/gconf-value.c
-+++ b/gconf/gconf-value.c
-@@ -1609,6 +1609,7 @@ void
- gconf_entry_set_value (GConfEntry  *entry,
-                        const GConfValue  *val)
- {
-+  g_return_if_fail (entry != NULL);
-   gconf_entry_set_value_nocopy (entry,
-                                 val ? gconf_value_copy (val) : NULL);
- }
diff --git a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch
deleted file mode 100644
index dc6c66b1c644..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 405f865c07261a95c8c9a09a84ab679c6dd0a330 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 24 Oct 2013 16:27:24 -0400
-Subject: gsettings-data-convert: Warn (and fix) invalid schema paths
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=704802
-
-https://bugzilla.gnome.org/show_bug.cgi?id=710836
-
-diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
-index 9b2d1d0..160ed41 100644
---- a/gsettings/gsettings-data-convert.c
-+++ b/gsettings/gsettings-data-convert.c
-@@ -182,7 +182,23 @@ handle_file (const gchar *filename)
-         }
- 
-       if (schema_path[1] != NULL)
--        settings = g_settings_new_with_path (schema_path[0], schema_path[1]);
-+	{
-+	  char *compat_path_alloced = NULL; 
-+	  char *compat_path;
-+	  /* Work around broken .convert files:
-+	     https://bugzilla.gnome.org/show_bug.cgi?id=704802
-+	  */
-+	  if (!g_str_has_suffix (schema_path[1], "/"))
-+	    {
-+	      g_warning ("Schema file '%s' has missing trailing / in '%s'",
-+			 filename, schema_path[1]);
-+	      compat_path = compat_path_alloced = g_strconcat (schema_path[1], "/", NULL);
-+	    }
-+	  else
-+	    compat_path = schema_path[1];
-+	  settings = g_settings_new_with_path (schema_path[0], compat_path);
-+	  g_free (compat_path_alloced);
-+	}
-       else
-         settings = g_settings_new (schema_path[0]);
- 
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch
deleted file mode 100644
index 54681bcb0e86..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 98ff7acca7595f508b094506195aeffaf2e8b74c Mon Sep 17 00:00:00 2001
-From: Stefan Sauer <ensonic@users.sf.net>
-Date: Wed, 23 Jan 2013 08:11:18 +0100
-Subject: mconvert: enable recursive scheme lookup and fix a crasher
-
-The recursive scheme lookup is needed to scan the whole settings path. The crash
-would happen in the case of a misconfiguration (e.g. building gconf from source
-and running uninstalled while the configure settings don't match the one used to
-create the installed package).
-
-diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
-index a8af942..9b2d1d0 100644
---- a/gsettings/gsettings-data-convert.c
-+++ b/gsettings/gsettings-data-convert.c
-@@ -22,6 +22,7 @@
- #include <string.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <errno.h>
- 
-@@ -90,6 +91,10 @@ get_writable_client (void)
-   GSList *addresses;
- 
-   addresses = get_writable_source_path ();
-+  if (!addresses) {
-+    g_printf("No writable gconf locations found\n");
-+    exit (1);
-+  }
-   engine = gconf_engine_get_local_for_addresses (addresses, NULL);
-   gconf_address_list_free (addresses);
- 
-@@ -155,7 +160,7 @@ handle_file (const gchar *filename)
- 
-       schema_path = g_strsplit (groups[i], ":", 2);
- 
--      schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE);
-+      schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE);
-       if (schema == NULL)
-         {
-           if (verbose)
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch
deleted file mode 100644
index 26503f7216ea..000000000000
--- a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 15 Apr 2013 09:57:34 -0400
-Subject: dbus: Don't spew to console when unable to connect to dbus daemon
-
-Instead pass the error up for the caller to decide what to do.
-
-This prevent untrappable warning messages from showing up at the
-console if gconftool --makefile-install-rule is called.
-
-diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
-index 5610fcf..048e3ea 100644
---- a/gconf/gconf-dbus.c
-+++ b/gconf/gconf-dbus.c
-@@ -105,7 +105,7 @@ static GHashTable     *engines_by_db = NULL;
- static GHashTable     *engines_by_address = NULL;
- static gboolean        dbus_disconnected = FALSE;
- 
--static gboolean     ensure_dbus_connection      (void);
-+static gboolean     ensure_dbus_connection      (GError **error);
- static gboolean     ensure_service              (gboolean          start_if_not_found,
- 						 GError          **err);
- static gboolean     ensure_database             (GConfEngine      *conf,
-@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf)
- }
- 
- static gboolean
--ensure_dbus_connection (void)
-+ensure_dbus_connection (GError **err)
- {
-   DBusError error;
- 
-@@ -392,7 +392,9 @@ ensure_dbus_connection (void)
- 
-   if (dbus_disconnected)
-     {
--      g_warning ("The connection to DBus was broken. Can't reinitialize it.");
-+      g_set_error (err, GCONF_ERROR,
-+                   GCONF_ERROR_NO_SERVER,
-+                   "The connection to DBus was broken. Can't reinitialize it.");
-       return FALSE;
-     }
- 
-@@ -402,7 +404,10 @@ ensure_dbus_connection (void)
-   
-   if (!global_conn) 
-     {
--      g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
-+      g_set_error (err, GCONF_ERROR,
-+                   GCONF_ERROR_NO_SERVER,
-+                   "Client failed to connect to the D-BUS daemon:\n%s",
-+                   error.message);
-       
-       dbus_error_free (&error);
-       return FALSE;
-@@ -431,13 +436,8 @@ ensure_service (gboolean  start_if_not_found,
- 
-   if (global_conn == NULL)
-     {
--      if (!ensure_dbus_connection ())
--	{
--	  g_set_error (err, GCONF_ERROR,
--		       GCONF_ERROR_NO_SERVER,
--		       _("No D-BUS daemon running\n"));
--	  return FALSE;
--	}
-+      if (!ensure_dbus_connection (err))
-+        return FALSE;
- 
-       g_assert (global_conn != NULL);
-     }
-@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void)
- {
-   if (global_conn == NULL)
-   {
--    if (!ensure_dbus_connection ())
-+    if (!ensure_dbus_connection (NULL))
-     {
-       return FALSE;
-     }
--- 
-cgit v0.10.1
-
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
deleted file mode 100644
index 0676bfbde501..000000000000
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="GConf"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit eutils gnome2 multilib-minimal python-r1
-
-DESCRIPTION="GNOME configuration system and daemon"
-HOMEPAGE="https://projects.gnome.org/gconf/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug +introspection ldap policykit"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=dev-libs/dbus-glib-0.100.2:=[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.6.18-r1:=[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-	ldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-	policykit? ( sys-auth/polkit:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	kill_gconf
-}
-
-src_prepare() {
-	# Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
-	epatch "${FILESDIR}/${PN}-2.24.0-no-gconfd.patch"
-
-	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
-	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
-
-	# From 'master'
-	# mconvert: enable recursive scheme lookup and fix a crasher
-	epatch "${FILESDIR}/${P}-mconvert-crasher.patch"
-
-	# dbus: Don't spew to console when unable to connect to dbus daemon
-	epatch "${FILESDIR}/${P}-spew-console-error.patch"
-
-	# gsettings-data-convert: Warn (and fix) invalid schema paths
-	epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch"
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gsettings-backend \
-		--with-gtk=3.0 \
-		--disable-orbit \
-		$(multilib_native_use_enable introspection) \
-		$(use_with ldap openldap) \
-		$(multilib_native_use_enable policykit defaults-service)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/gconf/html doc/gconf/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	python_replicate_script "${ED}"/usr/bin/gsettings-schema-convert
-
-	keepdir /etc/gconf/gconf.xml.mandatory
-	keepdir /etc/gconf/gconf.xml.defaults
-	# Make sure this directory exists, bug #268070, upstream #572027
-	keepdir /etc/gconf/gconf.xml.system
-
-	echo "CONFIG_PROTECT_MASK=\"/etc/gconf\"" > 50gconf
-	echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
-	doenvd 50gconf
-	dodir /root/.gconfd
-}
-
-pkg_preinst() {
-	kill_gconf
-	gnome2_pkg_preinst
-}
-
-pkg_postinst() {
-	kill_gconf
-
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-
-	# change the permissions to avoid some gconf bugs
-	einfo "changing permissions for gconf dirs"
-	find  "${EPREFIX}"/etc/gconf/ -type d -exec chmod ugo+rx "{}" \;
-
-	einfo "changing permissions for gconf files"
-	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
-
-kill_gconf() {
-	# This function will kill all running gconfd-2 that could be causing troubles
-	if [ -x "${EPREFIX}"/usr/bin/gconftool-2 ]
-	then
-		"${EPREFIX}"/usr/bin/gconftool-2 --shutdown
-	fi
-
-	return 0
-}
diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
deleted file mode 100644
index d2a393a8590c..000000000000
--- a/gnome-base/gconf/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="ldap">Build backend which enables default mail accounts,
-	addressbooks and calendars for Evolution to be configured using each
-	user's LDAP entry."</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gdm-3.24.3 b/gnome-base/gdm-3.24.3
new file mode 100644
index 000000000000..b74321cc91f2
--- /dev/null
+++ b/gnome-base/gdm-3.24.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/intltool-0.40.0 dev-util/itstool virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.9.4 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=GNOME Display Manager for managing graphical display servers and user logins
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GDM
+IUSE=accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86
+LICENSE=GPL-2+ branding? ( CC-BY-SA-4.0 )
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.36:2[dbus] >=x11-libs/gtk+-2.91.1:3 >=gnome-base/dconf-0.20 >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas >=media-libs/fontconfig-2.5.0:1.0 >=media-libs/libcanberra-0.4[gtk3] sys-apps/dbus >=sys-apps/accountsservice-0.6.35 x11-apps/sessreg x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libxcb >=x11-misc/xdg-utils-1.0.2-r3 virtual/pam >=sys-apps/systemd-186:0=[pam] sys-auth/pambase[systemd] audit? ( sys-process/audit ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) plymouth? ( sys-boot/plymouth ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) >=gnome-base/gnome-session-3.6 >=gnome-base/gnome-shell-3.1.90 x11-apps/xhost accessibility? ( >=app-accessibility/orca-3.10 gnome-extra/mousetweaks ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) !gnome-extra/fast-user-switch-applet
+SLOT=0
+SRC_URI=mirror://gnome/sources/gdm/3.24/gdm-3.24.3.tar.xz branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=813e0998afcbcbba8d3d2d1e66e02b80
diff --git a/gnome-base/gdm/Manifest b/gnome-base/gdm/Manifest
deleted file mode 100644
index a72befd1d5ec..000000000000
--- a/gnome-base/gdm/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX 49-keychain-r1 193 BLAKE2B e4653256b9a0a23be84286d25278d2addf464cc541d43f57a33ed0390b562d03acf7f9d8510ad1b09d4a3736d2bb2a323f5fcc473014b6f351abb5bee71a419b SHA512 32a6d72de9b6b7bfbac0a563fc8710576419e6d989fe48da294b92b197722059ee0e46672d5df2833cd1a7dacf5ae4ebc31b12b605416fd25a0924c35e505d21
-AUX 50-ssh-agent-r1 255 BLAKE2B d197daa7db7da3fc667e5bd561d2edf46b484365130a2d72259c4a2f316ec3af957599cd2c755f7e517ff32ed59e068d1dbcd47da6961534668786403590ff20 SHA512 85c8eca948646508ecc52a30a15b94c626196037ab65b4d797df472df34c714aacf800261902febda5b7bc051bff29efc9fff474a0c029838881b7f8704b13ba
-AUX gdm-2.32.0-xinitrc-ssh-agent.patch 842 BLAKE2B 98233eaf06fbe0950aa36bbc8bee2ac7ffa3cdebe75e32b8ef9a5035c383135bfc77e201d2ee07e7ec6b53770bef20484a3fba93b1cd7f434253704b70563e38 SHA512 40630ec2e7bee66102e141a0ba4d02e4202d052bb829606f684b6c23c9f3dbc2d43cea71d7eba163398251af2d7c7b34d0abafee76ccd6400521551de1c385bd
-AUX gdm-3.8.4-fingerprint-auth.patch 923 BLAKE2B e681da8518ed1d002c1205658bb35e472e9d130df5d70dfd9eef55f5361cffeee716ebe0eea23f4c19f9f6ec2f4118729616f7f4e2c758990cf7cde3271cc8b2 SHA512 3cf5f9c0eabdae3f767d9b9db6052d760e879c14b9304753cdda56a4f643a9ed97f3ea83f642bfe96d220c8e9e4f99fbbd47c6e99ddfebeb6322a3a033c296d5
-AUX gdm-3.8.4-logo.patch 805 BLAKE2B 80c323529acfe9287009494060f3e4d588dcf415845d3502840674ac0108cdd721e9af71e2df7cf94bb69fb3526d76e96bd21f31ed002fce460b30fd2afa3a20 SHA512 98dc0b01f4a4cbb87b32ec52450eb21f07bf96dc4d919cf662314c50fe0f2b1a19c90e3d8d2a0de905e8ada41642c0f89aa89dd640ead7e3d732468c9e363fb2
-DIST gdm-3.24.3.tar.xz 1113992 BLAKE2B 79ae5ccf0477779bdb05cea4f0e8b2766caee0552efe8fe044da655037bfd603f1e4ab89a4eb0687f786bf44e9fd1c27e07bc498a769c8f88f0cc22b2dd1c9b1 SHA512 d8edffb582545f452ec071990fd7d07d6cb755458bc77a9e1b807816f8202f70fc8177e4bb345125075347942c6760c5a5460e3570dc32ee2570ecc15e5f3345
-DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
-EBUILD gdm-3.24.3.ebuild 5989 BLAKE2B 30e27e656a9bdf1018f19ad8c17a7bb630d1ab4ce902e411bea5b9eaa17ed870c9028eaa77717a5eab502a00bef98a28551467ab9b5dfca59892e6024eda8554 SHA512 66b4242cb343b289746c368de1d4a76868951d2ed5c422866c42a621d546e973902a7a4987cfee52a3b8abea9633acfe64ba08b49ada717c58871202a6ce1e70
-MISC metadata.xml 477 BLAKE2B 29eb8d343cd5195f35dc73d07c695dd3090f8f8ea436b88c8a8fb7f15beac82aaeb2b83215443851866e7fcec51aa14ff19c30597a74cd9a73b384ee801b16f0 SHA512 4da6d5a4f518596834d4138db716bf58d2b2f28f07fed6379a6f0d8bdecb6b803fb3b24880dfcb93ff5aac03f512bf08af7f9742d01a497dd4fc6d7a74d1a844
diff --git a/gnome-base/gdm/files/49-keychain-r1 b/gnome-base/gdm/files/49-keychain-r1
deleted file mode 100644
index 51a1ca87905c..000000000000
--- a/gnome-base/gdm/files/49-keychain-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# source keychain variables
-
-keychain="`which keychain 2>/dev/null`"
-if [ -n "$keychain" ] && [ -x "$keychain" ] && [ -f "$HOME/.bash_profile" ]
-then
-	. "${HOME}/.bash_profile"
-fi
diff --git a/gnome-base/gdm/files/50-ssh-agent-r1 b/gnome-base/gdm/files/50-ssh-agent-r1
deleted file mode 100644
index 4d94fb04a14a..000000000000
--- a/gnome-base/gdm/files/50-ssh-agent-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# add ssh-agent if found
-
-sshagent="`which ssh-agent 2>/dev/null`"
-if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-	command="$sshagent -- $command"
-elif [ -z "$sshagent" ] ; then
-	echo "$0: ssh-agent not found!"
-fi
diff --git a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch b/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
deleted file mode 100644
index bfd8398af2b3..000000000000
--- a/gnome-base/gdm/files/gdm-2.32.0-xinitrc-ssh-agent.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c0581264d5e2b412aa27dc30623512b461024e4f Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 2 Nov 2010 23:19:31 +0100
-Subject: [PATCH 2/4] ssh-agent handling must be done at xinitrc.d
-
-Gentoo bug: #220603
----
- data/Xsession.in | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/data/Xsession.in b/data/Xsession.in
-index 201be92..88f1fd9 100755
---- a/data/Xsession.in
-+++ b/data/Xsession.in
-@@ -191,14 +191,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then
-     done
- fi
- 
--# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
--    command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
--    echo "$0: ssh-agent not found!"
--fi
--
- echo "$0: Setup done, will execute: $command"
- 
- eval exec $command
--- 
-1.8.5.1
-
diff --git a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch b/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
deleted file mode 100644
index cd19077a5f1d..000000000000
--- a/gnome-base/gdm/files/gdm-3.8.4-fingerprint-auth.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 75fe02c2b383b27b202940bdedd7d8d2c64169fb Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 30 Jul 2013 22:56:30 -0400
-Subject: [PATCH 3/4] Gentoo does not have a fingerprint-auth pam stack
-
----
- data/pam-exherbo/gdm-fingerprint.pam | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/data/pam-exherbo/gdm-fingerprint.pam b/data/pam-exherbo/gdm-fingerprint.pam
-index 41639ec..d9633fb 100644
---- a/data/pam-exherbo/gdm-fingerprint.pam
-+++ b/data/pam-exherbo/gdm-fingerprint.pam
-@@ -1,6 +1,11 @@
- account  include  system-login
- 
--auth     substack fingerprint-auth
-+auth     optional pam_env.so
-+auth     required pam_tally2.so onerr=succeed
-+auth     required pam_shells.so
-+auth     required pam_nologin.so
-+auth     required pam_fprintd.so
-+auth     required pam_permit.so
- auth     optional pam_gnome_keyring.so
- 
- password required pam_deny.so
--- 
-1.8.5.1
-
diff --git a/gnome-base/gdm/files/gdm-3.8.4-logo.patch b/gnome-base/gdm/files/gdm-3.8.4-logo.patch
deleted file mode 100644
index 151d4bc77f42..000000000000
--- a/gnome-base/gdm/files/gdm-3.8.4-logo.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bcc651df77a429a6bf9b13892f71fedb1b87a069 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 11 Dec 2013 22:46:58 +0100
-Subject: [PATCH 4/4] Apply Gentoo branding
-
----
- data/org.gnome.login-screen.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.login-screen.gschema.xml.in b/data/org.gnome.login-screen.gschema.xml.in
-index 03da374..5e81bc0 100644
---- a/data/org.gnome.login-screen.gschema.xml.in
-+++ b/data/org.gnome.login-screen.gschema.xml.in
-@@ -31,7 +31,7 @@
-       </_description>
-     </key>
-     <key name="logo" type="s">
--      <default>''</default>
-+      <default>'/usr/share/pixmaps/gentoo-gdm.svg'</default>
-       <_summary>
-         Path to small image at top of user list
-       </_summary>
--- 
-1.8.5.1
-
diff --git a/gnome-base/gdm/gdm-3.24.3.ebuild b/gnome-base/gdm/gdm-3.24.3.ebuild
deleted file mode 100644
index 6dc61fc310ac..000000000000
--- a/gnome-base/gdm/gdm-3.24.3.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 pam readme.gentoo-r1 systemd user versionator
-
-DESCRIPTION="GNOME Display Manager for managing graphical display servers and user logins"
-HOMEPAGE="https://wiki.gnome.org/Projects/GDM"
-
-SRC_URI="${SRC_URI}
-	branding? ( https://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
-"
-
-LICENSE="
-	GPL-2+
-	branding? ( CC-BY-SA-4.0 )
-"
-
-SLOT="0"
-
-IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86"
-
-# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
-# nspr used by smartcard extension
-# dconf, dbus and g-s-d are needed at install time for dconf update
-# We need either systemd or >=openrc-0.12 to restart gdm properly, bug #463784
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.36:2[dbus]
-	>=x11-libs/gtk+-2.91.1:3
-	>=gnome-base/dconf-0.20
-	>=gnome-base/gnome-settings-daemon-3.1.4
-	gnome-base/gsettings-desktop-schemas
-	>=media-libs/fontconfig-2.5.0:1.0
-	>=media-libs/libcanberra-0.4[gtk3]
-	sys-apps/dbus
-	>=sys-apps/accountsservice-0.6.35
-
-	x11-apps/sessreg
-	x11-base/xorg-server
-	x11-libs/libXi
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXdmcp
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libxcb
-	>=x11-misc/xdg-utils-1.0.2-r3
-
-	virtual/pam
-	>=sys-apps/systemd-186:0=[pam]
-
-	sys-auth/pambase[systemd]
-
-	audit? ( sys-process/audit )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	plymouth? ( sys-boot/plymouth )
-	selinux? ( sys-libs/libselinux )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	xinerama? ( x11-libs/libXinerama )
-"
-# XXX: These deps are from session and desktop files in data/ directory
-# fprintd is used via dbus by gdm-fingerprint-extension
-# gnome-session-3.6 needed to avoid freezing with orca
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-session-3.6
-	>=gnome-base/gnome-shell-3.1.90
-	x11-apps/xhost
-
-	accessibility? (
-		>=app-accessibility/orca-3.10
-		gnome-extra/mousetweaks )
-	fprint? (
-		sys-auth/fprintd
-		sys-auth/pam_fprint )
-
-	!gnome-extra/fast-user-switch-applet
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	test? ( >=dev-libs/check-0.9.4 )
-"
-
-DOC_CONTENTS="
-	To make GDM start at boot, run:\n
-	# systemctl enable gdm.service\n
-	\n
-	For passwordless login to unlock your keyring, you need to install
-	sys-auth/pambase with USE=gnome-keyring and set an empty password
-	on your keyring. Use app-crypt/seahorse for that.\n
-	\n
-	You may need to install app-crypt/coolkey and sys-auth/pam_pkcs11
-	for smartcard support
-"
-
-pkg_setup() {
-	enewgroup gdm
-	enewgroup video # Just in case it hasn't been created yet
-	enewuser gdm -1 -1 /var/lib/gdm gdm,video
-
-	# For compatibility with certain versions of nvidia-drivers, etc., need to
-	# ensure that gdm user is in the video group
-	if ! egetent group video | grep -q gdm; then
-		# FIXME XXX: is this at all portable, ldap-safe, etc.?
-		# XXX: egetent does not have a 1-argument form, so we can't use it to
-		# get the list of gdm's groups
-		local g=$(groups gdm)
-		elog "Adding user gdm to video group"
-		usermod -G video,${g// /,} gdm || die "Adding user gdm to video group failed"
-	fi
-}
-
-src_prepare() {
-	# ssh-agent handling must be done at xinitrc.d, bug #220603
-	eapply "${FILESDIR}/${PN}-2.32.0-xinitrc-ssh-agent.patch"
-
-	# Gentoo does not have a fingerprint-auth pam stack
-	eapply "${FILESDIR}/${PN}-3.8.4-fingerprint-auth.patch"
-
-	# Show logo when branding is enabled
-	use branding && eapply "${FILESDIR}/${PN}-3.8.4-logo.patch"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	local myconf
-	# PAM is the only auth scheme supported
-	# even though configure lists shadow and crypt
-	# they don't have any corresponding code.
-	# --with-at-spi-registryd-directory= needs to be passed explicitly because
-	# of https://bugzilla.gnome.org/show_bug.cgi?id=607643#c4
-	# Xevie is obsolete, bug #482304
-	# --with-initial-vt=7 conflicts with plymouth, bug #453392
-	! use plymouth && myconf="${myconf} --with-initial-vt=7"
-
-	gnome2_src_configure \
-		--enable-gdm-xsession \
-		--enable-user-display-server \
-		--with-run-dir=/run/gdm \
-		--localstatedir="${EPREFIX}"/var \
-		--disable-static \
-		--with-xdmcp=yes \
-		--enable-authentication-scheme=pam \
-		--with-default-pam-config=exherbo \
-		--with-pam-mod-dir=$(getpam_mod_dir) \
-		--with-at-spi-registryd-directory="${EPREFIX}"/usr/libexec \
-		--without-xevie \
-		--enable-systemd-journal \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(use_with audit libaudit) \
-		$(use_enable ipv6) \
-		$(use_with plymouth) \
-		$(use_with selinux) \
-		$(use_with tcpd tcp-wrappers) \
-		$(use_enable wayland wayland-support) \
-		$(use_with xinerama) \
-		${myconf}
-}
-
-src_install() {
-	gnome2_src_install
-
-	if ! use accessibility ; then
-		rm "${ED}"/usr/share/gdm/greeter/autostart/orca-autostart.desktop || die
-	fi
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}/49-keychain-r1" 49-keychain
-	newexe "${FILESDIR}/50-ssh-agent-r1" 50-ssh-agent
-
-	# gdm user's home directory
-	keepdir /var/lib/gdm
-	fowners gdm:gdm /var/lib/gdm
-
-	# install XDG_DATA_DIRS gdm changes
-	echo 'XDG_DATA_DIRS="/usr/share/gdm"' > 99xdg-gdm
-	doenvd 99xdg-gdm
-
-	use branding && newicon "${WORKDIR}/tango-gentoo-v1.1/scalable/gentoo.svg" gentoo-gdm.svg
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	local d ret
-
-	gnome2_pkg_postinst
-
-	# bug #436456; gdm crashes if /var/lib/gdm subdirs are not owned by gdm:gdm
-	ret=0
-	ebegin "Fixing "${EROOT}"var/lib/gdm ownership"
-	chown gdm:gdm "${EROOT}var/lib/gdm" || ret=1
-	for d in "${EROOT}var/lib/gdm/"{.cache,.config,.local}; do
-		[[ ! -e "${d}" ]] || chown -R gdm:gdm "${d}" || ret=1
-	done
-	eend ${ret}
-
-	systemd_reenable gdm.service
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
deleted file mode 100644
index 747420ed8b55..000000000000
--- a/gnome-base/gdm/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="fprint">Enables experimental fingerprint authentication using
-		<pkg>sys-auth/fprintd</pkg></flag>
-	<flag name="plymouth">Enable support for smooth transition from
-		<pkg>sys-boot/plymouth</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-3.20.0 b/gnome-base/gnome-3.20.0
new file mode 100644
index 000000000000..b9d3a416f318
--- /dev/null
+++ b/gnome-base/gnome-3.20.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Meta package for GNOME 3, merge this package to install
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=accessibility +bluetooth +classic +cdr cups +extras
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
+LICENSE=metapackage
+PDEPEND=>=gnome-base/gvfs-1.28[udisks]
+RDEPEND=>=gnome-base/gnome-core-libs-3.20.0[cups?] >=gnome-base/gnome-core-apps-3.20.0[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.20.0 >=x11-wm/mutter-3.20.0 >=gnome-base/gnome-shell-3.20.0[bluetooth?] >=x11-themes/gnome-backgrounds-3.20 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.20 >=app-accessibility/at-spi2-core-2.20 >=app-accessibility/caribou-0.4.21 >=app-accessibility/orca-3.20.0 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.20.0 ) extras? ( >=gnome-base/gnome-extra-apps-3.20.0 )
+SLOT=2.0
+_md5_=76364b6c20bb347411a40ee4b73ae9c9
diff --git a/gnome-base/gnome-3.24.2 b/gnome-base/gnome-3.24.2
new file mode 100644
index 000000000000..95014074475f
--- /dev/null
+++ b/gnome-base/gnome-3.24.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=postinst
+DESCRIPTION=Meta package for GNOME 3, merge this package to install
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=accessibility +bluetooth +classic +cdr cups +extras
+KEYWORDS=amd64 ~ppc ~ppc64 x86
+LICENSE=metapackage
+PDEPEND=>=gnome-base/gvfs-1.32.1[udisks]
+RDEPEND=>=gnome-base/gnome-core-libs-3.24.2[cups?] >=gnome-base/gnome-core-apps-3.24.2[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.24.2 >=x11-wm/mutter-3.24.2 >=gnome-base/gnome-shell-3.24.2[bluetooth?] >=x11-themes/gnome-backgrounds-3.24.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.24.1 >=app-accessibility/at-spi2-core-2.24.1 >=app-accessibility/caribou-0.4.21 >=app-accessibility/orca-3.24.0 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.24.2 ) extras? ( >=gnome-base/gnome-extra-apps-3.24.2 )
+SLOT=2.0
+_md5_=99a66983af1f2eee91bf91d990a43949
diff --git a/gnome-base/gnome-common-3.18.0-r1 b/gnome-base/gnome-common-3.18.0-r1
new file mode 100644
index 000000000000..d0d0379ba130
--- /dev/null
+++ b/gnome-base/gnome-common-3.18.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Common files for development of Gnome packages
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-common
+IUSE=+autoconf-archive
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+SLOT=3
+SRC_URI=mirror://gnome/sources/gnome-common/3.18/gnome-common-3.18.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=46a1755481143ee5fb81d921662743c4
diff --git a/gnome-base/gnome-common/Manifest b/gnome-base/gnome-common/Manifest
deleted file mode 100644
index aa50c1c03a4e..000000000000
--- a/gnome-base/gnome-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-common-3.18.0.tar.xz 155804 BLAKE2B 5e5dbccf1851f45e2890e2fcced1be5630dd378bb22448e38ff7988a18145bfa90dee03a64a4ba4ff9d22ea6fd812e9f02a1ee1f9656b4d47201afc174d69229 SHA512 b931c9a6668d996560549738bb2d95f86f56fa68ce930c077275bdc8fddbc2d28d215c1190099db1df851417902fca87ec81f1c0e644c5b9630a175e1cde0719
-EBUILD gnome-common-3.18.0-r1.ebuild 663 BLAKE2B 5d35696d3f34ff92b474d0690deeccaf0788a5097382b52c96aaee56fd51608bcd59f959161355adcde23989c2b8b9a7c26414b3bbccfdf4906ec7fbac3fbafb SHA512 01df27dc01c1311bc12baf38362100058cb6592cebd2a7c2904e70e77cf1c37c5d36f3bebdcfc467cb94034e3f82ad3b24f2d44d8e59db2a1af54585b002e248
-MISC metadata.xml 423 BLAKE2B 7e825de85ab5542370d4563ce0d7a9c1643aba435b9ab8ede4af4e4c8ee371c99130289502dfe3e606df5f6dcfb91adca6a60728218bc6b2df9d669918449df7 SHA512 267dd7f1897f75f178b4f83325117792d9bccfdc339327eb54b151452c65fedadd72b4c0205b00d18a9edd985dbb9cc32e11bf4e3b587a8dd3d6a3a9bc8d1183
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
deleted file mode 100644
index 6ef07b78a497..000000000000
--- a/gnome-base/gnome-common/gnome-common-3.18.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Common files for development of Gnome packages"
-HOMEPAGE="https://git.gnome.org/browse/gnome-common"
-
-LICENSE="GPL-3"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+autoconf-archive"
-
-RDEPEND=""
-DEPEND=""
-
-src_configure() {
-	# Force people to rely on sys-devel/autoconf-archive, bug #594084
-	gnome2_src_configure --with-autoconf-archive
-}
diff --git a/gnome-base/gnome-common/metadata.xml b/gnome-base/gnome-common/metadata.xml
deleted file mode 100644
index 1340d1a31fcd..000000000000
--- a/gnome-base/gnome-common/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="autoconf-archive">Pull in <pkg>sys-devel/autoconf-archive</pkg> for ax_*.m4 files
-		instead of installing them from the gnome-common tarball</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-control-center-3.24.4 b/gnome-base/gnome-control-center-3.24.4
new file mode 100644
index 000000000000..59ad4dc58891
--- /dev/null
+++ b/gnome-base/gnome-control-center-3.24.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) x11-base/xorg-proto dev-libs/libxml2:2 dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME's main interface to configure various aspects of the desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-control-center/
+IUSE=+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+PDEPEND=>=gnome-base/gnome-session-2.91.6-r1
+RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.22.0:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.21.4 >=gnome-base/gnome-desktop-3.21.2:3= >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] >=x11-misc/colord-0.1.34:0= >=dev-libs/libpwquality-1.2.2 dev-libs/libxml2:2 gnome-base/libgtop:2= media-libs/fontconfig >=sys-apps/accountsservice-0.6.39 >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-2[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.99:= virtual/libgudev x11-apps/xmodmap x11-libs/cairo x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libXi-1.2 bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) colord? ( net-libs/libsoup:2.4 >=x11-misc/colord-0.1.34:0= >=x11-libs/colord-gtk-0.1.24 ) cups? ( >=net-print/cups-1.7[dbus] >=net-fs/samba-4.0.0[client] ) gnome-online-accounts? ( >=media-libs/grilo-0.3.0:0.3= >=net-libs/gnome-online-accounts-3.21.5:= ) ibus? ( >=app-i18n/ibus-1.5.2 ) kerberos? ( app-crypt/mit-krb5 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-misc/networkmanager-1.2.0:=[modemmanager] >=net-misc/modemmanager-0.7.990 ) v4l? ( media-libs/clutter-gtk:1.0 >=media-video/cheese-3.5.91 ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=media-libs/clutter-1.11.3:1.0 media-libs/clutter-gtk:1.0 >=x11-libs/libXi-1.2 ) || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) >=gnome-base/libgnomekbd-3 wayland? ( dev-libs/libinput ) !wayland? ( >=x11-drivers/xf86-input-libinput-0.19.0 input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300 !<net-wireless/gnome-bluetooth-3.3.2
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-control-center-3.24.4-patchset.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b859634e5729f5ca566752f1d3c8f1aa
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
deleted file mode 100644
index 87f896f6a09b..000000000000
--- a/gnome-base/gnome-control-center/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927
-DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a
-EBUILD gnome-control-center-3.24.4.ebuild 4846 BLAKE2B 55a347117e272330e5190abe5b1e2a3f2a034a22ed0a746a848f7c1b14c06d1b9b8961b8281916d1775df957514971409b713bfc1743f2f59da7e749bf14d1f8 SHA512 aa8a3f470892b80b4ba03d8b0009b7f81a345e9156fcc718fcfecd0fec823aed61d96d93c85979a52b3b87412ce465bbc9210f363a693093e727c49711f26e77
-MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
deleted file mode 100644
index 5e32940aad46..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.4.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit bash-completion-r1 gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# g-s-d[policykit] needed for bug #403527
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# udev could be made optional, only conditions gsd-device-panel
-# (mouse, keyboards, touchscreen, etc)
-# display panel requires colord and gnome-settings-daemon[colord]
-# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional)
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.22.0:3[X,wayland?]
-	>=gnome-base/gsettings-desktop-schemas-3.21.4
-	>=gnome-base/gnome-desktop-3.21.2:3=
-	>=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit]
-	>=x11-misc/colord-0.1.34:0=
-
-	>=dev-libs/libpwquality-1.2.2
-	dev-libs/libxml2:2
-	gnome-base/libgtop:2=
-	media-libs/fontconfig
-	>=sys-apps/accountsservice-0.6.39
-
-	>=media-libs/libcanberra-0.13[gtk3]
-	>=media-sound/pulseaudio-2[glib]
-	>=sys-auth/polkit-0.97
-	>=sys-power/upower-0.99:=
-
-	virtual/libgudev
-	x11-apps/xmodmap
-	x11-libs/cairo
-	x11-libs/libX11
-	x11-libs/libXxf86misc
-	>=x11-libs/libXi-1.2
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
-	colord? (
-		net-libs/libsoup:2.4
-		>=x11-misc/colord-0.1.34:0=
-		>=x11-libs/colord-gtk-0.1.24 )
-	cups? (
-		>=net-print/cups-1.7[dbus]
-		>=net-fs/samba-4.0.0[client]
-	)
-	gnome-online-accounts? (
-		>=media-libs/grilo-0.3.0:0.3=
-		>=net-libs/gnome-online-accounts-3.21.5:= )
-	ibus? ( >=app-i18n/ibus-1.5.2 )
-	kerberos? ( app-crypt/mit-krb5 )
-	networkmanager? (
-		>=gnome-extra/nm-applet-1.2.0
-		>=net-misc/networkmanager-1.2.0:=[modemmanager]
-		>=net-misc/modemmanager-0.7.990 )
-	v4l? (
-		media-libs/clutter-gtk:1.0
-		>=media-video/cheese-3.5.91 )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=media-libs/clutter-1.11.3:1.0
-		media-libs/clutter-gtk:1.0
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
-	|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
-	>=gnome-base/libgnomekbd-3
-	wayland? ( dev-libs/libinput )
-	!wayland? (
-		>=x11-drivers/xf86-input-libinput-0.19.0
-		input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
-	!<gnome-base/gdm-2.91.94
-	!<gnome-extra/gnome-color-manager-3.1.2
-	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300
-	!<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-#	gnome-base/gnome-common
-#	sys-devel/autoconf-archive
-
-PATCHES=(
-	# Makes some panels and dependencies optional; requires eautoreconf
-	# https://bugzilla.gnome.org/686840, 697478, 700145
-	# Fix some absolute paths to be appropriate for Gentoo
-	"${WORKDIR}"/patches/
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-update-mimedb \
-		--disable-static \
-		--enable-documentation \
-		$(use_enable bluetooth) \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable ibus) \
-		$(use_enable kerberos) \
-		$(use_enable networkmanager) \
-		$(use_with v4l cheese) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_install() {
-	gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/metadata.xml b/gnome-base/gnome-control-center/metadata.xml
deleted file mode 100644
index 4e40862668dd..000000000000
--- a/gnome-base/gnome-control-center/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="colord">Support color management using
-			<pkg>x11-misc/colord</pkg></flag>
-		<flag name="gnome-online-accounts">Enable configuration panel for
-			<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
-		<flag name="ibus">Enable support for enhanced input methods through
-			<pkg>app-i18n/ibus</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-core-apps-3.20.0 b/gnome-base/gnome-core-apps-3.20.0
new file mode 100644
index 000000000000..dfbf75b841bc
--- /dev/null
+++ b/gnome-base/gnome-core-apps-3.20.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=+bluetooth +cdr cups
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86
+LICENSE=metapackage
+RDEPEND=>=gnome-base/gnome-core-libs-3.20.0[cups?] >=gnome-base/gnome-session-3.20.0 >=gnome-base/gnome-menus-3.10.1:3 >=gnome-base/gnome-settings-daemon-3.20.0[cups?] >=gnome-base/gnome-control-center-3.20.0[cups?] >=app-crypt/gcr-3.20.0 >=gnome-base/nautilus-3.20.0 >=gnome-base/gnome-keyring-3.20.0 >=gnome-extra/evolution-data-server-3.20.0 >=app-crypt/seahorse-3.20.0 >=app-editors/gedit-3.20.0 >=app-text/evince-3.20.0 >=gnome-extra/gnome-contacts-3.20.0 >=media-gfx/eog-3.20.0 >=media-video/totem-3.18 >=net-im/empathy-3.12.12 >=x11-terms/gnome-terminal-3.20.0 >=gnome-extra/gnome-user-docs-3.20.0 >=gnome-extra/yelp-3.20.0 >=x11-themes/adwaita-icon-theme-3.20 >=x11-themes/gnome-themes-standard-3.20.0 bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.0 ) cdr? ( >=app-cdr/brasero-3.12.1 ) !gnome-base/gnome-applets
+SLOT=3.0
+_md5_=2169c186153184fe5690bf9f6e2a73c2
diff --git a/gnome-base/gnome-core-apps-3.24.2 b/gnome-base/gnome-core-apps-3.24.2
new file mode 100644
index 000000000000..7ea186f648f9
--- /dev/null
+++ b/gnome-base/gnome-core-apps-3.24.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Sub-meta package for the core applications integrated with GNOME 3
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=+bluetooth +cdr cups
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=metapackage
+RDEPEND=>=gnome-base/gnome-core-libs-3.24.2[cups?] >=gnome-base/gnome-session-3.24.2 >=gnome-base/gnome-settings-daemon-3.24.2[cups?] >=gnome-base/gnome-control-center-3.24.2[cups?] >=app-crypt/gcr-3.20.0 >=gnome-base/nautilus-3.24.2 >=gnome-base/gnome-keyring-3.20.0 >=gnome-extra/evolution-data-server-3.24.2 >=app-crypt/seahorse-3.20.0 >=app-editors/gedit-3.22.1 >=app-text/evince-3.24.2 >=gnome-extra/gnome-contacts-3.22.1 >=media-gfx/eog-3.24.1 >=media-video/totem-3.24.0 >=x11-terms/gnome-terminal-3.24.2 >=gnome-extra/gnome-user-docs-3.24.2 >=gnome-extra/yelp-3.22.0 >=x11-themes/adwaita-icon-theme-3.24.0 >=x11-themes/gnome-themes-standard-3.22.3 bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.1 ) cdr? ( >=app-cdr/brasero-3.12.2 ) !gnome-base/gnome-applets
+SLOT=3.0
+_md5_=fc98d96a0885d76ec61c07ad22c7fdc1
diff --git a/gnome-base/gnome-core-apps/Manifest b/gnome-base/gnome-core-apps/Manifest
deleted file mode 100644
index 501616c677ef..000000000000
--- a/gnome-base/gnome-core-apps/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD gnome-core-apps-3.20.0.ebuild 1446 BLAKE2B f14dc6f63582ab8f9a11c55e780d3a56a3e9642ed8ebd6c109e9aaabf8f95910c266e124a16adf14f8b4af367fa74c27ac30a4c198c1fb779fd226e6dbd64daa SHA512 265e62a1341dc6dcd4da66ae67e11ae43a5b434fac1b18c329646871201663cee4c7fa1cb1b16526193057d7da9345a38d62e9f82c2f64be8323b2411ef3bd8f
-EBUILD gnome-core-apps-3.24.2.ebuild 1506 BLAKE2B 514feee02bfe57ff00f83db8a0beb317a6be0678a066658b39b7740000625ba647410a90384769b7041aa19ea681803124fd492dde4209089a65e769dbe11f59 SHA512 5e7f9285e94ca98f1ea51d17d91f994a657b4a25f41e64357130e40aa287bc10106376b5f98f67fc44664ceb82519886a03d9ff218008ee85a1de4bba191476a
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild
deleted file mode 100644
index d7f6d2f5522e..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.20.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth +cdr cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# Note to developers:
-# This is a wrapper for the core apps tightly integrated with GNOME 3
-# gtk-engines:2 is still around because it's needed for gtk2 apps
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.10.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=app-crypt/gcr-${PV}
-	>=gnome-base/nautilus-${PV}
-	>=gnome-base/gnome-keyring-${PV}
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-${PV}
-	>=app-editors/gedit-${PV}
-	>=app-text/evince-${PV}
-	>=gnome-extra/gnome-contacts-${PV}
-	>=media-gfx/eog-${PV}
-	>=media-video/totem-3.18
-	>=net-im/empathy-3.12.12
-	>=x11-terms/gnome-terminal-${PV}
-
-	>=gnome-extra/gnome-user-docs-${PV}
-	>=gnome-extra/yelp-${PV}
-
-	>=x11-themes/adwaita-icon-theme-${PV%??}
-	>=x11-themes/gnome-themes-standard-${PV}
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
-	cdr? ( >=app-cdr/brasero-3.12.1 )
-
-	!gnome-base/gnome-applets
-"
-DEPEND=""
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
deleted file mode 100644
index 3822a36e6092..000000000000
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.24.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+bluetooth +cdr cups"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# Note to developers:
-# This is a wrapper for the core apps tightly integrated with GNOME 3
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=app-crypt/gcr-3.20.0
-	>=gnome-base/nautilus-${PV}
-	>=gnome-base/gnome-keyring-3.20.0
-	>=gnome-extra/evolution-data-server-${PV}
-
-	>=app-crypt/seahorse-3.20.0
-	>=app-editors/gedit-3.22.1
-	>=app-text/evince-${PV}
-	>=gnome-extra/gnome-contacts-3.22.1
-	>=media-gfx/eog-3.24.1
-	>=media-video/totem-3.24.0
-	>=x11-terms/gnome-terminal-${PV}
-
-	>=gnome-extra/gnome-user-docs-${PV}
-	>=gnome-extra/yelp-3.22.0
-
-	>=x11-themes/adwaita-icon-theme-3.24.0
-	>=x11-themes/gnome-themes-standard-3.22.3
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.20.1 )
-	cdr? ( >=app-cdr/brasero-3.12.2 )
-
-	!gnome-base/gnome-applets
-"
-DEPEND=""
-
-# >=gnome-base/gnome-menus-3.13.3:3  # not used by core gnome anymore, just gnome-classic extensions
-# >=net-im/empathy-3.12.12 # not part of gnome releng core or apps suite anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-apps/metadata.xml b/gnome-base/gnome-core-apps/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gnome-core-apps/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome-core-libs-3.24.2 b/gnome-base/gnome-core-libs-3.24.2
new file mode 100644
index 000000000000..90b03a3d61d3
--- /dev/null
+++ b/gnome-base/gnome-core-libs-3.24.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Sub-meta package for the core libraries of GNOME 3
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=cups python
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=metapackage
+RDEPEND=>=dev-libs/glib-2.52.2:2 >=x11-libs/gdk-pixbuf-2.36.6:2 >=x11-libs/pango-1.40.9 >=x11-libs/gtk+-3.22.16:3[cups?] >=dev-libs/atk-2.24 >=gnome-base/librsvg-2.40.18 >=gnome-base/gnome-desktop-3.24.2:3 >=x11-libs/startup-notification-0.12 >=gnome-base/gvfs-1.32.1 >=gnome-base/dconf-0.26 >=media-libs/gstreamer-1.12.3:1.0 >=media-libs/gst-plugins-base-1.12.3:1.0 >=media-libs/gst-plugins-good-1.12.3:1.0 python? ( >=dev-python/pygobject-3.24.1:3 )
+SLOT=3.0
+_md5_=3d011e5f4e6b55154a00a0c2a61dbf93
diff --git a/gnome-base/gnome-core-libs/Manifest b/gnome-base/gnome-core-libs/Manifest
deleted file mode 100644
index 2ab84d652d38..000000000000
--- a/gnome-base/gnome-core-libs/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gnome-core-libs-3.24.2.ebuild 1053 BLAKE2B baea5363a73c2a7ea9f77417d3e224d24983405572d4aaa48fdf41198b489aee0ca9c5df2820a8f676adf2b28b28bc31c9154e8dcab1deee390782b5c14c46d9 SHA512 48301a8470a7d2179ee9a8b639cf449d7493b41abfe48a33f454fe66f88eb67d888827d15f2bccbc63a93923bcbca074ade6e185251a93eac2cc374506284ac0
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild
deleted file mode 100644
index 4c40ebc736e8..000000000000
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.24.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the core libraries of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="cups python"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Note to developers:
-# This is a wrapper for the core libraries used by GNOME 3
-RDEPEND="
-	>=dev-libs/glib-2.52.2:2
-	>=x11-libs/gdk-pixbuf-2.36.6:2
-	>=x11-libs/pango-1.40.9
-	>=x11-libs/gtk+-3.22.16:3[cups?]
-	>=dev-libs/atk-2.24
-	>=gnome-base/librsvg-2.40.18
-	>=gnome-base/gnome-desktop-${PV}:3
-	>=x11-libs/startup-notification-0.12
-
-	>=gnome-base/gvfs-1.32.1
-	>=gnome-base/dconf-0.26
-
-	>=media-libs/gstreamer-1.12.3:1.0
-	>=media-libs/gst-plugins-base-1.12.3:1.0
-	>=media-libs/gst-plugins-good-1.12.3:1.0
-
-	python? ( >=dev-python/pygobject-3.24.1:3 )
-"
-DEPEND=""
-
-# >=x11-libs/libwnck-3.20.1:3 - not used by core packages anymore
-
-S="${WORKDIR}"
diff --git a/gnome-base/gnome-core-libs/metadata.xml b/gnome-base/gnome-core-libs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gnome-core-libs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome-desktop-2.32.1-r2 b/gnome-base/gnome-desktop-2.32.1-r2
new file mode 100644
index 000000000000..a7f1164397a7
--- /dev/null
+++ b/gnome-base/gnome-desktop-2.32.1-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.34:2 >=x11-libs/libXrandr-1.2 >=gnome-base/gconf-2:2 >=x11-libs/startup-notification-0.5 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-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 x11-base/xorg-proto >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
+EAPI=5
+HOMEPAGE=https://www.gnome.org/
+IUSE=license-docs debug python_targets_python2_7
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+PDEPEND=>=dev-python/pygtk-2.8:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.14:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] license-docs? ( gnome-base/gnome-desktop:3[doc(+)] )
+RDEPEND=>=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.34:2 >=x11-libs/libXrandr-1.2 >=gnome-base/gconf-2:2 >=x11-libs/startup-notification-0.5 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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-desktop/2.32/gnome-desktop-2.32.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af330cddee3435d5bdf341112af0adab
diff --git a/gnome-base/gnome-desktop-3.24.2 b/gnome-base/gnome-desktop-3.24.2
new file mode 100644
index 000000000000..a1e362e4e712
--- /dev/null
+++ b/gnome-base/gnome-desktop-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) app-text/docbook-xml-dtd:4.1.2 dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.6 dev-util/itstool sys-devel/gettext x11-base/xorg-proto virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Libraries for the gnome desktop that are not part of the UI
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-desktop
+IUSE=debug +introspection udev test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?] >=x11-libs/gtk+-3.3.6:3[X,introspection?] x11-libs/cairo:=[X] x11-libs/libX11 x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) udev? ( sys-apps/hwids virtual/libudev:= ) !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
+SLOT=3/12
+SRC_URI=mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2b6371aae5cba78b0d4fff7b565b67eb
diff --git a/gnome-base/gnome-desktop/Manifest b/gnome-base/gnome-desktop/Manifest
deleted file mode 100644
index 6d8bf2de2f9f..000000000000
--- a/gnome-base/gnome-desktop/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gnome-desktop-2.32.1-gold.patch 493 BLAKE2B 4a7e5a1d834bb2a8f753e279a96875a34e25126a4a51167a37bcc2d749e1c28694bc53ee32ffe5490e20f6dc1a4f82e9201b5d9753928119be2ff2f3e19ba53b SHA512 1ceb79f150cc271547766044277cb38c45cb8ebaab9edaf5fd7bfc29ed25920c80d4a0331fdc6ed91f5b47cb51d820270714d72d3bec7cd55939f1a1ef7a9c0b
-AUX gnome-desktop-2.32.1-thumbnails.patch 3530 BLAKE2B 5ebed12840808f13e8116ff6e55c08269813dcc5f6acd863c2f845b75efb1879c36539c7690e9812ed034a4756da6b04bd271ecd9f3f07e22831edd6c7e81734 SHA512 8683aae51ba9a97074442b226d24267857d64a911608fc1c8a207fadc69222583c26281d4c16dddfbf7c975eb76fc6d5c08291ff594468dbee6dd92ef0313263
-DIST gnome-desktop-2.32.1.tar.bz2 1633847 BLAKE2B 9c69504b0f904fe04bdaa2e2fd3c6fbdd0cdd67033bae6e21377cce2deb68f05ed85bc735547c036923978ebdb8952c262676a01a33f8d7acffb0b964f97366a SHA512 b8084d08366dab661a7ee369cd03ba62beddbdfa9a36b988b7d13d207b33d6916f7fa8691717fba7b6a70d8276779e35360b1dc385e6ec876f30ea7b8b373c28
-DIST gnome-desktop-3.24.2.tar.xz 1064808 BLAKE2B 8574d26f2c2adedd7a287651fb34170e75d1744ad14e6caab8ede87af63b93197bcf4cde60dd9f6352dae8ae7bf8d598d0b24588d3a06cc2192c651b58577562 SHA512 691817fda97fc1c560c72213668eb4c2a8d03cc2433470a78149b3f785e95d9b4b681bceb733a67e1bfda649a6aed7ca4569b4891ee89f824a28d7a95f2782c2
-EBUILD gnome-desktop-2.32.1-r2.ebuild 2296 BLAKE2B fbd9347c8215cc512b0a510da35b4e12425f7c33a40a6081f714ba3cf4d71eabf66c27c230eb08147d9c56c1d15ac9586c7ecaa894baffc6721fbba35bcda062 SHA512 427f8dca28ce505920a02e0f540b3c311baff2fc03dcac908d07d4d4e463f70dbb3b642ae53129ff7c4a2892efc34ca84683316cb15f493c89968ed390e4b74e
-EBUILD gnome-desktop-3.24.2.ebuild 1602 BLAKE2B da62b47e959d77b54a023ff873e3f1ddc3192b8c035e92be21b3346acd8c9feb0d92abab59e25a958894a01baadf8eb537d3d40f0f32b43856c74c79a17b9876 SHA512 67fec7204f36afb1e32f7dbfa9023cbf4621811d6a5b82f48d5e65e2d8e5e5d648285544eeecc28be4099fe0f5b5ab41bde449730b8dd6214218c3a36e87fec8
-MISC metadata.xml 354 BLAKE2B f3504e89fa723ab0e4856f88e088fe1a3eff2bfee9635ffaae7404eff28b0090a636a9d9441e27dea8a3a62e980537636cf696097c946908554730ba12f1c358 SHA512 bfd7555f171ffd08174b134d34475d1dd40e6d325d188dd0a631d82d85836d92900a3ac641c6b200654ecdcd76371d7bbb4c3e34c4ee8b8410e8c6d8503a5bea
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
deleted file mode 100644
index 2e845da46e5b..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- libgnome-desktop/Makefile.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libgnome-desktop/Makefile.in b/libgnome-desktop/Makefile.in
-index 39209f6..a57b09e 100644
---- a/libgnome-desktop/Makefile.in
-+++ b/libgnome-desktop/Makefile.in
-@@ -388,7 +388,7 @@ libgnome_desktop_2_la_SOURCES = \
- 
- libgnome_desktop_2_la_LIBADD = \
- 	$(XLIB_LIBS)		\
--	$(GNOME_DESKTOP_LIBS)
-+	$(GNOME_DESKTOP_LIBS) -lm
- 
- libgnome_desktop_2_la_LDFLAGS = \
- 	-version-info $(LT_VERSION) \
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
deleted file mode 100644
index 583d7274379a..000000000000
--- a/gnome-base/gnome-desktop/files/gnome-desktop-2.32.1-thumbnails.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Originally from https://github.com/mate-desktop/mate-desktop/commit/fcede97471263b7f145ceeb988f569d4aa9129b8
-Ported to gnome-desktop by Matthew Turnbull <sparky@bluefang-logic.com>
-
-Fixes nautilus-2 thumbnailing with >=glib-2.34
-
-https://bugs.gentoo.org/show_bug.cgi?id=450930
-
-diff -rupN a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
---- a/libgnome-desktop/gnome-desktop-thumbnail.c
-+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
-@@ -526,8 +526,13 @@ gnome_desktop_thumbnail_factory_lookup (
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
-   
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails",
-+#endif
- 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- 			   file,
- 			   NULL);
-@@ -587,8 +592,13 @@ gnome_desktop_thumbnail_factory_has_vali
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails/fail",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails/fail",
-+#endif
- 			   appname,
- 			   file,
- 			   NULL);
-@@ -917,12 +927,17 @@ make_thumbnail_dirs (GnomeDesktopThumbna
- 
-   res = FALSE;
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+				    "thumbnails",
-+#else
-   thumbnail_dir = g_build_filename (g_get_home_dir (),
- 				    ".thumbnails",
-+#endif
- 				    NULL);
-   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
-     {
--      g_mkdir (thumbnail_dir, 0700);
-+      g_mkdir_with_parents (thumbnail_dir, 0700);
-       res = TRUE;
-     }
- 
-@@ -951,12 +966,17 @@ make_thumbnail_fail_dirs (GnomeDesktopTh
- 
-   res = FALSE;
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  thumbnail_dir = g_build_filename (g_get_user_cache_dir (),
-+				    "thumbnails",
-+#else
-   thumbnail_dir = g_build_filename (g_get_home_dir (),
- 				    ".thumbnails",
-+#endif
- 				    NULL);
-   if (!g_file_test (thumbnail_dir, G_FILE_TEST_IS_DIR))
-     {
--      g_mkdir (thumbnail_dir, 0700);
-+      g_mkdir_with_parents (thumbnail_dir, 0700);
-       res = TRUE;
-     }
- 
-@@ -1025,8 +1045,13 @@ gnome_desktop_thumbnail_factory_save_thu
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails",
-+#endif
- 			   (priv->size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- 			   file,
- 			   NULL);
-@@ -1129,8 +1154,13 @@ gnome_desktop_thumbnail_factory_create_f
- 
-   file = g_strconcat (g_checksum_get_string (checksum), ".png", NULL);
- 
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails/fail",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails/fail",
-+#endif
- 			   appname,
- 			   file,
- 			   NULL);
-@@ -1221,8 +1251,13 @@ gnome_desktop_thumbnail_path_for_uri (co
-   file = g_strconcat (md5, ".png", NULL);
-   g_free (md5);
-   
-+#if GLIB_CHECK_VERSION (2, 34, 0)
-+  path = g_build_filename (g_get_user_cache_dir (),
-+			   "thumbnails",
-+#else
-   path = g_build_filename (g_get_home_dir (),
- 			   ".thumbnails",
-+#endif
- 			   (size == GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL)?"normal":"large",
- 			   file,
- 			   NULL);
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
deleted file mode 100644
index dbcd5ea476d1..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-2.32.1-r2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="license-docs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Note: gnome-desktop:2 and :3 install identical files in /usr/share/gnome/help
-# and /usr/share/omf when --enable-desktop-docs is passed to configure. To avoid
-# file conflict and pointless duplication, gnome-desktop:2[doc] will simply use
-# the files that are installed by :3[doc]
-# Note: depend on glib-2.34 to make sure users upgrade glib before gnome-desktop
-# to get a fix for bug #450930
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.34:2
-	>=x11-libs/libXrandr-1.2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/startup-notification-0.5
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	>=app-text/gnome-doc-utils-0.3.2
-	~app-text/docbook-xml-dtd-4.1.2
-	x11-base/xorg-proto
-"
-PDEPEND=">=dev-python/pygtk-2.8:2[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-2.14:2[${PYTHON_USEDEP}]
-	license-docs? ( gnome-base/gnome-desktop:3[doc(+)] )
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
-# eventually libXrandr shouldn't RDEPEND on randrproto)
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gold.patch
-	epatch "${FILESDIR}"/${P}-thumbnails.patch #450930
-	gnome2_src_prepare
-}
-
-src_configure() {
-	python_export_best
-	gnome2_src_configure \
-		--with-gnome-distributor=Gentoo \
-		--disable-scrollkeeper \
-		--disable-static \
-		--disable-deprecations \
-		--disable-desktop-docs
-	# desktop-docs will be built by gnome-desktop:3
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-	gnome2_src_install
-	# python-r1.eclass doesn't like versioned python shebangs
-	sed -e 's@#!\(.*python.*\)@#!/usr/bin/env python@' -i gnome-about/gnome-about
-	python_doscript gnome-about/gnome-about
-}
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
deleted file mode 100644
index 23ef79b6f8aa..000000000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.24.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
-HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="3/12" # subslot = libgnome-desktop-3 soname version
-IUSE="debug +introspection udev"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
-
-# cairo[X] needed for gnome-bg
-COMMON_DEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
-	>=x11-libs/gtk+-3.3.6:3[X,introspection?]
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	udev? (
-		sys-apps/hwids
-		virtual/libudev:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.6
-	dev-util/itstool
-	sys-devel/gettext
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-distributor=Gentoo \
-		--enable-desktop-docs \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable debug debug-tools) \
-		$(use_enable introspection) \
-		$(use_enable udev)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
deleted file mode 100644
index 65b08cd27572..000000000000
--- a/gnome-base/gnome-desktop/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="license-docs">Install help files documenting GNOME's
-			licenses</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-extra-apps-3.24.2 b/gnome-base/gnome-extra-apps-3.24.2
new file mode 100644
index 000000000000..81903365fa77
--- /dev/null
+++ b/gnome-base/gnome-extra-apps-3.24.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DESCRIPTION=Sub-meta package for the applications of GNOME 3
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=+games +share +shotwell +tracker
+KEYWORDS=amd64 x86
+LICENSE=metapackage
+RDEPEND=>=gnome-base/gnome-core-libs-3.24.2 >=sys-apps/baobab-3.24.0 >=media-video/cheese-3.24.0 >=www-client/epiphany-3.24.2 >=app-arch/file-roller-3.24.1 >=gnome-extra/gnome-calculator-3.24.0 >=gnome-extra/gnome-calendar-3.24.2 >=gnome-extra/gnome-characters-3.24.0 >=sys-apps/gnome-disk-utility-3.24.1 >=media-gfx/gnome-font-viewer-3.24.0 >=gnome-extra/gnome-power-manager-3.24.0 >=media-gfx/gnome-screenshot-3.22.0 >=gnome-extra/gnome-system-monitor-3.24.0 >=gnome-extra/gnome-weather-3.24.0 >=gnome-extra/gucharmap-9.0.4:2.90 >=gnome-extra/sushi-3.24.0 >=media-sound/sound-juicer-3.24.0 >=net-misc/vino-3.22.0 >=gnome-base/dconf-editor-3.24.2 >=app-dicts/gnome-dictionary-3.24.1 >=mail-client/evolution-3.24.2 >=net-analyzer/gnome-nettool-3.8.1 >=gnome-extra/gnome-tweak-tool-3.24.1 >=gnome-extra/nautilus-sendto-3.8.4 >=net-misc/vinagre-3.22.0 games? ( >=games-puzzle/five-or-more-3.22.2 >=games-board/four-in-a-row-3.22.1 >=games-board/gnome-chess-3.24.1 >=games-puzzle/gnome-klotski-3.22.1 >=games-board/gnome-mahjongg-3.22.0 >=games-board/gnome-mines-3.24.0 >=games-arcade/gnome-nibbles-3.24.0 >=games-arcade/gnome-robots-3.22.1 >=games-puzzle/gnome-sudoku-3.24.0 >=games-puzzle/gnome-taquin-3.22.0 >=games-puzzle/gnome-tetravex-3.22.0 >=games-puzzle/hitori-3.22.3 >=games-board/iagno-3.22.0 >=games-puzzle/lightsoff-3.24.0 >=games-puzzle/quadrapassel-3.22.0 >=games-puzzle/swell-foop-3.24.0 >=games-board/tali-3.22.0 ) share? ( >=gnome-extra/gnome-user-share-3.18.3 ) shotwell? ( >=media-gfx/shotwell-0.24 ) tracker? ( >=app-misc/tracker-1.12 >=gnome-extra/gnome-documents-3.24.2 >=media-gfx/gnome-photos-3.24.2 >=media-sound/gnome-music-3.24.2 )
+SLOT=3.0
+_md5_=5809f2903ce4bc0fd90608e0ae8328fc
diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest
deleted file mode 100644
index b35cfc764173..000000000000
--- a/gnome-base/gnome-extra-apps/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gnome-extra-apps-3.24.2.ebuild 2335 BLAKE2B 2bafe0766ef3e641f0a7281defcfdb2b75b05b222a5098a552d0a5cd9b4ba7925c82a3fa8889bca4183360a39d7a4a5840c1343e30bf92495f2a1e76b9829645 SHA512 671d41127a5144a31985b96e9768312cb4e4cdfd9a5e45269a18bd3c6d7bae4dc644b265dc358181017542131a8c5f77825cee5c884673f2ee1605b921489f95
-MISC metadata.xml 617 BLAKE2B ee89ac320ee9fa2c6a29d3d8b86df05a734781bfb5e538f9f84a85c9467672901713d94347acbef958c8c5733f9a0a07f0b008bf84f2daa2df5390bf8225eb66 SHA512 d91641939c20487a6ba4cfc0c55b6bdf7ba6315b63b8a045976bb9367c6001f9feea9c206ac522cf47efbd5267205e45c29b3ad5ce6189fd1a02f4d993a036be
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
deleted file mode 100644
index 1ccdc6efeb50..000000000000
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.24.2.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sub-meta package for the applications of GNOME 3"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="3.0"
-IUSE="+games +share +shotwell +tracker"
-
-KEYWORDS="amd64 x86"
-
-# Note to developers:
-# This is a wrapper for the extra apps integrated with GNOME 3
-# Keep pkg order within a USE flag as upstream releng versions file
-# TODO: Should we keep these here: gnome-power-manager, gucharmap, sound-juicer; replace gucharmap with gnome-characters?
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}
-
-	>=sys-apps/baobab-3.24.0
-	>=media-video/cheese-3.24.0
-	>=www-client/epiphany-${PV}
-	>=app-arch/file-roller-3.24.1
-	>=gnome-extra/gnome-calculator-3.24.0
-	>=gnome-extra/gnome-calendar-${PV}
-	>=gnome-extra/gnome-characters-3.24.0
-	>=sys-apps/gnome-disk-utility-3.24.1
-	>=media-gfx/gnome-font-viewer-3.24.0
-	>=gnome-extra/gnome-power-manager-3.24.0
-	>=media-gfx/gnome-screenshot-3.22.0
-	>=gnome-extra/gnome-system-monitor-3.24.0
-	>=gnome-extra/gnome-weather-3.24.0
-	>=gnome-extra/gucharmap-9.0.4:2.90
-	>=gnome-extra/sushi-3.24.0
-	>=media-sound/sound-juicer-3.24.0
-	>=net-misc/vino-3.22.0
-
-	>=gnome-base/dconf-editor-${PV}
-	>=app-dicts/gnome-dictionary-3.24.1
-	>=mail-client/evolution-${PV}
-	>=net-analyzer/gnome-nettool-3.8.1
-	>=gnome-extra/gnome-tweak-tool-3.24.1
-	>=gnome-extra/nautilus-sendto-3.8.4
-	>=net-misc/vinagre-3.22.0
-
-	games? (
-		>=games-puzzle/five-or-more-3.22.2
-		>=games-board/four-in-a-row-3.22.1
-		>=games-board/gnome-chess-3.24.1
-		>=games-puzzle/gnome-klotski-3.22.1
-		>=games-board/gnome-mahjongg-3.22.0
-		>=games-board/gnome-mines-3.24.0
-		>=games-arcade/gnome-nibbles-3.24.0
-		>=games-arcade/gnome-robots-3.22.1
-		>=games-puzzle/gnome-sudoku-3.24.0
-		>=games-puzzle/gnome-taquin-3.22.0
-		>=games-puzzle/gnome-tetravex-3.22.0
-		>=games-puzzle/hitori-3.22.3
-		>=games-board/iagno-3.22.0
-		>=games-puzzle/lightsoff-3.24.0
-		>=games-puzzle/quadrapassel-3.22.0
-		>=games-puzzle/swell-foop-3.24.0
-		>=games-board/tali-3.22.0
-	)
-	share? ( >=gnome-extra/gnome-user-share-3.18.3 )
-	shotwell? ( >=media-gfx/shotwell-0.24 )
-	tracker? (
-		>=app-misc/tracker-1.12
-		>=gnome-extra/gnome-documents-${PV}
-		>=media-gfx/gnome-photos-${PV}
-		>=media-sound/gnome-music-${PV} )
-"
-DEPEND=""
-S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/metadata.xml b/gnome-base/gnome-extra-apps/metadata.xml
deleted file mode 100644
index de5c58479821..000000000000
--- a/gnome-base/gnome-extra-apps/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="games">Install Gnome Games</flag>
-	<flag name="share">Install the <pkg>gnome-extra/gnome-user-share</pkg> personal file sharing tool</flag>
-	<flag name="shotwell">Install the <pkg>media-gfx/shotwell</pkg> photo manager</flag>
-	<flag name="tracker">Install the <pkg>app-misc/tracker</pkg> indexer and the GNOME packages that require it</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-keyring-3.20.0 b/gnome-base/gnome-keyring-3.20.0
new file mode 100644
index 000000000000..da2a70c33201
--- /dev/null
+++ b/gnome-base/gnome-keyring-3.20.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) filecaps? ( sys-libs/libcap ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Password and keyring managing daemon
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
+IUSE=+caps pam selinux +ssh-agent test +filecaps test
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=app-crypt/pinentry[gnome-keyring]
+RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f69fee6b902ff70f716edc7fd6690dd6
diff --git a/gnome-base/gnome-keyring-3.20.1 b/gnome-base/gnome-keyring-3.20.1
new file mode 100644
index 000000000000..30ddc591417e
--- /dev/null
+++ b/gnome-base/gnome-keyring-3.20.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:= >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) filecaps? ( sys-libs/libcap ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Password and keyring managing daemon
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
+IUSE=+caps pam selinux +ssh-agent test +filecaps test
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=app-crypt/pinentry[gnome-keyring]
+RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) selinux? ( sec-policy/selinux-gnome ) >=app-crypt/gnupg-2.0.28:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	fcaps	9445d60c1eb084a91c38ef4c070b2f16	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a591b88cb58ff5b3b580ddcd2345b62c
diff --git a/gnome-base/gnome-keyring/Manifest b/gnome-base/gnome-keyring/Manifest
deleted file mode 100644
index 6be3088820c4..000000000000
--- a/gnome-base/gnome-keyring/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnome-keyring-3.20.0.tar.xz 1215324 BLAKE2B 97a4663fac7d3e854a742ac2f160fda2b40c5ff9f7316b52197955aa1970732ef323252325a021469d4944e962b1f1b868d300476b854f21cc5636961e3972da SHA512 f7e6195b4be52edaee3bc3181f006ec31ebd54f8000c98220520f4158f66580b60950e4f55247aefae6aa9320f6589c8a09c1e32853165915ae5ff1b40627c5b
-DIST gnome-keyring-3.20.1.tar.xz 1219800 BLAKE2B b0c633575ee35a733bbf04322e4413675bc40d4de256b66183138483f50c1d399a450cd4d06a3d76707948a7c541ef129a3385044f109a37677af6a7fc01e9af SHA512 a60d8a4b17a9c6d8c581578881abaf7d79de43045a314b401e3bfd3974edb4ab94117dd430203b721058f432b24bf6296e0b7c4fba1e66cccd2c2e9441787177
-EBUILD gnome-keyring-3.20.0.ebuild 2160 BLAKE2B 7950bac9588a9e1ccbe00c868c12702ed94cdfcb205e4e232b25262b30bc8a71380eada6216665bfb95e697eaf138e9df5d69da256e21a451fb97e8a21320394 SHA512 d2ad880164ec25e7853fe4ac395e0e93500d559452ffbfe3cc87bc7b5ffd490b3d1c6f3f77d5df9f61d50e0e6b55cef819d4bd4f49d4e96b01cd6237bd58f2f7
-EBUILD gnome-keyring-3.20.1.ebuild 2161 BLAKE2B 780499b7c5c77253574506de794dbc4bd01d3c1adb55b11bf8f2195f4004fcb819d31b257aa2018a464c9f031bac8578c5c570bdc575788331402201146d80db SHA512 e70b39552d8f78322083b14570dea1a3fe06a9bc1fa7a9434f6476153242a73bb5d14df212be2d02a100bfa9f64648cf1de028250af2bb9f4bca35dde56790d3
-MISC metadata.xml 883 BLAKE2B 6d253b088319b1f442d91e0372751ce3ddd0516bbd3e72242e4541837c6c6bfe83371a5c47a7be73fad6046be5f053aa6c6fb41d884111ac53cd4de3cb0d1381 SHA512 31d506051c1353e1e4dd987e5ccd39281d19f6ae08974a09bd8145218c7209588629a79c6baad9ff1b83358a699f46fddb8c4ec51da73efe26be2d5e7f0a905a
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
deleted file mode 100644
index 7ac2c9823bcb..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.20.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-"
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild
deleted file mode 100644
index 26a5b8da2d79..000000000000
--- a/gnome-base/gnome-keyring/gnome-keyring-3.20.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit fcaps gnome2 pam python-any-r1 versionator virtualx
-
-DESCRIPTION="Password and keyring managing daemon"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
-	>=app-crypt/gcr-3.5.3:=[gtk]
-	>=dev-libs/glib-2.38:2
-	app-misc/ca-certificates
-	>=dev-libs/libgcrypt-1.2.2:0=
-	caps? ( sys-libs/libcap-ng )
-	pam? ( virtual/pam )
-	selinux? ( sec-policy/selinux-gnome )
-	>=app-crypt/gnupg-2.0.28:=
-"
-DEPEND="${RDEPEND}
-	>=app-eselect/eselect-pinentry-0.5
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-"
-PDEPEND="app-crypt/pinentry[gnome-keyring]" #570512
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# Disable stupid CFLAGS with debug enabled
-	sed -e 's/CFLAGS="$CFLAGS -g"//' \
-		-e 's/CFLAGS="$CFLAGS -O0"//' \
-		-i configure.ac configure || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_with caps libcap-ng) \
-		$(use_enable pam) \
-		$(use_with pam pam-dir $(getpam_mod_dir)) \
-		$(use_enable selinux) \
-		$(use_enable ssh-agent) \
-		--enable-doc
-}
-
-src_test() {
-	 "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/schema" || die
-	 GSETTINGS_SCHEMA_DIR="${S}/schema" virtx emake check
-}
-
-pkg_postinst() {
-	# cap_ipc_lock only needed if building --with-libcap-ng
-	# Never install as suid root, this breaks dbus activation, see bug #513870
-	use caps && fcaps -m 755 cap_ipc_lock usr/bin/gnome-keyring-daemon
-	gnome2_pkg_postinst
-
-	if ! [[ $(eselect pinentry show | grep "pinentry-gnome3") ]] ; then
-		ewarn "Please select pinentry-gnome3 as default pinentry provider:"
-		ewarn " # eselect pinentry set pinentry-gnome3"
-	fi
-}
diff --git a/gnome-base/gnome-keyring/metadata.xml b/gnome-base/gnome-keyring/metadata.xml
deleted file mode 100644
index f8058de62b5a..000000000000
--- a/gnome-base/gnome-keyring/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
-		GNOME Keyring is a collection of components in GNOME that store
-		secrets, passwords, keys, certificates and make them available to
-		applications. It is integrated with the user's login, so that
-		their secret storage can be unlocked when the user logins into their
-		session. It is based around a standard called PKCS#11, which is a
-		standard way for applications to manage certificates and keys on
-		smart cards or secure storage.
-	</longdescription>
-	<use>
-		<flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys.
-			Recommended unless you are using ECDSA or Ed25519 keys.</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-light-3.22.0 b/gnome-base/gnome-light-3.22.0
new file mode 100644
index 000000000000..81b7ad105483
--- /dev/null
+++ b/gnome-base/gnome-light-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst pretend
+DESCRIPTION=Meta package for GNOME-Light, merge this package to install
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=cups +gnome-shell
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=metapackage
+PDEPEND=>=gnome-base/gvfs-1.28.0
+RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.22.0[cups?] >=gnome-base/gnome-session-3.22.0 >=gnome-base/gnome-menus-3.10.1:3 >=gnome-base/gnome-settings-daemon-3.22.0[cups?] >=gnome-base/gnome-control-center-3.22.0[cups?] >=gnome-base/nautilus-3.20.0 gnome-shell? ( >=x11-wm/mutter-3.22.0 >=gnome-base/gnome-shell-3.22.0 ) >=x11-themes/adwaita-icon-theme-2 >=x11-themes/gnome-themes-standard-3.22.0 >=x11-themes/gnome-backgrounds-2 >=x11-terms/gnome-terminal-3.22.0
+SLOT=2.0
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=144d6f94b39b61f779cc358e829f5f9e
diff --git a/gnome-base/gnome-light-3.24.2 b/gnome-base/gnome-light-3.24.2
new file mode 100644
index 000000000000..d15a1b64d2ec
--- /dev/null
+++ b/gnome-base/gnome-light-3.24.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst pretend
+DESCRIPTION=Meta package for GNOME-Light, merge this package to install
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=cups +gnome-shell
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=metapackage
+PDEPEND=>=gnome-base/gvfs-1.32.1
+RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.24.2[cups?] >=gnome-base/gnome-session-3.24.2 >=gnome-base/gnome-settings-daemon-3.24.2[cups?] >=gnome-base/gnome-control-center-3.24.2[cups?] >=gnome-base/nautilus-3.24.2 gnome-shell? ( >=x11-wm/mutter-3.24.2 >=gnome-base/gnome-shell-3.24.2 ) >=x11-themes/adwaita-icon-theme-2 >=x11-themes/gnome-themes-standard-3.22.3 >=x11-themes/gnome-backgrounds-2 >=x11-terms/gnome-terminal-3.24.2
+SLOT=2.0
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=6b76105f46c69178428fb9aae0355bc1
diff --git a/gnome-base/gnome-light/Manifest b/gnome-base/gnome-light/Manifest
deleted file mode 100644
index b3d80a61b66b..000000000000
--- a/gnome-base/gnome-light/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD gnome-light-3.22.0.ebuild 1762 BLAKE2B 7aece5726a0453567f9a0191f42fbe888cb567aad79b5066d19e3fc5f190d451f926cd1298868d137b996fde0111c30c6214ec52c72da04c20a0a889586d8a3c SHA512 6d835eee81128178793ce60d96687f0cf7a5d7e2c6d8329a7df0d1bc54f1fd1fd746a3151c8e1510b66598488a35647c65c01dc06cdc14ff6ae3cad864dec3b5
-EBUILD gnome-light-3.24.2.ebuild 1709 BLAKE2B a95ca9100ad9842d54fff566dfd4088adf709636eb5a1458446c400ff1f55b807a7a8eef295002ea798c94a064dc7af93de5d693445dfeb1586e5913286c068e SHA512 5a79223238c824c08a835bb6e35036d5ef0d3244a92c04684d716b35a89220830a0a59a19ea44af108b54bbc650b2e85140adf042c81d5fe6a377e28520a4f1e
-MISC metadata.xml 406 BLAKE2B 562a281deb064ec0aa74ffebe4e38c864746809724acc4522df8c9cc0590d80937836923a029e521c5a0eec83adda11f169fa554e9760128408b78e87d916f26 SHA512 04875558c048cf102d8e5ffb17cb363808ca84c350f9b03958536cc5185cfd109b4653bbb4de202f47d092f8fc6d15173d3453a3bc62aa431b0c83cbb699a047
diff --git a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild b/gnome-base/gnome-light/gnome-light-3.22.0.ebuild
deleted file mode 100644
index ad70f051b6c9..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.22.0.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-P_RELEASE="$(get_version_components 2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-menus-3.10.1:3
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-3.20.0
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
-	>=x11-themes/gnome-themes-standard-${PV}
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-${PV}
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.28.0"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're installing neither GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/gnome-light-3.24.2.ebuild b/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
deleted file mode 100644
index 00f36b71176e..000000000000
--- a/gnome-base/gnome-light/gnome-light-3.24.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-P_RELEASE="$(get_version_components 2)"
-
-DESCRIPTION="Meta package for GNOME-Light, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-LICENSE="metapackage"
-SLOT="2.0"
-IUSE="cups +gnome-shell"
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# XXX: Note to developers:
-# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
-# the bare minimum of libs/apps needed. It is basically gnome-base/gnome without
-# any apps, but shouldn't be used by users unless they know what they are doing.
-RDEPEND="!gnome-base/gnome
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-
-	>=gnome-base/gnome-session-${PV}
-	>=gnome-base/gnome-settings-daemon-${PV}[cups?]
-	>=gnome-base/gnome-control-center-${PV}[cups?]
-
-	>=gnome-base/nautilus-${PV}
-
-	gnome-shell? (
-		>=x11-wm/mutter-${PV}
-		>=gnome-base/gnome-shell-${PV} )
-
-	>=x11-themes/adwaita-icon-theme-${P_RELEASE}
-	>=x11-themes/gnome-themes-standard-3.22.3
-	>=x11-themes/gnome-backgrounds-${P_RELEASE}
-
-	>=x11-terms/gnome-terminal-${PV}
-"
-DEPEND=""
-PDEPEND=">=gnome-base/gvfs-1.32.1"
-S="${WORKDIR}"
-
-pkg_pretend() {
-	if ! use gnome-shell; then
-		# Users probably want to use e16, sawfish, etc
-		ewarn "You're not installing GNOME Shell"
-		ewarn "You will have to install and manage a window manager by yourself"
-	fi
-}
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome-light/metadata.xml b/gnome-base/gnome-light/metadata.xml
deleted file mode 100644
index b0d8e7f76359..000000000000
--- a/gnome-base/gnome-light/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and
-		<pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop mode</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-menus-3.13.3-r1 b/gnome-base/gnome-menus-3.13.3-r1
new file mode 100644
index 000000000000..7900ca9f9858
--- /dev/null
+++ b/gnome-base/gnome-menus-3.13.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( dev-libs/gjs ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Library for the Desktop Menu fd.o specification
+EAPI=5
+HOMEPAGE=https://git.gnome.org/browse/gnome-menus
+IUSE=+introspection test debug
+KEYWORDS=~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) !<gnome-base/gnome-menus-3.0.1-r1:0
+SLOT=3
+SRC_URI=mirror://gnome/sources/gnome-menus/3.13/gnome-menus-3.13.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef786c2081a9b428434f88a03554480c
diff --git a/gnome-base/gnome-menus/Manifest b/gnome-base/gnome-menus/Manifest
deleted file mode 100644
index 5be24b7c10cb..000000000000
--- a/gnome-base/gnome-menus/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnome-menus-3.13.3-multiple-desktop.patch 5094 BLAKE2B 8f70982804f8c8778e0e0eb60496c87b9634b817ca538793ba14c56a66934e540a315ba82a54fb0412bfc95234c5e3485f1a6210eac2125f4b77d9a9cacd6113 SHA512 6d7b3cb6d3e445355ea4c77a2930ef93792d5ce1ec44e449576700cea00f1f9e0fd2f1445a7d41675ed5a976501b458a8e650fd0c8e1adb0c1b364832d6f0972
-AUX gnome-menus-3.13.3-multiple-desktop2.patch 781 BLAKE2B 2da46999a7943a61b0032c77e863b201f9a46598dc5da385b5529afa62d3f826373d315132cd1580ef1e63f264e7cc61ca51757ae2bd509e409b4408f3e9cae9 SHA512 e48c3a35fae90e35bffc1a36713d3b5122de7edb5369a4e34b04c49030a0c33937ad24099814e3003c887d5a0369b9cc927445f965ec2a2cfa9ac55858404f4d
-AUX gnome-menus-3.8.0-ignore_kde_standalone.patch 1665 BLAKE2B 97e21c328c44620d7cacfd302907d846d0d58c86c4e2709231f94318bde97825f59f85616c47d475ec5c1fec969a8d46301532deeb03ab910df2f9cec5692a5e SHA512 db461006883594de834fff029b3aa769afa6955bc94062865d8c71ec224fdd64867693763c3ecb98921c98c7410bacf18dc2110b5322e1956c877e7fcf61bef0
-DIST gnome-menus-3.13.3.tar.xz 404664 BLAKE2B 7772c817317b4af86e740aeea3095f51ff210f73e53160ca2359d45a017236c82fe787956c04a9e0001e2511671438d4955f0bf7947cdfa8649d78fe931d6d79 SHA512 d631eb17ddc1b33227d0e5862a9344a8605ee1e9ebc1f12ce4ac98895adaf8a82ef2a49415d99bc194a02f30f30c3d6d49759f280fbc246c9e482711fd5021d2
-EBUILD gnome-menus-3.13.3-r1.ebuild 1382 BLAKE2B 8bb7a4381e0975e4c6030708920a8d2a3a192ee52dd0da131cf3c4b8c9aa89eeb5f150a5af2b417955643f2ed2aed1b63b6ffe9fe082b3ac0e0f53578dbeb3ef SHA512 13517cd1fc4b57e6f63d114a273639cfafa3faeb16aaa977a3a9213a12e39fc8cc6a50f8b40b1f7e4f36265d586ac0a7fa76d285d382514ba64a81a42c11fe54
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch
deleted file mode 100644
index 8ec7006fce5b..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From b4546ab43c2c7ef6fb6cb7e5db83dc3975b56e8e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels@gmail.com>
-Date: Mon, 27 Oct 2014 18:41:34 +0200
-Subject: desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
-
-This is based on glib commit:
-5a5e16e93c4f11e635918ecdb41681f63fd05a39
----
- libmenu/desktop-entries.c | 110 ++++++++++++++++++++++------------------------
- 1 file changed, 52 insertions(+), 58 deletions(-)
-
-diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
-index 326f311..bd4f886 100644
---- a/libmenu/desktop-entries.c
-+++ b/libmenu/desktop-entries.c
-@@ -85,32 +85,27 @@ unix_basename_from_path (const char *path)
-     return path;
- }
- 
--static const char *
--get_current_desktop (void)
-+static const gchar * const *
-+get_current_desktops (void)
- {
--  static char *current_desktop = NULL;
-+  static gchar **result;
- 
--  /* Support XDG_CURRENT_DESKTOP environment variable; this can be used
--   * to abuse gnome-menus in non-GNOME desktops. */
--  if (!current_desktop)
-+  if (g_once_init_enter (&result))
-     {
--      const char *desktop;
-+      const gchar *desktops;
-+      gchar **tmp;
- 
--      desktop = g_getenv ("XDG_CURRENT_DESKTOP");
-+      desktops = g_getenv ("XDG_CURRENT_DESKTOP");
- 
--      /* Note: if XDG_CURRENT_DESKTOP is set but empty, do as if it
--       * was not set */
--      if (!desktop || desktop[0] == '\0')
--        current_desktop = g_strdup ("GNOME");
--      else
--        current_desktop = g_strdup (desktop);
--    }
-+      if (desktops)
-+        desktops = "";
- 
--  /* Using "*" means skipping desktop-related checks */
--  if (g_strcmp0 (current_desktop, "*") == 0)
--    return NULL;
-+      tmp = g_strsplit (desktops, ":", 0);
-+
-+      g_once_init_leave (&result, tmp);
-+    }
- 
--  return current_desktop;
-+  return  (const gchar **) result;
- }
- 
- static GIcon *
-@@ -151,52 +146,58 @@ key_file_get_icon (GKeyFile *key_file)
- static gboolean
- key_file_get_show_in (GKeyFile *key_file)
- {
--  const gchar *current_desktop;
--  gchar **strv;
-+  const gchar * const *current_desktops;
-+  gchar **only_show_in;
-+  gchar **not_show_in;
-   gboolean show_in = TRUE;
--  int i;
--
--  current_desktop = get_current_desktop ();
--  if (!current_desktop)
--    return TRUE;
--
--  strv = g_key_file_get_string_list (key_file,
--                                     DESKTOP_ENTRY_GROUP,
--                                     "OnlyShowIn",
--                                     NULL,
--                                     NULL);
--  if (strv)
-+  gint i;
-+
-+  current_desktops = get_current_desktops ();
-+  only_show_in = g_key_file_get_string_list (key_file,
-+                                             DESKTOP_ENTRY_GROUP,
-+                                             "OnlyShowIn",
-+                                             NULL,
-+                                             NULL);
-+  not_show_in = g_key_file_get_string_list (key_file,
-+                                            DESKTOP_ENTRY_GROUP,
-+                                            "NotShowIn",
-+                                            NULL,
-+                                            NULL);
-+
-+  for (i = 0; current_desktops[i]; i++)
-     {
--      show_in = FALSE;
--      for (i = 0; strv[i]; i++)
-+      gint j;
-+
-+      if (only_show_in)
-         {
--          if (!strcmp (strv[i], current_desktop))
-+          show_in = FALSE;
-+          for (j = 0; only_show_in[j]; j++)
-             {
--              show_in = TRUE;
--              break;
-+              if (g_str_equal (only_show_in[j], current_desktops[i]))
-+                {
-+                  show_in = TRUE;
-+                  goto out;
-+                }
-             }
-         }
--    }
--  else
--    {
--      strv = g_key_file_get_string_list (key_file,
--                                         DESKTOP_ENTRY_GROUP,
--                                         "NotShowIn",
--                                         NULL,
--                                         NULL);
--      if (strv)
-+
-+      if (not_show_in)
-         {
-           show_in = TRUE;
--          for (i = 0; strv[i]; i++)
-+          for (j = 0; not_show_in[j]; j++)
-             {
--              if (!strcmp (strv[i], current_desktop))
-+              if (g_str_equal (not_show_in[j], current_desktops[i]))
-                 {
-                   show_in = FALSE;
-+                  goto out;
-                 }
-             }
-         }
-     }
--  g_strfreev (strv);
-+
-+out:
-+  g_strfreev (only_show_in);
-+  g_strfreev (not_show_in);
- 
-   return show_in;
- }
-@@ -579,14 +580,7 @@ gboolean
- desktop_entry_get_show_in (DesktopEntry *entry)
- {
-   if (entry->type == DESKTOP_ENTRY_DESKTOP)
--    {
--      const char *current_desktop = get_current_desktop ();
--
--      if (current_desktop == NULL)
--        return TRUE;
--      else
--        return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, current_desktop);
--    }
-+    return g_desktop_app_info_get_show_in (((DesktopEntryDesktop*)entry)->appinfo, NULL);
-   return ((DesktopEntryDirectory*)entry)->showin;
- }
- 
--- 
-cgit v0.11.2
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch b/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch
deleted file mode 100644
index 966b060eac27..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.13.3-multiple-desktop2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 4befe76fbdb76aa6a986297ef71d1601b2ced42e Mon Sep 17 00:00:00 2001
-From: Josselin Mouette <joss@debian.org>
-Date: Sun, 14 Dec 2014 20:36:36 +0100
-Subject: desktop-entries: fix trivial bug in handling of multiple desktops in
- XDG_CURRENT_DESKTOP.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=741505
----
- libmenu/desktop-entries.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libmenu/desktop-entries.c b/libmenu/desktop-entries.c
-index bd4f886..a463d79 100644
---- a/libmenu/desktop-entries.c
-+++ b/libmenu/desktop-entries.c
-@@ -97,7 +97,7 @@ get_current_desktops (void)
- 
-       desktops = g_getenv ("XDG_CURRENT_DESKTOP");
- 
--      if (desktops)
-+      if (!desktops)
-         desktops = "";
- 
-       tmp = g_strsplit (desktops, ":", 0);
--- 
-cgit v0.11.2
-
diff --git a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
deleted file mode 100644
index ab6cb92d7dda..000000000000
--- a/gnome-base/gnome-menus/files/gnome-menus-3.8.0-ignore_kde_standalone.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bf91222f05076f32c0a21aa22f8629dc6ce19eb4 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Mon, 25 Feb 2013 16:36:44 +0330
-Subject: [PATCH] gnome-menus-3.7.90-ignore_kde_standalone
-
----
- layout/gnome-applications.menu | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu
-index 9242eff..94ea6d4 100644
---- a/layout/gnome-applications.menu
-+++ b/layout/gnome-applications.menu
-@@ -277,7 +277,19 @@
-       <And>
-         <Not><Category>Core</Category></Not>
-         <Not><Category>Screensaver</Category></Not>
--
-+        <Not><Category>X-KDE-settings-accessibility</Category></Not>
-+        <Not><Category>X-KDE-settings-components</Category></Not>
-+        <Not><Category>X-KDE-settings-desktop</Category></Not>
-+        <Not><Category>X-KDE-settings-looknfeel</Category></Not>
-+        <Not><Category>X-KDE-settings-network</Category></Not>
-+        <Not><Category>X-KDE-settings-webbrowsing</Category></Not>
-+        <Not><Category>X-KDE-settings-peripherals</Category></Not>
-+        <Not><Category>X-KDE-settings-hardware</Category></Not>
-+        <Not><Category>X-KDE-settings-power</Category></Not>
-+        <Not><Category>X-KDE-settings-security</Category></Not>
-+        <Not><Category>X-KDE-settings-sound</Category></Not>
-+        <Not><Category>X-KDE-settings-system</Category></Not>
-+        <Not><Category>X-KDE-information</Category></Not>
-         <!-- Really Fedora ??? -->
-         <Not><Filename>gnome-eog.desktop</Filename></Not>
-         <Not><Filename>gnome-file-roller.desktop</Filename></Not>
--- 
-1.8.1.2
-
diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
deleted file mode 100644
index 675fccc08fec..000000000000
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="Library for the Desktop Menu fd.o specification"
-HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="+introspection test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-# Older versions of slot 0 install the menu editor and the desktop directories
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gnome-menus-3.0.1-r1:0
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( dev-libs/gjs )
-"
-
-src_prepare() {
-	# Don't show KDE standalone settings desktop files in GNOME others menu
-	epatch "${FILESDIR}/${PN}-3.8.0-ignore_kde_standalone.patch"
-
-	# desktop-entries: support multiple desktops in XDG_CURRENT_DESKTOP
-	# (from 'master')
-	epatch "${FILESDIR}"/${P}-multiple-desktop{,2}.patch
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-	# Do NOT compile with --disable-debug/--enable-debug=no
-	# It disables api usage checks
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-base/gnome-menus/metadata.xml b/gnome-base/gnome-menus/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gnome-menus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome-mime-data-2.18.0 b/gnome-base/gnome-mime-data-2.18.0
new file mode 100644
index 000000000000..c2af80c36f19
--- /dev/null
+++ b/gnome-base/gnome-mime-data-2.18.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=virtual/pkgconfig >=dev-util/intltool-0.35 >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=MIME data for Gnome
+EAPI=5
+HOMEPAGE=https://www.gnome.org/
+IUSE=debug
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5e1a3ca36a7d09d72316c355a3c7a3c7
diff --git a/gnome-base/gnome-mime-data/Manifest b/gnome-base/gnome-mime-data/Manifest
deleted file mode 100644
index 4c39563398ad..000000000000
--- a/gnome-base/gnome-mime-data/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-mime-data-2.18.0.tar.bz2 607012 BLAKE2B 6653e11f04f94035e7bf7d12413870b6e425bb32c50cd0776fae93be05eaea6eb4116f8d068e86c39fca9a3f86148934357d5a1c538a7deaae117151b8f1e466 SHA512 132996786254799341eeaa7894749cf4a95e391e31d985b1527b2f3dfeeeb01e7cc000753fc21d559db07fcc92018f4839f170eb149cb457fe06058ad3d986d5
-EBUILD gnome-mime-data-2.18.0.ebuild 619 BLAKE2B 134a37f9fe24ac5838d7c472d45f487a75301b0ab95e004b5590301fca3e3618c5912badf7b93a86248ea5cd5097be19fef0dd1452d137588849b8fe0e8a8301 SHA512 7c32b9a15d0fcf07c44e3465987cdbfc4c05c9479b30fb97b5033b839a2540913a9c590d86a4001690b17d055fdac7e0f87c258f49691875f04faabe5163da84
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild b/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
deleted file mode 100644
index e805a50562ac..000000000000
--- a/gnome-base/gnome-mime-data/gnome-mime-data-2.18.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="MIME data for Gnome"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-"
-
-src_prepare() {
-	intltoolize --force || die "intltoolize failed"
-	gnome2_src_prepare
-}
diff --git a/gnome-base/gnome-mime-data/metadata.xml b/gnome-base/gnome-mime-data/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gnome-mime-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome-session-3.24.2-r1 b/gnome-base/gnome-session-3.24.2-r1
new file mode 100644
index 000000000000..b7086586a8a7
--- /dev/null
+++ b/gnome-base/gnome-session-3.24.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) dev-libs/libxslt >=dev-util/intltool-0.40.6 >=sys-devel/gettext-0.10.40 virtual/pkgconfig !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) gnome-base/gnome-common >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome session manager
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-session
+IUSE=doc elibc_FreeBSD ipv6 systemd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2 LGPL-2 FDL-1.1
+RDEPEND=>=dev-libs/glib-2.46.0:2[dbus] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.18.0:3 >=dev-libs/json-glib-0.10 >=gnome-base/gnome-desktop-3.18:3= elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) media-libs/mesa[egl,gles2] media-libs/libepoxy x11-libs/libSM x11-libs/libICE x11-libs/libXau x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk x11-apps/xdpyinfo systemd? ( >=sys-apps/systemd-183:0= ) >=gnome-base/gnome-settings-daemon-3.23.2 >=gnome-base/gsettings-desktop-schemas-0.1.7 x11-themes/adwaita-icon-theme sys-apps/dbus[X] !systemd? ( sys-auth/consolekit >=dev-libs/dbus-glib-0.76 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-session-3.24.2-xorg-default-translations.patch.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=954cf18979ef4fc2e9f553e95133d124
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest
deleted file mode 100644
index 5a1bfe04695c..000000000000
--- a/gnome-base/gnome-session/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX 10-user-dirs-update-gnome-r1 299 BLAKE2B ba1537eb23474b47f69937d38cb5b9f0de56631d06b888292b96fd7179e60593c3b9c6c2da86a589a45ae35ccb0e03f169895462044b9fb3e1d600e768a65da1 SHA512 9e4b7e32546433e913928f0e357eef2936750bea0996dbb33443bc1f2ac32a3e38880abad6985a229382ef06138583de65b6f1e76dea3ac4577e10fec7f46b2a
-AUX 15-xdg-data-gnome-r1 262 BLAKE2B 8ea3192680b1cda2076ebceafd7cd4f340f6f4c5f5bbb309f3dfe5af1d50283ca024a508d0d4dc92a6c5fa65de1489cad55451df3016eae3f5cc4070d16e4c78 SHA512 aecdebbaaad1bd3032d687975017f040b58520fe8d5848dc5fd9b726aba8904dda314a315d3ee33e76bb11eddf8785a939a0a83634d99ba74a0342683840fcbc
-AUX 3.22.3-xorg-default.patch 1929 BLAKE2B 0af17b6f73c4c431c4815dd3f1f23a7aef81727ddc179f3f8ad5aa10875562ecc6904e35ccdc55aae76dc956423bd30c4469768a5797023ab79da7e84d125599 SHA512 025ba94a21a3c42b816083e6d99c85ece695487af1153990c1fec63bbb215284efb95a2c8d505afe36b0e4575b0796ca57fe83ae715a8593c8db886b7eacfca1
-AUX 90-xcursor-theme-gnome 384 BLAKE2B 985ea5b7de4d51b46625c21b803c5d225ac598b81813bb0bf00620a8b825a90f2b54717ed24ca8c9554c3ae6f8dbd75424f2b4ae8c6f38fcb789e655aa35aad6 SHA512 3d692715a744303f31a78ddf7aaefdbece8c50ebc5dfaac84cdfb6430155db465ab0140340eea4b5caf6d4dff030736eca9d028f24ed1d41ebc345fa309a4a4b
-AUX Gnome 2391 BLAKE2B ac78e23bb1172844c1da04a2615f03209b703d25d3e4d8976b7d62cc52fe128b35eb3f9e8f0bf3884f0c444ab2da88eb6ba12d9a852e8a058f4abdcf050dc68c SHA512 a994e811855c822c3f03354ec7608587f4102e6e9039dd35aec75e825b7610b259d4e1e7246cb6136ec2f7a4d27c1859dc02945fb13c448aafc26b8a2dae53a6
-AUX defaults.list-r3 18178 BLAKE2B 77d04148ddb7a1ad76b4c59e3d1bd216791c88bc8b25b6f506e36000279610a8742e9a30b1cda5ad364f562e3ac043a2e887d95dfa82c1aa2f8ed2d255aeb2a7 SHA512 1c8cd1a07f0aaacaef2adf7d009a90996b177b348dd6780fc9692728424d8803e517ae4d357fa2324e447b8d082836b60565497b505d54e0559704757b6ecbf3
-DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc
-DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27
-EBUILD gnome-session-3.24.2-r1.ebuild 4552 BLAKE2B c5aee03290d0fb718777313002f2a3fe2c7df2d6403e00ca1bbcb3105f21fad2eede1f487e1e9b2b06f2554b436d73310ae3fad994a42f92ca64be81b18f5e11 SHA512 e2ebe3cb856799af58998e74a9d642eb0599bfc0ebed80c7e5047977a8337c925c909ed8fb19bea33ffcd93bf7b5f587bb2ec97f4d97942f6b263bb58c866e89
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1 b/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
deleted file mode 100644
index 61fd08c51141..000000000000
--- a/gnome-base/gnome-session/files/10-user-dirs-update-gnome-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# Create various XDG directories, and write ~/.config/user-dirs.dirs, etc.
-# That file is read by glib to get XDG_PICTURES_DIR, etc
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
-	if type xdg-user-dirs-update &>/dev/null; then
-		xdg-user-dirs-update
-	fi
-fi
diff --git a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1 b/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
deleted file mode 100644
index 5eaa6985d9dc..000000000000
--- a/gnome-base/gnome-session/files/15-xdg-data-gnome-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
-	if [ -z "$XDG_DATA_DIRS" ]; then
-		export XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/
-	else
-		export XDG_DATA_DIRS=/usr/share/gnome:"$XDG_DATA_DIRS"
-	fi
-fi
diff --git a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch b/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
deleted file mode 100644
index 02eea39715cc..000000000000
--- a/gnome-base/gnome-session/files/3.22.3-xorg-default.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a709a07bff91a7b2dd4e4a412090850a73937999 Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode@redhat.com>
-Date: Mon, 7 Mar 2016 13:36:32 -0500
-Subject: [PATCH 2/3] data: switch back to Xorg by default
-
-Consensus seems to be that switching to wayland for user sessions
-by default is a bit premature.
-
-This commit moves it back to Xorg by default.
-
-We'll save wayland by default for 3.22
-
-https://bugzilla.gnome.org/show_bug.cgi?id=763266
----
- data/Makefile.am                                         | 4 ++--
- data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
- rename data/{gnome-xorg.desktop.in => gnome-wayland.desktop.in} (85%)
-
-diff --git a/data/Makefile.am b/data/Makefile.am
-index ae08730..d0a7310 100644
---- a/data/Makefile.am
-+++ b/data/Makefile.am
-@@ -9,7 +9,7 @@ hwcompatdir = $(pkgdatadir)
- hwcompat_DATA = hardware-compatibility
- 
- xsessiondir = $(datadir)/xsessions
--xsession_in_files = gnome.desktop.in gnome-xorg.desktop.in
-+xsession_in_files = gnome.desktop.in
- 
- if BUILD_SESSION_SELECTOR
- xsession_in_files += gnome-custom-session.desktop.in
-@@ -18,7 +18,7 @@ endif
- xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
- 
- wayland_sessiondir = $(datadir)/wayland-sessions
--wayland_session_in_files = gnome.desktop.in
-+wayland_session_in_files = gnome-wayland.desktop.in
- wayland_session_DATA = $(wayland_session_in_files:.desktop.in=.desktop)
- 
- sessiondir = $(datadir)/gnome-session/sessions
-diff --git a/data/gnome-xorg.desktop.in b/data/gnome-wayland.desktop.in
-similarity index 85%
-rename from data/gnome-xorg.desktop.in
-rename to data/gnome-wayland.desktop.in
-index d00b3dc..852be87 100644
---- a/data/gnome-xorg.desktop.in
-+++ b/data/gnome-wayland.desktop.in
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--_Name=GNOME on Xorg
-+_Name=GNOME on Wayland
- _Comment=This session logs you into GNOME
- Exec=gnome-session
- TryExec=gnome-session
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-session/files/90-xcursor-theme-gnome b/gnome-base/gnome-session/files/90-xcursor-theme-gnome
deleted file mode 100644
index 13bc453c7854..000000000000
--- a/gnome-base/gnome-session/files/90-xcursor-theme-gnome
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ "$DESKTOP_SESSION" = "gnome" -o "$DESKTOP_SESSION" = "cinnamon" ]; then
-    XCURSOR_THEME=`dconf read /org/gnome/desktop/interface/cursor-theme` 2> /dev/null
-    if [ x"$XCURSOR_THEME" = "x" ]; then
-        export XCURSOR_THEME="Adwaita"
-    else
-        # 'dconf read' wraps string output in single quotes
-        eval export "XCURSOR_THEME=$XCURSOR_THEME"
-    fi
-fi
diff --git a/gnome-base/gnome-session/files/Gnome b/gnome-base/gnome-session/files/Gnome
deleted file mode 100644
index 55d39b633257..000000000000
--- a/gnome-base/gnome-session/files/Gnome
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/sh
-#
-# This file has bitrotted badly. Someone needs to clean this up.
-#
-
-if [ -f /etc/xdg/menus/gnome-applications.menu ] ; then
-	export XDG_MENU_PREFIX=gnome-
-fi
-
-for errfile in "$HOME/.gnomerc-errors" "${TMPDIR-/tmp}/gnomerc-$USER" "/tmp/gnomerc-$USER"
-do
-	if ( cp /dev/null "$errfile" 2> /dev/null )
-	then
-		chmod 600 "$errfile"
-		exec > "$errfile" 2>&1
-		break
-	fi
-done
-#
-#  Distributors:
-#  You should modify the paths here to fit your distro
-#  If you need to do so, send me (jirka@5z.com) a patch
-#  and I'll try to make the script detect the distro stuff
-#
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-userxkbmap=$HOME/.Xkbmap
-
-sysresources=/etc/X11/Xresources
-sysmodmap=/etc/X11/Xmodmap
-sysxkbmap=/etc/X11/Xkbmap
-
-rh6sysresources=/etc/X11/xinit/Xresources
-rh6sysmodmap=/etc/X11/xinit/Xmodmap
-
-if [ -x "$HOME/.gnomerc" ]; then
-	command="$HOME/.gnomerc"
-elif [ -x /etc/X11/gdm/gnomerc ]; then
-	command="/etc/X11/gdm/gnomerc"
-else
-	# as fallback in case the config is screwed
-	command=`which gnome-session`
-fi
-
-# merge in defaults
-if [ -f "$rh6sysresources" ]; then
-    xrdb -merge "$rh6sysresources"
-fi
-
-if [ -f "$sysresources" ]; then
-    xrdb -merge "$sysresources"
-fi
-
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-
-# merge in keymaps
-if [ -f "$sysxkbmap" ]; then
-    setxkbmap `cat "$sysxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-if [ -f "$userxkbmap" ]; then
-    setxkbmap `cat "$userxkbmap"`
-    XKB_IN_USE=yes
-fi
-
-#
-# Eeek, this seems like too much magic here
-#
-if [ -z "$XKB_IN_USE" ] && [ ! -L /etc/X11/X ]; then
-    if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
-       xkbsymbols=`sed -n -e 's/^[     ]*XkbSymbols[   ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
-       if [ -n "$xkbsymbols" ]; then
-           setxkbmap -symbols "$xkbsymbols"
-           XKB_IN_USE=yes
-       fi
-    fi
-fi
-
-# xkb and xmodmap don't play nice together
-if [ -z "$XKB_IN_USE" ]; then
-    if [ -f "$rh6sysmodmap" ]; then
-       xmodmap "$rh6sysmodmap"
-    fi
-
-    if [ -f "$sysmodmap" ]; then
-       xmodmap "$sysmodmap"
-    fi
-
-    if [ -f "$usermodmap" ]; then
-       xmodmap "$usermodmap"
-    fi
-fi
-
-unset XKB_IN_USE
-
-# run all system xinitrc shell scripts.
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-    for i in /etc/X11/xinit/xinitrc.d/* ; do
-        if [ -x "$i" ]; then
-	    . "$i"
-        fi
-    done
-fi
-
-exec $command
diff --git a/gnome-base/gnome-session/files/defaults.list-r3 b/gnome-base/gnome-session/files/defaults.list-r3
deleted file mode 100644
index 5dfa6be6af16..000000000000
--- a/gnome-base/gnome-session/files/defaults.list-r3
+++ /dev/null
@@ -1,335 +0,0 @@
-[Default Applications]
-application/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-abiword=abiword.desktop;
-text/abiword=abiword.desktop;
-text/richtext=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/rtf=abiword.desktop;libreoffice-writer.desktop;openoffice.org-writer.desktop;
-text/x-abiword=abiword.desktop;
-text/x-xml-abiword=abiword.desktop;
-x-content/blank-bd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-dvd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-cd=brasero-org.gnome.Nautilus.desktop;
-x-content/blank-hddvd=brasero-org.gnome.Nautilus.desktop;
-application/x-dia-diagram=dia.desktop;
-image/bmp=eog.desktop;
-image/gif=eog.desktop;
-image/jpeg=eog.desktop;
-image/jpg=eog.desktop;
-image/pjpeg=eog.desktop;
-image/png=eog.desktop;
-image/svg+xml=eog.desktop;
-image/svg+xml-compressed=eog.desktop;
-image/x-bmp=eog.desktop;
-image/x-gray=eog.desktop;
-image/x-icb=eog.desktop;
-image/x-ico=eog.desktop;
-image/x-pcx=eog.desktop;
-image/x-png=eog.desktop;
-image/x-portable-anymap=eog.desktop;
-image/x-portable-bitmap=eog.desktop;
-image/x-portable-graymap=eog.desktop;
-image/x-portable-pixmap=eog.desktop;
-image/x-xbitmap=eog.desktop;
-image/x-xpixmap=eog.desktop;
-image/vnd.wap.wbmp=eog.desktop;
-image/g3fax=gimp.desktop;
-image/x-compressed-xcf=gimp.desktop;
-image/x-fits=gimp.desktop;
-image/x-icon=gimp.desktop;
-image/x-psd=gimp.desktop;
-image/x-sgi=gimp.desktop;
-image/x-sun-raster=gimp.desktop;
-image/x-tga=gimp.desktop;
-image/x-xcf=gimp.desktop;
-image/x-xwindowdump=gimp.desktop;
-application/xhtml+xml=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-text/html=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-application/pdf=evince.desktop;
-application/x-bzpdf=evince.desktop;
-application/x-gzpdf=evince.desktop;
-application/postscript=evince.desktop;
-application/x-bzpostscript=evince.desktop;
-application/x-gzpostscript=evince.desktop;
-image/x-eps=evince.desktop;
-image/x-bzeps=evince.desktop;
-image/x-gzeps=evince.desktop;
-application/x-dvi=evince.desktop;
-application/x-bzdvi=evince.desktop;
-application/x-gzdvi=evince.desktop;
-image/vnd.djvu=evince.desktop;
-image/tiff=evince.desktop;
-application/x-cbr=evince.desktop;
-application/x-cbz=evince.desktop;
-application/x-cb7=evince.desktop;
-application/x-7z-compressed=org.gnome.FileRoller.desktop;
-application/x-7z-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-ace=org.gnome.FileRoller.desktop;
-application/x-alz=org.gnome.FileRoller.desktop;
-application/x-ar=org.gnome.FileRoller.desktop;
-application/x-arj=org.gnome.FileRoller.desktop;
-application/x-bzip=org.gnome.FileRoller.desktop;
-application/x-bzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-bzip1=org.gnome.FileRoller.desktop;
-application/x-bzip1-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cabinet=org.gnome.FileRoller.desktop;
-application/x-cd-image=org.gnome.FileRoller.desktop;
-application/x-compress=org.gnome.FileRoller.desktop;
-application/x-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-cpio=org.gnome.FileRoller.desktop;
-application/x-deb=org.gnome.FileRoller.desktop;
-application/x-ear=org.gnome.FileRoller.desktop;
-application/x-gtar=org.gnome.FileRoller.desktop;
-application/x-gzip=org.gnome.FileRoller.desktop;
-application/x-java-archive=org.gnome.FileRoller.desktop;
-application/x-lha=org.gnome.FileRoller.desktop;
-application/x-lhz=org.gnome.FileRoller.desktop;
-application/x-lzip=org.gnome.FileRoller.desktop;
-application/x-lzip-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzma=org.gnome.FileRoller.desktop;
-application/x-lzma-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-lzop=org.gnome.FileRoller.desktop;
-application/x-lzop-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-rar=org.gnome.FileRoller.desktop;
-application/x-rar-compressed=org.gnome.FileRoller.desktop;
-application/x-rpm=org.gnome.FileRoller.desktop;
-application/x-rzip=org.gnome.FileRoller.desktop;
-application/x-tar=org.gnome.FileRoller.desktop;
-application/x-tarz=org.gnome.FileRoller.desktop;
-application/x-stuffit=org.gnome.FileRoller.desktop;
-application/x-war=org.gnome.FileRoller.desktop;
-application/x-xz=org.gnome.FileRoller.desktop;
-application/x-xz-compressed-tar=org.gnome.FileRoller.desktop;
-application/x-zip=org.gnome.FileRoller.desktop;
-application/x-zip-compressed=org.gnome.FileRoller.desktop;
-application/x-zoo=org.gnome.FileRoller.desktop;
-application/zip=org.gnome.FileRoller.desktop;
-multipart/x-zip=org.gnome.FileRoller.desktop;
-text/plain=org.gnome.gedit.desktop;
-text/css=org.gnome.gedit.desktop;
-text/javascript=org.gnome.gedit.desktop;
-text/markdown=org.gnome.gedit.desktop;
-text/mathml=org.gnome.gedit.desktop;
-text/x-csrc=org.gnome.gedit.desktop;
-text/x-chdr=org.gnome.gedit.desktop;
-text/x-dtd=org.gnome.gedit.desktop;
-text/x-java=org.gnome.gedit.desktop;
-text/x-javascript=org.gnome.gedit.desktop;
-text/x-patch=org.gnome.gedit.desktop;
-text/x-perl=gedit.destkop
-text/x-php=gedit.destkop
-text/x-python=gedit.destkop
-text/x-sql=org.gnome.gedit.desktop;
-text/xml=org.gnome.gedit.desktop;
-application/javascript=gedit.destkop
-application/x-cgi=org.gnome.gedit.desktop;
-application/x-javascript=org.gnome.gedit.desktop;
-application/x-perl=org.gnome.gedit.desktop;
-application/x-php=org.gnome.gedit.desktop;
-application/x-python=org.gnome.gedit.desktop;
-application/xml=org.gnome.gedit.desktop;
-application/xml-dtd=org.gnome.gedit.desktop;
-application/x-font-ttf=org.gnome.font-viewer.desktop;
-application/x-font-pcf=org.gnome.font-viewer.desktop;
-application/x-font-type1=org.gnome.font-viewer.desktop;
-application/x-font-otf=org.gnome.font-viewer.desktop;
-application/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.lotus-1-2-3=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-123=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-applix-spreadsheet=gnumeric.desktop;
-application/x-dbase=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dbf=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-dos_ms_excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-gnumeric=gnumeric.desktop;
-application/x-mps=gnumeric.desktop;
-application/x-ms-excel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-msexcel=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-oleo=gnumeric.desktop;
-application/x-planperfect=gnumeric.desktop;
-application/x-quattropro=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/x-sc=gnumeric.desktop;
-application/x-sylk=gnumeric.desktop;
-application/x-xbase=gnumeric.desktop;
-application/x-xls=gnumeric.desktop;
-application/xls=gnumeric.desktop;
-text/comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/spreadsheet=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/tab-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-comma-separated-values=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-text/x-csv=gnumeric.desktop;libreoffice-calc.desktop;openoffice.org-calc.desktop;
-zz-application/zz-winassoc-xls=gnumeric.desktop;
-x-content/software=nautilus-autorun-software.desktop;
-x-content/unix-software=nautilus-autorun-software.desktop;
-x-directory/gnome-default-handler=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-x-directory/normal=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-inode/directory=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-application/x-gnome-saved-search=nautilus-folder-handler.desktop;org.gnome.Nautilus.desktop;
-application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.sun.xml.calc.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.calc=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.stardivision.chart=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.template.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.ms-excel.sheet.binary.macroenabled.12=libreoffice-calc.desktop;openoffice.org-calc.desktop;
-application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.sun.xml.draw.template=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.stardivision.draw=libreoffice-draw.desktop;openoffice.org-draw.desktop;
-application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.sun.xml.impress.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.stardivision.impress=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/mspowerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.presentation.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.ms-powerpoint.template.macroenabled.12=libreoffice-impress.desktop;openoffice.org-impress.desktop;
-application/vnd.oasis.opendocument.formula=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.sun.xml.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.stardivision.math=libreoffice-math.desktop;openoffice.org-math.desktop;
-application/vnd.oasis.opendocument.text=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.sun.xml.writer.global=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.stardivision.writer=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/msword=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/x-doc=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/wordperfect=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.document.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-application/vnd.ms-word.template.macroenabled.12=libreoffice-writer.desktop;openoffice.org-writer.desktop;
-x-content/audio-player=rhythmbox.desktop;
-x-content/audio-cdda=sound-juicer.desktop;
-application/x-shockwave-flash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/futuresplash=swfdec-player.desktop;firefox.desktop;chromium-browser-chromium.desktop;
-application/mxf=org.gnome.Totem.desktop;
-application/ogg=org.gnome.Totem.desktop;
-application/ram=org.gnome.Totem.desktop;
-application/sdp=org.gnome.Totem.desktop;
-application/smil=org.gnome.Totem.desktop;
-application/smil+xml=org.gnome.Totem.desktop;
-application/vnd.ms-wpl=org.gnome.Totem.desktop;
-application/vnd.rn-realmedia=org.gnome.Totem.desktop;
-application/x-extension-m4a=org.gnome.Totem.desktop;
-application/x-extension-mp4=org.gnome.Totem.desktop;
-application/x-flac=org.gnome.Totem.desktop;
-application/x-flash-video=org.gnome.Totem.desktop;
-application/x-matroska=org.gnome.Totem.desktop;
-application/x-netshow-channel=org.gnome.Totem.desktop;
-application/x-ogg=org.gnome.Totem.desktop;
-application/x-quicktime-media-link=org.gnome.Totem.desktop;
-application/x-quicktimeplayer=org.gnome.Totem.desktop;
-application/x-shorten=org.gnome.Totem.desktop;
-application/x-smil=org.gnome.Totem.desktop;
-application/xspf+xml=org.gnome.Totem.desktop;
-audio/3gpp=org.gnome.Totem.desktop;
-audio/ac3=org.gnome.Totem.desktop;
-audio/AMR=org.gnome.Totem.desktop;
-audio/AMR-WB=org.gnome.Totem.desktop;
-audio/basic=org.gnome.Totem.desktop;
-audio/midi=org.gnome.Totem.desktop;
-audio/mp4=org.gnome.Totem.desktop;
-audio/mpeg=org.gnome.Totem.desktop;
-audio/mpegurl=org.gnome.Totem.desktop;
-audio/ogg=org.gnome.Totem.desktop;
-audio/prs.sid=org.gnome.Totem.desktop;
-audio/vnd.rn-realaudio=org.gnome.Totem.desktop;
-audio/x-ape=org.gnome.Totem.desktop;
-audio/x-flac=org.gnome.Totem.desktop;
-audio/x-gsm=org.gnome.Totem.desktop;
-audio/x-it=org.gnome.Totem.desktop;
-audio/x-m4a=org.gnome.Totem.desktop;
-audio/x-matroska=org.gnome.Totem.desktop;
-audio/x-mod=org.gnome.Totem.desktop;
-audio/x-mp3=org.gnome.Totem.desktop;
-audio/x-mpeg=org.gnome.Totem.desktop;
-audio/x-mpegurl=org.gnome.Totem.desktop;
-audio/x-ms-asf=org.gnome.Totem.desktop;
-audio/x-ms-asx=org.gnome.Totem.desktop;
-audio/x-ms-wax=org.gnome.Totem.desktop;
-audio/x-ms-wma=org.gnome.Totem.desktop;
-audio/x-musepack=org.gnome.Totem.desktop;
-audio/x-pn-aiff=org.gnome.Totem.desktop;
-audio/x-pn-au=org.gnome.Totem.desktop;
-audio/x-pn-realaudio=org.gnome.Totem.desktop;
-audio/x-pn-realaudio-plugin=org.gnome.Totem.desktop;
-audio/x-pn-wav=org.gnome.Totem.desktop;
-audio/x-pn-windows-acm=org.gnome.Totem.desktop;
-audio/x-realaudio=org.gnome.Totem.desktop;
-audio/x-real-audio=org.gnome.Totem.desktop;
-audio/x-sbc=org.gnome.Totem.desktop;
-audio/x-scpls=org.gnome.Totem.desktop;
-audio/x-speex=org.gnome.Totem.desktop;
-audio/x-tta=org.gnome.Totem.desktop;
-audio/x-vorbis=org.gnome.Totem.desktop;
-audio/x-vorbis+ogg=org.gnome.Totem.desktop;
-audio/x-wav=org.gnome.Totem.desktop;
-audio/x-wavpack=org.gnome.Totem.desktop;
-audio/x-xm=org.gnome.Totem.desktop;
-image/vnd.rn-realpix=org.gnome.Totem.desktop;
-image/x-pict=org.gnome.Totem.desktop;
-misc/ultravox=org.gnome.Totem.desktop;
-text/google-video-pointer=org.gnome.Totem.desktop;
-text/x-google-video-pointer=org.gnome.Totem.desktop;
-video/3gpp=org.gnome.Totem.desktop;
-video/dv=org.gnome.Totem.desktop;
-video/fli=org.gnome.Totem.desktop;
-video/flv=org.gnome.Totem.desktop;
-video/mp2t=org.gnome.Totem.desktop;
-video/mp4=org.gnome.Totem.desktop;
-video/mp4v-es=org.gnome.Totem.desktop;
-video/mpeg=org.gnome.Totem.desktop;
-video/msvideo=org.gnome.Totem.desktop;
-video/ogg=org.gnome.Totem.desktop;
-video/quicktime=org.gnome.Totem.desktop;
-video/vivo=org.gnome.Totem.desktop;
-video/vnd.divx=org.gnome.Totem.desktop;
-video/vnd.rn-realvideo=org.gnome.Totem.desktop;
-video/vnd.vivo=org.gnome.Totem.desktop;
-video/webm=org.gnome.Totem.desktop;
-video/x-anim=org.gnome.Totem.desktop;
-video/x-avi=org.gnome.Totem.desktop;
-video/x-flc=org.gnome.Totem.desktop;
-video/x-fli=org.gnome.Totem.desktop;
-video/x-flic=org.gnome.Totem.desktop;
-video/x-flv=org.gnome.Totem.desktop;
-video/x-m4v=org.gnome.Totem.desktop;
-video/x-matroska=org.gnome.Totem.desktop;
-video/x-mpeg=org.gnome.Totem.desktop;
-video/x-ms-asf=org.gnome.Totem.desktop;
-video/x-ms-asx=org.gnome.Totem.desktop;
-video/x-msvideo=org.gnome.Totem.desktop;
-video/x-ms-wm=org.gnome.Totem.desktop;
-video/x-ms-wmv=org.gnome.Totem.desktop;
-video/x-ms-wmx=org.gnome.Totem.desktop;
-video/x-ms-wvx=org.gnome.Totem.desktop;
-video/x-nsv=org.gnome.Totem.desktop;
-video/x-ogm+ogg=org.gnome.Totem.desktop;
-video/x-theora+ogg=org.gnome.Totem.desktop;
-video/x-totem-stream=org.gnome.Totem.desktop;
-x-content/video-dvd=org.gnome.Totem.desktop;
-x-content/video-vcd=org.gnome.Totem.desktop;
-x-content/video-svcd=org.gnome.Totem.desktop;
-x-scheme-handler/ghelp=yelp.desktop;
-x-scheme-handler/help=yelp.desktop;
-x-scheme-handler/http=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/https=firefox.desktop;chromium-browser-chromium.desktop;epiphany.desktop;
-x-scheme-handler/mailto=evolution.desktop;
diff --git a/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild b/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
deleted file mode 100644
index 905dab2736df..000000000000
--- a/gnome-base/gnome-session/gnome-session-3.24.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
-
-DESCRIPTION="Gnome session manager"
-HOMEPAGE="https://git.gnome.org/browse/gnome-session"
-SRC_URI="${SRC_URI}
-	https://dev.gentoo.org/~leio/distfiles/${P}-xorg-default-translations.patch.xz"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="doc elibc_FreeBSD ipv6 systemd"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-# gdk-pixbuf used in the inhibit dialog
-COMMON_DEPEND="
-	>=dev-libs/glib-2.46.0:2[dbus]
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.18.0:3
-	>=dev-libs/json-glib-0.10
-	>=gnome-base/gnome-desktop-3.18:3=
-	elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
-
-	media-libs/mesa[egl,gles2]
-
-	media-libs/libepoxy
-	x11-libs/libSM
-	x11-libs/libICE
-	x11-libs/libXau
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	x11-apps/xdpyinfo
-
-	systemd? ( >=sys-apps/systemd-183:0= )
-"
-# Pure-runtime deps from the session files should *NOT* be added here
-# Otherwise, things like gdm pull in gnome-shell
-# gnome-themes-standard is needed for the failwhale dialog themeing
-# sys-apps/dbus[X] is needed for session management
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-settings-daemon-3.23.2
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	x11-themes/adwaita-icon-theme
-	sys-apps/dbus[X]
-	!systemd? (
-		sys-auth/consolekit
-		>=dev-libs/dbus-glib-0.76
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	>=sys-devel/gettext-0.10.40
-	virtual/pkgconfig
-	!<gnome-base/gdm-2.20.4
-	doc? (
-		app-text/xmlto
-		dev-libs/libxslt )
-	gnome-base/gnome-common
-"
-# gnome-common needed for eautoreconf
-# gnome-base/gdm does not provide gnome.desktop anymore
-
-PATCHES=(
-	# Restore Xorg as the default GNOME session instead of Wayland for the 3.24 release, bug 641988
-	"${FILESDIR}/3.22.3-xorg-default.patch" # remove ewarn about this below when removing for 3.26; also eautoreconf if possible
-	"${WORKDIR}/${P}-xorg-default-translations.patch"
-)
-
-src_configure() {
-	# 1. Avoid automagic on old upower releases
-	# 2. xsltproc is always checked due to man configure
-	#    switch, even if USE=-doc
-	# 3. Disable old gconf support as other distributions did long time
-	#    ago
-	gnome2_src_configure \
-		--disable-deprecation-flags \
-		--disable-gconf \
-		--enable-session-selector \
-		$(use_enable doc docbook-docs) \
-		$(use_enable ipv6) \
-		$(use_enable systemd) \
-		$(use_enable !systemd consolekit) \
-		UPOWER_CFLAGS="" \
-		UPOWER_LIBS=""
-		# gnome-session-selector pre-generated man page is missing
-		#$(usex !doc XSLTPROC=$(type -P true))
-}
-
-src_install() {
-	gnome2_src_install
-
-	dodir /etc/X11/Sessions
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}/Gnome"
-
-	insinto /usr/share/applications
-	newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome
-
-	# This should be done here as discussed in bug #270852
-	newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome
-
-	# Set XCURSOR_THEME from current dconf setting instead of installing
-	# default cursor symlink globally and affecting other DEs (bug #543488)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=711703
-	newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ewarn "The Gentoo GNOME team has decided to retain Xorg session default instead of"
-	ewarn "Wayland for GNOME 3.24 stable version, even if USE=wayland is set on applicable"
-	ewarn "packages. You can still choose the 'GNOME on Wayland' session explicitly, if"
-	ewarn "desired. GNOME 3.26 will default to Wayland again as upstream GNOME does, if"
-	ewarn "USE=wayland is used globally, but 'GNOME on Xorg' session will remain a choice."
-	ewarn "Default enabling USE=wayland via gnome profiles is planned with 3.26 as well."
-
-	if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then
-		ewarn "If you use a custom .xinitrc for your X session,"
-		ewarn "make sure that the commands in the xinitrc.d scripts are run."
-	fi
-}
diff --git a/gnome-base/gnome-session/metadata.xml b/gnome-base/gnome-session/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gnome-session/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome-settings-daemon-3.24.4 b/gnome-base/gnome-settings-daemon-3.24.4
new file mode 100644
index 000000000000..433e2c9d305d
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon-3.24.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) cups? ( sys-apps/sed ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/pygobject:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/dbusmock[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) gnome-base/gnome-session ) dev-libs/libxml2:2 sys-devel/gettext >=dev-util/intltool-0.40 virtual/pkgconfig x11-base/xorg-proto >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gnome Settings Daemon
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-settings-daemon
+IUSE=+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.44.0:2[dbus] >=x11-libs/gtk+-3.15.3:3[X,wayland?] >=gnome-base/gnome-desktop-3.11.1:3= >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/librsvg-2.36.2:2 media-fonts/cantarell media-libs/alsa-lib media-libs/fontconfig media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-2 >=sys-power/upower-0.99:= x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3:= x11-libs/libX11 x11-libs/libxkbfile x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXtst x11-libs/libXxf86misc x11-misc/xkeyboard-config >=app-misc/geoclue-2.3.1:2.0 >=dev-libs/libgweather-3.9.5:2= >=sci-geosciences/geocode-glib-3.10 >=sys-auth/polkit-0.103 colord? ( >=media-libs/lcms-2.2:2 >=x11-misc/colord-1.0.2:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/pango-1.20 x11-drivers/xf86-input-wacom virtual/libgudev:= ) networkmanager? ( >=net-misc/networkmanager-1.0 ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( virtual/libgudev:= ) wayland? ( dev-libs/wayland ) gnome-base/dconf !openrc-force? ( sys-apps/systemd ) !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3 !<gnome-base/gnome-session-3.23.2
+REQUIRED_USE=input_devices_wacom? ( udev ) smartcard? ( udev ) wayland? ( udev )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-settings-daemon-3.24.4-patchset.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	udev	79c22815770535c8ae27f6f356559a88	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0aace946b266355d0d1786ec34911234
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
deleted file mode 100644
index cb632e8c70a6..000000000000
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb
-DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0
-EBUILD gnome-settings-daemon-3.24.4.ebuild 4686 BLAKE2B 8feb81d9bc098af7247f182b22aa326813bb6aa0d08355aa2b1b74637089898a124e246758e0f7f0fb9fff855e60190f3b5b6fa516d7e2e18d45e307f116f58f SHA512 b9f7048dd90ca9c1a9f081e677ce2da682aa68b498e708341e927a59638cff3782c06005cbb85023e6b17809126a13528205734e1fbfb2773a436f9506f60f65
-MISC metadata.xml 591 BLAKE2B 6dfcef2c04291096bef621cb68ed9f2fa2c379920fb2072783b6245673fb37a6b6903d80ac8da46439a6a6be81372a3474585abbe4234559b558f48c3e23a1a6 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
deleted file mode 100644
index 30c725168566..000000000000
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 systemd udev virtualx
-
-DESCRIPTION="Gnome Settings Daemon"
-HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland"
-REQUIRED_USE="
-	input_devices_wacom? ( udev )
-	smartcard? ( udev )
-	wayland? ( udev )
-"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2[dbus]
-	>=x11-libs/gtk+-3.15.3:3[X,wayland?]
-	>=gnome-base/gnome-desktop-3.11.1:3=
-	>=gnome-base/gsettings-desktop-schemas-3.23.3
-	>=gnome-base/librsvg-2.36.2:2
-	media-fonts/cantarell
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libcanberra[gtk3]
-	>=media-sound/pulseaudio-2
-	>=sys-power/upower-0.99:=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/libnotify-0.7.3:=
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-libs/libXi
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXtst
-	x11-libs/libXxf86misc
-	x11-misc/xkeyboard-config
-
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/libgweather-3.9.5:2=
-	>=sci-geosciences/geocode-glib-3.10
-	>=sys-auth/polkit-0.103
-
-	colord? (
-		>=media-libs/lcms-2.2:2
-		>=x11-misc/colord-1.0.2:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/pango-1.20
-		x11-drivers/xf86-input-wacom
-		virtual/libgudev:= )
-	networkmanager? ( >=net-misc/networkmanager-1.0 )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( virtual/libgudev:= )
-	wayland? ( dev-libs/wayland )
-"
-# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
-# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
-# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
-# systemd needed for power and session management, bug #464944
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/dconf
-	!openrc-force? ( sys-apps/systemd )
-	!<gnome-base/gnome-control-center-2.22
-	!<gnome-extra/gnome-color-manager-3.1.1
-	!<gnome-extra/gnome-power-manager-3.1.3
-	!<gnome-base/gnome-session-3.23.2
-"
-# xproto-7.0.15 needed for power plugin
-DEPEND="${COMMON_DEPEND}
-	cups? ( sys-apps/sed )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
-		$(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]')
-		gnome-base/gnome-session )
-	dev-libs/libxml2:2
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-# TypeErrors with python3; weird test errors with python2; all in power component that was made required now
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	# Make colord and wacom optional; requires eautoreconf
-	# Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf
-	# Reduce memory usage by not initing GTK+ where not needed
-	# Reduce memory usage by using a fake CSS theme instead of full Adwaita for GTK+ needing plugins; requires eautoreconf
-	# Fix build system to require gudev with wayland, bug #627966
-	"${WORKDIR}"/patches/
-)
-
-python_check_deps() {
-	if use test; then
-		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" &&
-		has_version "dev-python/dbusmock[${PYTHON_USEDEP}]"
-	fi
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable debug more-warnings) \
-		$(use_enable networkmanager network-manager) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable udev gudev) \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable wayland)
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow the this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml
deleted file mode 100644
index 7ddc604ee2fa..000000000000
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="colord">Support color management using
-			<pkg>x11-misc/colord</pkg></flag>
-		<flag name="openrc-force">Skip systemd dependency (#480336),
-			enabling this flag will become your setup to be fully
-			unsupported by upstream and downstream Gnome team. Do not
-			try to enable it unless completely needed</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-shell-3.22.3 b/gnome-base/gnome-shell-3.22.3
new file mode 100644
index 000000000000..0e3f0c315e6b
--- /dev/null
+++ b/gnome-base/gnome-shell-3.22.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 >=dev-util/gtk-doc-am-1.17 gnome-base/gnome-common >=sys-devel/gettext-0.19.6 virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~alpha ~arm
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
+RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.22.1[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.3.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aa06cf8320df81f6602730ddb0f11685
diff --git a/gnome-base/gnome-shell-3.24.3 b/gnome-base/gnome-shell-3.24.3
new file mode 100644
index 000000000000..1fbd204eaeb7
--- /dev/null
+++ b/gnome-base/gnome-shell-3.24.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.24.0:0/0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) dev-libs/libxslt >=dev-util/gdbus-codegen-2.45.3 >=dev-util/gtk-doc-am-1.17 gnome-base/gnome-common sys-devel/autoconf-archive >=sys-devel/gettext-0.19.6 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.45.3:2[dbus] >=dev-libs/gjs-1.47.0 >=dev-libs/gobject-introspection-1.49.1:= dev-libs/libical:= >=x11-libs/gtk+-3.15.0:3[introspection] >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.21.3 >=gnome-extra/evolution-data-server-3.17.2:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.24.0:0/0[introspection] >=x11-libs/startup-notification-0.11 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/dbus-glib dev-libs/libxml2:2 media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8:=[introspection] ) nsplugin? ( >=dev-libs/json-glib-0.13.2 ) app-accessibility/at-spi2-core:2[introspection] >=app-accessibility/caribou-0.4.8 dev-libs/libgweather:2[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu >=x11-themes/adwaita-icon-theme-3.19.90 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f4a23f62fa7b5948a97a9d719b5756d
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
deleted file mode 100644
index ecf16323e3ae..000000000000
--- a/gnome-base/gnome-shell/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gnome-shell-3.12-bluetooth-flag.patch 1894 BLAKE2B a53360d103faf25aa605cd5c73eeb892ce667f57313fbd90bdcf176151158b1389ba49becd4421d825e5d63d4dcb0a2e99618f3558de87f0afe2b46851a353f0 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80
-AUX gnome-shell-3.22.0-defaults.patch 1228 BLAKE2B 9bb49d830c2bbc36123ca8fdddc02d4b750a5ffd174fa653ead26a75dc9478be4b5a39c31a004a3897655aae097c23f511d6bb494b0aede51fea74294be3fcf6 SHA512 f350324af68de8f7ae9dab609fdb81e272f9d545a125f3da85d9f06e4a0de09f857517d6c7a585ff1ea3b56f4d51b049cbeb62c39472d61d45026331104c5af5
-AUX gnome-shell-3.22.0-gir-build-fix.patch 882 BLAKE2B 62a816accf06abd182d1381326ad2059a59b3ff9579475b160d9c6fa715acfcf0f3d9d3544bc435b13fcdd45cf420b761ea6681718e540a39533f615b7aa0214 SHA512 b534134cc76dce49c78621d9245e9c457f4eefc3ac89dc09f036a178524b0ad3608683f43a0920fdb1d36410aebbfdecd701725217b6239f4549ef4ba82b7213
-DIST gnome-shell-3.22.3.tar.xz 1952576 BLAKE2B 26d974bc45b93342db3d23f9a999734b571c6819c1fdddc20e019e282bcfbdf6d9f40850667756046187e0e3a52a57ba60962cc49b7b4b49909ec5f992e518e6 SHA512 47d67910b321a182d3ecd41f20cd923ec433cc93ab04b0b31351ca0229505ecbf343b1307585e557ee757845dc09b2371b0c2197717ed532b71878c186337ee9
-DIST gnome-shell-3.24.3.tar.xz 1982088 BLAKE2B 608b3e73d546dea543a23c31a64b03c32f35d118cd79fd0371a9e392377b4dd03bc16413443d643ed604a2fa81c2838939d92ef4c89a54469a8bd83dc9661f8f SHA512 369ed80b975369b79d4ac9b3f1fbd469fdde331e9079d09eeac6398a9b3c349b09f7570dfce1ed6e1cdfaf514b4b40c6038f34b6c3c7928470b2cd65b702ff15
-EBUILD gnome-shell-3.22.3.ebuild 6847 BLAKE2B edb25faf602ece895a316042dd62896d84755f17f26f51a217c748b653e3ca729aae959c8a2fb39d51da654ee9f961855f69f43d15ad9777d1b6b0d22c10b212 SHA512 b0cb683473ec3a3dcffb1dd9fee56a6b9ec4dfe6f311a523c3920cbb690a69d5e4e73643bde1c6eb3faf4f4a6bb8337640d42ce92b2b8fd08b26e39666449ad3
-EBUILD gnome-shell-3.24.3.ebuild 6605 BLAKE2B 4122c4a9ac2bd12ee622393b0d82910de449ffc854c8e3c20c49e512543bc61821cc0f813a868a2f1732165d19b8767fd37ecbf68834227851264a4375d8386a SHA512 7c025fcdecdc2e77888a20b827448f5abaa3335a84d0c04d88bc77dccade30fcd30693a3c8b0c3e377f197a5a85ce52fa07c8b60e58341b4166f794a54813bc1
-MISC metadata.xml 738 BLAKE2B f379ab17d70d0241fffcef221940031cf797d3393c903fcc75c847e4bd985242c124b598e61ae50bce7e58ababe8595533bf3fb52fea47d75712eaa2af291492 SHA512 02db87e2ac6c43ed104ae911de8caf78632b861c4efd3bbf5b0cf7dfab1d4d79e023b724b140ca86e72961c06454479f4d814ad1ae5dfd481bfbc7a45af0c18b
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
deleted file mode 100644
index 2fa93af25cd0..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Thu, 28 Feb 2013 18:48:32 +0330
-Subject: [PATCH 2/3] Make bluetooth support optional
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 16 +++++++++++++---
- 1 file changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9a30e65..aa710f0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
- ])
- AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
- 
-+AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth],
-+	AS_HELP_STRING([--without-bluetooth],
-+		[Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
--        [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
--	 AC_SUBST([HAVE_BLUETOOTH],[1])],
-+	[AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-+	 AC_SUBST([HAVE_BLUETOOTH],[1])
-+	 AC_MSG_RESULT([yes])],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
--	 AC_SUBST([HAVE_BLUETOOTH],[0])])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
- AC_SUBST(CALENDAR_SERVER_CFLAGS)
--- 
-1.9.0
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
deleted file mode 100644
index b80dbc3a0dce..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-defaults.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7a671f99b7ef2d5f38be67668aac762764b32a42 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 10 Dec 2013 23:33:51 +0100
-Subject: [PATCH 1/2] Alter list of default applications
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- data/org.gnome.shell.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
-index c1e6b21..368c654 100644
---- a/data/org.gnome.shell.gschema.xml.in
-+++ b/data/org.gnome.shell.gschema.xml.in
-@@ -31,7 +31,7 @@
-       </description>
-     </key>
-     <key name="favorite-apps" type="as">
--      <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-+      <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
-       <summary>List of desktop file IDs for favorite applications</summary>
-       <description>
-         The applications corresponding to these identifiers
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
deleted file mode 100644
index b0c5fb769e8f..000000000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 12 Nov 2016 00:21:25 +0100
-Subject: [PATCH] Add missing rpath to point to mutter specific libraries
-
-Reported-By: AlphatPC@gmail.com
-X-Gentoo-Bug: 597842
-X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e9aacfe..fd98ba5 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in stamp-shell-enum-types.h
- 	rm -f $(@F).tmp
- EXTRA_DIST += shell-enum-types.c.in
- 
--libgnome_shell_ldflags = -avoid-version
-+libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR)
- libgnome_shell_libadd =		\
- 	-lm			\
- 	$(GNOME_SHELL_LIBS)	\
--- 
-2.10.1
-
diff --git a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
deleted file mode 100644
index 9d87933477f9..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.22.3.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit autotools gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +ibus +networkmanager nsplugin -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha ~arm"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.45.3:2[dbus]
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-1.49.1:=
-	dev-libs/libical:=
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.22.1[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8:=[introspection] )
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session is needed for gnome-session-quit
-# 3. Control shell settings
-# 4. Systemd needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-# 8. IBus is needed for nls integration
-RDEPEND="${COMMON_DEPEND}
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	dev-libs/libgweather:2[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	>=x11-themes/adwaita-icon-theme-3.19.90
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	>=dev-util/gtk-doc-am-1.17
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Change favorites defaults, bug #479918
-	eapply "${FILESDIR}"/${PN}-3.22.0-defaults.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	eapply "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-
-	# Add missing path to libmutter-clutter when building .gir, bug #597842
-	eapply "${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		$(use_enable nsplugin browser-plugin) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
-		ewarn "drivers."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
deleted file mode 100644
index 7dff8d524124..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.24.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +browser-extension +ibus +networkmanager nsplugin -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.45.3:2[dbus]
-	>=dev-libs/gjs-1.47.0
-	>=dev-libs/gobject-introspection-1.49.1:=
-	dev-libs/libical:=
-	>=x11-libs/gtk+-3.15.0:3[introspection]
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.21.3
-	>=gnome-extra/evolution-data-server-3.17.2:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.24.0:0/0[introspection]
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8:=[introspection] )
-	nsplugin? ( >=dev-libs/json-glib-0.13.2 )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Introspection stuff needed via imports.gi.*
-# 2. gnome-session is needed for gnome-session-quit
-# 3. Control shell settings
-# 4. Systemd needed for suspending support
-# 5. xdg-utils needed for xdg-open, used by extension tool
-# 6. adwaita-icon-theme and dejavu font neeed for various icons & arrows
-# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-# 8. IBus is needed for nls integration
-RDEPEND="${COMMON_DEPEND}
-	app-accessibility/at-spi2-core:2[introspection]
-	>=app-accessibility/caribou-0.4.8
-	dev-libs/libgweather:2[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99:=[introspection]
-	x11-libs/pango[introspection]
-	gnome-base/librsvg:2[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	>=x11-themes/adwaita-icon-theme-3.19.90
-
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?,networkmanager(+)?]
-	browser-extension? ( gnome-extra/chrome-gnome-shell )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gdbus-codegen-2.45.3
-	>=dev-util/gtk-doc-am-1.17
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Change favorites defaults, bug #479918
-	"${FILESDIR}"/${PN}-3.22.0-defaults.patch
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	"${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-	# Add missing path to libmutter-clutter when building .gir, bug #597842
-	"${FILESDIR}"/${PN}-3.22.0-gir-build-fix.patch
-)
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		$(use_enable nsplugin browser-plugin) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	elif has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	else
-		pax-mark m "${ED}usr/bin/gnome-shell"{,-extension-prefs}
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa if you do not have hardware 3D setup."
-	fi
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=563084
-	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
-		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
-		ewarn "otherwise Gnome will fail to start"
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "https://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome-shell/metadata.xml b/gnome-base/gnome-shell/metadata.xml
deleted file mode 100644
index 3d91d2b59fe4..000000000000
--- a/gnome-base/gnome-shell/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="browser-extension">Ensure the presence of extensions.gnome.org
-		native connector <pkg>gnome-extra/chrome-gnome-shell</pkg></flag>
-	<flag name="ibus">Enable support for enhanced input methods through
-		<pkg>app-i18n/ibus</pkg></flag>
-	<flag name="openrc-force">Skip systemd dependency (#480336),
-		enabling this flag will become your setup to be fully
-		unsupported by upstream and downstream Gnome team. Do not
-		try to enable it unless completely needed</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gnome-vfs-2.24.4-r5 b/gnome-base/gnome-vfs-2.24.4-r5
new file mode 100644
index 000000000000..ee17f08c2997
--- /dev/null
+++ b/gnome-base/gnome-vfs-2.24.4-r5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=gnome-base/gconf-2.32.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.100.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( >=sys-apps/acl-2.2.52-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnome-extra/gnome-vfs-sftp ) ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gettext gnome-base/gnome-common >=dev-util/intltool-0.40 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/gtk-doc-am-1.13 >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gnome Virtual Filesystem
+EAPI=5
+HOMEPAGE=https://www.gnome.org/
+IUSE=acl gnutls ipv6 kerberos libressl samba ssl zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=gnome-base/gconf-2.32.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.100.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( >=sys-apps/acl-2.2.52-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/attr-2.4.47-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !gnome-extra/gnome-vfs-sftp ) ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=2
+SRC_URI=mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=78f374b9c1ed8f1365b11fc11a74c351
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
deleted file mode 100644
index f4a6703a8e8a..000000000000
--- a/gnome-base/gnome-vfs/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX gnome-vfs-2.12.0-afs.patch 663 BLAKE2B 790fc4d85bebee9d3be52a0d6704030c71458477142169879e37c999f31c22866194080956f9fcca33165671df9a5277ccea2209eb9044e6f3bad96e6fcff1ec SHA512 38b1268e774ba2e7726295ee019f939b9dfc5d1a67f8e45d9bc30a2ae20f647acd9570740ad06cb17d83d9299f863aa14dd77a2ca2f9f4910b9c328111ae5ca1
-AUX gnome-vfs-2.15.2-headers-define.patch 569 BLAKE2B eb8b7b640e97e19a157f701d1cd721f39fefb2d2a39727a75bae145c5c0d0fd05419abec4aae0bc62ec3ae42361ebbe13d78dc3d932e4eca58c06bd2db45a523 SHA512 fc4c512ffe74368e83026b24d32c2c77a41f0430d24e782586938dde6061cbc023adcbe2bc21a19d2b584b6c22078ae6d3df7c839576270055aa6832337df60a
-AUX gnome-vfs-2.16.0-no-dbus-crash.patch 710 BLAKE2B f73c2ffc1480ad1e0b94bc476965a1da989635bdcc34aeb65670e6548403bd32abc644b8eed1da0e8d5498484c855b10efe721b04f08b188198002fc49997434 SHA512 527c24b8902c9a1049b08f6479d32674c8f382a9ae4d7c6f3de772c09347555fda680a3dbfe70fcc312db8aa939ccbc4a42d1a84fd6a9f4a51180943766f5261
-AUX gnome-vfs-2.20.0-automagic-deps.patch 2008 BLAKE2B ff25a966da246a795cab5f76db474041eacd245ae17496ef1328f9d7c2db10708cead3feaf45ff6da52c69752cf20596f7411f4261ea98e68ce45c0a3ba21b64 SHA512 32cd2438a7b8d08a827ad8fc6118f67f14e4a67a176adfe3d6e5cc5a97934733c337d6bee41f06ab47920032fed0fd4cd5e761f9ad4ddc0617a2005f21bbf2ec
-AUX gnome-vfs-2.20.1-automagic-deps.patch 643 BLAKE2B 7f9c6d06be805ecc325a235b6705945bb488a6565e93a1b8939faf09c754f463e4f23568644ed1b6956d2f8130a493a560783c88c2877697bd426b98c73f4cb0 SHA512 95ffa05d5212fd6156611e021a2dcd9ec940b6aa74c85d3c8a3ba01d840578af1f1af459ab724559b5a6331a757a74f1fa284455fce2c311c39e1855556bd745
-AUX gnome-vfs-2.24.0-uuid-mount.patch 2452 BLAKE2B 9607e8f7641799dbb46e29bfd7623815fa4066685b10d2cb232e556998f76970097d1bda65554c8c85961e729c269b8a7a6210f2532605cbf7cd16c501444574 SHA512 f66dbba17937b2b1b00aed3804d0b927cd65a2f462853069e62d7973d3f3d88c2a0a2d153e1c95c27ecdf363ff0530f0e8d9849e7b168815ca3f1ad0baf98b96
-AUX gnome-vfs-2.24.4-automake-1.13.patch 840 BLAKE2B fcdd3d1728f95b5b30246fa7471819d00ac2f689d957b665dbd16f2c84ec2e4afb4e2bfac9ca3d3eda4cd42be84c58402aacab1a7e2a503cf9802b5fce5001d7 SHA512 88e9ef1ff7cb513d576fa8d6441ff10c5072f277aef65f107c4f742690db9a4ebee0c986c3773d2055538c771672de84c3d08435cb1f8329dae633db395ae639
-AUX gnome-vfs-2.24.4-build-tests-asneeded.patch 632 BLAKE2B 21ff1b1b0d077f43e15989944c337f94b0ddaf5d69cc966d248404fd19afe2dd3a24eb589fff040a4993ed9f4da3692fda81851c0da4342ba89cee0bded387a3 SHA512 e9afd45ccbe6552daedc20403a0ea892a3dbf039439acc1bcabbecdcac57e808828a83076a6a29492ac74fa81b3f47a02b9d9d2a2387e445b03c8bf4f96e3bab
-AUX gnome-vfs-2.24.4-disable-test-async-cancel.patch 689 BLAKE2B e09b96510144b96385e55ef2d47dfbbcaacd662d327a57f2c04636cfa13971c12cc20c00a681a206515c098464c5956cd736331f0ae10cb0677b06b69ad341ae SHA512 434a3491b55cfdd581bf3f542d464844941af72daa6933d957a85120d17ee72fff59e9d98e303bd17a3fd9f1694506186a52309d2ec3077680f7d45759e4ae77
-AUX gnome-vfs-2.24.4-gnutls27.patch 3235 BLAKE2B f6874c9edf48200bcfb7028ef64235fd902a94490995638add7118c1e34b88e197daeca96083cbb21725bb265f62612622b1f24039028baf61ab2dc0158d3ec4 SHA512 a17ea282f22e22c2390c3a53efab2c99a3fbb2ee370c0c1a19a477ff76bdeae483bf1886f09680681b824254c14a8a411470c95319c4f3d5a7775f4369935b25
-AUX gnome-vfs-2.24.4-gnutls34.patch 1624 BLAKE2B 9b29ee3e95ad79f31a9d4adc494aa6b0587a85c308769238607be5a7284a2dfdf13cf33ae14a35624596414af1383a5fa9c647076c016fc6e86942ed8352bc8e SHA512 adbbe966be3f7193c838794fc8a8949433377c6730c55ed152c345858b4da3f97f5c372d6b4555814ea10f5c65b52cb8a625563a0329604a9d61ce57b08de620
-AUX gnome-vfs-2.24.4-home_dir_fakeroot.patch 4996 BLAKE2B 9883ef67221c053df5ad2d3f70e3f7c3f1916660cb35dd82a0dc52008ffd1a780f685a7af82a2dda1ec25aae5d1f024322b3a8c20bd8d48227405d0c1c357b48 SHA512 dcad32f15afaa7677c6d10672c06c6d635a17d2bb686883c94f42bfc4f9fc6c525c4f097c3af718020fd224e06bba0d0a4ec68cde431545e9fe4a2c65320a48f
-DIST gnome-vfs-2.24.4.tar.bz2 1890370 BLAKE2B 696c8ce479de5a15660c9cc79eeb1abb6d69716f68558c7f791a3a44a7f1e9d09d9bc9adcca11dabd745f36a70222817b68888f3c56839add737b802aba0e7ac SHA512 db4e49f5356647667c4d40c7ce5c299c934cb41069b2086fb89c4e87b2202b5009616d65c1dafeb93e37033a5a68965342c2b18d87b8a3265c4347dec5128581
-EBUILD gnome-vfs-2.24.4-r5.ebuild 4161 BLAKE2B 60cffdf3f01bbe0f1cdfbde6a1775485fd13bae61bdbc62e9f83ee1fff4824b7fb51545c4225d736f35e8800886f27f00b00e3395fed6bb68b2afd1249c9349c SHA512 cedf37cdabd94bdcbd3d30b228d3f789f8b221c60b01993f869c64eb28d440f7f0177844b366c6dd602d759a53cb5a1a07b80b40f633e0080a4e28ad9c27fd83
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
deleted file mode 100644
index cdc88c24b6a3..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.12.0-afs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c
---- gnome-vfs-2.12.0/libgnomevfs/gnome-vfs-filesystem-type.c	2005-08-23 01:34:36.000000000 +0800
-+++ gnome-vfs-2.12.0-patched/libgnomevfs/gnome-vfs-filesystem-type.c	2005-09-18 20:30:47.000000000 +0800
-@@ -35,7 +35,7 @@
- 
- static struct FSInfo fs_data[] = {
- 	{ "affs"     , N_("AFFS Volume"), 0},
--	{ "afs"      , N_("AFS Network Volume"), 0 },
-+	{ "afs"      , N_("AFS Network Volume"), 1 },
- 	{ "auto"     , N_("Auto-detected Volume"), 0 },
- 	{ "cd9660"   , N_("CD-ROM Drive"), 0 },
- 	{ "cdda"     , N_("CD Digital Audio"), 0 },
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
deleted file mode 100644
index f74db8edb1cd..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.15.2-headers-define.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in	2006-06-13 00:36:14.000000000 -0500
-+++ configure.in	2006-06-13 00:54:15.000000000 -0500
-@@ -191,6 +191,16 @@
- 
- AC_CHECK_HEADERS(sys/param.h sys/resource.h sys/vfs.h sys/mount.h sys/statfs.h sys/statvfs.h sys/param.h wctype.h sys/poll.h poll.h)
- 
-+AC_CHECK_HEADERS([pwd.h])
-+if test "$ac_cv_header_pwd_h" = "yes"; then
-+	AC_DEFINE(HAVE_PWD_H, [1], [pwd.h present])
-+fi
-+
-+AC_CHECK_HEADERS([grp.h])
-+if test "$ac_cv_header_grp_h" = "yes"; then
-+	AC_DEFINE(HAVE_GRP_H, [1], [grp.h present])
-+fi
-+
- dnl
- dnl file system type member in statfs struct
- dnl
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
deleted file mode 100644
index 6905060a4f71..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.16.0-no-dbus-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c
---- gnome-vfs-2.16.0.orig/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-07-07 04:46:39.000000000 -0400
-+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-21 11:22:49.000000000 -0400
-@@ -236,6 +236,8 @@
- gnome_vfs_volume_monitor_client_init (GnomeVFSVolumeMonitorClient *volume_monitor_client)
- {
- 	setup_dbus_connection (volume_monitor_client);
-+	if (!volume_monitor_client->dbus_conn)
-+		return;
- 	read_drives_from_daemon (volume_monitor_client);
- 	read_volumes_from_daemon (volume_monitor_client);
- }
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
deleted file mode 100644
index 876148b891f4..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.0-automagic-deps.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Index: configure.in
-===================================================================
---- configure.in	(révision 5413)
-+++ configure.in	(copie de travail)
-@@ -448,9 +448,13 @@
- dnl GSSAPI
- dnl Check for Kerberos installation
- have_gssapi=no
-+
-+AC_ARG_ENABLE(krb5,
-+	      AS_HELP_STRING([--enable-krb5],[Enable Kerberos 5 support]),
-+	      [],[enable_krb5=yes])
- AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
--					   
--if test "x$KRB5_CONFIG" != "xnone"; then
-+
-+if test "x$KRB5_CONFIG" != "xnone" -a "x$enable_krb5" = "xyes"; then
-    GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
-    GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
-    
-@@ -481,8 +485,12 @@
-      break
-    ])
-    LIBS="$saved_LIBS" 
--   CPPFLAGS="$saved_CPPFLAGS" 
--fi   
-+   CPPFLAGS="$saved_CPPFLAGS"
-+fi
-+
-+if test "x$KRB5_CONFIG" = "xnone" -a "x$enable_krb5" = "xyes"; then
-+	AC_MSG_ERROR([*** kerberos 5 support enabled but krb5-config not found ***])
-+fi
- AC_SUBST(GSSAPI_LIBS)
- AC_SUBST(GSSAPI_CFLAGS)
- 	   
-@@ -1077,9 +1085,13 @@
- dnl =====================
- dnl ACL checks
- dnl =====================
--acl_backends=""
-+acl_backends="none"
- ACL_LIBS=""
- 
-+AC_ARG_ENABLE(acl,
-+	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
-+	    [],[enable_acl=yes])
-+
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1102,7 +1114,7 @@
- gvfs_cv_HAVE_POSIX_ACLS=yes, gvfs_cv_HAVE_POSIX_ACLS=no)
- 		LIBS=$acl_LIBS])
- 
--if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_SOLARIS_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
-     have_solaris_acl_support=yes
-     acl_backends="solaris"
- 
-@@ -1110,7 +1122,7 @@
-     AC_CHECK_HEADERS([pwd.h grp.h])
- fi
- 
--if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" ; then
-+if test x"$gvfs_cv_HAVE_POSIX_ACLS" = x"yes" -a x"$enable_acl" = x"yes"; then
-     have_posix_acl_support=yes
-     acl_backends="posix"
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
deleted file mode 100644
index 11ac34c07214..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.20.1-automagic-deps.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.in.	2007-11-30 04:15:01.000000000 +0100
-+++ configure.in	2007-11-30 04:16:21.000000000 +0100
-@@ -1102,6 +1102,7 @@
- 	    AS_HELP_STRING([--disable-acl],[Don't use libacl support]),
- 	    [],[enable_acl=yes])
- 
-+if test "x$enable_acl" = "xyes"; then
- AC_CHECK_LIB(attr,getxattr,[ACL_LIBS="$ACL_LIBS -lattr"])
- AC_CHECK_LIB(acl,acl_get_file,[ACL_LIBS="$ACL_LIBS -lacl"])
- AC_CHECK_LIB(sec,acl,[ACL_LIBS="$ACL_LIBS -lsec"])
-@@ -1189,6 +1190,8 @@
- fi
- 
-+fi
- AC_SUBST(ACL_LIBS)
-+
- AM_CONDITIONAL(HAVE_POSIX_ACL, test x"$have_posix_acl_support" = x"yes")
- AM_CONDITIONAL(HAVE_SOLARIS_ACL, test x"$have_solaris_acl_support" = x"yes")
- 
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
deleted file mode 100644
index e76a9837136a..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.0-uuid-mount.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 8427c2daf543353f42b932b5137b6ec590f6589b Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:42:31 +0200
-Subject: [PATCH 7/9] Prevent duplicated volumes, bug #193083
-
----
- libgnomevfs/gnome-vfs-unix-mounts.c |   39 +++++++++++++++++++++++++++++++++-
- 1 files changed, 37 insertions(+), 2 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-unix-mounts.c b/libgnomevfs/gnome-vfs-unix-mounts.c
-index 51a009b..3eee305 100644
---- a/libgnomevfs/gnome-vfs-unix-mounts.c
-+++ b/libgnomevfs/gnome-vfs-unix-mounts.c
-@@ -40,6 +40,10 @@
- #ifdef HAVE_POLL_H
- #include <poll.h>
- #endif
-+
-+#include <limits.h>
-+#include <stdlib.h>
-+
- #include <stdio.h>
- #include <unistd.h>
- #include <sys/time.h>
-@@ -290,6 +294,15 @@ _gnome_vfs_get_current_unix_mounts (GList **return_list)
- 
- 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
- 		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+
-+		if (g_file_test (mntent->mnt_fsname, G_FILE_TEST_IS_SYMLINK)) {
-+			char rpath[PATH_MAX];
-+			if (realpath (mntent->mnt_fsname, rpath)) {
-+				g_free (mount_entry->device_path);
-+				mount_entry->device_path = g_strdup (rpath);
-+			}
-+		}
-+
- 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
- 		
- 		g_hash_table_insert (mounts_hash,
-@@ -571,9 +584,31 @@ _gnome_vfs_get_unix_mount_table (GList **return_list)
- 		}
- 		
- 		mount_entry = g_new0 (GnomeVFSUnixMountPoint, 1);
--
-+		
-+		if(strlen(mntent->mnt_fsname) >= 5 && !strncmp (mntent->mnt_fsname, "UUID=", 5)) {
-+			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-uuid/%s", mntent->mnt_fsname+5);
-+		}
-+		else if(strlen(mntent->mnt_fsname) >= 6 && !strncmp (mntent->mnt_fsname, "LABEL=", 6)) {
-+			mount_entry->device_path = g_strdup_printf ("/dev/disk/by-label/%s", mntent->mnt_fsname+6);
-+		}
-+		else {
-+			mount_entry->device_path = g_strdup (mntent->mnt_fsname);
-+		}
-+		
-+		if (g_file_test (mount_entry->device_path, G_FILE_TEST_IS_SYMLINK)) {
-+			char rpath[PATH_MAX];
-+			if (realpath (mount_entry->device_path, rpath)) {
-+				g_free (mount_entry->device_path);
-+				mount_entry->device_path = g_strdup (rpath);
-+			}
-+			else {
-+				g_free (mount_entry->device_path);
-+				g_free (mount_entry);
-+				continue;
-+			}
-+		}
-+		
- 		mount_entry->mount_path = g_strdup (mntent->mnt_dir);
--		mount_entry->device_path = g_strdup (mntent->mnt_fsname);
- 		mount_entry->filesystem_type = g_strdup (mntent->mnt_type);
- 
- #ifdef HAVE_HASMNTOPT
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
deleted file mode 100644
index 69f470a396a9..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-automake-1.13.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.in     | 2 +-
- test/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 7335451..7817998 100644
---- a/configure.in
-+++ b/configure.in
-@@ -33,7 +33,7 @@ AC_SUBST(LIBGNOMEVFS_REVISION)
- AC_SUBST(LIBGNOMEVFS_AGE)
- AC_SUBST(LIBGNOMEVFS_VERSION)
- 	
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE(gnome-vfs, $LIBGNOMEVFS_VERSION)
- 
- dnl make sure we keep ACLOCAL_FLAGS around for maintainer builds to work
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..626bdec 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -65,7 +65,7 @@ TESTS = test-acl	  \
- 	test-async-cancel \
- 	test-escape       \
- 	test-uri       	  \
--	$(srcdir)/auto-test	
-+	auto-test
- 
- libraries =						\
- 	$(top_builddir)/libgnomevfs/libgnomevfs-2.la	\
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
deleted file mode 100644
index 45ca015573f0..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-build-tests-asneeded.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b7dabab33e00bdbd8b566ca058a1bce7dec2b77d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:45:21 +0200
-Subject: [PATCH 8/9] Do not build tests unless required
-
----
- test/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 5b0992e..a1aefa0 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -14,7 +14,7 @@ else
- platform_only_programs = test-dns-sd test-symlinks test-parse-ls-lga
- endif
- 
--noinst_PROGRAMS =				\
-+check_PROGRAMS =				\
- 	test-acl				\
- 	test-address				\
- 	test-async				\
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
deleted file mode 100644
index 2684c92ec098..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-disable-test-async-cancel.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 390c1f6c06917f54cfacd5f85834d02c231cc2ea Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 01:46:31 +0200
-Subject: [PATCH 9/9] Disable broken test, bug #285706, upstream #618089
-
----
- test/Makefile.am |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/test/Makefile.am b/test/Makefile.am
-index a1aefa0..c18f2e4 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -62,7 +62,6 @@ TESTS_ENVIRONMENT = GNOME_VFS_MODULE_PATH=$(top_builddir)/modules/.libs \
- 		SRCDIR=$(srcdir)
- TESTS = test-acl	  \
- 	test-address      \
--	test-async-cancel \
- 	test-escape       \
- 	test-uri       	  \
- 	$(srcdir)/auto-test	
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
deleted file mode 100644
index 93ebd17c7eff..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls27.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Debian #529827
-GNOME #574589
-Gentoo #253729
-Patch by Gilles Dartiguelongue, fixed for correctly setting have_ssl
-
-Allow gnome-vfs-2.24 to build with gnutls >= 2.7.0
-Use pkg-config in place of gnutls own macro since it's not present anymore.
-
-As gnome-vfs-ssl.c also directly uses libgcrypt, we need to make sure that
-configure checks for it. Use AM_PATH_LIBGCRYPT macro for that.
-
-
-Index: gnome-vfs-2.24.4/configure.in
-===================================================================
---- gnome-vfs-2.24.4.orig/configure.in	2011-03-16 14:07:18.901009688 +0100
-+++ gnome-vfs-2.24.4/configure.in	2011-03-16 14:16:19.317009687 +0100
-@@ -667,15 +667,14 @@
-   if test "x${OPENSSL_LIBS}" != "x"; then
-     AC_MSG_ERROR([*** Can't use both openssl and gnutls at the same time. Please pick one only. ***])
-   else
--    AC_CHECK_HEADER(gcrypt.h,, AC_MSG_ERROR([*** Need gcrypt.h to compile with GnuTLS support ***]))
--    AM_PATH_LIBGNUTLS(1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--			      have_ssl=true])
--
-+    AM_PATH_LIBGCRYPT
-+    if test "x${LIBGCRYPT_LIBS}" = "x"; then
-+      AC_MSG_ERROR([Unable to find LIBGRYPT])
-+    fi
-+    PKG_CHECK_MODULES(LIBGNUTLS, gnutls >= 1.0.0, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
-+    				 	   	  have_ssl=true])
-     if test "x${LIBGNUTLS_LIBS}" = "x"; then
--      AM_PATH_LIBGNUTLS(0.5.1, [AC_DEFINE(HAVE_GNUTLS, 1, [Define to 1 if GnuTLS is available])
--                                 AC_DEFINE(GNUTLS_COMPAT, 1, [FIXME])
--				 have_ssl=true],
--                                 AC_MSG_ERROR([Unable to find GNUTLS]))
-+      AC_MSG_ERROR([Unable to find GNUTLS])
-     fi
-   fi
- fi
-@@ -1045,8 +1044,8 @@
- dnl ==============================================================================
- 
- PKG_CHECK_MODULES(LIBGNOMEVFS, glib-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 >= $XML_REQUIRED gnome-mime-data-2.0 $dbus_requirement)
--LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
--LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
-+LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
-+LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
- AC_SUBST(LIBGNOMEVFS_CFLAGS)
- AC_SUBST(LIBGNOMEVFS_LIBS)
- 
-Index: gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
-===================================================================
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:07:18.861009688 +0100
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2011-03-16 14:09:17.517009687 +0100
-@@ -61,13 +61,6 @@
- #endif
- #endif
- 
--#if defined GNUTLS_COMPAT
--#define gnutls_certificate_credentials GNUTLS_CERTIFICATE_CREDENTIALS
--#define gnutls_session GNUTLS_STATE
--#define gnutls_certificate_free_credentials gnutls_certificate_free_sc
--#define gnutls_certificate_allocate_credentials gnutls_certificate_allocate_sc
--#endif
--
- typedef struct {
- #ifdef HAVE_OPENSSL
- 	int sockfd;
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
deleted file mode 100644
index 78942f06ea11..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-gnutls34.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
---- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c	2010-02-09 14:16:14.000000000 +0200
-+++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c	2015-04-14 00:01:51.272451668 +0300
-@@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
- #endif
- }
- 
--#ifdef HAVE_GNUTLS
--static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
--static const int cipher_priority[] = 
--	{GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
--	 GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
--static const int comp_priority[] =
--	{GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
--static const int kx_priority[] =
--	{GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
--static const int mac_priority[] =
--	{GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
--
--#endif
--
--
- /**
-  * gnome_vfs_ssl_create_from_fd:
-  * @handle_return: pointer to a #GnomeVFSSSL struct, which will
-@@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
- 	gnutls_transport_set_ptr (ssl->private->tlsstate, 
- 				  GINT_TO_POINTER (fd));
- 
--	gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
--	gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
--	gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
--	gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
--	gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
-+	gnutls_set_default_priority (ssl->private->tlsstate);
- 
- 	gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
- 			 ssl->private->xcred);
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
deleted file mode 100644
index 991286aa4de6..000000000000
--- a/gnome-base/gnome-vfs/files/gnome-vfs-2.24.4-home_dir_fakeroot.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 01dba45f0d15b7e23f21d19776d64f69879cd27a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sat, 2 Oct 2010 00:41:01 +0200
-Subject: [PATCH 5/9] Fix to identify ${HOME} (#200897)
-
-Thanks to debian folks.
----
- libgnomevfs/gnome-vfs-application-registry.c |    2 +-
- libgnomevfs/gnome-vfs-init.c                 |    3 +-
- libgnomevfs/gnome-vfs-private-utils.c        |   52 ++++++++++++++++++++++++++
- libgnomevfs/gnome-vfs-private-utils.h        |    2 +
- modules/file-method.c                        |    6 +-
- 5 files changed, 60 insertions(+), 5 deletions(-)
-
-diff --git a/libgnomevfs/gnome-vfs-application-registry.c b/libgnomevfs/gnome-vfs-application-registry.c
-index 0b11cc5..051ea44 100644
---- a/libgnomevfs/gnome-vfs-application-registry.c
-+++ b/libgnomevfs/gnome-vfs-application-registry.c
-@@ -965,7 +965,7 @@ gnome_vfs_application_registry_init (void)
- 						       NULL);
- 	gnome_registry_dir.system_dir = TRUE;
- 	
--	user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
-+	user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
- 						      ".gnome",
- 						      "application-info",
- 						      NULL);
-diff --git a/libgnomevfs/gnome-vfs-init.c b/libgnomevfs/gnome-vfs-init.c
-index e3fd5d9..c07cf06 100644
---- a/libgnomevfs/gnome-vfs-init.c
-+++ b/libgnomevfs/gnome-vfs-init.c
-@@ -118,7 +118,8 @@ gnome_vfs_init (void)
- 	char *bogus_argv[2] = { "dummy", NULL };
- 	*/
- 	
--	if (!ensure_dot_gnome_exists ()) {
-+	/* The first call also checks that ~/.gnome2 is writable. */
-+	if (!gnome_vfs_get_home_dir ()) {
- 		return FALSE;
- 	}
- 
-diff --git a/libgnomevfs/gnome-vfs-private-utils.c b/libgnomevfs/gnome-vfs-private-utils.c
-index 7fafde3..7ad8fbc 100644
---- a/libgnomevfs/gnome-vfs-private-utils.c
-+++ b/libgnomevfs/gnome-vfs-private-utils.c
-@@ -34,6 +34,7 @@
- #include "gnome-vfs-uri.h"
- #include <errno.h>
- #include <glib.h>
-+#include <glib/gstdio.h>
- #include <gconf/gconf-client.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -1085,3 +1086,54 @@ _gnome_vfs_winsock_strerror (int error)
- }
- #endif
- 
-+static gboolean
-+ensure_dot_gnome_exists (gchar *home_dir)
-+{
-+	gboolean retval = TRUE;
-+	gchar *dirname;
-+
-+	dirname = g_build_filename (home_dir, ".gnome2", NULL);
-+
-+	if (!g_file_test (dirname, G_FILE_TEST_EXISTS)) {
-+		if (g_mkdir (dirname, S_IRWXU) != 0) {
-+			g_warning ("Unable to create ~/.gnome2 directory: %s",
-+				   g_strerror (errno));
-+			retval = FALSE;
-+		}
-+	} else if (!g_file_test (dirname, G_FILE_TEST_IS_DIR)) {
-+		g_warning ("Error: ~/.gnome2 must be a directory.");
-+		retval = FALSE;
-+	}
-+
-+	g_free (dirname);
-+	return retval;
-+}
-+
-+/**
-+ * gnome_vfs_get_home_dir:
-+ *
-+ * If ~/.gnome2 is writable, return the home directory
-+ * Otherwise, return the contents of the HOME environment variable
-+ *
-+ * Return value: home directory if successful, NULL otherwise.
-+ * Do not free the value returned.
-+ */
-+const gchar *
-+gnome_vfs_get_home_dir (void)
-+{
-+	static gchar *home = NULL;
-+
-+	if (home == NULL) {
-+		gchar *tmp = g_get_home_dir ();
-+		if (ensure_dot_gnome_exists (tmp)) {
-+			home = g_strdup (tmp);
-+		} else {
-+			gchar *tmp2 = g_getenv ("HOME");
-+			if (!g_str_equal (tmp, tmp2) && ensure_dot_gnome_exists (tmp2)) {
-+				home = g_strdup (tmp2);
-+			}
-+		}
-+	}
-+
-+	return home;
-+}
-diff --git a/libgnomevfs/gnome-vfs-private-utils.h b/libgnomevfs/gnome-vfs-private-utils.h
-index 981c6d9..fe282a2 100644
---- a/libgnomevfs/gnome-vfs-private-utils.h
-+++ b/libgnomevfs/gnome-vfs-private-utils.h
-@@ -124,6 +124,8 @@ const char    *_gnome_vfs_winsock_strerror		  (int		 error);
- 
- #endif
- 
-+const gchar   *gnome_vfs_get_home_dir                     (void);
-+
- G_END_DECLS
- 
- #endif /* _GNOME_VFS_PRIVATE_UTILS_H */
-diff --git a/modules/file-method.c b/modules/file-method.c
-index 37e4853..7265e58 100644
---- a/modules/file-method.c
-+++ b/modules/file-method.c
-@@ -1531,7 +1531,7 @@ save_trash_entry_cache (void)
- 	GList *p;
- 	char *buffer, *escaped_path, *escaped_mount_point;
- 
--	cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
-+	cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
- 	cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
- 
- 	if (mkdir_recursive (cache_file_parent, 0777) != 0) {
-@@ -1670,7 +1670,7 @@ read_saved_cached_trash_entries (void)
- 	cached_trash_directories = NULL;
- 
- 	/* read in the entries from disk */
--	cache_file_path = g_build_filename (g_get_home_dir (),
-+	cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
- 					    TRASH_ENTRY_CACHE_PARENT,
- 					    TRASH_ENTRY_CACHE_NAME,
- 					    NULL);
-@@ -1942,7 +1942,7 @@ do_find_directory (GnomeVFSMethod *method,
- 		return GNOME_VFS_ERROR_INVALID_URI;
- 
- 	/* We will need the URI and the stat structure for the home directory. */
--	home_directory = g_get_home_dir ();
-+	home_directory = gnome_vfs_get_home_dir ();
- 
- 	if (gnome_vfs_context_check_cancellation (context)) {
- 		g_free (full_name_near);
--- 
-1.7.3
-
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
deleted file mode 100644
index 7b788c1a09d7..000000000000
--- a/gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gnome Virtual Filesystem"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl gnutls ipv6 kerberos libressl samba ssl zeroconf"
-
-RDEPEND="
-	>=gnome-base/gconf-2.32.4-r1[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
-	gnome-base/gnome-mime-data
-	>=x11-misc/shared-mime-info-0.14
-	>=dev-libs/dbus-glib-0.100.2[${MULTILIB_USEDEP}]
-	acl? (
-		>=sys-apps/acl-2.2.52-r1[${MULTILIB_USEDEP}]
-		>=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
-	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	ssl? (
-		gnutls?	(
-			>=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}]
-			!gnome-extra/gnome-vfs-sftp )
-		!gnutls? (
-			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-			!gnome-extra/gnome-vfs-sftp ) )
-	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	gnome-base/gnome-common
-	>=dev-util/intltool-0.40
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	>=dev-util/gtk-doc-am-1.13
-"
-
-src_prepare() {
-	# Allow the Trash on afs filesystems (#106118)
-	epatch "${FILESDIR}"/${PN}-2.12.0-afs.patch
-
-	# Fix compiling with headers missing
-	epatch "${FILESDIR}"/${PN}-2.15.2-headers-define.patch
-
-	# Fix for crashes running programs via sudo
-	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
-
-	# Fix automagic dependencies, upstream bug #493475
-	epatch "${FILESDIR}"/${PN}-2.20.0-automagic-deps.patch
-	epatch "${FILESDIR}"/${PN}-2.20.1-automagic-deps.patch
-
-	# Fix to identify ${HOME} (#200897)
-	# thanks to debian folks
-	epatch "${FILESDIR}"/${PN}-2.24.4-home_dir_fakeroot.patch
-
-	# Configure with gnutls-2.7, bug #253729
-	# Fix building with gnutls-2.12, bug #388895
-	epatch "${FILESDIR}"/${PN}-2.24.4-gnutls27.patch
-
-	# Prevent duplicated volumes, bug #193083
-	epatch "${FILESDIR}"/${PN}-2.24.0-uuid-mount.patch
-
-	# Do not build tests with FEATURES="-test", bug #226221
-	epatch "${FILESDIR}"/${PN}-2.24.4-build-tests-asneeded.patch
-
-	# Disable broken test, bug #285706
-	epatch "${FILESDIR}"/${PN}-2.24.4-disable-test-async-cancel.patch
-
-	# Fix for automake-1.13 compatibility, #466944
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-
-	# Fix gnutls-3.4+ compatibility, #560084
-	# always use system defaults (patch from Arch Linux)
-	epatch "${FILESDIR}"/${P}-gnutls34.patch
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-schemas-install
-		--disable-static
-		--disable-cdda
-		--disable-fam
-		--disable-hal
-		--disable-howl
-		$(use_enable acl)
-		$(use_enable gnutls)
-		$(use_enable ipv6)
-		$(use_enable kerberos krb5)
-		$(use_enable samba)
-		$(use_enable ssl openssl)
-		$(use_enable zeroconf avahi)
-		# Useless ? --enable-http-neon
-
-		# fix path to krb5-config
-		KRB5_CONFIG=/usr/bin/${CHOST}-krb5-config
-	)
-
-	# this works because of the order of configure parsing
-	# so should always be behind the use_enable options
-	# foser <foser@gentoo.org 19 Apr 2004
-	use gnutls && use ssl && myconf+=( --disable-openssl )
-
-	#bug #519060
-	#configure script is so messed up on res_init on Darwin
-	[[ ${CHOST} == *-darwin* ]] && export LIBS="${LIBS} -lresolv"
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure "${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_test() {
-	unset DISPLAY
-	# Fix bug #285706
-	unset XAUTHORITY
-	Xemake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-	einstalldocs
-}
diff --git a/gnome-base/gnome-vfs/metadata.xml b/gnome-base/gnome-vfs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gnome-vfs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gnome/Manifest b/gnome-base/gnome/Manifest
deleted file mode 100644
index 2f11f92b5e37..000000000000
--- a/gnome-base/gnome/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-EBUILD gnome-3.20.0.ebuild 1456 BLAKE2B 9acd17a4f24ff1220bcb3caf32bebf2b625150e02175c60b30390d5577b000de8f97f33ec88ca690afdaad20ba921f11d0b48ae4211f825f713c7eed5a634a6f SHA512 db4545199d2f9b4e4bf0b0991ec6f21040d7191644bb1929fbe16151899c07e30d452e50c8e2732eb02674f7141fa845bfb604642c491597c452d13c4403d57f
-EBUILD gnome-3.24.2.ebuild 1404 BLAKE2B 2a83d561ded9713019c9e7360eeff82bcd01c4405fcae85202c6fc736fc7fff9ed5d31a1afedf224e756fb43c30d6784911e0fafd4e74f716bc44b4a7fb6595f SHA512 698c330c27fe7ecdbf8aead2d5e32ccb9e983ac2428c8f383654e057742f649bb0e543a24a723a36961a20e9d637d1bf8fbd7456c39c76bc9f4b0e968cab8ea2
-MISC metadata.xml 452 BLAKE2B 94890a098fcc359b62b9176f57baa243301ab562c549395f6307789987a668c095a1d571be9b7a5325ffdcbd51efaff100c1098ae0e2c337be11c54b3b703529 SHA512 459b43467672d33807e28cfa40ad930a083a026de9cc1dba2e5b795c1d766ca8f42591153164dbdedaeb7785d22a431eb5d1b36e618314ce792bb1c7da383d9a
diff --git a/gnome-base/gnome/gnome-3.20.0.ebuild b/gnome-base/gnome/gnome-3.20.0.ebuild
deleted file mode 100644
index 7fdd120189b4..000000000000
--- a/gnome-base/gnome/gnome-3.20.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-IUSE="accessibility +bluetooth +classic +cdr cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-# GDM-3.0 integrates very nicely with GNOME Shell
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
-
-	>=gnome-base/gdm-${PV}
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-
-	>=x11-themes/gnome-backgrounds-3.20
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.20
-		>=app-accessibility/at-spi2-core-2.20
-		>=app-accessibility/caribou-0.4.21
-		>=app-accessibility/orca-${PV}
-		>=gnome-extra/mousetweaks-3.12.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-
-DEPEND=""
-
-PDEPEND=">=gnome-base/gvfs-1.28[udisks]"
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome/gnome-3.24.2.ebuild b/gnome-base/gnome/gnome-3.24.2.ebuild
deleted file mode 100644
index cbf8482f077a..000000000000
--- a/gnome-base/gnome/gnome-3.24.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Meta package for GNOME 3, merge this package to install"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="metapackage"
-SLOT="2.0" # Cannot be installed at the same time as gnome-2
-
-# when unmasking for an arch
-# double check none of the deps are still masked !
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-
-IUSE="accessibility +bluetooth +classic +cdr cups +extras"
-
-S=${WORKDIR}
-
-# TODO: check accessibility completeness
-RDEPEND="
-	>=gnome-base/gnome-core-libs-${PV}[cups?]
-	>=gnome-base/gnome-core-apps-${PV}[cups?,bluetooth?,cdr?]
-
-	>=gnome-base/gdm-${PV}
-
-	>=x11-wm/mutter-${PV}
-	>=gnome-base/gnome-shell-${PV}[bluetooth?]
-
-	>=x11-themes/gnome-backgrounds-3.24.0
-	x11-themes/sound-theme-freedesktop
-
-	accessibility? (
-		>=app-accessibility/at-spi2-atk-2.24.1
-		>=app-accessibility/at-spi2-core-2.24.1
-		>=app-accessibility/caribou-0.4.21
-		>=app-accessibility/orca-3.24.0
-		>=gnome-extra/mousetweaks-3.12.0 )
-	classic? ( >=gnome-extra/gnome-shell-extensions-${PV} )
-	extras? ( >=gnome-base/gnome-extra-apps-${PV} )
-"
-
-DEPEND=""
-
-PDEPEND=">=gnome-base/gvfs-1.32.1[udisks]"
-
-pkg_postinst() {
-	# Remember people where to find our project information
-	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
-	elog "for information about the project and documentation."
-}
diff --git a/gnome-base/gnome/metadata.xml b/gnome-base/gnome/metadata.xml
deleted file mode 100644
index 77f5727ea19a..000000000000
--- a/gnome-base/gnome/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-  <flag name="classic">Install <pkg>gnome-extra/gnome-shell-extensions</pkg>
-    for the Gnome Shell Classic mode</flag>
-  <flag name="extras">Install additional GNOME applications</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/gsettings-desktop-schemas-3.22.0 b/gnome-base/gsettings-desktop-schemas-3.22.0
new file mode 100644
index 000000000000..66a15efa6676
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas-3.22.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of GSettings schemas for GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
+IUSE=+introspection
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
+SLOT=0
+SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e7f07116b24ffac715a35cb37e3349a2
diff --git a/gnome-base/gsettings-desktop-schemas-3.24.1 b/gnome-base/gsettings-desktop-schemas-3.24.1
new file mode 100644
index 000000000000..cb38beceb394
--- /dev/null
+++ b/gnome-base/gsettings-desktop-schemas-3.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8 >=dev-util/intltool-0.50.1 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Collection of GSettings schemas for GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
+IUSE=+introspection
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
+SLOT=0
+SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=65bc73962f5c053aef587b484753d776
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
deleted file mode 100644
index 0c78f009a2f9..000000000000
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gsettings-desktop-schemas-3.22.0.tar.xz 598412 BLAKE2B 0249dfbdc7d574824ad6c34cdbafc7859eba4d78494c80d42b9b5a739cfaa8bb6d43e13093148253dedd0ae2762261750f791d809ba8058a78098fc7f8dad510 SHA512 653198f78f8108222e84c0e94b6b914e03597234a627f1c205fc58a7bf54fdde073ff98cfdce1dccec7da1d8a7cbf648004cd392382d4ff617245cc3e581dfd1
-DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
-EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 763 BLAKE2B 0698eee92e216f5d039d3c6d0ca9659504015d6597cc722b46487da6f733a6e391c7211fe93fb9df8b9a49a0b51af333366a3292330743e2f1e844a1f3b76091 SHA512 1a0e09d280a5ec1b7849f8069c884a15c071a88669567c9fac251dade4c9acae0a42f4c2996949b0dbbcb6871dcea549d9608113118e9bc8f1c8a7a4f5494ce1
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild
deleted file mode 100644
index 66069286ce4f..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.22.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0:= )
-	!<gnome-base/gdm-3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
deleted file mode 100644
index 8285b4be9735..000000000000
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Collection of GSettings schemas for GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="+introspection"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.31:2
-	introspection? ( >=dev-libs/gobject-introspection-1.31.0:= )
-	!<gnome-base/gdm-3.8
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure $(use_enable introspection)
-}
diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml b/gnome-base/gsettings-desktop-schemas/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/gsettings-desktop-schemas/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/gvfs-1.32.1-r1 b/gnome-base/gvfs-1.32.1-r1
new file mode 100644
index 000000000000..ff5babc47356
--- /dev/null
+++ b/gnome-base/gvfs-1.32.1-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.4 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-core-12.3.0 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Virtual filesystem implementation for gio
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
+IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
+REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( !elogind udisks )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.1.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.1-patches.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ecf2ce8692dbe4c6877ee5e2e1ae4d7
diff --git a/gnome-base/gvfs-1.32.2 b/gnome-base/gvfs-1.32.2
new file mode 100644
index 000000000000..f59d192f32aa
--- /dev/null
+++ b/gnome-base/gvfs-1.32.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=sys-devel/gettext-0.19.4 virtual/pkgconfig dev-util/gdbus-codegen dev-util/gtk-doc-am test? ( >=dev-python/twisted-16 || ( net-analyzer/netcat net-analyzer/netcat6 ) ) !udev? ( >=dev-libs/libgcrypt-1.2.2:0 ) >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Virtual filesystem implementation for gio
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/gvfs
+IUSE=afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=app-crypt/gcr:= >=dev-libs/glib-2.51:2 dev-libs/libxml2:2 net-misc/openssh afp? ( >=dev-libs/libgcrypt-1.2.2:0= ) archive? ( app-arch/libarchive:= ) bluray? ( media-libs/libbluray:= ) elogind? ( >=sys-auth/elogind-229:0= ) fuse? ( >=sys-fs/fuse-2.8.0:0 ) gnome-keyring? ( app-crypt/libsecret ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= ) google? ( >=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts] >=net-libs/gnome-online-accounts-3.17.1:= ) gphoto2? ( >=media-libs/libgphoto2-2.5.0:= ) gtk? ( >=x11-libs/gtk+-3.0:3 ) http? ( >=net-libs/libsoup-2.42:2.4 ) ios? ( >=app-pda/libimobiledevice-1.2:= >=app-pda/libplist-1:= ) mtp? ( >=dev-libs/libusb-1.0.21 >=media-libs/libmtp-1.1.12 ) nfs? ( >=net-fs/libnfs-1.9.8 ) policykit? ( sys-auth/polkit sys-libs/libcap ) samba? ( >=net-fs/samba-4[client] ) systemd? ( >=sys-apps/systemd-206:0= ) udev? ( cdda? ( dev-libs/libcdio-paranoia ) >=virtual/libgudev-147:= virtual/libudev:= ) udisks? ( >=sys-fs/udisks-1.97:2 ) zeroconf? ( >=net-dns/avahi-0.6 )
+REQUIRED_USE=cdda? ( udev ) elogind? ( !systemd udisks ) google? ( gnome-online-accounts ) mtp? ( udev ) udisks? ( udev ) systemd? ( !elogind udisks )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gvfs/1.32/gvfs-1.32.2.tar.xz https://dev.gentoo.org/~leio/distfiles/gvfs-1.32.2-patchset.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aacae90d6eb99509210ea8067a4519b9
diff --git a/gnome-base/gvfs/Manifest b/gnome-base/gvfs/Manifest
deleted file mode 100644
index aae8d7145ab9..000000000000
--- a/gnome-base/gvfs/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX gvfs-1.30.2-sysmacros.patch 525 BLAKE2B 27337a06b02aea544e98b5726ac5a1ae29c8632150c373ce85f0f601c368e0f1430217ee729de5494e15162a05423c738e0756431a46c87b62ac647615b6273d SHA512 9b06683ed3b8ceea1b330e86308c396581ab4c85aa22199ce92acad915bb28f0fed8997558c08b18cb9c5f1bab45e46a1365831acaf1c194e7134e185849dba2
-DIST gvfs-1.32.1-patches.tar.xz 53288 BLAKE2B 2394f0931927069b4aeab69769df74c823ebffca2e7e73245b3597e085f2fff5c98999e6eccd052fa3564339b75d764f2124592c0977fddd2eb4afeca819b965 SHA512 c3e9de02e013aaf707878f8ffab96c42ac558412020f8462f928d2c7bd8b9756aa980e6b8db50e6f0ff0ad91f250ef1a26358d80b5d1cdaa9234475ec3a3db4f
-DIST gvfs-1.32.1.tar.xz 1813212 BLAKE2B 4b349e968eaab75d75ac9e7b66087298754ad81668e415812c4db74e2e393ac2cddea1b55771656dcd67ffdca23e4cf1642afef101498d309c643519fcefcca3 SHA512 7bd4d137437c1704faf6a9c2712bddcc327284e752c552c2cc18c64beb5e6d291af321e92d02d4f09b619762121129cee82c13ec2a4ca39d045196ebeeb28dd8
-DIST gvfs-1.32.2-patchset.tar.xz 22152 BLAKE2B 46371e4da9f3259ae1be6e7900aa9c3fa83913cf1f5ac80c485abc6a10bd77667e7fad29a09eb160af39212da31c00ccccbc3e47b4ed79780e254ff78d4b7130 SHA512 d7a17a33b737d8ac679e259055b57f63ef18f783dd7887c726502f8c05cb9339addd8728ee180ed15dc7d067ff45cc1888bc42a8ca45f9734717cfcde53f3e45
-DIST gvfs-1.32.2.tar.xz 1820100 BLAKE2B a12209f8d1f1350edfc470bb8181d68172580909764899a20b248e5dca673e5904aef0562f3244336dd8eff66cbae926d4fb2ebcccc30125328e15aeb622b481 SHA512 2fecb7103917f976528a75d317ddb6c9a71c2787cd1bd442c42a40177b74a026e37c9794117f802ebf608091d446ac58eb80d1a618df619180bb3920a98a9457
-EBUILD gvfs-1.32.1-r1.ebuild 3826 BLAKE2B f1bfe2003c7d9e52a28be077b9dffe0cb0b1df892324fef94716f5667ce6fd99092aafac595d429a924c5ef614b74d77b6f42088a762aacbaae2e9954ea3f563 SHA512 fc653f73522939d51129c6443971f2cc1ec2e73cc409db8a8520d5b77d84b242135289bbbbf8a5584dbc8a078000244991fe288faf8849d849c63babbf6f6ff3
-EBUILD gvfs-1.32.2.ebuild 3806 BLAKE2B a7a6fa7f95fe62e4965823c7b1ed7ee9f0631022d0d7f9e72c6520cf9e97e83434f258c39c17e785aa6fa21cf8a040e45f6a6bf9c25b2e527f9d12624bd3c9fa SHA512 76c3fbdf15b2bda15c6715344a7c536b39af84f5ec980ec9ed45ec75a308e6bfc57fe5a735410cdf52c110fa034597889c24546a771cdc96a0bdd3b480bfdeb2
-MISC metadata.xml 1625 BLAKE2B 931da927a3cef58e8d768454cdda485acf3b8b42a87d9d4be0faa495e7b49b16e780815a0a959b91b116b078cb333c69873374e0f95e8aadb074ce836df3149d SHA512 4a3815b41763def19356793e36bafbd8a87359c9501f526465a6d8b62394c1605909b70ba4b8679b2dca89bb2660ea573a0e97611facf2d23c878fcdf51e7bfc
diff --git a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch b/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
deleted file mode 100644
index b2d2a91f5a76..000000000000
--- a/gnome-base/gvfs/files/gvfs-1.30.2-sysmacros.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=776532
-https://bugs.gentoo.org/580234
-
---- a/metadata/meta-daemon.c
-+++ b/metadata/meta-daemon.c
-@@ -27,6 +27,7 @@
- #include <glib/gstdio.h>
- #include <locale.h>
- #include <stdlib.h>
-+#include <sys/sysmacros.h>
- #include "metatree.h"
- #include "gvfsdaemonprotocol.h"
- #include "metadata-dbus.h"
---- a/metadata/metatree.c
-+++ b/metadata/metatree.c
-@@ -1,4 +1,5 @@
- #include "config.h"
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/mman.h>
diff --git a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild b/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
deleted file mode 100644
index a4dbfa656798..000000000000
--- a/gnome-base/gvfs/gvfs-1.32.1-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patches.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	elogind? ( !systemd udisks )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( !elogind udisks )
-"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.51:2
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray:= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	fuse? ( >=sys-fs/fuse-2.8.0:0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
-	google? (
-		>=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
-		>=net-libs/gnome-online-accounts-3.17.1:= )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	mtp? (
-		>=dev-libs/libusb-1.0.21
-		>=media-libs/libmtp-1.1.12 )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	policykit? (
-		sys-auth/polkit
-		sys-libs/libcap )
-	samba? ( >=net-fs/samba-4[client] )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		>=virtual/libgudev-147:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-core-12.3.0
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patches/ #599482, 641522, gnome-3-24 backports
-	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
-)
-
-src_prepare() {
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--disable-gdu \
-		--enable-documentation \
-		--enable-gcr \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable elogind libelogind) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable http) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable mtp libusb) \
-		$(use_enable nfs) \
-		$(use_enable policykit admin) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udev gudev) \
-		$(use_enable udev) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/gvfs-1.32.2.ebuild b/gnome-base/gvfs/gvfs-1.32.2.ebuild
deleted file mode 100644
index 356344824fce..000000000000
--- a/gnome-base/gvfs/gvfs-1.32.2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Virtual filesystem implementation for gio"
-HOMEPAGE="https://wiki.gnome.org/Projects/gvfs"
-SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-
-IUSE="afp archive bluray cdda elogind fuse google gnome-keyring gnome-online-accounts gphoto2 gtk +http ios mtp nfs policykit samba systemd test +udev udisks zeroconf"
-REQUIRED_USE="
-	cdda? ( udev )
-	elogind? ( !systemd udisks )
-	google? ( gnome-online-accounts )
-	mtp? ( udev )
-	udisks? ( udev )
-	systemd? ( !elogind udisks )
-"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-
-RDEPEND="
-	app-crypt/gcr:=
-	>=dev-libs/glib-2.51:2
-	dev-libs/libxml2:2
-	net-misc/openssh
-	afp? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	archive? ( app-arch/libarchive:= )
-	bluray? ( media-libs/libbluray:= )
-	elogind? ( >=sys-auth/elogind-229:0= )
-	fuse? ( >=sys-fs/fuse-2.8.0:0 )
-	gnome-keyring? ( app-crypt/libsecret )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.7.1:= )
-	google? (
-		>=dev-libs/libgdata-0.17.7:=[crypt,gnome-online-accounts]
-		>=net-libs/gnome-online-accounts-3.17.1:= )
-	gphoto2? ( >=media-libs/libgphoto2-2.5.0:= )
-	gtk? ( >=x11-libs/gtk+-3.0:3 )
-	http? ( >=net-libs/libsoup-2.42:2.4 )
-	ios? (
-		>=app-pda/libimobiledevice-1.2:=
-		>=app-pda/libplist-1:= )
-	mtp? (
-		>=dev-libs/libusb-1.0.21
-		>=media-libs/libmtp-1.1.12 )
-	nfs? ( >=net-fs/libnfs-1.9.8 )
-	policykit? (
-		sys-auth/polkit
-		sys-libs/libcap )
-	samba? ( >=net-fs/samba-4[client] )
-	systemd? ( >=sys-apps/systemd-206:0= )
-	udev? (
-		cdda? ( dev-libs/libcdio-paranoia )
-		>=virtual/libgudev-147:=
-		virtual/libudev:= )
-	udisks? ( >=sys-fs/udisks-1.97:2 )
-	zeroconf? ( >=net-dns/avahi-0.6 )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	test? (
-		>=dev-python/twisted-16
-		|| (
-			net-analyzer/netcat
-			net-analyzer/netcat6 ) )
-	!udev? ( >=dev-libs/libgcrypt-1.2.2:0 )
-"
-# libgcrypt.m4, provided by libgcrypt, needed for eautoreconf, bug #399043
-# test dependencies needed per https://bugzilla.gnome.org/700162
-
-# Tests with multiple failures, this is being handled upstream at:
-# https://bugzilla.gnome.org/700162
-RESTRICT="test"
-
-PATCHES=(
-	"${WORKDIR}"/patches/ #599482, 641522, gnome-3-24 backports
-	"${FILESDIR}"/${PN}-1.30.2-sysmacros.patch #580234
-)
-
-src_prepare() {
-	if ! use udev; then
-		sed -e 's/gvfsd-burn/ /' \
-			-e 's/burn.mount.in/ /' \
-			-e 's/burn.mount/ /' \
-			-i daemon/Makefile.am || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-documentation installs man pages
-	# --disable-obexftp, upstream bug #729945
-	gnome2_src_configure \
-		--disable-gdu \
-		--enable-documentation \
-		--enable-gcr \
-		--with-dbus-service-dir="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		$(use_enable afp) \
-		$(use_enable archive) \
-		$(use_enable bluray) \
-		$(use_enable cdda) \
-		$(use_enable elogind libelogind) \
-		$(use_enable fuse) \
-		$(use_enable gnome-keyring keyring) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable google) \
-		$(use_enable gphoto2) \
-		$(use_enable gtk) \
-		$(use_enable http) \
-		$(use_enable ios afc) \
-		$(use_enable mtp libmtp) \
-		$(use_enable mtp libusb) \
-		$(use_enable nfs) \
-		$(use_enable policykit admin) \
-		$(use_enable samba) \
-		$(use_enable systemd libsystemd-login) \
-		$(use_enable udev gudev) \
-		$(use_enable udev) \
-		$(use_enable udisks udisks2) \
-		$(use_enable zeroconf avahi)
-}
diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
deleted file mode 100644
index d26195bc7e44..000000000000
--- a/gnome-base/gvfs/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-gvfs is a userspace virtual filesystem designed to work with the i/o
-abstractions of gio (a library availible in glib &gt;= 2.15.1). It
-installs several modules that are automatically used by applications
-using the APIs of libgio. There is also fuse support that allows
-applications not using gio to access the gvfs filesystems.
-</longdescription>
-<use>
-	<flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
-	<flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
-	<flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
-	<flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for session tracking.</flag>
-	<flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
-	<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
-	<flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
-	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup</pkg></flag>
-	<flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
-	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/libbonobo-2.24.3-r1 b/gnome-base/libbonobo-2.24.3-r1
new file mode 100644
index 000000000000..9cb45a3922cd
--- /dev/null
+++ b/gnome-base/libbonobo-2.24.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.14:2 >=gnome-base/orbit-2.14.0 >=dev-libs/libxml2-2.4.20:2 >=sys-apps/dbus-1.0.0 >=dev-libs/dbus-glib-0.74 >=dev-libs/popt-1.5 !gnome-base/bonobo-activation dev-util/gtk-doc-am virtual/yacc sys-devel/flex x11-apps/xrdb virtual/pkgconfig >=dev-util/intltool-0.35 >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME CORBA framework
+EAPI=5
+HOMEPAGE=https://developer.gnome.org/libbonobo/stable/
+IUSE=debug examples test debug
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1 GPL-2
+RDEPEND=>=dev-libs/glib-2.14:2 >=gnome-base/orbit-2.14.0 >=dev-libs/libxml2-2.4.20:2 >=sys-apps/dbus-1.0.0 >=dev-libs/dbus-glib-0.74 >=dev-libs/popt-1.5 !gnome-base/bonobo-activation
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e02b9048deda8791e7c86617fd3021e8
diff --git a/gnome-base/libbonobo/Manifest b/gnome-base/libbonobo/Manifest
deleted file mode 100644
index 2a863df66969..000000000000
--- a/gnome-base/libbonobo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbonobo-2.24.3.tar.bz2 1354929 BLAKE2B 44f8d7bf4530363dd680fb277dbacabb85a3871fd3645ef7aa4a2a4dbd112a31329c8295637f73e37853035ac0e2cd7b918b2966f58fbcccd5abc943c02a2cc5 SHA512 c97224ba2d4afc07e520399aa04849487a4ec4dd1b80b56e0472b4c3ebbddd0ce0105ba63ca2f823590788754791127dbe86b49cb39239db0019f8104db25716
-EBUILD libbonobo-2.24.3-r1.ebuild 1536 BLAKE2B 64649733ace865324333a93aec10a789eb477c31bac61d3fc46965787c7608e700a4232336c4829189ce1cf86b2892a647b3d17f64669e815d6afd269e1440bd SHA512 c7d376ee9959e9b885ac8cbd53a3029062ecd7f7093f9fddc5075e328cd529e5a5caa298c378c79507f5fe31a305087165681ddced153adbef1161b66bdf53cc
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild b/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
deleted file mode 100644
index 4be2587ea505..000000000000
--- a/gnome-base/libbonobo/libbonobo-2.24.3-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="GNOME CORBA framework"
-HOMEPAGE="https://developer.gnome.org/libbonobo/stable/"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="debug examples test"
-
-RDEPEND="
-	>=dev-libs/glib-2.14:2
-	>=gnome-base/orbit-2.14.0
-	>=dev-libs/libxml2-2.4.20:2
-	>=sys-apps/dbus-1.0.0
-	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/popt-1.5
-	!gnome-base/bonobo-activation
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/yacc
-	sys-devel/flex
-	x11-apps/xrdb
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-"
-
-# Tests are broken in several ways as reported in bug #288689 and upstream
-# doesn't take care since libbonobo is deprecated.
-RESTRICT="test"
-
-src_prepare() {
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die
-
-	if ! use test; then
-		# don't waste time building tests, bug #226223
-		sed 's/tests//' -i Makefile.am Makefile.in || die
-	fi
-
-	if ! use examples; then
-		sed 's/samples//' -i Makefile.am Makefile.in || die
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable debug bonobo-activation-debug)
-}
-
-src_test() {
-	# Pass tests with FEATURES userpriv, see bug #288689
-	unset ORBIT_SOCKETDIR
-	emake check
-}
diff --git a/gnome-base/libbonobo/metadata.xml b/gnome-base/libbonobo/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libbonobo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libbonoboui-2.24.5-r1 b/gnome-base/libbonoboui-2.24.5-r1
new file mode 100644
index 000000000000..ba8dd1ee11ba
--- /dev/null
+++ b/gnome-base/libbonoboui-2.24.5-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=gnome-base/libgnomecanvas-1.116 >=gnome-base/libbonobo-2.22 >=gnome-base/libgnome-2.13.7 >=dev-libs/libxml2-2.4.20:2 >=gnome-base/gconf-2:2 >=x11-libs/gtk+-2.8.12:2 >=dev-libs/glib-2.6.0:2 >=gnome-base/libglade-1.99.11:2.0 >=dev-libs/popt-1.5 dev-util/gtk-doc-am x11-apps/xrdb sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=User Interface part of libbonobo
+EAPI=5
+HOMEPAGE=https://developer.gnome.org/libbonoboui/
+IUSE=examples test test
+KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=gnome-base/libgnomecanvas-1.116 >=gnome-base/libbonobo-2.22 >=gnome-base/libgnome-2.13.7 >=dev-libs/libxml2-2.4.20:2 >=gnome-base/gconf-2:2 >=x11-libs/gtk+-2.8.12:2 >=dev-libs/glib-2.6.0:2 >=gnome-base/libglade-1.99.11:2.0 >=dev-libs/popt-1.5
+SLOT=0
+SRC_URI=mirror://gnome/sources/libbonoboui/2.24/libbonoboui-2.24.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c82fc02d1930bef744088a6bcf267bf4
diff --git a/gnome-base/libbonoboui/Manifest b/gnome-base/libbonoboui/Manifest
deleted file mode 100644
index f683f4d929a3..000000000000
--- a/gnome-base/libbonoboui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libbonoboui-2.24.5.tar.bz2 976250 BLAKE2B b8847b23479ba1c13ee41ebc67031c94572f9f9e5ae88b067da78bac2c78d6c52c6a5bd408246328fb71fa2d1722ce69acaa517c90520cd9fe5e81828988d6ea SHA512 163a8f39d9dad7fc3f1afc55b1a779961d285abe2988ff74bfcad4376e9dbfb91bb3e8212f96f48f91c54a6aff749ba6e00ea2d9add10c76b650f3072b875100
-EBUILD libbonoboui-2.24.5-r1.ebuild 1353 BLAKE2B 9732816f947d6a5ac012df5c32c11d15867a63b0066eb07e64c20c9efba820fd6b820540af2611ba43efdc08e517f586a962bb01d9f42c94624a0c5938dc4137 SHA512 28e09e22b6161b90d4a4be92b8d25fb3c66cc36a1f94f45e288256b5c62a55f65fe9a6065e1320463e3c6e2c4a7ad79c7da0ccde8a7681a93f31e829e6457294
-MISC metadata.xml 744 BLAKE2B 9b0f0bd7470f3486c1e2dc90ef701db7a4d55afd42092904326842651f6b29b02e35a136c69b7e252d6bd458f5f2b4eea384a27bcc69067ef6b9deeeb3e6dd2e SHA512 0f23ea97d68a4c46220dd395343aa63ed8351222f0c8aeeeefe9d9410a397522d7866f4600023653ac683513754480d92c7fffcd551d5f7987b2100ca2b5c370
diff --git a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild b/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
deleted file mode 100644
index 56b1c70caca9..000000000000
--- a/gnome-base/libbonoboui/libbonoboui-2.24.5-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="User Interface part of libbonobo"
-HOMEPAGE="https://developer.gnome.org/libbonoboui/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="examples test"
-
-# GTK+ dep due to bug #126565
-RDEPEND="
-	>=gnome-base/libgnomecanvas-1.116
-	>=gnome-base/libbonobo-2.22
-	>=gnome-base/libgnome-2.13.7
-	>=dev-libs/libxml2-2.4.20:2
-	>=gnome-base/gconf-2:2
-	>=x11-libs/gtk+-2.8.12:2
-	>=dev-libs/glib-2.6.0:2
-	>=gnome-base/libglade-1.99.11:2.0
-	>=dev-libs/popt-1.5
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	x11-apps/xrdb
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-
-src_prepare() {
-	if ! use test; then
-		# don't waste time building tests
-		sed 's/tests//' -i Makefile.am Makefile.in || die "sed 1 failed"
-	fi
-
-	if ! use examples; then
-		sed 's/samples//' -i Makefile.am Makefile.in || die "sed 2 failed"
-	fi
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	addpredict "/root/.gnome2_private"
-	gnome2_src_configure --disable-static
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	Xemake check
-}
diff --git a/gnome-base/libbonoboui/metadata.xml b/gnome-base/libbonoboui/metadata.xml
deleted file mode 100644
index 561f51608528..000000000000
--- a/gnome-base/libbonoboui/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription>
-	computer. It will however make a snappier openoffice than the binary  version.
-	The Bonobo UI library provides a number of user interface controls using the 
-	Bonobo component framework.	This module is heading towards planned deprecation.
-	It will continue to be supported and API/ABI stable	throughout the GNOME 2.x 
-	series, but we do not recommend using it in new applications unless you require
-	functionality that has not already been moved elsewhere.
-</longdescription>
-</pkgmetadata>
diff --git a/gnome-base/libglade-2.6.4-r2 b/gnome-base/libglade-2.6.4-r2
new file mode 100644
index 000000000000..b290305216dd
--- /dev/null
+++ b/gnome-base/libglade-2.6.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.10.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( python_single_target_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Library to construct graphical interfaces at runtime
+EAPI=5
+HOMEPAGE=https://library.gnome.org/devel/libglade/stable/
+IUSE=static-libs test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7 test
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.10.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] tools? ( python_single_target_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=tools? ( ^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) )
+SLOT=2.0
+SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c1b50d3053f3c0b1b6884a100d969f64
diff --git a/gnome-base/libglade/Manifest b/gnome-base/libglade/Manifest
deleted file mode 100644
index af82907e460b..000000000000
--- a/gnome-base/libglade/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX Makefile.in.am-2.4.2-xmlcatalog.patch 1121 BLAKE2B 44306faa45d22aedf392202a74dd52ebbd9ac67cf908f3f9c9318e7807b32ed3755df375aa2bfcd116f4a480a67c91e9896421633591c6978b1779f2bfa1775a SHA512 9b183d34df84e3bc4eb8e4484ed59a40d54b4fb33b5f2208e13cd4619bcdacd0276a339d9020505764cb0a99fd83255199eda53b48979656b81850144993be86
-AUX libglade-2.6.3-fix_tests-page_size.patch 369 BLAKE2B 0994633712e71d4d1919dbf5c5e7eaf74598991c3c80ff8a7bdc620f4b8e3fe9bb8852f88f84af24e5de4436fecbf7152d6ad5dbb96a3ded915dce69a506a941 SHA512 b294e48205725b4c3adc81fc86e28fd49bd902871eee64f21d4c3d14d1c9f65fd98e17aee99c39146d6fb7c128f3669e2bc99523240466c49e271912c20da35d
-AUX libglade-2.6.4-enable-extensions.patch 225 BLAKE2B 668fb60395b401e3acc9f93ab049a13621e404b7e3e9a7ee265bac6850eae20db0957064726fe9b4a8f9403ec60398585dec2c7762c65daef824eb8f444b295a SHA512 e9cf514612790984110f9c5dc8fe12f5e2b4707ea469a803f0db24dc1ff7561411e6e47faafa71037e23daa1a21b1bc8ac7fc6e699508c76e9cb5b4cf8c10fde
-AUX libglade-2.6.4-gold-glib-2.32.patch 544 BLAKE2B 0a7b0c89eab5e17788528743aa894f485e19bcc84f2175e1a4c64363ef3c0924e9fd7fdd7b20ff01a899cfbdb549ac00fc375e4b47cef98bc118a288ca332621 SHA512 d2d77d6e4d2bfe426222231dbca29b6003d33e3964ea6ab25f2f2c11d3b52ed9d1379c5f5d727980ad16b6db8d7bab2dc540830e169b70ce24e9afd8c170a1d8
-DIST libglade-2.6.4.tar.bz2 356119 BLAKE2B 7132a12affc4b6954eb9565236ca64a0f13f369dba630c14fdbb66a35d2273e8dd371baaad80ce97fd4480a6795629dd7f3bbee90a34b09c85041907a054f5c3 SHA512 b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735
-EBUILD libglade-2.6.4-r2.ebuild 2876 BLAKE2B dedbc0a48031f319bcea42aa31e97c6b1926f75875e81bd912d47cc8d79fc12195b48c3558bbefbbe87f6a29d334d077f2f94e655b15c311d9ee09ccf7ba3e89 SHA512 2ef8d6806fb65620e2dad89f8c2930d77a28a7a8090a0b72477e0c34a01e1346e665ce40f524c2b393832a39e310ff832456351ffad4bc88b774a1d18401db9e
-MISC metadata.xml 336 BLAKE2B c8f534b3eb5adf1f4e4b71a95b4dd7ecb6ddcf954d617eaf960a08d6ee43818c948c9ed72cbe252159a4185feaddef8a294e41277416618237a271ec84e90e5e SHA512 20b4ab7e8cf4ef4f714003fb96a18e249ab4a0fb5956e7f1475e827ff9dcbca0901abfeaab2b3d52e58745f21e0d09cfd20f58668d5074db8bc6d0a34438a5e3
diff --git a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch b/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
deleted file mode 100644
index 059cdc20f794..000000000000
--- a/gnome-base/libglade/files/Makefile.in.am-2.4.2-xmlcatalog.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Makefile.am	2004-11-11 18:56:13.000000000 +0800
-+++ b/Makefile.am	2004-12-06 11:00:24.501734048 +0800
-@@ -24,7 +24,7 @@
- 
- if HAVE_XMLCATALOG
- install-data-local:
--	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
-+#	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
- uninstall-local:
- 	-$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
- endif
---- a/Makefile.in	2004-11-11 19:21:38.000000000 +0800
-+++ b/Makefile.in	2004-12-06 11:00:49.786890120 +0800
-@@ -819,7 +819,7 @@
- 
- 
- @HAVE_XMLCATALOG_TRUE@install-data-local:
--@HAVE_XMLCATALOG_TRUE@	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
-+@HAVE_XMLCATALOG_TRUE@#	-$(XMLCATALOG) --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
- @HAVE_XMLCATALOG_TRUE@uninstall-local:
- @HAVE_XMLCATALOG_TRUE@	-$(XMLCATALOG) --noout --del $(xmldir)/glade-2.0.dtd $(XML_CATALOG_FILE)
- 
diff --git a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch b/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
deleted file mode 100644
index 37c5b69e544c..000000000000
--- a/gnome-base/libglade/files/libglade-2.6.3-fix_tests-page_size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/test-libglade-gtk.glade	2008-09-27 16:50:40.164242312 +0300
-+++ b/tests/test-libglade-gtk.glade	2008-09-27 16:50:43.460908927 +0300
-@@ -470,7 +470,7 @@
- 	  <upper>100</upper>
- 	  <step>1</step>
- 	  <page>10</page>
--	  <page_size>10</page_size>
-+	  <page_size>0</page_size>
- 	  <child>
- 	    <left_attach>1</left_attach>
- 	    <right_attach>2</right_attach>
diff --git a/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch b/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch
deleted file mode 100644
index 9be8fb93bf84..000000000000
--- a/gnome-base/libglade/files/libglade-2.6.4-enable-extensions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-AC_USE_SYSTEM_EXTENSIONS needed for Solaris
-
-https://bugs.gentoo.org/show_bug.cgi?id=430090
-
---- a/configure.in
-+++ b/configure.in
-@@ -22,6 +22,7 @@
- fi
- 
- AC_PROG_CC
-+AC_USE_SYSTEM_EXTENSIONS
- AC_ISC_POSIX
- AC_HEADER_STDC
- 
diff --git a/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch b/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch
deleted file mode 100644
index 0696dce58760..000000000000
--- a/gnome-base/libglade/files/libglade-2.6.4-gold-glib-2.32.patch
+++ /dev/null
@@ -1,17 +0,0 @@
- configure.in |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index e0c52a8..b2a4a4a 100644
---- a/configure.in
-+++ b/configure.in
-@@ -46,7 +46,8 @@ PKG_CHECK_MODULES(LIBGLADE, [dnl
-   libxml-2.0 >= required_libxml_version dnl
-   atk >= required_atk_version dnl
-   gtk+-2.0 >= required_gtk_version dnl
--  glib-2.0 >= required_glib_version])
-+  glib-2.0 >= required_glib_version dnl
-+  gmodule-no-export-2.0 >= required_glib_version])
- 
- AC_MSG_CHECKING([for native Win32])
- case "$host" in
diff --git a/gnome-base/libglade/libglade-2.6.4-r2.ebuild b/gnome-base/libglade/libglade-2.6.4-r2.ebuild
deleted file mode 100644
index c84622335aa7..000000000000
--- a/gnome-base/libglade/libglade-2.6.4-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE='xml(+)'
-
-inherit autotools eutils gnome2 multilib-minimal python-single-r1 virtualx
-
-DESCRIPTION="Library to construct graphical interfaces at runtime"
-HOMEPAGE="https://library.gnome.org/devel/libglade/stable/"
-
-LICENSE="LGPL-2"
-SLOT="2.0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs test tools"
-REQUIRED_USE="tools? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.10.0[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	tools? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-pkg_setup() {
-	use tools && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# patch to stop make install installing the xml catalog
-	# because we do it ourselves in postinst()
-	epatch "${FILESDIR}"/Makefile.in.am-2.4.2-xmlcatalog.patch
-
-	# patch to not throw a warning with gtk+-2.14 during tests, as it triggers abort
-	epatch "${FILESDIR}/${PN}-2.6.3-fix_tests-page_size.patch"
-
-	# Fails with gold due to recent changes in glib-2.32's pkg-config files
-	epatch "${FILESDIR}/${P}-gold-glib-2.32.patch"
-
-	# Needed for solaris, else gcc finds a syntax error in /usr/include/signal.h
-	epatch "${FILESDIR}/${P}-enable-extensions.patch"
-
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		glade/Makefile.am glade/Makefile.in || die
-
-	if ! use test; then
-		sed 's/ tests//' -i Makefile.am Makefile.in || die "sed failed"
-	fi
-
-	gnome2_src_prepare
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-multilib_src_configure() {
-	if ! multilib_is_native_abi || ! use tools; then
-		export am_cv_pathless_PYTHON=none
-	fi
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable static-libs static)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_test() {
-	Xemake check || die "make check failed"
-}
-
-multilib_src_install() {
-	dodir /etc/xml
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	local DOCS=( AUTHORS ChangeLog NEWS README )
-	einstalldocs
-}
-
-pkg_postinst() {
-	echo ">>> Updating XML catalog"
-	"${EPREFIX}"/usr/bin/xmlcatalog --noout --add "system" \
-		"https://glade.gnome.org/glade-2.0.dtd" \
-		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	echo ">>> removing entries from the XML catalog"
-	"${EPREFIX}"/usr/bin/xmlcatalog --noout --del \
-		"${EPREFIX}"/usr/share/xml/libglade/glade-2.0.dtd /etc/xml/catalog
-}
diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
deleted file mode 100644
index be1a70fa45d5..000000000000
--- a/gnome-base/libglade/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="tools">Install libglade-convert Python script.</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-base/libgnome-2.32.1-r1 b/gnome-base/libgnome-2.32.1-r1
new file mode 100644
index 000000000000..b64df862220b
--- /dev/null
+++ b/gnome-base/libgnome-2.32.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=gnome-base/gconf-2 >=dev-libs/glib-2.16:2 >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 media-libs/libcanberra >=dev-lang/perl-5 dev-util/gtk-doc-am >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Essential Gnome Libraries
+EAPI=5
+HOMEPAGE=https://library.gnome.org/devel/libgnome/stable/
+IUSE=branding debug
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2
+PDEPEND=gnome-base/gvfs
+RDEPEND=>=gnome-base/gconf-2 >=dev-libs/glib-2.16:2 >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 media-libs/libcanberra
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgnome/2.32/libgnome-2.32.1.tar.bz2 branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29dac9043f97f046dc719d91b6944449
diff --git a/gnome-base/libgnome-keyring-3.12.0-r1 b/gnome-base/libgnome-keyring-3.12.0-r1
new file mode 100644
index 000000000000..3901762fca68
--- /dev/null
+++ b/gnome-base/libgnome-keyring-3.12.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Compatibility library for accessing secrets
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
+IUSE=debug +introspection test vala debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.16.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.2.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-apps/dbus-1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/gnome-keyring-3.1.92 introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgnome-keyring/3.12/libgnome-keyring-3.12.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5e3d82065427e969bf88dda62d3ff55
diff --git a/gnome-base/libgnome-keyring/Manifest b/gnome-base/libgnome-keyring/Manifest
deleted file mode 100644
index ea87bf8d9f0d..000000000000
--- a/gnome-base/libgnome-keyring/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgnome-keyring-3.12.0.tar.xz 435092 BLAKE2B 16e02ce3509b98e325658fc64e5731a872a050a9bf1b39dc81347a53aaee2fd4726ab9b0a41c7451249954a01144488e720f8356e77dda5bc9da5f78416d30e1 SHA512 dd1777b6e0dd774feb86dbc72d9f2a85f2143e2772a09c438b84aec468ddc5e7ee5ebd534d24f079e5daf4757f2918d0621e26fb671fde0fcef9c74d30f8b9bd
-EBUILD libgnome-keyring-3.12.0-r1.ebuild 1732 BLAKE2B f8f7149c43b0406f53d380e4a28e155375ce3d51086ea6220709f8606b2c30955168d7af32217ee7436dfbea91cca52b193625f67488c965e1c9932ddfd04651 SHA512 5ca4a6468c96da508a4d28bc12d9bbb11b7647f943e4b39dca6c433bcb8848f354297f7cc1c2968f36fdefa78355e7ba386670b46f102ad9c3eef47344f14bdf
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild b/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
deleted file mode 100644
index a7b8b0d1067a..000000000000
--- a/gnome-base/libgnome-keyring/libgnome-keyring-3.12.0-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.16"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 vala multilib-minimal
-
-DESCRIPTION="Compatibility library for accessing secrets"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
-
-LICENSE="LGPL-2+ GPL-2+" # tests are GPL-2
-SLOT="0"
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.16.0:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libgcrypt-1.2.2:0=[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	>=gnome-base/gnome-keyring-3.1.92
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0 )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( ${PYTHON_DEPS} )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# FIXME: Remove silly CFLAGS, report upstream
-	sed -e 's:CFLAGS="$CFLAGS -g:CFLAGS="$CFLAGS:' \
-		-e 's:CFLAGS="$CFLAGS -O0:CFLAGS="$CFLAGS:' \
-		-i configure.ac configure || die "sed failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" gnome2_src_configure \
-		$(multilib_native_use_enable vala)
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/docs/reference/gnome-keyring/html docs/reference/gnome-keyring/html || die
-	fi
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	dbus-launch emake check || die "tests failed"
-}
diff --git a/gnome-base/libgnome-keyring/metadata.xml b/gnome-base/libgnome-keyring/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnome-keyring/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest
deleted file mode 100644
index 090a708e04bc..000000000000
--- a/gnome-base/libgnome/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libgnome-2.26.0-branding.patch 839 BLAKE2B b7f994739db6c2119bca6abfcc8c53221979a148f972470b0c9c2d2d126baee145e32de074a63c2aac5fda1a35dd9201904e13150876994bca42a9f60a7a9714 SHA512 de12f680f875ade002c752ea6595969b2948196299d3807592bb014ade59c51093e1d19f56d2f69fe381fece037a48c7dcb44c632ddc19128959db1dec54f473
-AUX libgnome-2.28.0-menus-have-icons.patch 538 BLAKE2B e4bca7e5ae5c7fe38d88e13347896a2d636db82584d0cbda015d617b14bc0ecbb434bc0f9ebc946765a3ec2c8e6f55ab1c7d2f780d955dedcaa0d007399544df SHA512 4897bd5497fd9cfbf778ab7c815028e5b819d1c1f69d2ad9bedb0f5895e8c7b7b40a918436026e494c83238c694145670046a0d0beeda31c5820bed5867eb1d2
-AUX libgnome-2.32.1-utf8-header.patch 930 BLAKE2B 32065fbe8e6d931f6c79209eb8acf11a4eda339832172822c6997a2ed03146d81d38d3ebb8b8238f3da9d62c0d8ad2c0937bb6e787f4889d68145adfbbcee290 SHA512 b72f124358ad66d00d00435cb5087163077361d33082e2b1dd9c06b9dd97203d515943d21214e834d2d0fbeedde7a85414b1a9ce39e734d6e1bf1bdab1664ad3
-DIST gentoo-gdm-theme-r3.tar.bz2 411703 BLAKE2B a4373d291f6813d2d07b78b23f5b5d1e288cb4a979a7b5cbe1351e6432cae2b24c07fa467b08c590a100e22807b3aa77ff085e0b8a9268e5542e81495013928a SHA512 47485899c698a2f6c3dee540806c0bbdedeab77a31b1f2b191f7f98d0d88a580aeb8dddf16fc33226db0519c21d185112421b5c6e233883ea4f67c844028281a
-DIST libgnome-2.32.1.tar.bz2 1776006 BLAKE2B 3e9fa78bf1b9a550588374809c90f7cabd7fc3fe17f18d6e1ce0ea463bfb6999279d1e0cfb4d8df1c64571e6d8c6a9c90bbe558ba7cd8c99f2a100bf9fbf83d9 SHA512 f94e603255a93e73249e0fd9ed5604d732b44ad46f3cc3065afb46fc6162f6cf29304f49440b5c06303b8e68608b6fd16236076813febb5f1cbdcde4bfc3b3e3
-EBUILD libgnome-2.32.1-r1.ebuild 1789 BLAKE2B e1ec0ef50077a5056443c41787b6ffd9c94d2e2c6af9f2023b1ab8a127e9b48793474483ee9f6e91401449718b5e1478f36af01154703485c223f6ba865bd228 SHA512 561557e7b6f602141d78b812f233712a3dc8593c3d64702c0ef632eee3e7036defbba95995df05c26526ca0b72582ead89ba07d6170dadd797f6d64f2aa11939
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch b/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch
deleted file mode 100644
index 2cab351e6b23..000000000000
--- a/gnome-base/libgnome/files/libgnome-2.26.0-branding.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in
---- libgnome-2.26.0.orig/schemas/desktop_gnome_background.schemas.in.in	2009-03-17 10:42:05.000000000 -0400
-+++ libgnome-2.26.0/schemas/desktop_gnome_background.schemas.in.in	2009-04-24 14:57:59.000000000 -0400
-@@ -29,7 +29,7 @@
-         <applyto>/desktop/gnome/background/picture_filename</applyto>
-         <owner>gnome</owner>
-         <type>string</type>
--	<default>@datadir@/pixmaps/backgrounds/gnome/background-default.jpg</default>
-+	<default>@datadir@/pixmaps/backgrounds/gnome/gentoo/gentoo-emergence.png</default>
-         <locale name="C">
-         <short>Picture Filename</short>
-         <long>File to use for the background image.</long>
diff --git a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch b/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch
deleted file mode 100644
index 7249696a7301..000000000000
--- a/gnome-base/libgnome/files/libgnome-2.28.0-menus-have-icons.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream changed default to no icons for menus. We don't want that. No one wants
-that.
-
----
---- schemas/desktop_gnome_interface.schemas.in.in
-+++ schemas/desktop_gnome_interface.schemas.in.in
-@@ -65,7 +65,7 @@
-       <applyto>/desktop/gnome/interface/menus_have_icons</applyto>
-       <owner>gnome</owner>
-       <type>bool</type>
--      <default>false</default>
-+      <default>true</default>
-       <locale name="C">
-         <short>Menus Have Icons</short>
-         <long>Whether menus may display an icon next to a menu entry.</long>
diff --git a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch b/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch
deleted file mode 100644
index a70dccc97e75..000000000000
--- a/gnome-base/libgnome/files/libgnome-2.32.1-utf8-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 33313713c4f5c1de500859ff128d6fd7e3af5722 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Mon, 7 Aug 2017 12:57:43 -0400
-Subject: gnome-config.h: Fix invalid UTF-8 in header
-
-This breaks the new Python `glib-mkenums`.
----
- libgnome/gnome-config.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgnome/gnome-config.h b/libgnome/gnome-config.h
-index 0c3dfe6..b9d659d 100644
---- a/libgnome/gnome-config.h
-+++ b/libgnome/gnome-config.h
-@@ -270,7 +270,7 @@ void gnome_config_clean_key_ (const char *path, gboolean priv);
- #define gnome_config_private_clean_key(path) \
- 	(gnome_config_clean_key_((path),TRUE))
- 
--/* returns the true filename of the config file�*/
-+/* returns the true filename of the config file */
- #define gnome_config_get_real_path(path) \
- 	(g_build_filename (gnome_user_dir_get(),(path),NULL))
- #define gnome_config_private_get_real_path(path) \
--- 
-cgit v0.12
-
diff --git a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
deleted file mode 100644
index 7134bf05adb7..000000000000
--- a/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Essential Gnome Libraries"
-HOMEPAGE="https://library.gnome.org/devel/libgnome/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="branding"
-
-SRC_URI="${SRC_URI}
-	branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )"
-
-RDEPEND="
-	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.16:2
-	>=gnome-base/gnome-vfs-2.5.3
-	>=gnome-base/libbonobo-2.13
-	>=dev-libs/popt-1.7
-	media-libs/libcanberra
-"
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-
-PDEPEND="gnome-base/gvfs"
-
-src_prepare() {
-	# Make sure menus have icons. People don't like change
-	epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch"
-
-	# Remove UTF-8 character from headers
-	# https://bugs.gentoo.org/639336
-	epatch "${FILESDIR}"/${PN}-2.32.1-utf8-header.patch
-
-	use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch
-
-	# Default to Adwaita theme over Clearlooks to proper gtk3 support
-	sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-canberra \
-		--disable-esd
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use branding; then
-		# Add gentoo backgrounds
-		dodir /usr/share/pixmaps/backgrounds/gnome/gentoo
-		insinto /usr/share/pixmaps/backgrounds/gnome/gentoo
-		doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png
-		doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png
-	fi
-}
diff --git a/gnome-base/libgnome/metadata.xml b/gnome-base/libgnome/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnomecanvas-2.30.3-r1 b/gnome-base/libgnomecanvas-2.30.3-r1
new file mode 100644
index 000000000000..53edf27859de
--- /dev/null
+++ b/gnome-base/libgnomecanvas-2.30.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1:2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-lang/perl-5 sys-devel/gettext >=dev-util/intltool-0.35 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=The Gnome 2 Canvas library
+EAPI=5
+HOMEPAGE=https://library.gnome.org/devel/libgnomecanvas/stable/
+IUSE=glade abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1:2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.3.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=86401c3b8ef7561b9f1796ef110b323d
diff --git a/gnome-base/libgnomecanvas/Manifest b/gnome-base/libgnomecanvas/Manifest
deleted file mode 100644
index f6f6ddfdafd8..000000000000
--- a/gnome-base/libgnomecanvas/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgnomecanvas-2.30.3.tar.bz2 574139 BLAKE2B 25f42bdb24899aaf6b2daf19242ba67a4bdae9a51bffaddc413b65a48843ccea1de11e18a82cc40ddec566ab25bf133811f00a8e7667a66b228ad8c855a8773d SHA512 b5bfa2133f5172abd5228d467db4d980dd4ac125cdbf55dcc1d5055dc3330861320c12cccb52ea63ba7f69824504c9d25781cd78001dc7a92b11c6f7e0c550de
-EBUILD libgnomecanvas-2.30.3-r1.ebuild 1680 BLAKE2B 9f3d6d23419b66e9654a6f0ce3a6fe81c8146dae42f83c3399f6317f3c83b4bcd5f73aca3c05f542721c9a24741023efafe82e0771c612ca2e804f51778b16da SHA512 03257888693cd0379c578cde5ced0ff6f04c43358623b396367de8480289205f7075d87a39aebf9a64ba8d053bf7beff1b52cbca56911d4c69aa5dcb56906669
-MISC metadata.xml 310 BLAKE2B bd322cd2300711715469acaec5e2930542ea48dde8e3444d465c9dfc13dbaddbd49885ddf04a643c07d67d75316f080ca587083001a0dc33cfb15b38b9bf7c19 SHA512 15504f6f0f8ba8e905677b293df85f64ec929c96b22a81a57803c47657a0f054039a1257086c02af49ab89a57b16d31d32619ccdf1f53ac2de93ce8fc2f99c12
diff --git a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild b/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
deleted file mode 100644
index 0f5756bec03a..000000000000
--- a/gnome-base/libgnomecanvas/libgnomecanvas-2.30.3-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib multilib-minimal virtualx
-
-DESCRIPTION="The Gnome 2 Canvas library"
-HOMEPAGE="https://library.gnome.org/devel/libgnomecanvas/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="glade"
-
-RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
-	>=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	glade? ( >=gnome-base/libglade-2.6.4-r1:2.0[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# Don't build demos that are not even installed, bug #226299
-	sed 's/^\(SUBDIRS =.*\)demos\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-		|| die "sed 2 failed"
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_enable glade) \
-		--disable-static
-
-	ln -s "${S}"/docs/reference/html docs/reference/html || die
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	einstalldocs
-}
-
-multilib_src_test() {
-	Xemake check || die "Test phase failed"
-}
diff --git a/gnome-base/libgnomecanvas/metadata.xml b/gnome-base/libgnomecanvas/metadata.xml
deleted file mode 100644
index d616878c0e84..000000000000
--- a/gnome-base/libgnomecanvas/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="glade">Enable glade support</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/libgnomekbd-3.22.0.1 b/gnome-base/libgnomekbd-3.22.0.1
new file mode 100644
index 000000000000..86f5f8118c3b
--- /dev/null
+++ b/gnome-base/libgnomekbd-3.22.0.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Gnome keyboard configuration library
+EAPI=6
+HOMEPAGE=https://www.gnome.org
+IUSE=+introspection test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.91.7:3[X,introspection?] >=x11-libs/libxklavier-5.2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+SLOT=0/8
+SRC_URI=mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ef9aba0edb1ce1a7a1fc91cb527a16c
diff --git a/gnome-base/libgnomekbd/Manifest b/gnome-base/libgnomekbd/Manifest
deleted file mode 100644
index 1d02559b7007..000000000000
--- a/gnome-base/libgnomekbd/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgnomekbd-3.22.0.1.tar.xz 450572 BLAKE2B cc7c0055dfae0c0593d9456e3de27da8cb33d9814151346a4a685a317f7701658392e6a403e942ceb928ebd9c06d0ba3b38c0f7f1abd08976c807d48d0246b58 SHA512 a4d2e6feac18cb7e3a65553dcd587f284c71154d3058866b0b6285b1acca549d33d0bd0014a97f1e153eb5e2a5a16e8b18eb680ce0078edd80bdd68a51ac080e
-EBUILD libgnomekbd-3.22.0.1.ebuild 769 BLAKE2B 58d9731b2987528629011d281b202e6d4df2c80684790640449661cde1a7c06ce9b2bf3a4c2b6e3bbc4c0db08141259e9ea7de5336c6a5bff38e226253939de5 SHA512 ababe33db7a72c81d17918291107e28a402b82adcff386d593468f67218b96b9017881dca47c733dcc0223ae5d977059787907c356161c2032197458ff30cf96
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild
deleted file mode 100644
index afe2aff53cac..000000000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.22.0.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="https://www.gnome.org"
-
-LICENSE="LGPL-2+"
-SLOT="0/8"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND="
-	>=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.91.7:3[X,introspection?]
-	>=x11-libs/libxklavier-5.2[introspection?]
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable test tests)
-}
diff --git a/gnome-base/libgnomekbd/metadata.xml b/gnome-base/libgnomekbd/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomekbd/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnomeprint-2.18.8-r1 b/gnome-base/libgnomeprint-2.18.8-r1
new file mode 100644
index 000000000000..a099695112d2
--- /dev/null
+++ b/gnome-base/libgnomeprint-2.18.8-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-print/libgnomecups-0.2.3-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/gettext >=dev-util/intltool-0.35 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/flex sys-devel/bison doc? ( ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/gtk-doc-0.9 ) >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Printer handling for Gnome
+EAPI=5
+HOMEPAGE=https://www.gnome.org/
+IUSE=cups doc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.34.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libart_lgpl-2.3.21-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cups? ( >=net-print/cups-1.7.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-print/libgnomecups-0.2.3-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=2.2
+SRC_URI=mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.8.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=beb7d068f349b1cfb8fd3d15827d0268
diff --git a/gnome-base/libgnomeprint/Manifest b/gnome-base/libgnomeprint/Manifest
deleted file mode 100644
index fc9da92e76a1..000000000000
--- a/gnome-base/libgnomeprint/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libgnomeprint-2.18.8-bison3.patch 861 BLAKE2B 44ae885666a4e66b43154690914667b21d7e99076e64ec223e6424fda76924c60f85873f61f6e40fbad7ddc405ae1dd5921f2596eec0864e5ec3bf7c73958021 SHA512 c13f2c5618bf28047e80155ed6d391930c5c986f4640d1e83aa3c323da7052bb2babf1772a37bc2782babd8ed072d18596d32792d4abf9440946dfd56e6cbfe8
-AUX libgnomeprint-2.18.8-cups-config.patch 1448 BLAKE2B 44477e228bd5aa5fce8be75e444c3a4cc2ed01cc0b62df5f16a11eea75a43e141fffc72c10dad806470b622f5f508ec5f638b70c265cb9bc47d9b4fca62ed288 SHA512 3290c71f0be264afe94428fb5c2f68287371a02e7497b657c9d3b9ef9bc358f82773d17da94fe67e585233236b9b5f2aed2d01ea5dc1c7e8f50696e00d80c89d
-AUX libgnomeprint-2.18.8-freetype-2.5.1.patch 3064 BLAKE2B 0b729d80486a43312f1558933cbce6dc06795eff52f4f1cae8602721a5d6d93050c8aa688faa27fef783565308aa815722cee704ee0b2ff72dbd93f3cf58ac0c SHA512 09a98494d3181df7356f6a19fcbd9ef23007d700baa0dc27373a5d03ae8983ce4bf21145384c75cc337676e8c58d5a4cdd43182ece4e6ec4fa6c447def355f1a
-AUX libgnomeprint-2.18.8-stdio-include.patch 271 BLAKE2B ddd56bebdcbd566d80514c7f9490ababb8b80f5fe052aaf3ca20c59a6c9b174dc1fd310ea3386e6f64bd14c80710f6857668eee6b38705ef8a5dc9a9892c2398 SHA512 3905f9d85606504666b8b4585a8360fc372504f2431049abf4518b8d8106c4c6e69f6cc401b48810d4252763f6adfcafe1303695350f91a17e2522f02898fce7
-DIST libgnomeprint-2.18.8.tar.bz2 880489 BLAKE2B e706e227c51b4be17246a86c59a29ec9129ea5dce7a073785debc29d04b2a13e71c731085088242bf4bc7946f7862f8d4c8c67b09afc05dc3e59d6809635a79d SHA512 eca4f118e918f8db04332c3c6df5370ee45497057b44747457b05f0517c55b38271b24cdf7493b8ba24875b2d53d99b5e64d5d63a04cd7fd895cb02ae1606469
-EBUILD libgnomeprint-2.18.8-r1.ebuild 2008 BLAKE2B 5b0e714c256dd2509a17780a9d0ad87bd8c5eb1c3029b76d3ef9b05e6988787d90f08249ffec6f7813a992a507633af8d8c0474d51fbf3c1aec93f36f9ed4544 SHA512 d8adfe9ed1d865756f3d0b5ed0536b9db1e82c8b304ba9be648f857ad45691249be3b2d7e4cd4fea088d634ad16fbaebc4e831fd8d3f7fcaeaa587f949b007fb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
deleted file mode 100644
index d9fbbdd84fb9..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-bison3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch
-
---- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig	2010-02-09 13:32:51.000000000 +0100
-+++ libgnomeprint-2.18.8/libgnomeprint/grammar.y	2013-11-03 21:44:59.859877696 +0100
-@@ -6,8 +6,6 @@
- #include <libgnomeprint/types.h>
- #include <libgnomeprint/gnome-print-filter.h>
- 
--#define YYPARSE_PARAM graph
--
- static void
- set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s)
- {
-@@ -99,7 +97,7 @@
- }
- 
- static int yylex (void *lvalp);
--static int yyerror (const char *s);
-+static int yyerror (graph_t *g, const char *s);
- %}
- 
- %union {
-@@ -117,6 +115,7 @@
- %type <p> pool
- 
- %pure_parser
-+%parse-param { graph_t *graph }
- 
- %start graph
- %%
-@@ -185,7 +184,7 @@
- %%
- 
- static int
--yyerror (const char *s)
-+yyerror (graph_t *g, const char *s)
- {
- 	return -1;
- }
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
deleted file mode 100644
index 999c6f075203..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-cups-config.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 29 Jun 2014 10:47:41 +0200
-Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config.
-
----
- configure.in | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 729278d..186fabf 100644
---- a/configure.in
-+++ b/configure.in
-@@ -223,17 +223,18 @@ AC_ARG_WITH(cups,
- )
- if test "x$try_cups" = "xyes"; then
- 	PKG_CHECK_MODULES(CUPS, "gmodule-2.0")
-+	AC_PATH_TOOL(CUPS_CONFIG, cups-config)
- 	AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20)
--	if cups-config --version --libs > /dev/null 2>&1; then
--	    verstxt=`cups-config --version`
-+	if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then
-+	    verstxt=`$CUPS_CONFIG --version`
- 	    vers=`echo "$verstxt" | \
- 		awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
- 	    if test "$vers" -lt 1001020; then
- 		    AC_MSG_RESULT(Cups found but the version found is less than 1.1.20)
-               cups_msg="Version requirement not satisfied"
- 	    else
--		    CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`"
--		    CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`"
-+		    CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`"
-+		    CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`"
- 		    AC_MSG_RESULT(Found version $verstxt)
- 	    fi
- 
--- 
-2.0.0
-
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
deleted file mode 100644
index 1a54e9be5b67..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-freetype-2.5.1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From e848ee98108ab8c5b12e2167b041b274b4bede83 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Thu, 8 Oct 2015 11:06:44 +0200
-Subject: [PATCH] Update freetype includes to work with >=freetype-2.5.1
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.in                    | 22 +++-------------------
- libgnomeprint/gnome-font-face.c |  3 ++-
- libgnomeprint/gnome-print-gdi.c |  2 +-
- libgnomeprint/gnome-rfont.c     |  4 ++--
- 4 files changed, 8 insertions(+), 23 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index c15bb69..aebe591 100644
---- a/configure.in
-+++ b/configure.in
-@@ -162,25 +162,9 @@ LDFLAGS="$LDFLAGS $LIBM"
- dnl =================================
- dnl Checking for freetype2
- dnl =================================
--FREETYPE_LIBS=
--FREETYPE_CFLAGS=
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--if test "x$FREETYPE_CONFIG" = "xno" ; then
--	AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint)
--else
--	FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
--	FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
--fi
--
--libgnomeprint_save_ldflags=$LDFLAGS
--LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
--
--freetype_version=false
--AC_MSG_NOTICE([checking for sufficiently new FreeType (at least 2.0.5)])
--AC_CHECK_LIB(freetype, FT_Get_Postscript_Name,:,[
--    AC_MSG_ERROR(You need FreeType2 (freetype-devel 2.0.5 or greater package) for this version of libgnomeprint)])
--
--LDFLAGS=$libgnomeprint_save_ldflags
-+dnl "freetype2 >= 17" means freetype-2.5.1
-+PKG_CHECK_MODULES(FREETYPE, freetype2 >= 17, ,
-+	[PKG_CHECK_MODULES(FREETYPE, freetype2, [FREETYPE_CFLAGS="$FREETYPE_CFLAGS -I`$PKG_CONFIG --variable=includedir freetype2`/freetype2/freetype"])])
- 
- dnl =================================
- dnl END: Checking for freetype2
-diff --git a/libgnomeprint/gnome-font-face.c b/libgnomeprint/gnome-font-face.c
-index 0447377..23794a8 100644
---- a/libgnomeprint/gnome-font-face.c
-+++ b/libgnomeprint/gnome-font-face.c
-@@ -36,7 +36,8 @@
- #include <stdarg.h>
- #include <locale.h>
- 
--#include <freetype/ftoutln.h>
-+#include <ft2build.h>
-+#include FT_OUTLINE_H
- 
- #include <libgnomeprint/gnome-print-private.h>
- #include <libgnomeprint/gnome-font-private.h>
-diff --git a/libgnomeprint/gnome-print-gdi.c b/libgnomeprint/gnome-print-gdi.c
-index f89a8e8..7755673 100755
---- a/libgnomeprint/gnome-print-gdi.c
-+++ b/libgnomeprint/gnome-print-gdi.c
-@@ -36,7 +36,7 @@
- #include <libgnomeprint/gp-gc-private.h>
- 
- #include <ft2build.h>
--#include <freetype/freetype.h>
-+#include FT_FREETYPE_H
- 
- #define WIN32_LEAN_AND_MEAN
- #include <windows.h>
-diff --git a/libgnomeprint/gnome-rfont.c b/libgnomeprint/gnome-rfont.c
-index 55ec261..a71bbda 100644
---- a/libgnomeprint/gnome-rfont.c
-+++ b/libgnomeprint/gnome-rfont.c
-@@ -28,8 +28,8 @@
- 
- #include <ft2build.h>
- #include FT_FREETYPE_H
--#include <freetype/ftglyph.h>
--#include <freetype/ftbbox.h>
-+#include FT_GLYPH_H
-+#include FT_BBOX_H
- #include <libart_lgpl/art_misc.h>
- #include <libart_lgpl/art_affine.h>
- #include <libart_lgpl/art_vpath.h>
--- 
-2.6.1
-
diff --git a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch b/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch
deleted file mode 100644
index dd9195434e87..000000000000
--- a/gnome-base/libgnomeprint/files/libgnomeprint-2.18.8-stdio-include.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/libgnomeprint/modules/cups/gnome-print-cups-transport.c
-+++ b/libgnomeprint/modules/cups/gnome-print-cups-transport.c
-@@ -34,6 +34,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <stdio.h>
- #include <unistd.h>
- #include <locale.h>
diff --git a/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild b/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild
deleted file mode 100644
index 599e35a3daac..000000000000
--- a/gnome-base/libgnomeprint/libgnomeprint-2.18.8-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools eutils gnome2 multilib-minimal
-
-DESCRIPTION="Printer handling for Gnome"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cups doc"
-
-RDEPEND=">=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}]
-	>=media-libs/libart_lgpl-2.3.21-r2[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]
-	>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
-	>=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	cups? (
-		>=net-print/cups-1.7.1-r1[${MULTILIB_USEDEP}]
-		>=net-print/libgnomecups-0.2.3-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	sys-devel/flex
-	sys-devel/bison
-	doc? (
-		~app-text/docbook-xml-dtd-4.1.2
-		>=dev-util/gtk-doc-0.9 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdio-include.patch \
-		"${FILESDIR}"/${P}-freetype-2.5.1.patch \
-		"${FILESDIR}"/${P}-bison3.patch \
-		"${FILESDIR}"/${P}-cups-config.patch
-	eautoreconf
-	gnome2_src_prepare
-
-	# Drop DEPRECATED flags, bug #384807
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED::g' \
-		configure.in configure || die
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		libgnomeprint/ttsubset/Makefile.am \
-		libgnomeprint/ttsubset/Makefile.in || die
-}
-
-multilib_src_configure() {
-	# Disable papi support until papi is in portage; avoids automagic
-	# dependencies on an untracked library.
-
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(use_with cups) \
-		--without-papi \
-		--disable-static
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_install_all() {
-	DOCS="AUTHORS BUGS ChangeLog* NEWS README"
-	einstalldocs
-}
diff --git a/gnome-base/libgnomeprint/metadata.xml b/gnome-base/libgnomeprint/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomeprint/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnomeprintui-2.18.6-r2 b/gnome-base/libgnomeprintui-2.18.6-r2
new file mode 100644
index 000000000000..16be02a9d7f0
--- /dev/null
+++ b/gnome-base/libgnomeprintui-2.18.6-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=gnome-base/libgnomeprint-2.12.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/libgnomecanvas-1.117[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-themes/adwaita-icon-theme sys-devel/gettext virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=User interface libraries for gnome print
+EAPI=6
+HOMEPAGE=https://www.gnome.org/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=gnome-base/libgnomeprint-2.12.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=gnome-base/libgnomecanvas-1.117[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.6:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-themes/adwaita-icon-theme
+SLOT=2.2
+SRC_URI=mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=159da39a3d1facafd84aea5f49f695e1
diff --git a/gnome-base/libgnomeprintui/Manifest b/gnome-base/libgnomeprintui/Manifest
deleted file mode 100644
index 64f42cabd4be..000000000000
--- a/gnome-base/libgnomeprintui/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX libgnomeprintui-2.18.6-adwaita-icon-theme.patch 432 BLAKE2B aa074c916814318b030fdfd2a3280d4d8a2651fb8849612b719ea56832688d8d5e31fa363dfbe426687c6b0ec6168488375a491617d26dd34aabff6fe1e9d460 SHA512 99af09eb081b419d126ac0bc664da16cfae67fede67190f67f48642efa1624cb49690601514ff77978c9577b76d9c9e79b775f96eab0961e890871be2a88681a
-AUX libgnomeprintui-2.18.6-intl.patch 375 BLAKE2B 3b7e6940ff666cb6c2bd0ba38242c5ed3d0d12020c649f1ac8500a7c70d691d217797eb2df04838272468730e173e16be648f8120950f7dae8cdeea112e14847 SHA512 78f37aa03642d78eef38923b9b487748c275571ddba090ce96c52797f7166f8930f937c3b579fcd83255d9fa703c6fb5f718d734cfb9e2af289059ee482035ee
-AUX libgnomeprintui-2.18.6-orientation-for-preview.patch 1660 BLAKE2B b86a794c8e5942de0469cd2f6de5c2b873df3fe321f25bc8e8923d9644f8a4ac7bcc36bfbb0c29b5a2a4c2e7cb3aa3b0b0c05db6a5094c6712bcf7385a12b815 SHA512 aac905ee6e66367a36a2f2d1d256e3a97f1071fbd445e5d759a42ede3f0f59c3e80b4108b948de3b44ab24a0c2ae8cc32dbc72dbbbb3bde6c94d725741faa6b6
-AUX libgnomeprintui-2.18.6-system-config-printer.patch 710 BLAKE2B 342dc6936553a6fa2c51e119056058275255bf720b6fa5bb0dd551ae5f2d4821ddfb048416b0ad61b481a4b59e9468bbf3b7cd348a7304a90e323530577c1628 SHA512 35323ad7e829ce5dc0f607637e16cfeb5d88fe63685801887b2c295b5f81640722d9f25c1e85c9a346c6dd2c38bde5bcc9cb97c529a154dfd5d52a6b66452c70
-DIST libgnomeprintui-2.18.6.tar.bz2 681125 BLAKE2B 2850749f0d41cada9ecc377ff1fad17d1d629094f423f012069790c5b5ec56c047668a8e2d703a11e8654046b1c8e06c075fb350e2d25e05a06622c3a2072efc SHA512 acf44fd8b273f5e48c9c7224647704c1d45a66c8fb7279414028506fd6b8941126636499793c825a767f2f731fcddce78ce750670969d5ff9236e9ff75dca002
-EBUILD libgnomeprintui-2.18.6-r2.ebuild 1143 BLAKE2B 840c6958808eafe15e0de13eb5ef103020003625e5285dc8920b2118b1a5596b79968570e584a54f75a58a2fc799469e8ff61e09cd36e83d8cd47c9f5bbca4f1 SHA512 6a4e8afc4cba31086cce62d2602b3fde587e808035b5fa99c73420750e8dbd4f1f24c8401310f8f6c9705c0cf0e5cd0fbf1d3d94f56c4e4cb3b91aba069928eb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
deleted file mode 100644
index f1fc4541db65..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-adwaita-icon-theme.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./configure.in.orig ./configure.in
---- ./configure.in.orig	2014-05-04 11:07:55.308844477 +0300
-+++ ./configure.in	2014-05-04 11:08:26.884571685 +0300
-@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [
- 	gtk+-2.0	   >= 2.6.0
- 	libgnomeprint-2.2  >= 2.12.1
- 	libgnomecanvas-2.0 >= 1.117.0
--	gnome-icon-theme   >= 1.1.92
-+	adwaita-icon-theme >= 1.1.92
- ])
- AC_SUBST(LIBGNOMEPRINTUI_CFLAGS)
- AC_SUBST(LIBGNOMEPRINTUI_LIBS)
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
deleted file mode 100644
index db206e6b13e8..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-intl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am~	2010-02-09 12:33:13.000000000 +0000
-+++ libgnomeprintui-2.18.6/libgnomeprintui/gpaui/Makefile.am	2015-11-03 23:16:49.625137517 +0000
-@@ -2,7 +2,6 @@
- 
- INCLUDES = \
- 	-I$(top_srcdir) \
--	-I$(top_srcdir)/intl \
- 	-I$(top_srcdir)/libgnomeprintui \
- 	-DWE_ARE_LIBGNOMEPRINT_INTERNALS \
- 	$(LIBGNOMEPRINTUI_CFLAGS)	\
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
deleted file mode 100644
index 3a6aa63fe356..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-orientation-for-preview.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- ./libgnomeprintui/gnome-print-job-preview.c.orig	2012-02-23 22:48:42.000000000 +0600
-+++ ./libgnomeprintui/gnome-print-job-preview.c	2012-02-25 00:18:43.000000000 +0600
-@@ -152,6 +152,7 @@ 
- 	GtkWidget *last;
- 	GnomeCanvas *canvas;
- 	GnomePrintConfig *config;
-+    guchar *paper_orientation_save;
- 
- 	guint current_page, current_offset;
- 
-@@ -2187,6 +2188,19 @@ 
- 	if (jp->config)
- 		g_object_unref (G_OBJECT (jp->config));
- 	jp->config = config;
-+    if( config ) {
-+        guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION );
-+        if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) ||
-+            ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) {
-+            jp->paper_orientation_save =
-+                gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION );
-+            gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt );
-+            g_free ( txt );
-+        }
-+        else {
-+            jp->paper_orientation_save = NULL;
-+        }
-+    }
- 	if (!jp->config)
- 		return;
- 	g_object_ref (G_OBJECT (jp->config));
-@@ -2389,6 +2403,13 @@ 
- {
- 	GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object);
- 
-+    if( jp->paper_orientation_save ) {
-+        gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION,
-+                                jp->paper_orientation_save );
-+        g_free ( jp->paper_orientation_save );
-+        jp->paper_orientation_save = NULL;
-+    }
-+
- 	gnome_print_job_preview_set_config (jp, NULL);
- 	gnome_print_job_preview_set_job (jp, NULL);
- 
diff --git a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch b/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
deleted file mode 100644
index 57e188c863b7..000000000000
--- a/gnome-base/libgnomeprintui/files/libgnomeprintui-2.18.6-system-config-printer.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -p -up libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c
---- libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c.system-config-printer	2008-09-23 10:49:59.000000000 +0200
-+++ libgnomeprintui-2.18.3/libgnomeprintui/gnome-printer-selector.c	2008-09-23 10:50:47.000000000 +0200
-@@ -47,7 +47,7 @@
- #include "gpaui/gpa-transport-selector.h"
- 
- #define GPS_PAD 4
--#define ADD_PRINTER_APP	"gnome-cups-add"
-+#define ADD_PRINTER_APP	"system-config-printer"
- 
- static void gnome_printer_selector_class_init (GnomePrinterSelectorClass *klass);
- static void gnome_printer_selector_init (GObject *object);
diff --git a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild b/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
deleted file mode 100644
index ab335f9a1373..000000000000
--- a/gnome-base/libgnomeprintui/libgnomeprintui-2.18.6-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit autotools gnome2 multilib-minimal
-
-DESCRIPTION="User interface libraries for gnome print"
-HOMEPAGE="https://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=gnome-base/libgnomeprint-2.12.1[${MULTILIB_USEDEP}]
-	>=gnome-base/libgnomecanvas-1.117[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.6:2[${MULTILIB_USEDEP}]
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-src_prepare() {
-	# Patches from Mageia
-	eapply "${FILESDIR}"/${P}-adwaita-icon-theme.patch
-	eapply "${FILESDIR}"/${P}-intl.patch
-	eapply "${FILESDIR}"/${P}-orientation-for-preview.patch
-	eapply "${FILESDIR}"/${P}-system-config-printer.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
diff --git a/gnome-base/libgnomeprintui/metadata.xml b/gnome-base/libgnomeprintui/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomeprintui/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgnomeui-2.24.5-r1 b/gnome-base/libgnomeui-2.24.5-r1
new file mode 100644
index 000000000000..436cf80a2daf
--- /dev/null
+++ b/gnome-base/libgnomeui-2.24.5-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/atk >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.20:2 >=dev-libs/popt-1.5 >=gnome-base/gconf-2:2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 gnome-base/libgnome-keyring >=gnome-base/libbonoboui-2.13.1 >=gnome-base/libglade-2:2.0 media-libs/libart_lgpl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 >=x11-libs/pango-1.1.2 x11-libs/libICE x11-libs/libSM dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig >=dev-util/intltool-0.40 >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=User Interface routines for Gnome
+EAPI=5
+HOMEPAGE=https://library.gnome.org/devel/libgnomeui/stable/
+IUSE=test
+KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2
+PDEPEND=x11-themes/adwaita-icon-theme
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.20:2 >=dev-libs/popt-1.5 >=gnome-base/gconf-2:2 >=gnome-base/gnome-keyring-0.4 >=gnome-base/gnome-vfs-2.7.3:2 >=gnome-base/libgnome-2.13.7 >=gnome-base/libgnomecanvas-2 gnome-base/libgnome-keyring >=gnome-base/libbonoboui-2.13.1 >=gnome-base/libglade-2:2.0 media-libs/libart_lgpl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.14:2 >=x11-libs/pango-1.1.2 x11-libs/libICE x11-libs/libSM
+SLOT=0
+SRC_URI=mirror://gnome/sources/libgnomeui/2.24/libgnomeui-2.24.5.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b2a61324d37084ad79f4f12d87bc00ba
diff --git a/gnome-base/libgnomeui/Manifest b/gnome-base/libgnomeui/Manifest
deleted file mode 100644
index af008d6f943c..000000000000
--- a/gnome-base/libgnomeui/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgnomeui-2.24.5.tar.bz2 1440172 BLAKE2B 3ffe1942b993fbd112029637cfe7eca031b500dac526c88cf1b28ed6d9f17232fd6e6d4220d455c852f73cd1ff6b074c47d30fd926b677ec426f1351def525b4 SHA512 e78fbe909179161acb6f7a1d31b8a247c9007af55c7f9c36422791be8d2681d42edfa582c19db88459d36309a18c03cb859997fe6b5918f602884607a8b6d5d5
-EBUILD libgnomeui-2.24.5-r1.ebuild 1330 BLAKE2B 753bcca40813d4bbcc9a14c901e0ccc807618a5971cb93428ec2d8c14de24e124fd1bfe5baa9a9ff0b4be4dc9ff22f171eed13c21d14f4eb749fbc0c0de44ec0 SHA512 4493e1ca96231381c64fd7d5e8476f1532255e1f2ab40082060ae11038d1be3bd2fbd0007f9e7c2ee9e2414753e284a56aea8c7cf97dea5d52b11bd5597ef59d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild b/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
deleted file mode 100644
index 31b9073ddb12..000000000000
--- a/gnome-base/libgnomeui/libgnomeui-2.24.5-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="User Interface routines for Gnome"
-HOMEPAGE="https://library.gnome.org/devel/libgnomeui/stable/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="test"
-
-# gtk+-2.14 dep instead of 2.12 ensures system doesn't loose VFS capabilities in GtkFilechooser
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.16:2
-	>=dev-libs/libxml2-2.4.20:2
-	>=dev-libs/popt-1.5
-	>=gnome-base/gconf-2:2
-	>=gnome-base/gnome-keyring-0.4
-	>=gnome-base/gnome-vfs-2.7.3:2
-	>=gnome-base/libgnome-2.13.7
-	>=gnome-base/libgnomecanvas-2
-	gnome-base/libgnome-keyring
-	>=gnome-base/libbonoboui-2.13.1
-	>=gnome-base/libglade-2:2.0
-	media-libs/libart_lgpl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.14:2
-	>=x11-libs/pango-1.1.2
-	x11-libs/libICE
-	x11-libs/libSM
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-PDEPEND="x11-themes/adwaita-icon-theme"
-
-src_prepare() {
-	if ! use test; then
-		sed 's/ test-gnome//' -i Makefile.am Makefile.in || die "sed failed"
-	fi
-	gnome2_src_prepare
-}
diff --git a/gnome-base/libgnomeui/metadata.xml b/gnome-base/libgnomeui/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgnomeui/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/libgtop-2.36.0 b/gnome-base/libgtop-2.36.0
new file mode 100644
index 000000000000..25f4b6b06912
--- /dev/null
+++ b/gnome-base/libgtop-2.36.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) >=dev-util/gtk-doc-am-1.4 >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A library that provides top functionality to applications
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/libgtop
+IUSE=+introspection
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+SLOT=2/10
+SRC_URI=mirror://gnome/sources/libgtop/2.36/libgtop-2.36.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=37895f6d25a26ceea79aa106dd23f501
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
deleted file mode 100644
index 4283e8b872b9..000000000000
--- a/gnome-base/libgtop/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
-EBUILD libgtop-2.36.0.ebuild 769 BLAKE2B b5247d7371184e217fa7f0242305577a009969c6ea9c2c67a45fa2646fa0441a5ff26c7d2e73b3f54b27347b1c9d7e76dd4afa3e64d5fa3d3a76a008e8503728 SHA512 525471e9a3d833b559a4cc5a963d9b6e8a7b25cceb8839c716ea2b6e764cd5b03756d767a434913940ab8542f62481d7b7b1aabe0d6f979f1987534211089a83
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
deleted file mode 100644
index dd04cae7630b..000000000000
--- a/gnome-base/libgtop/libgtop-2.36.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2
-
-DESCRIPTION="A library that provides top functionality to applications"
-HOMEPAGE="https://git.gnome.org/browse/libgtop"
-
-LICENSE="GPL-2"
-SLOT="2/10" # libgtop soname version
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Add explicit stdc, bug #628256
-	append-cflags "-std=c99"
-
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
diff --git a/gnome-base/libgtop/metadata.xml b/gnome-base/libgtop/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-base/libgtop/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-base/librsvg-2.40.18 b/gnome-base/librsvg-2.40.18
new file mode 100644
index 000000000000..9a01ad328fd3
--- /dev/null
+++ b/gnome-base/librsvg-2.40.18
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 ) dev-libs/gobject-introspection-common dev-libs/vala-common >=dev-util/gtk-doc-am-1.13 >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Scalable Vector Graphics (SVG) rendering library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/LibRsvg
+IUSE=+introspection tools vala abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libcroco-0.6.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.10.8:= ) tools? ( >=x11-libs/gtk+-3.10.0:3 )
+REQUIRED_USE=vala? ( introspection )
+SLOT=2
+SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.18.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=97794b283f3cafb3294ee4a6a0121865
diff --git a/gnome-base/librsvg/Manifest b/gnome-base/librsvg/Manifest
deleted file mode 100644
index 8942de41ecdd..000000000000
--- a/gnome-base/librsvg/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX librsvg-2.40.12-gtk-optional.patch 2192 BLAKE2B 6f04fb0a8ad1cef7847eab6b74708343c558b32256b19c70dc6e90ef8894e59b0992d214261dc1fe5ffcb020b5f2f3dd16fb73747e85cc03f0e017b5c5758281 SHA512 d9af98164138c52781117d72b4245ac03b7049f8743cc7f644314ba10d0e74c0f2f08a7c9d163bdef3e07ca3a66ce75089c23af3562ff0afebbae838c901bddb
-AUX librsvg-2.40.2-vala-out-of-source.patch 1066 BLAKE2B 43bb0dfdc90f3fe3084e23ee5d275d92e41a60f7f5c3763180c91232f4543fe93b036ff22a455247b15d09f514bd8a9a4145ac1aec09b444cb9fc5414410c4b9 SHA512 6a8e8035183a965c7359c6258cde5a842c2eda662a9ccebbe27ea27eb978591255664a837124e65f25e2653980c354c6c4b9ae11427cc27fe46ccfcdcde8102f
-DIST librsvg-2.40.18.tar.xz 574384 BLAKE2B 964997ef3bd5f8bdcab43e67f22d12458683c0eeee2fa81e7a6199f6a31c7ac11c599327a6a66118000f63549ea735a042c71429635f6dc9bf073f12eab067b6 SHA512 faf503d0d881801ce129715e7ae979ee1675bd32beac9170b1889c94aac64caf486968bc86f3480463b84e94f28c1d805551ffdcb7068ecadd0688146e0fb182
-EBUILD librsvg-2.40.18.ebuild 2676 BLAKE2B e47af1be268099f6b78b7ef3b66609e3f69e70d207e1df4bccd002b604638fd166b028de95646c6dfe39b3dcbe090a2e67679e02fc4c42b09f3a53cc0542f27d SHA512 a1f1a21701c19546b0cc78a45b29c4bb8f643829b007f45a1d221477115c5f667e57342338a40e5e566617e5fd6c6f60d361b041a55c4c992ed4d93a83237a1f
-MISC metadata.xml 311 BLAKE2B a08d15c269bf4c4eb82ea8daa3a563c899bf6029b4e9cb3efdb9c470a9885b3f349e1f20a8010f1bebf2120ffd79b8ac1601117c4cf4b026a854edc3f12aaa36 SHA512 b2bc97563f3fe4e9af71ee1af9d68afc6c99d7f1ca27e21defad6e479d16e79cc0cc317c7da7930e0b345100dafdf5c5f2e5aa990acd5b5f2e01e775e9ad99f4
diff --git a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch b/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
deleted file mode 100644
index b7c5b85223de..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.40.12-gtk-optional.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 18917f7fd3160afe06019f4b6234aeb78a3fdb4e Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Tue, 19 Nov 2013 16:00:29 +0000
-Subject: [PATCH] configure: add option to enable/disable use of GTK+
-
-Distro packagers like predictability and automatically detected optional
-dependencies are not predicable.  Add a --with-gtk3 option (default to "auto")
-for forcibly controlling whether GTK+ will be used or not.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=712693
----
- configure.in |   17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f7a89dc..1498f72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,17 +119,22 @@ AC_CHECK_FUNCS(strtok_r)
- # GTK
- # ===========================================================================
- 
--PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= $GTK3_REQUIRED],[have_gtk_3=yes],[have_gtk_3=no])
--
- GTK3_BINARY_VERSION=
- 
--if test "$have_gtk_3" = "yes"; then
--    GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
-+AC_MSG_CHECKING([whether to use GTK+ 3])
-+AC_ARG_WITH([gtk3],
-+  [AS_HELP_STRING([--without-gtk3],[Don't build GTK+3 tools (default=auto)])],
-+  [],[PKG_CHECK_EXISTS([gtk+-3.0 >= $GTK3_REQUIRED],[with_gtk3=yes],[with_gtk3=no])])
-+AC_MSG_RESULT([$with_gtk3])
-+
-+if test "$with_gtk3" = "yes"; then
-+  PKG_CHECK_MODULES(GTK3, [gtk+-3.0 >= $GTK3_REQUIRED])
-+  GTK3_BINARY_VERSION="`$PKG_CONFIG --variable=gtk_binary_version gtk+-3.0`"
- fi
- 
- AC_SUBST([GTK3_BINARY_VERSION])
- 
--AM_CONDITIONAL([HAVE_GTK_3],[test "$have_gtk_3" = "yes"])
-+AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk3" = "yes"])
- 
- dnl ===========================================================================
- dnl GDK-Pixbuf SVG loader
-@@ -305,6 +310,6 @@ librsvg-$VERSION
- 	Build introspectable bindings:  ${found_introspection}
- 	Build Vala bindings:            ${enable_vala}
- 	Build GdkPixbuf loader:         ${enable_pixbuf_loader}
--        GTK+ $GTK3_REQUIRED or later:           ${have_gtk_3}
-+        GTK 3.0:                        ${with_gtk3}
- 	Build miscellaneous tools:      ${build_misc_tools}
- "
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch b/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch
deleted file mode 100644
index bda090572a8d..000000000000
--- a/gnome-base/librsvg/files/librsvg-2.40.2-vala-out-of-source.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bf4da5524d50e1068f851bcbe50c8f8ae1948d73 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 18 Jun 2014 09:44:51 +0200
-Subject: [PATCH] build: Fix building .vapi out-of-source.
-
-Rsvg-2.0-custom.vala file resides in $(srcdir), and therefore full path
-needs to be given to vapigen. Otherwise, the build fails when build is
-performed out-of-source.
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index e881100..dc6b0c9 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -257,7 +257,7 @@ VAPIGEN_VAPIS = librsvg-$(RSVG_API_VERSION).vapi
- 
- librsvg_@RSVG_API_VERSION_U@_vapi_DEPS = gio-2.0 cairo
- librsvg_@RSVG_API_VERSION_U@_vapi_METADATADIRS = $(srcdir)
--librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir Rsvg-$(RSVG_API_VERSION)-custom.vala
-+librsvg_@RSVG_API_VERSION_U@_vapi_FILES = Rsvg-$(RSVG_API_VERSION).gir $(srcdir)/Rsvg-$(RSVG_API_VERSION)-custom.vala
- 
- vapidir = $(datadir)/vala/vapi
- vapi_DATA = $(VAPIGEN_VAPIS)
--- 
-2.0.0
-
diff --git a/gnome-base/librsvg/librsvg-2.40.18.ebuild b/gnome-base/librsvg/librsvg-2.40.18.ebuild
deleted file mode 100644
index 2ab6d776ea39..000000000000
--- a/gnome-base/librsvg/librsvg-2.40.18.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils gnome2 multilib-minimal vala
-
-DESCRIPTION="Scalable Vector Graphics (SVG) rendering library"
-HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
-
-LICENSE="LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="+introspection tools vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
-	>=x11-libs/cairo-1.12.14-r4[${MULTILIB_USEDEP}]
-	>=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
-	>=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libcroco-0.6.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-0.10.8:= )
-	tools? ( >=x11-libs/gtk+-3.10.0:3 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	dev-libs/vala-common
-	>=dev-util/gtk-doc-am-1.13
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	vala? ( $(vala_depend) )
-"
-# >=gtk-doc-am-1.13, gobject-introspection-common, vala-common needed by eautoreconf
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=653323
-	eapply "${FILESDIR}/${PN}-2.40.12-gtk-optional.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731826
-	eapply "${FILESDIR}/${PN}-2.40.2-vala-out-of-source.patch"
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# -Bsymbolic is not supported by the Darwin toolchain
-	if [[ ${CHOST} == *-darwin* ]]; then
-		myconf+=( --disable-Bsymbolic )
-	fi
-
-	# --disable-tools even when USE=tools; the tools/ subdirectory is useful
-	# only for librsvg developers
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		--disable-static \
-		--disable-tools \
-		$(multilib_native_use_enable introspection) \
-		$(multilib_native_use_with tools gtk3) \
-		$(multilib_native_use_enable vala) \
-		--enable-pixbuf-loader \
-		"${myconf[@]}"
-
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/html doc/html || die
-	fi
-}
-
-multilib_src_compile() {
-	# causes segfault if set, see bug #411765
-	unset __GL_NO_DSO_FINALIZER
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	# causes segfault if set, see bug 375615
-	unset __GL_NO_DSO_FINALIZER
-	multilib_foreach_abi gnome2_pkg_postrm
-}
diff --git a/gnome-base/librsvg/metadata.xml b/gnome-base/librsvg/metadata.xml
deleted file mode 100644
index fb664414b62c..000000000000
--- a/gnome-base/librsvg/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="tools">Build svg viewer tool</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/metadata.xml b/gnome-base/metadata.xml
deleted file mode 100644
index 0fe9232faaf5..000000000000
--- a/gnome-base/metadata.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The gnome-base category contains core GNOME packages.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnome-base enthält die GNOME Basispakete.
-	</longdescription>
-	<longdescription lang="es">
-		La catagoría gnome-base contiene los paquetes principales de GNOME.
-	</longdescription>
-	<longdescription lang="ja">
-		gnome-baseカテゴリーにはGNOMEのコア・パッケージが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De gnome-base categorie bevat de basisonderdelen van de GNOME desktopomgeving.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnome-base chứa các gói GNOME cốt lõi.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnome-base contiene i pacchetti base di GNOME.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnome-base contém os pacotes principais de GNOME.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnome-base zawiera podstawowe pakiety środowiska GNOME.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnome-base/nautilus-3.20.4 b/gnome-base/nautilus-3.20.4
new file mode 100644
index 000000000000..0b75361aa6ee
--- /dev/null
+++ b/gnome-base/nautilus-3.20.4
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.19.12:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 >=dev-util/gtk-doc-am-1.10 >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A file manager for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IUSE=exif gnome +introspection packagekit +previewer selinux sendto tracker xmp test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk]
+RDEPEND=>=dev-libs/glib-2.45.7:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.19.12:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-0.16:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/3.20/nautilus-3.20.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49fa04932be85148edf1d96766bd28fc
diff --git a/gnome-base/nautilus-3.24.2.1 b/gnome-base/nautilus-3.24.2.1
new file mode 100644
index 000000000000..56f76afc6f28
--- /dev/null
+++ b/gnome-base/nautilus-3.24.2.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-1:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.33 >=dev-util/gtk-doc-am-1.10 >=sys-devel/gettext-0.19.7 virtual/pkgconfig x11-base/xorg-proto >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A file manager for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Nautilus
+IUSE=exif gnome +introspection packagekit +previewer selinux sendto tracker xmp test
+KEYWORDS=~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=gnome? ( x11-themes/adwaita-icon-theme ) tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 ) previewer? ( >=gnome-extra/sushi-0.1.9 ) sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 ) >=gnome-base/gvfs-1.14[gtk]
+RDEPEND=>=app-arch/gnome-autoar-0.2.1 >=dev-libs/glib-2.51.2:2[dbus] >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.21.6:3[introspection?] >=dev-libs/libxml2-2.7.8:2 >=gnome-base/gnome-desktop-3:3= gnome-base/dconf >=gnome-base/gsettings-desktop-schemas-3.8.0 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender exif? ( >=media-libs/libexif-0.6.20 ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) selinux? ( >=sys-libs/libselinux-2 ) tracker? ( >=app-misc/tracker-1:= ) xmp? ( >=media-libs/exempi-2.1.0:2 ) packagekit? ( app-admin/packagekit-base ) sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=565da9ebcc4f7e194f899783f593adac
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
deleted file mode 100644
index e1640de139c1..000000000000
--- a/gnome-base/nautilus/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST nautilus-3.20.4.tar.xz 3453376 BLAKE2B 47e09f45909f6abd735c976ea6ab0b90c918490193a931b186472d9be1d22f5c7314647ec14e36a88b9f8013f3784f7788b4d9ef136e139e1b1cb41b0167c378 SHA512 01bee5c70067c508ca918948afe0b400680eb68518ae69803e2971a215b0eaf54c9251566c6c44835a1c0b9b20248450539a47936c6aba5c9accc9ef3cbe8a8e
-DIST nautilus-3.24.2.1.tar.xz 5143440 BLAKE2B 731046b6bdd0817b770cf3e2f0667187bfde613cf1a15611e6ec06e74bc3c2432ca66894119f224023fe46b01fd777d3dde2d2ac7bba0a9eb0fd71d38e1756ff SHA512 f6868600bcdc82071b3a63f4e4a0f7decf0d72e021eb3d0c26e914413c858163ee4403c4f3ef7689556a0fc91394f30cff9a3db14da030b277b50972c7b80a07
-EBUILD nautilus-3.20.4.ebuild 2845 BLAKE2B d2bba71577e58e052e7ebfcb70bf5fd2b8bf2d29c17eca783466b477ac848e1d4d64b946e0f270f594dda877efc49ce585b674af8f532460bd373474e3838d73 SHA512 d8a41c19d696094b9fbe547b5933a7c4f78b95ff30818a814ca7e50270fadbdaf93624381547493603913b573c00f36bef840e493a0744978dd0fa5462b8b015
-EBUILD nautilus-3.24.2.1.ebuild 2874 BLAKE2B 0a8456f9952f4b91a92635b3f6b2b00268214f8d128646dc294f24be9c78eb56bb5fd9d12cf3ad7734a131b8886895b2a623176eb1be38fb87470c2125633393 SHA512 9f510f28d2b1d7e2128d224b9fc25da4450b76530a697f7c1fb1e129dd1af60de07fe226ccdc873131947562b9eb2f4353466c32ed078195e87ee74f46504334
-MISC metadata.xml 795 BLAKE2B 5932c49c4317d89bb5bbc9754909397129147647a203cb5ee6e2d984850fbe87fa567f7e77b8b8afb329b4ea8d1c29413d1e51afa24d8f9ad8ada9efec1e21e5 SHA512 22363d80a08d2422ca7e454caf87dceb0ec7cfa6461467f3857c28e53cab914466c85a9fbabfa7d811009cbd3be2243cfb07462f49c434f345bf4c1999de1668
diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
deleted file mode 100644
index 71760b9a6322..000000000000
--- a/gnome-base/nautilus/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="packagekit">Use packagekit to search for programs to open
-		unknown file types</flag>
-	<flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
-		from the file mananger</flag>
-	<flag name="sendto">Enable the nautilus-sendto extension to send files to
-		various locations/devices</flag>
-	<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
-	<flag restrict="&gt;=gnome-base/nautilus-3.22" name="tracker">Add support for <pkg>app-misc/tracker</pkg> search and batch rename</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/nautilus/nautilus-3.20.4.ebuild b/gnome-base/nautilus/nautilus-3.20.4.ebuild
deleted file mode 100644
index 50a2aedfd4d6..000000000000
--- a/gnome-base/nautilus/nautilus-3.20.4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo-r1 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=dev-libs/glib-2.45.7:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.19.12:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	selinux? ( >=sys-libs/libselinux-2 )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable selinux) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild b/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
deleted file mode 100644
index ec1bd6f72c7a..000000000000
--- a/gnome-base/nautilus/nautilus-3.24.2.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # Needed with USE 'sendto'
-
-inherit gnome2 readme.gentoo-r1 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Nautilus"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-# FIXME: tests fails under Xvfb, but pass when building manually
-# "FAIL: check failed in nautilus-file.c, line 8307"
-# need org.gnome.SessionManager service (aka gnome-session) but cannot find it
-RESTRICT="test"
-
-# Require {glib,gdbus-codegen}-2.30.0 due to GDBus API changes between 2.29.92
-# and 2.30.0
-COMMON_DEPEND="
-	>=app-arch/gnome-autoar-0.2.1
-	>=dev-libs/glib-2.51.2:2[dbus]
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.21.6:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-	>=gnome-base/gnome-desktop-3:3=
-
-	gnome-base/dconf
-	>=gnome-base/gsettings-desktop-schemas-3.8.0
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-
-	exif? ( >=media-libs/libexif-0.6.20 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	selinux? ( >=sys-libs/libselinux-2 )
-	tracker? ( >=app-misc/tracker-1:= )
-	xmp? ( >=media-libs/exempi-2.1.0:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.33
-	>=dev-util/gtk-doc-am-1.10
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	packagekit? ( app-admin/packagekit-base )
-	sendto? ( !<gnome-extra/nautilus-sendto-3.0.1 )
-"
-
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="
-	gnome? ( x11-themes/adwaita-icon-theme )
-	tracker? ( >=gnome-extra/nautilus-tracker-tags-0.12 )
-	previewer? ( >=gnome-extra/sushi-0.1.9 )
-	sendto? ( >=gnome-extra/nautilus-sendto-3.0.1 )
-	>=gnome-base/gvfs-1.14[gtk]
-"
-# Need gvfs[gtk] for recent:/// support
-
-src_prepare() {
-	if use previewer; then
-		DOC_CONTENTS="nautilus uses gnome-extra/sushi to preview media files.
-			To activate the previewer, select a file and press space; to
-			close the previewer, press space again."
-	fi
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-desktop \
-		--disable-profiling \
-		--disable-update-mimedb \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable sendto nst-extension) \
-		$(use_enable selinux) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	use previewer && readme.gentoo_create_doc
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use previewer; then
-		readme.gentoo_print_elog
-	else
-		elog "To preview media files, emerge nautilus with USE=previewer"
-	fi
-}
diff --git a/gnome-base/orbit-2.14.19-r5 b/gnome-base/orbit-2.14.19-r5
new file mode 100644
index 000000000000..db2f9de42a5e
--- /dev/null
+++ b/gnome-base/orbit-2.14.19-r5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libIDL-0.8.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/gtk-doc-am virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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=ORBit2 is a high-performance CORBA ORB
+EAPI=5
+HOMEPAGE=https://projects.gnome.org/ORBit2/
+IUSE=pic static-libs test debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2 LGPL-2
+RDEPEND=>=dev-libs/glib-2.44.1-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libIDL-0.8.14-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+REQUIRED_USE=test? ( debug )
+SLOT=2
+SRC_URI=mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9e21368ef6a11bb4add7ee0615e21084
diff --git a/gnome-base/orbit/Manifest b/gnome-base/orbit/Manifest
deleted file mode 100644
index 2575b705080a..000000000000
--- a/gnome-base/orbit/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX orbit-2.14.19-aix-func_data.patch 3631 BLAKE2B 10f94d0ee3203beb142f265a5f239fef31215163e8afc71561b08a4703f1938729d5041212641e204bc3eaedd162763c3e536afcf9d2ceabec496d934f0f075c SHA512 2b4414e1443a8d03c163677334f974664c2f64ccd100442f0d4a7dda61677fac397085deba9c36f0c1e70d3ab36f033d6f23d2d2c5ebaa4412bfed631783382b
-AUX orbit-2.14.19-automake-1.13.patch 674 BLAKE2B 8e6b8b79001c041334d1ed7164ee1944c06131596bdc2303b376f2a6e501e1f8ffdc09eba4d79e059699f1ebb2ce30653ea627cfbe5a0f520f11e3d54ced40d5 SHA512 a49043dd50d09893828ca5f71e4af4054ec68b322b244c1f5ce7eb0a471ddb9b099c9939c0a4d6b036d4e28a163e23ec29896baa2fffc137269fd61d34bce447
-AUX orbit-2.14.19-fPIC.patch 1650 BLAKE2B a6a28a41ef14e633d472142183722d881061ec1d6a70f3777247c3b75fb7b6c0aef88bbdb456bddda5eb03df32f9b7b7aae9dc1a641ea611fd4fd91b087c2f82 SHA512 31915edd0998b4738a5c97a74b4e4f84ac80a7db5a04e1f205ff2a2ea181df9bf471a839f75bef8bc96644c0e3c731e3cf6c47bedbccd07ab7b10f27e8e19da8
-AUX orbit-2.14.19-link_protocol_is_local.patch 1006 BLAKE2B 927492b912c5f8e557a3d4bb922b8250206c7359907cd330d0f55ac30d9955dc93c110018b55f0d093191396b694c46553c8b5a0d227a3bb805c03c8e09d38f3 SHA512 f765686448db2d190bebb85c165b5e32bb3e29a30f5407b5f3236dfcc0b0c94f77715d136678ec9021a9e450b22fbd7c0dfed3e30d070f795d708244594de2a8
-AUX orbit-2.14.19-parallel-build.patch 963 BLAKE2B 578f51e904cbaaa40d27b9c1a512958b34edb63ae0936edf1abaf25e29142c92250bb9b56d22583a28a6aad8266947f788b430bb869a57a82e4a1349a0fa312f SHA512 f38605716bc0c72ba87be108ad7dd3f86779fd548183abe847b74a74ad009778b42ebfc8bee0d97033f698ad28b6e383708c6033725568f37226a6de1221c187
-DIST ORBit2-2.14.19.tar.bz2 764820 BLAKE2B 8b1180da6c5ae90e83edd330387da2974fd57d60fe79fa99b9f6f87fe7c4b9a816504c76fa055fef0c63cc72d3cccce3be410eb6945549ff30703ca26c8df631 SHA512 313e125234e8d1195be277ad125af169f12ce312cb541a4641c5d57d3c905bbdc6a46672a86a012409cf4d7af58b5122f0e5db250730b65e8d95b2d5f4c4657e
-EBUILD orbit-2.14.19-r5.ebuild 2998 BLAKE2B 0d47817a405617d7a8193f208fd8cf916af4ebe1c0b222692d2ca4efa4c96cb9aa063faa20f65f5a0540ad5240dabf78633568dfd70e819a7185573468511241 SHA512 548690d5fd7e1120b61d7b0472cf848ddbda09f4727c42659630d35e34f64dbaa8830432f7b2382d1d4af6a9508ea548ae9cdbb028b131f9e82d6e2b7da8811e
-MISC metadata.xml 359 BLAKE2B e60465ce144792058da10587759ba4c1ca3d754b29aa0be28b12efe72eb0616f5b25969f1102612ff37cbe296e0093e0fab0417800ee1efaef6fdf6941800f1f SHA512 07fe8b368b9f16c31d09701b1b1f6714ea3a305f9578705681b212d442e2e216a2d5649e9c76195f004f782a6e32e1eb94a8d9742e6593ce1bd76a7a8af6f385
diff --git a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch b/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch
deleted file mode 100644
index b58fd00a10b8..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-aix-func_data.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From c50f193f69f9b14dd26fafb7cb4c9514eaa6f15e Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Thu, 26 Jun 2014 12:45:18 +0200
-Subject: [PATCH 1/2] bug#732275: rename func_data to gfunc_data for AIX
-
----
- include/orbit/orb-core/allocators.h |  2 +-
- src/idl-compiler/orbit-idl-utils.c  | 14 +++++++-------
- src/idl-compiler/orbit-idl2.h       |  4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/include/orbit/orb-core/allocators.h b/include/orbit/orb-core/allocators.h
-index 0401a15..1861ca1 100644
---- a/include/orbit/orb-core/allocators.h
-+++ b/include/orbit/orb-core/allocators.h
-@@ -41,7 +41,7 @@ gpointer ORBit_realloc_tcval (gpointer       old,
-     Below, some magic values of the fnc ptr are defined.
- **/
- typedef gpointer (*ORBit_Mem_free_fn) (gpointer mem,
--				       gpointer func_data);
-+				       gpointer gfunc_data);
- 
- #define ORBIT_MEMHOW_HOW(how)      ((how) & 0x3)
- #define ORBIT_MEMHOW_ELEMENTS(how) ((how) >> 2)
-diff --git a/src/idl-compiler/orbit-idl-utils.c b/src/idl-compiler/orbit-idl-utils.c
-index 3bb0467..04fe4a2 100644
---- a/src/idl-compiler/orbit-idl-utils.c
-+++ b/src/idl-compiler/orbit-idl-utils.c
-@@ -362,7 +362,7 @@ orbit_idl_print_node(IDL_tree node, int indent_level)
- 
- static void
- IDL_tree_traverse_helper(IDL_tree p, GFunc f,
--			 gconstpointer func_data,
-+			 gconstpointer gfunc_data,
- 			 GHashTable *visited_nodes,
- 			 gboolean    include_self)
- {
-@@ -376,17 +376,17 @@ IDL_tree_traverse_helper(IDL_tree p, GFunc f,
- 	for (curitem = IDL_INTERFACE (p).inheritance_spec; curitem;
- 	     curitem = IDL_LIST (curitem).next) {
- 		IDL_tree_traverse_helper (IDL_get_parent_node 
--			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, func_data, visited_nodes, TRUE);
-+			(IDL_LIST (curitem).data, IDLN_INTERFACE, NULL), f, gfunc_data, visited_nodes, TRUE);
- 	}
- 
- 	if (include_self)
--		f(p, (gpointer)func_data);
-+		f(p, (gpointer)gfunc_data);
- }
- 
- void
- IDL_tree_traverse_parents_full (IDL_tree      p,
- 				GFunc         f,
--				gconstpointer func_data,
-+				gconstpointer gfunc_data,
- 				gboolean      include_self)
- {
- 	GHashTable *visited_nodes = g_hash_table_new (NULL, g_direct_equal);
-@@ -400,7 +400,7 @@ IDL_tree_traverse_parents_full (IDL_tree      p,
- 	if (!p)
- 		return;
- 
--	IDL_tree_traverse_helper (p, f, func_data, visited_nodes, include_self);
-+	IDL_tree_traverse_helper (p, f, gfunc_data, visited_nodes, include_self);
- 
- 	g_hash_table_destroy (visited_nodes);
- }
-@@ -408,9 +408,9 @@ IDL_tree_traverse_parents_full (IDL_tree      p,
- void
- IDL_tree_traverse_parents (IDL_tree p,
- 			   GFunc f,
--			   gconstpointer func_data)
-+			   gconstpointer gfunc_data)
- {
--	IDL_tree_traverse_parents_full (p, f, func_data, TRUE);
-+	IDL_tree_traverse_parents_full (p, f, gfunc_data, TRUE);
- }
- 
- /* For use by below function */
-diff --git a/src/idl-compiler/orbit-idl2.h b/src/idl-compiler/orbit-idl2.h
-index b58f57f..670e072 100644
---- a/src/idl-compiler/orbit-idl2.h
-+++ b/src/idl-compiler/orbit-idl2.h
-@@ -16,10 +16,10 @@ void     orbit_idl_print_node            (IDL_tree      node,
- 					  int           indent_level);
- void     IDL_tree_traverse_parents       (IDL_tree      p,
- 					  GFunc         f,
--					  gconstpointer func_data);
-+					  gconstpointer gfunc_data);
- void     IDL_tree_traverse_parents_full  (IDL_tree      p,
- 					  GFunc         f,
--					  gconstpointer func_data, 
-+					  gconstpointer gfunc_data,
- 					  gboolean      include_self);
- gboolean orbit_cbe_type_contains_complex (IDL_tree      ts);
- void     orbit_idl_check_oneway_op       (IDL_tree      op);
--- 
-1.8.3.2
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch b/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch
deleted file mode 100644
index fcfeefba08cb..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-automake-1.13.patch
+++ /dev/null
@@ -1,22 +0,0 @@
- test/everything/Makefile.am | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
-index 32beb36..1eef7ac 100644
---- a/test/everything/Makefile.am
-+++ b/test/everything/Makefile.am
-@@ -73,12 +73,12 @@ server_DEPENDENCIES=${EVERYTHING_BUILT} $(included_src)
- 
- IDL_FLAGS= --showcpperrors --add-imodule
- IDL_FILES= everything.idl
--include $(top_srcdir)/Makefile.shared
-+include ../../Makefile.shared
- 
- BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
- CLEANFILES = ${BUILT_SOURCES} iorfile
- 
--TESTS = $(srcdir)/test.sh
-+TESTS = test.sh
- 
- EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
- 
diff --git a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch b/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
deleted file mode 100644
index 394919f98568..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-fPIC.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 31236105deaa4b50a70aa256819bfc4790f705d8 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 3 Mar 2013 13:29:24 -0500
-Subject: [PATCH] Add an option to build libname-server-2.a's objects as PIC
-
-Needed for Gentoo hardened, see https://bugs.gentoo.org/show_bug.cgi?id=312161
----
- configure.in                  | 9 +++++++++
- src/services/name/Makefile.am | 1 +
- 2 files changed, 10 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index 0879051..38b7b8b 100644
---- a/configure.in
-+++ b/configure.in
-@@ -118,6 +118,15 @@ if test z$enable_purify = zyes; then
- 	AC_DEFINE(ORBIT_PURIFY, 1, [defined if purify is enabled])
- fi
- 
-+AC_ARG_ENABLE([libname-server-pic],
-+	[AS_HELP_STRING([--enable-libname-server-pic], [force libname-server-2.a to be built as PIC])])
-+if test x$enable_libname_server_pic = xyes; then
-+	LIBNAME_SERVER_PIC=$lt_prog_compiler_pic
-+else
-+	LIBNAME_SERVER_PIC=
-+fi
-+AC_SUBST(LIBNAME_SERVER_PIC)
-+
- AC_MSG_CHECKING(which idl compiler to use)
- IDL_COMPILER="\$(top_builddir)/src/idl-compiler/orbit-idl-2\$(EXEEXT)"
- AC_ARG_WITH(idl-compiler,
-diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
-index 7212557..21b7365 100644
---- a/src/services/name/Makefile.am
-+++ b/src/services/name/Makefile.am
-@@ -65,6 +65,7 @@ name_client_2_LDADD = $(LDADDS)
- libname_server_2_a_SOURCES = orbit-name-server.c CosNaming-skels.c \
- 			   name-support.c name-support.h
- libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
-+libname_server_2_a_CFLAGS = $(INCLUDES) $(LIBNAME_SERVER_PIC)
- 
- orbit_name_server_2_SOURCES = boot.c
- orbit_name_server_2_LDFLAGS = $(FLAGS)
--- 
-1.8.1.5
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch b/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch
deleted file mode 100644
index 2344935f46d2..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-link_protocol_is_local.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8b9acc9bd4ac9be12317f24c7ecafc4200e19609 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Tue, 12 Feb 2013 00:27:41 -0500
-Subject: [PATCH] Fix link_protocol_is_local_ipv46 for ipv4 on some
- ipv6-enabled machines
-
-Ensure that saddr is compared to an ipv4 local_addr, not to an ipv6 one,
-by setting hints.ai_family before calling getaddrinfo().
-
-https://bugzilla.gnome.org/show_bug.cgi?id=693636
----
- linc2/src/linc-protocols.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/linc2/src/linc-protocols.c b/linc2/src/linc-protocols.c
-index e6895f4..22a77aa 100644
---- a/linc2/src/linc-protocols.c
-+++ b/linc2/src/linc-protocols.c
-@@ -383,6 +383,7 @@ link_protocol_is_local_ipv46 (const LinkProtocolInfo *proto,
- 		memset(&hints, 0, sizeof(hints));
- 		hints.ai_socktype = SOCK_STREAM;
- 		hints.ai_flags = AI_CANONNAME;
-+		hints.ai_family = proto->family;
- 
- 		if (getaddrinfo(link_get_local_hostname(), NULL, &hints, &local_addr) != 0) {
- 			if (!warned++)
--- 
-1.8.1.2
-
diff --git a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch b/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch
deleted file mode 100644
index 113b90465bae..000000000000
--- a/gnome-base/orbit/files/orbit-2.14.19-parallel-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c67303ecfdf80072a2852433c7f7818113e61c06 Mon Sep 17 00:00:00 2001
-From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
-Date: Thu, 26 Jun 2014 12:37:59 +0200
-Subject: [PATCH 2/2] bug#732274: fix parallel build failure
-
----
- src/services/name/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/services/name/Makefile.am b/src/services/name/Makefile.am
-index deda1ed..8cf868e 100644
---- a/src/services/name/Makefile.am
-+++ b/src/services/name/Makefile.am
-@@ -68,7 +68,7 @@ libname_server_2_a_DEPENDENCIES = $(DEPS) CosNaming.h
- 
- orbit_name_server_2_SOURCES = boot.c
- orbit_name_server_2_LDFLAGS = $(FLAGS)
--orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h
-+orbit_name_server_2_DEPENDENCIES = $(DEPS) CosNaming.h libname-server-2.a
- orbit_name_server_2_LDADD = libname-server-2.a $(LDADDS)
- 
- $(libname_server_2_a_OBJECTS) $(name_client_2_OBJECTS) $(orbit_name_server_2_OBJECTS) : CosNaming.h
--- 
-1.8.3.2
-
diff --git a/gnome-base/orbit/metadata.xml b/gnome-base/orbit/metadata.xml
deleted file mode 100644
index 0d28a3e32644..000000000000
--- a/gnome-base/orbit/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="pic">Force libname-server-2 to be built as PIC; needed on
-		hardened systems</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-base/orbit/orbit-2.14.19-r5.ebuild b/gnome-base/orbit/orbit-2.14.19-r5.ebuild
deleted file mode 100644
index 927a74b0de2b..000000000000
--- a/gnome-base/orbit/orbit-2.14.19-r5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="ORBit2"
-GNOME_TARBALL_SUFFIX="bz2"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 toolchain-funcs autotools multilib-minimal
-
-DESCRIPTION="ORBit2 is a high-performance CORBA ORB"
-HOMEPAGE="https://projects.gnome.org/ORBit2/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="pic static-libs test"
-REQUIRED_USE="test? ( debug )"
-
-RDEPEND=">=dev-libs/glib-2.44.1-r1:2[${MULTILIB_USEDEP}]
-	>=dev-libs/libIDL-0.8.14-r1[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/orbit-2.0/orbit/orbit-config.h )
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/orbit2-config )
-
-src_prepare() {
-	# Fix wrong process kill, bug #268142
-	sed "s:killall lt-timeout-server:killall timeout-server:" \
-		-i test/timeout.sh || die "sed 1 failed"
-
-	# Do not mess with CFLAGS
-	sed 's/-ggdb -O0//' -i configure.in configure || die "sed 2 failed"
-
-	if ! use test; then
-		sed -i -e 's/test //' Makefile.am || die
-	fi
-
-	# Drop failing test, bug #331709
-	sed -i -e 's/test-mem //' test/Makefile.am || die
-
-	# Fix link_protocol_is_local() for ipv4 on machines with ipv6
-	# https://bugzilla.gnome.org/show_bug.cgi?id=693636
-	epatch "${FILESDIR}/${PN}-2.14.19-link_protocol_is_local.patch"
-
-	# Build libname-server-2.a with -fPIC on hardened, bug #312161
-	epatch "${FILESDIR}/${PN}-2.14.19-fPIC.patch"
-
-	epatch "${FILESDIR}"/${P}-automake-1.13.patch
-	epatch "${FILESDIR}"/${P}-parallel-build.patch #273031
-	epatch "${FILESDIR}"/${P}-aix-func_data.patch #515094
-
-	eautoreconf
-	gnome2_src_prepare
-
-	# we have to copy sources, there is something that causes tests
-	# to segfault when libs are out-of-source built.
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	# We need to unset IDL_DIR, which is set by RSI's IDL.  This causes certain
-	# files to be not found by autotools when compiling ORBit.  See bug #58540
-	# for more information.  Please don't remove -- 8/18/06
-	unset IDL_DIR
-
-	# We need to use the hosts IDL compiler if cross-compiling, bug #262741
-	if tc-is-cross-compiler; then
-		# check that host version is present and executable
-		[[ -x ${EPREFIX}/usr/bin/orbit-idl-2 ]] || die "Please emerge ~${CATEGORY}/${P} on the host system first"
-		myconf=("${myconf[@]}" "--with-idl-compiler=${EPREFIX}/usr/bin/orbit-idl-2")
-	fi
-	gnome2_src_configure \
-		$(use_enable pic libname-server-pic) \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-}
-
-multilib_src_compile() {
-	gnome2_src_compile
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-multilib_src_test() {
-	# can fail in parallel, see bug #235994
-	emake -j1 check
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index ba10073fdebd..0898dc8b4f76 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/assogiate-0.2.1-r1 b/gnome-extra/assogiate-0.2.1-r1
new file mode 100644
index 000000000000..ac0d46d03e8d
--- /dev/null
+++ b/gnome-extra/assogiate-0.2.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.8:2 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-2.24.4-r3:2.4 >=dev-cpp/libxmlpp-2.40:2.6 >=dev-cpp/gnome-vfsmm-2.26.0-r1 app-text/gnome-doc-utils dev-util/intltool 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=assoGiate is an editor of the file types database for GNOME
+EAPI=5
+HOMEPAGE=http://www.kdau.com/projects/assogiate
+IUSE=debug
+KEYWORDS=amd64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.8:2 >=dev-cpp/glibmm-2.46:2 >=dev-cpp/gtkmm-2.24.4-r3:2.4 >=dev-cpp/libxmlpp-2.40:2.6 >=dev-cpp/gnome-vfsmm-2.26.0-r1
+SLOT=0
+SRC_URI=http://www.kdau.com/files/assogiate-0.2.1.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ba36ed6de369d457206f19a80711fa8
diff --git a/gnome-extra/assogiate/Manifest b/gnome-extra/assogiate/Manifest
deleted file mode 100644
index 1b215d5924af..000000000000
--- a/gnome-extra/assogiate/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX assogiate-0.2.1-desktop.patch 678 BLAKE2B 6aa59f1d862b829abe52f1f3681f95b2b97e66c9f481575ef5a2b6669c51a64b8c5b519bb5af284c5e65339d22a5737ad83ad6904c9d57280408f301c463bb54 SHA512 db9c31c389e6b0b8f789891bab949a3b6cb0f0d2dbb15d61e4e2d4d66506f893dc788e66e6ceb484a3c41fa2f3e82d4f30a58f052c823398bde7ca2f8b8a5968
-AUX assogiate-0.2.1-gcc-4.7.patch 729 BLAKE2B 9425f2889437ab8543ebad8b9a4da1e47760979d090ebd5d0dae2cf5386891d92e3a409f6f228e0ec002e7b108d7c7cd0b17538933b5c34105e7e9ec44ba6754 SHA512 30b6c0b4223467c5dc05e6ef9fcc111a1b2e7a6ba9d520e6d7d5cae4994dfdef0a4b4bb087e508e32593f6c8da2ff5c97a1cffd87ccc91d9c6a8f88fba936eb0
-AUX assogiate-0.2.1-glib-2.32.patch 2108 BLAKE2B 44c629864ab3c1ca6272f547ab8f1ca101bd6864aa27a7e962f05c1d3263be3df4e63fff16a44a8df796c660ed16a825ec42f786fd2a02a215db7a4ffd9daf10 SHA512 0f31eb8fabc13d898fbcf760d76de772f546a521b5a5a56d0728ced1d73d5ef98fbea96bec2075d8a392e641eee8e8729e1813f6a2caa9d2db14601de6988d47
-AUX assogiate-0.2.1-typedialog.patch 1037 BLAKE2B 310051829863b8a2c9f473244240f6471428744699438508ed7caf29c03856be46ee6d690d0d8b471f8a29961ffcadbfcc449e5a63fbabcd39b89ee2606f48f2 SHA512 d242b3933e287eb3d3e7b64ef5abe31e776307a974b9e40069ffabb19c414450cef2022ce4cc78cd28022ad8bec2c1e5e86eda50e3d94c9a23cdb352b5f6c7a1
-DIST assogiate-0.2.1.tar.bz2 369446 BLAKE2B 5b2e656eb9b1f77b73e4b736c748c45aac0be6102cc497139e8f11df38caa7874a02fd04e064e057465c2309876e9ea3a6fa5bff7164c4f3c59933f5b9b6cbb0 SHA512 d54148a13c07e6d9526c67f6522ed450e4afa86074972ae195e2fab2080a68c25f7030be21fcc8aab67aaea9b4e2f70993a402bf91e513ca93b83955b9fba8ac
-EBUILD assogiate-0.2.1-r1.ebuild 1078 BLAKE2B 15eff1369f00a24e878c4515eba0b24cd12b28f0b42f86ee04d1f3f59428e3711df8978d82fc999f2db7eed8dea72df357e574e2ceebf7f43d7e2f6e2c327d6a SHA512 2efb15d5150080f6f95c6ad72632d9b6262e11b84549a5a62f79191275a461a468c886101fa20f9e403d398f39cc970a2ce1fe13ce3a883d1e595024141b55f3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
deleted file mode 100644
index 4737a2b52173..000000000000
--- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils flag-o-matic gnome2
-
-DESCRIPTION="assoGiate is an editor of the file types database for GNOME"
-HOMEPAGE="http://www.kdau.com/projects/assogiate"
-SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-cpp/gtkmm-2.24.4-r3:2.4
-	>=dev-cpp/libxmlpp-2.40:2.6
-	>=dev-cpp/gnome-vfsmm-2.26.0-r1
-"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS="AUTHORS ChangeLog NEWS README TODO"
-
-src_prepare() {
-	# Fix desktop file
-	epatch "${FILESDIR}"/${P}-desktop.patch
-
-	# Fix compilation, bug #374911
-	epatch "${FILESDIR}"/${P}-typedialog.patch
-
-	# Fix building with glib-2.32, bug #417765
-	epatch "${FILESDIR}"/${P}-glib-2.32.patch
-
-	# Fix building with gcc-4.7
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-
-	eautoreconf
-	gnome2_src_prepare
-
-	append-cxxflags -std=c++11
-}
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
deleted file mode 100644
index 3944938611de..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Update assogiate desktop file
-Author: Vincent Legout <vincent@legout.info>
-
-Index: assogiate/data/assogiate.desktop.in
-===================================================================
---- assogiate.orig/data/assogiate.desktop.in	2011-05-02 20:46:29.322670186 +0200
-+++ assogiate/data/assogiate.desktop.in	2011-05-02 20:46:47.835433235 +0200
-@@ -1,9 +1,9 @@
- [Desktop Entry]
--Encoding=UTF-8
- _Name=File Types Editor
- _Comment=Modify the detection and display of file types
- Exec=assogiate
- Icon=assogiate
- Terminal=false
- Type=Application
--Categories=GNOME;GTK;System;FileTools;
-+Categories=GNOME;GTK;System;FileTools;X-GNOME-PersonalSettings;
-+OnlyShowIn=GNOME;
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
deleted file mode 100644
index 33d13bd067d5..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-gcc-4.7.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix ftbfs with gcc-4.7
-Author: Vincent Legout <vlegout@debian.org>
-Last-Update: 2012-04-04
-Bug-Debian: http://bugs.debian.org/667104
-
-Index: assogiate/libassogiate/mime-package.cc
-===================================================================
---- assogiate.orig/libassogiate/mime-package.cc	2012-03-25 10:47:26.524889975 +0200
-+++ assogiate/libassogiate/mime-package.cc	2012-04-04 18:54:11.675024484 +0200
-@@ -31,6 +31,7 @@
- #include <libxml/tree.h>
- #include <libxml++/parsers/domparser.h>
- #include <libgnomevfsmm/init.h>
-+#include <unistd.h>
- 
- /******************************************************************************/
- /* Globals                                                                    */
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
deleted file mode 100644
index 0bcecc31e5ab..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-glib-2.32.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Include glib.h instead of individual headers
-Author: Vincent Legout <vlegout@debian.org>
-Bug-Debian: http://bugs.debian.org/665507
-
-Index: assogiate/libassogiate/mime-database.cc
-===================================================================
---- assogiate.orig/libassogiate/mime-database.cc	2012-03-25 10:43:34.000000000 +0200
-+++ assogiate/libassogiate/mime-database.cc	2012-03-25 10:47:00.072890551 +0200
-@@ -23,7 +23,7 @@
- #include "private.hh"
- #include "mime-database.hh"
- 
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <glibmm/miscutils.h>
- 
- /******************************************************************************/
-Index: assogiate/libassogiate/mime-type.cc
-===================================================================
---- assogiate.orig/libassogiate/mime-type.cc	2012-03-25 10:43:34.000000000 +0200
-+++ assogiate/libassogiate/mime-type.cc	2012-03-25 10:47:00.072890551 +0200
-@@ -23,7 +23,7 @@
- #include "private.hh"
- #include "mime-type.hh"
- 
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <gtkmm/icontheme.h>
- #include <libxml++/nodes/element.h>
- #include <libxml++/nodes/textnode.h>
-Index: assogiate/libassogiate/misc/extras.cc
-===================================================================
---- assogiate.orig/libassogiate/misc/extras.cc	2012-03-25 10:43:34.000000000 +0200
-+++ assogiate/libassogiate/misc/extras.cc	2012-03-25 10:47:00.092890549 +0200
-@@ -24,7 +24,7 @@
- 
- #include <algorithm>
- #include <stdexcept>
--#include <glib/gmem.h>
-+#include <glib.h>
- #include <glibmm/utility.h>
- 
- /******************************************************************************/
-Index: assogiate/src/main.cc
-===================================================================
---- assogiate.orig/src/main.cc	2012-03-25 10:43:34.396895145 +0200
-+++ assogiate/src/main.cc	2012-03-25 10:47:07.628890386 +0200
-@@ -28,8 +28,7 @@
- #include <clocale>
- #include <iostream>
- #include <locale>
--#include <glib/goption.h>
--#include <glib/gutils.h>
-+#include <glib.h>
- #include <glibmm/optionentry.h>
- #include <gtk/gtkaboutdialog.h>
- #include <gtk/gtkversion.h>
diff --git a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch b/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
deleted file mode 100644
index 188c69be7cad..000000000000
--- a/gnome-extra/assogiate/files/assogiate-0.2.1-typedialog.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix ftbfs
-Author: Vincent Legout <vincent@legout.info>
-Bug-Debian: http://bugs.debian.org/624924
-
-Index: assogiate/src/type-dialog.cc
-===================================================================
---- assogiate.orig/src/type-dialog.cc	2011-05-09 16:51:09.951622099 +0200
-+++ assogiate/src/type-dialog.cc	2011-05-09 16:51:53.293459257 +0200
-@@ -144,7 +144,7 @@
- 	general_upper->pack_start(*Gtk::manage(general_info), true, true);
- 
- 	if (renameable) {
--		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector());
-+		Gtk::ComboBox *cb = new Gtk::ComboBox(CategoriesStore::get_selector(), false);
- 		cb->signal_changed().connect
- 			(sigc::mem_fun(*this, &TypeDialog::on_category_changed));
- 		m_category_widget = cb;
-@@ -622,7 +622,7 @@
- 	} else {
- 		AddItemDialog adder(this, _("Add File Contents Rule"));
- 
--		Gtk::ComboBox type(MagicTypesStore::get());
-+		Gtk::ComboBox type(MagicTypesStore::get(), false);
- 		type.pack_start(MagicTypesColumns::get().name);
- 		adder.add_item(_("_Type:"), type, true);
- 
diff --git a/gnome-extra/assogiate/metadata.xml b/gnome-extra/assogiate/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/assogiate/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/chrome-gnome-shell-10 b/gnome-extra/chrome-gnome-shell-10
new file mode 100644
index 000000000000..d675a5007cd2
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell-10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/10/chrome-gnome-shell-10.tar.xz
+_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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b746dd79307f2a5ae4d7a67c3dffbed9
diff --git a/gnome-extra/chrome-gnome-shell-8-r1 b/gnome-extra/chrome-gnome-shell-8-r1
new file mode 100644
index 000000000000..1400ca70aaf5
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell-8-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/8/chrome-gnome-shell-8.tar.xz
+_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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=53d1f29efdf28dc060d15c13cf640827
diff --git a/gnome-extra/chrome-gnome-shell-9 b/gnome-extra/chrome-gnome-shell-9
new file mode 100644
index 000000000000..7ac0a37f8682
--- /dev/null
+++ b/gnome-extra/chrome-gnome-shell-9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] app-misc/jq sys-apps/coreutils sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] gnome-base/gnome-shell
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/chrome-gnome-shell/9/chrome-gnome-shell-9.tar.xz
+_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	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fbee6ceb44e90a85ce6acd2daa258e7c
diff --git a/gnome-extra/chrome-gnome-shell/Manifest b/gnome-extra/chrome-gnome-shell/Manifest
deleted file mode 100644
index d8d75d935716..000000000000
--- a/gnome-extra/chrome-gnome-shell/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX chrome-gnome-shell-8-enabled-extensions-array.patch 1231 BLAKE2B 78150fd5c0aa3591d14d8856e2946f41cf91bc61bbcf6fe2e1f8427c33a45daa9f01224ecd197ae9f98f4acb9050039bf86e3d062377abbd1cb7c9ab237af959 SHA512 1c7423fcea6b258ae55fdc83658dab547b199b2b69e4f0fa54dc6b922718a23ebe6cf506a279eeff6c7c3a42bcc662e218bf5d4be9825c3558150495dc8a3bcf
-AUX chrome-gnome-shell-8-get_dbus_connection.patch 2851 BLAKE2B 7ab0caf998f58f3b8d5c03634f35d6a771fd2bcb42af68d6a459662449e5743e71e2243e2dfa929be9c5bff0183716c518beba75b6d37ac12b9b892ecb521684 SHA512 555674bf8b4077f466657ae101da344c17fbc8062012ab341943b48d3260fa83b9a0a3d7c7fdd11dd93e856cbbce5aaf6f7561b9d6457081cec3398d79ecbfc8
-AUX chrome-gnome-shell-8-metadata-version.patch 1155 BLAKE2B be54db5312bff9f23a672068c71689ad2509ab67089a0dcc6558e37ea86b85ba31a67c7070b8e0b581fa884c1fe0adec50a63ab3776ab8bcec557a7626c59641 SHA512 2d38dfd0fe30829053a7f3bcbee8a2afa6cda2cfe1b52d664338b95081b49d9974a5a976a75ebad7401c5dbeb4e76d0920e260e20f722c7af0f9f83b9bd224e8
-DIST chrome-gnome-shell-10.tar.xz 158972 BLAKE2B fe4df942f885aee40d5c5e01dcd127a9deb46aeb57765336c91a7a9c56f7c953eb36d822ffa821300b99e3d765c1b162767fc5debc24e42a16bddb1404796c9c SHA512 cf0d108c3fb57deb4926a4cf043dd64d776eda4c01ec595a1472c6c45726b8460381b9bd7cb1b43d7a5bd8a585be0d1b648c720a2f0a7a377c133b8750e76cd6
-DIST chrome-gnome-shell-8.tar.xz 143224 BLAKE2B 9dcb94f7dcc263c6cc332c476bd652b0ea62443ffb154f67ba869ddc970e892a28ef96be13732d49dfbf5c3db9c4c8fed18918359f240e6b1b6218fa3a2bd462 SHA512 61acd4b0564892667bd1468430ddfff4c0cfbe92b573d8b7e4c5448c25266bd0ee6e89e9bebe08553de4f9661ceeea46f5af38d980051491c40ed7deb24e3277
-DIST chrome-gnome-shell-9.tar.xz 151984 BLAKE2B 884906a308d864893664f499172c130b6ab7cc3ae7a5746f7430f3d779f43320de723c9757fc4c8a9328704b2b5c40c8a829d74280ac78d4f09e000f593c3805 SHA512 b9b5f913a74bdfa641ce35c62f15aa1ceff37e6e0fef43c127ff8ba31933ba2d9c93ee50809b013336ec63ae1020d4e1cacd56d9a86204e1ba4c0bd1d8ed50cf
-EBUILD chrome-gnome-shell-10.ebuild 1029 BLAKE2B 95861f4deb9861f6bcf0fefa2ecb04f9b273de8bb9e1f40bd5e289cbd887f91de8b44eafd62f71fcadbba4a15f79101c6bd1a4ccdfbe204707d3c705a4c00885 SHA512 9d1aed107c5433bc942500163e0c8ba463429e5e474a24bc74afe52843c14e82d15a415d5ed4584c9f2d500b1c8e72156f275c4f009b092b1d26a6c194880327
-EBUILD chrome-gnome-shell-8-r1.ebuild 2135 BLAKE2B 2f74d0cce221510f4724d90e23908c67eedd894740bc459ae65cb931091149f49012c0371a2d230dc115660b62369e4d050e66b04d42c6cb230e9be4b42dd6f3 SHA512 a53ddffc9b2a923fcbd3854963d1906166d43db8c5e6df026c006a6a898399d5cb8357df0ec2774e1572096d79fd79998ceeacd5b0d6d0b7adcbc8a00f81d2bf
-EBUILD chrome-gnome-shell-9.ebuild 1868 BLAKE2B 1406711b618d76f8d59957a58575298eed99311788288b7c6fa982d0726698063f388e834e742e477150208fc5b72b7777c6c4cd0e02032181c6c0ff4f0736b5 SHA512 84cbb17759a69935ddadf9386dfc649fa9b00bd6574ec5a346cfe5ead80a94fbda18d0de49b1ecc602c1e12526ff31d53494fa56280a88d36ec74ea7629b2bff
-MISC metadata.xml 538 BLAKE2B 730cc561a29ab8e4506843dfaa1520af6a8ef1b3139856fbb4e7ba077eab90f28f0440c0b511e0c11167961971ebe0b1b7b53ce386d2f82d4d20b0e9f41664a9 SHA512 fed3f8fac456d95085878b4f3a5f9a0c139df07d4c3a515412727f4e4a805456736d5e36df6397e2a38dbf7043f4e83e2ffddf2615749fa7a43734a17b0ea3b2
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
deleted file mode 100644
index a932b4e301dc..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-10.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog "You can install browser extension using link provided at"
-	elog "https://extensions.gnome.org website."
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
deleted file mode 100644
index 0ddf6116f70a..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}"-enabled-extensions-array.patch
-	"${FILESDIR}/${P}"-metadata-version.patch
-	"${FILESDIR}/${P}"-get_dbus_connection.patch
-)
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Chrome policy files should be removed with package.
-	# Otherwise it will not be possible to uninstall web extension
-	# from browser.
-	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
-	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
-	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
-	doenvd 50"${PN}"
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "If you are installing ${PN} for the first time then you should"
-	elog "restart or reload dbus service before starting your browser."
-	elog
-	elog "Please note that this package provides native messaging connector only."
-	elog
-	elog "Managed policy was installed to force web extension installation"
-	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
-	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
-	elog
-	elog "For Mozilla Firefox you should manualy install web extension from"
-	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
-	elog
-	elog "For Opera you should manualy install web extension from"
-	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
deleted file mode 100644
index 599855c9cf5c..000000000000
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-single-r1
-
-DESCRIPTION="GNOME Shell integration for Chrome/Chromium, Firefox, Vivaldi, Opera browsers"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"
-SRC_URI="mirror://gnome/sources/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	app-misc/jq
-	sys-apps/coreutils
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	gnome-base/gnome-shell
-"
-
-src_configure() {
-	local mycmakeargs=( -DBUILD_EXTENSION=OFF )
-	cmake-utils_src_configure
-}
-
-src_install() {
-	# Chrome policy files should be removed with package.
-	# Otherwise it will not be possible to uninstall web extension
-	# from browser.
-	echo -n "CONFIG_PROTECT_MASK=\"" > 50"${PN}" || die
-	echo -n "/etc/chromium/policies/managed/${PN}.json " >> 50"${PN}" || die
-	echo "/etc/opt/chrome/policies/managed/${PN}.json\"" >> 50"${PN}" || die
-	doenvd 50"${PN}"
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	elog "Please note that this package provides native messaging connector only."
-	elog
-	elog "Managed policy was installed to force browser extension installation"
-	elog "for Google Chrome, Chromium and Vivaldi browsers from Chrome Store"
-	elog "https://chrome.google.com/webstore/detail/gphhapmejobijbbhgpjhcjognlahblep"
-	elog
-	elog "For Mozilla Firefox you should manualy install browser extension from"
-	elog "https://addons.mozilla.org/firefox/addon/gnome-shell-integration/"
-	elog
-	elog "For Opera you should manualy install browser extension from"
-	elog "https://addons.opera.com/extensions/details/gnome-shell-integration/"
-}
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
deleted file mode 100644
index 7a56ca0256be..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-enabled-extensions-array.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1de3c56c636adfdb74970bf9d7a5424af3830d92 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 19:43:30 +0400
-Subject: [PATCH 3/6] connector: assume that "enabled-extensions" array can
- contains duplicates
-
-See-Also: https://bugzilla.gnome.org/show_bug.cgi?id=777650
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/26
----
- connector/chrome-gnome-shell.py | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 719a347..0b92d83 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -424,9 +424,10 @@ class ChromeGNOMEShell(Gio.Application):
-                     continue
- 
-                 if extension['enable']:
--                    uuids.append(extension['uuid'])
-+                    if not extension['uuid'] in uuids:
-+                        uuids.append(extension['uuid'])
-                 elif extension['uuid'] in uuids:
--                    uuids.remove(extension['uuid'])
-+                    uuids = [value for value in uuids if value != extension['uuid']]
- 
-             settings.set_strv(ENABLED_EXTENSIONS_KEY, uuids)
- 
--- 
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
deleted file mode 100644
index be5f6c4e51d0..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-get_dbus_connection.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From dca4a3538f86d8e2e957945a691430573192716d Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Tue, 24 Jan 2017 19:42:19 +0400
-Subject: [PATCH 6/6] connector: do not use get_dbus_connection after
- GApplication was released.
-
-Fixes: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
----
- connector/chrome-gnome-shell.py | 22 +++++++++++++---------
- 1 file changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0f6e5f1..ac6740a 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -106,21 +106,26 @@ class ChromeGNOMEShell(Gio.Application):
-             self.hold()
- 
-     # Is there any way to hook this to shutdown?
--    def cleanup(self):
--        debug('Cleanup')
-+    def clean_release(self):
-+        debug('Release')
- 
-         if self.shellAppearedId:
-             Gio.bus_unwatch_name(self.shellAppearedId)
- 
-         if self.shellSignalId:
--            self.get_dbus_connection().signal_unsubscribe(self.shellSignalId)
-+            dbus_connection = self.get_dbus_connection()
-+
-+            if dbus_connection is not None:
-+                dbus_connection.signal_unsubscribe(self.shellSignalId)
-+
-+        self.release()
- 
-     def default_exception_hook(self, exception_type, value, tb):
-         log_error("Uncaught exception of type %s occured" % exception_type)
-         traceback.print_tb(tb)
-         log_error("Exception: %s" % value)
- 
--        self.release()
-+        self.clean_release()
- 
-     def add_simple_action(self, name, callback, parameter_type):
-         action = Gio.SimpleAction.new(
-@@ -191,7 +196,7 @@ class ChromeGNOMEShell(Gio.Application):
-     # noinspection PyUnusedLocal
-     def on_service_timeout(self, data):
-         debug('On service timeout')
--        self.release()
-+        self.clean_release()
- 
-         return False
- 
-@@ -203,7 +208,7 @@ class ChromeGNOMEShell(Gio.Application):
- 
-         if len(text_length_bytes) == 0:
-             debug('Release condition: %s' % str(condition))
--            self.release()
-+            self.clean_release()
-             return
- 
-         # Unpack message length as 4 byte integer.
-@@ -255,14 +260,14 @@ class ChromeGNOMEShell(Gio.Application):
-     # noinspection PyUnusedLocal
-     def on_hup(self, source, condition, data):
-         debug('On hup: %s' % str(condition))
--        self.release()
-+        self.clean_release()
- 
-         return False
- 
-     # noinspection PyUnusedLocal
-     def on_sigint(self, data):
-         debug('On sigint')
--        self.release()
-+        self.clean_release()
- 
-         return False
- 
-@@ -545,6 +550,5 @@ if __name__ == '__main__':
-     app = ChromeGNOMEShell('--gapplication-service' in sys.argv)
- 
-     app.run(sys.argv)
--    app.cleanup()
- 
-     debug('Quit')
--- 
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch b/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
deleted file mode 100644
index 238d1fcd1df6..000000000000
--- a/gnome-extra/chrome-gnome-shell/files/chrome-gnome-shell-8-metadata-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 48ded6911e60fb8415190b252ca420b994e6c525 Mon Sep 17 00:00:00 2001
-From: Yuri Konotopov <ykonotopov@gnome.org>
-Date: Mon, 23 Jan 2017 22:29:12 +0400
-Subject: [PATCH 4/6] connector: assume version 1 for extensions without
- version in metadata
-
-Bug: https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues/27
-See-Also: https://git.gnome.org/browse/extensions-web/commit/?id=214f03ee90f0f391d3d4fdec23feedf45e3d0507
----
- connector/chrome-gnome-shell.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/connector/chrome-gnome-shell.py b/connector/chrome-gnome-shell.py
-index 0b92d83..0f6e5f1 100755
---- a/connector/chrome-gnome-shell.py
-+++ b/connector/chrome-gnome-shell.py
-@@ -506,7 +506,7 @@ class ChromeGNOMEShell(Gio.Application):
-                         http_request['installed'][uuid] = {
-                             'version': int(extensions[uuid]['version'])
-                         }
--                    except ValueError:
-+                    except (ValueError, KeyError):
-                         http_request['installed'][uuid] = {
-                             'version': 1
-                         }
--- 
-2.10.2
-
diff --git a/gnome-extra/chrome-gnome-shell/metadata.xml b/gnome-extra/chrome-gnome-shell/metadata.xml
deleted file mode 100644
index 3d84d898ca45..000000000000
--- a/gnome-extra/chrome-gnome-shell/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ykonotopov@gnome.org</email>
-		<name>Yuri Konotopov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/nE0sIghT/chrome-gnome-shell-mirror/issues</bugs-to>
-		<remote-id type="github">GNOME/chrome-gnome-shell</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-3.6.6-r2 b/gnome-extra/cinnamon-3.6.6-r2
new file mode 100644
index 000000000000..0aed1d25316a
--- /dev/null
+++ b/gnome-extra/cinnamon-3.6.6-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
+EAPI=6
+HOMEPAGE=http://developer.linuxmint.com/
+IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-3.6 >=gnome-extra/cinnamon-settings-daemon-3.6 >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-3.6 >=gnome-extra/cinnamon-control-center-3.6 >=gnome-extra/cinnamon-screensaver-3.6 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f0771af73f2cfb7fe624540a08e2430d
diff --git a/gnome-extra/cinnamon-control-center-3.6.5 b/gnome-extra/cinnamon-control-center-3.6.5
new file mode 100644
index 000000000000..d0bec0dc769f
--- /dev/null
+++ b/gnome-extra/cinnamon-control-center-3.6.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) app-text/iso-codes x11-base/xorg-proto dev-libs/libxslt >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common sys-devel/autoconf-archive >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamons's main interface to configure various aspects of the desktop
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+colord +cups debug input_devices_wacom systemd
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.31:2 dev-libs/libxml2:2 >=gnome-base/libgnomekbd-2.91.91:0= >=gnome-extra/cinnamon-desktop-1.0:0= >=gnome-extra/cinnamon-menus-1.0:0= >=gnome-extra/cinnamon-settings-daemon-1.0:0= >=gnome-extra/nm-applet-0.9.8 media-libs/fontconfig >=net-misc/modemmanager-0.7 >=net-misc/networkmanager-0.9.8:=[modemmanager] >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.4.1:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libxklavier colord? ( >=x11-misc/colord-0.1.14:0= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 >=x11-libs/gtk+-3.8:3 >=x11-libs/libXi-1.2 ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd sys-auth/elogind ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) cups? ( app-admin/system-config-printer net-print/cups-pk-helper ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/3.6.5.tar.gz -> cinnamon-control-center-3.6.5.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2b0365e8362fe12e0f7784b9c76a3c16
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
deleted file mode 100644
index 7e76de75aa63..000000000000
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cinnamon-control-center-3.6.5.tar.gz 3888881 BLAKE2B 9b867d6467ece64a3e2d5e8a87a83235f85738e4b5ee7ea9db31f63c5681b1eec24388ff29b54bc1e01c12e3a15d5eb445c72ffe8576c211f708945ed5dde2bf SHA512 09e482976fbefbd388151736fde4d4e198f3584b47f270ad7d0ce4299029012fa7c7825e221a094c8536ebd5824406bb943a8aad5cf51d60dc22dcf5c02b3b91
-EBUILD cinnamon-control-center-3.6.5.ebuild 2466 BLAKE2B 7a3bb2afeb1618e7d020c4d5320baf222ddbac924b4fcf3f0ccebf10072e9ccc990a0781a7a20d3feb6017c9e7370b8b62c33d36ba71612f1ed5d2f2c71e877a SHA512 9f3b7c43c256d1565904eef0262e276f53b9e2d272e6546f54645e0852a1432f32e1ee51019df243d21c234ea6845d0d2f232ba56d676a3549679c02733afa52
-MISC metadata.xml 452 BLAKE2B 0b3f734916acf4ee8b2fb22b8b419dd63a18c107c4521d874a7c4a2ea45fd8ffd9ce7f44e85a7b4642a989dd0c96a80f02af4e57e64d99f650ab821b2a89f746 SHA512 e063012f6cd1d892a124a3c47c247ec36351993af36c3c5cf0be0b1fafa12119f1e7506013a3fb97616b8343c924d4bcd341350c4e575fb042d63c957c8cc666
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
deleted file mode 100644
index 12f5a93bba7e..000000000000
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.6.5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamons's main interface to configure various aspects of the desktop"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+colord +cups debug input_devices_wacom systemd"
-KEYWORDS="amd64 x86"
-
-# False positives caused by nested configure scripts
-QA_CONFIGURE_OPTIONS=".*"
-
-# FIXME: modemmanager is not optional
-#        networkmanager is not optional
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2:2
-	>=gnome-base/libgnomekbd-2.91.91:0=
-	>=gnome-extra/cinnamon-desktop-1.0:0=
-	>=gnome-extra/cinnamon-menus-1.0:0=
-	>=gnome-extra/cinnamon-settings-daemon-1.0:0=
-	>=gnome-extra/nm-applet-0.9.8
-	media-libs/fontconfig
-	>=net-misc/modemmanager-0.7
-	>=net-misc/networkmanager-0.9.8:=[modemmanager]
-	>=sys-auth/polkit-0.103
-	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.4.1:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libxklavier
-	colord? ( >=x11-misc/colord-0.1.14:0= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		>=x11-libs/gtk+-3.8:3
-		>=x11-libs/libXi-1.2 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
-	systemd? ( >=sys-apps/systemd-31 )
-	!systemd? ( app-admin/openrc-settingsd sys-auth/elogind )
-	x11-themes/adwaita-icon-theme
-	colord? ( >=gnome-extra/gnome-color-manager-3 )
-	cups? (
-		app-admin/system-config-printer
-		net-print/cups-pk-helper )
-	input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] )
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/iso-codes
-	x11-base/xorg-proto
-
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.1
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-
-	gnome-base/gnome-common
-	sys-devel/autoconf-archive
-"
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --enable-systemd doesn't do anything in $PN-2.2.5
-	gnome2_src_configure \
-		--disable-static \
-		--enable-documentation \
-		--disable-onlineaccounts \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable input_devices_wacom wacom) \
-		$(use_enable systemd)
-}
diff --git a/gnome-extra/cinnamon-control-center/metadata.xml b/gnome-extra/cinnamon-control-center/metadata.xml
deleted file mode 100644
index dbc06458f865..000000000000
--- a/gnome-extra/cinnamon-control-center/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-control-center</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-desktop-3.6.2 b/gnome-extra/cinnamon-desktop-3.6.2
new file mode 100644
index 000000000000..d691c03f1351
--- /dev/null
+++ b/gnome-extra/cinnamon-desktop-3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice >=dev-util/gtk-doc-am-1.4 >=dev-util/intltool-0.40.6 gnome-base/gnome-common x11-base/xorg-proto 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A collection of libraries and utilites used by Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+introspection systemd python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.37.3:2[dbus] media-sound/pulseaudio[glib] >=x11-libs/gdk-pixbuf-2.22:2[introspection?] >=x11-libs/gtk+-3.3.16:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 x11-libs/cairo:=[X] x11-libs/libX11 x11-libs/libxkbfile x11-misc/xkeyboard-config >=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) sys-apps/accountsservice dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0/4
+SRC_URI=https://github.com/linuxmint/cinnamon-desktop/archive/3.6.2.tar.gz -> cinnamon-desktop-3.6.2.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1cdd5061af382a294934d72bb7ef39bb
diff --git a/gnome-extra/cinnamon-desktop/Manifest b/gnome-extra/cinnamon-desktop/Manifest
deleted file mode 100644
index 06d55183e05f..000000000000
--- a/gnome-extra/cinnamon-desktop/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cinnamon-desktop-2.6.4.systemd.gschema.override 127 BLAKE2B 9e92cc304697735f86be4d00b9c3504ba20348a0382a644b313f30ce4c32e833cbcd690a3dd3d1870851a1b17d3174c7ffe9c6f154e456720c4d6d01a0b71382 SHA512 b8d72287707a1caad2dfe90a220973ea70b0c523ac14b79b21c11c87ca9a8e844698e9a33ec6f27f0dcd9c8e88d2117aab8b0064688917d7e1acbdc368e85f2e
-DIST cinnamon-desktop-3.6.2.tar.gz 571728 BLAKE2B 17a3297b75a1ba9e34ff5ef8b7252748b4300fe40381b8d5942fcf5baaf7532a560cdbd918d2dc7ed34921e357c61f74d947a5e2174cd7b0310f91015a4bc4f4 SHA512 75af7ec916d43d02eebe9a83214cdb538067f6b674ca76e109f3bed909e61df11ec83350e97505ddaaed24f097e7b20512822e30b52d14a39d6a0e3d582d05fb
-EBUILD cinnamon-desktop-3.6.2.ebuild 1684 BLAKE2B a663d72bb18781e3e6ee22212d29bef6a49bde9fe434a78d5ceadc723cb975f48b04c1021f1390e6d676833ca9880091de4059ceb306778d3917e4dbe4d3d62f SHA512 1254cfe83cd36533bd8a398ea47b9bdeb95822768ada0e477fb1b810dc0b1ec73eef6fa0ff6b6aeb0b31f2c22f35ac82b8b4a7f8edcba6b56bd158c894b82e62
-MISC metadata.xml 343 BLAKE2B ad89f9bce993b3d57620eadf715cff2aec3e4ef058e3edc34f8b02478be2a783f6d3e90c645818ce7a6dea30274fd67ca093f2284123e677fceb0b89da80c95d SHA512 628ef0f1097a5afc62968982247ae10d2db811fd0e82944d64d1b7bb2f6dec888cf16a5bb2ddf5ca1317860abc099cbd63916381a4be69568dd0c21405fe0e18
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
deleted file mode 100644
index a509d28ded90..000000000000
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="A collection of libraries and utilites used by Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 x86"
-IUSE="+introspection systemd"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.37.3:2[dbus]
-	media-sound/pulseaudio[glib]
-	>=x11-libs/gdk-pixbuf-2.22:2[introspection?]
-	>=x11-libs/gtk+-3.3.16:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.3
-	x11-libs/cairo:=[X]
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	>=gnome-base/gsettings-desktop-schemas-3.5.91
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	sys-apps/accountsservice
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-doc-am-1.4
-	>=dev-util/intltool-0.40.6
-	gnome-base/gnome-common
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# set sane default gschema values for systemd users
-	if use systemd; then
-		insinto /usr/share/glib-2.0/schemas/
-		newins "${FILESDIR}"/${PN}-2.6.4.systemd.gschema.override ${PN}.systemd.gschema.override
-	fi
-}
diff --git a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override b/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
deleted file mode 100644
index cf08f9ca2d2b..000000000000
--- a/gnome-extra/cinnamon-desktop/files/cinnamon-desktop-2.6.4.systemd.gschema.override
+++ /dev/null
@@ -1,5 +0,0 @@
-[org.cinnamon.desktop.session]
-
-screensaver-uses-logind=true
-session-manager-uses-logind=true
-settings-daemon-uses-logind=true
diff --git a/gnome-extra/cinnamon-desktop/metadata.xml b/gnome-extra/cinnamon-desktop/metadata.xml
deleted file mode 100644
index 4664002df8ad..000000000000
--- a/gnome-extra/cinnamon-desktop/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-desktop</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-menus-3.6.0 b/gnome-extra/cinnamon-menus-3.6.0
new file mode 100644
index 000000000000..9374e76753aa
--- /dev/null
+++ b/gnome-extra/cinnamon-menus-3.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) dev-libs/gobject-introspection-common >=dev-util/intltool-0.40 gnome-base/gnome-common sys-devel/gettext 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon's library for the Desktop Menu fd.o specification
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug +introspection
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=dev-libs/glib-2.29.15:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-menus/archive/3.6.0.tar.gz -> cinnamon-menus-3.6.0.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2cccdbedfcb49b194d2f35c2e8262a7f
diff --git a/gnome-extra/cinnamon-menus/Manifest b/gnome-extra/cinnamon-menus/Manifest
deleted file mode 100644
index 3b879affb623..000000000000
--- a/gnome-extra/cinnamon-menus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cinnamon-menus-3.6.0.tar.gz 180165 BLAKE2B a014c120bc84206914be69fcae0f4ec09b98a281012ed3f6f2f21f46762ea0b5e289c6dbd321fb7889f6172c9e7150673513e4c15dbd2e634c48efcefa816176 SHA512 dc90dbb8633ac77f4c8be7b013e3d6f9ba8f4e830f7e8c09ec7dcb9566a3768171a59cdc90b6cd11ad015b93629cdf6fc8c2397656f74603a517c0fbc97d3b14
-EBUILD cinnamon-menus-3.6.0.ebuild 869 BLAKE2B 605b700314515d29704c6a4d834c4d3a8911fb8d603743215adaec321e33a90995c117ee98e8e547460717295a61996ecf8248b67534e172e356d961a1b4c93c SHA512 fc67e347dc2eb02a2c641fbf137000e49758e6e7ec546f373779b0b18419702addc12e66d0ca39d25bb206b1c5938bab4822a3d9fa79083f24777b5747b6b290
-MISC metadata.xml 341 BLAKE2B be1e94bc533e24d0daae51089eb50e5e3f30db907094797872e42eefdfe7e8f6abe0f0cb7174bf650e0f20f9a5fc58a4e7243913c29f2cd7e06ca4e46bc4ba63 SHA512 177880a66033caf631d8b8c794da66a122feb891f1208fe6d6f9a3e7675f3cae22d85d0cdd1dd5c17b9098e8e38e823b96385e19f75439ea4d0b32a1f6e81f83
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
deleted file mode 100644
index 0a3cbee5e369..000000000000
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2
-
-DESCRIPTION="Cinnamon's library for the Desktop Menu fd.o specification"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.29.15:2
-	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/gobject-introspection-common
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		--disable-static
-}
diff --git a/gnome-extra/cinnamon-menus/metadata.xml b/gnome-extra/cinnamon-menus/metadata.xml
deleted file mode 100644
index 9f2cc8ae0d4c..000000000000
--- a/gnome-extra/cinnamon-menus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-menus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-screensaver-3.6.1-r1 b/gnome-extra/cinnamon-screensaver-3.6.1-r1
new file mode 100644
index 000000000000..30a942d63baf
--- /dev/null
+++ b/gnome-extra/cinnamon-screensaver-3.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) >=dev-util/intltool-0.35 gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Screensaver for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=debug doc pam systemd xinerama python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=x11-libs/gtk+-3.1.4:3[introspection] >=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=] >=gnome-base/gsettings-desktop-schemas-0.1.7 >=gnome-base/libgnomekbd-3.6 >=dev-libs/dbus-glib-0.78 net-libs/webkit-gtk:4[introspection] sys-apps/dbus x11-libs/libxklavier x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-themes/adwaita-icon-theme !systemd? ( sys-auth/elogind ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] pam? ( virtual/pam ) systemd? ( >=sys-apps/systemd-31:0= ) xinerama? ( x11-libs/libXinerama ) !~gnome-extra/cinnamon-1.8.8.1 dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/setproctitle[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/xapp[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/psutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-screensaver/archive/3.6.1.tar.gz -> cinnamon-screensaver-3.6.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b6b237bd4525c67d370a389f47014758
diff --git a/gnome-extra/cinnamon-screensaver/Manifest b/gnome-extra/cinnamon-screensaver/Manifest
deleted file mode 100644
index 775b2869f252..000000000000
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cinnamon-screensaver-3.6.1.tar.gz 154729 BLAKE2B cd94413791d0500f01ec8eefc9b003e635c1bdac35d37768097ba19aff3005359e6596d3795dcf41ded9338f33dc9b68f6fdd5b7556eef9fbdcb88b8de4dd500 SHA512 9fd5ad0227993277d8ea773cbf80de7d3d7145eb38014e3673d2c31f9947dae0f45cd961077c56cd17deb6422b128ea56c909f4974ab55953bd42c63a2a2fc37
-EBUILD cinnamon-screensaver-3.6.1-r1.ebuild 2024 BLAKE2B 80141dcc65f1817703fc4339ed02599d40af68f62f729564ccd64dc41fe498781e3427c9ed7c73b6ad1af8b37661361f00bf01558b6c6a870bb53c310d79a224 SHA512 e5d43f38ab31e210746706197b69d176e522f567ef49df24e6ecc1b9ac74ebbf5fa4a07d5ed72000a2488aa2b25668eec1930e5e14f8c9b6d8185264c89e3abf
-MISC metadata.xml 347 BLAKE2B 773184a65ac7d37b4a3d999c2a191c93b5b02fbe7a7649132b67673d6285a7cfdddc699e18d9c30312e776c8a323d773722b45fbd75991fb46fee079b689ccfc SHA512 4467748a71035d2147a185121e657c8fa84f7d62c80c5a5bc2eadea631d1dde6c741e1e33c39f839cca9c9a48dfbad99706633bccc48af4c5009b490f353d4be
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
deleted file mode 100644
index 0c336581cdca..000000000000
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools gnome2 multilib python-single-r1
-
-DESCRIPTION="Screensaver for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="debug doc pam systemd xinerama"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=x11-libs/gtk+-3.1.4:3[introspection]
-	>=gnome-extra/cinnamon-desktop-2.6.3:0=[systemd=]
-	>=gnome-base/gsettings-desktop-schemas-0.1.7
-	>=gnome-base/libgnomekbd-3.6
-	>=dev-libs/dbus-glib-0.78
-
-	net-libs/webkit-gtk:4[introspection]
-
-	sys-apps/dbus
-	x11-libs/libxklavier
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXScrnSaver
-	x11-libs/libXxf86misc
-	x11-libs/libXxf86vm
-	x11-themes/adwaita-icon-theme
-
-	!systemd? ( sys-auth/elogind )
-
-	${PYTHON_DEPS}
-
-	pam? ( virtual/pam )
-	systemd? ( >=sys-apps/systemd-31:0= )
-	xinerama? ( x11-libs/libXinerama )
-"
-# our cinnamon-1.8 ebuilds installed a cinnamon-screensaver.desktop hack
-RDEPEND="${COMMON_DEPEND}
-	!~gnome-extra/cinnamon-1.8.8.1
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	dev-python/xapp[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? (
-		app-text/xmlto
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/docbook-xml-dtd:4.4 )
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	python_fix_shebang screensavers
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug ' ') \
-		$(use_enable xinerama)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version x11-misc/xscreensaver; then
-		elog "${PN} can use screensavers from x11-misc/xscreensaver"
-	fi
-
-}
diff --git a/gnome-extra/cinnamon-screensaver/metadata.xml b/gnome-extra/cinnamon-screensaver/metadata.xml
deleted file mode 100644
index 00e290bb5707..000000000000
--- a/gnome-extra/cinnamon-screensaver/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-screensaver</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-session-3.6.1-r4 b/gnome-extra/cinnamon-session-3.6.1-r4
new file mode 100644
index 000000000000..b97635e1f702
--- /dev/null
+++ b/gnome-extra/cinnamon-session-3.6.1-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) dev-libs/libxslt >=dev-util/intltool-0.40.6 virtual/pkgconfig doc? ( app-text/xmlto ) gnome-base/gnome-common >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Cinnamon session manager
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=doc ipv6 systemd
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ FDL-1.1+ LGPL-2+
+RDEPEND=>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.37.3:2 media-libs/libcanberra x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/cairo x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X] virtual/opengl systemd? ( >=sys-apps/systemd-183 sys-auth/polkit ) !systemd? ( sys-power/upower sys-auth/polkit[elogind] ) >=gnome-extra/cinnamon-desktop-2.6[systemd=] !systemd? ( sys-auth/elogind[policykit] )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-session/archive/3.6.1.tar.gz -> cinnamon-session-3.6.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=79293e1cc141c622e41b94109e2934ba
diff --git a/gnome-extra/cinnamon-session/Manifest b/gnome-extra/cinnamon-session/Manifest
deleted file mode 100644
index d144ce9be781..000000000000
--- a/gnome-extra/cinnamon-session/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cinnamon-session-3.0.1-automagic.patch 1470 BLAKE2B 799b731979f9a5326d61ec130db092a6b52d10eb0f434302b49fa0996fc9b6c3073ff312bd5f84faf1b12936919209db6159a7ad235f765af78b622b06b700db SHA512 571cdc733a66821abd927a7132bc27ebbc214023eb6c2985213409272d11baad1f734350d2a0853c27ebc35a059ca9d3766c4db658b558e013d5850a13f5e971
-AUX cinnamon-session-3.6.1-elogind.patch 1948 BLAKE2B 616dde6cb6612126074524df8662fc30cf59c126a37cfa9d82b09c086d31f47af64d9f96210a8d430b9eb3aca7279b93ce38f31e4574274064d103dc2f142b97 SHA512 ad8c067514318c126aab6d72da7004a0c07964cb9cac8c3763ec39b07d222a9dd6425eb464f1f0047d55c61f8a335611bd46e1546e2f170b43959207ff98c75f
-AUX cinnamon-session-3.6.1-elogind2.patch 743 BLAKE2B 4827c2cc5c8bcb74b0a31dc81c4fd4a25ade00f3a22371627cc3bdb5e3fb4476f7b66954ab6101681bef04bd7e38531851f2e371e6dee32c6294fc6f6faa240c SHA512 03e7beeaf6a93aaedcbe070c6182d3fcc898bd8410a65c63a9c5dcce310e97a4a4654e88e91e7aa7d8c12eef12d8f02eba89d8e007842c27d04dc9165c642de3
-DIST cinnamon-session-3.6.1.tar.gz 205682 BLAKE2B 5e4bb931da715feebec6c980cd59d82b682d75234ab0e2c4135948fd83b81ea8c57536b6b2a0294162de82288af57a31977e77383e9c426357ecb4dacc4bd1e4 SHA512 a8ae2d332ba8e9f83ab9444c56611b28bd1c32ef9764fd5e883b7835940ec2b6c8b87f8af1735a3c2fe59ad4f15af5f5dab065cd368aaa09d4d25f6156ec6137
-EBUILD cinnamon-session-3.6.1-r4.ebuild 1540 BLAKE2B de1d180a3c7ef0b85ff0f8e9766108d5e6f8ed58fab9c124b21d9acf5907665db3eb45723b48e31bdbc9772ecfe5358d0f46c9702c346253530de4bfc9f7dca0 SHA512 4e12e45b19c8c54cc8319ff554c1372942a72ad54f8e13e5b24e23f230ea09292403395fad216cb95bccaddf64d22d4b2a4adc281e8abe4b4b27271d1004123a
-MISC metadata.xml 343 BLAKE2B 6526f06bd8b9c250154c56a126b12c40b9c61fc52b6d4175f9b5e86e3a3ef5b1eba4af9db0b9ef768aaac361e941f2ab93f4e2d6291afb5cc1657c20f69d825b SHA512 dbdf14a6641b809dcdf364577f4e9ca9ca31d6db62a74f74bbbf1f5ee962e69452fb027098735bda31138c27dd43692b78915eca1ad40ab5a29938a28a56b610
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
deleted file mode 100644
index 2be2b7170fa6..000000000000
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.6.1-r4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils gnome2
-
-DESCRIPTION="Cinnamon session manager"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc ipv6 systemd"
-
-COMMON_DEPEND="
-	>=dev-libs/dbus-glib-0.88
-	>=dev-libs/glib-2.37.3:2
-	media-libs/libcanberra
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3
-	x11-libs/cairo
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXcomposite
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-	virtual/opengl
-	systemd? ( >=sys-apps/systemd-183
-			   sys-auth/polkit )
-	!systemd? ( sys-power/upower
-			   sys-auth/polkit[elogind] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-extra/cinnamon-desktop-2.6[systemd=]
-	!systemd? ( sys-auth/elogind[policykit] )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-
-	gnome-base/gnome-common
-"
-
-src_prepare() {
-	# make upower and logind check non-automagic
-	eapply "${FILESDIR}/${PN}-3.0.1-automagic.patch"
-	eapply "${FILESDIR}/${PN}-3.6.1-elogind.patch"
-	eapply "${FILESDIR}/${PN}-3.6.1-elogind2.patch"
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gconf \
-		--disable-static \
-		--enable-logind \
-		$(use_enable doc docbook-docs) \
-		$(use_enable ipv6)
-}
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
deleted file mode 100644
index 9ca31379a60e..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.0.1-automagic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/configure.ac~	2016-05-20 13:03:13.000000000 +0200
-+++ b/configure.ac	2016-06-25 17:36:55.389583194 +0200
-@@ -56,7 +56,15 @@
- 
- dnl We can only support old upower
- dnl https://bugzilla.gnome.org/show_bug.cgi?id=710383
--PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+AC_ARG_ENABLE([old-upower],
-+  AS_HELP_STRING([--disable-old-upower], [Do not check for old UPower API]),
-+  [enable_old_upower=$enableval],
-+  [enable_old_upower=auto])
-+
-+have_old_upower=no
-+if test x$enable_old_upower != xno ; then
-+  PKG_CHECK_MODULES(UPOWER, upower-glib < 0.99.0, have_old_upower=yes, have_old_upower=no)
-+fi
- AS_IF([test x$have_old_upower = xyes], [
-   AC_DEFINE([HAVE_OLD_UPOWER], [1], [Define if we have an older upower])
- ])
-@@ -96,9 +104,15 @@
- dnl Check for logind
- dnl ====================================================================
- 
--PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+  AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+  [enable_logind=$enableval],
-+  [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
deleted file mode 100644
index fdbda72ca22e..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/cinnamon-session/Makefile.am b/cinnamon-session/Makefile.am
-index 789d47d..d8093d4 100644
---- a/cinnamon-session/Makefile.am
-+++ b/cinnamon-session/Makefile.am
-@@ -71,6 +71,7 @@ cinnamon_session_CPPFLAGS =			\
- 	$(XEXT_CFLAGS)				\
- 	$(GCONF_CFLAGS)				\
- 	$(LOGIND_CFLAGS)			\
-+	$(ELOGIND_CFLAGS)			\
- 	-I$(top_srcdir)/egg			\
- 	-DLOCALE_DIR=\""$(datadir)/locale"\"	\
- 	-DDATA_DIR=\""$(datadir)/cinnamon-session"\" \
-@@ -91,6 +92,7 @@ cinnamon_session_LDADD =				\
- 	$(UPOWER_LIBS)				\
- 	$(GCONF_LIBS)				\
- 	$(LOGIND_LIBS)				\
-+	$(ELOGIND_LIBS)				\
- 	$(EXECINFO_LIBS)
- 
- libcsmutil_la_SOURCES =				\
-diff --git a/cinnamon-session/csm-systemd.c b/cinnamon-session/csm-systemd.c
-index cef991c..dc2aa2e 100644
---- a/cinnamon-session/csm-systemd.c
-+++ b/cinnamon-session/csm-systemd.c
-@@ -32,7 +32,11 @@
- #include <sys/types.h>
- #include <pwd.h>
- 
-+#ifdef HAVE_ELOGIND
-+#include <elogind/sd-login.h>
-+#else
- #include <systemd/sd-login.h>
-+#endif
- 
- #include <glib.h>
- #include <glib-object.h>
-diff --git a/configure.ac b/configure.ac
-index 38db5a3..8dafc6a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,15 +113,23 @@ AC_ARG_ENABLE([logind],
- 
- have_logind=no
- if test x$enable_logind != xno ; then
--  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd >= 183], [have_logind=yes], [have_logind=no])
-+  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
- fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
- 
-+have_elogind=no
-+PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-+if test x$have_elogind = xyes; then
-+        AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+fi
-+
- AC_SUBST(LOGIND_CFLAGS)
- AC_SUBST(LOGIND_LIBS)
-+AC_SUBST(ELOGIND_CFLAGS)
-+AC_SUBST(ELOGIND_LIBS)
- 
- dnl ====================================================================
- dnl Option to disable DBus user session support.
diff --git a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch b/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
deleted file mode 100644
index a58703bc1bf3..000000000000
--- a/gnome-extra/cinnamon-session/files/cinnamon-session-3.6.1-elogind2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index c46b35f..5bde44a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -113,7 +113,7 @@ AC_ARG_ENABLE([logind],
- 
- have_logind=no
- if test x$enable_logind != xno ; then
--  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0], [have_logind=yes], [have_logind=no])
-+  PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
- fi
- 
- if test x$have_logind = xyes; then
-@@ -124,6 +124,7 @@ have_elogind=no
- PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
- if test x$have_elogind = xyes; then
-         AC_DEFINE(HAVE_ELOGIND, 1, [Define if elogind is supported])
-+	AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
- fi
- 
- AC_SUBST(LOGIND_CFLAGS)
diff --git a/gnome-extra/cinnamon-session/metadata.xml b/gnome-extra/cinnamon-session/metadata.xml
deleted file mode 100644
index ad3cba8d7130..000000000000
--- a/gnome-extra/cinnamon-session/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-session</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-settings-daemon-3.6.1-r1 b/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
new file mode 100644
index 000000000000..35189eabef5c
--- /dev/null
+++ b/gnome-extra/cinnamon-settings-daemon-3.6.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= ) dev-libs/libxml2:2 >=dev-util/intltool-0.37.1 x11-base/xorg-proto 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Cinnamon's settings daemon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+colord cups input_devices_wacom smartcard systemd test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=gnome-base/libgnomekbd-3.6 >=gnome-base/librsvg-2.36.2 >=gnome-extra/cinnamon-desktop-2.8.0:0= media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra:0=[gtk3] sys-apps/dbus >=sys-auth/polkit-0.97 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.9.10:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libxklavier virtual/libgudev:= >=sys-power/upower-0.9.11 colord? ( >=x11-misc/colord-0.1.27:= ) cups? ( >=net-print/cups-1.4[dbus] ) input_devices_wacom? ( >=dev-libs/libwacom-0.7 x11-drivers/xf86-input-wacom x11-libs/libXtst ) smartcard? ( >=dev-libs/nss-3.11.2 ) systemd? ( sys-apps/systemd:0= ) !systemd? ( sys-auth/elogind:0= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-settings-daemon/archive/3.6.1.tar.gz -> cinnamon-settings-daemon-3.6.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=08f75d86703479fe8a572e917b2f860e
diff --git a/gnome-extra/cinnamon-settings-daemon/Manifest b/gnome-extra/cinnamon-settings-daemon/Manifest
deleted file mode 100644
index 305bc3622bfc..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cinnamon-settings-daemon-3.0.1-optional.patch 3242 BLAKE2B 6f2b64711df08f037155360728ad3f1da4184e2531e2b516b1e656379a9fc8edc26757a9b758f435c227b68c8a9936654b2147602f41b38e6eb198b4045bd10c SHA512 77d0e4c7f72b43b14e5d3106fde06d119f2e20b372e5cfa3565b67cdba6d1150fc1c59866df7db85307d1b3d8b0b2c90d5e04acbb6429e801a3aedd6135f72e8
-DIST cinnamon-settings-daemon-3.6.1.tar.gz 995005 BLAKE2B c512fe53b707099dca0926893f03056d508bbe22026367c3212a99f22df60d629e02e080fccdeb73151c7aa7e93396b47bede1820059f4a53eace11a56ae5521 SHA512 48a28decff08a191f4ec604386c3bb5c07001d4bc4f7b6d1da379626b41650653fdd14205bbed5321c41fbc281e8638b17e1de30dbba5d299f79cde03216cb33
-EBUILD cinnamon-settings-daemon-3.6.1-r1.ebuild 2042 BLAKE2B 5941be45774f98c77b5cff4ea89403166943715c46a7904f634c394fc168bc6aeccd9dfbd35869cf36dd0fa4af89ec286aebaf9be861722dc4096399c9ed3ea8 SHA512 41702acbfccba846c82ebec1e88a9b15c3b5946cd73231075086b7bac52734f15d8061e02f80e7431469b204d2f2e8259dd5d101361f48357c5e1c0fbcee10f0
-MISC metadata.xml 453 BLAKE2B 430a92263b5593b373d945790b066af782b50e58008c4cbe045b768b757bf0ff286629df2a1e35b8fa13582aea2e134a8b55468e1abb3b67598f4f338c4f67f2 SHA512 b4525358e2f21c39d179f8003bd27122af405a7c79dbde94bb0d3b5086f9c39691c9dae986cacbe669316e92459cec19a40af2ed651d0abfcbbbce0857054ee8
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
deleted file mode 100644
index 66ed58615ece..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2 virtualx
-
-DESCRIPTION="Cinnamon's settings daemon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+colord cups input_devices_wacom smartcard systemd"
-RESTRICT=test
-
-# udev is non-optional since lots of plugins, not just gudev, pull it in
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=gnome-base/libgnomekbd-3.6
-	>=gnome-base/librsvg-2.36.2
-	>=gnome-extra/cinnamon-desktop-2.8.0:0=
-	media-libs/fontconfig
-	>=media-libs/lcms-2.2:2
-	media-libs/libcanberra:0=[gtk3]
-	sys-apps/dbus
-	>=sys-auth/polkit-0.97
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.9.10:3
-	>=x11-libs/libnotify-0.7.3:0=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxklavier
-	virtual/libgudev:=
-	>=sys-power/upower-0.9.11
-
-	colord? ( >=x11-misc/colord-0.1.27:= )
-	cups? ( >=net-print/cups-1.4[dbus] )
-	input_devices_wacom? (
-		>=dev-libs/libwacom-0.7
-		x11-drivers/xf86-input-wacom
-		x11-libs/libXtst )
-	smartcard? ( >=dev-libs/nss-3.11.2 )
-	systemd? ( sys-apps/systemd:0= )
-	!systemd? (	sys-auth/elogind:0= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	>=dev-util/intltool-0.37.1
-	x11-base/xorg-proto
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# make colord and wacom optional
-	eapply "${FILESDIR}"/${PN}-3.0.1-optional.patch
-
-	# Disable broken test
-	sed -e '/g_test_add_func ("\/color\/edid/d' \
-		-i plugins/color/gcm-self-test.c || die
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# no point in disabling gudev since other plugins pull it in
-	gnome2_src_configure \
-		--disable-static \
-		--enable-gudev \
-		--enable-polkit \
-		--enable-logind \
-		$(use_enable colord color) \
-		$(use_enable cups) \
-		$(use_enable smartcard smartcard-support) \
-		$(use_enable input_devices_wacom wacom)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch b/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
deleted file mode 100644
index c12d7636f967..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/files/cinnamon-settings-daemon-3.0.1-optional.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/configure.ac~	2016-05-10 17:30:40.000000000 +0200
-+++ b/configure.ac	2016-06-25 17:43:46.554279197 +0200
-@@ -259,14 +259,28 @@
- dnl - color
- dnl ---------------------------------------------------------------------------
- 
--PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+AC_ARG_ENABLE(color,
-+              AS_HELP_STRING([--disable-color], [disable Colord support (default: enabled)]),,
-+              enable_color=yes)
-+build_color=false
-+if test x"$enable_color" != x"no" ; then
-+  PKG_CHECK_MODULES(COLOR, [colord >= 0.1.27 cinnamon-desktop >= $CINNAMON_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
-+  build_color=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_COLOR, [test "x$build_color" = "xtrue"])
- 
- dnl ---------------------------------------------------------------------------
- dnl - wacom
- dnl ---------------------------------------------------------------------------
-+AC_ARG_ENABLE(wacom,
-+              AS_HELP_STRING([--disable-wacom], [disable Wacom support (default: auto)]),,
-+              enable_wacom=auto)
- build_wacom=false
--PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
--                  [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+if test x"$enable_wacom" != x"no" ; then
-+  PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 cinnamon-desktop xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION gtk+-3.0 >= 3.8.0],
-+                    [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])], [build_wacom="false"])
-+fi
- 
- AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
- 
-@@ -372,9 +386,15 @@
- dnl Check for logind
- dnl ====================================================================
- 
--PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [
-- PKG_CHECK_MODULES(LOGIND, [libsystemd], [have_logind=yes], [have_logind=no])
--])
-+AC_ARG_ENABLE([logind],
-+              AS_HELP_STRING([--disable-logind], [Do not check for logind]),
-+              [enable_logind=$enableval],
-+              [enable_logind=auto])
-+
-+have_logind=no
-+if test x$enable_logind != xno ; then
-+    PKG_CHECK_MODULES(LOGIND, [libsystemd-login], [have_logind=yes], [have_logind=no])
-+fi
- 
- if test x$have_logind = xyes; then
-     AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
-@@ -595,6 +615,7 @@
-         LCMS DICT support:        ${have_new_lcms}
-         Libnotify support:        ${have_libnotify}
- 
-+        Colord support:           ${build_color}
-         Wacom support:            ${build_wacom}
- 
-         Smartcard support:        ${have_smartcard_support}
---- a/plugins/Makefile.am~	2016-05-10 17:30:40.000000000 +0200
-+++ b/plugins/Makefile.am	2016-06-25 17:44:30.021307677 +0200
-@@ -6,7 +6,6 @@
- 	automount	\
- 	background  \
- 	clipboard	\
--	color		\
- 	cursor		\
- 	dummy		\
-     datetime    \
-@@ -23,6 +22,12 @@
- 
- disabled_plugins = $(NULL)
- 
-+if BUILD_COLOR
-+enabled_plugins += color
-+else
-+disabled_plugins += color
-+endif
-+
- if BUILD_WACOM
- enabled_plugins += wacom
- else
diff --git a/gnome-extra/cinnamon-settings-daemon/metadata.xml b/gnome-extra/cinnamon-settings-daemon/metadata.xml
deleted file mode 100644
index aab7fdc66a7f..000000000000
--- a/gnome-extra/cinnamon-settings-daemon/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<use>
-		<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-settings-daemon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon-translations-3.6.3 b/gnome-extra/cinnamon-translations-3.6.3
new file mode 100644
index 000000000000..82714891859a
--- /dev/null
+++ b/gnome-extra/cinnamon-translations-3.6.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Translation data for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
+_md5_=697d5626c05c46ecca189ab89d9ede14
diff --git a/gnome-extra/cinnamon-translations-3.6.3-r1 b/gnome-extra/cinnamon-translations-3.6.3-r1
new file mode 100644
index 000000000000..2c6c63976857
--- /dev/null
+++ b/gnome-extra/cinnamon-translations-3.6.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
+DESCRIPTION=Translation data for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>gnome-extra/cinnamon-settings-daemon-3.6
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cinnamon-translations/archive/3.6.3.tar.gz -> cinnamon-translations-3.6.3.tar.gz
+_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b
+_md5_=ec415cb57dae1a2783b51af3fe99a3a8
diff --git a/gnome-extra/cinnamon-translations/Manifest b/gnome-extra/cinnamon-translations/Manifest
deleted file mode 100644
index 8e52522469d0..000000000000
--- a/gnome-extra/cinnamon-translations/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cinnamon-translations-3.6.3.tar.gz 9486325 BLAKE2B 75d25beb66dc28565eb6d61f64df66e69de347ffe01984d9958b3388109d7e89f839205913432d7d68a7fedda743d4de52d63b1d95fc54ff77a8b80501d7e668 SHA512 274ad790ad9e8bc1d424ce45ff426ebdadf868bd48c065a21a8be014cabc889927974de5eb56ef909317bcecf4a0ca9e98af8ba3ade08c903fa286c93e05f695
-EBUILD cinnamon-translations-3.6.3-r1.ebuild 1361 BLAKE2B b30f76730a9e283a793ad8036e5e4bd5a6aca87e02903c6c87e64c67db1149ae426e37036dd94e2ab163a0d1ce1318ada461786e9e5df939fb3096cb0b807a20 SHA512 9eefaf04e7d7f151df23305fe6e84b8d9e05395def647b3773a762ab369f59e1521af377ff162c266272ac1f6608d8905b9920f22c6a2a4f3c6adee3d3c847c1
-EBUILD cinnamon-translations-3.6.3.ebuild 1309 BLAKE2B 7cff20355506a7a644f58bf10b0498fb9f08782177d78af6790c590703df83d7533239c033058adf903ad580572857959d9b26ee9daab59cb5cc8eed7a0924f6 SHA512 dd6b64f23edb69ff0a8672dee36ce4f34bb60a7883b265cb6b6c3caffcf3ad57419551dd4057f6b386df679ae6cbc28fb58abce676c844e80e50745fca5f8d83
-MISC metadata.xml 348 BLAKE2B 22e9f760365b2c7e8aee07556c723590b93f615fcab90c687dbaa55f4a32262ef29b1d576f68830caf6c21a315e87009c0101b98fac856c70d88269a12bdc251 SHA512 357310d45466db6b2f600aacce60220f88810d91ff228bdfb874c3f3c7148c6ad599c11d87c63e1b2650361361e6a3accce18700aa15046322514f5065cd0777
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
deleted file mode 100644
index 8f055fc0aec4..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">gnome-extra/cinnamon-settings-daemon-3.6"
-RDEPEND="${DEPEND}"
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
deleted file mode 100644
index 39fbaa56032e..000000000000
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
-
-inherit l10n
-
-DESCRIPTION="Translation data for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-RESTRICT="test" # tests are for upstream translators and need network access
-
-src_configure() { :; }
-
-src_install() {
-	# Cannot run before since locales are not in the expected place for this to work
-	l10n_find_plocales_changes "${S}"/usr/share/locale "" ""
-
-	install_locale() {
-		dodir /usr/share/locale
-		insinto /usr/share/locale
-		doins -r usr/share/locale/${1}
-	}
-	l10n_for_each_locale_do install_locale
-}
diff --git a/gnome-extra/cinnamon-translations/metadata.xml b/gnome-extra/cinnamon-translations/metadata.xml
deleted file mode 100644
index d5f1fb8d01fc..000000000000
--- a/gnome-extra/cinnamon-translations/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/cinnamon-translations</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
deleted file mode 100644
index d9e248510d9a..000000000000
--- a/gnome-extra/cinnamon/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX cinnamon-2.2.6-automagic-gnome-bluetooth.patch 1715 BLAKE2B acee6063acb4c0c8d67f098a7ccde319589c330736a9624537ac2dcfbee75c8971cb6b88cb49ae36b380b0fe3024d55c54e127cc2cec0d21ade17f56b9ed9be6 SHA512 a4344afe29799dbd4e6d88907c2906702c861e1409fb95d29fcc52f9b75be379ffd5a4682dde4a82fe40c898bb2468590d1241adb1a2415c473a3d75459e3460
-AUX cinnamon-2.8.0-background.patch 1106 BLAKE2B c3f42ba7e5f298b4345701536d7045cb4b224f4c22645135083ebccf5211bf33eaf61f95c639737561208e7dc10cacc54e900f93a18d73d0aaf90967192dd3ae SHA512 2affc6ab9b9b1f444fb5fec752e4d90cd7716986e5c48087c6e2bc9820792547fc1f6aca66d096ec056aaa0010c023fca2c88f6828320fb575a0fa2e56b22995
-AUX cinnamon-3.6.6-wheel-sudo.patch 1342 BLAKE2B 173bb9331b51cd0a3110477c8631bd2c887cba6c085d8e8f299810aa83fc83f3e72f8855c40e74637a0453f0fc6b47d972d1a54280ea2eb5538dbe08e7dccd49 SHA512 e59432ca4463652eb5f47075898b78b9025c3a83ca4a305a2c545b9791f8e715cb96c54c550175277dab53cac0f5a6c9fbf78352a09ac977a192e75e800ddb74
-AUX polkit-cinnamon-authentication-agent-1.desktop 213 BLAKE2B 66a45b25c92751b01d0286e000997e91cea344a4d4ac8d2073d4f268e2e58791d675e3e3f869dc792572c743ff01bf0e92ff87b85686e5a63f0db646b2bf8fbc SHA512 b60eb24e3bbd501ed9a22cea386c3f70be431e15c3851ac8e8ebbc454648510ab30ad89d1720cbd9036debb2d970adaef0aa28ca37e8f5cbfe56cbf50c8775db
-DIST cinnamon-3.6.6.tar.gz 2211080 BLAKE2B a5be448413532b6cc84c77d17e56739a8c2f3c26f21fac3fcdcaeda127a00e1a8f7d623964c4040f77624da06795eb607491aef55bf31fcb291b074ee75930f9 SHA512 9bd153508458bae2f99a451620fe5e80e45cae0e10cf113b07ca2c0a76cd16e84c4a6d743c659ef41ab91066df025f78a0ea2005a3d34ddd065fe88f358b6642
-EBUILD cinnamon-3.6.6-r2.ebuild 7646 BLAKE2B 15b814158431413272ec8a030141cf2874d64614a0a0a75ee6c09ec916b32397626fb5668527af039284eda72eeee68a4c21084a894aadaa1feeda1fe3f17b46 SHA512 f06a8fff3801480155d230dc962a6ab201cce072ae951f24f381e51087919961b3ac9f5ba5b0091410fe31aabae4d1715febe6bc354d6f14b1cdbd5a1f8dfe98
-MISC metadata.xml 335 BLAKE2B cb8a6325c1c826a1e7024b00fab8c93eefc54517d38b642b9df3041efbe37864a53ae0258d5a374aeaf83afe3e5a9b442359e1058765aa74ffb042b0306f50dd SHA512 f9dd9ed8857cedec2a47af22252405b77b08768ec9039bdb034a848f175bd4e9046a082654e38c69e3e4b5dc1864377782a20ba2c9ea19f51f79d08182447bdb
diff --git a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
deleted file mode 100644
index 504464fac2ab..000000000000
--- a/gnome-extra/cinnamon/cinnamon-3.6.6-r2.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils flag-o-matic gnome2 multilib pax-utils python-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://developer.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-# bluetooth support dropped due to bug #511648
-IUSE="+nls +networkmanager" #+bluetooth
-
-# We need *both* python 2.x and 3.x
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( $(python_gen_useflags 'python2*') )
-	|| ( $(python_gen_useflags 'python3*') )
-"
-
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-accessibility/at-spi2-atk:2
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.35.0:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-3.6:0=[introspection]
-	>=gnome-extra/cinnamon-menus-3.6[introspection]
-	>=gnome-extra/cjs-3.6.0
-	>=media-libs/clutter-1.10:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.9.12:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-3.6.0[introspection]
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999:=[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# 12. polkit-gnome - explicitly autostarted by us
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	>=gnome-extra/cinnamon-session-3.6
-	>=gnome-extra/cinnamon-settings-daemon-3.6
-
-	>=app-accessibility/caribou-0.3
-
-	x11-misc/xdg-utils
-	x11-libs/xapps[introspection]
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/gconf-python:2[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pexpect[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pycairo[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pypam[${PYTHON_USEDEP}]' 'python2*')
-	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]' 'python2*')
-
-	x11-themes/gnome-themes-standard
-	x11-themes/adwaita-icon-theme
-
-	>=gnome-extra/nemo-3.6
-	>=gnome-extra/cinnamon-control-center-3.6
-	>=gnome-extra/cinnamon-screensaver-3.6
-
-	gnome-extra/polkit-gnome
-
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-	nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep 'dev-python/polib[${PYTHON_USEDEP}]' 'python2*')
-	dev-util/gtk-doc
-	>=dev-util/intltool-0.4
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	# Fix backgrounds path as cinnamon doesn't provide them
-	# https://github.com/linuxmint/Cinnamon/issues/3575
-	eapply "${FILESDIR}"/${PN}-2.8.0-background.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	eapply "${FILESDIR}"/${PN}-2.2.6-automagic-gnome-bluetooth.patch
-
-	# Use wheel group instead of sudo (from Fedora/Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3576
-	eapply "${FILESDIR}"/${PN}-3.6.6-wheel-sudo.patch
-
-	# Use pkexec instead of gksu (from Arch)
-	# https://github.com/linuxmint/Cinnamon/issues/3565
-	sed -i 's/gksu/pkexec/' files/usr/bin/cinnamon-settings-users || die
-
-	# Add polkit agent to required components (from Fedora/Arch), bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \
-		files/usr/share/cinnamon-session/sessions/cinnamon*.session || die
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	# python 2-and-3 shebang fixing craziness
-	local p
-	python_setup 'python3*'
-	for p in $(grep -rl '#!.*python3'); do
-		python_fix_shebang "${p}"
-	done
-
-	python_setup 'python2*'
-	for p in $(grep -rl '#!.*python[^3]'); do
-		python_fix_shebang "${p}"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}"usr/$(get_libdir)/cinnamon-*
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-
-	# Ensure authentication-agent is started, bug #523958
-	# https://github.com/linuxmint/Cinnamon/issues/3579
-	insinto /etc/xdg/autostart/
-	doins "${FILESDIR}"/polkit-cinnamon-authentication-agent-1.desktop
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-}
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
deleted file mode 100644
index aa2e82bd13fa..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.2.6-automagic-gnome-bluetooth.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 40750fc87b7a1cad60d0e605732b9df50dd16c11 Mon Sep 17 00:00:00 2001
-From: root <admin@catmur.co.uk>
-Date: Sun, 8 Jan 2012 13:55:05 +0000
-Subject: [PATCH] Fix automagic gnome-bluetooth dependency
-
-https://bugs.gentoo.org/show_bug.cgi?id=398145
-
-Ed Catmur 2012-01-08 13:46:22 UTC
-libgnome-bluetooth-applet is a private library so they shouldn't be linking
-against it anyway.  I tried to work out how to tell libtool to add it to rpath
-but got totally lost.
-
-I'll see if I can work out how to fix the automagic gnome-bluetooth dependency
-so I can at least merge USE=-bluetooth.
----
- configure.ac | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index c0e43e1..bc764e1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0)
- PKG_CHECK_MODULES(DESKTOP_SCHEMAS, cinnamon-desktop >= 1.0.0)
- 
- AC_MSG_CHECKING([for bluetooth support])
-+AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)]))
-+AS_IF([test "x$with_bluetooth" != "xno"], [
- PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
- 	 BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -123,6 +125,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0],
- 	[AC_DEFINE([HAVE_BLUETOOTH],[0])
- 	 AC_SUBST([HAVE_BLUETOOTH],[0])
- 	 AC_MSG_RESULT([no])])
-+], [AC_DEFINE([HAVE_BLUETOOTH],[0])
-+	 AC_SUBST([HAVE_BLUETOOTH],[0])
-+	 AC_MSG_RESULT([no])])
- 
- MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin`
- MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin`
--- 
-1.9.2
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch b/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
deleted file mode 100644
index d9c14144cb52..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-2.8.0-background.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19b9e5392a0b1530861d306ee962ac85c108ba1a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 11 Jan 2015 20:33:37 +0100
-Subject: [PATCH 1/5] Use gnome backgrounds since Cinnamon isn't providing any
-
-https://github.com/linuxmint/Cinnamon/issues/3575
----
- files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-index bf6dc39..83a8b04 100644
---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_backgrounds.py
-@@ -198,7 +198,7 @@ class Module:
-     def get_system_backgrounds(self):
-         picture_list = []
-         folder_list = []
--        properties_dir = "/usr/share/cinnamon-background-properties"
-+        properties_dir = "/usr/share/gnome-background-properties"
-         backgrounds = []
-         if os.path.exists(properties_dir):
-             for i in os.listdir(properties_dir):
--- 
-2.2.1
-
diff --git a/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch b/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
deleted file mode 100644
index 50512c3ab371..000000000000
--- a/gnome-extra/cinnamon/files/cinnamon-3.6.6-wheel-sudo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-index 8028727..85497c8 100755
---- a/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-+++ b/files/usr/share/cinnamon/cinnamon-settings-users/cinnamon-settings-users.py
-@@ -839,11 +839,11 @@ class Module:
-             pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size("/usr/share/cinnamon/faces/user-generic.png", 48, 48)
-             description = "<b>%s</b>\n%s" % (fullname, username)
-             piter = self.users.append(None, [new_user, pixbuf, description])
--            # Add the user to his/her own group and sudo if Administrator was selected
-+            # Add the user to his/her own group and wheel if Administrator was selected
-             if dialog.account_type_combo.get_active() == 1:
--                subprocess.call(["usermod", username, "-G", "%s,sudo,nopasswdlogin" % username])
-+                subprocess.call(["usermod", username, "-G", "%s,wheel,nopasswdlogin" % username])
-             else:
--                subprocess.call(["usermod", username, "-G", "%s,nopasswdlogin" % username])
-+                subprocess.call(["usermod", username, "-G", "%s" % username])
-             self.load_groups()
-         dialog.destroy()
- 
diff --git a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop b/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
deleted file mode 100644
index 24e14f267e23..000000000000
--- a/gnome-extra/cinnamon/files/polkit-cinnamon-authentication-agent-1.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=PolicyKit Authentication Agent
-Exec=/usr/libexec/polkit-gnome-authentication-agent-1
-Terminal=false
-Type=Application
-Categories=
-NoDisplay=true
-OnlyShowIn=X-Cinnamon;
-X-GNOME-AutoRestart=true
diff --git a/gnome-extra/cinnamon/metadata.xml b/gnome-extra/cinnamon/metadata.xml
deleted file mode 100644
index 216784b94f4d..000000000000
--- a/gnome-extra/cinnamon/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/Cinnamon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/cjs-3.6.1 b/gnome-extra/cjs-3.6.1
new file mode 100644
index 000000000000..c576851f62ac
--- /dev/null
+++ b/gnome-extra/cjs-3.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+cairo examples gtk test test
+KEYWORDS=amd64 x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=dev-lang/spidermonkey:38 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0 virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) !<gnome-extra/cinnamon-2.4
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/linuxmint/cjs/archive/3.6.1.tar.gz -> cjs-3.6.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c3ba181385a02506d6b4a16bc2b9011
diff --git a/gnome-extra/cjs/Manifest b/gnome-extra/cjs/Manifest
deleted file mode 100644
index 6f1d3b633360..000000000000
--- a/gnome-extra/cjs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch 860 BLAKE2B 267f2ade6aeb3178f98f68a7350cfdf3bdb6b421c10f064b4decf63e98c13438d73ea3447bb351b8f4605873c35c7a5612a16898e96e37356dbb7cb1d48fefa4 SHA512 8505482101109f4f7fbc8d81084fda1c22ebaf14036138c3812ce3e7b8434edc8b0b47930652e66f11a2d5fe04f004e62791088871267b7dc43396aa026778b6
-DIST cjs-3.6.1.tar.gz 426279 BLAKE2B b9d99e06b580b81178d0b4e2e3d854769357f28277500aed9f5bc2672f26ec72f584576c53d7aa6069737ae81bd0b1bf05d56d39c947de1206c506d72c8da075 SHA512 648997c76acb11885a53a73aa456989784fe5f5a12e0f349bce658c1eb3e3ce2b5c576ace488962c9b012fc85c2c3dd828f61f857cc9da7b60ee5fcdd7d25155
-EBUILD cjs-3.6.1.ebuild 2099 BLAKE2B 09dbb18fe6444150291372bdacac0a73ff6530e59f874cd2220df9a682f5af74beed4d632c6cd13c2abda6b571ef2cab4caef08111c8e3ba13e3d23e9ba37301 SHA512 9fc82a49feece084bb937045928ca3e1d33d2585bf9aaa822b4a9329e17179a3f71b3b7f83b263a5e36f3de3b1118aca81b20848dce04632ca9445d4987e7771
-MISC metadata.xml 330 BLAKE2B 9fd63621288d25f6643471279d5f5be01cc61d40ad7de618ba140add34415ecacceed969c7f57f70b55b20646947b658f4451f0427aa38a82ec0c36f7ceff2d2 SHA512 04f852b262c14801c718e80553018fbb5a48725200eb3bc502f0feb552881d0d75b9aca97bc6cd4247ce753b3b6cf95c8e6a8d9214059aeed4da39a6b12e6158
diff --git a/gnome-extra/cjs/cjs-3.6.1.ebuild b/gnome-extra/cjs/cjs-3.6.1.ebuild
deleted file mode 100644
index 8aea23c9840d..000000000000
--- a/gnome-extra/cjs/cjs-3.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnome2 pax-utils virtualx
-
-DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
-SLOT="0"
-IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-lang/spidermonkey:38
-	>=dev-libs/glib-2.37.3:2
-	>=dev-libs/gobject-introspection-1.38:=
-	sys-libs/readline:0
-	virtual/libffi
-	cairo? ( x11-libs/cairo[X,glib] )
-	gtk? ( x11-libs/gtk+:3 )
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-	sys-devel/autoconf-archive
-"
-# Cinnamon 2.2 does not work with this release.
-RDEPEND="${RDEPEND}
-	!<gnome-extra/cinnamon-2.4
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch" )
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-	sed -ie "s/gjs-console/cjs-console/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh \
-		"${S}"/installed-tests/scripts/testWarnings.sh || die
-
-	sed -ie "s/Gjs-WARNING/Cjs-WARNING/g" \
-		"${S}"/installed-tests/scripts/testCommandLine.sh || die
-
-	sed -ie "s/'Gjs'/'Cjs'/g" \
-		"${S}"/installed-tests/js/testExceptions.js \
-		"${S}"/installed-tests/js/testSignals.js \
-		"${S}"/installed-tests/js/testGDBus.js \
-		"${S}"/installed-tests/js/testEverythingBasic.js || die
-}
-
-src_configure() {
-	# FIXME: add systemtap/dtrace support, like in glib:2
-	# FIXME: --enable-systemtap installs files in ${D}/${D} for some reason
-	gnome2_src_configure \
-		--disable-systemtap \
-		--disable-dtrace \
-		$(use_with cairo) \
-		$(use_with gtk)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	# installation sometimes fails in parallel
-	gnome2_src_install -j1
-
-	if use examples; then
-		insinto /usr/share/doc/"${PF}"/examples
-		doins "${S}"/examples/*
-	fi
-
-	# Required for cjs-console to run correctly on PaX systems
-	pax-mark mr "${ED}/usr/bin/cjs-console"
-}
diff --git a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch b/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
deleted file mode 100644
index 40be11981ede..000000000000
--- a/gnome-extra/cjs/files/cjs-3.6.1-No-reason-for-System.version-to-be-this-restrictive.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2d3e093bac41474c2adf433c2948fdc97495f4dc Mon Sep 17 00:00:00 2001
-From: Kristian Fiskerstrand <kf@sumptuouscapital.com>
-Date: Mon, 2 Apr 2018 19:27:35 +0200
-Subject: [PATCH] No reason for System.version to be this restrictive
-
----
- installed-tests/js/testSystem.js | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/installed-tests/js/testSystem.js b/installed-tests/js/testSystem.js
-index 1211de4..d205595 100644
---- a/installed-tests/js/testSystem.js
-+++ b/installed-tests/js/testSystem.js
-@@ -12,7 +12,7 @@ describe('System.addressOf()', function () {
- describe('System.version', function () {
-     it('gives a plausible number', function () {
-         expect(System.version).not.toBeLessThan(14700);
--        expect(System.version).toBeLessThan(20000);
-+        expect(System.version).toBeLessThan(32000);
-     });
- });
- 
--- 
-2.16.1
-
diff --git a/gnome-extra/cjs/metadata.xml b/gnome-extra/cjs/metadata.xml
deleted file mode 100644
index 9e988588122b..000000000000
--- a/gnome-extra/cjs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">linuxmint/cjs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/eiciel-0.9.11 b/gnome-extra/eiciel-0.9.11
new file mode 100644
index 000000000000..b70cc76a0791
--- /dev/null
+++ b/gnome-extra/eiciel-0.9.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3 virtual/pkgconfig >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=ACL editor for GNOME, with Nautilus extension
+EAPI=5
+HOMEPAGE=http://rofi.roger-ferrer.org/eiciel/
+IUSE=xattr
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
+SLOT=0
+SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4df30084d2401753b1332d4dd92e98a
diff --git a/gnome-extra/eiciel-0.9.11-r1 b/gnome-extra/eiciel-0.9.11-r1
new file mode 100644
index 000000000000..bcfa984256e5
--- /dev/null
+++ b/gnome-extra/eiciel-0.9.11-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3 virtual/pkgconfig >=sys-devel/gettext-0.18.1 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=ACL editor for GNOME, with Nautilus extension
+EAPI=5
+HOMEPAGE=http://rofi.roger-ferrer.org/eiciel/
+IUSE=xattr
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/acl-2.2.32 >=dev-cpp/gtkmm-3:3.0 >=gnome-base/nautilus-3
+SLOT=0
+SRC_URI=http://rofi.roger-ferrer.org/eiciel/download/eiciel-0.9.11.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1c97f46f26758240a001be48b3d13642
diff --git a/gnome-extra/eiciel/Manifest b/gnome-extra/eiciel/Manifest
deleted file mode 100644
index 771bdad443ab..000000000000
--- a/gnome-extra/eiciel/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST eiciel-0.9.11.tar.bz2 680384 BLAKE2B 1d16aa383b25fb870f44bb942736287b063ff82c886119207dd222adad900f529075f58c0d5881e7f8d845f0c43d099dafd3f6e871bb11fe7171a7d1e099f8f7 SHA512 914b8b888e502a31f6c70bcc7d391ea8b79dde07e13b9a6ebb3b52a20b793fafd7a7a7f8ff7177c0150a223a74cae1b06fca0a274bc27545bb89223b4b8fd2aa
-EBUILD eiciel-0.9.11-r1.ebuild 730 BLAKE2B 28c013cedab0a52da378bc5d26d90ed39c44ed80b2e78c5149074acbb631b41594fcd5cf4719e8eca0c85486aa11485608434e8f211386259b5f32fbff3fe6ba SHA512 b5c6c15b6dff67cb53cb7a65c62055b01cc58d4311f4436c742ef8ccd5b76720e5c1fc8a38697b0ea4a990beb5c2ff50a7f0003e9a5173ff23af8fb322da08f9
-EBUILD eiciel-0.9.11.ebuild 689 BLAKE2B 6c80108f4550064cc32c25a9564fe3a994f27f0bd397432533aff5988e10a5df5532720f9860a05784b89473fe1e2b99ea2122f5d9224c72a9802f8560d1e162 SHA512 1d12e3d4ba528bf565b8c1595162144e9765f89277307fce4fbb677c82711bc90aff18cc153673b7f0afeef854112fa8eb59235801f7e5b11875d42ae70977c3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
deleted file mode 100644
index fa509d7fbe6f..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit flag-o-matic gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xattr"
-
-RDEPEND="
-	>=sys-apps/acl-2.2.32
-	>=dev-cpp/gtkmm-3:3.0
-	>=gnome-base/nautilus-3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.18.1
-"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-version=3 \
-		$(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/eiciel-0.9.11.ebuild b/gnome-extra/eiciel/eiciel-0.9.11.ebuild
deleted file mode 100644
index b24a03ddc18c..000000000000
--- a/gnome-extra/eiciel/eiciel-0.9.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="ACL editor for GNOME, with Nautilus extension"
-HOMEPAGE="http://rofi.roger-ferrer.org/eiciel/"
-SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="xattr"
-
-RDEPEND="
-	>=sys-apps/acl-2.2.32
-	>=dev-cpp/gtkmm-3:3.0
-	>=gnome-base/nautilus-3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.18.1
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gnome-version=3 \
-		$(use_enable xattr user-attributes)
-}
diff --git a/gnome-extra/eiciel/metadata.xml b/gnome-extra/eiciel/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/eiciel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/evolution-data-server-3.22.7 b/gnome-extra/evolution-data-server-3.22.7
new file mode 100644
index 000000000000..7997dfc745a0
--- /dev/null
+++ b/gnome-extra/evolution-data-server-3.22.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-2 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Evolution groupware backend
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0/59
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.7.tar.xz
+_eclasses_=db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e95e3bdb921318a009b2b668f99f989d
diff --git a/gnome-extra/evolution-data-server-3.24.7 b/gnome-extra/evolution-data-server-3.24.7
new file mode 100644
index 000000000000..09bd900fedef
--- /dev/null
+++ b/gnome-extra/evolution-data-server-3.24.7
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 >=virtual/pypy-5:0 ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Evolution groupware backend
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
+RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=net-libs/webkit-gtk-2.11.91:4 >=dev-libs/libgdata-0.17.7:= ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= >=dev-libs/libgdata-0.17.7:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
+REQUIRED_USE=vala? ( introspection )
+RESTRICT=test
+SLOT=0/60
+SRC_URI=mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.7.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ac7e93764e6527b314093706a0c0c4a
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
deleted file mode 100644
index b32dd7c69df4..000000000000
--- a/gnome-extra/evolution-data-server/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX 3.24.7-DESTDIR-honoring.patch 1122 BLAKE2B 73d95683bd162f0e93de3b005787b2aa722b0a0f4ba58e3313fa3e66f90c159d5766ac03ee81c2fa3cb33ff2dedfcd4ffb59fb32ac88b17f04447d38c4a7605e SHA512 311e0163ef783430f4eea638e2ece92ab6d1c52d79f399190607eead5359f28eec647c626bb1c435eba427f7844456b4fd2dd60e75ca40331f1d249d1549eb0c
-AUX 3.24.7-libical3-compat.patch 5323 BLAKE2B 5a2392751b009d6726490cbd11227d1d4c5ed5e61c8d0b6acdf282182dffcdeb31a2ed6395626231dc729dd9ee7b1ca26a3ce9148b3cca1fbdc83376e58baca7 SHA512 0b29c1d86eedf778d489a4a4c78bfc292898ceba2d90ac4c81aae2a0c65ac132e71de767f7a74ef839977c2fbdcc38da50579735e1775cfb5b2414fa304d19b5
-AUX calentry.schema 3661 BLAKE2B 0235e8d98d1367f209a31cc74da9563d53dfc12ca34e020f63a18fcb73c13345e58a9e4a9f5bb3e14a7774bdcd279118d84d971a4b164c8ce41cd26798efabdd SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834
-DIST evolution-data-server-3.22.7.tar.xz 5564924 BLAKE2B 8107a13ef46a4457e122c5d719c0d29ccbf5ec61424fb6b4810b1e165bb68cb8c1c87ec9ab34446458321c0c56ba5a5408f45ae9fc95bcee965c21caaad6a230 SHA512 53648c0b893982b3577008aeae57e213e084aa5ba4663ca109f200b268635fd1544408c1ace065e91e5eaf48a20f59609c8e895a1907501ea5e64119d1590d44
-DIST evolution-data-server-3.24.7.tar.xz 4253252 BLAKE2B ca435a4e6c3a003c5166bd06f0308766686cc9e02f1eb6a15a521c58805bafdfd39cbc7ee058339ba383329ab34a11ed2b0eeebd9b545219c4b3d8f51de8df60 SHA512 3e83cb0e87ec822ebf6c81963693e7c701d20266e0811bd261a78073c75724e2c24ac5d5561e997ed8567e9e519c175b3104fa6e2e28158854c8c3ec39a8e9df
-EBUILD evolution-data-server-3.22.7.ebuild 3689 BLAKE2B 4b37c74e6b0d27d4cd1061049f27e5044cd0319367fae2d521cd0a861076de52a52c736e009ee55ea93fae46fb38a7d1e63b3988d5d188dd35f0e034c85174a1 SHA512 ec236fda93b156d8ee5ada17f83ba66fee61807c44979d6f9301711e088bca1135abc367f2959cbc95c2e7be5c2976844418decb82e8eda362bb2af059adf1cb
-EBUILD evolution-data-server-3.24.7.ebuild 4145 BLAKE2B 57e6f7f7908806fa50aa131648aaae3e6a2a835826bd0184f0cc89a631e876e8c2bbca68442fb134855f4b86513b13c8fbc2f5e573ace476ee3f8e82b739f5f7 SHA512 3091dac9ea3d6ccc827b84d68fb6e08d1a8dc0579f2aa7e08f320628d58e1641f65186e104b1e6f15759261813cd7857bba2334335f849c4f69dbece01b89e35
-MISC metadata.xml 894 BLAKE2B 2b37b8e2f6a027c64cf3fa2e93dda6270d6d73291213c956aabd91d3cdbeed7b7f40d7738f22566059304c13cb4471d6a344b564d28c4d11e86ac159dd789ebb SHA512 26ebc7b28f82f5d0d048bb699ad3663f8cb26cecccff86bb77543412a8faaf54c9cfbf3f526a6d3e113ec5b573fb97cc60eb56343d3a79d9d6162922cfddab52
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild
deleted file mode 100644
index 5d597fe7d157..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/59" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/libical-0.43:=
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.42:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.10:3
-	)
-	google? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.11.91:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=gnome-base/gnome-common-2
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	local gdata_flag
-	if use google || use gnome-online-accounts; then
-		gdata_flag="--enable-google"
-	else
-		gdata_flag="--disable-google"
-	fi
-
-	# phonenumber does not exist in tree
-	gnome2_src_configure \
-		$(use_enable api-doc-extras gtk-doc) \
-		$(use_with api-doc-extras private-docs) \
-		$(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
-		$(use_enable gnome-online-accounts goa) \
-		$(use_enable gtk) \
-		$(use_enable google google-auth) \
-		${gdata_flag} \
-		$(use_enable introspection) \
-		$(use_enable ipv6) \
-		$(use_with kerberos krb5 "${EPREFIX}"/usr) \
-		$(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
-		$(use_with ldap openldap) \
-		$(use_enable vala vala-bindings) \
-		$(use_enable weather) \
-		--enable-largefile \
-		--enable-smime \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--without-phonenumber \
-		--disable-examples \
-		--disable-uoa
-}
-
-src_test() {
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
deleted file mode 100644
index cfc4ff4b4e9f..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.24.7.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit cmake-utils db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/60" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.17.7 soft required for new gdata_feed_get_next_page_token API to handle more than 100 google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-gdata_depend=">=dev-libs/libgdata-0.17.7:="
-RDEPEND="
-	>=app-crypt/gcr-3.4
-	>=app-crypt/libsecret-0.5[crypt]
-	>=dev-db/sqlite-3.7.17:=
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/libical-0.43:=
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4:=
-	>=dev-libs/nss-3.9:=
-	>=net-libs/libsoup-2.42:2.4
-
-	dev-libs/icu:=
-	sys-libs/zlib:=
-	virtual/libiconv
-
-	berkdb? ( >=sys-libs/db-4:= )
-	gtk? (
-		>=app-crypt/gcr-3.4[gtk]
-		>=x11-libs/gtk+-3.10:3
-	)
-	google? (
-		>=dev-libs/json-glib-1.0.4
-		>=net-libs/webkit-gtk-2.11.91:4
-		${gdata_depend}
-	)
-	gnome-online-accounts? (
-		>=net-libs/gnome-online-accounts-3.8:=
-		${gdata_depend} )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
-	kerberos? ( virtual/krb5:= )
-	ldap? ( >=net-nds/openldap-2:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-util/gdbus-codegen
-	dev-util/gperf
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
-	"${FILESDIR}"/${PV}-libical3-compat.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-
-	# Make CMakeLists versioned vala enabled
-	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
-	    -e "s;\(find_program(VAPIGEN\) vapigen);\1 ${VAPIGEN});" \
-		-i "${S}"/CMakeLists.txt || die
-}
-
-src_configure() {
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	local google_auth_enable
-	if use google || use gnome-online-accounts; then
-		google_auth_enable="ON"
-	else
-		google_auth_enable="OFF"
-	fi
-
-	# phonenumber does not exist in tree
-	local mycmakeargs=(
-		-DENABLE_GTK_DOC=$(usex api-doc-extras)
-		-DWITH_PRIVATE_DOCS=$(usex api-doc-extras)
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DWITH_KRB5=$(usex kerberos)
-		-DWITH_KRB5_INCLUDES=$(usex kerberos "${EPREFIX}"/usr "")
-		-DWITH_KRB5_LIBS=$(usex kerberos "${EPREFIX}"/usr/$(get_libdir) "")
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DWITH_PHONENUMBER=OFF
-		-DENABLE_SMIME=ON
-		-DENABLE_GTK=$(usex gtk)
-		-DENABLE_GOOGLE_AUTH=${google_auth_enable}
-		-DENABLE_EXAMPLES=OFF
-		-DENABLE_GOA=$(usex gnome-online-accounts)
-		-DENABLE_UOA=OFF
-		-DWITH_LIBDB=$(usex berkdb "${EPREFIX}"/usr OFF)
-		# ENABLE_BACKTRACES requires libdwarf ?
-		-DENABLE_IPV6=$(usex ipv6)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_GOOGLE=$(usex google)
-		-DENABLE_LARGEFILE=ON
-		-DENABLE_VALA_BINDINGS=$(usex vala)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	virtx cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use ldap; then
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema
-		dosym ../../../usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch b/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
deleted file mode 100644
index a3a3d470b984..000000000000
--- a/gnome-extra/evolution-data-server/files/3.24.7-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5406fcda088be73f462e7d02d4a2ae56cc7329cc Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Oct 2017 19:20:36 +0200
-Subject: Bug 781645 - Skip GSettings schema compile when DESTDIR is set
-
----
- cmake/modules/GLibTools.cmake | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb82..f0be558 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
- 	if(_install_code)
- 		# Compile gsettings schemas and ensure that all of them are in the place.
- 		install(CODE
--			"execute_process(${_install_code}
--				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
--			)")
-+			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+				execute_process(${_install_code}
-+					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+				)
-+			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- 	endif(_install_code)
- endmacro(add_gsettings_schemas)
- 
--- 
-cgit v0.12
-
diff --git a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch b/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
deleted file mode 100644
index 8f574b0f8d9c..000000000000
--- a/gnome-extra/evolution-data-server/files/3.24.7-libical3-compat.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From dc5fc0e163421f5a01c3cdaab23ca2ea1eb3fae2 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 4 Oct 2017 11:48:48 +0200
-Subject: [PATCH 1/2] Use icaltime_is_utc() instead of icaltimetype::is_utc
-
-The structure member is going to be removed from libical in the next release
-and the function is available for a long time, thus it's safe to replace
-the usage in the code.
-
-(cherry picked from commit f607f8628a28440374579531bc78848dfe0c782e)
----
- src/calendar/backends/contacts/e-cal-backend-contacts.c | 1 -
- src/calendar/libecal/e-cal-component.c                  | 8 ++++----
- src/calendar/libecal/e-cal-recur.c                      | 8 ++++----
- src/calendar/libecal/e-cal-time-util.c                  | 3 +--
- 4 files changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/src/calendar/backends/contacts/e-cal-backend-contacts.c b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-index d2b570885..cf2c62062 100644
---- a/src/calendar/backends/contacts/e-cal-backend-contacts.c
-+++ b/src/calendar/backends/contacts/e-cal-backend-contacts.c
-@@ -699,7 +699,6 @@ cdate_to_icaltime (EContactDate *cdate)
- 	ret.month = cdate->month;
- 	ret.day = cdate->day;
- 	ret.is_date = TRUE;
--	ret.is_utc = FALSE;
- 	ret.zone = NULL;
- 	ret.is_daylight = FALSE;
- 
-diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
-index 65b530d1e..6d8a9814d 100644
---- a/src/calendar/libecal/e-cal-component.c
-+++ b/src/calendar/libecal/e-cal-component.c
-@@ -2522,7 +2522,7 @@ get_datetime (struct datetime *datetime,
- 	 * This makes the timezone code simpler. */
- 	if (datetime->tzid_param)
- 		dt->tzid = g_strdup (icalparameter_get_tzid (datetime->tzid_param));
--	else if (dt->value && dt->value->is_utc)
-+	else if (dt->value && icaltime_is_utc (*dt->value))
- 		dt->tzid = g_strdup ("UTC");
- 	else
- 		dt->tzid = NULL;
-@@ -2559,9 +2559,9 @@ set_datetime (ECalComponent *comp,
- 
- 	/* If the TZID is set to "UTC", we set the is_utc flag. */
- 	if (dt->tzid && !strcmp (dt->tzid, "UTC"))
--		dt->value->is_utc = 1;
--	else
--		dt->value->is_utc = 0;
-+		dt->value->zone = icaltimezone_get_utc_timezone ();
-+	else if (dt->value->zone == icaltimezone_get_utc_timezone ())
-+		dt->value->zone = NULL;
- 
- 	if (datetime->prop) {
- 		/* make sure no VALUE property is left if not needed */
-diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
-index 535d56c14..cad588c4d 100644
---- a/src/calendar/libecal/e-cal-recur.c
-+++ b/src/calendar/libecal/e-cal-recur.c
-@@ -195,7 +195,7 @@ ensure_timezone (icalcomponent *comp,
- 	   a different icalcomponent and cause use-after-free. */
- 	tt->zone = NULL;
- 
--	if (tt->is_utc)
-+	if (icaltime_is_utc (*tt))
- 		return TRUE;
- 
- 	tt->zone = default_timezone;
-@@ -435,7 +435,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
- 				rrule.until.minute = 0;
- 				rrule.until.second = 0;
- 
--				if (!rrule.until.zone && !rrule.until.is_utc)
-+				if (!rrule.until.zone && !icaltime_is_utc (rrule.until))
- 					rrule.until.zone = dtstart.zone;
- 			}
- 
-@@ -542,7 +542,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
- 				exrule.until.minute = 0;
- 				exrule.until.second = 0;
- 
--				if (!exrule.until.zone && !exrule.until.is_utc)
-+				if (!exrule.until.zone && !icaltime_is_utc (exrule.until))
- 					exrule.until.zone = dtstart.zone;
- 			}
- 
-@@ -586,7 +586,7 @@ e_cal_recur_generate_instances_sync (icalcomponent *comp,
- 			if (!success)
- 				break;
- 
--			if (!exdate.zone && !exdate.is_utc)
-+			if (!exdate.zone && !icaltime_is_utc (exdate))
- 				exdate.zone = dtstart.zone;
- 
- 			if (intersects_interval (&exdate, NULL, duration_days, duration_seconds, &interval_start, &interval_end)) {
-diff --git a/src/calendar/libecal/e-cal-time-util.c b/src/calendar/libecal/e-cal-time-util.c
-index 7bcbc8ba1..914761cb0 100644
---- a/src/calendar/libecal/e-cal-time-util.c
-+++ b/src/calendar/libecal/e-cal-time-util.c
-@@ -763,9 +763,8 @@ tm_to_icaltimetype (struct tm *tm,
- 
- 	itt.day = tm->tm_mday;
- 	itt.month = tm->tm_mon + 1;
--	itt.year = tm->tm_year+ 1900;
-+	itt.year = tm->tm_year + 1900;
- 
--	itt.is_utc = 0;
- 	itt.is_date = is_date;
- 
- 	return itt;
--- 
-2.15.1
-
-
-From fccd77cf4620ca76c4fd2bf7721e3fb7eaf55ec6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 5 Oct 2017 13:50:08 +0200
-Subject: [PATCH 2/2] e-cal-recur.c:ensure_timezone(): Unset icaltimetype::zone
- only if not UTC
-
-With a removal of icaltimetype::is_utc the icaltimetype::zone is used
-to determine whether it's UTC or not. That means that the icaltimetype::zone
-can be unset only if it's not the built-in UTC time zone.
-
-(cherry picked from commit 1f39ade8db00091d6fa4c752ccb70361ef0e8abc)
----
- src/calendar/libecal/e-cal-recur.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/calendar/libecal/e-cal-recur.c b/src/calendar/libecal/e-cal-recur.c
-index cad588c4d..fc14fb15c 100644
---- a/src/calendar/libecal/e-cal-recur.c
-+++ b/src/calendar/libecal/e-cal-recur.c
-@@ -193,7 +193,8 @@ ensure_timezone (icalcomponent *comp,
- 
- 	/* Do not trust the 'zone' set on the structure, as it can come from
- 	   a different icalcomponent and cause use-after-free. */
--	tt->zone = NULL;
-+	if (tt->zone != icaltimezone_get_utc_timezone ())
-+		tt->zone = NULL;
- 
- 	if (icaltime_is_utc (*tt))
- 		return TRUE;
--- 
-2.15.1
-
diff --git a/gnome-extra/evolution-data-server/files/calentry.schema b/gnome-extra/evolution-data-server/files/calentry.schema
deleted file mode 100644
index bc79da273cc2..000000000000
--- a/gnome-extra/evolution-data-server/files/calentry.schema
+++ /dev/null
@@ -1,108 +0,0 @@
-# RFC2739 calEntry schema for OpenLDAP 2.x 
-
-#
-# From https://bugs.gentoo.org/show_bug.cgi?id=83988
-# Please notify us of updated revisions by submitting a bug report at bugs.gentoo.org
-#
-
-# Version of RFC 2739 schema translated by Terrelle Shaw 
-# (xytek@xytek.org) # Nov. 7, 2002 # Modifications by Peter Marschall
-# <peter.marschall@adpm.de> # Nov. 9, 2002
-
-# Notes:
-# * RFC2739 seems to be a bit sloppy about attribute type and
-#   objectclass definitions syntax and also about attribute syntax
-#   and matching rules.
-#   (It even counts the attributes in the calEntry objectclass wrong ;-)
-# * The following changes have been applied to correct the schema
-#   - added description to each attributetype definition
-#   - changed SYNTAX from 'IA5String' to corresponding OID
-#     to make matching rules and syntax consistent
-#   - replaced illegal keyword SUBSTRING by SUBSTR
-#   - changed SUBSTR from caseIgnoreIA5Match to caseIgnoreIA5SubstringsMatch
-#   - removed illegal keyword MULTI-VALUE
-#   - added keyword SINGLE-VALUE where appropriate
-#   - removed USAGE since cwuserApplications is the default 
-#   - added description to the objectclass defintion
-#   - corrected typo in objectclass definition
-#   - added the attributetypes defined but not used to the objectclass
-
-
-# 2.4.4.1 calCalURI
-attributetype ( 1.2.840.113556.1.4.478 
-	NAME 'calCalURI' 
-	DESC 'URI to a snapshot of the users entire default calendar'
-	EQUALITY caseIgnoreIA5Match 
-	SUBSTR caseIgnoreIA5SubstringsMatch 
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-# 2.4.4.2 calFBURL
-attributetype ( 1.2.840.113556.1.4.479
-	NAME 'calFBURL'
-	DESC 'URI to the users default free/busy time data'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-# 2.4.4.3 calCAPURI
-attributetype ( 1.2.840.113556.1.4.480
-	NAME 'calCAPURI'
-	DESC 'URI used to communicate with the users calendar'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-# 2.4.4.4 calCalAdrURI
-attributetype ( 1.2.840.113556.1.4.481
-	NAME 'calCalAdrURI'
-	DESC 'URI to which event requests should be sent for the user'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
-	SINGLE-VALUE )
-
-# 2.4.4.5 calOtherCalURIs
-attributetype ( 1.2.840.113556.1.4.482
-	NAME 'calOtherCalURIs'
-	DESC 'URIs to snapshots of non-default calendars belonging to the user'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.4.6 calOtherFBURLs
-attributetype ( 1.2.840.113556.1.4.483
-	NAME 'calOtherFBURLs'
-	DESC 'URIs to non-default free/busy data belonging to the user'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.4.7 calOtherCAPURIs
-attributetype ( 1.2.840.113556.1.4.484
-	NAME 'calOtherCAPURIs'
-	DESC 'URIs to non-default calendars belonging to the user'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.4.8 calOtherCalAdrURIs
-attributetype ( 1.2.840.113556.1.4.485
-	NAME 'calOtherCalAdrURIs'
-	DESC 'URIs of destinations for event requests to non-default calendars'
-	EQUALITY caseIgnoreIA5Match
-	SUBSTR caseIgnoreIA5SubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
-
-# 2.4.3.1 calEntry
-objectclass ( 1.2.840.113556.1.5.87
-	NAME 'calEntry'
-	DESC 'Calendering and free/busy information'
-	SUP top AUXILIARY
-	MAY ( calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
-		calOtherCAPURIs $ calOtherCalURIs $ calOtherFBURLs $ 
-		calOtherCalAdrURIs ) )
-
-# EOF
diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
deleted file mode 100644
index 5c891ea46d4d..000000000000
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="api-doc-extras">Build documentation for private APIs</flag>
-		<flag name="berkdb"><pkg>sys-libs/db</pkg> support needed to migrate old (pre-3.12 evolution versions) addressbook data</flag>
-		<flag name="gnome-online-accounts">Enable <pkg>net-libs/gnome-online-accounts</pkg> based Google authentication support</flag>
-		<flag name="google">Enable internal Google authentication support. If gnome-online-accounts is enabled and used, this is not necessary,
-			but both can be supported at the same time with different setup at runtime</flag>
-		<flag name="weather">Enable optional weather calendar support</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-extra/evolution-ews-3.24.6 b/gnome-extra/evolution-ews-3.24.6
new file mode 100644
index 000000000000..2e4505ce09ed
--- /dev/null
+++ b/gnome-extra/evolution-ews-3.24.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.7:0= >=mail-client/evolution-3.24.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( net-libs/uhttpmock ) sys-devel/make >=dev-util/cmake-3.9.6 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Evolution module for connecting to Microsoft Exchange Web Services
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
+IUSE=test
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-db/sqlite:3= >=dev-libs/glib-2.46:2 dev-libs/libical:0= >=dev-libs/libmspack-0.4 >=dev-libs/libxml2-2 >=gnome-extra/evolution-data-server-3.24.7:0= >=mail-client/evolution-3.24.6:2.0 >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.10:3
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/evolution-ews/3.24/evolution-ews-3.24.6.tar.xz
+_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d1a60c799bfb9e5ac53c49a14e1aa65
diff --git a/gnome-extra/evolution-ews/Manifest b/gnome-extra/evolution-ews/Manifest
deleted file mode 100644
index cb0d6aac1b26..000000000000
--- a/gnome-extra/evolution-ews/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.24.6-DESTDIR-honoring.patch 1196 BLAKE2B e6996ff088f5e5f3b1e4db6b1f85524d61ba35798d76cf46f07c9efe8587dadeab08b78f3a8d0ad8602ebe6899c72e0d0804e2835ba634afddf610ec0ff54488 SHA512 dc837d7150a42e9e03856b36a1f417ac1b850722f1475efacfa00bf724d45fddc03eb61d3f8f4c7e74884c672dd1f18bed86987cd3f22bbefa6ad7f514368a07
-AUX 3.24.6-libical3-compat.patch 1623 BLAKE2B f8fc567f2c86cbe6392de5750e8a01155d49a9bb79912d1e3f066be0b03eae90be4d39b72d3fa2eb92129d378d5647a697c3813d253f26980bed5a51e838a811 SHA512 2f1a607cf44d69bdd7a14551f0b95cc01c34a86f92741fce848b3d90e6e4bc8c35e9bf02426c742da3ab8bb4bc01c4533bac8c95894f11bb57290da19dec95bb
-DIST evolution-ews-3.24.6.tar.xz 488668 BLAKE2B 3ec507b654042882158d2d8dfdbaae0372cc67d515501e45e327ef006cd8674f7b6e48de63f8930add9f29536d3428604f21666cfac98a764cb2eb0c20353ef3 SHA512 24bcaf9755b9d45d4848624b42f2b41bf1532aa836cdd26f8ab57b4dd5ac83d4375c340e0cac6f7f1b830c3ab998597893bce0fdd471ed7b0758a69367edfac1
-EBUILD evolution-ews-3.24.6.ebuild 1306 BLAKE2B f82629ba467605d6c359c1b2c0db19a912332e6c1c32126a70919131d15b639bac496004c344a9078932fe262c5c84ff669aa2a3e30cdc5fd76ae969e9bd0675 SHA512 b270f0ec8019b39bd49157c393be0ba1bf305fe4dba9bb7a0e18e89c6095b6c0b5af662b21b9f4cb87c9f4ea629ebe36e339125976977afbc31601f516df2a7d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
deleted file mode 100644
index dd21ac33a3b7..000000000000
--- a/gnome-extra/evolution-ews/evolution-ews-3.24.6.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit cmake-utils gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange Web Services"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.46:2
-	dev-libs/libical:0=
-	>=dev-libs/libmspack-0.4
-	>=dev-libs/libxml2-2
-	>=gnome-extra/evolution-data-server-3.24.7:0=
-	>=mail-client/evolution-${PV}:2.0
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.10:3
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( net-libs/uhttpmock )
-"
-
-# Unittests fail to find libevolution-ews.so
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-DESTDIR-honoring.patch
-	"${FILESDIR}"/${PV}-libical3-compat.patch
-)
-
-src_prepare() {
-	gnome2_src_prepare # default from inherit order, but be explicit; needed for xdg_src_prepare, env_reset and co
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_MSPACK=ON
-		-DENABLE_TESTS=$(usex test)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-}
diff --git a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
deleted file mode 100644
index c74df6bce523..000000000000
--- a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 2 Oct 2017 19:24:57 +0200
-Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is
- set
-
-(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f)
----
- cmake/modules/GLibTools.cmake | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb82..f0be558 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
- 	if(_install_code)
- 		# Compile gsettings schemas and ensure that all of them are in the place.
- 		install(CODE
--			"execute_process(${_install_code}
--				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
--			)")
-+			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+				execute_process(${_install_code}
-+					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+				)
-+			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- 	endif(_install_code)
- endmacro(add_gsettings_schemas)
- 
--- 
-2.15.1
-
diff --git a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch b/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
deleted file mode 100644
index 001e35630e91..000000000000
--- a/gnome-extra/evolution-ews/files/3.24.6-libical3-compat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 02ac53280fef79d7ed2aafa2989cd1da5c5e8d80 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Mon, 8 Jan 2018 14:23:49 +0200
-Subject: [PATCH] Use icaltime_is_utc() instead of icaltimetype::is_utc
-
-The structure member is going to be removed from libical3 and the
-function is available for a long time, thus it's safe to replace
-the usage in the code.
-
-(ported from commit 7c0f42604c16fe571168ea48f4628bc920359595)
----
- src/calendar/e-cal-backend-ews-utils.c | 2 +-
- src/calendar/e-cal-backend-ews.c       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/calendar/e-cal-backend-ews-utils.c b/src/calendar/e-cal-backend-ews-utils.c
-index 41d77b4..a46b1e3 100644
---- a/src/calendar/e-cal-backend-ews-utils.c
-+++ b/src/calendar/e-cal-backend-ews-utils.c
-@@ -346,7 +346,7 @@ ewscal_set_time (ESoapMessage *msg,
- 	gchar *tz_ident = NULL;
- 
- 	if (with_timezone) {
--		if (t->is_utc || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
-+		if (icaltime_is_utc (*t) || !t->zone || t->zone == icaltimezone_get_utc_timezone ()) {
- 			tz_ident = g_strdup ("Z");
- 		} else {
- 			gint offset, is_daylight, hrs, mins;
-diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
-index 50dd5ae..29e488f 100644
---- a/src/calendar/e-cal-backend-ews.c
-+++ b/src/calendar/e-cal-backend-ews.c
-@@ -1081,7 +1081,7 @@ e_cal_backend_ews_get_timezone_from_ical_component (ECalBackend *backend,
- 			struct icaltimetype dtstart;
- 
- 			dtstart = icalproperty_get_dtstart (prop);
--			if (dtstart.is_utc)
-+			if (icaltime_is_utc (dtstart))
- 				tzid = "UTC";
- 		}
- 	}
--- 
-2.15.1
-
diff --git a/gnome-extra/evolution-ews/metadata.xml b/gnome-extra/evolution-ews/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/evolution-ews/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gconf-editor-3.0.1-r1 b/gnome-extra/gconf-editor-3.0.1-r1
new file mode 100644
index 000000000000..998c1fe06fd4
--- /dev/null
+++ b/gnome-extra/gconf-editor-3.0.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2 sys-devel/gettext app-text/gnome-doc-utils >=dev-util/intltool-0.35 virtual/pkgconfig ~app-text/docbook-xml-dtd-4.1.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An editor to the GNOME config system
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gconf-editor
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=gnome-base/gconf-2.12:2
+SLOT=0
+SRC_URI=mirror://gnome/sources/gconf-editor/3.0/gconf-editor-3.0.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8f25437a898f499248f9163fedcbfe52
diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest
deleted file mode 100644
index fc80055ad9f4..000000000000
--- a/gnome-extra/gconf-editor/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gconf-editor-3.0.1-assertion-crash.patch 1194 BLAKE2B 6ce0c5d96e329a32b0632829a812cdd6fae4418f6039cddcffe17fec91c58af8cb5d749eaa2a096496580d0e8ac3daa62ce427ebb6510c626a6e7908bf9dad3d SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc
-AUX gconf-editor-3.0.1-drop-accel.patch 1383 BLAKE2B 16e3e1816c8bb7da13827dfd6579e0cbbbdf73a2b368038e347f444569abec184cc9bc48caf8e6a16925c855b3ba8c5b370c7ab6f3f0cd9840061366b3e9a91d SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff
-DIST gconf-editor-3.0.1.tar.xz 1452468 BLAKE2B 775072c69f3350b009c07553d178e83885379292159ea9025831bab0f6b91f2e95e341d4f654a0fd8896c560ba99e635b68f3ff825e337ec5b7d558a366fce52 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49
-EBUILD gconf-editor-3.0.1-r1.ebuild 801 BLAKE2B b2e16dd5a4c5be9e614471c1875fc65d60d95ea6cc593ac2229f2e07d45c120129ee043f26d7a2a624b41840a5fe7b0b2007e302fbcaac442e52649214d614a5 SHA512 97ebb68c595795556438669de55ab6807d0004658bdca72448075c434d0ef6984c0259fc756da84edd13e96ea75a591c182c3684081d8b4c2c858d17f21d4616
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
deleted file mode 100644
index b7df8f51007d..000000000000
--- a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-assertion-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 25d823099337f7ede4782f46fea46f251646dc3e Mon Sep 17 00:00:00 2001
-From: Edward Sheldrake <ejsheldrake@gmail.com>
-Date: Wed, 11 Apr 2012 07:27:16 +0000
-Subject: Fix assertion failed crash
-
-Fix "assertion failed: (last_slash != NULL)" crash while navigating the
-left tree view, fixed by having the model for the right list view emit
-all the row deleted signals before deleting any of its data.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=670586
----
-diff --git a/src/gconf-list-model.c b/src/gconf-list-model.c
-index 27e1af6..4fc60f8 100644
---- a/src/gconf-list-model.c
-+++ b/src/gconf-list-model.c
-@@ -133,11 +133,14 @@ gconf_list_model_set_root_path (GConfListModel *model, const gchar *root_path)
- 
- 	if (model->root_path != NULL) {
- 		for (list = model->values; list; list = list->next) {
-+			model->stamp++;
-+			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
-+		}
-+
-+		for (list = model->values; list; list = list->next) {
- 			GConfEntry *entry = list->data;
- 
- 			g_hash_table_remove (model->key_hash, gconf_entry_get_key (entry));
--			model->stamp++;
--			gtk_tree_model_row_deleted (GTK_TREE_MODEL (model), path);
- 
- 			gconf_entry_unref (entry);
- 		}
---
-cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch b/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
deleted file mode 100644
index 0d79ec56c396..000000000000
--- a/gnome-extra/gconf-editor/files/gconf-editor-3.0.1-drop-accel.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 62e68d8e2f6e2c473820113fbf46ced9f77111d4 Mon Sep 17 00:00:00 2001
-From: William Jon McCann <jmccann@redhat.com>
-Date: Thu, 03 May 2012 18:10:53 +0000
-Subject: Drop use GTK accel maps
-
-They are confusing, weird, and stored in an obsolete location.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675392
----
-diff --git a/src/main.c b/src/main.c
-index 8da5ccc..9bce4b8 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -26,34 +26,6 @@
- #include "gconf-stock-icons.h"
- #include "gconf-editor-window.h"
- 
--static char *
--build_accel_filename (void)
--{
--	return g_build_filename (g_get_home_dir (), ".gnome2", "accels", PACKAGE, NULL);
--}
--
--static void
--load_accel_map (void)
--{
--	char *map;
--
--	map = build_accel_filename ();
--	gtk_accel_map_load (map);
--
--	g_free (map);
--}
--
--static void
--save_accel_map (void)
--{
--	char *map;
--
--	map = build_accel_filename ();
--	gtk_accel_map_save (map);
--
--	g_free (map);
--}
--
- gint
- main (gint argc, gchar **argv)
- {
-@@ -92,7 +64,6 @@ main (gint argc, gchar **argv)
- 	/* Register our stock icons */
-         gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (), ICONDIR);
- 	gconf_stock_icons_register ();
--	load_accel_map ();
- 
-         gtk_window_set_default_icon_name ("gconf-editor");
- 
-@@ -107,7 +78,6 @@ main (gint argc, gchar **argv)
- 	
- 	gtk_main ();
- 
--	save_accel_map ();
- 	g_strfreev (remaining_args);
- 
- 	return 0;
---
-cgit v0.9.2
diff --git a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
deleted file mode 100644
index 46fca22ad7ea..000000000000
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="An editor to the GNOME config system"
-HOMEPAGE="https://git.gnome.org/browse/gconf-editor"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/gtk+-3.0.0:3
-	>=gnome-base/gconf-2.12:2
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	app-text/gnome-doc-utils
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	~app-text/docbook-xml-dtd-4.1.2
-"
-# gnome-common for eautoreconf
-
-PATCHES=(
-	# Fix assertion failed crash (from 'master')
-	"${FILESDIR}/${PN}-3.0.1-assertion-crash.patch"
-
-	# Drop use GTK accel maps (from 'master')
-	"${FILESDIR}/${PN}-3.0.1-drop-accel.patch"
-)
diff --git a/gnome-extra/gconf-editor/metadata.xml b/gnome-extra/gconf-editor/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gconf-editor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-boxes-3.24.1-r1 b/gnome-extra/gnome-boxes-3.24.1-r1
new file mode 100644
index 000000000000..a27473b4ab6c
--- /dev/null
+++ b/gnome-extra/gnome-boxes-3.24.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:= || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) app-text/yelp-tools >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Simple GNOME 3 application to access remote or virtual systems
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Boxes
+IUSE=kernel_linux
+KEYWORDS=amd64
+LICENSE=LGPL-2
+RDEPEND=>=app-arch/libarchive-3:= >=dev-libs/glib-2.38:2 >=dev-libs/gobject-introspection-0.9.6:= >=dev-libs/libxml2-2.7.8:2 >=sys-libs/libosinfo-0.2.12 >=app-emulation/qemu-1.3.1[spice,smartcard,usbredir] >=app-emulation/libvirt-0.9.3[libvirtd,qemu] >=app-emulation/libvirt-glib-0.2.3 >=x11-libs/gtk+-3.19.8:3 >=net-libs/gtk-vnc-0.4.4[gtk3(+)] app-crypt/libsecret app-emulation/spice[smartcard] >=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir] virtual/libusb:1 >=app-misc/tracker-0.16:0=[iso] >=sys-apps/util-linux-2.20 >=net-libs/libsoup-2.38:2.4 sys-fs/mtools >=virtual/libgudev-165:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bf050d8c1883dcb0c4a41eb53346d877
diff --git a/gnome-extra/gnome-boxes/Manifest b/gnome-extra/gnome-boxes/Manifest
deleted file mode 100644
index 162f8ca1fd27..000000000000
--- a/gnome-extra/gnome-boxes/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-boxes-3.24.1.tar.xz 1710348 BLAKE2B ce90cc1a6baefa45c1a553b059f4fa7ac5c9a6fbd7a2d71377a9c6f38fddb7ac5a110f38d0a65b45cf2ba948ebee6026cc22b5f93a2ba521c9db6cb20bd3dc37 SHA512 a687dd65af91d717862bba0a81d715b64de1092cbb5ffd8a756fe80988c84110127f186007e8cf4011bf23cc0ec0adb346ead72ef47c655f85a7fcb9ed3ec393
-EBUILD gnome-boxes-3.24.1-r1.ebuild 2625 BLAKE2B cbe862162ca7e0655345a16d6abdd819b731ca6fdfdd7e8eb869ede04bef9918a7f48f499965e0cbf749902cffabba8549dbe833d75751ea9541bcd2a379b9ee SHA512 b247c4bfd29b6debb3f9b7680e658653db2e0aae204b9cc5f39419fdc6eadbf9b1ba9bacc998d63ef39dbde27d16b58730add58be273ec8d781fb2933f80a73c
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
deleted file mode 100644
index 8c6e1e10e020..000000000000
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.24.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.28"
-
-inherit gnome2 linux-info readme.gentoo-r1 vala
-
-DESCRIPTION="Simple GNOME 3 application to access remote or virtual systems"
-HOMEPAGE="https://wiki.gnome.org/Apps/Boxes"
-
-LICENSE="LGPL-2"
-SLOT="0"
-
-# We force 'bindist' due to licenses from gnome-boxes-nonfree
-IUSE="" #bindist
-
-KEYWORDS="amd64"
-
-# NOTE: sys-fs/* stuff is called via exec()
-# FIXME: ovirt is not available in tree
-# FIXME: use vala.eclass but only because of libgd not being able
-#        to use its pre-generated files so do not copy all the
-#        vala deps like live ebuild has.
-# FIXME: qemu probably needs to depend on spice[smartcard]
-#        directly with USE=spice
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=dev-libs/libxml2-2.7.8:2
-	>=sys-libs/libosinfo-0.2.12
-	>=app-emulation/qemu-1.3.1[spice,smartcard,usbredir]
-	>=app-emulation/libvirt-0.9.3[libvirtd,qemu]
-	>=app-emulation/libvirt-glib-0.2.3
-	>=x11-libs/gtk+-3.19.8:3
-	>=net-libs/gtk-vnc-0.4.4[gtk3(+)]
-	app-crypt/libsecret
-	app-emulation/spice[smartcard]
-	>=net-misc/spice-gtk-0.32[gtk3(+),smartcard,usbredir]
-	virtual/libusb:1
-
-	>=app-misc/tracker-0.16:0=[iso]
-
-	>=sys-apps/util-linux-2.20
-	>=net-libs/libsoup-2.38:2.4
-
-	sys-fs/mtools
-	>=virtual/libgudev-165:=
-"
-#	!bindist? ( gnome-extra/gnome-boxes-nonfree )
-
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Before running gnome-boxes, you will need to load the KVM modules.
-If you have an Intel Processor, run:
-# modprobe kvm-intel
-
-If you have an AMD Processor, run:
-# modprobe kvm-amd"
-
-pkg_pretend() {
-	linux-info_get_any_version
-
-	if linux_config_exists; then
-		if ! { linux_chkconfig_present KVM_AMD || \
-			linux_chkconfig_present KVM_INTEL; }; then
-			ewarn "You need KVM support in your kernel to use GNOME Boxes!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# Do not change CFLAGS, wondering about VALA ones but appears to be
-	# needed as noted in configure comments below
-	sed 's/CFLAGS="$CFLAGS -O0 -ggdb3"//' -i configure{.ac,} || die
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# debug needed for splitdebug proper behavior (cardoe), bug #????
-	gnome2_src_configure \
-		--enable-debug \
-		--disable-strict-cc \
-		--disable-ovirt
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-boxes/metadata.xml b/gnome-extra/gnome-boxes/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-boxes/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-calculator-3.24.0 b/gnome-extra/gnome-calculator-3.24.0
new file mode 100644
index 000000000000..f18d8fb4c9d8
--- /dev/null
+++ b/gnome-extra/gnome-calculator-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0= dev-libs/mpc:= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0 app-text/yelp-tools >=dev-util/intltool-0.50 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A calculator application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Calculator
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libxml2:2 dev-libs/mpfr:0= dev-libs/mpc:= >=net-libs/libsoup-2.42:2.4 >=x11-libs/gtk+-3.19.3:3 >=x11-libs/gtksourceview-3.15.1:3.0 !<gnome-extra/gnome-utils-2.3 !gnome-extra/gcalctool
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1bfce13993582cd76ec6a3b640fea6d6
diff --git a/gnome-extra/gnome-calculator/Manifest b/gnome-extra/gnome-calculator/Manifest
deleted file mode 100644
index 5ab9174102ae..000000000000
--- a/gnome-extra/gnome-calculator/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-calculator-3.24.0.tar.xz 1358368 BLAKE2B 81ad42598418b11f2436ebf482bbf93547460990cdb464efb3107e93010081f3d687bf99c80d35d9a6576b5d838218c7ea07e81256abfa358ce78031d80b346d SHA512 55968f3a307748050089652394a3652b8e199be9abf87d43e732874526dc2f08c4521e302a69afd2c09705ffa67a890fc2217503dd31ef51959df9189364c22f
-EBUILD gnome-calculator-3.24.0.ebuild 834 BLAKE2B 8ac1c3a59b54f95aaa319c587bc7267943052de6418cb2628315a90fede5b7ce50460e25edc4d91b59f280476c40b2af57c7634e0206715d34899400282359d5 SHA512 1d4108b7525b94ddcc4783b8b68b1a5bdaa1d04194cc97f6e4e56cbf1fbbb96144d3d25804556c8a8030b63293332fc463726cd34afffab2b9f17e577a863c9e
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
deleted file mode 100644
index bbbad3bed35b..000000000000
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	dev-libs/libxml2:2
-	dev-libs/mpfr:0=
-	dev-libs/mpc:=
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-libs/gtk+-3.19.3:3
-	>=x11-libs/gtksourceview-3.15.1:3.0
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3
-	!gnome-extra/gcalctool
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		VALAC=$(type -P true)
-}
diff --git a/gnome-extra/gnome-calculator/metadata.xml b/gnome-extra/gnome-calculator/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-calculator/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-calendar-3.24.3 b/gnome-extra/gnome-calendar-3.24.3
new file mode 100644
index 000000000000..28cf667e3658
--- /dev/null
+++ b/gnome-extra/gnome-calendar-3.24.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2 dev-libs/appstream-glib dev-util/gdbus-codegen >=dev-util/intltool-0.40.6 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Manage your online calendars with simple and modern interface
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Calendar
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.43.4:2 >=x11-libs/gtk+-3.21.6:3 >=gnome-extra/evolution-data-server-3.17.1:= >=dev-libs/libical-1.0.1:0= net-libs/libsoup:2.4 >=net-libs/gnome-online-accounts-3.2.0:= >=gnome-base/gsettings-desktop-schemas-3.21.2
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=66f4dafc91efdf53947940d6ef21a618
diff --git a/gnome-extra/gnome-calendar/Manifest b/gnome-extra/gnome-calendar/Manifest
deleted file mode 100644
index b1e53c111199..000000000000
--- a/gnome-extra/gnome-calendar/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.24.3-libical3-compat.patch 1429 BLAKE2B ff22e520aeded89b65db02b511c869b8b76c1be1978b9be750565a6d813c0bdf8054a346849de4e2a8c840506d8fb72d34cf08148878b25839f5454d727a2a64 SHA512 72541436fc604ebb923e4d1d9bd033b22972c7f3305b81a2c4b3b77a9c56513654f382de433112e8327250d901e108b899baed437d871125f1709c21cbcfb370
-AUX 3.24.3-week-grid-fixes.patch 4124 BLAKE2B 99fca623889b10356defd0da2ab2672123dadf98ca0eb4ede729c0a586caf5677249ce541ba2a2a7cc440e5fc209a3a93fd4dd0e92607010f1320f988f3977c6 SHA512 9a4095c13470a1dcd7fef6d1d5e9ce12b54acde103029983ca7bb581efbc2502f74ef1fc53b6c7dfb40cc25d1778a1b5d82852dc674038217d2777e9e5a1d0a0
-DIST gnome-calendar-3.24.3.tar.xz 2425292 BLAKE2B cb859e229b040dd1ef34643e7aac5ddc1d0368d0bc6912effd73bd2c95ecab458294fef866f5718e108ef36f03bfc0dcb5a1140a571b3dc35128125ea8ff8e19 SHA512 979a369a5c5fc7d4621ff1ae69dfb1b53002cc014b2f1c480c0122da5bf4282c1928df9dcdb3528352e9589099184ab51f96d1a065e346be8e639aa5fc96ac67
-EBUILD gnome-calendar-3.24.3.ebuild 1136 BLAKE2B 7a1af8ac832510b41fd73df583ac12f1b695e1f6058102d33cce26d22db69330a3f3c7f54998644f0033958ba46047f07914841068efb8a1a4c0e43eb1109863 SHA512 6febd724b2740904b0821cfec5631f5218dd5e0732fd99bab55b9b7d546f2422f273dccbeb083eda2685115b73be28c5d860b2e9e3f68e8cf222babe27194e73
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch b/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
deleted file mode 100644
index 5d0160e9773e..000000000000
--- a/gnome-extra/gnome-calendar/files/3.24.3-libical3-compat.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ad404c26ed22690d842a01df3e10a851a198a0b7 Mon Sep 17 00:00:00 2001
-From: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
-Date: Wed, 15 Nov 2017 13:09:54 -0800
-Subject: [PATCH] utils: simplify gcal_dup_icaltime
-
-Instead of copying member by member, copy the entire struct contents.
-It works as before, but doesn't depend on the member names.
-
-This fixes compiling gnome-calendar with libical 3.0.0, since the
-struct icaltimetype had one of the members removed (is_utc).
-
-https://bugzilla.gnome.org/show_bug.cgi?id=790072
----
- src/gcal-utils.c | 19 +------------------
- 1 file changed, 1 insertion(+), 18 deletions(-)
-
-diff --git a/src/gcal-utils.c b/src/gcal-utils.c
-index c80ba53a..4558f540 100644
---- a/src/gcal-utils.c
-+++ b/src/gcal-utils.c
-@@ -199,24 +199,7 @@ datetime_is_date (GDateTime *dt)
- icaltimetype*
- gcal_dup_icaltime (const icaltimetype *date)
- {
--  icaltimetype *new_date;
--
--  if (date == NULL)
--    return NULL;
--
--  new_date= g_new (icaltimetype, 1);
--  new_date->year = date->year;
--  new_date->month = date->month;
--  new_date->day = date->day;
--  new_date->hour = date->hour;
--  new_date->minute = date->minute;
--  new_date->second = date->second;
--  new_date->is_utc = date->is_utc;
--  new_date->is_date = date->is_date;
--  new_date->is_daylight = date->is_daylight;
--  new_date->zone = date->zone;
--
--  return new_date;
-+  return g_memdup (date, sizeof (icaltimetype));
- }
- 
- /**
--- 
-2.15.1
-
diff --git a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch b/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
deleted file mode 100644
index e382029ceeb1..000000000000
--- a/gnome-extra/gnome-calendar/files/3.24.3-week-grid-fixes.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 9f4bc90761bb9eb3b3e8bdc9ec6b42f44f02053e Mon Sep 17 00:00:00 2001
-From: Abdullahi Usman
-Date: Mon, 10 Jul 2017 11:43:36 +0100
-Subject: week-grid : seperate week's events overlaps.
-
-The week view can display mutilple events that can partly or fully span
-same time ranges.
-
-But week view fails to make correct assumption about the width of events when
-two or more events span some time ranges in which these events also span some
-time ranges with other events, and whereby the number of these other events
-that they span time ranges with does not coincide with the number of the events
-that the other event also span.  Week view ended up calculating cells that
-appears horizontally jointed up.  Also int16_compare() does not dereference the
-pointer from g_ptr_array_sort() correctly and that makes it sort events
-incorrectly and hence making events appears vertically jointed up.
-
-If an event have other events in which they span some time, we calcuate its width
-by taking into consideration of all the events that the other event may span
-time with.  The event that has the higher number of time spans is considered.
-We also save and retrieve our positions using UINT_TO_POINTER and POINTER_TO_UINT()
-respectively, and then dereference the pointer from g_ptr_array_sort() correctly.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=777416
----
- src/views/gcal-week-grid.c | 41 +++++++++++++++++++++++++++++++++++------
- 1 file changed, 35 insertions(+), 6 deletions(-)
-
-diff --git a/src/views/gcal-week-grid.c b/src/views/gcal-week-grid.c
-index 20ddb48..ab125b0 100644
---- a/src/views/gcal-week-grid.c
-+++ b/src/views/gcal-week-grid.c
-@@ -184,10 +184,10 @@ get_event_range (GcalWeekGrid *self,
- }
- 
- static inline gint
--int16_compare (gconstpointer a,
--               gconstpointer b)
-+uint16_compare (gconstpointer a,
-+                gconstpointer b)
- {
--  return GPOINTER_TO_INT (a) - GPOINTER_TO_INT (b);
-+  return GPOINTER_TO_UINT (*(gint*)a) - GPOINTER_TO_UINT (*(gint*)b);
- }
- 
- static inline guint
-@@ -204,7 +204,7 @@ get_event_index (GcalRangeTree *tree,
-   if (!array)
-     return 0;
- 
--  g_ptr_array_sort (array, int16_compare);
-+  g_ptr_array_sort (array, uint16_compare);
- 
-   for (i = 0; array && i < array->len; i++)
-     {
-@@ -235,6 +235,35 @@ count_overlaps_at_range (GcalRangeTree *self,
- 
-       n_events = gcal_range_tree_count_entries_at_range (self, i, i + 1);
- 
-+      if (n_events == 0)
-+        break;
-+
-+      counter = MAX (counter, n_events);
-+    }
-+
-+  return counter;
-+}
-+
-+static guint
-+count_overlaps_of_event (GcalRangeTree *self,
-+                         guint16        day_start,
-+                         guint16        day_end,
-+                         guint16        event_start,
-+                         guint16        event_end)
-+{
-+  guint64 i, counter;
-+
-+  counter = count_overlaps_at_range (self, event_start, day_end);
-+
-+  for (i = event_start; i > day_start; i--)
-+    {
-+      guint n_events;
-+
-+      n_events = gcal_range_tree_count_entries_at_range (self, i - 1, i);
-+
-+      if (n_events == 0)
-+        break;
-+
-       counter = MAX (counter, n_events);
-     }
- 
-@@ -652,7 +681,7 @@ gcal_week_grid_size_allocate (GtkWidget     *widget,
-           context = gtk_widget_get_style_context (event_widget);
- 
-           /* The total number of events available in this range */
--          events_at_range = count_overlaps_at_range (self->events, data->start, data->end);
-+          events_at_range = count_overlaps_of_event (self->events, day_start, day_end, data->start, data->end);
- 
-           /* The real horizontal position of this event */
-           widget_index = get_event_index (overlaps, data->start, data->end);
-@@ -689,7 +718,7 @@ gcal_week_grid_size_allocate (GtkWidget     *widget,
-           gcal_range_tree_add_range (overlaps,
-                                      data->start,
-                                      data->end,
--                                     GINT_TO_POINTER (widget_index));
-+                                     GUINT_TO_POINTER (widget_index));
-         }
- 
-       g_clear_pointer (&widgets_data, g_ptr_array_unref);
--- 
-cgit v0.12
-
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
deleted file mode 100644
index ffbe2073b8fe..000000000000
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.24.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Manage your online calendars with simple and modern interface"
-HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
-RDEPEND="
-	>=dev-libs/glib-2.43.4:2
-	>=x11-libs/gtk+-3.21.6:3
-	>=gnome-extra/evolution-data-server-3.17.1:=
-	>=dev-libs/libical-1.0.1:0=
-	net-libs/libsoup:2.4
-	>=net-libs/gnome-online-accounts-3.2.0:=
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.40.6
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-week-grid-fixes.patch # from gnome-3-22 branch
-	"${FILESDIR}"/${PV}-libical3-compat.patch # from master branch, https://bugzilla.gnome.org/show_bug.cgi?id=790072
-)
-
-src_configure() {
-	# Explicit --enable-debug=minimum forces no -O and -g touching in development (odd minor) versions
-	gnome2_src_configure \
-		--enable-debug=minimum
-}
diff --git a/gnome-extra/gnome-calendar/metadata.xml b/gnome-extra/gnome-calendar/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-calendar/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-characters-3.24.0 b/gnome-extra/gnome-characters-3.24.0
new file mode 100644
index 000000000000..d2eefd0d9a17
--- /dev/null
+++ b/gnome-extra/gnome-characters-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection] dev-libs/appstream-glib >=sys-devel/gettext-0.19.8 virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-util/dogtail[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/dogtail[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-util/dogtail[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/CharacterMap
+IUSE=test test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 BSD
+RDEPEND=>=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libunistring-0.9.5 >=x11-libs/gtk+-3.20:3[introspection] >=x11-libs/pango-1.36[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5dfd469aef7f58b04600477ccbf27d5c
diff --git a/gnome-extra/gnome-characters/Manifest b/gnome-extra/gnome-characters/Manifest
deleted file mode 100644
index 2ea63ff59958..000000000000
--- a/gnome-extra/gnome-characters/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-characters-3.24.0.tar.xz 1490304 BLAKE2B b7bea411ae623a29469fa82d8a9a220a718134776c0973431f4f16f6753bcedd34a8886f3cecc8af59b178f93c051310fa988aef198618b2c4d0be9001cb7ad8 SHA512 28531676e3ed89cea574f800a1f0e19106eb4ccb0edc62ea493bb6680fdbe3b1ed45c3cd865a637c059a89df63b980cd4a9d69d73049778c52725b1d38fdad9d
-EBUILD gnome-characters-3.24.0.ebuild 1168 BLAKE2B 17e378c2397c5f9c02242ce840ba6c5f9626086e62287d00ded178f09a9d3f7a6797155b3946a39742006c9a80b032bea78466757c093c1142657dda1415fe29 SHA512 5dd6ce8d5cdb738fa247a2e97ac7703cfcccd9bf4bf7a2493e4443422de620665a34303ffba1005ea886ea0685ffd833c35aa617facdd95d756ded751570263c
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
deleted file mode 100644
index ef88e3fd8906..000000000000
--- a/gnome-extra/gnome-characters/gnome-characters-3.24.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libunistring-0.9.5
-	>=x11-libs/gtk+-3.20:3[introspection]
-	>=x11-libs/pango-1.36[introspection]
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed 's/print \(.*\)/print(\1)/' -i "${S}"/tests/smoke_test.py || die
-
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-characters/metadata.xml b/gnome-extra/gnome-characters/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-characters/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-clocks-3.24.0 b/gnome-extra/gnome-clocks-3.24.0
new file mode 100644
index 000000000000..f684dec507a6
--- /dev/null
+++ b/gnome-extra/gnome-clocks-3.24.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3 || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Clocks application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Clocks
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/glib-2.44:2 >=dev-libs/libgweather-3.13.91:2= >=gnome-base/gnome-desktop-3.7.90:3= >=media-libs/gsound-0.98 >=sci-geosciences/geocode-glib-0.99.4 >=x11-libs/gtk+-3.19.8:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b6d04001437818a9cf538bdc827b13a1
diff --git a/gnome-extra/gnome-clocks/Manifest b/gnome-extra/gnome-clocks/Manifest
deleted file mode 100644
index 1b011df00fda..000000000000
--- a/gnome-extra/gnome-clocks/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-clocks-3.24.0.tar.xz 954576 BLAKE2B 848303243391bfbc5ae2fcd8bfb4f3320ccb8465098d95379aaecf856341f05171964eda1a0a8637e04b5330cee6343003ec25063157f6d8ba0abcc22aa3f6ef SHA512 f29a61ac9634008fa918f9f08c6e24c93816c0077687bd2feff3ef2c62c0db475076de5dbc1e223027627e985c4e4362f0cdf1a47821356c0a9ef9c4cd672de1
-EBUILD gnome-clocks-3.24.0.ebuild 700 BLAKE2B 6eb7773cd6c818eed081337668cdd1a83cab80e946f8fc94635b895eff454f55d410297a113b58223ce8df2510418eeb188ac02fdcb4c38d6e049b8a6bf4aba7 SHA512 a108464748a745e78c230d635d1085fcbbc2b2a96b9a01a6fec6b63e7384b38377bd6e4fe40fd7a1784f0b970f6b772d36b08760e4812e160f9b7481d2bbb192
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
deleted file mode 100644
index 7740ca668b48..000000000000
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="Clocks application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/glib-2.44:2
-	>=dev-libs/libgweather-3.13.91:2=
-	>=gnome-base/gnome-desktop-3.7.90:3=
-	>=media-libs/gsound-0.98
-	>=sci-geosciences/geocode-glib-0.99.4
-	>=x11-libs/gtk+-3.19.8:3
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
diff --git a/gnome-extra/gnome-clocks/metadata.xml b/gnome-extra/gnome-clocks/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-clocks/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-color-manager-3.24.0 b/gnome-extra/gnome-color-manager-3.24.0
new file mode 100644
index 000000000000..b78ff9eb394c
--- /dev/null
+++ b/gnome-extra/gnome-color-manager-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= ) app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib dev-libs/libxslt dev-util/itstool >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Color profile manager for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-color-manager
+IUSE=packagekit raw test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.31.10:2 >=media-libs/lcms-2.2:2 >=media-libs/libcanberra-0.10[gtk3] media-libs/libexif media-libs/tiff:0= >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.91 >=x11-misc/colord-1.3.1:0= >=x11-libs/colord-gtk-0.1.20 packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2:0= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-color-manager/3.24/gnome-color-manager-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=025abfdb46d00dd378869a7c49b29593
diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest
deleted file mode 100644
index 97ee856ff8b5..000000000000
--- a/gnome-extra/gnome-color-manager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003
-EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8
-MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
deleted file mode 100644
index 441b966300cd..000000000000
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="Color profile manager for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="packagekit raw"
-
-# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
-RDEPEND="
-	>=dev-libs/glib-2.31.10:2
-	>=media-libs/lcms-2.2:2
-	>=media-libs/libcanberra-0.10[gtk3]
-	media-libs/libexif
-	media-libs/tiff:0=
-
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/vte-0.25.1:2.91
-	>=x11-misc/colord-1.3.1:0=
-	>=x11-libs/colord-gtk-0.1.20
-
-	packagekit? ( app-admin/packagekit-base )
-	raw? ( media-gfx/exiv2:0= )
-"
-# docbook-sgml-{utils,dtd:4.1} needed to generate man pages
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# Always enable tests since they are check_PROGRAMS anyway
-	# appstream does not want to be relax by default !
-	gnome2_src_configure \
-		--disable-static \
-		--enable-tests \
-		$(use_enable packagekit) \
-		$(use_enable raw exiv)
-#		APPSTREAM_UTIL=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version media-gfx/argyllcms ; then
-		elog "If you want to do display or scanner calibration, you will need to"
-		elog "install media-gfx/argyllcms"
-	fi
-}
diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml
deleted file mode 100644
index 6968539644cc..000000000000
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="packagekit">Enable support for the distro-neutral package
-			manager GUI <pkg>app-admin/packagekit</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-commander-1.6.3 b/gnome-extra/gnome-commander-1.6.3
new file mode 100644
index 000000000000..d88386d57707
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.6.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( >=dev-util/cppunit-1.13.2 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e63c0d5642b0b917ff49c17e54754329
diff --git a/gnome-extra/gnome-commander-1.6.4 b/gnome-extra/gnome-commander-1.6.4
new file mode 100644
index 000000000000..e606090a25b5
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1de77fd2e5a620cfd20510c72551ab4f
diff --git a/gnome-extra/gnome-commander-1.8.0 b/gnome-extra/gnome-commander-1.8.0
new file mode 100644
index 000000000000..b8eb2db2fc07
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf python taglib samba test +unique python_targets_python2_7 python_targets_python3_4 python_single_target_python2_7 python_single_target_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c81937df4252f8ebb3c5e8f90715fa8e
diff --git a/gnome-extra/gnome-commander-1.8.1 b/gnome-extra/gnome-commander-1.8.1
new file mode 100644
index 000000000000..70654e795c16
--- /dev/null
+++ b/gnome-extra/gnome-commander-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig test? ( >=dev-cpp/gtest-1.7.0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical, full featured, twin-panel file manager
+EAPI=6
+HOMEPAGE=https://gcmd.github.io/
+IUSE=chm exif gsf pdf taglib samba test +unique
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=app-text/yelp-tools >=dev-libs/glib-2.44.0:2 unique? ( >=dev-libs/libunique-0.9.3:1 ) gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.18.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) taglib? ( >=media-libs/taglib-1.4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-commander/1.8/gnome-commander-1.8.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4962f1883eba6c2019ce6875e18050d0
diff --git a/gnome-extra/gnome-commander/Manifest b/gnome-extra/gnome-commander/Manifest
deleted file mode 100644
index 87c4fc1433ad..000000000000
--- a/gnome-extra/gnome-commander/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST gnome-commander-1.6.3.tar.xz 6653164 BLAKE2B 04d39ad7e19939b1791de838a03a9406abb11599e8c43d86cf491aef087e9c78574d28bc076ceefab81a18f09fb1ac49b7cb893b0381a7890744a77438c53453 SHA512 92f138c3cff1b88b967340f945bfa58c5840fb3db806943b4d4eb87211fea10de01a8a365de6ca2b18cb0503bd850e758c3a37fe604b5402481c03e953e94dd3
-DIST gnome-commander-1.6.4.tar.xz 6678752 BLAKE2B 987aa7ff2b34df163a82a9e1964d21860a90ba2ff6fb71190ebfec245090a9ffea1aa8a45c037cd848135dec7a56b7cd26e31d70be8c5ce3f24ad132cff3b19a SHA512 00fcf86025b69a38e68b2c69977ffe54e8b00028176163ce746824a73faed55eeff2fe37eea2e191fd0e7fc1901e2ed701938c3fdfabe9e9b8bdaaec152df0e0
-DIST gnome-commander-1.8.0.tar.xz 7433656 BLAKE2B 686581eb6775e336928f18f3c817d4d34b19da2c5c91660e453223833b24f6bd1400d8ecf2ca3698fc18f2d926343006058b00fefda889204f251b223d6a2d34 SHA512 0023528301812431bffde4c0d314d07d2399d450604bf88426078cfbeed5ee286f16ad0037f85c2b281e9037fd0c622aa92a4a5be055c198d9bdbd3d211c197d
-DIST gnome-commander-1.8.1.tar.xz 7298888 BLAKE2B 57def43a8d8794ea813e6520c436d86f3fb9218e64f0b1e7280e03370870a29887737006e056ee0e2af78e12e225a8f5789c4f86f68eac13e27420cbef0fd2d7 SHA512 76efb88e1ee8843fcb9cf17c421dda1769d39b1bfd9d5c97e3ff570117bcac44dfd17a2efbda5079155115611b10b75644ec12df541bd6f7f8d0f65e471f6b32
-EBUILD gnome-commander-1.6.3.ebuild 1690 BLAKE2B 75d8fe6a6c140dc66cd44dd7a280763367e431ddec9acb8ff6a8ed8f48b3c9ded16a0a6a38ae0dd4b6349f0e421323f8da4b3639cbf040379e6a9414342c3ff2 SHA512 dc55901ec53ee864e99280e97f6d1af621c9f567c46bfe120328d4268e7108561aa8f30a960e2c642c141c8ebec4f5a3a5225c4170c37f9c73fac5e2a9c736a0
-EBUILD gnome-commander-1.6.4.ebuild 1690 BLAKE2B 8e7cd9242ec65947a4cd2b0ec68fe7c1d5956afb9016b1c86e687f2892095384aef0267173044c0f587918390529548b42bb34a51d97bee1396e5000f8d99763 SHA512 f8071c83815e1c58fcc11027695b7ee92d46cb80958ed0d11add1bbd0a04ca0b46a002dfd65573d786a589d4c3d0d58b9573d188c83d876b5cf24092a7510aa8
-EBUILD gnome-commander-1.8.0.ebuild 1662 BLAKE2B 19fdd9b09b7d8082d3b9bdc6305bd85ba31b3ed1f5138c249e9a77aa3683fab08e130ab7c717d2415eb71809ef8e2b8dec059406c5f5fa068af07908faa6a40b SHA512 9c016b72422439dbedf6c93901e7bc5413de12cd8924a87b07cb84fc9c86cbb5c45b1a031ef2a96c43c9dd3065e85415a9279b4a9e145e1cc70741a447429217
-EBUILD gnome-commander-1.8.1.ebuild 1392 BLAKE2B d1c67d019e1a24dc28f3122012cd10aa208b9785f3e902124177c0c847ed12142b531b1c4ee7e53181837f3d33dc359a5b69e100c5819d79692a607edc2d29d4 SHA512 adc3f88d893737c1b9d2a4cb8f56260f40733d2e39a7e6a53bc813d8225b57b4321c88751935e916cb7329925ca016cf45de226dd0ba4dabb3646354431d5b1e
-MISC metadata.xml 1272 BLAKE2B 808953256b9af04ad4d4d8021e40f8d90b04333d03f67a15f2d50461706059269e02ed0316160245d636482ee6a741c4591c474e24028b5493383c99ab0bb1bb SHA512 4b2df4f1f6935f0efa0c1b1b8d975ea1927e049824c6bb35101ce93069477c39bb68e584648c1e88cf4e60083ecfe5a101ea11381b525d3245e3ff128914f4b2
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
deleted file mode 100644
index 8855b6edb1ce..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.8.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/gnome-vfs-python-2.0.0
-	)
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-util/cppunit-1.13.2 )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable python) \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
deleted file mode 100644
index 83995841e950..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-text/gnome-doc-utils
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.8.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-			${PYTHON_DEPS}
-			>=dev-python/gnome-vfs-python-2.0.0
-	)
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable python) \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
deleted file mode 100644
index 9ce12ae4eeeb..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.8.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 python-single-r1
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="chm exif gsf pdf python taglib samba test +unique"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	app-text/yelp-tools
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.18.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/gnome-vfs-python-2.0.0
-	)
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable python) \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
deleted file mode 100644
index 7fd4b9933cc6..000000000000
--- a/gnome-extra/gnome-commander/gnome-commander-1.8.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="A graphical, full featured, twin-panel file manager"
-HOMEPAGE="https://gcmd.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="chm exif gsf pdf taglib samba test +unique"
-
-RDEPEND="
-	app-text/yelp-tools
-	>=dev-libs/glib-2.44.0:2
-	unique? ( >=dev-libs/libunique-0.9.3:1 )
-	gnome-base/gnome-keyring
-	>=gnome-base/gnome-vfs-2.0.0
-	>=gnome-base/libgnome-2.0.0
-	>=gnome-base/libgnomeui-2.4.0
-	>=x11-libs/gtk+-2.18.0:2
-	chm? ( dev-libs/chmlib )
-	exif? ( >=media-gfx/exiv2-0.14 )
-	gsf? ( >=gnome-extra/libgsf-1.12.0 )
-	samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] )
-	pdf? ( >=app-text/poppler-0.18 )
-	taglib? ( >=media-libs/taglib-1.4 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? ( >=dev-cpp/gtest-1.7.0 )
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with chm libchm) \
-		$(use_with exif exiv2) \
-		$(use_with gsf libgsf) \
-		$(use_with pdf poppler) \
-		$(use_with samba) \
-		$(use_with taglib) \
-		$(use_with unique)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	has_version dev-util/meld || elog "You need dev-util/meld to synchronize files and directories."
-	has_version gnome-extra/yelp || elog "You need gnome-extra/yelp to view the docs."
-}
diff --git a/gnome-extra/gnome-commander/metadata.xml b/gnome-extra/gnome-commander/metadata.xml
deleted file mode 100644
index 59b66f283536..000000000000
--- a/gnome-extra/gnome-commander/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>u.scholz83@gmx.de</email>
-    <name>Uwe Scholz</name>
-  </maintainer>
-<maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-<upstream>
-  <maintainer status="active">
-    <email>u.scholz83@gmx.de</email>
-    <name>Uwe Scholz</name>
-  </maintainer>
-  <changelog>https://git.gnome.org/browse/gnome-commander/tree/NEWS?h=gcmd-1-4</changelog>
-  <bugs-to>https://bugzilla.gnome.org/browse.cgi?product=gnome-commander</bugs-to>
-  <remote-id type="freecode">gnome-commander</remote-id>
-</upstream>
-<use>
-  <flag name="chm">Enable metadata support for Microsoft Compiled HTML Help files</flag>
-  <flag name="gsf">Add metadata support for OLE, OLE2 and ODF</flag>
-  <flag name="unique">Enable single instance support using dev-libs/libunique</flag>
-  <flag name="pdf">Add metadata support for PDF</flag>
-  <flag name="python">Add support for python plugins</flag>
-  <flag name="samba">Add support for SAMBA (Windows File and Printer sharing)</flag>
-  <flag name="taglib">Add metadata support for ID3, Vorbis, FLAC and APE</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-contacts-3.22.1-r1 b/gnome-extra/gnome-contacts-3.22.1-r1
new file mode 100644
index 000000000000..c1db7f5611e8
--- /dev/null
+++ b/gnome-extra/gnome-contacts-3.22.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/folks-0.11.4:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= ) || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) >=dev-libs/gobject-introspection-0.9.6:= dev-libs/folks[vala(+)] gnome-base/gnome-desktop:3=[introspection] gnome-extra/evolution-data-server[vala] net-libs/telepathy-glib[vala] app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME contact management application
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Contacts
+IUSE=v4l
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/folks-0.11.4:=[eds,telepathy] >=dev-libs/glib-2.37.6:2 >=dev-libs/libgee-0.10:0.8 >=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts] >=gnome-base/gnome-desktop-3.0:3= media-libs/clutter:1.0 media-libs/clutter-gtk:1.0 media-libs/libchamplain:0.12 net-libs/gnome-online-accounts:= >=net-libs/telepathy-glib-0.17.5 >=sci-geosciences/geocode-glib-3.15.3 x11-libs/cairo:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.20.0:3 x11-libs/pango v4l? ( >=media-video/cheese-3.5.91:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=983366c80a5c9a9e9a7f099e3151b742
diff --git a/gnome-extra/gnome-contacts/Manifest b/gnome-extra/gnome-contacts/Manifest
deleted file mode 100644
index f33285beaf7f..000000000000
--- a/gnome-extra/gnome-contacts/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX 3.22.1-fix-vala-0.35-part1.patch 884 BLAKE2B 2994fc2b28bbe8f3b547542b100324fce5d95b385ea8edc1013c86c1e0df1dabafb4306b8153953c67a36e1d96e1c658c599afea5f1c3e3a7d617d01c05d3224 SHA512 73754d230efe89d3e3273e1d24a69e58e45a8d6e74fce1a41f7a7889aa58189fcc2f5edf36ce2418c43871716634301308f0c211f0f18282cb409d009669bdf2
-AUX 3.22.1-fix-vala-0.35-part2.patch 1501 BLAKE2B ca7149152cae32912977bb8a2ca420d1711fcff5e2b18e040d9969e246a0398f66ad09cee72f22b282d6eec834d10721a99d270ba873d782f09bc6e30b7c80d6 SHA512 700772e2c87bfad32e408f20653a20976c0a3b243fd4bc8b6ed61cb9fe34f1b1f572b877aa05e9b9c3854cc444d5d7fc1c26dcd9ac28bf76694eb02c2e31bb4c
-DIST gnome-contacts-3.22.1.tar.xz 788820 BLAKE2B 8f620334dd380e8cb690f7b71d3a99a921f5814ab230690a60be6022150db7a6a0f74e426e72d8d027eb5280e1b6bfd04fa7b0b030519bb19e4718ca0c9f2120 SHA512 d93ed6c65ffdabe1925cc795b88ff374fe69e03fcd36af7c2fc67a5236b90ab6af4bd269b6fc3b344fcd6b4688d866628b8b090bb62de95f8bd0c2e40c26a107
-EBUILD gnome-contacts-3.22.1-r1.ebuild 1840 BLAKE2B 3678c0ff5796cb2bfed0d35954e0553bdb6b94c79fd9e4d120fac3a307351c948c4cf2d733878002907af6416548ef6c18063fce60a48b022e3f0faa9130e6d2 SHA512 81cfe1119ad2b63bb3041eecae2b4a5b0dc0e1b8e4901f6ad74cb1c52004abcd820dd131f3b2bac0e0d7b067c69c2a53a84187ab7f9019d991f81de79def191d
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
deleted file mode 100644
index b9634e6fc041..000000000000
--- a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 2ba6e380dd8a3575bd8f4d4e5d8d3883003e9f54 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz@ubuntu.com>
-Date: Sat, 1 Oct 2016 14:27:55 +0200
-Subject: [PATCH] Don't restrict RowData.details to the generic type "string"
-
-This allows AbstractFieldDetails<G> based values to be assigned,
-like PostalAddressFieldDetails.
-
-Fixes a build-failure with vala 0.35+ due to stricter type-checking.
----
- src/contacts-contact-editor.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/contacts-contact-editor.vala b/src/contacts-contact-editor.vala
-index 3372f87..3978887 100644
---- a/src/contacts-contact-editor.vala
-+++ b/src/contacts-contact-editor.vala
-@@ -77,7 +77,7 @@ public class Contacts.ContactEditor : Grid {
-   }
- 
-   struct RowData {
--    AbstractFieldDetails<string> details;
-+    AbstractFieldDetails details;
-   }
- 
-   struct Field {
--- 
-2.14.1
-
diff --git a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch b/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
deleted file mode 100644
index 4cfe861fa509..000000000000
--- a/gnome-extra/gnome-contacts/files/3.22.1-fix-vala-0.35-part2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b96b0fc07c49724f252a5cd35f2d028f91529068 Mon Sep 17 00:00:00 2001
-From: Jeena <hello@jeena.net>
-Date: Tue, 15 Aug 2017 16:53:05 +0200
-Subject: [PATCH] Drop unnecessary format-string.
-
-Code got refactored in 3.25/master but it boils down to dropping this
-extra parameter.
----
- src/contacts-contact-pane.vala | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/contacts-contact-pane.vala b/src/contacts-contact-pane.vala
-index 8e100f2..fce832b 100644
---- a/src/contacts-contact-pane.vala
-+++ b/src/contacts-contact-pane.vala
-@@ -451,7 +451,6 @@ public class Contacts.ContactPane : Notebook {
- 					 DialogFlags.MODAL,
- 					 MessageType.ERROR,
- 					 ButtonsType.OK,
--					 "%s",
- 					 _("You need to enter some data"));
-       dialog.show ();
-       dialog.response.connect ( () => {
-@@ -463,7 +462,6 @@ public class Contacts.ContactPane : Notebook {
- 					 DialogFlags.MODAL,
- 					 MessageType.ERROR,
- 					 ButtonsType.OK,
--					 "%s",
- 					 _("No primary addressbook configured"));
-       dialog.show ();
-       dialog.response.connect ( () => {
-@@ -482,7 +480,6 @@ public class Contacts.ContactPane : Notebook {
- 					DialogFlags.MODAL,
- 					MessageType.ERROR,
- 					ButtonsType.OK,
--					"%s",
- 					_("Unable to create new contacts: %s"), e.message);
- 	  }
- 
-@@ -493,7 +490,6 @@ public class Contacts.ContactPane : Notebook {
- 					DialogFlags.MODAL,
- 					MessageType.ERROR,
- 					ButtonsType.OK,
--					"%s",
- 					_("Unable to find newly created contact"));
- 	  }
- 
--- 
-2.14.1
-
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
deleted file mode 100644
index 95083e15f4ef..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-VALA_MIN_API_VERSION="0.24"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-VALA_DEPEND="
-	$(vala_depend)
-	>=dev-libs/gobject-introspection-0.9.6:=
-	dev-libs/folks[vala(+)]
-	gnome-base/gnome-desktop:3=[introspection]
-	gnome-extra/evolution-data-server[vala]
-	net-libs/telepathy-glib[vala]
-"
-# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
-# folks-0.11.4 to avoid build issues with vala-0.36, upstream 7a9001b056b4fb1d00375e7b2adeda9b7cf93c90
-RDEPEND="
-	>=dev-libs/folks-0.11.4:=[eds,telepathy]
-	>=dev-libs/glib-2.37.6:2
-	>=dev-libs/libgee-0.10:0.8
-	>=gnome-extra/evolution-data-server-3.13.90:=[gnome-online-accounts]
-	>=gnome-base/gnome-desktop-3.0:3=
-	media-libs/clutter:1.0
-	media-libs/clutter-gtk:1.0
-	media-libs/libchamplain:0.12
-	net-libs/gnome-online-accounts:=
-	>=net-libs/telepathy-glib-0.17.5
-	>=sci-geosciences/geocode-glib-3.15.3
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.20.0:3
-	x11-libs/pango
-	v4l? ( >=media-video/cheese-3.5.91:= )
-"
-DEPEND="${RDEPEND}
-	${VALA_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-vala-0.35-part1.patch
-	"${FILESDIR}"/${PV}-fix-vala-0.35-part2.patch
-)
-
-src_prepare() {
-	# Regenerate the pre-generated C sources, bug #471628
-	if ! use v4l; then
-		touch src/*.vala
-	fi
-
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-man-pages \
-		$(use_with v4l cheese)
-}
diff --git a/gnome-extra/gnome-contacts/metadata.xml b/gnome-extra/gnome-contacts/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-directory-thumbnailer-0.1.10 b/gnome-extra/gnome-directory-thumbnailer-0.1.10
new file mode 100644
index 000000000000..4bc084944942
--- /dev/null
+++ b/gnome-extra/gnome-directory-thumbnailer-0.1.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3 >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Thumbnail generator for directories
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer
+KEYWORDS=amd64 x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.35:2 >=x11-libs/gdk-pixbuf-2.36.5:2 >=gnome-base/gnome-desktop-2.2:3= x11-libs/gtk+:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-directory-thumbnailer/0.1/gnome-directory-thumbnailer-0.1.10.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d4e8f55d9ff29ab010e3596cd1eecfb9
diff --git a/gnome-extra/gnome-directory-thumbnailer/Manifest b/gnome-extra/gnome-directory-thumbnailer/Manifest
deleted file mode 100644
index 6fc2274401e2..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-directory-thumbnailer-0.1.10.tar.xz 277524 BLAKE2B 3ecff07a7984b1edebf07d5e0199110bfb7e841a5da03d0d8aa55c0029c6e1fa6b6409bbb3294f02187d14ff55580159863f36cff5ce6157f23f1949a0e10661 SHA512 0e6a2874f633bfa32f0028f99c8535b3da0b44b3c89cf1e20a8dd23c8cf2e0e7bf7204af04587c4cf3a9614d9111814a8c6474bb43229178447cb3143672f0fc
-EBUILD gnome-directory-thumbnailer-0.1.10.ebuild 496 BLAKE2B 183cac210a7897aafda4772c734dfd99d2a31b766b506264931f44e8aaccd85f80b49e54d06a0288e3d3bd2443d4c95fe50d0f4364729f53a9744c96f89d0acb SHA512 4501b8e8d2ac36bb2651104c502ba957c50a7626d6bdc80c842a8ab9d392ecbb8776f3451b8270ccc73d81dc725818b3ed8fa1d47301d6eafa62e67005e1501e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
deleted file mode 100644
index 3c9bd5ca9e13..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Thumbnail generator for directories"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDirectoryThumbnailer"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.35:2
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=gnome-base/gnome-desktop-2.2:3=
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/gnome-directory-thumbnailer/metadata.xml b/gnome-extra/gnome-directory-thumbnailer/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-directory-thumbnailer/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-documents-3.24.3 b/gnome-extra/gnome-documents-3.24.3
new file mode 100644
index 000000000000..c3d02f840858
--- /dev/null
+++ b/gnome-extra/gnome-documents-3.24.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] dev-libs/libxslt >=dev-util/intltool-0.50.1 dev-util/itstool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A document manager application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Documents
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=>=app-text/evince-3.13.3[introspection] >=net-libs/webkit-gtk-2.6:4[introspection] dev-libs/gjs >=dev-libs/glib-2.39.3:2 >=dev-libs/gobject-introspection-1.31.6:= >=x11-libs/gtk+-3.22.10:3[introspection] >=net-libs/libsoup-2.41.3:2.4 gnome-base/gnome-desktop:3=[introspection] >=app-misc/tracker-1:=[miner-fs] >=x11-libs/cairo-1.14 >=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection] x11-libs/gdk-pixbuf:2[introspection] >=net-libs/gnome-online-accounts-3.2.0[introspection] x11-libs/pango[introspection] >=net-libs/libzapojit-0.0.2[introspection] >=app-text/libgepub-0.4[introspection] net-misc/gnome-online-miners sys-apps/dbus x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a7dcd0b93853c59b4988b0b319cf970e
diff --git a/gnome-extra/gnome-documents/Manifest b/gnome-extra/gnome-documents/Manifest
deleted file mode 100644
index c0d0556f6c32..000000000000
--- a/gnome-extra/gnome-documents/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-documents-3.24.3.tar.xz 2313680 BLAKE2B 920e18b0ca43cfa95945268613f15f2f417de74c8992aefe414205d3463c0cdaac81fcabb9453ac93a76ae7b221da73379d86902b483fe2f3d12063ac27acdf7 SHA512 c5b59ba4a2eb83d7c61e6e50f6af2d0b310c7b9709ea7c8a02da707cc7e335589e4bef7b6f6618bbcca729fdaed531647f7f839aa3538830a226b837d0f0118a
-EBUILD gnome-documents-3.24.3.ebuild 1245 BLAKE2B 33bc45540e828e4045b47930b3e4627fd40aa0e15de115b3b8516c93ca8a76941bf62089a434b824da3788e3098660ca937e1c00dc1b68c790dd8796b2a6dd18 SHA512 acd279ff281474d3654f2f49f9783a84226971caacdeae4b21b5dadd6e47520dd69fffc383d3259d401c96542e2eb1f45b3e325c60174eff447c375ea1707dda
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
deleted file mode 100644
index 0d0f874803cf..000000000000
--- a/gnome-extra/gnome-documents/gnome-documents-3.24.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A document manager application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="amd64 x86"
-
-# cairo-1.14 for cairo_surface_set_device_scale check and usage
-COMMON_DEPEND="
-	>=app-text/evince-3.13.3[introspection]
-	>=net-libs/webkit-gtk-2.6:4[introspection]
-	dev-libs/gjs
-	>=dev-libs/glib-2.39.3:2
-	>=dev-libs/gobject-introspection-1.31.6:=
-	>=x11-libs/gtk+-3.22.10:3[introspection]
-	>=net-libs/libsoup-2.41.3:2.4
-	gnome-base/gnome-desktop:3=[introspection]
-	>=app-misc/tracker-1:=[miner-fs]
-	>=x11-libs/cairo-1.14
-	>=dev-libs/libgdata-0.13.3:=[crypt,gnome-online-accounts,introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=net-libs/gnome-online-accounts-3.2.0[introspection]
-	x11-libs/pango[introspection]
-	>=net-libs/libzapojit-0.0.2[introspection]
-	>=app-text/libgepub-0.4[introspection]
-"
-RDEPEND="${COMMON_DEPEND}
-	net-misc/gnome-online-miners
-	sys-apps/dbus
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50.1
-	dev-util/itstool
-	virtual/pkgconfig
-"
-# eautoreconf requires yelp-tools
diff --git a/gnome-extra/gnome-documents/metadata.xml b/gnome-extra/gnome-documents/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-documents/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-dvb-daemon-0.2.90 b/gnome-extra/gnome-dvb-daemon-0.2.90
new file mode 100644
index 000000000000..d8c3ed5c1de1
--- /dev/null
+++ b/gnome-extra/gnome-dvb-daemon-0.2.90
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) totem? ( media-video/totem ) || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) >=dev-lang/perl-5.8.1:0 >=dev-util/intltool-0.40.0:0 >=dev-libs/libltdl-2.2.6:0 virtual/pkgconfig:0 nls? ( >=sys-devel/gettext-0.18.1:0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/action/show/Projects/DVBDaemon
+IUSE=nls totem vala
+KEYWORDS=amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.4.0:1.0 >=media-libs/gst-plugins-good-1.4.0:1.0 >=media-libs/gst-plugins-bad-1.4.0:1.0 >=dev-libs/libgee-0.8:0.8 >=dev-db/sqlite-3.4:3 >=media-libs/gst-rtsp-server-1.4.5:1.0 media-plugins/gst-plugins-dvb:1.0 dev-python/gst-python:1.0 >=dev-python/pygobject-3.2.1:3 >=dev-libs/gobject-introspection-1.44.0:0 x11-libs/gtk+:3[introspection] virtual/libgudev:0 vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) totem? ( media-video/totem )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-dvb-daemon/0.2/gnome-dvb-daemon-0.2.90.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4886600dc206a9778fa7e8cdf13f9c59
diff --git a/gnome-extra/gnome-dvb-daemon/Manifest b/gnome-extra/gnome-dvb-daemon/Manifest
deleted file mode 100644
index dc597fcc8e9e..000000000000
--- a/gnome-extra/gnome-dvb-daemon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-dvb-daemon-0.2.90.tar.xz 700504 BLAKE2B ff08784a7b7e995a0bddda724cd000a2f98da22d7e27897a837e345523c02c2bf016f96861341181b0d4f1ee9afc5104675f1ab2c77ab14815f08f34324693d5 SHA512 73e18ed5b267f1ef1ceebfe4ff25ccac3222bca9d7da164dd16acf9367c6b9f9710e915c81ef851c54b6fcae9b08f36d0c78665f4af425afc41b4c08eba49c40
-EBUILD gnome-dvb-daemon-0.2.90.ebuild 1694 BLAKE2B 99e5817e82f936dc5fbe67f7b62fd79a23ee6a02b1f9702b060ad57826744a500db3fe3a87b0d231531a9add195f14f989c89aaf5fbebf85bee375c218a0b2c4 SHA512 3b7ef1acba1b596f9629803e4a6eb45b9660aed68ed73a61864a5711584df676f34eaa010e7078b6352d3d596c576ba7ac7b97d00107eaab31a10d2fb01a92e3
-MISC metadata.xml 587 BLAKE2B bd4ef7c759254cf493e4b55166deab4f94eea2226fbaa5630708b4217f2fda2f2b6537620b5a0fb94cf3cad8db87f29c7da05c42c85060475667df71cc8a88e8 SHA512 e3f3fcf4fefb21c6d5cdd394c3c663ba1f178e7f2f7432e3e03a0c2a546baaf328d25fed7dff1145833d8df17f955acd0e2d49db404385c4eb6155c961380243
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
deleted file mode 100644
index c8b8ebee7ef5..000000000000
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-VALA_MIN_API_VERSION="0.26"
-
-inherit eutils gnome2 multilib python-any-r1 vala
-
-DESCRIPTION="Setup your DVB devices, record and watch TV shows and browse EPG using GStreamer"
-HOMEPAGE="https://wiki.gnome.org/action/show/Projects/DVBDaemon"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="nls totem vala"
-
-RDEPEND=">=dev-libs/glib-2.32.0:2
-	>=media-libs/gstreamer-1.4.0:1.0
-	>=media-libs/gst-plugins-good-1.4.0:1.0
-	>=media-libs/gst-plugins-bad-1.4.0:1.0
-	>=dev-libs/libgee-0.8:0.8
-	>=dev-db/sqlite-3.4:3
-	>=media-libs/gst-rtsp-server-1.4.5:1.0
-	media-plugins/gst-plugins-dvb:1.0
-	dev-python/gst-python:1.0
-	>=dev-python/pygobject-3.2.1:3
-	>=dev-libs/gobject-introspection-1.44.0:0
-	x11-libs/gtk+:3[introspection]
-	virtual/libgudev:0
-	vala? ( $(vala_depend) )
-	totem? ( media-video/totem )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	>=dev-lang/perl-5.8.1:0
-	>=dev-util/intltool-0.40.0:0
-	>=dev-libs/libltdl-2.2.6:0
-	virtual/pkgconfig:0
-	nls? ( >=sys-devel/gettext-0.18.1:0 )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-	if use vala ; then
-		vala_src_prepare
-	fi
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #569992
-	addpredict /dev
-	gnome2_src_configure \
-		$(use_enable nls) \
-		$(use_enable totem totem-plugin) \
-		$(usex totem '--with-totem-plugin-dir=/usr/$(get_libdir)/totem/plugins' '')
-}
-
-pkg_postinst() {
-	if use totem ; then
-		python_optimize
-	fi
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	if use totem ; then
-		python_optimize
-	fi
-	gnome2_pkg_postrm
-}
diff --git a/gnome-extra/gnome-dvb-daemon/metadata.xml b/gnome-extra/gnome-dvb-daemon/metadata.xml
deleted file mode 100644
index 001aba64a9ee..000000000000
--- a/gnome-extra/gnome-dvb-daemon/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">
-	GNOME DVB Daemon is a daemon written in Vala based on GStreamer to setup your 
-	DVB devices, record and watch TV shows and browse EPG.	It can be controlled 
-	by any application via its D-Bus interface.
-</longdescription>
-<use>
-	<flag name="totem">Build a plugin for <pkg>media-video/totem</pkg></flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-getting-started-docs-3.24.1 b/gnome-extra/gnome-getting-started-docs-3.24.1
new file mode 100644
index 000000000000..f89cf758eebe
--- /dev/null
+++ b/gnome-extra/gnome-getting-started-docs-3.24.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-text/yelp-tools >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help a new user get started in GNOME
+EAPI=6
+HOMEPAGE=https://help.gnome.org/
+KEYWORDS=amd64 ~arm x86
+LICENSE=CC-BY-SA-3.0
+RDEPEND=gnome-extra/gnome-user-docs
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ca482646e1c7ab1ca299cf5c76fdb6a9
diff --git a/gnome-extra/gnome-getting-started-docs/Manifest b/gnome-extra/gnome-getting-started-docs/Manifest
deleted file mode 100644
index f729bad898d3..000000000000
--- a/gnome-extra/gnome-getting-started-docs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-getting-started-docs-3.24.1.tar.xz 119137908 BLAKE2B 628dab2c9a938f3b265855443e794c1575586d0579692e1a21bae77dd497989cd061cff4dd97090f11719916f24742eedfc81bacb4fdf31536eca78cdd221d6f SHA512 7d44ac4030c3459014f391d10699b48f9be789c196900e29a56574e98698ffe494d3344a7c99f04291c49093827385093877b9047549cc5ff4d352d39297387d
-EBUILD gnome-getting-started-docs-3.24.1.ebuild 424 BLAKE2B 64093399bab07a9e68c313ab3084eb774543e336106b9f46517fcd27ec476c5cae4cc36091a1234c386374953ef0cce20c046a4db7942112b850cacdb84aab26 SHA512 adfea1597f4471168fed28f8de0f9002c83b95c47f5cfc254044252deac204bff92e29ef4514c66d35e6c043935afe0f9e3c249df8388a3bc501e2bda1fe45ff
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
deleted file mode 100644
index 6e1a40b324b1..000000000000
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.24.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Help a new user get started in GNOME"
-HOMEPAGE="https://help.gnome.org/"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="gnome-extra/gnome-user-docs"
-DEPEND="app-text/yelp-tools"
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
diff --git a/gnome-extra/gnome-getting-started-docs/metadata.xml b/gnome-extra/gnome-getting-started-docs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-getting-started-docs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-integration-spotify-20140907-r1 b/gnome-extra/gnome-integration-spotify-20140907-r1
new file mode 100644
index 000000000000..92ac08854131
--- /dev/null
+++ b/gnome-extra/gnome-integration-spotify-20140907-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst preinst prerm
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
+DESCRIPTION=GNOME integration for Spotify
+EAPI=6
+HOMEPAGE=https://github.com/mrpdaemon/gnome-integration-spotify
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/imagemagick x11-misc/wmctrl x11-misc/xautomation x11-misc/xdotool x11-apps/xwininfo
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/mrpdaemon/gnome-integration-spotify/archive/20140907.tar.gz -> gnome-integration-spotify-20140907.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=727207dbac141501ed08dab4401011d9
diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest
deleted file mode 100644
index 59ccedf3760f..000000000000
--- a/gnome-extra/gnome-integration-spotify/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874
-EBUILD gnome-integration-spotify-20140907-r1.ebuild 1088 BLAKE2B eee6fc450013734e5afd2ccde4d31d2f2aff6d9337c1b7d078dc5792ff8681ac1851d21314ce79f1e98b418225822f34695532bae9928f19bcd883d80bf9e6ab SHA512 d5426537c55a588054638d30403e6a705da7ed399f78e55c3c00f9ce134c58e33daf438b9a4d95f6b90e24c5a777ebe8736c1d20fb41eb08db68990215d644da
-MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
deleted file mode 100644
index 6b304d8fd213..000000000000
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2-utils python-r1
-
-DESCRIPTION="GNOME integration for Spotify"
-HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify"
-#SRC_URI="https://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz"
-SRC_URI="https://github.com/mrpdaemon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/mrpdaemon-${PN}-df9124d"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	media-gfx/imagemagick
-	x11-misc/wmctrl
-	x11-misc/xautomation
-	x11-misc/xdotool
-	x11-apps/xwininfo"
-
-src_install() {
-	dobin spotify-dbus.py
-	python_replicate_script "${ED}"/usr/bin/spotify-dbus.py
-	mkdir -p "${D}/etc/gconf/schemas"
-	cp spotify.schemas "${D}/etc/gconf/schemas"
-}
-
-pkg_preinst() {
-	gnome2_gconf_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-}
-
-pkg_prerm() {
-	gnome2_gconf_uninstall
-}
diff --git a/gnome-extra/gnome-integration-spotify/metadata.xml b/gnome-extra/gnome-integration-spotify/metadata.xml
deleted file mode 100644
index 890dee3a0870..000000000000
--- a/gnome-extra/gnome-integration-spotify/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mrpdaemon/gnome-integration-spotify</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-logs-3.24.2 b/gnome-extra/gnome-logs-3.24.2
new file mode 100644
index 000000000000..cf597d5aeb05
--- /dev/null
+++ b/gnome-extra/gnome-logs-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3 ~app-text/docbook-xml-dtd-4.3 app-text/yelp-tools dev-libs/appstream-glib dev-libs/libxslt >=dev-util/intltool-0.50 gnome-base/gnome-common virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Log messages and event viewer
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Logs
+IUSE=test test
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-libs/glib-2.43.90:2 gnome-base/gsettings-desktop-schemas sys-apps/systemd:= >=x11-libs/gtk+-3.19.3:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b93a4b78b2ecb49a889020b8e7669215
diff --git a/gnome-extra/gnome-logs/Manifest b/gnome-extra/gnome-logs/Manifest
deleted file mode 100644
index 98520620014f..000000000000
--- a/gnome-extra/gnome-logs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-logs-3.24.2.tar.xz 1000552 BLAKE2B da237fbce0b1ced77c52ffab1965f6e1209df8fa1f224274b3dddd30bea106fed6449e37e0ad654b579ce1128fb6b554ffd521faa5362db9ef8f8f2a54a1685f SHA512 6f7dabb0b0093b860198344373eb1feae244ed23c3a65494499c09a83c687ba68ff023ec5ce34846be51fd74293fdb4b575cf3a748a22fae183e89086eba1db9
-EBUILD gnome-logs-3.24.2.ebuild 995 BLAKE2B a84cd13c043754c4ef9e377ee4033cd8a018d9d5b46c6dbc1d2c97029d685c47ad00394fb129e710effe65030a765d9cb4d99088d54648a71493a6ccb937ffab SHA512 634cd794549eea11f7cf675f2e8404af952cc51f756fa8ea439776e8ab0f2b0fef4ec9045cde019fa9f78a88706df1ca79b31a30836f2476170924af8d98b47e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
deleted file mode 100644
index b5ed60f132c6..000000000000
--- a/gnome-extra/gnome-logs/gnome-logs-3.24.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Log messages and event viewer"
-HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/glib-2.43.90:2
-	gnome-base/gsettings-desktop-schemas
-	sys-apps/systemd:=
-	>=x11-libs/gtk+-3.19.3:3
-"
-DEPEND="${RDEPEND}
-	~app-text/docbook-xml-dtd-4.3
-	app-text/yelp-tools
-	dev-libs/appstream-glib
-	dev-libs/libxslt
-	>=dev-util/intltool-0.50
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-man \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-logs/metadata.xml b/gnome-extra/gnome-logs/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/gnome-logs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-packagekit-3.22.1 b/gnome-extra/gnome-packagekit-3.22.1
new file mode 100644
index 000000000000..47849d7e56da
--- /dev/null
+++ b/gnome-extra/gnome-packagekit-3.22.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 dev-libs/libxslt sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=PackageKit client for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
+IUSE=systemd udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0c5a5847523a4b66e5d445045b627da8
diff --git a/gnome-extra/gnome-packagekit-3.24.0 b/gnome-extra/gnome-packagekit-3.24.0
new file mode 100644
index 000000000000..3093351c379f
--- /dev/null
+++ b/gnome-extra/gnome-packagekit-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= ) app-text/docbook-sgml-utils dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.9 dev-libs/libxslt >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=PackageKit client for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/software/PackageKit/
+IUSE=systemd udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.15.3:3 >=x11-libs/libnotify-0.7.0:= x11-libs/pango >=app-admin/packagekit-base-0.9.1 >=media-libs/libcanberra-0.10[gtk3] >=sys-apps/dbus-1.1.2 media-libs/fontconfig x11-libs/libX11 systemd? ( >=sys-apps/systemd-42 ) !systemd? ( sys-auth/consolekit ) udev? ( virtual/libgudev:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3d8c774840859c0b71b22c3cf3365317
diff --git a/gnome-extra/gnome-packagekit/Manifest b/gnome-extra/gnome-packagekit/Manifest
deleted file mode 100644
index 09d38e1c5eb7..000000000000
--- a/gnome-extra/gnome-packagekit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnome-packagekit-3.22.1.tar.xz 1684420 BLAKE2B 30ce96fdec5fb1211d06fcc751ed0ac01e386364af6025051766b25ee6eadb4a926c3ff5ed74d27c67fc5774497fac20cde0248a6bd9ee24a77ae9cad7e0080d SHA512 f8f5046f53c095f199cf75452a5f0c2cc62a54cd5337b696a3885358573b44d94bcf44b168a4ea8cbd00b746d0274437a5fc9cb10f0a55e9eb9f2dbd2a8e4f18
-DIST gnome-packagekit-3.24.0.tar.xz 2174372 BLAKE2B fd6b94c1e2bd9e29c73754e3c1625d6acd4e1931a80c61c572d6f1a90a3c1814cafea1358e64f8cb1be0308d00146716a3a5058a732702b14c3d6a9a0cc98d4a SHA512 af3291b11ad279d050fcd970e1c98257b65da5f36146d8e5f1f255ef1b17e6f2caf8073ce16623da130edaf452860788aa20dd2de6a4bbf639aaf9d3bbd7c095
-EBUILD gnome-packagekit-3.22.1.ebuild 2277 BLAKE2B 14854b16c43bc1ebdc62fc58bcc7fa8add0ad63e975d874ce8e438ec264fc8384b298fd8fac17b399903fca14e6fa09e06136453cb75777e051bd1843496260b SHA512 850a7e248b6b93aa1714003fd2e7a9614b5982ed227331dd6ca4a74ad0e4d069393b7852b09baa5731c6754c67c6f6d106e7b7a1b2a2716fcc947c819a588609
-EBUILD gnome-packagekit-3.24.0.ebuild 2241 BLAKE2B 24984de13082b7b6adb336bab3400b297baabe1256d15a213b30c6147f8bbd84d4ef5b53038b4edb2d8a2decc9da7b3adeb6a0e715f8bbc030e0022aa3de7634 SHA512 5a701a9aec0294d81c126fb157f1bc89fd1dab84e94e33c1a9391669a8fdd02b6d05961a2bb03ce0b3fba907832353e31452cbf2ecbf4053031890545871ec83
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
deleted file mode 100644
index 0fc509b13a24..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd udev" # test
-
-# XXX: test, upstream managed to break gpk-self-test beyond repair
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.15.3:3
-	>=x11-libs/libnotify-0.7.0:=
-	x11-libs/pango
-
-	>=app-admin/packagekit-base-0.9.1
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	systemd? ( >=sys-apps/systemd-42 )
-	!systemd? ( sys-auth/consolekit )
-	udev? ( virtual/libgudev:= )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	dev-libs/libxslt
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_prepare() {
-	# * disable tests with graphical dialogs and that require packagekitd
-	#   to be run with the dummy backend and installed .ui files
-	# * disable tests that fails every time packagekit developers make a
-	#   tiny change to headers
-	# * gpk_test_markdown_func: no definition for that one
-	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
-		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_error_func/d' \
-		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
-		-e '/g_test_add_func.*gpk_test_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_markdown_func/d' \
-		-i src/gpk-self-test.c || die
-
-	# XXX: g_autoptr requires explicit type support
-	sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
-		-i src/gpk-self-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--enable-iso-c \
-		--disable-tests \
-		$(use_enable systemd) \
-		$(use_enable udev gudev)
-		# $(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
deleted file mode 100644
index 3b3299265a41..000000000000
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.24.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="PackageKit client for the GNOME desktop"
-HOMEPAGE="https://www.freedesktop.org/software/PackageKit/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="systemd udev" # test
-
-# XXX: test, upstream managed to break gpk-self-test beyond repair
-# gdk-pixbuf used in gpk-animated-icon
-# pango used on gpk-common
-RDEPEND="
-	>=dev-libs/glib-2.32:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.15.3:3
-	>=x11-libs/libnotify-0.7.0:=
-	x11-libs/pango
-
-	>=app-admin/packagekit-base-0.9.1
-	>=media-libs/libcanberra-0.10[gtk3]
-	>=sys-apps/dbus-1.1.2
-
-	media-libs/fontconfig
-	x11-libs/libX11
-
-	systemd? ( >=sys-apps/systemd-42 )
-	!systemd? ( sys-auth/consolekit )
-	udev? ( virtual/libgudev:= )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=dev-util/gtk-doc-am-1.9
-	dev-libs/libxslt
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-# NOTES:
-# app-text/docbook-sgml-utils required for man pages
-
-# UPSTREAM:
-# see if tests can forget about display (use eclass for that ?)
-
-src_prepare() {
-	# * disable tests with graphical dialogs and that require packagekitd
-	#   to be run with the dummy backend and installed .ui files
-	# * disable tests that fails every time packagekit developers make a
-	#   tiny change to headers
-	# * gpk_test_markdown_func: no definition for that one
-	sed -e '/g_test_add_func.*gpk_test_enum_func/d' \
-		-e '/g_test_add_func.*gpk_test_dbus_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_error_func/d' \
-		-e '/g_test_add_func.*gpk_test_modal_dialog/d' \
-		-e '/g_test_add_func.*gpk_test_task_func/d' \
-		-e '/g_test_add_func.*gpk_test_markdown_func/d' \
-		-i src/gpk-self-test.c || die
-
-	# XXX: g_autoptr requires explicit type support
-	sed -e 's/g_autoptr(GpkTask)/GpkTask */' \
-		-i src/gpk-self-test.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--localstatedir=/var \
-		--disable-tests \
-		$(use_enable systemd) \
-		$(use_enable udev gudev)
-		# $(use_enable test tests)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
-}
diff --git a/gnome-extra/gnome-packagekit/metadata.xml b/gnome-extra/gnome-packagekit/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-packagekit/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-power-manager-3.24.0 b/gnome-extra/gnome-power-manager-3.24.0
new file mode 100644
index 000000000000..c58346b261a7
--- /dev/null
+++ b/gnome-extra/gnome-power-manager-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= app-text/docbook-sgml-dtd:4.1 app-text/docbook-sgml-utils dev-libs/appstream-glib >=sys-devel/gettext-0.19.7 x11-base/xorg-proto virtual/pkgconfig test? ( sys-apps/dbus ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME power management service
+EAPI=6
+HOMEPAGE=https://projects.gnome.org/gnome-power-manager/
+IUSE=test test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.45.8:2 >=x11-libs/gtk+-3.3.8:3 >=x11-libs/cairo-1 >=sys-power/upower-0.99:= x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-power-manager/3.24/gnome-power-manager-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=be1dc1e3f882b406b0bddf543a4569b3
diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest
deleted file mode 100644
index 1fb25f58426a..000000000000
--- a/gnome-extra/gnome-power-manager/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-power-manager-3.24.0.tar.xz 554616 BLAKE2B f39ce93943426fe8e833b48b5e7e4a02645eb3ffd28aa9e3e8c515d159950409ae9904b2683419d0087b3ced8e30f1c42b4dd9c511100041952449aef0b18e0f SHA512 fbbac0f5176382ccd13497cd80792d10ca4bc39fa4cc0585543f5458ba0f256ffb66b7ebd82667e482ba33cf2b6f3ef6a64bf2f55ac224e1d9ab2e2b7491e4e0
-EBUILD gnome-power-manager-3.24.0.ebuild 1307 BLAKE2B e095a196b85063bbb4d24370c2f682c87527c29c1e768cfd214de4afbc608bc0494e95cd381da5e25ca2e361f09a6c488a3372f2a390954a2c4802f35b123df2 SHA512 e41221b0c3fbe36bc4944fd3f159d378d399cb073ddc29250186ab6922e5d9d1d70d6282f61893d6352bb4a51ca339cea2e443f4743687b46e68becdcdcd3a7f
-MISC metadata.xml 421 BLAKE2B db2e0d7210e04256add24c9bfa054291ffcd6cf8b52107c184b61b27859589ed17bc3ef2037cf3eaf1fe7a8ceb3ac381c67f6c3557f0d960ff0f1aaf67e9bb99 SHA512 3734560a015221b467a58c968ebd60272e14fc37bd93d07dfecc15e68dd403ed82e1724d62ba88ce3ee07b5c0e179adc1fc67d68d2c119458901e609a740b43a
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
deleted file mode 100644
index 5e67d409645f..000000000000
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.24.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 virtualx
-
-DESCRIPTION="GNOME power management service"
-HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.45.8:2
-	>=x11-libs/gtk+-3.3.8:3
-	>=x11-libs/cairo-1
-	>=sys-power/upower-0.99:=
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-sgml-dtd:4.1
-	app-text/docbook-sgml-utils
-	dev-libs/appstream-glib
-	>=sys-devel/gettext-0.19.7
-	x11-base/xorg-proto
-	virtual/pkgconfig
-	test? ( sys-apps/dbus )
-"
-
-# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages
-# (files under ${S}/man).
-# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs.
-
-src_prepare() {
-	# Drop debugger CFLAGS from configure
-	# Touch configure.ac only if running eautoreconf, otherwise
-	# maintainer mode gets triggered -- even if the order is correct
-	sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \
-		-i configure || die "debugger sed failed"
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable test tests)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml
deleted file mode 100644
index 8b88d4204ab7..000000000000
--- a/gnome-extra/gnome-power-manager/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
-		Power Manager daemon for the GNOME desktop environment that makes it
-		easy to manage your laptop or desktop system.
-	</longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-search-tool-3.6.0 b/gnome-extra/gnome-search-tool-3.6.0
new file mode 100644
index 000000000000..f5dac6b9b86c
--- /dev/null
+++ b/gnome-extra/gnome-search-tool-3.6.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Search tool for GNOME 3
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2 FDL-1.1
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.30:2 sys-apps/grep x11-libs/gdk-pixbuf >=x11-libs/gtk+-3:3[X] x11-libs/libICE x11-libs/libSM sys-apps/findutils || ( sys-apps/mlocate sys-freebsd/freebsd-ubin ) !<gnome-extra/gnome-utils-3.4
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-search-tool/3.6/gnome-search-tool-3.6.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0ca1910c7da134ad3c77b46debfa89af
diff --git a/gnome-extra/gnome-search-tool/Manifest b/gnome-extra/gnome-search-tool/Manifest
deleted file mode 100644
index 65b3fad00f4d..000000000000
--- a/gnome-extra/gnome-search-tool/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-search-tool-3.6.0.tar.xz 685172 BLAKE2B dab076a7f03d8d2cf7ebc884f65b737d627e27c67665b44147113aa898667aa84dda4fd5bb1196264e2cc3221c3bb166fc01bad36c5363f0400744d779330387 SHA512 55126e1d49b32015e5bc6db70a7094b3ea72ed447d66f530f72fa057af982faa1dbeae5f179cc3c0ed71fea58f756f47c40809e9d11c68239fa2232352e579a5
-EBUILD gnome-search-tool-3.6.0.ebuild 911 BLAKE2B 9c829e2f7c35843415180f48e975e6cef286a7ee9472987131868d31c8b1bc9fcf92a99b18536014f71bd03b9adc50c802d0f6cf0c41d95487b147f0d3eadd8d SHA512 c1dcebb9826df3165a6f486728822180d1fa851fb29aeda4a47521a44105b4c99cd689ed3e08662e1dad2f2cf0c76b5b3624c6cf326a4175050574d200aeba5f
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
deleted file mode 100644
index 1ffca1a609d9..000000000000
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Search tool for GNOME 3"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.30:2
-	sys-apps/grep
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libICE
-	x11-libs/libSM
-"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/findutils
-	|| ( sys-apps/mlocate sys-freebsd/freebsd-ubin )
-	!<gnome-extra/gnome-utils-3.4
-"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_configure() {
-	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
-	gnome2_src_configure
-}
diff --git a/gnome-extra/gnome-search-tool/metadata.xml b/gnome-extra/gnome-search-tool/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-search-tool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions-3.24.3 b/gnome-extra/gnome-shell-extensions-3.24.3
new file mode 100644
index 000000000000..a3ed95cac4de
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-3.24.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=sys-devel/gettext-0.19.6 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=JavaScript extensions for GNOME Shell
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell/Extensions
+IUSE=examples
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.26:2 >=gnome-base/libgtop-2.28.3[introspection] >=app-eselect/eselect-gnome-shell-extensions-20111211 >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= dev-libs/atk[introspection] gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.14.2 media-libs/clutter:1.0[introspection] net-libs/telepathy-glib[introspection] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] x11-themes/adwaita-icon-theme x11-wm/mutter[introspection]
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d3c4858f5da64a73aa5a99ebbe50017
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus-21 b/gnome-extra/gnome-shell-extensions-topicons-plus-21
new file mode 100644
index 000000000000..c615feb4a5db
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus-21
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Moves legacy tray icons to top panel
+EAPI=6
+HOMEPAGE=https://extensions.gnome.org/extension/1031/topicons/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.16
+SLOT=0
+SRC_URI=https://github.com/phocean/TopIcons-plus/archive/v21.tar.gz -> gnome-shell-extensions-topicons-plus-21.tar.gz
+_eclasses_=vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=b6e9cca81ec5de0e51e3cb4c786fd3d9
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest b/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
deleted file mode 100644
index 3e4f267208f7..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-shell-extensions-topicons-plus-21.tar.gz 2756641 BLAKE2B 39414711365a9c68fa2b0172859e9969a7f71eae5e7498abee9ff05e4c215df09419cdad99192c60892b1bd6e8b27724c81c5d3da9a3d8ca3072d984824cb950 SHA512 f85db46f20c24f0b11ce2c79c0548b88262faf059d674073e328917dc8497de0e07ccd6f3613f45aa9e49109468d78293f3a8f0f4fea5a24a7c5254666cda5df
-EBUILD gnome-shell-extensions-topicons-plus-21.ebuild 1327 BLAKE2B b8d030527a7364996f2258e5543344930ec64e2d4ff62d826f6e983c718521556f04789d9db36e121868e7227f983a473b9c53d700231470a71d9322c48b30ff SHA512 f18583531b6721b92fed2ac2b81c3ca3137331464196a05c4fad7ff02c21f33dbade7ecc657a1ed7274c5b231253f549f80b16013b8ece623773b06a3b14409e
-MISC metadata.xml 339 BLAKE2B 0fff96ce59c258cfb52c0616844df2bad11bf14fa283831d608ab862d2ac4fc26af0c4445d906d174290f0abee98149f12b24c85de79adfe2b959c17f14c3b42 SHA512 6bd54fe410561f215eba59872c742b9a11016cede62ddaf0aa8f899bf2c2abffde29cb63c9b819486a750be66b3dadd72257f6e26dcd87798aece31e0a752b40
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
deleted file mode 100644
index 852ec51263a1..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-21.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit vcs-snapshot
-
-DESCRIPTION="Moves legacy tray icons to top panel"
-HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
-SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# glib for glib-compile-schemas at build time, needed at runtime anyways
-COMMON_DEPEND="
-	dev-libs/glib:2
-"
-RDEPEND="${COMMON_DEPEND}
-	app-eselect/eselect-gnome-shell-extensions
-	>=gnome-base/gnome-shell-3.16
-"
-DEPEND="${COMMON_DEPEND}"
-
-#src_compile() {
-	# It redoes this with "make install" later due to a dumb Makefile, so don't bother
-	#make build
-#}
-
-src_install() {
-	# TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
-	make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
-	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
-	# Assuming it needs only compiled gettext catalogs at runtime
-	rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
-	dodoc README.md
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml b/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
deleted file mode 100644
index 725b4746cbef..000000000000
--- a/gnome-extra/gnome-shell-extensions-topicons-plus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">phocean/TopIcons-plus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-extensions/Manifest b/gnome-extra/gnome-shell-extensions/Manifest
deleted file mode 100644
index ca6b5f2340b1..000000000000
--- a/gnome-extra/gnome-shell-extensions/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-shell-extensions-3.24.3.tar.xz 346420 BLAKE2B 3b6f6686656ca6f395bd69fea905c4f28264db81ac0f207bc2e0d6c82410328be2bc4c98faa659d9ac551cabb73e0576c4e28def9c14e5c7710a9785528909db SHA512 7948a9cb6f5cb8d760bc42ea2865823ee60bd164b491d944edb0413e362f38ed90d39ead44ac57872a83c43c4050f5448936e739626b89a2b486a22f41d61e20
-EBUILD gnome-shell-extensions-3.24.3.ebuild 2052 BLAKE2B a1be0802d71c34de0baf77b088badb0ef0f492c30ce738e85fcc52f921f2156f11715dfa2f3a7309cb1e3fe804ef80bd3d3c37a95b8dc49aecb7ea801fcceec7 SHA512 2aa74c3f079d1fe228e12fed8f984f80be3f0bdbc904499555e80d2a0931bc9003f652ba5aacb49563eef5bc86495c6f8552c2b1136fe0179b078a1004e45cba
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
deleted file mode 100644
index b083460498d0..000000000000
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.24.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2 readme.gentoo-r1
-
-DESCRIPTION="JavaScript extensions for GNOME Shell"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="examples"
-KEYWORDS="amd64 x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.26:2
-	>=gnome-base/libgtop-2.28.3[introspection]
-	>=app-eselect/eselect-gnome-shell-extensions-20111211
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	dev-libs/atk[introspection]
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.14.2
-	media-libs/clutter:1.0[introspection]
-	net-libs/telepathy-glib[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/pango[introspection]
-	x11-themes/adwaita-icon-theme
-	x11-wm/mutter[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-"
-# eautoreconf needs gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="Installed extensions installed are initially disabled by default.
-To change the system default and enable some extensions, you can use
-# eselect gnome-shell-extensions
-
-Alternatively, to enable/disable extensions on a per-user basis,
-you can use the https://extensions.gnome.org/ web interface, the
-gnome-extra/gnome-tweak-tool GUI, or modify the org.gnome.shell
-enabled-extensions gsettings key from the command line or a script."
-
-src_configure() {
-	gnome2_src_configure --enable-extensions=all
-}
-
-src_install() {
-	gnome2_src_install
-
-	local example="example@gnome-shell-extensions.gcampax.github.com"
-	if use examples; then
-		mv "${ED}usr/share/gnome-shell/extensions/${example}" \
-			"${ED}usr/share/doc/${PF}/" || die
-	else
-		rm -r "${ED}usr/share/gnome-shell/extensions/${example}" || die
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/gnome-shell-extensions/metadata.xml b/gnome-extra/gnome-shell-extensions/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-shell-extensions/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-shell-frippery-3.24.0 b/gnome-extra/gnome-shell-frippery-3.24.0
new file mode 100644
index 000000000000..c6da972d8973
--- /dev/null
+++ b/gnome-extra/gnome-shell-frippery-3.24.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=Unofficial extension pack providing GNOME 2-like features for GNOME 3
+EAPI=6
+HOMEPAGE=http://frippery.org/extensions/index.html
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+
+RDEPEND=app-eselect/eselect-gnome-shell-extensions >=dev-libs/gjs-1.29 dev-libs/gobject-introspection:= gnome-base/gnome-menus:3[introspection] >=gnome-base/gnome-shell-3.20 media-libs/clutter:1.0[introspection] x11-libs/pango[introspection]
+SLOT=0
+SRC_URI=http://frippery.org/extensions/gnome-shell-frippery-3.24.0.tgz
+_md5_=4a3bc6af78986fb17898f6f0e669a8d5
diff --git a/gnome-extra/gnome-shell-frippery/Manifest b/gnome-extra/gnome-shell-frippery/Manifest
deleted file mode 100644
index 404334d21b8e..000000000000
--- a/gnome-extra/gnome-shell-frippery/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-shell-frippery-3.24.0.tgz 79322 BLAKE2B d5e6db3d165708836e0cec4c1c2f6ffd3227876a566759ac9db9c7ce1d71841002a991df0bd2bf2279e79dfb9a87af1e8b10abe850f972ff2c9f49397106b8b5 SHA512 7f12f3be7ec4d55cf9f96c81c5af649cbb410fe79e880b3b5469e1554ae8419e40d5a77ab9d3889758a2729dd31e59b08e507803b84886305b75fe27df5eebd5
-EBUILD gnome-shell-frippery-3.24.0.ebuild 914 BLAKE2B 116a6673c879e0a10db2af34f5e3c13c386f92bb73abd51a86ae884436a27af5b02c80fe9816c5f9e6fce89b2a95c550163c288f0fdbd5284af6871bb192a041 SHA512 b87203ae36ddd9a66427ecc57f57ccc4973f0e7ae97b008625f3456688b2005afbdbcf97ecd0d0a6b742f7851acbcc6132dc42fd0ab625b44ce8ff06258181b7
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
deleted file mode 100644
index 982b541a3d90..000000000000
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unofficial extension pack providing GNOME 2-like features for GNOME 3"
-HOMEPAGE="http://frippery.org/extensions/index.html"
-SRC_URI="http://frippery.org/extensions/${P}.tgz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	app-eselect/eselect-gnome-shell-extensions
-	>=dev-libs/gjs-1.29
-	dev-libs/gobject-introspection:=
-	gnome-base/gnome-menus:3[introspection]
-	>=gnome-base/gnome-shell-3.20
-	media-libs/clutter:1.0[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND=""
-
-S="${WORKDIR}/.local/share/gnome-shell"
-
-src_install() {
-	insinto /usr/share/gnome-shell/extensions
-	doins -r extensions/*@*
-	dodoc gnome-shell-frippery/{CHANGELOG,README}
-}
-
-pkg_postinst() {
-	ebegin "Updating list of installed extensions"
-	eselect gnome-shell-extensions update
-	eend $?
-}
diff --git a/gnome-extra/gnome-shell-frippery/metadata.xml b/gnome-extra/gnome-shell-frippery/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-shell-frippery/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-software-3.22.7 b/gnome-extra/gnome-software-3.22.7
new file mode 100644
index 000000000000..56d7150fdf72
--- /dev/null
+++ b/gnome-extra/gnome-software-3.22.7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-admin/packagekit-base-1.1.0 app-crypt/libsecret dev-db/sqlite:3 >=dev-libs/appstream-glib-0.6.7:0 >=dev-libs/glib-2.46:2 >=dev-libs/json-glib-1.1.1 >=gnome-base/gsettings-desktop-schemas-3.11.5 >=net-libs/libsoup-2.51.92:2.4 sys-auth/polkit >=x11-libs/gdk-pixbuf-2.31.5 >=x11-libs/gtk+-3.20:3 gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= ) spell? ( app-text/gtkspell:3 ) udev? ( virtual/libgudev ) app-text/docbook-xml-dtd:4.2 dev-libs/libxslt >=dev-util/intltool-0.35 virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Gnome install & update software
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Software
+IUSE=gnome spell test udev test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-admin/packagekit-base-1.1.0 app-crypt/libsecret dev-db/sqlite:3 >=dev-libs/appstream-glib-0.6.7:0 >=dev-libs/glib-2.46:2 >=dev-libs/json-glib-1.1.1 >=gnome-base/gsettings-desktop-schemas-3.11.5 >=net-libs/libsoup-2.51.92:2.4 sys-auth/polkit >=x11-libs/gdk-pixbuf-2.31.5 >=x11-libs/gtk+-3.20:3 gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= ) spell? ( app-text/gtkspell:3 ) udev? ( virtual/libgudev )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.7.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=657923b56ff318529a27d565daf16dc7
diff --git a/gnome-extra/gnome-software/Manifest b/gnome-extra/gnome-software/Manifest
deleted file mode 100644
index 97a0df4093d6..000000000000
--- a/gnome-extra/gnome-software/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-software-3.22.7.tar.xz 3865764 BLAKE2B c23e3b9e34a9b233a584a920fcd5969b3ebb5fa4227da147870e71c1531da6c3efda913149a903667ae1725c505c1c842aac0a76b439a2730bf6c837f39757fc SHA512 184714710695d8c48451c1ee7885524dfa30cc6091975bdd317bdd6ce130e7815ab7474074ed191913594bcd5142932bd7918ae19a695170a34a5f934e1b9825
-EBUILD gnome-software-3.22.7.ebuild 1905 BLAKE2B 37a604c6a5f8d29c2cfc3f8e8a0ab83d10e97a8232dcbe8bc62068998cc251686f53122e27c04db4d309f51b466431dc8e29723b5c197c9b3da76f3c0238ca58 SHA512 39cd8f54b680ade58142114ba78bc56ee18655a24659c4cdb3f1e3f2c9df155bcad34bf1b6a333a29ac697b50ef067eb17f6296b91dd0483985e6a884e16718e
-MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild b/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild
deleted file mode 100644
index f43cb6123697..000000000000
--- a/gnome-extra/gnome-software/gnome-software-3.22.7.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="Gnome install & update software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Software"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnome spell test udev"
-
-RDEPEND="
-	>=app-admin/packagekit-base-1.1.0
-	app-crypt/libsecret
-	dev-db/sqlite:3
-	>=dev-libs/appstream-glib-0.6.7:0
-	>=dev-libs/glib-2.46:2
-	>=dev-libs/json-glib-1.1.1
-	>=gnome-base/gsettings-desktop-schemas-3.11.5
-	>=net-libs/libsoup-2.51.92:2.4
-	sys-auth/polkit
-	>=x11-libs/gdk-pixbuf-2.31.5
-	>=x11-libs/gtk+-3.20:3
-	gnome? ( >=gnome-base/gnome-desktop-3.17.92:3= )
-	spell? ( app-text/gtkspell:3 )
-	udev? ( virtual/libgudev )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-# test? ( dev-util/valgrind )
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# valgrind fails with SIGTRAP
-	sed -e 's/TESTS = .*/TESTS =/' \
-		-i "${S}"/src/Makefile.{am,in} || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# FIXME: investigate limba and firmware update support
-	gnome2_src_configure \
-		--enable-man \
-		--enable-packagekit \
-		--enable-polkit \
-		--disable-firmware \
-		--disable-limba \
-		--disable-ostree \
-		--disable-rpm \
-		--disable-steam \
-		--disable-flatpak \
-		--enable-webapps \
-		--disable-snap \
-		$(use_enable spell gtkspell) \
-		$(use_enable test dogtail) \
-		$(use_enable test tests) \
-		$(use_enable gnome gnome-desktop) \
-		$(use_enable gnome shell-extensions) \
-		$(use_enable udev gudev)
-}
-
-src_test() {
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
diff --git a/gnome-extra/gnome-software/metadata.xml b/gnome-extra/gnome-software/metadata.xml
deleted file mode 100644
index 4cbddcaa19ad..000000000000
--- a/gnome-extra/gnome-software/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-system-monitor-3.24.0 b/gnome-extra/gnome-system-monitor-3.24.0
new file mode 100644
index 000000000000..83c57231b40c
--- /dev/null
+++ b/gnome-extra/gnome-system-monitor-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 ) app-text/yelp-tools >=dev-util/intltool-0.41.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Gnome System Monitor
+EAPI=6
+HOMEPAGE=https://help.gnome.org/users/gnome-system-monitor/
+IUSE=systemd X
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.37.3:2 >=gnome-base/libgtop-2.28.2:2= >=x11-libs/gtk+-3.22:3[X(+)] >=dev-cpp/gtkmm-3.3.18:3.0 >=dev-cpp/glibmm-2.46:2 >=dev-libs/libxml2-2.0:2 >=gnome-base/librsvg-2.35:2 systemd? ( >=sys-apps/systemd-44:0= ) X? ( >=x11-libs/libwnck-2.91.0:3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac96f6cfccec1b3c36cd27181b27716f
diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest
deleted file mode 100644
index 0a0dc8c611e4..000000000000
--- a/gnome-extra/gnome-system-monitor/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-system-monitor-3.24.0.tar.xz 930956 BLAKE2B f08b6da2ee9d45d232f1d1f019b6844f6fcf50baf85944d240611fbc0794cce6755d6b7daf275f4d97686558fc0f2525a8700fda473b576f8d5d41f66f118275 SHA512 4155d9f130cc1e38d32b76d10ca91056d82b90ca555f9ded26acfd1ef018b92163b0cc2256861b8e166b3bfa7eadc6c900aa9c79fd0c859045197ab2eaf3dc9f
-EBUILD gnome-system-monitor-3.24.0.ebuild 974 BLAKE2B 2ff42e344500a9c746eb1d89dc9b8c9c742625d09d967806847f01001ce44a412c364a86be6b0c9106c83d7908ada98414c40de98ba177bba3a4cf9a696d93ae SHA512 faa193df18b0b1317500364a2d371c7bcbc56dc7d25bf3e82581f73f63a3cc0f68e1e9944949dc481c145132ee5df31a202ee2ac25676f021c09a702eeb403bb
-MISC metadata.xml 378 BLAKE2B 2087d7820bf1a1544e22fa7451cd241ce73b899e2e48886f0feb234bf72c97710ec9bdee27fbeefa96ca43a0c36fcf87eec2161805a46cf7d7047f3d9472a286 SHA512 62f13c436d761ad3e4dcad32486a4f163b88e19644e4d1299813c22b0158cbf23e1d8d41ec20aa800c7cf638e89e721e6296b93446144e7b067f26b66bcfda88
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
deleted file mode 100644
index a091aeed701c..000000000000
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.24.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The Gnome System Monitor"
-HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	>=dev-libs/glib-2.37.3:2
-	>=gnome-base/libgtop-2.28.2:2=
-	>=x11-libs/gtk+-3.22:3[X(+)]
-	>=dev-cpp/gtkmm-3.3.18:3.0
-	>=dev-cpp/glibmm-2.46:2
-	>=dev-libs/libxml2-2.0:2
-	>=gnome-base/librsvg-2.35:2
-	systemd? ( >=sys-apps/systemd-44:0= )
-	X? ( >=x11-libs/libwnck-2.91.0:3 )
-"
-# eautoreconf requires gnome-base/gnome-common
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.41.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# XXX: appdata is deprecated by appstream-glib, upstream must upgrade
-	gnome2_src_configure \
-		$(use_enable systemd) \
-		$(use_enable X broken-wnck) \
-		APPDATA_VALIDATE="$(type -P true)"
-}
diff --git a/gnome-extra/gnome-system-monitor/metadata.xml b/gnome-extra/gnome-system-monitor/metadata.xml
deleted file mode 100644
index f4a330c0bbf8..000000000000
--- a/gnome-extra/gnome-system-monitor/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
-		unit names, for running processes</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-tweak-tool-3.22.0 b/gnome-extra/gnome-tweak-tool-3.22.0
new file mode 100644
index 000000000000..2b1575a659ba
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool-3.22.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.21.2 >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tool to customize GNOME 3 options
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.21.2 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 gnome-base/gnome-shell >=gnome-base/nautilus-3
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f2756f0e30b94f4fd01596b4a0cc56d
diff --git a/gnome-extra/gnome-tweak-tool-3.24.1 b/gnome-extra/gnome-tweak-tool-3.24.1
new file mode 100644
index 000000000000..188ed60ac905
--- /dev/null
+++ b/gnome-extra/gnome-tweak-tool-3.24.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.23.3 >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tool to customize GNOME 3 options
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/GnomeTweakTool
+IUSE=python_targets_python2_7
+KEYWORDS=amd64 ~ia64 x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/glib:2[dbus] >=dev-python/pygobject-3.10.2:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=gnome-base/gsettings-desktop-schemas-3.23.3 >=gnome-base/gnome-desktop-3.6.0.1:3=[introspection] >=x11-libs/gtk+-3.12:3[introspection] net-libs/libsoup:2.4[introspection] x11-libs/libnotify[introspection] >=gnome-base/gnome-settings-daemon-3 >=gnome-base/gnome-shell-3.24 >=gnome-base/nautilus-3
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec3b035f9071e8dc5974c85aa60b5169
diff --git a/gnome-extra/gnome-tweak-tool/Manifest b/gnome-extra/gnome-tweak-tool/Manifest
deleted file mode 100644
index 57cb4ed46ff3..000000000000
--- a/gnome-extra/gnome-tweak-tool/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch 1029 BLAKE2B 8b97e43a73f9ebb05d9f771db16e3b96e21f377047847e2aed69015a99ad1126bab659c979979d91ec5af006040d1bfa44f85fd781333352d34008d9d48c2b84 SHA512 55bfacefeef6581dd42e1e3f8474196cd29d4eea8ad83c7b33bac5757854e0f946927ccf25cd09e0f93b971361c6ff3896772e0aa18f4dfec9c77c11a73cf147
-DIST gnome-tweak-tool-3.22.0.tar.xz 260132 BLAKE2B fe3e8810fa3fc209707ca5b2fa16d75114038243ff3930065b44ea34c1030a435a2aec70b108134ae238d8ed4d3ec70cc51c0c1f69c1d41bea162211765fb690 SHA512 c63c2c61787c78e2e25077cc83b28ae49bffd9e7c39aa78ebd93587ba9640275083f46273cb55986bcc46842449a31f38b77f0e9be69cea551218fd160f6d769
-DIST gnome-tweak-tool-3.24.1.tar.xz 261872 BLAKE2B ce62ad4357d8f8660bbbdcd81a1190f21cf7a832853aba404bc087b8150bff8f6451902102dfe030a6eec5ce658d31f176e0d32055f25e69203fda65ce092120 SHA512 b76e9a46de07d12b586fb7326fcd51fff1565b831fe8f4d1ab4bbefe36450b5d2cb7c7a168922960894ba57ac9bd412afa61973c034bd1b5f2b45c52eb34adcd
-EBUILD gnome-tweak-tool-3.22.0.ebuild 1649 BLAKE2B d4f0202d18e68d2f8427970155aadb5f69d4c19b1065e0598427b387a0532a59637f522f3a22c2919c4e23232a86236a7482834728673e86fa9893404eb1ffcb SHA512 50154ce71b3504ea9aff6797031cf9dec2209def242a701d8a05215a1dc80cf5fc8508456641776ab409da984a8af0e931d7ef2f0319d53ee51bca63d6126a8a
-EBUILD gnome-tweak-tool-3.24.1.ebuild 1582 BLAKE2B 9949f10799534331b7bacb75159ee55f5f555d96f55a9abc440c9363b4bb1b227c18660b601b14180c66f35c889e7a7f69580a2bbd17a531a6a726c442c7a996 SHA512 3ce39b7ebc3bfdcac542c28b0b64834936a0701874dd3b4fb93973667142caa31197e2ec4e4a1bc063709d4acfdc2eb0d8d3e0741857f908b6984228facc9bed
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch b/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
deleted file mode 100644
index b65a713277b0..000000000000
--- a/gnome-extra/gnome-tweak-tool/files/gnome-tweak-tool-3.10.1-gentoo-cursor-themes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c848d45b0697a6ac3661dbf3fbd356864e8b4e24 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour <sobhanmohammadpour1@yahoo.fr>
-Date: Tue, 15 Jan 2013 17:23:12 +0330
-Subject: [PATCH] gentoo-cursor-themes
-
----
- gtweak/tweaks/tweak_interface.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index b20a41c..2125d59 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -69,7 +69,8 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
-+        dirs = ( os.path.join(gtweak.DATA_DIR, "cursors", "xorg-x11"),
-+                 os.path.join(gtweak.DATA_DIR, "icons"),
-                  os.path.join(GLib.get_user_data_dir(), "icons"),
-                  os.path.join(os.path.expanduser("~"), ".icons"))
-         valid = walk_directories(dirs, lambda d:
--- 
-1.8.1
-
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
deleted file mode 100644
index 91fd458f0e89..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
-
-# Newer pygobject needed due upstream bug #723951
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/glib:2[dbus]
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3.21.2
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	>=x11-libs/gtk+-3.12:3[introspection]
-
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	gnome-base/gnome-shell
-	>=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
deleted file mode 100644
index e53ec44d1f8f..000000000000
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.24.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Tool to customize GNOME 3 options"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~ia64 x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-libs/glib:2[dbus]
-	>=dev-python/pygobject-3.10.2:3[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3.23.3
-"
-# g-s-d, gnome-desktop, gnome-shell etc. needed at runtime for the gsettings schemas
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-desktop-3.6.0.1:3=[introspection]
-	>=x11-libs/gtk+-3.12:3[introspection]
-
-	net-libs/libsoup:2.4[introspection]
-	x11-libs/libnotify[introspection]
-
-	>=gnome-base/gnome-settings-daemon-3
-	>=gnome-base/gnome-shell-3.24
-	>=gnome-base/nautilus-3
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Add contents of Gentoo's cursor theme directory to cursor theme list
-	eapply "${FILESDIR}/${PN}-3.10.1-gentoo-cursor-themes.patch"
-
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	install_python() {
-		gnome2_src_install
-		python_doscript gnome-tweak-tool || die
-	}
-	python_foreach_impl run_in_build_dir install_python
-}
diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml b/gnome-extra/gnome-tweak-tool/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-tweak-tool/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-user-docs-3.24.2 b/gnome-extra/gnome-user-docs-3.24.2
new file mode 100644
index 000000000000..038a073dda53
--- /dev/null
+++ b/gnome-extra/gnome-user-docs-3.24.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=test? ( dev-libs/libxml2 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME end user documentation
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-docs
+IUSE=test
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=CC-BY-3.0
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a2f14e98c12e128c027731f550a6068
diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest
deleted file mode 100644
index 0c79626008fe..000000000000
--- a/gnome-extra/gnome-user-docs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-user-docs-3.24.2.tar.xz 14167700 BLAKE2B deec09954a9c3bf915c86030d13df70efec81090c74744fb98192a1e9727cab2bd54ee608f1f3bddcf8707f6a3a6e1ddaeffdc5175e0d0f2ad4ab2e890036330 SHA512 7725ceb6d079d244f9f764c54b2d374588a808c8f1b2e70f655e1d3e3dc957cab3a8edcfe3d000c5d4520e9d9da031585a20ade978b66753ef3b2c912230a87d
-EBUILD gnome-user-docs-3.24.2.ebuild 936 BLAKE2B c73905e25c9a419e3c8999f7a09ae702becd42b1a526d90342bc3b3436e63af99631f00875526940f387a98ed39d42b5383f39a55990bacb313f15113385f5f4 SHA512 1b63ecd8d58c1110c79134c3679a715a3fcb09e075fe045ce512d5a83ad82051d691da674bc7880f5a6ed7a0183957e172ee69764a020d5313061b42ad0c66cb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
deleted file mode 100644
index e4ff024c6df4..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.24.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
-
-LICENSE="CC-BY-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="
-	test? ( dev-libs/libxml2 )
-"
-# eautoreconf requires:
-#	app-text/yelp-tools
-# rebuilding translations requires:
-#	app-text/yelp-tools
-#	dev-util/gettext
-
-# This ebuild does not install any binaries
-RESTRICT="binchecks strip"
-
-src_configure() {
-	# itstool is only needed for rebuilding translations
-	# xmllint is only needed for tests
-	gnome2_src_configure \
-		$(usex test "" XMLLINT=$(type -P true)) \
-		ITSTOOL=$(type -P true)
-}
-
-src_compile() {
-	# Do not compile; "make all" with unset LINGUAS rebuilds all translations,
-	# which can take > 2 hours on a Core i7.
-	return
-}
diff --git a/gnome-extra/gnome-user-docs/metadata.xml b/gnome-extra/gnome-user-docs/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-user-docs/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-user-share-3.18.3 b/gnome-extra/gnome-user-share-3.18.3
new file mode 100644
index 000000000000..f0a13f5298c4
--- /dev/null
+++ b/gnome-extra/gnome-user-share-3.18.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:= !<gnome-base/gnome-control-center-3.9 app-text/yelp-tools app-text/docbook-xml-dtd:4.1.2 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
+DESCRIPTION=Personal file sharing for the GNOME desktop
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/gnome-user-share
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3:3 >=gnome-base/nautilus-2.91.7 media-libs/libcanberra[gtk3] >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] >=x11-libs/libnotify-0.7:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-user-share/3.18/gnome-user-share-3.18.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bed9a7c1c40ac907d2eaf73a37667cc8
diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest
deleted file mode 100644
index 3feb10173ee3..000000000000
--- a/gnome-extra/gnome-user-share/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gnome-user-share-3.18.1-no-prefork.patch 553 BLAKE2B 201db9747d9bf68ac9421a6bd0341d2c4ab42b2eb5ca331deac58f669a02bdf559fc29e01cd028bcfd3494733e76bf649d4ca77836307e219c7060554b251583 SHA512 f1a8156d09e0f7dad2422b79000f34843567a7e0b66838774e03576a81cc243a52e0bf52d88bf7be98f2454e3119b3080a6c72c1320faf6ab5e4494d7be4fe0b
-DIST gnome-user-share-3.18.3.tar.xz 347528 BLAKE2B 32c3a5aa84438e8bc276c6cf21fb35325b2b2c31f73bd301f73bdfbb91d90bcedf66c02b249dc047fb23eae2b7740097465c3a4164113d05e6811fec6f719d6c SHA512 3f8da3cc6f73aa612883252982fac0c53e35184ac0d31f210b525fd04dd8dbffb3f7be4c331309ea9df6a712000eb2d29f75224505c822cffc11b3d435e17991
-EBUILD gnome-user-share-3.18.3.ebuild 1338 BLAKE2B 41b790537dd9ee808d10f03cb98e95feadff2bb0c9d004e92d8445a760a0d5f41c4bba6dfe6a32dcbecc0ebcf4083b5ec9bd7750c806343dd45b4869718ca4e8 SHA512 0fc7927a387ad1a2f6f8d3ea0fed37d9ece10d76832905659bf6addf9047100f688bf38ee0cc409482fb4f73b3e3e28f53f91038834ef4af0cd07d742b5927a0
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
deleted file mode 100644
index 156721d286cf..000000000000
--- a/gnome-extra/gnome-user-share/files/gnome-user-share-3.18.1-no-prefork.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-user-share-3.14.2/data/dav_user_2.4.conf.orig 2015-06-03 20:21:27.512774376 -0600

-+++ gnome-user-share-3.14.2/data/dav_user_2.4.conf      2015-06-03 20:21:33.588774303 -0600

-@@ -9,7 +9,6 @@

- LimitXMLRequestBody 100000

- 

- LoadModule unixd_module ${HTTP_MODULES_PATH}/mod_unixd.so

--LoadModule mpm_prefork_module ${HTTP_MODULES_PATH}/mod_mpm_prefork.so

- LoadModule dav_module ${HTTP_MODULES_PATH}/mod_dav.so

- LoadModule dav_fs_module ${HTTP_MODULES_PATH}/mod_dav_fs.so

- LoadModule authn_core_module ${HTTP_MODULES_PATH}/mod_authn_core.so
\ No newline at end of file
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
deleted file mode 100644
index c102ec8b6bba..000000000000
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib systemd
-
-DESCRIPTION="Personal file sharing for the GNOME desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# FIXME: could libnotify be made optional ?
-# FIXME: selinux automagic support
-RDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=x11-libs/gtk+-3:3
-	>=gnome-base/nautilus-2.91.7
-	media-libs/libcanberra[gtk3]
-	>=www-apache/mod_dnssd-0.6
-	>=www-servers/apache-2.2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-	>=x11-libs/libnotify-0.7:=
-"
-DEPEND="${RDEPEND}
-	!<gnome-base/gnome-control-center-3.9
-	app-text/yelp-tools
-	app-text/docbook-xml-dtd:4.1.2
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Upstream forces to use prefork because of Fedora defaults, but
-	# that is problematic for us (bug #551012)
-	# https://bugzilla.gnome.org/show_bug.cgi?id=750525#c2
-	"${FILESDIR}"/${PN}-3.18.1-no-prefork.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--with-httpd=apache2 \
-		--with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-user-share/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-utils-3.8.0 b/gnome-extra/gnome-utils-3.8.0
new file mode 100644
index 000000000000..49cb181adefc
--- /dev/null
+++ b/gnome-extra/gnome-utils-3.8.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta package for utilities for the GNOME desktop
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Attic/GnomeUtils
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=metapackage
+RDEPEND=>=app-admin/gnome-system-log-3.8.0 >=app-dicts/gnome-dictionary-3.8.0 >=gnome-extra/gnome-search-tool-3.6.0 >=media-gfx/gnome-font-viewer-3.8.0 >=media-gfx/gnome-screenshot-3.8.0 >=sys-apps/baobab-3.8.0
+SLOT=0
+_md5_=583ea1e638c00340f9125dc85cb42377
diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest
deleted file mode 100644
index 3e44faaaec6a..000000000000
--- a/gnome-extra/gnome-utils/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD gnome-utils-3.8.0.ebuild 605 BLAKE2B 9e5593e04f0d270c76a19fef914876ef95678bc8b06198330702bf23704c9098aa4826c4cd8a55b468e7c9b12e2fdd0f4c8234d76f03584667556e0ac03fd432 SHA512 aff6dccc6bdbbed252313f9904aebdadb77be9a19772250a2f7bed50b46b6a8485ca3efcc957c5f3f866fba93ad3988385cf5e237d22d2158c7e1ada262b70f4
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
deleted file mode 100644
index a7a82db68fee..000000000000
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Meta package for utilities for the GNOME desktop"
-HOMEPAGE="https://wiki.gnome.org/Apps/Attic/GnomeUtils"
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-DEPEND=""
-RDEPEND="
-	>=app-admin/gnome-system-log-${PV}
-	>=app-dicts/gnome-dictionary-${PV}
-	>=gnome-extra/gnome-search-tool-3.6.0
-	>=media-gfx/gnome-font-viewer-${PV}
-	>=media-gfx/gnome-screenshot-${PV}
-	>=sys-apps/baobab-${PV}
-"
diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-utils/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gnome-weather-3.24.0 b/gnome-extra/gnome-weather-3.24.0
new file mode 100644
index 000000000000..5cc6b965c964
--- /dev/null
+++ b/gnome-extra/gnome-weather-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3 dev-libs/appstream-glib >=dev-util/intltool-0.26 virtual/pkgconfig test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-util/dogtail[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-util/dogtail[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-util/dogtail[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-util/dogtail[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A weather application for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Design/Apps/Weather
+IUSE=test test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0
+RDEPEND=>=app-misc/geoclue-2.3.1:2.0 >=dev-libs/gjs-1.43.3 >=dev-libs/glib-2.32:2 >=dev-libs/gobject-introspection-1.35.9:= >=dev-libs/libgweather-3.17.2:= gnome-base/gsettings-desktop-schemas >=x11-libs/gtk+-3.11.4:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=63d15337c9c679216c83fdb7492bf278
diff --git a/gnome-extra/gnome-weather/Manifest b/gnome-extra/gnome-weather/Manifest
deleted file mode 100644
index c319c4b148bb..000000000000
--- a/gnome-extra/gnome-weather/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gnome-weather-3.24.0.tar.xz 5358924 BLAKE2B 89091c0dd2e69109621450621a03231da9fc6032cfdc44386e632ab3e8e478fc9a02efff86417277fbdbd2c39d730efd76df1a787e14112dd0447b53715b5aff SHA512 c286c97dc1cbb4991e56ed49e8c788c6a58f0f0dcd5534812ee3e06a0570fd1bb0b45f7e35bdc11443f62dc3a2cd262db4f3d2b1f238cfc24236de88de4a4bce
-EBUILD gnome-weather-3.24.0.ebuild 1085 BLAKE2B 23e877012247c7bacf65e616bb5ba59ce5eaf1b460b79950f684ca083f0b6af164a39fdba803d3a22bdae898d455cc3618f0ba930e377dfd07633123cd5e6b58 SHA512 1c3bd5d93d8809c2f6322577ff950a4387806880fcc733b927c37deb174a1a45a9b2fb7ab0f68d568df222f077e61e46d0432b404b41c2da57804b1597868d30
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
deleted file mode 100644
index 544418eed9c9..000000000000
--- a/gnome-extra/gnome-weather/gnome-weather-3.24.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A weather application for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
-
-LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=app-misc/geoclue-2.3.1:2.0
-	>=dev-libs/gjs-1.43.3
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/gobject-introspection-1.35.9:=
-	>=dev-libs/libgweather-3.17.2:=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/gtk+-3.11.4:3
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	>=dev-util/intltool-0.26
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
-"
-
-python_check_deps() {
-	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable test dogtail)
-}
-
-src_test() {
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
diff --git a/gnome-extra/gnome-weather/metadata.xml b/gnome-extra/gnome-weather/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gnome-weather/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gtkhtml-4.10.0 b/gnome-extra/gtkhtml-4.10.0
new file mode 100644
index 000000000000..30158baf4bd3
--- /dev/null
+++ b/gnome-extra/gtkhtml-4.10.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4 x11-base/xorg-proto sys-devel/gettext >=dev-util/intltool-0.40.0 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight HTML rendering/printing/editing engine
+EAPI=5
+HOMEPAGE=https://git.gnome.org/browse/gtkhtml
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=x11-libs/gtk+-3.2:3 >=x11-libs/cairo-1.10:= x11-libs/pango >=app-text/enchant-1.1.7:= gnome-base/gsettings-desktop-schemas >=app-text/iso-codes-0.49 >=net-libs/libsoup-2.26.0:2.4
+SLOT=4.0
+SRC_URI=mirror://gnome/sources/gtkhtml/4.10/gtkhtml-4.10.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a18c8d41898ecc93ea026baedefa52e8
diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest
deleted file mode 100644
index 965e855bc860..000000000000
--- a/gnome-extra/gtkhtml/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtkhtml-4.10.0.tar.xz 1050628 BLAKE2B 563eab2e81fea2f0d457cd4506f9b91e9ce497f4f8ca8281b3f609fcb8ae3a666b5815133f6590334af31adf5fbeba1d401b8d328ed04439f0f88051c52d5e7c SHA512 efb159f902a910abd259cf38a86894a363dfd6b632aaad5ca88baf278780e653a2efc783ae48d9e4239f9fbfcbab15a5f343b60c910166d04e6663d4e34843e0
-EBUILD gtkhtml-4.10.0.ebuild 970 BLAKE2B 5c8c81303f3d8d0ea64325fd7ae78cb876970983da7c84ed923118019c6526debe71700573eedb074ac2fab017f1902b43fb0c21c057c138dd716e3569953fef SHA512 c1f401b7ab55a2e61c3de3be8c22325a5f75858c207647926b92a0671b76361f59479add8d1b0109e5974ee38eda166936d9a59911f10428b1d61a8a265c5e94
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
deleted file mode 100644
index b596e147e0ec..000000000000
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Lightweight HTML rendering/printing/editing engine"
-HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-# orbit is referenced in configure, but is not used anywhere else
-RDEPEND="
-	>=x11-libs/gtk+-3.2:3
-	>=x11-libs/cairo-1.10:=
-	x11-libs/pango
-	>=app-text/enchant-1.1.7:=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/iso-codes-0.49
-	>=net-libs/libsoup-2.26.0:2.4
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Don't collide with 3.14 slot
-	mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die
-}
diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gtkhtml/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/gucharmap-10.0.0 b/gnome-extra/gucharmap-10.0.0
new file mode 100644
index 000000000000..09c14513d31c
--- /dev/null
+++ b/gnome-extra/gucharmap-10.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ff69a6edac6a879f16b1dda36ab0bf2
diff --git a/gnome-extra/gucharmap-10.0.3 b/gnome-extra/gucharmap-10.0.3
new file mode 100644
index 000000000000..c10404ef10b6
--- /dev/null
+++ b/gnome-extra/gucharmap-10.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-10.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/10.0/gucharmap-10.0.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6a3d1ff8883c964dbcf6d2f820f4e04a
diff --git a/gnome-extra/gucharmap-3.0.1-r200 b/gnome-extra/gucharmap-3.0.1-r200
new file mode 100644
index 000000000000..b6a0900dd70a
--- /dev/null
+++ b/gnome-extra/gucharmap-3.0.1-r200
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-2.14.0:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) dev-util/gtk-doc-am >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=cjk debug doc +introspection
+KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.16.3:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-2.14.0:2[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gucharmap/3.0/gucharmap-3.0.1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1d958aecc3287fbe4a0da2cda2bff82a
diff --git a/gnome-extra/gucharmap-9.0.2 b/gnome-extra/gucharmap-9.0.2
new file mode 100644
index 000000000000..21f611a64311
--- /dev/null
+++ b/gnome-extra/gucharmap-9.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f476aaf03183f20a67496d3ed215e47
diff --git a/gnome-extra/gucharmap-9.0.4 b/gnome-extra/gucharmap-9.0.4
new file mode 100644
index 000000000000..4da874f8275f
--- /dev/null
+++ b/gnome-extra/gucharmap-9.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0 app-text/yelp-tools dev-util/desktop-file-utils >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig test? ( app-text/docbook-xml-dtd:4.1.2 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Unicode character map viewer and library
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Gucharmap
+IUSE=debug +introspection test vala
+KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND==app-i18n/unicode-data-9.0* >=dev-libs/glib-2.32:2 >=x11-libs/pango-1.2.1[introspection?] >=x11-libs/gtk+-3.16:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !<gnome-extra/gucharmap-3:0
+REQUIRED_USE=vala? ( introspection )
+SLOT=2.90
+SRC_URI=mirror://gnome/sources/gucharmap/9.0/gucharmap-9.0.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f476aaf03183f20a67496d3ed215e47
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
deleted file mode 100644
index b3d6dded6b6d..000000000000
--- a/gnome-extra/gucharmap/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX gucharmap-3.4.1.1-fix-doc.patch 348 BLAKE2B c6bf73a5e9940557fa43da04b8212ca527b9abdfaccf7f1522c9a6dfcb52af8f6c05a56a683621eb64c34452464605d7a5a98b77ab9b67224f5c84acc0b1cf68 SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27
-DIST gucharmap-10.0.0.tar.xz 1034780 BLAKE2B 9ebcff1f182de52aa12c40de93c80d2942316fb718330872932034cd9bee66e41a667bd70e6d632e17accda66413b18bdf9addf6a892510d5798ad21fa8908de SHA512 e097e54cfd4e6a8fd47992d163128bc8e87c0c6aa81718f900d7367fa6d88a528815c7bb87bfcaddd145aaa8b1c8068fdf6da6fe2a1c90381ff555b43712f33a
-DIST gucharmap-10.0.3.tar.xz 1713960 BLAKE2B 0a0412c7a4d46c25112d9bb33d64e82b448e981a2ecb9a5ed5ce5e96657e5264e14262b15c4e5af6b3d023c20193a7471071c5d346f0d48e22583b07e92d51f7 SHA512 0815ca39311db4dc3ff5202f1303cad72bc204f4eef4d2ec83465123ff856eeb552a583666419ad4a3bf9d3ddcf294883fc8e24e32c30814916b41bc14a108fe
-DIST gucharmap-3.0.1.tar.bz2 3275481 BLAKE2B 80dde7791abdc72677add9c65c59f810e6c6952116b92db34059c4c40d2657246b17844c105e68f32c86294e9b4e71e9d48e6f0522855465734d7c24e8d17608 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1
-DIST gucharmap-9.0.2.tar.xz 1023120 BLAKE2B f0ea1b2e866abea180c062ea2559f6f26b80d38c66aac838ee2e6371ea4a09a14842a51e2e4e7d9ffb0e0bf052a7c6f21e92843c8f36eb6edc52a73063bef0f3 SHA512 33fa2989e263ba30bc430b8181009dd5d491dd2b453f6047369dc49dafb4f58be67dd9f1320b7005325236519a794eb4564fbd39a1d976133001f4f983ae1370
-DIST gucharmap-9.0.4.tar.xz 1029684 BLAKE2B f2af9c422abceb98783b6ea6a29241383cc6220410cd45a4c1fc04ce57fc51bc629fc4560d5ad852b19f1b85fc0276e68b423b2f6579e8f973794b2528b9cb7c SHA512 2d2ce94796cb40bcaf14930624ddd788af1c49d464be1fc5d4ab8112df14054ce1324c86eaf028921266494f9fbb41d29a7b40db810fb15280d470fd26be6df2
-EBUILD gucharmap-10.0.0.ebuild 1664 BLAKE2B 81d087632398b74ad6fb3eba9cfc1e8b663b054db3cfdf9611d2ceb34215e1ba80af4686def075b93b8e1b1d1255d57e586474475e83cd37778e05654b8140bb SHA512 0352bcd7dcbac69699c57c45080875821a4dfe07e6dcc8ae6ef24aa82042756c5409fd7e342d8e6244ca818a2abec8f2d80e7dffa1fbe24e4f24aac67180f417
-EBUILD gucharmap-10.0.3.ebuild 1656 BLAKE2B e7585a19b559cb2e01d10b6906e0420ca58839c11c09251f2da39cd6e7ff7abc68d7f0b1f327b410cfde93aa3c8ef95c28795d1ec01094ffaf6cdd2dfc66e218 SHA512 c2cdc8664586879a80e0003bfaf92bbfe28aef6f4c64aa4d9cd9ad32f11e07481528f6e4cd39bdff0f4f54c271014de0aca5d55de8e882faa7c0422275f8aa4e
-EBUILD gucharmap-3.0.1-r200.ebuild 1470 BLAKE2B 9f817d96745a0fbf907aec0b13d6be14a99c815af50846ae6ccbd4a84d826d7ff8635ff893a69a9e0be4f9d199977264eb34cf60c8f75b817f4f2d3df73fc6ad SHA512 254fec449e286c8df0f273f5cde96d1571baebc0384a8e5ac69e17808ce14f7a49fdabd44b0d5f584c7935a33c7eb395c34db2df315d4ba9ae155471499bda65
-EBUILD gucharmap-9.0.2.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
-EBUILD gucharmap-9.0.4.ebuild 1649 BLAKE2B 46f9ec6ad8452f2e850cc21a6bee29275e0c27c7ede9535a563a292a72ced0791492c003e81c8019b11513b6c8a52dc38705599c7c136398cebd38f05d66bf10 SHA512 493545976a8d527349a4318b7aa18e84da54c1e7c49fecdd28640e1c9555ce0877051bf1a3c108c9806c6f6837fdd452d548f80cb33b82a02380aebf58e410fe
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch b/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
deleted file mode 100644
index 52696b5128a8..000000000000
--- a/gnome-extra/gucharmap/files/gucharmap-3.4.1.1-fix-doc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/docs/reference/gucharmap-docs.sgml
-+++ b/docs/reference/gucharmap-docs.sgml
-@@ -21,6 +21,5 @@
-     <xi:include href="xml/gucharmap-script-codepoint-list.xml"/>
-     <xi:include href="xml/gucharmap-chapters-view.xml"/>
-     <xi:include href="xml/gucharmap-unicode-info.xml"/>
--    <xi:include href="xml/gucharmap.xml"/>
-   </chapter>
- </book>
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
deleted file mode 100644
index 2fb7f3ac86c3..000000000000
--- a/gnome-extra/gucharmap/gucharmap-10.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild b/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
deleted file mode 100644
index 80975bdc6b3d..000000000000
--- a/gnome-extra/gucharmap/gucharmap-10.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
deleted file mode 100644
index 14bb204f238c..000000000000
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
-
-inherit gnome2
-
-DESCRIPTION="Unicode character map viewer library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="cjk debug doc +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.16.3:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-2.14.0:2[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# .desktop and schema files are only needed for the gucharmap program
-	sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \
-		-e 's:schema_DATA\s*=.*:schema_DATA = :' \
-		-i Makefile.* || die "sed Makefile.* failed"
-
-	eapply "${FILESDIR}/${PN}-3.4.1.1-fix-doc.patch" # bug 436710, fixed in 3.6
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-gtk=2.0 \
-		--disable-charmap \
-		--disable-gconf \
-		$(use_enable cjk unihan) \
-		$(use_enable debug) \
-		$(use_enable introspection)
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if ! has_version "gnome-extra/gucharmap:2.90" ; then
-		ewarn "Note: ${PF} includes only the gucharmap-2 library."
-		ewarn "If you need the gucharmap program, emerge gucharmap:2.90"
-	fi
-}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
deleted file mode 100644
index edc765ed8bfe..000000000000
--- a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
deleted file mode 100644
index edc765ed8bfe..000000000000
--- a/gnome-extra/gucharmap/gucharmap-9.0.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala versionator
-
-DESCRIPTION="Unicode character map viewer and library"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
-
-LICENSE="GPL-3"
-SLOT="2.90"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-
-IUSE="debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-UNICODE_VERSION=$(get_version_component_range 1-2)
-
-COMMON_DEPEND="
-	=app-i18n/unicode-data-${UNICODE_VERSION}*
-	>=dev-libs/glib-2.32:2
-	>=x11-libs/pango-1.2.1[introspection?]
-	>=x11-libs/gtk+-3.16:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gucharmap-3:0
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/desktop-file-utils
-	>=dev-util/gtk-doc-am-1
-	>=dev-util/intltool-0.40
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (	app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	# prevent file collisions with slot 0
-	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
-		-i configure.ac configure || die "sed configure.ac configure failed"
-
-	# avoid autoreconf
-	sed -e 's/-Wall //g' -i configure || die "sed failed"
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# unihan is not really conditional
-	# https://bugzilla.gnome.org/show_bug.cgi?id=768210#c5
-	gnome2_src_configure \
-		--disable-static \
-		--with-unicode-data=/usr/share/unicode-data \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
diff --git a/gnome-extra/gucharmap/metadata.xml b/gnome-extra/gucharmap/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/gucharmap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/libgda-5.2.4-r2 b/gnome-extra/libgda-5.2.4-r2
new file mode 100644
index 000000000000..7e306638b966
--- /dev/null
+++ b/gnome-extra/libgda-5.2.4-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) >=app-text/gnome-doc-utils-0.9 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.40.6 virtual/pkgconfig java? ( >=virtual/jdk-1.6 ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=GNOME database access library
+EAPI=6
+HOMEPAGE=http://www.gnome-db.org/
+IUSE=berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala elibc_FreeBSD java python_targets_python2_7
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=app-text/iso-codes >=dev-libs/glib-2.32:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline:0= sys-libs/ncurses:0= berkdb? ( sys-libs/db:* ) firebird? ( dev-db/firebird ) gnome-keyring? ( app-crypt/libsecret ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0= ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap:= ) mdb? ( >app-office/mdbtools-0.5:= ) mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) reports? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-java/fop dev-python/reportlab ) ssl? ( dev-libs/openssl:= ) >=dev-db/sqlite-3.6.22:3= vala? ( dev-libs/libgee:0.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=reports? ( python_targets_python2_7 ) canvas? ( gtk ) graphviz? ( gtk ) sourceview? ( gtk ) vala? ( introspection )
+RESTRICT=test firebird? ( bindist )
+SLOT=5/4
+SRC_URI=mirror://gnome/sources/libgda/5.2/libgda-5.2.4.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	db-use	582140d1a711279e50ce284fc7b609f5	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dc2a122ee3357e9b493dfaa647285964
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
deleted file mode 100644
index 8b1aefa0a000..000000000000
--- a/gnome-extra/libgda/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5
-AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353
-AUX libgda-5.2.4-format-security.patch 1003 BLAKE2B 7b8727e080b0a82645a4f9cdbe718a814b22fd8939d613dc6100b85ce589cf1cd8760a1d515c8ffb7221ff83ce09abbc841ab6a05520c3a804c4eeefe1588359 SHA512 b723fff823b4de0ed79883d8b2c9e44e3ae26bac919992afe2eb055aaac972ee188bc28865497e3b6b0e613e8b7977061151e489fef31c99b5ce783928e9f42f
-AUX libgda-5.2.4-jre18.patch 450 BLAKE2B 1ce265d157bab47f94cc4ffcc620813efd0683a78b516e5b8ecb90f0d3d69b6b6daff7b30c2ec24842d6726804787d06e8b5858a75beb7c4b41d6cf4304d0f0f SHA512 4280b18ac16a1831aac433a2dc64f0713f8668b31d18465877861e0c0e2dd5eb2bc2aa70cdf0d742da4b6c48f2b7ec7bd7f109de99436f84c5d155c2dc4fed94
-AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc8952409bd5b5b695f77fbc99b7a6b4980154bafccaece3a8eec8008f07a973c937918864c60ecc215bf2db2a6a1c5fda8419 SHA512 dba082bdae037d4b9e021085166c4b5e8791c461cfbd9b0668731651b07f931bae8405b8b7d3c7f0cf51ddbfa23b03a265abd8ab3603e90933e0c99a299b53a0
-DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc
-EBUILD libgda-5.2.4-r2.ebuild 4925 BLAKE2B 6d78da6d22688f9c8d3b71425b5828e83d91f36c33e5f9215d3953a4746b4f46f1577396bbac18d1e881ab0184634622bbb9bbc76ab5d65aecced3795be02251 SHA512 c03a97df0b0aeeeba44410c367e5bff172ac3b66c7baf1ca030d96243fcf7ef3a538c16c9cb60a20b136bb81e2a9d907b539fb72778833e83af6d4811fd23487
-MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
deleted file mode 100644
index fe814a730490..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 05:45:35 -0400
-Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons
-
----
- control-center/data/Makefile.am                    |   12 ++++++------
- ... hicolor_apps_16x16_gda-control-center-5.0.png} |  Bin 833 -> 833 bytes
- ... hicolor_apps_22x22_gda-control-center-5.0.png} |  Bin 1157 -> 1157 bytes
- ... hicolor_apps_24x24_gda-control-center-5.0.png} |  Bin 1144 -> 1144 bytes
- ...icolor_apps_256x256_gda-control-center-5.0.png} |  Bin 33543 -> 33543 bytes
- ... hicolor_apps_32x32_gda-control-center-5.0.png} |  Bin 1867 -> 1867 bytes
- ... hicolor_apps_48x48_gda-control-center-5.0.png} |  Bin 3144 -> 3144 bytes
- control-center/gda-control-center-5.0.desktop.in   |    2 +-
- 8 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am
-index 03fa362..862ec88 100644
---- a/control-center/data/Makefile.am
-+++ b/control-center/data/Makefile.am
-@@ -5,12 +5,12 @@ public_icons_themes = \
- 	$(NULL)
- 
- public_icons = \
--	hicolor_apps_16x16_gda-control-center.png \
--	hicolor_apps_22x22_gda-control-center.png \
--	hicolor_apps_24x24_gda-control-center.png \
--	hicolor_apps_256x256_gda-control-center.png \
--	hicolor_apps_32x32_gda-control-center.png \
--	hicolor_apps_48x48_gda-control-center.png \
-+	hicolor_apps_16x16_gda-control-center-5.0.png \
-+	hicolor_apps_22x22_gda-control-center-5.0.png \
-+	hicolor_apps_24x24_gda-control-center-5.0.png \
-+	hicolor_apps_256x256_gda-control-center-5.0.png \
-+	hicolor_apps_32x32_gda-control-center-5.0.png \
-+	hicolor_apps_48x48_gda-control-center-5.0.png \
- 	$(NULL)
- 
- private_icons = \
-diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in
-index 6fd5b58..429787d 100644
---- a/control-center/gda-control-center-5.0.desktop.in
-+++ b/control-center/gda-control-center-5.0.desktop.in
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- _Name=Database access control center
- _Comment=Configure your database access environment
--Icon=gda-control-center
-+Icon=gda-control-center-5.0
- Exec=gda-control-center-5.0
- Terminal=false
- Type=Application
--- 
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
deleted file mode 100644
index 2fd31ab7d1de..000000000000
--- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 4 Jun 2011 05:59:46 -0400
-Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files
-
----
- tools/browser/doc/Makefile.am                      |    2 +-
- ...browser-docs.sgml => gda-browser-5.0-docs.sgml} |    0
- ...r-sections.txt => gda-browser-5.0-sections.txt} |    0
- .../{gda-browser.types => gda-browser-5.0.types}   |    0
- 4 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am
-index 971fa79..cf6637a 100644
---- a/tools/browser/doc/Makefile.am
-+++ b/tools/browser/doc/Makefile.am
-@@ -3,7 +3,7 @@
- AUTOMAKE_OPTIONS = 1.6
- 
- # The name of the module.
--DOC_MODULE=gda-browser
-+DOC_MODULE=gda-browser-5.0
- 
- # The top-level SGML file.
- DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
--- 
-1.7.5.3
-
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
deleted file mode 100644
index 81c7804c512c..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Wed, 16 Apr 2014 14:59:50 +0200
-Subject: [PATCH] Markup message correction
-
----
- libgda-ui/demos/ddl_queries.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
-index a47630f..4b29377 100644
---- a/libgda-ui/demos/ddl_queries.c
-+++ b/libgda-ui/demos/ddl_queries.c
-@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data)
- 		else
- 			msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql);
- 
--		dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
--							  GTK_DIALOG_MODAL,
--							  msg_type, GTK_BUTTONS_CLOSE, msg);
-+		dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window),
-+					      GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL);
-+		gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg);
- 		g_free (sql);
- 		g_free (msg);
- 
--- 
-1.9.0
-
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
deleted file mode 100644
index f66fa8f95846..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgda-5.2.2/configure.orig	2014-05-17 14:58:33.206028742 +0200
-+++ libgda-5.2.2/configure	2014-05-17 14:58:45.937790443 +0200
-@@ -23200,6 +23259,11 @@
- 		    JTYPE="Sun JRE 1.7"
- 		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
- 		    ;;
-+                JRE1.8.*)
-+		    try_java=true
-+		    JTYPE="Sun JRE 1.8"
-+		    JFLAGS="-Xlint:unchecked -Xlint:deprecation"
-+		    ;;
-                 JREgcj-4*)
- 		    try_java=true
- 		    JTYPE="GCJ"
diff --git a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch b/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
deleted file mode 100644
index c586d49356d0..000000000000
--- a/gnome-extra/libgda/files/libgda-5.2.4-vala-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e72c59062f39e89569524f4556cbddb8d00119f4 Mon Sep 17 00:00:00 2001
-From: Vivien Malerba <malerba@gnome-db.org>
-Date: Sun, 7 Feb 2016 20:49:07 +0100
-Subject: Re-correction for bug #761424
-
-Automatic detection of API version
----
- configure.ac | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 152f676..9898a32 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -571,13 +571,13 @@ fi
- vala_api="No Vala bindings will be generated"
- if test "x$enable_vala" = "xyes"
- then
--	AM_PROG_VALAC([0.26.0])
-+	AM_PROG_VALAC()
- 	if test "x$VALA_API_VERSION" = "x"
- 	then
--		VAPIGEN_CHECK([0.26.0],[0.26],,no)
--		vala_api="0.26 (Default)"
-+		VAPIGEN_CHECK(,,,no)
-+		vala_api="`pkg-config --modversion vapigen` (Default)"
- 	else
--		VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
-+		VAPIGEN_CHECK(,$VALA_API_VERSION,,no)
- 		vala_api=$VALA_API_VERSION
- 	fi
- else
--- 
-cgit v0.12
-
diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
deleted file mode 100644
index 478c37175488..000000000000
--- a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 vala
-
-DESCRIPTION="GNOME database access library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2+ LGPL-2+"
-
-IUSE="berkdb canvas debug firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres reports sourceview ssl vala"
-REQUIRED_USE="
-	reports? ( ${PYTHON_REQUIRED_USE} )
-	canvas? ( gtk )
-	graphviz? ( gtk )
-	sourceview? ( gtk )
-	vala? ( introspection )
-"
-# firebird license is not GPL compatible
-
-SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.32:2
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	sys-libs/readline:0=
-	sys-libs/ncurses:0=
-	berkdb? ( sys-libs/db:* )
-	firebird? ( dev-db/firebird )
-	gnome-keyring? ( app-crypt/libsecret )
-	gtk? (
-		>=x11-libs/gtk+-3.0.0:3
-		canvas? ( x11-libs/goocanvas:2.0= )
-		sourceview? ( x11-libs/gtksourceview:3.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	http? ( >=net-libs/libsoup-2.24:2.4 )
-	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-	json? ( dev-libs/json-glib )
-	ldap? ( net-nds/openldap:= )
-	mdb? ( >app-office/mdbtools-0.5:= )
-	mysql? ( virtual/mysql:= )
-	postgres? ( dev-db/postgresql:= )
-	reports? (
-		${PYTHON_DEPS}
-		dev-java/fop
-		dev-python/reportlab )
-	ssl? ( dev-libs/openssl:= )
-	>=dev-db/sqlite-3.6.22:3=
-	vala? ( dev-libs/libgee:0.8 )
-"
-
-# java dep shouldn't rely on slots, bug #450004
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.9
-	app-text/yelp-tools
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.6
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.6 )
-	vala? ( $(vala_depend) )
-"
-
-# FIXME: lots of tests failing. Check if they still fail in 5.1.2
-# firebird support bindist-restricted because it is not GPL compatible
-RESTRICT="
-	test
-	firebird? ( bindist )
-"
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use reports && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix compilation with -Werror=format-security (from 'master')
-	eapply "${FILESDIR}"/${PN}-5.2.4-format-security.patch
-
-	# Support JRE 1.8 (from Fedora)
-	eapply "${FILESDIR}"/${PN}-5.2.4-jre18.patch
-
-	# Fix vala test,
-	# https://bugzilla.gnome.org/show_bug.cgi?id=761424
-	eapply "${FILESDIR}"/${PN}-5.2.4-vala-check.patch
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-
-	use reports ||
-		sed -e '/SUBDIRS =/ s/trml2html//' \
-			-e '/SUBDIRS =/ s/trml2pdf//' \
-			-i libgda-report/RML/Makefile.{am,in} || die
-
-	# Prevent file collisions with libgda:4
-	eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-	eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-	# Move files with mv (since epatch can't handle rename diffs) and
-	# update pre-generated gtk-doc files (for non-git versions of libgda)
-	local f
-	for f in tools/browser/doc/gda-browser* ; do
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-			-i ${f} || die "sed ${f} failed"
-		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-	done
-	for f in control-center/data/*_gda-control-center.png ; do
-		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-			die "mv ${f} failed"
-	done
-
-	eautoreconf
-	gnome2_src_prepare
-	java-pkg-opt-2_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local myconf=( )
-	if use introspection ; then
-		myconf+=( $(use_enable gtk gdaui-gi) )
-	else
-		myconf+=( --disable-gdaui-gi )
-	fi
-	if use vala ; then
-		myconf+=( $(use_enable gtk gdaui-vala) )
-	else
-		myconf+=( --disable-gdaui-vala )
-	fi
-
-	gnome2_src_configure \
-		--with-help \
-		--disable-default-binary \
-		--disable-static \
-		--enable-system-sqlite \
-		$(use_with berkdb bdb /usr) \
-		$(use_with canvas goocanvas) \
-		$(use_enable debug) \
-		$(use_with firebird firebird /usr) \
-		$(use_with gnome-keyring libsecret) \
-		$(use_with graphviz) \
-		$(use_with gtk ui) \
-		$(use_with http libsoup) \
-		$(use_enable introspection) \
-		$(use_enable introspection gda-gi) \
-		"$(use_with java java $JAVA_HOME)" \
-		$(use_enable json) \
-		$(use_with ldap) \
-		$(use_with mdb mdb /usr) \
-		$(use_with mysql mysql /usr) \
-		$(use_with oci8 oracle) \
-		$(use_with postgres postgres /usr) \
-		$(use_enable ssl crypto) \
-		$(use_with sourceview gtksourceview) \
-		$(use_enable vala) \
-		$(use_enable vala vala-extensions) \
-		${myconf[@]}
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	java-pkg-opt-2_pkg_preinst
-}
-
-src_install() {
-	gnome2_src_install
-	if use reports; then
-		for t in trml2{html,pdf}; do
-			python_scriptinto /usr/share/libgda-5.0/gda_${t}
-			python_doscript libgda-report/RML/${t}/${t}.py
-		done
-	fi
-}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
deleted file mode 100644
index c72a40986ea2..000000000000
--- a/gnome-extra/libgda/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
-		<flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
-		<flag name="json">Enable support for JSON format</flag>
-		<flag name="mdb">Enable support for Microsoft Access database using <pkg>app-office/mdbtools</pkg></flag>
-		<flag name="reports">Install tools for generating graphical reports</flag>
-		<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-extra/libgsf-1.14.41-r1 b/gnome-extra/libgsf-1.14.41-r1
new file mode 100644
index 000000000000..23a366e29199
--- /dev/null
+++ b/gnome-extra/libgsf-1.14.41-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35.0 dev-libs/gobject-introspection-common virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The GNOME Structured File Library
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/gsf/
+IUSE=bzip2 gtk +introspection
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
+SLOT=0/114
+SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.41.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c61fe0b623c8d40a82087bf359f29171
diff --git a/gnome-extra/libgsf-1.14.43 b/gnome-extra/libgsf-1.14.43
new file mode 100644
index 000000000000..26352d7a861f
--- /dev/null
+++ b/gnome-extra/libgsf-1.14.43
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= ) >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35.0 dev-libs/gobject-introspection-common virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The GNOME Structured File Library
+EAPI=6
+HOMEPAGE=https://developer.gnome.org/gsf/
+IUSE=bzip2 gtk +introspection
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/glib-2.26:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gdk-pixbuf:2 virtual/imagemagick-tools ) introspection? ( >=dev-libs/gobject-introspection-1:= )
+SLOT=0/114
+SRC_URI=mirror://gnome/sources/libgsf/1.14/libgsf-1.14.43.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cb6a80a7a1949eaa46107bceb757b6a3
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
deleted file mode 100644
index 8e868b0c59a0..000000000000
--- a/gnome-extra/libgsf/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST libgsf-1.14.41.tar.xz 616944 BLAKE2B 300da197dcbd5568758da21ea25b25636fcd7b16483a5b526e1c9e0242145208580f6edd41ac1028b7b51fe159eab506a32947ef81beb47883cf133bf2ea9cb7 SHA512 e3892500288e5d1d9e46cdd3940d872ae2504fe54babe2dc085218c3e1a5aff5a7220c88bde730239af4a56c340a22f47337280b8892f0ab31e1e751adea9bc3
-DIST libgsf-1.14.43.tar.xz 618272 BLAKE2B a381125ce75d06ae4bf1c9dbe9b2e207534ff7c3310e40984e482bc5120eae45a7e3ed4cfd878890037f31ee540c700dea3120119b9a533fa79cab317a0c83a8 SHA512 bb487de9358c057fc73f3414c9515726315be9b6d78456253daaca1cbd58281de8766e0b72914532d63fab04d3ae2cf90f711f436c7b4f70620d77e8a7802ac9
-EBUILD libgsf-1.14.41-r1.ebuild 1004 BLAKE2B be7fb620de1def1bcb5a3431c5d8d8416db4ee10ab67d033201ab9c83b11340e96c58f640c61877407d22b81f5abf020597f07d07219ba08c618be44e7b70e90 SHA512 852c7872d67ac45243fb75986064db62e2022bacd714cecbb9613d5f7fc0fd961ffef89c13ad4f57de89791d9df12db1f76e030d9536262edaaae2b8fb13db0c
-EBUILD libgsf-1.14.43.ebuild 1005 BLAKE2B 9eaf6b7b19bc908bd901be7cb0c12edfad4b2efad49ae40fb6d9295ab1fd81221df6bc54958044f57311c2c08ed4166f0d6e13929cec7bbe4907f9adf86c1031 SHA512 799f7bcc275d74c5ba739e31b60cca301649b06ba3ffe0a86c0fba5138a2a883db2fea3a3b81122cced6b5c3d862f7bd42da8c7e6bb3ccc0c18e5bdcc6a91486
-MISC metadata.xml 320 BLAKE2B 0724d11438ccaab9b8665d8bc0c9787fce2fc77c1d7b45b8400a66bfcf82c904c73dda016327ab27c81eb2c1574a0f568bcc04ed579c5cc0f8f15dc6d52762a7 SHA512 605b3ee95fa1f26d46a52ad9e9e6f14b4ee193bd2427336afa2a2f6379287bbb121cb98629afbc146bc46fb721871143c73dd9af805b27a1d1ac0d912dd7a4f0
diff --git a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
deleted file mode 100644
index 24145aa1ebba..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35.0
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.43.ebuild b/gnome-extra/libgsf/libgsf-1.14.43.ebuild
deleted file mode 100644
index b0aa05ab0d02..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.43.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="https://developer.gnome.org/gsf/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/114" # libgsf-1.so version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 gtk +introspection"
-
-RDEPEND="
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/libxml2-2.4.16:2
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	gtk? (
-		x11-libs/gdk-pixbuf:2
-		virtual/imagemagick-tools
-		)
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35.0
-	dev-libs/gobject-introspection-common
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_with bzip2 bz2) \
-		$(use_enable introspection) \
-		$(use_with gtk gdk-pixbuf)
-}
diff --git a/gnome-extra/libgsf/metadata.xml b/gnome-extra/libgsf/metadata.xml
deleted file mode 100644
index 88797e4b6d00..000000000000
--- a/gnome-extra/libgsf/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="gtk">Enable use of gdk in thumbnailer</flag>
-</use>
-</pkgmetadata>
diff --git a/gnome-extra/metadata.xml b/gnome-extra/metadata.xml
deleted file mode 100644
index a7fd28d99930..000000000000
--- a/gnome-extra/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The gnome-extra category contains additional non-core GNOME packages.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnome-extra enthält zusätzliche GNOME-Pakete die nicht
-		Teil des Basissystems sind.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría gnome-extra contiene paquetes adicionales de GNOME.
-	</longdescription>
-	<longdescription lang="ja">
-		gnome-extraカテゴリーにはGNOMEのコアなし拡張パッケージが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De gnome-extra categorie bevat optionele extra's voor de GNOME desktopomgeving.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnome-extra chứa các gói GNOME bổ sung, không thuộc về các gói cốt lõi.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnome-extra contiene pacchetti vari per GNOME.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnome-extra contém pacotes adicionais de GNOME.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnome-extra zawiera dodatkowe pakiety dla środowiska GNOME.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnome-extra/mousetweaks-3.12.0 b/gnome-extra/mousetweaks-3.12.0
new file mode 100644
index 000000000000..abc8a3e1dce1
--- /dev/null
+++ b/gnome-extra/mousetweaks-3.12.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-desktop-schemas-0.1 x11-libs/libX11 x11-libs/libXtst x11-libs/libXfixes x11-libs/libXcursor >=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Mouse accessibility enhancements for the GNOME desktop
+EAPI=5
+HOMEPAGE=https://live.gnome.org/Mousetweaks/Home
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.25.9:2 >=x11-libs/gtk+-3:3[X] >=gnome-base/gsettings-desktop-schemas-0.1 x11-libs/libX11 x11-libs/libXtst x11-libs/libXfixes x11-libs/libXcursor
+SLOT=0
+SRC_URI=mirror://gnome/sources/mousetweaks/3.12/mousetweaks-3.12.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=aa1c513ab9fb7f27b9c56e393da63c58
diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest
deleted file mode 100644
index 5cb9ddf22bcf..000000000000
--- a/gnome-extra/mousetweaks/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mousetweaks-3.12.0.tar.xz 287236 BLAKE2B e0036131b3f6066b0fdb8dfb92531d1e1c1c1366c14f6016a8c41333892d85b6c7f11a754d82d0f3227b57b80d7bb72f3e0f0264c422fcda5451205ee3fc75a8 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0
-EBUILD mousetweaks-3.12.0.ebuild 613 BLAKE2B 76029c315fd57279884b55c9314bbaf63919a18026d6090d0b05ad548ef28b00d9d083dab77723f76d40b526db0dab25a29f8859262cef7dbe799c133c5b91e9 SHA512 eecf107a61829cec3dce73c205b6c143137f86226b139f1b8db85285a7b147ff576a69b800ba5b31038cbd4cd77e466a981f81b38334ce05fe395a789ec04ffd
-MISC metadata.xml 992 BLAKE2B 4949c671cddff34432cb834515eb2a320e229b92d7d7978195497a027984e8d26545f12b2287a3655dcadd2fcf6f7d0a77a5b1d037af58a5d242b031203f27a0 SHA512 81582de18c045117b2b854561e628cc80ee942179a187787dbaefe835d0498139b05fe5486cbabdb1fbfe0c399be230c5c3cc2a7c18c5de8cf465642873b8f27
diff --git a/gnome-extra/mousetweaks/metadata.xml b/gnome-extra/mousetweaks/metadata.xml
deleted file mode 100644
index 9c5233005cb2..000000000000
--- a/gnome-extra/mousetweaks/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
-		Mousetweaks is an Accessibility Software whose developement started as a GSoC
-		2007 project under Ubuntu. It brings additional fonctionalities to the pointer
-		that allow a user to:
-
-		* open the contextual menu by clicking and holding the left button; it is
-		* for example useful for users that can manipulate only one button
-		* perform the 4 click types (left click, double click, drag click and
-		* right click) by software; it is for example useful for users that are
-		* not able to manipulate any button
-		* to lock the pointer temporarily into an area on the screen; it is
-		* for example useful for people that have to use their pointing
-		* hardware not only for the computer
-	</longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
deleted file mode 100644
index 72ef40bdea12..000000000000
--- a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop"
-HOMEPAGE="https://live.gnome.org/Mousetweaks/Home"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.25.9:2
-	>=x11-libs/gtk+-3:3[X]
-	>=gnome-base/gsettings-desktop-schemas-0.1
-
-	x11-libs/libX11
-	x11-libs/libXtst
-	x11-libs/libXfixes
-	x11-libs/libXcursor
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/nautilus-actions-3.2.3 b/gnome-extra/nautilus-actions-3.2.3
new file mode 100644
index 000000000000..8ddb2836ebe9
--- /dev/null
+++ b/gnome-extra/nautilus-actions-3.2.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Configures programs to be launched when files are selected in Nautilus
+EAPI=5
+HOMEPAGE=http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 FDL-1.3
+RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
+SLOT=3
+SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.3.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38d6672623cba7bff0004028c5b3586f
diff --git a/gnome-extra/nautilus-actions-3.2.4 b/gnome-extra/nautilus-actions-3.2.4
new file mode 100644
index 000000000000..0e34c8d7ba97
--- /dev/null
+++ b/gnome-extra/nautilus-actions-3.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2 dev-util/gdbus-codegen >=dev-util/intltool-0.35.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Configures programs to be launched when files are selected in Nautilus
+EAPI=5
+HOMEPAGE=http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2 FDL-1.3
+RDEPEND=>=dev-libs/glib-2.30:2 >=dev-libs/libxml2-2.6:2 dev-libs/libunique:3 >=gnome-base/libgtop-2.23.1:2 >=gnome-base/nautilus-3 sys-apps/util-linux x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE >=x11-libs/libSM-1 !gnome-extra/nautilus-actions:2
+SLOT=3
+SRC_URI=mirror://gnome/sources/nautilus-actions/3.2/nautilus-actions-3.2.4.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=38d6672623cba7bff0004028c5b3586f
diff --git a/gnome-extra/nautilus-actions/Manifest b/gnome-extra/nautilus-actions/Manifest
deleted file mode 100644
index a700a8a5ad5f..000000000000
--- a/gnome-extra/nautilus-actions/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST nautilus-actions-3.2.3.tar.xz 8238308 BLAKE2B b0a385e2d05794d9e50eebb88ab279a49228493302358f3cfc66a8b70f4defbe7b368190e11c52087097dbc2660a6e251a3930e3415e7e8d6657487484c03f3b SHA512 1b9e4e622ef66b1a05b0a9426fd0de929d8d890a836c4fe83cd127e94e07b33652d6087c9c556e0b56b7724c5f7e328a7e56df3aad517f4add940a96f460ff45
-DIST nautilus-actions-3.2.4.tar.xz 5148812 BLAKE2B e81edf846219b89f3585743d8a3601f21483dff86d601415a968d7f50f9fb4b889038593796d1b442f0395f0c649e7c5c3639b2fc0a42dc05bb7ba6588247709 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0
-EBUILD nautilus-actions-3.2.3.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
-EBUILD nautilus-actions-3.2.4.ebuild 1220 BLAKE2B 547c8cc69486b962f48533d0cc4726950cd3cf9b92366bb90a85afb3e03e12942f6d08a2ac411f8095a0113f6b6abcfc19640c6175618720f26a7485102c0488 SHA512 add9a5a3aa85abc2a8b2e168dd2604d0e2f443ad13e54406c2283d4416449b2adfccdf03e642b9be7670f20dd54bcc8ad7fd9a0f3f66e4c2201bdbd87c140298
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/nautilus-actions/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
deleted file mode 100644
index e26c5a7c91ab..000000000000
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
-HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
-
-LICENSE="GPL-2 FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libunique:3
-	>=gnome-base/libgtop-2.23.1:2
-	>=gnome-base/nautilus-3
-	sys-apps/util-linux
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	>=x11-libs/libSM-1
-
-	!gnome-extra/nautilus-actions:2
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# install docs in /usr/share/doc/${PF}, not ${P}
-	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
-		Makefile.{am,in} \
-		docs/Makefile.{am,in} \
-		docs/nact/Makefile.{am,in} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-deprecated \
-		--disable-gconf \
-		--with-gtk=3
-}
-
-src_install() {
-	gnome2_src_install
-	# Do not install COPYING
-	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-}
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
deleted file mode 100644
index e26c5a7c91ab..000000000000
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Configures programs to be launched when files are selected in Nautilus"
-HOMEPAGE="http://www.nautilus-actions.org/ https://git.gnome.org/browse/nautilus-actions/"
-
-LICENSE="GPL-2 FDL-1.3"
-SLOT="3"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.30:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libunique:3
-	>=gnome-base/libgtop-2.23.1:2
-	>=gnome-base/nautilus-3
-	sys-apps/util-linux
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
-	>=x11-libs/libSM-1
-
-	!gnome-extra/nautilus-actions:2
-"
-DEPEND="${RDEPEND}
-	dev-util/gdbus-codegen
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# install docs in /usr/share/doc/${PF}, not ${P}
-	sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \
-		Makefile.{am,in} \
-		docs/Makefile.{am,in} \
-		docs/nact/Makefile.{am,in} || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-deprecated \
-		--disable-gconf \
-		--with-gtk=3
-}
-
-src_install() {
-	gnome2_src_install
-	# Do not install COPYING
-	rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die
-}
diff --git a/gnome-extra/nautilus-dropbox-1.6.2 b/gnome-extra/nautilus-dropbox-1.6.2
new file mode 100644
index 000000000000..d736802c8d71
--- /dev/null
+++ b/gnome-extra/nautilus-dropbox-1.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama virtual/pkgconfig dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Store, Sync and Share Files Online
+EAPI=5
+HOMEPAGE=https://www.dropbox.com
+IUSE=debug python_targets_python2_7 kernel_linux debug
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://www.dropbox.com/download?dl=packages/nautilus-dropbox-1.6.2.tar.bz2
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	linux-info	8e77ea4def23d38cdf0e8ffa69187d34	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4e4a93108927fc3745425ce25075a45a
diff --git a/gnome-extra/nautilus-dropbox/Manifest b/gnome-extra/nautilus-dropbox/Manifest
deleted file mode 100644
index fec599d546fa..000000000000
--- a/gnome-extra/nautilus-dropbox/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX nautilus-dropbox-0.7.0-system-rst2man.patch 463 BLAKE2B fdb1996d7144cd9c6943111cf1a4abd9a55f9a594131985c1f0c40eec7c203b2d2839fdf2e673480bb329735dce27e31cbcdee8bdd2c019df678620d374095aa SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb
-DIST nautilus-dropbox-1.6.2.tar.bz2 354408 BLAKE2B 7a3d1cee88dc595fc43f92d84328cf112755d2aa98a99e84e24d132b6167fb5378cc4e9914c31510d38deadc952caed1debdea7ae07dcd0a7b58e72790af428a SHA512 696808a7e5a1d8bbe06903b5ab075e0aa32d0b35c44363d7874fcdd48d339650bdf80190e37cba5782b31565ca9b233573a3d2ee74866add169ff5ea1d0b62d3
-EBUILD nautilus-dropbox-1.6.2.ebuild 2151 BLAKE2B d46812b55e47b3f7a3b94816cb44782ca7fc8c97dd577aaffe1044717a4aa025c6d0e0a8ef8965ff8fbae8836f37db0709c24b0bfc59323efd91641fbd7c9dae SHA512 d173c45b3b1e6a69f4c908da25aa217cc65f381621b4c1cd039e719131ecdf0e34955453dde9d50d062a78c44022d1d80ba2db33b8217464b33f3c4baee9a7f7
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch b/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
deleted file mode 100644
index ea0053b4bbb6..000000000000
--- a/gnome-extra/nautilus-dropbox/files/nautilus-dropbox-0.7.0-system-rst2man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nautilus-dropbox-0.7.0/configure.in
-===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.in
-+++ nautilus-dropbox-0.7.0/configure.in
-@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
- 
- AC_PATH_PROG([PYTHON], [python])
- 
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-+AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
- AC_SUBST(RST2MAN)
- 
- # define module checking macro
diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
deleted file mode 100644
index 1419c0468b89..000000000000
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils python-r1 linux-info gnome2 readme.gentoo user
-
-DESCRIPTION="Store, Sync and Share Files Online"
-HOMEPAGE="https://www.dropbox.com"
-SRC_URI="https://www.dropbox.com/download?dl=packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	gnome-base/nautilus
-	dev-libs/glib:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	net-misc/dropbox
-	x11-libs/gtk+:2
-	x11-libs/libnotify
-	x11-libs/libXinerama"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-python/docutils[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	check_extra_config
-	enewgroup dropbox
-
-	DOC_CONTENTS="Add any users who wish to have access to the dropbox nautilus
-		plugin to the group 'dropbox'. You need to setup a drobox account
-		before using this plugin. Visit ${HOMEPAGE} for more information."
-
-	python_export_best
-}
-
-src_prepare() {
-	G2CONF="${G2CONF} $(use_enable debug) --disable-static"
-
-	gnome2_src_prepare
-
-	# use sysem dropbox
-	sed \
-		-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
-		-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
-		-i dropbox.in || die
-	# us system rst2man
-	epatch "${FILESDIR}"/${PN}-0.7.0-system-rst2man.patch
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in || die
-	AT_NOELIBTOOLIZE=yes eautoreconf
-}
-
-src_install () {
-	gnome2_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libnautilus-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get nautilus extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D
-	extensiondir="${extensiondir#${EPREFIX}}"
-
-	use prefix || fowners root:dropbox "${extensiondir}"/libnautilus-dropbox.so
-	fperms o-rwx "${extensiondir}"/libnautilus-dropbox.so
-
-	readme.gentoo_create_doc
-
-	python_replicate_script "${ED}"/usr/bin/dropbox
-}
-
-pkg_postinst () {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/nautilus-sendto-3.8.5 b/gnome-extra/nautilus-sendto-3.8.5
new file mode 100644
index 000000000000..b1c749d92d2d
--- /dev/null
+++ b/gnome-extra/nautilus-sendto-3.8.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-libs/gtk+-2.90.3:3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A nautilus extension for sending files to locations
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/nautilus-sendto/
+IUSE=debug
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gtk+-2.90.3:3
+SLOT=0
+SRC_URI=mirror://gnome/sources/nautilus-sendto/3.8/nautilus-sendto-3.8.5.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ac63667a62db2fda039be843b541cf3e
diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest
deleted file mode 100644
index 8cda69248766..000000000000
--- a/gnome-extra/nautilus-sendto/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nautilus-sendto-3.8.5.tar.xz 382440 BLAKE2B 30c842c04838c52eb41b1d808828ea7a00a9811a634f96e7bdfb559eb01569db6bedf0f4f6b504df8a5a13c1400ad9ca548298faceee9abc97377d034ab41dc1 SHA512 d9b504d5615e761f19b7b4610d394ac9b928023163b3e416aca114f168330d3b35617ee8e80338cce2248151096a6e2094576e7978b80076d5eedb9bb847bfa3
-EBUILD nautilus-sendto-3.8.5.ebuild 997 BLAKE2B 571fc12497f3238790e580b907793fac2a09f3b54f0c0b4ad900c76f2df54e6b8cc3e7388db9b105099c9aa64363f154ea767a7cb3afae8cf630651cecb71dbd SHA512 a1cec99ec57bbfa246e6baf6e513dc69ed2b15e27749f522474dbb5ff486d2fba7132c5ed12b78d51e6315cd043a31cf22038e2aae91d48e093d807a8df32b7e
-MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
deleted file mode 100644
index 996e7cacd217..000000000000
--- a/gnome-extra/nautilus-sendto/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
deleted file mode 100644
index 99ff5a458ea4..000000000000
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A nautilus extension for sending files to locations"
-HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug"
-
-RDEPEND="
-	>=x11-libs/gtk+-2.90.3:3
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Needed for eautoreconf
-#	>=gnome-base/gnome-common-0.12
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Does not require introspection at all, bug #561008
-	sed -i -e 's/\(^ \+enable_introspection\)=yes/\1=no/' configure || die
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ')
-}
-
-pkg_postinst() {
-	if ! has_version "gnome-base/nautilus[sendto]"; then
-		einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]"
-	fi
-}
diff --git a/gnome-extra/nautilus-tracker-tags-1.12.4 b/gnome-extra/nautilus-tracker-tags-1.12.4
new file mode 100644
index 000000000000..f7ecf8426df4
--- /dev/null
+++ b/gnome-extra/nautilus-tracker-tags-1.12.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare setup
+DEPEND=~app-misc/tracker-1.12.4 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 app-arch/xz-utils
+DESCRIPTION=Nautilus extension to tag files for Tracker
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Tracker
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2
+RDEPEND=~app-misc/tracker-1.12.4 >=dev-libs/glib-2.44:2 >=gnome-base/nautilus-2.90 x11-libs/gtk+:3 !<app-misc/tracker-0.12.5-r1[nautilus]
+SLOT=0
+SRC_URI=mirror://gnome/sources/tracker/1.12/tracker-1.12.4.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=d32de93d65790b02545a2da6caac7f1b
diff --git a/gnome-extra/nautilus-tracker-tags/Manifest b/gnome-extra/nautilus-tracker-tags/Manifest
deleted file mode 100644
index 58f53b0ed98b..000000000000
--- a/gnome-extra/nautilus-tracker-tags/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.12.5-Makefile 759 BLAKE2B c7c184be791db0f74dc0ade23d30297ae06de599ad0317c6973c262e2df2ed93468a8737c454b63f089886c07a4d9c45e8e1117d057b0feb5e27c3e4e5be3f5f SHA512 57731bd3626b33c34f10f84cbe21654eedb2bbee7a374f78ae2015e9bfaf273f7cf797d5a5a7e31ab7ebfb6a8e7241dc7735126634ce455dc57f057158b21b8d
-DIST tracker-1.12.4.tar.xz 5051884 BLAKE2B 99cc85fc4d49691eb0a73e4f1776d9971b5cbe5844478825e473137b4d7b13e2578065be497da57285abc2d3cf4c6d1ed1b077a01cd68dc093e18ddd7674c1f1 SHA512 e81af22733c7d80535c79e23a4b3edbbcf888eede1dff071d466518054e90d4c207af76bcb4d8c73dc20729ae2eab60444ca91ee7ae09e96c0da2fdab97752c1
-EBUILD nautilus-tracker-tags-1.12.4.ebuild 969 BLAKE2B dc8b84e61d4b1fa24665275fdd025839d657845ed80ee9c0798cf79d536372755dbcfae8b95edc34dc2f60ae9b55a2d6749bb74a965b773f488e4516df702191 SHA512 20de68b14de7403987569922ad78ba8004b0a150a1bbb0be8bc19bb526ab237538af0700f7b3687b3ddb669ec3ea3f7e9999c6365cb0138afb6bbf938b76c5bb
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile b/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
deleted file mode 100644
index c2aececf863d..000000000000
--- a/gnome-extra/nautilus-tracker-tags/files/0.12.5-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-EXTENSIONDIR := $(shell pkg-config --variable=extensiondir libnautilus-extension)
-CFLAGS := -fPIC $(CFLAGS) $(shell pkg-config --cflags glib-2.0 gtk+-3.0 libnautilus-extension tracker-sparql-$(TRACKER_API))
-LIBS := $(shell pkg-config --libs glib-2.0 gtk+-3.0 libnautilus-extension tracker-sparql-$(TRACKER_API))
-RPATH := $(shell pkg-config --variable=libdir tracker-sparql-$(TRACKER_API))/tracker-$(TRACKER_API)
-INSTALL = install
-
-object_files = tracker-tags-extension.o tracker-tags-utils.o tracker-tags-view.o
-
-libnautilus-tracker-tags.so: $(object_files)
-	$(CC) -shared -Wl,-rpath=$(RPATH) -Wl,-soname=$@ $(LDFLAGS) $^ $(LIBS) -o $@
-
-install: libnautilus-tracker-tags.so
-	$(INSTALL) -d $(DESTDIR)$(EXTENSIONDIR)/
-	$(INSTALL) $^ $(DESTDIR)$(EXTENSIONDIR)/
-
diff --git a/gnome-extra/nautilus-tracker-tags/metadata.xml b/gnome-extra/nautilus-tracker-tags/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/nautilus-tracker-tags/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
deleted file mode 100644
index 0dedff4b8909..000000000000
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.12.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="tracker"
-
-inherit gnome.org toolchain-funcs
-
-DESCRIPTION="Nautilus extension to tag files for Tracker"
-HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-COMMON_DEPEND="
-	~app-misc/tracker-${PV}
-	>=dev-libs/glib-2.44:2
-	>=gnome-base/nautilus-2.90
-	x11-libs/gtk+:3
-"
-RDEPEND="${COMMON_DEPEND}
-	!<app-misc/tracker-0.12.5-r1[nautilus]
-"
-# Before tracker-0.12.5-r1, nautilus-tracker-tags was part of tracker
-DEPEND="${COMMON_DEPEND}"
-
-S="${S}/src/plugins/nautilus"
-
-pkg_setup() {
-	tc-export CC
-	export TRACKER_API=1.0
-}
-
-src_prepare() {
-	default
-	cp "${FILESDIR}/0.12.5-Makefile" Makefile || die "cp failed"
-	# config.h is not used, but is included in every source file...
-	sed -e 's:#include "config.h"::' -i *.c *.h || die "sed failed"
-}
diff --git a/gnome-extra/nemo-3.6.4 b/gnome-extra/nemo-3.6.4
new file mode 100644
index 000000000000..c16bb6e27e3b
--- /dev/null
+++ b/gnome-extra/nemo-3.6.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) || ( ( dev-lang/python:3.6 dev-python/polib[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/pygobject:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/polib[python_targets_python3_5(-),python_single_target_python3_5(+)] dev-python/pygobject:3[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/polib[python_targets_python3_4(-),python_single_target_python3_4(+)] dev-python/pygobject:3[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-lang/perl-5 >=dev-util/gdbus-codegen-2.31.0 dev-util/gtk-doc-am >=dev-util/intltool-0.40.1 sys-devel/gettext virtual/pkgconfig x11-base/xorg-proto dev-util/gtk-doc gnome-base/gnome-common >=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A file manager for Cinnamon, forked from Nautilus
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=exif +introspection +nls packagekit tracker xmp test
+KEYWORDS=amd64 x86
+LICENSE=GPL-2+ LGPL-2+ FDL-1.1
+PDEPEND=>=gnome-base/gvfs-0.1.2
+RDEPEND=>=dev-libs/glib-2.37.3:2[dbus] >=gnome-extra/cinnamon-desktop-2.6.1:0= >=x11-libs/pango-1.28.3 >=x11-libs/gtk+-3.9.10:3[introspection?] >=dev-libs/libxml2-2.7.8:2 gnome-base/dconf:0= gnome-base/gsettings-desktop-schemas >=x11-libs/libnotify-0.7:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrender >=x11-libs/xapps-1.0.4 exif? ( >=media-libs/libexif-0.6.20:= ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) tracker? ( >=app-misc/tracker-0.12:= ) xmp? ( >=media-libs/exempi-2.2.0:= ) sys-libs/libselinux x11-themes/adwaita-icon-theme nls? ( >=gnome-extra/cinnamon-translations-2.2 )
+SLOT=0
+SRC_URI=https://github.com/linuxmint/nemo/archive/3.6.4.tar.gz -> nemo-3.6.4.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef682f1d7301babf2cd15faf95213dbb
diff --git a/gnome-extra/nemo/Manifest b/gnome-extra/nemo/Manifest
deleted file mode 100644
index dbebfeb259be..000000000000
--- a/gnome-extra/nemo/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST nemo-3.6.4.tar.gz 1433265 BLAKE2B 0640ad5e803d955072d0773ef3ea20739d6189720defbf3db6fc48da503b7cb72f8c33302542799933499f2f5c0e28c8e706da77f9943362e7db23eb9c4d6a21 SHA512 a8541e8944ce44b3f62ad0211c550509704f3210ce4aaaebcaefcb50a358f018eb01fba26d18ea8edbd662dab2b915fb7c4f4704e8468f6b9b3f4b636bf0d87e
-EBUILD nemo-3.6.4.ebuild 2083 BLAKE2B a42237f3a60077c8c317c0bf986c3fa35b8850a5a76adee061c7dd036dc6f2a25623182cfe11b7aa44a6d0966575d36b853ca8828f0d1eb9e4c1742466b1f8ff SHA512 a0e21b561853d86f9dd5304112bd924b46993d163c86354e9937dba2105d830d465e872e3f5ad84b38692ea039647432b26ef4f0c9be643f92a5342c2b9eefcb
-MISC metadata.xml 525 BLAKE2B 62bd5c4d9f4c8dfc2d82f2d24f7f9a3281f18fe10be1538edf6d91ab0760fd01f6dcb7d3b71bb3a65c923b904f91559db8e3622ab9af76f6778e213b2c60e640 SHA512 9c60022c7a5054ee0271b3b412aa6fcc8271247756438a5323bd5acb4a5a0b5d781dc256de6b68a51e276d0ca1dccc434cd718fa51682d8fa6a8cf5ae26350a9
diff --git a/gnome-extra/nemo/metadata.xml b/gnome-extra/nemo/metadata.xml
deleted file mode 100644
index b3526b807770..000000000000
--- a/gnome-extra/nemo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cinnamon@gentoo.org</email>
-		<name>Cinnamon Project</name>
-	</maintainer>
-	<use>
-		<flag name="packagekit">Use packagekit to search for programs to open unknown file types</flag>
-		<flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> search</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">linuxmint/nemo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnome-extra/nemo/nemo-3.6.4.ebuild b/gnome-extra/nemo/nemo-3.6.4.ebuild
deleted file mode 100644
index d840df8f6897..000000000000
--- a/gnome-extra/nemo/nemo-3.6.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools eutils gnome2 python-any-r1 virtualx
-
-DESCRIPTION="A file manager for Cinnamon, forked from Nautilus"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="exif +introspection +nls packagekit tracker xmp"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.37.3:2[dbus]
-	>=gnome-extra/cinnamon-desktop-2.6.1:0=
-	>=x11-libs/pango-1.28.3
-	>=x11-libs/gtk+-3.9.10:3[introspection?]
-	>=dev-libs/libxml2-2.7.8:2
-
-	gnome-base/dconf:0=
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/libnotify-0.7:=
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	>=x11-libs/xapps-1.0.4
-
-	exif? ( >=media-libs/libexif-0.6.20:= )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	tracker? ( >=app-misc/tracker-0.12:= )
-	xmp? ( >=media-libs/exempi-2.2.0:= )
-	sys-libs/libselinux
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/adwaita-icon-theme
-	nls? ( >=gnome-extra/cinnamon-translations-2.2 )
-"
-
-PDEPEND=">=gnome-base/gvfs-0.1.2"
-
-DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/polib[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=dev-lang/perl-5
-	>=dev-util/gdbus-codegen-2.31.0
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig
-	x11-base/xorg-proto
-
-	dev-util/gtk-doc
-	gnome-base/gnome-common
-"
-# For eautoreconf
-#	gnome-base/gnome-common, dev-util/gtk-doc (not only -am!)
-
-src_prepare() {
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable exif libexif) \
-		$(use_enable introspection) \
-		$(use_enable tracker) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/libnemo-private" || die
-
-	cd src # we don't care about translation tests
-	GSETTINGS_SCHEMA_DIR="${S}/libnemo-private" virtx emake check
-}
diff --git a/gnome-extra/nm-applet-1.4.6-r1 b/gnome-extra/nm-applet-1.4.6-r1
new file mode 100644
index 000000000000..26a40b47c8ba
--- /dev/null
+++ b/gnome-extra/nm-applet-1.4.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection +modemmanager teamd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=app-crypt/libsecret >=dev-libs/glib-2.32:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.4:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= modemmanager? ( net-misc/modemmanager ) teamd? ( >=dev-libs/jansson-2.3 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.4/network-manager-applet-1.4.6.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1f5fe521f5774e0cae6f38d216c617d1
diff --git a/gnome-extra/nm-applet-1.8.10 b/gnome-extra/nm-applet-1.8.10
new file mode 100644
index 000000000000..8ea0c14ec1cf
--- /dev/null
+++ b/gnome-extra/nm-applet-1.8.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection gcr +modemmanager selinux teamd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.10.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7815e5a601605fc3f633f48621f3372f
diff --git a/gnome-extra/nm-applet-1.8.10-r1 b/gnome-extra/nm-applet-1.8.10-r1
new file mode 100644
index 000000000000..dafd214ffe4c
--- /dev/null
+++ b/gnome-extra/nm-applet-1.8.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 ) >=dev-util/gtk-doc-am-1.0 >=dev-util/intltool-0.50.1 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=GNOME applet for NetworkManager
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=+introspection +gcr +modemmanager selinux teamd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+PDEPEND=virtual/notification-daemon
+RDEPEND=>=app-crypt/libsecret-0.18 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/dbus-glib-0.88 >=sys-apps/dbus-1.4.1 >=sys-auth/polkit-0.96-r1 >=x11-libs/gtk+-3.10:3[introspection?] >=x11-libs/libnotify-0.7.0 app-text/iso-codes >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) modemmanager? ( net-misc/modemmanager ) selinux? ( sys-libs/libselinux ) teamd? ( >=dev-libs/jansson-2.7 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/network-manager-applet/1.8/network-manager-applet-1.8.10.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cf44c99ac3cf4c11521c55086ebac502
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
deleted file mode 100644
index 66e429550de1..000000000000
--- a/gnome-extra/nm-applet/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX 1.4.6-CVE-2017-6590.patch 8963 BLAKE2B d725254a4cee53f4d24aaa062f1782ecf4e5c5aad841d9d473660e94c021dc7576fb1ee57b3d61da3eb18ae508472cda1c0ea52c618f66649e688910991fb928 SHA512 7798b5f62b971c505e0d1569ea9daabe0683e6aadd2ecb6e653e7927e14f47fb0e672aee874f5125eff50aa56916f74bd0756f9433cfa0b040723bcc4a2b9532
-AUX 1.4.6-fix-nma-bindings.patch 1350 BLAKE2B e09dbb79718de55270405de02efd48c0df45448e3073762088523070346076c0fa0c42813beeb3de377108c55516908e9b37440f8089a308d9840be74d8d1a41 SHA512 a2237c8fd94260c1681e97aabe6a8c203acb5e743996c280e6e7f8890cf4ccf1525c7d61d768e3418915258ef2a9416614a41eee6d223e4db11f1f168c17cf4f
-AUX 1.4.6-fix-translations-in-g-c-c.patch 4530 BLAKE2B 34f76eb8ffc74d58be05e05dfe636ca594149b1a101c2611d4df896e2148519d18087ebd12a3cc5e17253be5e57bf6bf90ed87aa5895e5a100fbfc82f74e4fbf SHA512 3af403696d1e647bfdf5a2316c17064b7fd4eb07c4ccce6d23fb0b6ce59143a90ba5b37377ed559d3abbe7fbe06642958c8a59b39cb67c19541dd6dd81831f7d
-AUX 1.4.6-improved-certfile-error-msg.patch 1481 BLAKE2B ca880144ffe78153b4989399d883def5d318668e886449f2bb2fdf094742cf2a6d25e6fa36fd6faba505d9caa97771fd6c1969c721bf14352c8665b072f07fca SHA512 dce3cbd0e8184d2558ffc63b068b7d1d396473f428fdba60c566eb1c5aae8c2519ee427516efebd63e69518ca55cac86c21db18a3753dd2780f0db2743d80bad
-AUX nm-applet-1.8.10-cert-chooser.patch 1421 BLAKE2B 6c867f5cca1c3b67a27cdfc9a80da728be65f80a8619dcfa0d53f910884e56d7cc1e6c2aa4a2661079d29f3abd49257a0720d59c09d0ba8024e140dc086ce033 SHA512 79ac1445ee0885b63092f28d2fbfd74b6b926696d44ee0ff47d079adc293301c05b8984ad812c66d4b7cab34c32902faed467fee1a2f14af66d2c43914858ed6
-AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c29961234c8f8f1f0002bd7a4275cdd2631e5a3961f011c73c9c1a9ee77b2471945d5ce83c5120b2b26e8395f5666338e64b067359 SHA512 e2a9bc66b13f84270ac9735315d197c1ab264c99e5941218df310ebaa40900490661dec5f5972734e75c89b6db27530fd6ef02ad91a61a20c0eb388cff0b42aa
-DIST network-manager-applet-1.4.6.tar.xz 1388916 BLAKE2B 697587e4451d37ab91e99e25e40a1d797724e26568d252c77361e25f32508722a58dba1b2b4d2c784150479493c0451173da0b42314ebb17f1b7215628675444 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f
-DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372
-EBUILD nm-applet-1.4.6-r1.ebuild 1670 BLAKE2B 3119a19f109ee03c9a149167b4e11812b6303fda297485f61c5494c669dbdb99e9b40e0721d8c9180ab7ea95af1e1d20f83a96f85c3915fc53fb3f2f67e8ffaf SHA512 ba565628ef8430a0e93e85ee5495409cd36094801a5ec9cf6207df3cf829405a0c74848e8840c4e6d0cb9ceb642d8abe3f888fc793e57bf9272f66ebb6fe7cf5
-EBUILD nm-applet-1.8.10-r1.ebuild 1782 BLAKE2B d4f25b89b7005270718ac2c0ede3ee063a33f8b434b6033826b5ffe793d7be4d409c0227ccefe84f6479545c636799f22e775ba3f7b8b84cbc71fb80d986e91f SHA512 03855f3ffcf930d139197f33cf2a646dc17071d2634a65021949c2e4845e5244364672b235de56a09828ef162cd1320976481df3e7026cfc802535b1646a966d
-EBUILD nm-applet-1.8.10.ebuild 1521 BLAKE2B 745e2371612905c6d42ff9bc57b1e29f4bfcf078a0ed32ee5bcd9bd6f106d7f44204e84fdeca46701fa64fee6cecad28d155a5b4a56d0fa08514c246b95930fa SHA512 4c498d9b8bba82485134556025b9be43640a259bbb01be404537c655102a1d08198c58c9f28e4bc0b720810a5d4842e92b67885303f6b0a6a3c279bc65224166
-MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067
diff --git a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch b/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
deleted file mode 100644
index 25270e1f4c83..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-This is a squashed to one diff of the following 3 upstream commits:
-
-From d1ebd01abfad506d9a8797a252d4549c2df2045a Mon Sep 17 00:00:00 2001
-From: Iain Lane <iain@orangesquash.org.uk>
-Date: Fri, 3 Mar 2017 12:27:23 +0000
-Subject: [PATCH 1/3] applet: check permissions before showing 802.1x wifi
- dialog (CVE-2017-6590)
-
-In most places, we (or NM) check permissions before performing actions.
-One place we don't is when we need more information when connecting to
-and 802.1x network. In that case we pop up a dialog to ask for more
-information before initiaing the connection.
-
-The dialog contains a GTK+ filechooser. We don't want unprivileged users
-to have access to this as it allows opening files.
-
-Check for MODIFY_SYSTEM or MODIFY_OWN before showing the dialog for
-802.1x connections. If the user doesn't have or can't get it, don't show
-the dialog. They wouldn't have been able to create the connection
-anyway.
-
-This fixes CVE-2017-6590.
-
-https://mail.gnome.org/archives/networkmanager-list/2017-March/msg00032.html
-https://bugs.launchpad.net/bugs/1668321
-
-[bgalvani@redhat.com: changed commit subject line, added links]
-
-(cherry picked from commit 523d0439c9d5633daccc77474f793c82cbd731ee)
-
-From f1f61ade24296b93044b9719fb2de1b561955e83 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 Mar 2017 14:18:06 +0100
-Subject: [PATCH 2/3] applet-device-wifi: remove unused functions
-
-They are not needed since commit 9b002809514a ("applet: remove usage
-of dbus-glib and private session D-Bus API").
-
-(cherry picked from commit d1c7f4d61f2eca23d90078c587059e4d8d11d3fc)
-
-From 7a582c5e6536b9e9a542d4791ae38a9d2840936b Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Tue, 14 Mar 2017 14:37:19 +0100
-Subject: [PATCH 3/3] applet-device-wifi: return FALSE on failure of
- new_auto_connection() method
-
-If the permission check fails, we never run the callback: return FALSE
-so that the caller can free resources.
-
-(cherry picked from commit 38303e04cefb56a0a2176c5e30b399b14f21fc05)
-
-diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
-index 7b8fa6e..cd44e05 100644
---- a/src/applet-device-wifi.c
-+++ b/src/applet-device-wifi.c
-@@ -40,12 +40,6 @@ static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer
- 
- static NMAccessPoint *update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet);
- 
--static void _do_new_auto_connection (NMApplet *applet,
--                                     NMDevice *device,
--                                     NMAccessPoint *ap,
--                                     AppletNewAutoConnectionCallback callback,
--                                     gpointer callback_data);
--
- /*****************************************************************************/
- 
- typedef struct {
-@@ -292,74 +286,6 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
- 		gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE);
- }
- 
--static void
--dbus_8021x_add_and_activate_cb (GObject *client,
--                                GAsyncResult *result,
--                                gpointer user_data)
--{
--	GError *error = NULL;
--	NMActiveConnection *active;
--
--	active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
--	if (error)
--		g_warning ("Failed to add/activate connection: (%d) %s", error->code, error->message);
--
--	g_clear_object (&active);
--	g_clear_error (&error);
--}
--
--typedef struct {
--	NMApplet *applet;
--	NMDevice *device;
--	NMAccessPoint *ap;
--} Dbus8021xInfo;
--
--static void
--dbus_connect_8021x_cb (NMConnection *connection,
--                       gboolean auto_created,
--                       gboolean canceled,
--                       gpointer user_data)
--{
--	Dbus8021xInfo *info = user_data;
--
--	if (canceled == FALSE) {
--		g_return_if_fail (connection != NULL);
--
--		/* Ask NM to add the new connection and activate it; NM will fill in the
--		 * missing details based on the specific object and the device.
--		 */
--		nm_client_add_and_activate_connection_async (info->applet->nm_client,
--		                                             connection,
--			                                     info->device,
--			                                     nm_object_get_path (NM_OBJECT (info->ap)),
--		                                             NULL,
--			                                     dbus_8021x_add_and_activate_cb,
--			                                     info->applet);
--	}
--
--	g_object_unref (info->device);
--	g_object_unref (info->ap);
--	memset (info, 0, sizeof (*info));
--	g_free (info);
--}
--
--gboolean
--applet_wifi_connect_to_8021x_network (NMApplet *applet,
--                                      NMDevice *device,
--                                      NMAccessPoint *ap)
--{
--	Dbus8021xInfo *info;
--
--	info = g_malloc0 (sizeof (*info));
--	info->applet = applet;
--	info->device = g_object_ref (device);
--	info->ap = g_object_ref (ap);
--
--	_do_new_auto_connection (applet, device, ap, dbus_connect_8021x_cb, info);
--	return TRUE;
--}
--
--
- typedef struct {
- 	NMApplet *applet;
- 	NMDeviceWifi *device;
-@@ -514,17 +440,28 @@ done:
- 	gtk_widget_destroy (GTK_WIDGET (dialog));
- }
- 
--static void
--_do_new_auto_connection (NMApplet *applet,
--                         NMDevice *device,
--                         NMAccessPoint *ap,
--                         AppletNewAutoConnectionCallback callback,
--                         gpointer callback_data)
-+static gboolean
-+can_get_permission (NMApplet *applet, NMClientPermission perm)
- {
--	NMConnection *connection = NULL;
--	NMSettingConnection *s_con = NULL;
-+	if (   applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_YES
-+	    || applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_AUTH)
-+		return TRUE;
-+	return FALSE;
-+}
-+
-+static gboolean
-+wifi_new_auto_connection (NMDevice *device,
-+                          gpointer dclass_data,
-+                          AppletNewAutoConnectionCallback callback,
-+                          gpointer callback_data)
-+{
-+	WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
-+	NMApplet *applet;
-+	NMAccessPoint *ap;
-+	NMConnection *connection;
-+	NMSettingConnection *s_con;
- 	NMSettingWireless *s_wifi = NULL;
--	NMSettingWirelessSecurity *s_wsec = NULL;
-+	NMSettingWirelessSecurity *s_wsec;
- 	NMSetting8021x *s_8021x = NULL;
- 	GBytes *ssid;
- 	NM80211ApSecurityFlags wpa_flags, rsn_flags;
-@@ -532,9 +469,13 @@ _do_new_auto_connection (NMApplet *applet,
- 	MoreInfo *more_info;
- 	char *uuid;
- 
--	g_assert (applet);
--	g_assert (device);
--	g_assert (ap);
-+	g_return_val_if_fail (dclass_data, FALSE);
-+	g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
-+	g_return_val_if_fail (NM_IS_ACCESS_POINT (info->ap), FALSE);
-+	g_return_val_if_fail (NM_IS_APPLET (info->applet), FALSE);
-+
-+	applet = info->applet;
-+	ap = info->ap;
- 
- 	connection = nm_simple_connection_new ();
- 
-@@ -590,6 +531,15 @@ _do_new_auto_connection (NMApplet *applet,
- 	 * Dialog Of Doom.
- 	 */
- 	if (s_8021x) {
-+		if (!can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) &&
-+		    !can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) {
-+			const char *text = _("Failed to add new connection");
-+			const char *err_text = _("Insufficient privileges.");
-+			g_warning ("%s: %s", text, err_text);
-+			utils_show_error_dialog (_("Connection failure"), text, err_text, FALSE, NULL);
-+			g_clear_object (&connection);
-+			return FALSE;
-+		}
- 		more_info = g_malloc0 (sizeof (*more_info));
- 		more_info->applet = applet;
- 		more_info->callback = callback;
-@@ -606,24 +556,10 @@ _do_new_auto_connection (NMApplet *applet,
- 		/* Everything else can just get activated right away */
- 		callback (connection, TRUE, FALSE, callback_data);
- 	}
--}
- 
--static gboolean
--wifi_new_auto_connection (NMDevice *device,
--                          gpointer dclass_data,
--                          AppletNewAutoConnectionCallback callback,
--                          gpointer callback_data)
--{
--	WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
--
--	g_return_val_if_fail (device != NULL, FALSE);
--	g_return_val_if_fail (info->ap != NULL, FALSE);
--
--	_do_new_auto_connection (info->applet, device, info->ap, callback, callback_data);
- 	return TRUE;
- }
- 
--
- static void
- wifi_menu_item_activate (GtkMenuItem *item, gpointer user_data)
- {
-diff --git a/src/applet.h b/src/applet.h
-index 41e95a1..b28dfa2 100644
---- a/src/applet.h
-+++ b/src/applet.h
-@@ -285,9 +285,6 @@ GdkPixbuf * nma_icon_check_and_load (const char *name,
-                                      NMApplet *applet);
- 
- gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet);
--gboolean applet_wifi_connect_to_8021x_network (NMApplet *applet,
--                                               NMDevice *device,
--                                               NMAccessPoint *ap);
- gboolean applet_wifi_create_wifi_network (NMApplet *applet);
- gboolean applet_wifi_can_create_wifi_network (NMApplet *applet);
- 
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch b/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
deleted file mode 100644
index 2a04a5327394..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 58e47dc92d38974141e1053b25cae02d7c8414b0 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Tue, 7 Mar 2017 09:43:03 +0100
-Subject: [PATCH] libnma/pygobject: libnma/NMA must use libnm/NM instead of
- legacy libraries
-
-libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings
-must load "NM" and not "NMClient"/"NetworkManager".
-
-As it was, the generated bindings for libnma were unusable and loading
-them would fail with
-
-    libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported
-
-https://bugzilla.gnome.org/show_bug.cgi?id=779153
-
-Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7
-(cherry picked from commit 7a59d41e5f6666d0da51f1f7aae7518befdb1182)
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index a57e15f..e76c9ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -532,7 +532,7 @@ pkgconfig_DATA += src/libnma/libnma.pc
- 
- if HAVE_INTROSPECTION
- src/libnma/NMA-1.0.gir: src/libnma/libnma.la
--src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
-+src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
- src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
- src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
- src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
--- 
-2.10.1
-
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch b/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
deleted file mode 100644
index 8a1fe825e38e..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 718b24286559169ba29f89536c3f6c81dcfe6e30 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Mon, 13 Mar 2017 21:57:28 +0100
-Subject: [PATCH] libnma,libnm-gtk: use package-aware gettext() macro
-
-gettext("str") expands to dcgettext(NULL, "str") which gets
-translations from the last used domain, while _("str") is equivalent
-to g_dgettext(GETTEXT_PACKAGE, "str") which uses the library's
-translations.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=772362
-(cherry picked from commit 9df10e2e758a7b78aa5a69a15900030f45e48fff)
----
- src/libnm-gtk/nm-ui-utils.c | 10 +++++-----
- src/libnma/nma-ui-utils.c   | 10 +++++-----
- 2 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
-index e92ff80..eec9a5f 100644
---- a/src/libnm-gtk/nm-ui-utils.c
-+++ b/src/libnm-gtk/nm-ui-utils.c
-@@ -642,7 +642,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
- 	                                   icon_name_table[item]);
- 	gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
- 	                                 GTK_ENTRY_ICON_SECONDARY,
--	                                 gettext (icon_desc_table[item]));
-+	                                 _(icon_desc_table[item]));
- 
- 	/* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
- 	 * Unfortunately, making GtkEntry insensitive will also make the icon
-@@ -843,12 +843,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
- 	g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
- 	g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
- 	group = NULL;
--	item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
-+	item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
- 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
--	item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
--	item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
-+	item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
-+	item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
- 	if (with_not_required)
--		item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
-+		item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
- 
- 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
- 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
-diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
-index 99e2e97..418ef5f 100644
---- a/src/libnma/nma-ui-utils.c
-+++ b/src/libnma/nma-ui-utils.c
-@@ -76,7 +76,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
- 	                                   icon_name_table[item]);
- 	gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
- 	                                 GTK_ENTRY_ICON_SECONDARY,
--	                                 gettext (icon_desc_table[item]));
-+	                                 _(icon_desc_table[item]));
- 
- 	/* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
- 	 * Unfortunately, making GtkEntry insensitive will also make the icon
-@@ -277,12 +277,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
- 	g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
- 	g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
- 	group = NULL;
--	item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
-+	item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
- 	group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
--	item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
--	item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
-+	item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
-+	item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
- 	if (with_not_required)
--		item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
-+		item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
- 
- 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
- 	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
--- 
-2.10.1
-
diff --git a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch b/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
deleted file mode 100644
index e83d4c34ca0e..000000000000
--- a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3609f9687728f2f7f8cdb33723c1d44660b81004 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller@redhat.com>
-Date: Thu, 23 Mar 2017 12:28:12 +0100
-Subject: [PATCH] c-e: improve error message for non-existing certificate file
-
-When the connection references a certifiate file that does not exist,
-the GUI's file picker button shows an "(None)", however the "Save"
-button is disable with message:
-
-  "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: unspecified error validating eap-method file"
-
-Slightly improve that by showing instead
-
-  "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: file "..." does not exist"
-
-The solution is not optimal because the GUI shows file "(None)",
-with is some hidden information that makes the connection invalid.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780423
-(cherry picked from commit b603844fc50679fc8683227bfa0f3b6c8e77c2c7)
----
- src/wireless-security/eap-method.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
-index cb733e8..b5c6609 100644
---- a/src/wireless-security/eap-method.c
-+++ b/src/wireless-security/eap-method.c
-@@ -237,6 +237,7 @@ eap_method_validate_filepicker (GtkBuilder *builder,
- 
- 	if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
- 		success = FALSE;
-+		g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("file \"%s\" does not exist"), filename);
- 		goto out;
- 	}
- 
--- 
-2.10.1
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
deleted file mode 100644
index 9aad2396953e..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4d2523b482ab78134dafc02c9b99bd15f1a9174a Mon Sep 17 00:00:00 2001
-From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
-Date: Sun, 14 Jan 2018 23:28:15 +0100
-Subject: [PATCH 1/1] libnma/cert-chooser: handle case of no avalable modules
-
-Cause: Apparently it's perfectly okay if the list of modules is empty
-(e.g., NULL).  However, the code assume that this indicates an error,
-tries to print the NULL error, and crashes.
-
-[lkundrak@v3.sk: cosmetic changes]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785674
-(cherry picked from commit a37483c1a364ef3cc1cfa29e7ad51ca108d75674)
----
- src/libnma/nma-cert-chooser-button.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
-index c7089390..00651765 100644
---- a/src/libnma/nma-cert-chooser-button.c
-+++ b/src/libnma/nma-cert-chooser-button.c
-@@ -93,10 +93,10 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
- 	gchar *label;
- 
- 	modules = gck_modules_initialize_registered_finish (res, &error);
--	if (!modules) {
-+	if (error) {
- 		/* The Front Fell Off. */
--		g_critical ("Error getting registered modules: %s", error->message);
--		g_error_free (error);
-+		g_warning ("Error getting registered modules: %s", error->message);
-+		g_clear_error (&error);
- 	}
- 
- 	model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self)));
--- 
-2.14.3
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
deleted file mode 100644
index 8f217af2dac6..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 46f99b295e59f44dfde50ec90e7c09627d32431e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 20 Dec 2017 13:23:12 +0100
-Subject: [PATCH 1/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys
-
-The compat implementations return a (transfer none) strv instead of a
-(transfer container) one. This has caused double frees in nm-applet:
-https://bugs.archlinux.org/task/56772
-
-Don't copy the keys and don't free the container later.
-
-[thaller@redhat.com: patch adjusted to avoid compiler warning]
-
-Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82)
----
- shared/nm-utils/nm-compat.c | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 22ab675d..47035e62 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- 	GPtrArray *a = user_data;
- 
--	g_ptr_array_add (a, g_strdup (key));
-+	g_ptr_array_add (a, (gpointer) key);
- }
- 
- static const char **
-@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting,
- 		g_ptr_array_sort (a, nm_strcmp_p);
- 		g_ptr_array_add (a, NULL);
- 		keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
--
--		/* we need to cache the keys *somewhere*. */
--		g_object_set_qdata_full (G_OBJECT (setting),
--		                         is_secrets
--		                         ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
--		                         : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
--		                         keys,
--		                         (GDestroyNotify) g_strfreev);
- 	}
- 
- 	NM_SET_OUT (out_length, len);
--- 
-2.14.3
-
-
-From 0d13a8b4064c83146714ecee86b69042aca35f9e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 21 Dec 2017 20:36:48 +0100
-Subject: [PATCH 2/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys()
-
-The previous fix was bad because the keys do not come from NMSettingVpn's hash
-table but are copies that are freed by nm_setting_vpn_foreach_* before
-it returns.
-
-[thaller@redhat.com: import shared code from NetworkManager, merging
-three patches together.]
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82
-
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
-(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951)
----
- shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 47035e62..90328c06 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- 	GPtrArray *a = user_data;
- 
--	g_ptr_array_add (a, (gpointer) key);
-+	g_ptr_array_add (a, g_strdup (key));
- }
- 
- static const char **
-@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting,
- {
- 	guint len;
- 	const char **keys = NULL;
--	gs_unref_ptrarray GPtrArray *a = NULL;
-+	GPtrArray *a;
- 
- 	nm_assert (NM_IS_SETTING_VPN (setting));
- 
--	a = g_ptr_array_new ();
-+	if (is_secrets)
-+		len = nm_setting_vpn_get_num_secrets (setting);
-+	else
-+		len = nm_setting_vpn_get_num_data_items (setting);
-+
-+	a = g_ptr_array_sized_new (len + 1);
-+
- 	if (is_secrets)
- 		nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
- 	else
- 		nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
--	len = a->len;
- 
--	if (a->len) {
-+	len = a->len;
-+	if (len) {
- 		g_ptr_array_sort (a, nm_strcmp_p);
- 		g_ptr_array_add (a, NULL);
--		keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
--	}
-+		keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
-+
-+		/* we need to cache the keys *somewhere*. */
-+		g_object_set_qdata_full (G_OBJECT (setting),
-+		                         is_secrets
-+		                         ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
-+		                         : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
-+		                         g_ptr_array_free (a, FALSE),
-+		                         (GDestroyNotify) g_strfreev);
-+	} else
-+		g_ptr_array_free (a, TRUE);
- 
- 	NM_SET_OUT (out_length, len);
- 	return keys;
--- 
-2.14.3
-
diff --git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
deleted file mode 100644
index 7cb30b744ca5..000000000000
--- a/gnome-extra/nm-applet/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
-		<flag name="modemmanager">Enable support for mobile broadband devices
-			using <pkg>net-misc/modemmanager</pkg></flag>
-		<flag name="teamd">Enable teamd configuration editor</flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
deleted file mode 100644
index 6a00ca01df6b..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF="yes"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +modemmanager teamd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	app-crypt/libsecret
-	>=dev-libs/glib-2.32:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.4:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	modemmanager? ( net-misc/modemmanager )
-	teamd? ( >=dev-libs/jansson-2.3 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-fix-nma-bindings.patch # NMA bindings fix to be usable in python etc
-	"${FILESDIR}"/${PV}-fix-translations-in-g-c-c.patch # g-c-c == gnome-control-center
-	"${FILESDIR}"/${PV}-CVE-2017-6590.patch # bug 613768
-	"${FILESDIR}"/${PV}-improved-certfile-error-msg.patch # bug 613646
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--without-appindicator \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		$(use_enable introspection) \
-		$(use_with modemmanager wwan) \
-		$(use_with teamd team)
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
deleted file mode 100644
index 7ce48b41917b..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-PATCHES=(
-	# shared/compat: fix memory handling of nm_setting_vpn_get_*_keys
-	# (from 'master')
-	"${FILESDIR}"/${P}-vpn-crash.patch
-
-	# libnma/cert-chooser: handle case of no avalable modules (from
-	# 'master')
-	"${FILESDIR}"/${P}-cert-chooser.patch
-)
-
-src_configure() {
-	local myconf=(
-		--without-appindicator
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
deleted file mode 100644
index 52554e8a0baa..000000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
-
-RDEPEND="
-	>=app-crypt/libsecret-0.18
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3.10:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
-	net-misc/mobile-broadband-provider-info
-
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
-	virtual/freedesktop-icon-theme
-	virtual/libgudev:=
-	gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
-	modemmanager? ( net-misc/modemmanager )
-	selinux? ( sys-libs/libselinux )
-	teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.0
-	>=dev-util/intltool-0.50.1
-	virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-src_configure() {
-	local myconf=(
-		--without-appindicator
-		--disable-lto
-		--disable-ld-gc
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_enable introspection)
-		$(use_with gcr)
-		$(use_with modemmanager wwan)
-		$(use_with selinux)
-		$(use_with teamd team)
-	)
-	gnome2_src_configure "${myconf[@]}"
-}
diff --git a/gnome-extra/office-runner-1.0.2 b/gnome-extra/office-runner-1.0.2
new file mode 100644
index 000000000000..e22a75bd36c2
--- /dev/null
+++ b/gnome-extra/office-runner-1.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=dev-util/intltool-0.40.0 virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lighthearted tool to temporarily inhibit GNOME's suspend on lid close behavior
+EAPI=5
+HOMEPAGE=http://www.hadess.net/search/label/office-runner
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/glib:2 >=gnome-base/gnome-settings-daemon-3.0 >=x11-libs/gtk+-3.8:3 >=sys-apps/systemd-190
+SLOT=0
+SRC_URI=mirror://gnome/sources/office-runner/1.0/office-runner-1.0.2.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8d61b09c5b977e55878bb05f10513d01
diff --git a/gnome-extra/office-runner/Manifest b/gnome-extra/office-runner/Manifest
deleted file mode 100644
index ba300ee69756..000000000000
--- a/gnome-extra/office-runner/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST office-runner-1.0.2.tar.xz 562660 BLAKE2B ad69a4340025b58d45f954524c9807831c98a4d81901276bfa3e8f76adb3a5bd1fcf0b50908e00c19888d82b6c48602228a42b84b008f2b7b95210868c8a90ed SHA512 a840af75f014147d30e950a4bc8628c97a79c8161eab3d0f658f5e4f5200df5baaa761d4ea27dc1bc70c6a467fc2536ac0aa473c338ffcbfc48689ba1ec13177
-EBUILD office-runner-1.0.2.ebuild 878 BLAKE2B dd7e6c8471381566e6cb3edbc3b4457e8e79dd8a1b78ecc008d567f2b0e94b79de164f537469a2f9f6279e0b20b8582535c7b15c6e6142a3648d77b36933a849 SHA512 920d5eae8032228f0cb2c8661d2f2f14e9e5b087272a4e3508f714062a183eb7a2157f0110c07597ef04253ddb1c4e24ef3d40946a5da7195cf7b2e9a7a27572
-MISC metadata.xml 520 BLAKE2B 7a1706f5380983f935e4feb3f00224194024beeea99aed500f2550780049354bab448ce6b507e9cfad63b0d16d08d1d5bc7880aff36be791a5888a8c813a2181 SHA512 54abe575b83b5b14c227e8e4b87f7bb00503afd69cce7d5a05124b4d67a0385ff21fcf4618f41668c3fedbd27c918753b4bdc0dcef296a63fcd774c608fbcc80
diff --git a/gnome-extra/office-runner/metadata.xml b/gnome-extra/office-runner/metadata.xml
deleted file mode 100644
index 77410621ce8c..000000000000
--- a/gnome-extra/office-runner/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
-		A tool in the form of a lighthearted game that
-		temporarily inhibits GNOME's default suspend on lid close behavior,
-		allowing the user to move his laptop with the lid closed without dropping
-		network connections.
-	</longdescription>
-</pkgmetadata>
diff --git a/gnome-extra/office-runner/office-runner-1.0.2.ebuild b/gnome-extra/office-runner/office-runner-1.0.2.ebuild
deleted file mode 100644
index d9bcef381725..000000000000
--- a/gnome-extra/office-runner/office-runner-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2 readme.gentoo
-
-DESCRIPTION="Lighthearted tool to temporarily inhibit GNOME's suspend on lid close behavior"
-HOMEPAGE="http://www.hadess.net/search/label/office-runner"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	>=gnome-base/gnome-settings-daemon-3.0
-	>=x11-libs/gtk+-3.8:3
-"
-# requires systemd's org.freedesktop.login1 dbus service
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/systemd-190
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-
-DOC_CONTENTS="${PN} inhibits suspend on lid close only for 10 minutes"
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/gnome-extra/polkit-gnome-0.105-r1 b/gnome-extra/polkit-gnome-0.105-r1
new file mode 100644
index 000000000000..ac216f21ce7b
--- /dev/null
+++ b/gnome-extra/polkit-gnome-0.105-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.102 x11-libs/gtk+:3 !lxde-base/lxpolkit dev-util/intltool virtual/pkgconfig sys-devel/gettext app-arch/xz-utils
+DESCRIPTION=A dbus session bus service that is used to bring up authentication dialogs
+EAPI=4
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/polkit
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.30 >=sys-auth/polkit-0.102 x11-libs/gtk+:3 !lxde-base/lxpolkit
+SLOT=0
+SRC_URI=mirror://gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=2b63a1ed5634305b94684bf86779045d
diff --git a/gnome-extra/polkit-gnome/Manifest b/gnome-extra/polkit-gnome/Manifest
deleted file mode 100644
index c5bcf77974d6..000000000000
--- a/gnome-extra/polkit-gnome/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST polkit-gnome-0.105.tar.xz 310876 BLAKE2B c4b44d8d667ecf043516468fea061c668c94f670aeb0649ecfe1cecdd466d46156b6fffbf642020bd575f4e40f84e6155d3752ebfef57ef0491019616a4f0c21 SHA512 eae2504959bca6f2b53dbad1b743fc0414b82897e62623af80ee74c4080a10d6b07a4c90151ee1264891f27373321b8697ac8a747cba5254c765b4cd9161bd42
-EBUILD polkit-gnome-0.105-r1.ebuild 1089 BLAKE2B 562f3c61d73fec764135a8830e157fbf146d99aa5b0106a88539c33f2f8ba4db59795fe02431248ebb8609c255148d03a1e7e316a10c28adf35e4f98ab2517fb SHA512 db286471057eb3db927037c4a09a6271f992e7eb78fa5a5a41487f03111fff1fecc7e33f086ce33056c76f1b85e77d605451c25aea5b7f29fc85250eb20dd309
-MISC metadata.xml 266 BLAKE2B 9c01787259e2c33e012f96ae52558f21518e2dc4e2bae1e528e8d53b897a698d9d205226aaf5c3796002ac10335d09b57de0d7a0ec079ea9982c7e05d1f67091 SHA512 c4dde7027a929519d75bf240bdf01edee88b6ab874e56c9e524f783b801eb26b5e86a9378cf23b21f7fd2f0f9ee45764daa7deef9173a05e0fedd997e648313b
diff --git a/gnome-extra/polkit-gnome/metadata.xml b/gnome-extra/polkit-gnome/metadata.xml
deleted file mode 100644
index d80c2d3fce7b..000000000000
--- a/gnome-extra/polkit-gnome/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>freedesktop-bugs@gentoo.org</email>
-	<name>Gentoo Freedesktop Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
deleted file mode 100644
index 5013ca8e3219..000000000000
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnome.org
-
-DESCRIPTION="A dbus session bus service that is used to bring up authentication dialogs"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30
-	>=sys-auth/polkit-0.102
-	x11-libs/gtk+:3
-	!lxde-base/lxpolkit"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS HACKING NEWS README TODO )
-
-src_install() {
-	default
-
-	cat <<-EOF > "${T}"/polkit-gnome-authentication-agent-1.desktop
-	[Desktop Entry]
-	Name=PolicyKit Authentication Agent
-	Comment=PolicyKit Authentication Agent
-	Exec=/usr/libexec/polkit-gnome-authentication-agent-1
-	Terminal=false
-	Type=Application
-	Categories=
-	NoDisplay=true
-	NotShowIn=MATE;KDE;
-	AutostartCondition=GNOME3 if-session gnome-fallback
-	EOF
-
-	insinto /etc/xdg/autostart
-	doins "${T}"/polkit-gnome-authentication-agent-1.desktop
-}
diff --git a/gnome-extra/seahorse-nautilus-3.11.92 b/gnome-extra/seahorse-nautilus-3.11.92
new file mode 100644
index 000000000000..e40bd33ed0a6
--- /dev/null
+++ b/gnome-extra/seahorse-nautilus-3.11.92
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 >=dev-util/intltool-0.35 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Nautilus extension for encrypting and decrypting files with GnuPG
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Seahorse
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gpgme-1.0.0 >=app-crypt/gcr-3.4[gtk] >=dev-libs/dbus-glib-0.35 >=dev-libs/glib-2.28:2 gnome-base/gnome-keyring >=gnome-base/nautilus-3 x11-libs/gtk+:3 >=x11-libs/libcryptui-3.9.90 >=x11-libs/libnotify-0.3:= >=app-crypt/gnupg-1.4 !app-crypt/seahorse-plugins[nautilus]
+SLOT=0
+SRC_URI=mirror://gnome/sources/seahorse-nautilus/3.11/seahorse-nautilus-3.11.92.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=705d0850dafb2a9219d6e340a1f3396b
diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
deleted file mode 100644
index ed11b8d48af8..000000000000
--- a/gnome-extra/seahorse-nautilus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST seahorse-nautilus-3.11.92.tar.xz 395304 BLAKE2B f7c741a2d0ae06636ed380c3b8f0006e183bd2eacae87f0c1bfa0d4f1fa0834401a86b7a2b2b21df268ec18b57fbeb6805f30dc20ae43e5456eb05635fda150b SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2
-EBUILD seahorse-nautilus-3.11.92.ebuild 1252 BLAKE2B 240b6de0be8c3e7b70a74383235b68d5929986b3766cc891d47341710c18d391544c406e05975fabdb6af2ccd4f191b4967fea1bed73c3e39344fc0122f9cf07 SHA512 a76cea1dcfbfd7131017883a2b93353619b5cfcc6d74e42a6ce65d12bdb31fae876f99285072e20f9dfb0657d671bd0d44af3b6952c0d04a1ca11b6365463fc3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/seahorse-nautilus/metadata.xml b/gnome-extra/seahorse-nautilus/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/seahorse-nautilus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
deleted file mode 100644
index 5c84f7204542..000000000000
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
-HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Seahorse"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.0.0
-	>=app-crypt/gcr-3.4[gtk]
-	>=dev-libs/dbus-glib-0.35
-	>=dev-libs/glib-2.28:2
-	gnome-base/gnome-keyring
-	>=gnome-base/nautilus-3
-	x11-libs/gtk+:3
-	>=x11-libs/libcryptui-3.9.90
-	>=x11-libs/libnotify-0.3:=
-	>=app-crypt/gnupg-1.4
-"
-# seahorse-nautilus was formerly part of seahorse-plugins
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/seahorse-plugins[nautilus]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not let configure mangle CFLAGS
-	sed -e '/^[ \t]*CFLAGS="$CFLAGS \(-g\|-O0\)/d' -i configure.ac configure ||
-		die "sed failed"
-
-	# Fix icon location, upstream bug #719763
-	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
-		tool/seahorse-notification.c || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gpg-check \
-		--enable-libnotify
-}
diff --git a/gnome-extra/sushi-3.24.0 b/gnome-extra/sushi-3.24.0
new file mode 100644
index 000000000000..e691dfda7d03
--- /dev/null
+++ b/gnome-extra/sushi-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-util/intltool-0.40 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A quick previewer for Nautilus, the GNOME file manager
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/sushi
+IUSE=office
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/gdk-pixbuf-2.23[introspection] >=dev-libs/gjs-1.40 >=dev-libs/glib-2.29.14:2 >=dev-libs/gobject-introspection-0.9.6:= >=media-libs/clutter-1.11.4:1.0[introspection] >=media-libs/clutter-gtk-1.0.1:1.0[introspection] >=x11-libs/gtk+-3.13.2:3[X,introspection] >=app-text/evince-3.0[introspection] media-libs/freetype:2 media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] >=media-libs/harfbuzz-0.9.9:= media-libs/clutter-gst:3.0[introspection] media-libs/musicbrainz:5= net-libs/webkit-gtk:4[introspection] x11-libs/gtksourceview:3.0[introspection] office? ( app-office/unoconv ) >=gnome-base/nautilus-3.1.90
+SLOT=0
+SRC_URI=mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f04fd2fe4787f4366d57b0805165cc0d
diff --git a/gnome-extra/sushi/Manifest b/gnome-extra/sushi/Manifest
deleted file mode 100644
index b29000c674b6..000000000000
--- a/gnome-extra/sushi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sushi-3.24.0.tar.xz 297332 BLAKE2B a01947627e9ca711f9f1d634f2791ee79e414bab38058ca4a8bfd822a2d277522fe99d66b3364f46662ee0fc1fa8a148f48ce8c434fd0d7bbb7ef1c159f2ea12 SHA512 b49e9c1ef1dc4c74ae06f6da9a2f428ed4ee3ec1ca3ba04c483ddb1bd976e6981466456d27a641048756a1ea0bf2fe033883059895e889950d0d0f340535b29b
-EBUILD sushi-3.24.0.ebuild 1397 BLAKE2B e70854e83c0ad23bc2c289eeef570624ad279636a05c2e19d62b0c0f103a439d7a183f8dd2148c78bd13d2631ddd25e804bf8aa8d782440d0528f8ae4c726bd7 SHA512 0dc8e816b550fc5ab58beeec4f379442adb23e9fbdb164551a4ab5551e604e3171abb4c0c5ee49f54ebf4ac3d7397d085fbc12006aa4693fe620e196351be130
-MISC metadata.xml 384 BLAKE2B 9d8094a09a87c46785605cae4b610f59fb6e8bdfef8e58c19dbd0725c8a11ba03cf3c25eeb77d553281934deeb64e91af780a44b43a630b5293f112f678115b4 SHA512 c6d8a451147839eb220b0e7b6759efdb59f1929da7f1d66d7c7a956a2626f04035f1b007da0e06fcf6d958bb8102df9c8c3dbc0634d89ad3937d40e21fe24651
diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
deleted file mode 100644
index 367fae8e3eae..000000000000
--- a/gnome-extra/sushi/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="office">Support viewing file formats such as generated by
-			<pkg>app-office/libreoffice</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/gnome-extra/sushi/sushi-3.24.0.ebuild b/gnome-extra/sushi/sushi-3.24.0.ebuild
deleted file mode 100644
index 3a0f5d975093..000000000000
--- a/gnome-extra/sushi/sushi-3.24.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="A quick previewer for Nautilus, the GNOME file manager"
-HOMEPAGE="https://git.gnome.org/browse/sushi"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="office"
-
-# Optional app-office/unoconv support (OOo to pdf)
-# freetype needed for font loader
-# gtk+[X] optionally needed for sushi_create_foreign_window(); when wayland is more widespread, might want to not force it
-COMMON_DEPEND="
-	>=x11-libs/gdk-pixbuf-2.23[introspection]
-	>=dev-libs/gjs-1.40
-	>=dev-libs/glib-2.29.14:2
-	>=dev-libs/gobject-introspection-0.9.6:=
-	>=media-libs/clutter-1.11.4:1.0[introspection]
-	>=media-libs/clutter-gtk-1.0.1:1.0[introspection]
-	>=x11-libs/gtk+-3.13.2:3[X,introspection]
-
-	>=app-text/evince-3.0[introspection]
-	media-libs/freetype:2
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	>=media-libs/harfbuzz-0.9.9:=
-	media-libs/clutter-gst:3.0[introspection]
-	media-libs/musicbrainz:5=
-	net-libs/webkit-gtk:4[introspection]
-	x11-libs/gtksourceview:3.0[introspection]
-
-	office? ( app-office/unoconv )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/nautilus-3.1.90
-"
-
-src_configure() {
-	gnome2_src_configure --disable-static
-}
diff --git a/gnome-extra/synapse-0.2.99.2 b/gnome-extra/synapse-0.2.99.2
new file mode 100644
index 000000000000..c77404f675b9
--- /dev/null
+++ b/gnome-extra/synapse-0.2.99.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey >=x11-libs/gtk+-3.0.0:3 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme plugins? ( >=net-libs/rest-0.7 ) || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<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 program launcher in the style of GNOME Do
+EAPI=5
+HOMEPAGE=https://launchpad.net/synapse-project/
+IUSE=plugins
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgee:0.8 >=dev-libs/glib-2.28.0:2 dev-libs/json-glib dev-libs/keybinder:3 dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey >=x11-libs/gtk+-3.0.0:3 x11-libs/libnotify x11-libs/pango x11-themes/adwaita-icon-theme plugins? ( >=net-libs/rest-0.7 )
+SLOT=0
+SRC_URI=https://launchpad.net/synapse-project/0.3/0.2.99.2/+download/synapse-0.2.99.2.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=29b7c15a3cd872cdb1941fbb3bb8b71e
diff --git a/gnome-extra/synapse/Manifest b/gnome-extra/synapse/Manifest
deleted file mode 100644
index 1504997b46de..000000000000
--- a/gnome-extra/synapse/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST synapse-0.2.99.2.tar.xz 444156 BLAKE2B b1fccaecf6ea0d8623e305852e3ae21bb0f95b38a086152643bfb15f82c59a27fc499487ad9a3dba56378f260eea26a43a76bef11220b9e24b2027b1a1a8f8ca SHA512 e4b6e0399a83fc7880d786e8cff6360850d5ce1ac2eabccb5ce6d3989e4356c42adf1155905b39bb6b10887c02844dad01cdf8d556bc4bd6c7cd11956f8116c7
-EBUILD synapse-0.2.99.2.ebuild 1263 BLAKE2B 8d18247cd27da294cd8feb76b4024073f7fd59f95ee197027cd6d495817644760a3de4ef0dc7256f9d1908628b068f5c0fcbe737841cf0ea3e7be16ac2bee67d SHA512 e25fd7c9374b4055352a125ffc312cbb91728653baffb86dbf3961b7ed08242935bc1cc76f0bc11506666a720b0c7d0eac672c7da82defa98a21e46add407f9a
-MISC metadata.xml 458 BLAKE2B 2202bb6ee7223434586fd946bc1f1b2dc3425e3df8bc4b187eb84318138701306bb572c0ebf4cae2ce2e519c78078f312f874a974d77a4e11a123c387324832b SHA512 e27cf8f714a9c730e6d37ac4e92dd66e080eca58ea2497552233d54e79c55eb0ae4622031b29659bb53d8011ea77b58cab60ce579d89144adf44d4aeac9c8c97
diff --git a/gnome-extra/synapse/metadata.xml b/gnome-extra/synapse/metadata.xml
deleted file mode 100644
index 52843da2e503..000000000000
--- a/gnome-extra/synapse/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
-  </maintainer>
-  <use>
-    <flag name="plugins">Build support for plugins using librest</flag>
-  </use>
-  <upstream>
-    <remote-id type="launchpad">synapse-project</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/gnome-extra/synapse/synapse-0.2.99.2.ebuild b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
deleted file mode 100644
index d2e698782f49..000000000000
--- a/gnome-extra/synapse/synapse-0.2.99.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GCONF_DEBUG="no" # gnome2_src_configure is not being used
-AUTOTOOLS_AUTORECONF=true
-
-inherit gnome2 autotools-utils vala
-
-DESCRIPTION="A program launcher in the style of GNOME Do"
-HOMEPAGE="https://launchpad.net/synapse-project/"
-SRC_URI="https://launchpad.net/synapse-project/0.3/${PV}/+download/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# "ayatana" support pending on GTK+-3.x version of synapse wrt #411613
-IUSE="plugins"
-
-RDEPEND="
-	dev-libs/libgee:0.8
-	>=dev-libs/glib-2.28.0:2
-	dev-libs/json-glib
-	dev-libs/keybinder:3
-	dev-libs/libunique:1
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtkhotkey
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/libnotify
-	x11-libs/pango
-	x11-themes/adwaita-icon-theme
-	plugins? ( >=net-libs/rest-0.7 )"
-
-	#ayatana? ( dev-libs/libappindicator )
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e 's/GNOME/GNOME;GTK/' data/synapse.desktop.in || die
-	vala_src_prepare
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-indicator=no
-		$(use_enable plugins librest yes)
-		)
-	autotools-utils_src_configure
-}
diff --git a/gnome-extra/yelp-3.22.0 b/gnome-extra/yelp-3.22.0
new file mode 100644
index 000000000000..92e3f02d11d6
--- /dev/null
+++ b/gnome-extra/yelp-3.22.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.41.0 dev-util/itstool >=sys-devel/gettext-0.17 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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Help browser for GNOME
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-3.12 >=net-libs/webkit-gtk-2.7.2:4 >=x11-libs/gtk+-3.13.3:3 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=91c510f804d0630cae83d8cea4d1d27a
diff --git a/gnome-extra/yelp-xsl-3.20.1 b/gnome-extra/yelp-xsl-3.20.1
new file mode 100644
index 000000000000..f43e0b2ab315
--- /dev/null
+++ b/gnome-extra/yelp-xsl-3.20.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:= >=dev-util/intltool-0.40 >=dev-util/itstool-1.2.0 sys-devel/gettext virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=XSL stylesheets for yelp
+EAPI=6
+HOMEPAGE=https://git.gnome.org/browse/yelp-xsl
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
+RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-xsl/3.20/yelp-xsl-3.20.1.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b25112b7a7cd245a080b5e05be731ae5
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
deleted file mode 100644
index b8b029b770c3..000000000000
--- a/gnome-extra/yelp-xsl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST yelp-xsl-3.20.1.tar.xz 568400 BLAKE2B f61151777eee346d08ecee2903fcf34759581b782662658a6af68f6623e62f9773ef842fa430655871033f39f10aa50481543c4d88f94c6484709fcd3d3776a7 SHA512 7ea22c3180261917d1a277a9b5023f9b2b22346bc3f55cdb1c61c4ae8f78411da93058b55f99c25c9a1bedad21ffa6c3dc460e1ee98614a84a4efa2c2449baac
-EBUILD yelp-xsl-3.20.1.ebuild 602 BLAKE2B 8a481c2e04086d1b03ad33c64648b9352ba6f0701a45b0353af08c5c9dc14b35804af5fa9f43e9fca87d29be4c4fee2dbce48b69c06ed484e064fb14e9586701 SHA512 9401b7d7a1aca25d8512f84765e18041705918bf2c5cede2a3a4d47b1624cac02c0e49437f3a485ac597dfab1e92f11b2421b14b2e189c54e448046a75e20c64
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp-xsl/metadata.xml b/gnome-extra/yelp-xsl/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/yelp-xsl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
deleted file mode 100644
index 16852873e662..000000000000
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="XSL stylesheets for yelp"
-HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
-
-LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
-SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12:=
-	>=dev-libs/libxslt-1.1.8:=
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40
-	>=dev-util/itstool-1.2.0
-	sys-devel/gettext
-	virtual/awk
-	virtual/pkgconfig
-"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
deleted file mode 100644
index 22fc52ff438b..000000000000
--- a/gnome-extra/yelp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX yelp-3.20.0-man-compatibility.patch 4229 BLAKE2B 1ebe101f4a0031ca46d6801e8dc19eb4225c0bd0d5789d379f3192fdc71afabf6a940156463bc60be414e4f607abcaa998f5e8ff81a74c107a5853490402f163 SHA512 427ee66fa1c156991254fd10511bead4fbed6b05a930da157cec61bd7fafcd83f0dd447ce8aa62d0dc76e2231cf5f34fbeccc8103de4ee9062b6d79955b9cc1d
-DIST yelp-3.22.0.tar.xz 1383500 BLAKE2B f3422c0e8370f42ce73a27d0336d6def61e8d43d9736946e65e579548cbcf9b52afacbdcaf0e8b8733dfe1dc0d0efd53ff6d73377c4e5bbaf2106b8cc42b10a7 SHA512 ba31c7801fc4642d9c4dcf34d4b8c02005f2ebfab4ecfe4e726685c5fb95f05311fc3a481f9b2d2e8b211395e4c932adba0e68b57d264cd1f6065402d9143d32
-EBUILD yelp-3.22.0.ebuild 1192 BLAKE2B 84234d94a25ce188f6377cc5dec1c130fbb2bb9f2cfa3878f4ae058341554892c586505b45e21ebfc57ab6f69bf0dc601f5c0b63865f0e7adafbb2535c67c6e2 SHA512 4e05de732fd5beaab9c997caddd7abfe68af62b74a2bfade825bc28e39f7c67b35bbac4e169ce38a3d771bcd87fc8c5d91c609b80da3318da9bc600da906a47f
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch b/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
deleted file mode 100644
index b756b67462bc..000000000000
--- a/gnome-extra/yelp/files/yelp-3.20.0-man-compatibility.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From b7f00d9fc5f4c948b3b412fa22488517e71a2987 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sun, 27 Mar 2016 17:11:59 +0200
-Subject: [PATCH] Enable compatibility with traditional man (#648854)
-
-As of commit 46a82ade3e6f0fac8f08b18e7fc23d8665f6f728, Yelp runs
-"man -Z -Tutf8 -EUTF-8 [FILE]" to obtain the groff intermediate format
-of the man page. However, the only implementation of man that accepts
-these options is man-db (used by Debian, Fedora, SUSE & Ubuntu).
-The traditional Linux man used by other distros and man implementations
-on non-Linux Unixes (FreeBSD, Solaris) do not have command-line options
-for outputting groff intermediate format.
-Therefore, on systems that do not use man-db, we need to manually
-uncompress the nroff source file and feed it to groff. This is best done
-using a small shell script (/usr/libexec/yelp-groff), both for for
-clarity and for ease of modification on systems with weird man setups.
-
-Signed-off-by: Alexandre Rostovtsev <tetromino@gmail.com>
-Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
----
- Makefile.am               |  2 ++
- libyelp/yelp-groff        | 49 +++++++++++++++++++++++++++++++++++++++++++++++
- libyelp/yelp-man-parser.c |  2 +-
- 3 files changed, 52 insertions(+), 1 deletion(-)
- create mode 100755 libyelp/yelp-groff
-
-diff --git a/Makefile.am b/Makefile.am
-index 30eba2c..b87f2b2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,6 +6,7 @@ BUILT_SOURCES = \
- 	$(nodist_libyelp_libyelp_la_SOURCES)
-
- lib_LTLIBRARIES = libyelp/libyelp.la
-+libexec_SCRIPTS = libyelp/yelp-groff
-
- libyelp_libyelp_la_SOURCES = \
- 	libyelp/yelp-bookmarks.c \
-@@ -58,6 +59,7 @@ libyelp_libyelp_la_CFLAGS = \
-
- libyelp_libyelp_la_CPPFLAGS = \
- 	-DDATADIR=\""$(datadir)"\" \
-+	-DLIBEXECDIR=\"$(libexecdir)\" \
- 	-DYELP_ICON_PATH=\"$(YELP_ICON_PATH)\" \
- 	-DYELP_WEB_EXTENSIONS_DIR=\""$(pkglibdir)/"web-extensions\" \
- 	-I$(top_builddir)/libyelp
-diff --git a/libyelp/yelp-groff b/libyelp/yelp-groff
-new file mode 100755
-index 0000000..5348024
---- /dev/null
-+++ b/libyelp/yelp-groff
-@@ -0,0 +1,49 @@
-+#!/bin/sh
-+#
-+# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
-+#
-+# This program is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public
-+# License along with this program; if not, write to the
-+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+# Boston, MA 02110-1301, USA.
-+#
-+###
-+#
-+# Process the requested compressed source nroff file and output groff
-+# intermediate format.
-+#
-+
-+filename=$1
-+
-+if [ -z ${filename} ] ; then
-+    echo "Usage: yelp-groff [FILE]" >&2
-+    echo "Process a man FILE and output groff intermediate format."
-+    exit 1
-+fi
-+
-+# If "man -Z -Tutf8 -EUTF-8" works (i.e. if man is man-db), use that.
-+man -Z -Tutf8 -EUTF-8 ${filename} 2>/dev/null && exit 0
-+
-+# Otherwise, manually uncompress the file ...
-+cat="cat"
-+case ${filename} in
-+    *.bz2)      cat="bzip2 -c -d" ;;
-+    *.gz)       cat="gunzip -c" ;;
-+    *.lzma)     cat="unlzma -c -d" ;;
-+    *.xz)       cat="unxz -c" ;;
-+    *.Z)        cat="zcat" ;;
-+esac
-+
-+# ... and run groff to get the intermediate format; preprocess with tbl
-+# unless MANROFFSEQ is defined.
-+${cat} ${filename} | groff -${MANROFFSEQ:-t} -man -Z -Tutf8
-diff --git a/libyelp/yelp-man-parser.c b/libyelp/yelp-man-parser.c
-index 46073a2..792e695 100644
---- a/libyelp/yelp-man-parser.c
-+++ b/libyelp/yelp-man-parser.c
-@@ -369,7 +369,7 @@ get_troff (gchar *path, GError **error)
- {
-     gint ystdout;
-     GError *err = NULL;
--    const gchar *argv[] = { "man", "-Z", "-Tutf8", "-EUTF-8", path, NULL };
-+    const gchar *argv[] = { LIBEXECDIR "/yelp-groff", path, NULL };
-     gchar **my_argv;
-
-     /* g_strdupv() should accept a "const gchar **". */
---
-2.7.4
-
diff --git a/gnome-extra/yelp/metadata.xml b/gnome-extra/yelp/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/yelp/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/yelp/yelp-3.22.0.ebuild b/gnome-extra/yelp/yelp-3.22.0.ebuild
deleted file mode 100644
index 1a32c72c41fa..000000000000
--- a/gnome-extra/yelp/yelp-3.22.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="Help browser for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND="
-	app-arch/bzip2:=
-	>=app-arch/xz-utils-4.9:=
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/libxml2-2.6.5:2
-	>=dev-libs/libxslt-1.1.4
-	>=gnome-extra/yelp-xsl-3.12
-	>=net-libs/webkit-gtk-2.7.2:4
-	>=x11-libs/gtk+-3.13.3:3
-	x11-themes/adwaita-icon-theme
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.13
-	>=dev-util/intltool-0.41.0
-	dev-util/itstool
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Fix compatibility with Gentoo's sys-apps/man
-	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
-	eapply "${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-bz2 \
-		--enable-lzma
-}
-
-src_install() {
-	gnome2_src_install
-	exeinto /usr/libexec/
-	doexe "${S}"/libyelp/yelp-groff
-}
diff --git a/gnome-extra/zenity-3.24.0 b/gnome-extra/zenity-3.24.0
new file mode 100644
index 000000000000..d347fa3b8323
--- /dev/null
+++ b/gnome-extra/zenity-3.24.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) app-text/yelp-tools gnome-base/gnome-common >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
+EAPI=6
+HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
+IUSE=debug libnotify webkit
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3[X] x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
+SLOT=0
+SRC_URI=mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b2953b9779d513c0c4e84b507b00d23
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
deleted file mode 100644
index 1fabd78322e8..000000000000
--- a/gnome-extra/zenity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zenity-3.24.0.tar.xz 1085124 BLAKE2B 2be50461c8575b5322319e3b35a9c833ae87f2e35abfdb27bed61dbead1b31dc31d551c8973634a7a0f0abc178ee6c7a4bb24377632df7d7fcaf77780f7fd4d6 SHA512 b24291166221cc2dabeabfeab7ca00ca63ff21c12a4eb327cd35ac43f485b8d4a858dd717df1b35b8bd3fd89d0bb235609855c6d349b76879b0f77b4fedd4dd9
-EBUILD zenity-3.24.0.ebuild 1108 BLAKE2B 32be4a94db30a9b9f4ed49607c096b9375041b360a10972a23b8441b4685082326375b3835cb8321367ddfde751fd2cc6fcebf8e6649618793da946603f35f3b SHA512 dafbd0107b9135b22a575d235dd6921928d2bdbde5dacd500798151255500343892978226b14a4c05359c52a55ed2b2ad67b3d8b948debfa49a06bebeaa3c47c
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/gnome-extra/zenity/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-3.24.0.ebuild b/gnome-extra/zenity/zenity-3.24.0.ebuild
deleted file mode 100644
index 3373cce2a49f..000000000000
--- a/gnome-extra/zenity/zenity-3.24.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-DESCRIPTION="Tool to display dialogs from the commandline and shell scripts"
-HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug libnotify webkit"
-
-# TODO: X11 dependency is automagically enabled
-RDEPEND="
-	>=dev-libs/glib-2.8:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3:3[X]
-	x11-libs/libX11
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
-"
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-"
-
-src_configure() {
-	gnome2_src_configure \
-		$(usex debug --enable-debug=yes ' ') \
-		$(use_enable libnotify) \
-		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Not really needed and prevent us from needing perl
-	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
-}
diff --git a/gnustep-apps/Manifest.gz b/gnustep-apps/Manifest.gz
index 350b76e35f12..fdb4c7e2dd2b 100644
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
diff --git a/gnustep-apps/aclock-0.4.0 b/gnustep-apps/aclock-0.4.0
new file mode 100644
index 000000000000..ae657f36415d
--- /dev/null
+++ b/gnustep-apps/aclock-0.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Analog dockapp clock for GNUstep
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/aclock/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-3
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/AClock-0.4.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fed42bb780228c9ed669ba58f8a30db9
diff --git a/gnustep-apps/aclock/Manifest b/gnustep-apps/aclock/Manifest
deleted file mode 100644
index 674c2c86c26b..000000000000
--- a/gnustep-apps/aclock/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST AClock-0.4.0.tar.gz 299488 BLAKE2B 36f41fe1abcc0de77b4d4c9f9be1af46a5c7741b7f71596803bb2debbd57cf750d4c8c87e86f00f185e20ef8f26ac3e795edd8fe4a5e462f3cfdb991780ff8b7 SHA512 45435e6b1e02b8fb6b924c7fbb5546f3836b7ee8a072323a5b7df0cf855b1a7f838234fb6318c558189f5a12e29275c2c85f61c4c989bfb5dbebfd087a5a7561
-EBUILD aclock-0.4.0.ebuild 600 BLAKE2B 8f2ff54d8d2a83e33ed4c1b62f4fdff948f2b1915d2335bb3719128cd1cb42daf2d483796a8cde78e3dc44644c5309870c98390cfd9068e2834029fbc9cace61 SHA512 29e54acef6fcdac6fefe0e4e8545a58472a6b03b19f3c1ad4125778d978d69fca16995965f417b9de4d8fd61617ee0154d9db1fd2f67dbbc453f2f863b7ca9d1
-MISC metadata.xml 502 BLAKE2B 90c79de83b11e608a34c9e89eddf66384af448441b98f78baecfe41c6abf39217679cea26dc8e7557521003bca52c0cdd5f83f2cef111dd46a4299d76022485a SHA512 0503620550f83aabe426fdad0dea14e0087ff4adc0013c69047b2330896b8afcad2d926d25817ec991a7607487810904f0a2438965c9738cda9414313e7c5e33
diff --git a/gnustep-apps/aclock/aclock-0.4.0.ebuild b/gnustep-apps/aclock/aclock-0.4.0.ebuild
deleted file mode 100644
index e5bcfc00d458..000000000000
--- a/gnustep-apps/aclock/aclock-0.4.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P=${P/ac/AC}
-DESCRIPTION="Analog dockapp clock for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/aclock/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-gnustep_config_script() {
-	echo "echo ' * using smooth seconds'"
-	echo "defaults write AClock SmoothSeconds YES"
-	echo "echo ' * setting refresh rate to 0.1 seconds'"
-	echo "defaults write AClock RefreshRate 0.1"
-}
diff --git a/gnustep-apps/aclock/metadata.xml b/gnustep-apps/aclock/metadata.xml
deleted file mode 100644
index 04b3a9815251..000000000000
--- a/gnustep-apps/aclock/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-A clock!
-	
-Advantages of GNUstep dockapps over non GNUstep dockapps
-+ scalable
-+ independant of X11
-
-Thanks
-Alexander Malmberg for the initial version
-Banlu Kemiyatorn for the eye candy
-
-Contact
-Gürkan Sengün 
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/addresses-0.4.8 b/gnustep-apps/addresses-0.4.8
new file mode 100644
index 000000000000..dc6ed17d0b62
--- /dev/null
+++ b/gnustep-apps/addresses-0.4.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Addresses is a Apple Addressbook work alike (standalone and for GNUMail)
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/addresses/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Addresses-0.4.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=02b7715654e9d38b5a4e7ebebb0fb457
diff --git a/gnustep-apps/addresses/Manifest b/gnustep-apps/addresses/Manifest
deleted file mode 100644
index ad25ec34e868..000000000000
--- a/gnustep-apps/addresses/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX addresses-0.4.7-as-needed.patch 1041 BLAKE2B d31e425f7a6807bb0ada248e749d43695c5d0a304a3b6310bbe67c8e65c3d12beed374b6f15dda56b2bb63cbd8d81c90feeab0266e3ae99351a61c23dbddc615 SHA512 7999d1f420af2300f30efa96763b390cda9c16a9c37a8ea1fe0dc816874239857f3c5df8d1861203ab06c94e92e0887954c0acb7fcf6eb3ff074158c3a3ebb99
-DIST Addresses-0.4.8.tar.gz 287207 BLAKE2B 68387772f7fe1597b898afcd5f2c4254aa3174cd7ee494f155a9e79c84e3fc4c526c358f37464d6e2cddafaf5ec6b92b5bd646f03afedad3954fe5068bed0d56 SHA512 2cd6bd16620d3fa4136242dd89c3281800bba0caeb99e986d3d6beacf31ae19b3dd7f563da2fe52038781cca639815dfc740c15b0e5273facf8cc2400d90fc0f
-EBUILD addresses-0.4.8.ebuild 496 BLAKE2B 1f24919d86324b31daf86afeef9a3f4a0513c3edbd03da2354a7c537c0d2fc538d39faf24779132e263d1fab29c8aec2fbd6918df616b167dc1ef3fde564f760 SHA512 3849cfb5771320731633239edf4329b1938b13507a6296b7b5a6641095b7773b32ee10ceb85f3786379d6db6d4870325cdcc0cd504451c752010d1a1a787e30b
-MISC metadata.xml 585 BLAKE2B 301402f548058abc9225d7d41df354c9c2fa6c86890c0381461405d8c56b482e4e3193c732a9af6735f88200128e782f395bd70418d303026ba1c2b3fe644ed3 SHA512 0080e2aebc0af5124766886742c73d4c999e07dec9c17c78e771889feb14cf60b0201b3f7c8e1c8105af1a525df0b3bbdc82116a02485e2566c0c41108ae6f14
diff --git a/gnustep-apps/addresses/addresses-0.4.8.ebuild b/gnustep-apps/addresses/addresses-0.4.8.ebuild
deleted file mode 100644
index 615716950373..000000000000
--- a/gnustep-apps/addresses/addresses-0.4.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="Addresses is a Apple Addressbook work alike (standalone and for GNUMail)"
-HOMEPAGE="http://gap.nongnu.org/addresses/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/a/A}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${P/a/A}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.4.7-as-needed.patch
-}
diff --git a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch b/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
deleted file mode 100644
index cdb7a84755e3..000000000000
--- a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur AddressManager.orig/GNUmakefile AddressManager/GNUmakefile
---- AddressManager.orig/GNUmakefile	2008-12-08 17:19:03.000000000 +0100
-+++ AddressManager/GNUmakefile	2008-12-08 17:19:28.000000000 +0100
-@@ -24,8 +24,7 @@
- AddressManager_OBJCFLAGS=-I../Frameworks -Wall
- AddressManager_LDFLAGS=\
- 	-L../Frameworks/AddressView/AddressView.framework/$(GNUSTEP_TARGET_LDIR) \
--	-L../Frameworks/Addresses/Addresses.framework/$(GNUSTEP_TARGET_LDIR)     \
--	-lAddressView -lAddresses
-+	-L../Frameworks/Addresses/Addresses.framework/$(GNUSTEP_TARGET_LDIR)
- 
- -include GNUmakefile.preamble
- -include GNUmakefile.local
-diff -Naur AddressManager.orig/GNUmakefile.preamble AddressManager/GNUmakefile.preamble
---- AddressManager.orig/GNUmakefile.preamble	2008-12-08 17:19:03.000000000 +0100
-+++ AddressManager/GNUmakefile.preamble	2008-12-08 17:19:24.000000000 +0100
-@@ -27,7 +27,7 @@
- # ObjC stuff
- ADDITIONAL_OBJC_LIBS +=
- # Tools
--ADDITIONAL_TOOL_LIBS +=
-+ADDITIONAL_TOOL_LIBS += -lAddressView -lAddresses
- # WebObjects
- ADDITIONAL_WO_LIBS +=
- 
diff --git a/gnustep-apps/addresses/metadata.xml b/gnustep-apps/addresses/metadata.xml
deleted file mode 100644
index 01ac24293f53..000000000000
--- a/gnustep-apps/addresses/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-This package constitutes a personal address manager for the GNUstep
-software system. It allows archiving complete personal contact
-information, organizing contacts in groups, integration with other
-software such as mail clients and sharing address information with
-other users over the network.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/affiche-0.6.0-r4 b/gnustep-apps/affiche-0.6.0-r4
new file mode 100644
index 000000000000..ced30061b396
--- /dev/null
+++ b/gnustep-apps/affiche-0.6.0-r4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Affiche allows people to 'stick' notes
+EAPI=6
+HOMEPAGE=http://www.collaboration-world.com/affiche
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.collaboration-world.com/affiche.data/releases/Stable/Affiche-0.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a6c8a3f161fda0de7f4899710a3a3f6f
diff --git a/gnustep-apps/affiche/Manifest b/gnustep-apps/affiche/Manifest
deleted file mode 100644
index 43a525b3dcf7..000000000000
--- a/gnustep-apps/affiche/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Affiche-0.6.0.tar.gz 50764 BLAKE2B f3d965c7f3c4d0a654a75fccaf2b6ce1cfeb7e1c688a927375e919e07cf85f0f3af2d6209cd7e061dbb575f979e8e8c69ec2831fa96ffd3ef1399f17997bf4b5 SHA512 114b323e8db0fa104fed5a94a544e481e8574a0af367951dfb1e400a15b0813564e433a12d33828f230b1f5f83578d161afad12e014f786e2e5bb60e90f637bc
-EBUILD affiche-0.6.0-r4.ebuild 406 BLAKE2B dc4ee36920f69b3ad75d791565a37368d32f94da9b91bfe6cb5d6490e173b908ef6ebe41b8574bddd1d50e78050f3dde833e9fda714d19334ec60e472d3a9ff9 SHA512 fc0805a87c78a622b1641062add558c190e867e29c0e820d6ce064dcb747c71e6c7e69931de0cee8d7790e175c0fc9d57fedff0e60a3939cf3147cc0fa8e7b7c
-MISC metadata.xml 648 BLAKE2B 1c772c620fe2af0ad172887c5a01c43a8e44913d171e0cc75c976fc160322eedca0cf9e67288c95e35021b10d3e7dcc57398bf76eba0a31870e081410c3404db SHA512 841bcebebad5a6db057e8fe0bf0b959193ea029ddf5b1093abbffed96c6dbe875f76137cba61345c2d3fe3acc6f8b6cba426447033ea784ff8c9ee3aaafb92a3
diff --git a/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild b/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
deleted file mode 100644
index c35fb5b43927..000000000000
--- a/gnustep-apps/affiche/affiche-0.6.0-r4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="Affiche allows people to 'stick' notes"
-HOMEPAGE="http://www.collaboration-world.com/affiche"
-SRC_URI="http://www.collaboration-world.com/affiche.data/releases/Stable/${P/a/A}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-S=${WORKDIR}/${PN/a/A}
diff --git a/gnustep-apps/affiche/metadata.xml b/gnustep-apps/affiche/metadata.xml
deleted file mode 100644
index 3775b344aa81..000000000000
--- a/gnustep-apps/affiche/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Affiche is a little application that allows people to "stick" little notes on their computer desktop. It works well under GNUstep and under Apple Mac OS X.
-
-The goal of this little application is to provide a good example on how to develop cross-platform applications between GNUstep and Apple Mac OS X while providing a useful application at the same time.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/batmon-0.8 b/gnustep-apps/batmon-0.8
new file mode 100644
index 000000000000..21f030c7d49f
--- /dev/null
+++ b/gnustep-apps/batmon-0.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=displays the status of your laptop battery
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/gap/batmon/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/batmon-0.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=026119d02c107d136a2e8cfc1536e174
diff --git a/gnustep-apps/batmon/Manifest b/gnustep-apps/batmon/Manifest
deleted file mode 100644
index 1d89a138cb14..000000000000
--- a/gnustep-apps/batmon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST batmon-0.8.tar.gz 39592 BLAKE2B 009067b85e3f44f9aa4bc1c23d139406c2e5d597c40380b6d3e6f3b9e653733b54cfda143ba0331b47df0702c15d04129603fe55b05165121fcb0ecdf4668b91 SHA512 b43a882f809307ef3dbdba9762bef443063d3d6c70bc202c4cd1e9a50a3f4b617607392e8777b4f6dfec89fb17a806ca19c256d2799d2b60f4e00b1fc334f2ce
-EBUILD batmon-0.8.ebuild 366 BLAKE2B c9caa7a41fae860cfb9f231b122709a4249d4035d2b3c7f06e509dfb983b979cf4d9f1b56e031fd6b32c681a2face4f35d8c169b931630a921c7548444818c08 SHA512 53b185fc36e3348991636971a5620cb3033257106674c23ab2c4e0f600268fed985c1471695ae64453f4cc27e0dfbc1d191383b9d2e7736e27b4300e7945c646
-MISC metadata.xml 502 BLAKE2B d4fdc3a7e4aaaa1e0e1338cd3ea21175c560f0c47952fd16ead241430d72ccbbe5cee60355a18a611c934b80b05512ae788674f5f48f535ea946f145ea0ea77e SHA512 914f476bbba4630393c354470ab80b22af38eb7d321b2c4bda564ff6032f931e6f20774c960acb63d028cf093d9767370d0868f8c14ed3133da8394ccb592f88
diff --git a/gnustep-apps/batmon/batmon-0.8.ebuild b/gnustep-apps/batmon/batmon-0.8.ebuild
deleted file mode 100644
index fad43fccded1..000000000000
--- a/gnustep-apps/batmon/batmon-0.8.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="displays the status of your laptop battery"
-HOMEPAGE="http://www.nongnu.org/gap/batmon/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/gnustep-apps/batmon/metadata.xml b/gnustep-apps/batmon/metadata.xml
deleted file mode 100644
index ac0a35517291..000000000000
--- a/gnustep-apps/batmon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Battery monitor is a small utility that displays the status of your laptop battery (charge/discharge and status). I works best with linux 2.6 kernels and ACPI, but now has also support for 2.4 kernels and APM</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/cdplayer-0.6.0 b/gnustep-apps/cdplayer-0.6.0
new file mode 100644
index 000000000000..794e382ba77c
--- /dev/null
+++ b/gnustep-apps/cdplayer-0.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libcdio dev-libs/libcdio-paranoia gnustep-apps/cynthiune dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Small CD Audio Player for GNUstep
+EAPI=5
+HOMEPAGE=https://github.com/schik/cdplayer
+IUSE=dbus debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libcdio dev-libs/libcdio-paranoia gnustep-apps/cynthiune dbus? ( gnustep-libs/dbuskit ) !gnustep-libs/cddb >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/schik/cdplayer/archive/v0.6.0.tar.gz -> cdplayer-0.6.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=00160e334256d17ed9a7b9f9eb778168
diff --git a/gnustep-apps/cdplayer/Manifest b/gnustep-apps/cdplayer/Manifest
deleted file mode 100644
index 5e67b91d6728..000000000000
--- a/gnustep-apps/cdplayer/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cdplayer-0.6.0.tar.gz 365695 BLAKE2B 3bf32a0c6ed70da3653be4dee6a59147e5d184d411f823a2d76bb67b0efe801a9cad2ca2b58529e567bafa4ef7a1726f5306870c5702de5d2c5287e5f81c3d5f SHA512 a777a8eb3b924fca7905b8063d9cbc64f1b3b5efd8f6ebcb4366c69e5c085d14cc416a25d6b389025d7ac2f80ee08e2adc742aa96c2c9f70170af22c807b7809
-EBUILD cdplayer-0.6.0.ebuild 794 BLAKE2B 0fd9ae6d5e111481293287a14b086053dff36f3f73a4d57e2b5dec18136d5bb8deba3b4660c0e4eac9dcb405f3758c69460c0631ffd3f95c3f66ce013ef3ac6c SHA512 4454f9a3d4392a6849573822a0085a36f47077e42b06ec27e3cfbfdcf415aaecb18565a60762c196953d26d84bdf253a0f7d9339e41b19b0bbefbbf8bf9fe92b
-MISC metadata.xml 406 BLAKE2B 4a2fe010de2675027505344ccbeddd75371138a86edda29dd5c2bb7247bd034af9774935d194abffcca3bbe3b8ebdad0b728b1286d61fc43a21fc302ffcea396 SHA512 220c1fa1624b8498de6601dc6225e322025a50b60ceb40401ec740a74cb0c6097210e749e6724ca6c146af33e7b696590bed08b8a030af3b7b3a7f2c7a7d24b2
diff --git a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild b/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
deleted file mode 100644
index 673668b295a7..000000000000
--- a/gnustep-apps/cdplayer/cdplayer-0.6.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="Small CD Audio Player for GNUstep"
-HOMEPAGE="https://github.com/schik/cdplayer"
-SRC_URI="https://github.com/schik/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="dbus"
-DEPEND="dev-libs/libcdio
-	dev-libs/libcdio-paranoia
-	gnustep-apps/cynthiune
-	dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}
-	!gnustep-libs/cddb"
-
-src_prepare() {
-	sed -e "s#cdda.h#paranoia/cdda.h#" \
-		-e "s#paranoia.h#paranoia/paranoia.h#" \
-		-i AudioCD/AudioCD.h || die "AudioCD.h sed failed"
-}
-
-src_compile() {
-	local myconf=""
-	use dbus || myconf="${myconf} notifications=no"
-
-	egnustep_env
-	egnustep_make ${myconf}
-}
diff --git a/gnustep-apps/cdplayer/metadata.xml b/gnustep-apps/cdplayer/metadata.xml
deleted file mode 100644
index b4a454b1a467..000000000000
--- a/gnustep-apps/cdplayer/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Small CD Audio Player for GNUstep</longdescription>
-	<upstream>
-		<remote-id type="github">schik/cdplayer</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/cenon-4.0.2-r1 b/gnustep-apps/cenon-4.0.2-r1
new file mode 100644
index 000000000000..fee63096b7fa
--- /dev/null
+++ b/gnustep-apps/cenon-4.0.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX
+EAPI=5
+HOMEPAGE=http://www.cenon.info/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=Cenon
+RDEPEND=>=gnustep-libs/cenonlibrary-4.0.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.cenon.zone/download/source/Cenon-4.0.2.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d30ea5d78197be28e1a0942537b6f19c
diff --git a/gnustep-apps/cenon/Manifest b/gnustep-apps/cenon/Manifest
deleted file mode 100644
index 6c359a4dacb7..000000000000
--- a/gnustep-apps/cenon/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cenon-4.0.2-check-return-value.patch 1416 BLAKE2B fa71100d4dc75119f3b853ad246ce81a9703d26fd1a90ed8a40cf34d1c472f15a94c5328e333b616d820aef9bbf7d6426b612ef1b92c118eeda90595bedbf372 SHA512 07cd48ed24fc791a5b3921cae99b4bcd9a36167b1d4c376881b82f420c7870ea2ae02aaf1cade56bc88b3f306154e60d3e64a9c2b6fe880ead317250e0ada921
-AUX cenon-4.0.2-gnustep-gui-0.24-support.patch 7456 BLAKE2B 87be676970631e905cef75c1d4f7fa4b49449c24987d561851a888e0e510d18ed645047baf8b50db42ef045fc49f2de34a7c6878b2598eca5b5ad67a14b38439 SHA512 a740fda5548284d4d6ad46d972c19b23382b6d0e4b92573c9edebe1eb362f13863bc9e8b50fcfd0c9f450fea979ba781ce3723fe692f862ed23fc0e7f02b23b7
-AUX cenon-4.0.2-install.patch 690 BLAKE2B 64eff078e98b8d4052af2801517c0712384222007eb3af343f92793a42d4f4b5fdcc347b70b8832062471b73a13eb32d811de7a26b18e0b70005d4cc57b3de1c SHA512 fece9ed365b6fa5ca2b897b64c073eb780c6270f6e7f8c7e92748c54626cda3a47872245869f4e3ba8b8fbd9ee8bf8665b0feb1574daca006f828d363e95ad21
-DIST Cenon-4.0.2.tar.bz2 4150615 BLAKE2B 75252c6495c0cdba32f18e31674ff1c4f8e3d6c7f94b56ac763bcd7d8bcb401fe6817e0a06642dc927ff87c32956e9277a777a7744a8a33135a4e3a76aa511cc SHA512 94bf95dbdb8fbe9c21fbe80cbc33fbe376c598cf79be295cb1045a0ac888da5363f388f3f051d593ca47f6c1fcbade2825389aec5da328c59158a1e5da89db75
-EBUILD cenon-4.0.2-r1.ebuild 677 BLAKE2B 6ceb3cd274d1c4f3f24713fbf6fc26a7527bd89cf905eacd3ae8b215cc6aeb040b804386ef5a11b5801007f1c3a39b717e4a2c53ddd04d2bd28a222052c82716 SHA512 f52dfb053603ecfee1a702e9e6ed28d3247401ebcc68aae84af489c9d3878bb8040a7113bbc50fe90fa8ffc1e9de190e5b9e7819aac56fe8fee434e500b36ee9
-MISC metadata.xml 447 BLAKE2B cb51c659c741f694f0e13e16113d92e3211b52105bdaa29754c0f3ed040dd6d37bb1873b438d779a6f26080a23a25659a349405c28e4a05f0949c8472ed8d300 SHA512 8b1bf24888d06c487d4601bd31d5184070554ecd59923a3de482b4fcce6f5130c706f68d4b35d1545be4a1fbbd76ac36f3072df1c6f5e92c03d8ee3d566b72a3
diff --git a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild b/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
deleted file mode 100644
index 209586efc0a7..000000000000
--- a/gnustep-apps/cenon/cenon-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-S=${WORKDIR}/${PN/c/C}
-
-DESCRIPTION="Cenon is a vector graphics tool for GNUstep, OpenStep and MacOSX"
-HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.cenon.zone/download/source/${P/c/C}.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-LICENSE="Cenon"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=gnustep-libs/cenonlibrary-4.0.0"
-
-src_prepare() {
-	# Do not install files already provided by cenonlibrary
-	epatch "${FILESDIR}"/${P}-install.patch
-
-	epatch "${FILESDIR}"/${P}-check-return-value.patch
-	epatch "${FILESDIR}"/${P}-gnustep-gui-0.24-support.patch
-}
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch b/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch
deleted file mode 100644
index a23135b3230d..000000000000
--- a/gnustep-apps/cenon/files/cenon-4.0.2-check-return-value.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Check the return value of `system'.
-Author: Yavor Doganov <yavor@gnu.org>
-Forwarded: yes
-Last-Update: 2014-06-25
----
-
---- cenon.app.orig/VHFImport/PSImport.m
-+++ cenon.app/VHFImport/PSImport.m
-@@ -143,7 +143,14 @@
- 
-     /* convert pdf to eps */
-     commandLine = [NSString stringWithFormat:@"%@ -q -dNOPAUSE -dBATCH -dSAFER -sDEVICE=epswrite -sOutputFile=%@ -c save pop -f '%@'", [self gsPath], psFile, pdfFile];
--    system([commandLine UTF8String]);
-+    if (system([commandLine UTF8String]) != 0)
-+      {
-+	NSRunAlertPanel(@"Unable to import file",
-+			@"An error occured while importing the file.\n"
-+			@"Make sure you have ghostscript installed in PATH.",
-+			@"OK", nil, nil);
-+	return nil;
-+      }
- 
-     /* import ps */
-     psData = [NSData dataWithContentsOfFile:psFile];
-@@ -330,7 +337,14 @@
-     //[data writeToFile:inFile atomically:NO];    // <= 10.4
- 
-     commandLine = [NSString stringWithFormat:@"%@ -dNODISPLAY -dBATCH -dNOSAFER -g1000x1000 '%@'", [self gsPath], inFile];
--    system([commandLine UTF8String]);
-+    if (system([commandLine UTF8String]) != 0)
-+      {
-+	NSRunAlertPanel(@"Unable to import file",
-+			@"An error occured while importing the file.\n"
-+			@"Make sure you have ghostscript installed in PATH.",
-+			@"OK", nil, nil);
-+	return nil;
-+      }
- 
-     /* load generated file */
-     //data = [[[NSString alloc] initWithContentsOfFile:outFile] autorelease];
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch b/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch
deleted file mode 100644
index b0799d835175..000000000000
--- a/gnustep-apps/cenon/files/cenon-4.0.2-gnustep-gui-0.24-support.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-Description: Various fixes for gnustep-base/1.24 and gnustep-gui/0.24.
- - Proper intialization.
- - Use correct return types for methods and compare functions.
- - Likewise for method arguments.
- - Avoid conflicting methods by declaring the ivars of a specific type.
- - Add mising argument to private method declaration.
-Author: Yavor Doganov <yavor@gnu.org>
-Bug-Debian: http://bugs.debian.org/749553
-Forwarded: yes
-Last-Update: 2014-06-25
----
-
---- cenon.app.orig/GraphicObjects.subproj/VCurveFit.m
-+++ cenon.app/GraphicObjects.subproj/VCurveFit.m
-@@ -87,7 +87,7 @@
- /* turn lines into optimized curves
-  */
- - (VPath*)fitGraphic:(VGraphic*)g maxError:(double)maxError
--{   Point2  *pts = nil;
-+{   Point2  *pts = NULL;
-     int     i, nPts = 0;
-     VPath   *path = nil;
- 
---- cenon.app.orig/GraphicObjects.subproj/VGroup.h
-+++ cenon.app/GraphicObjects.subproj/VGroup.h
-@@ -67,7 +67,7 @@
- - (float)stepWidth;
- - (void)setRadialCenter:(NSPoint)rc;
- - (NSPoint)radialCenter;
--- (void)setList:(NSArray*)aList;
-+- (void)setList:(NSMutableArray*)aList;
- - (void)addObject:(VGraphic*)g;
- - (void)add:(NSArray*)addList;
- - (NSMutableArray*)list;
---- cenon.app.orig/InspectorPanel.subproj/IPAllAcc.h
-+++ cenon.app/InspectorPanel.subproj/IPAllAcc.h
-@@ -40,7 +40,7 @@
- 
- @interface IPAllAcc:IPBasicLevel
- {
--    id  accPopup;           // the popup to allow the user to select the different accessories
-+    NSPopUpButton *accPopup; // the popup to allow the user to select the different accessories
-     id  accView;            // the view containing the accessory view
- 
-     int levelCnt;           // number of accessories
---- cenon.app.orig/InspectorPanel.subproj/IPAllFilling.h
-+++ cenon.app/InspectorPanel.subproj/IPAllFilling.h
-@@ -39,7 +39,7 @@
-     id stepForm;
-     id colorWell;
-     id colorWellGraduated;
--    id fillPopup;
-+    NSPopUpButton *fillPopup;
-     id sliderBox;
-     id radialCenterText;
-     id angleButtonLeft;
---- cenon.app.orig/InspectorPanel.subproj/IPAllStrokeWidth.h
-+++ cenon.app/InspectorPanel.subproj/IPAllStrokeWidth.h
-@@ -35,7 +35,7 @@
- @interface IPAllStrokeWidth:IPBasicLevel
- {
-     int		stroked;
--    id 		strokePopup;
-+    NSPopUpButton	*strokePopup;
-     id 		colorWell;
-     id 		widthField;
-     id 		widthSlider;
---- cenon.app.orig/LayerObject.h
-+++ cenon.app/LayerObject.h
-@@ -144,8 +144,8 @@
- - (void)setString:(NSString *)aString;
- - (NSString*)string;
- 
--- (void)setTag:(int)newTag;
--- (int)tag;
-+- (void)setTag:(NSInteger)newTag;
-+- (NSInteger)tag;
- 
- - (void)setColor:(NSColor *)aColor;
- - (NSColor *)color;
---- cenon.app.orig/LayerObject.m
-+++ cenon.app/LayerObject.m
-@@ -227,8 +227,8 @@
- - (void)setString:(NSString *)aString   { [string release]; string = [aString retain]; }
- - (NSString *)string                    { return string; }
- 
--- (void)setTag:(int)newTag              { tag = newTag; }
--- (int)tag                              { return tag; }
-+- (void)setTag:(NSInteger)newTag        { tag = newTag; }
-+- (NSInteger)tag                        { return tag; }
- 
- - (void)setColor:(NSColor *)aColor      { color=aColor; }
- - (NSColor *)color                      { return color; }
---- cenon.app.orig/GraphicObjects.subproj/VPath.h
-+++ cenon.app/GraphicObjects.subproj/VPath.h
-@@ -58,7 +58,7 @@
- - (NSMutableArray*)list;
- - (void)setList:aList;
- - (void)setList:aList optimize:(BOOL)optimize;
--- (unsigned)count;
-+- (NSUInteger)count;
- - (unsigned)countRecursive;
- - (void)getEndPoints:(NSPoint*)p1 :(NSPoint*)p2;
- - (int)selectedKnobIndex;
---- cenon.app.orig/GraphicObjects.subproj/VPath.m
-+++ cenon.app/GraphicObjects.subproj/VPath.m
-@@ -399,7 +399,7 @@
-     *p2 = [[list objectAtIndex:[list count]-1] pointWithNum:MAXINT]; 
- }
- 
--- (unsigned)count
-+- (NSUInteger)count
- {
-     return [list count];
- }
---- cenon.app.orig/InspectorPanel.subproj/IPImage.h
-+++ cenon.app/InspectorPanel.subproj/IPImage.h
-@@ -43,7 +43,7 @@
-     id	thumbSwitch;
-     id	nameField;
-     id	factorField;
--    id	compPopUp;
-+    NSPopUpButton *compPopUp;
- 
-     VGraphic	*graphic;	// the loaded graphic or the first of them if multiple
- }
---- cenon.app.orig/DINImportSub.m
-+++ cenon.app/DINImportSub.m
-@@ -46,7 +46,7 @@
- /* created: 2001-06-06
-  * performcance map is not used, because we set this later when the layers are added to the view!
-  */
--static NSInteger sortLayer(id l1, id l2, void *context)
-+static NSComparisonResult sortLayer(id l1, id l2, void *context)
- {   float       d1 = 0.0, d2 = 0.0;
-     VGraphic    *g0 = [[l1 list] objectAtIndex:0], *g1 = [[l2 list] objectAtIndex:0];
- 
---- cenon.app.orig/DocView.m
-+++ cenon.app/DocView.m
-@@ -994,7 +994,7 @@
- #define SORT_COL_LRUL 5
- #define SORT_ROW_URLL 6
- #define SORT_ROW_LRUL 7
--NSInteger sortPosition(id g1, id g2, void *context)
-+NSComparisonResult sortPosition(id g1, id g2, void *context)
- {   NSPoint	p1 = [g1 bounds].origin, p2 = [g2 bounds].origin;
-     int		sort = *(int*)context;
- 
---- cenon.app.orig/SVGImportSub.m
-+++ cenon.app/SVGImportSub.m
-@@ -112,7 +112,7 @@
- /* allocate a group object
-  * copy the objects in aList to the group, add the group to bList
-  */
--- (void)addGroupList:(NSArray*)aList toList:bList
-+- (void)addGroupList:(NSMutableArray*)aList toList:bList
- {   VGroup          *g = [VGroup group];
-     int             i;
-     NSMutableArray  *mutArray = [NSMutableArray array];
-@@ -136,7 +136,7 @@
-     [bList addObject:g];
- }
- 
--- (void)addGroupList:(NSArray*)aList toList:bList withTransform:(NSAffineTransform*)matrix
-+- (void)addGroupList:(NSMutableArray*)aList toList:bList withTransform:(NSAffineTransform*)matrix
- {   VGroup          *g = [VGroup group];
-     int             i;
-     NSMutableArray  *mutArray = [NSMutableArray array];
---- cenon.app.orig/MoveCell.h
-+++ cenon.app/MoveCell.h
-@@ -32,7 +32,7 @@
- 
- @interface MoveCell:NSCell
- {
--    int		tag;
-+    NSInteger		tag;
-     MoveMatrix 	*moveMatrix;
- 
-     float	ascender, descender, lineHeight;
-@@ -41,8 +41,8 @@
- - (void)setMatrix:(MoveMatrix *)anMatrix;
- - (void)setFont:(NSFont *)fontObj;
- 
--- (void)setTag:(int)anInt;
--- (int)tag;
-+- (void)setTag:(NSInteger)anInt;
-+- (NSInteger)tag;
- 
- - (BOOL)dependant;
- 
---- cenon.app.orig/MoveCell.m
-+++ cenon.app/MoveCell.m
-@@ -39,14 +39,14 @@
- 
- /* modified: 13.01.93
-  */
--- (void)setTag:(int)anInt
-+- (void)setTag:(NSInteger)anInt
- {
-     tag=anInt;
- }
- 
- /* modified: 13.01.93
-  */
--- (int)tag
-+- (NSInteger)tag
- {
-     return tag;
- }
---- cenon.app.orig/VHFImport/DXFImport.m
-+++ cenon.app/VHFImport/DXFImport.m
-@@ -86,7 +86,7 @@
- - (BOOL)getSolid:(NSScanner*)scanner :(NSPoint*)ps :(int*)pCnt;
- - (BOOL)getCircle:(NSScanner*)scanner :(NSPoint*)ctr :(NSPoint*)start :(float*)angle;
- - (BOOL)getArc:(NSScanner*)scanner :(NSPoint*)ctr :(NSPoint*)start :(float*)angle;
--- (BOOL)getText :(NSScanner*)scanner mtext:(BOOL)mext :(NSString**)string :(float*)angle :(NSPoint*)origin :(float*)size :(float*)ar :(int*)alignment;
-+- (BOOL)getText :(NSScanner*)scanner mtext:(BOOL)mext :(NSString**)string :(float*)angle :(NSPoint*)origin :(float*)size :(float*)ar :(int*)alignment :(NSString**)fontName;
- - (BOOL)get3DFace:(NSScanner*)scanner points:(V3Point*)pts color:(NSColor**)color;
- - (BOOL)getInsert:(NSScanner*)scanner :cList;
- - (void)updateBounds:(NSPoint)p;
---- cenon.app.orig/TileScrollView.h
-+++ cenon.app/TileScrollView.h
-@@ -36,7 +36,7 @@
- @interface TileScrollView:NSScrollView
- {
-     id		box;
--    id		resPopupListButton;
-+    NSPopUpButton *resPopupListButton;
-     id		document;
-     VFloat	oldScaleFactor;
- }
diff --git a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch b/gnustep-apps/cenon/files/cenon-4.0.2-install.patch
deleted file mode 100644
index 8a75db6ee13a..000000000000
--- a/gnustep-apps/cenon/files/cenon-4.0.2-install.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur Cenon.orig/GNUmakefile.postamble Cenon/GNUmakefile.postamble
---- Cenon.orig/GNUmakefile.postamble	2013-04-23 18:18:19.231871028 +0200
-+++ Cenon/GNUmakefile.postamble	2013-04-23 18:19:31.482864370 +0200
-@@ -18,12 +18,12 @@
- # before-install::
- 
- # Things to do after installing
--after-install::
-+#after-install::
- 	# copy library
- 	#rm -R $(GNUSTEP_LIBRARY)/$(APP_NAME)
--	cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
-+	#cp -R Library/$(APP_NAME)/ $(GNUSTEP_LIBRARY)/
- 	# set permissions (rrr)
--	chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
-+	#chmod -R ugo+rX $(GNUSTEP_APPS)/$(APP_NAME).*
- 	#chmod -R ugo+rX $(GNUSTEP_LIBRARY)/$(APP_NAME)
- 
- # Things to do before uninstalling
diff --git a/gnustep-apps/cenon/metadata.xml b/gnustep-apps/cenon/metadata.xml
deleted file mode 100644
index 82760064a1ed..000000000000
--- a/gnustep-apps/cenon/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-		Cenon is a graphical tool of a special kind. Build upon a
-		modular graphical core, Cenon offers a wide variety of
-		possibilities and applications.
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/cynthiune-1.0.0 b/gnustep-apps/cynthiune-1.0.0
new file mode 100644
index 000000000000..4af59c8cb00a
--- /dev/null
+++ b/gnustep-apps/cynthiune-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=media-libs/audiofile media-libs/taglib alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( media-libs/libid3tag media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( media-libs/libmodplug ) timidity? ( media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.1.2 >=media-libs/libvorbis-1.0.1-r2 ) mad? ( virtual/pkgconfig ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Free software and romantic music player for GNUstep
+EAPI=5
+HOMEPAGE=http://gap.nongnu.org/cynthiune/
+IUSE=alsa ao flac mad modplug musepack oss timidity vorbis debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/audiofile media-libs/taglib alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) flac? ( media-libs/flac ) mad? ( media-libs/libid3tag media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) modplug? ( media-libs/libmodplug ) timidity? ( media-sound/timidity++ ) vorbis? ( >=media-libs/libogg-1.1.2 >=media-libs/libvorbis-1.0.1-r2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Cynthiune-1.0.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8a6fd884fffbeeb60d5683dc5d26314d
diff --git a/gnustep-apps/cynthiune/Manifest b/gnustep-apps/cynthiune/Manifest
deleted file mode 100644
index b203832d13a6..000000000000
--- a/gnustep-apps/cynthiune/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Cynthiune-1.0.0.tar.gz 570554 BLAKE2B 84cf68622c75b3e2b978aef2d8e3ab1de582d58a3d0c9cd7fac47c30cde69e61a16016abcfe0290339648cda58e0600fc21dae3ce97d3d0ec07013af9cb1c366 SHA512 ae56a77a138b2f661ecedbbad89935c3e8ec44447b000b73985577ea28304d11bb957fe118ba844168e9c7a06a229e8b024a6bc6eb4199080d6e69b77a31b4b7
-EBUILD cynthiune-1.0.0.ebuild 1702 BLAKE2B ad1e73150726a8867f12ac347ba455a0f83ea0181856f10bd8954658b77edf577218ea54efa31c1f071c227ee64792dccadb940f5734960b0b5edf07e201dfad SHA512 b991e8e64fa3a2c5906c47a6e50e9f49d1e13d002eb4cf7f4eeb77e7e379b93052f269f03b5d403a9e34e9e1e9743b1791857903fafbd06e84451c27bd25648d
-MISC metadata.xml 2309 BLAKE2B 2e481586c05f827797dbf4e4994dd6f4d17024ec9326090208fe8332efa0722ae6d6cde1e12658091ea8af1e032af7b15afd5d1c36a82336ffe4824dee510674 SHA512 ba9ac73bb2da9a4bb0935c3bad93a7ed9b78ef2ef1e43264e6c09558954c8a725ba3c1df88fec14fc0d7a2cb6a953d1aeb612b16edfdd4b1a7f14e42eb58c0a8
diff --git a/gnustep-apps/cynthiune/cynthiune-1.0.0.ebuild b/gnustep-apps/cynthiune/cynthiune-1.0.0.ebuild
deleted file mode 100644
index f6c3a25f513b..000000000000
--- a/gnustep-apps/cynthiune/cynthiune-1.0.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/c/C}
-DESCRIPTION="Free software and romantic music player for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/cynthiune/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="alsa ao flac mad modplug musepack oss timidity vorbis"
-
-# musicbrainz disabled upstream for now
-RDEPEND="media-libs/audiofile
-	media-libs/taglib
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libid3tag
-		media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	modplug? ( media-libs/libmodplug )
-	timidity? ( media-sound/timidity++ )
-	vorbis? ( >=media-libs/libogg-1.1.2
-		>=media-libs/libvorbis-1.0.1-r2 )"
-DEPEND="${RDEPEND}
-	mad? ( virtual/pkgconfig )"
-
-S=${WORKDIR}/${MY_P}
-
-cynthiune_get_config() {
-	local myconf="disable-windowsmedia=yes disable-esound=yes"
-	use alsa || myconf="${myconf} disable-alsa=yes"
-	use ao || myconf="${myconf} disable-ao=yes"
-	use flac || myconf="${myconf} disable-flac=yes disable-flactags=yes"
-	use mad || myconf="${myconf} disable-mp3=yes disable-id3tag=yes"
-	use modplug || myconf="${myconf} disable-mod=yes"
-	use musepack || myconf="${myconf} disable-musepack=yes"
-	use oss || myconf="${myconf} disable-oss=yes"
-	use timidity || myconf="${myconf} disable-timidity=yes"
-	use vorbis || myconf="${myconf} disable-ogg=yes disable-vorbistags=yes"
-
-	echo ${myconf}
-}
-
-src_compile() {
-	egnustep_env
-	egnustep_make "$(cynthiune_get_config)"
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install "$(cynthiune_get_config)"
-}
diff --git a/gnustep-apps/cynthiune/metadata.xml b/gnustep-apps/cynthiune/metadata.xml
deleted file mode 100644
index 69269796fe98..000000000000
--- a/gnustep-apps/cynthiune/metadata.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Cynthiune (january 2004)
-=========
-
-What is Cynthiune?
-------------------
-Cynthiune is a free software and romantic music player for GNUstep and MacOSX.
-I wrote it originally as a christmas gift to a girl that I liked because she
-could not listen to music on her Mac with a free program. Since then, I decided
-to make it public and add even more features to make it a complete and useable
-media player.
-
-For the moment, it looks pretty much like XMMS, Winamp and similar software.
-Even though it has far less features than those, the essential components of a
-usable and user-friendly program are there in my opinion.
-
-From a programmatic point-of-view, I have decided to write a program that is
-released only when considered bug-free. The free software community lacks,
-IMnsHO, a sense of quality that makes its programs nearly useless to
-lambda users. Not only is it useless, but I think it also gives free software
-a bad reputation. The principle of freedom in "free software" is fundamental
-to me, but it has to be reachable not only by some sort of geeky elite. There
-is no point in telling users that since they have the freedom to enhance those
-programs, they must fix them if they want to use them. Releasing a program
-with too many bugs is of no use and is likely not to interest other fellow
-programmers in the community either.
-
-On the other hand, Apple has published an interesting program called "iTunes".
-Of course, it is not free software but it does implement interesting ideas
-that I would like to include in Cynthiune. For example: CD burning, complete
-playlist management, etc... Personally I find its user interface to be not as
-user-friendly as it could be. My plan is thus to take advantage of my own
-programming skills and sense of aesthetics (and ergonomy) to try to write
-something a little bit different, inspired both by XMMS/Winamp and iTunes.
-Cynthiune is thus currently very basic but its core design is starting to be
-extensible enough that it will not be too much trouble to enhance it.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/fisicalab-0.3.5 b/gnustep-apps/fisicalab-0.3.5
new file mode 100644
index 000000000000..839774b2841a
--- /dev/null
+++ b/gnustep-apps/fisicalab-0.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=educational application to solve physics problems
+EAPI=5
+HOMEPAGE=https://www.gnu.org/software/fisicalab
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=sci-libs/gsl-1.10 >=virtual/gnustep-back-0.16.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://gnu/fisicalab/fisicalab-0.3.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a32c59f49fe286f275ec7b506c367fd4
diff --git a/gnustep-apps/fisicalab/Manifest b/gnustep-apps/fisicalab/Manifest
deleted file mode 100644
index ee7ba92603de..000000000000
--- a/gnustep-apps/fisicalab/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST fisicalab-0.3.5.tar.gz 7801631 BLAKE2B a4c07f951620ade580dc788bb5380f400b95b71e69df87288836b8eb221b76998ec9214a23b2c75e39a46816deefa65a935b5196c9281008e1ac44924b29893b SHA512 03ac3f67c3597fda8418f6b5e7612c2b56cd90a5afd12834e57934a0a453f7afd7488ba0476af576275a3e2663389d4b18de590bfc954d2ca38af6c31cbd790b
-EBUILD fisicalab-0.3.5.ebuild 427 BLAKE2B faf3f097b9af0fffc34bbff3a2bdf55fa6f08e4eda4da764f7554154554cc01695093d6c4b7c4bbbf903f0d39c308fdbd7f134e9ec9e472978b74b438ea41085 SHA512 a8f79795683efa8658fb816f8ad43bf9e89d1e3b01eacab78cd43d94cc386ed3e57c9ba1ba5ca9863e54e14b233ef1dd5889dfc53e707eb931c201cca28d952f
-MISC metadata.xml 693 BLAKE2B 5ea95708724d1f1e309d490f489294c0e6c2525d8bd94c1e9d832c31d64709bdf48069af4941019027bd31674b0544b89ba9a686cc3596af9b49dc2035ac76ac SHA512 eb4ed444758c79796bd963843fb4db345ff1587ec955195267b1dadb6c313fa988e6c50bd02595c6773e7c7b901290ca6bd3d9cebb5e805458cbf2130efe8df2
diff --git a/gnustep-apps/fisicalab/fisicalab-0.3.5.ebuild b/gnustep-apps/fisicalab/fisicalab-0.3.5.ebuild
deleted file mode 100644
index 55e2cefb11c7..000000000000
--- a/gnustep-apps/fisicalab/fisicalab-0.3.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-DESCRIPTION="educational application to solve physics problems"
-HOMEPAGE="https://www.gnu.org/software/fisicalab"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=sci-libs/gsl-1.10
-	>=virtual/gnustep-back-0.16.0"
-RDEPEND="${DEPEND}"
diff --git a/gnustep-apps/fisicalab/metadata.xml b/gnustep-apps/fisicalab/metadata.xml
deleted file mode 100644
index d204a0226edc..000000000000
--- a/gnustep-apps/fisicalab/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>FísicaLab is an educational application to solve physics problems. Is made with GNUstep and use the GSL libraries (GNU Scientific Library). The problems are setting adding elements from the palette to chalkboard, and writing the data of each element. The elements are objects as Blocks, Pulleys, Mobiles, Forces, ... . Use the SI and English systems, scientific notation and many conversion factors</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/ftp-0.5 b/gnustep-apps/ftp-0.5
new file mode 100644
index 000000000000..88d1f2eda6af
--- /dev/null
+++ b/gnustep-apps/ftp-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=FTP client for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/ftp/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/FTP-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=45f28d20af5da0a9ab8952ba7c789383
diff --git a/gnustep-apps/ftp-0.6 b/gnustep-apps/ftp-0.6
new file mode 100644
index 000000000000..60712777d118
--- /dev/null
+++ b/gnustep-apps/ftp-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=FTP client for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/ftp/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/FTP-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=45f28d20af5da0a9ab8952ba7c789383
diff --git a/gnustep-apps/ftp/Manifest b/gnustep-apps/ftp/Manifest
deleted file mode 100644
index 13865d9aa104..000000000000
--- a/gnustep-apps/ftp/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST FTP-0.5.tar.gz 132587 BLAKE2B cf564c0780abae841ea9ac8774841955429b688e8e4150391996d4d72051a8be9e14d8533d21a238f1b4a50c9bdf17cc717a9788a7b1514d30a1e2a3bf0f4037 SHA512 186ea229d15d06f43410bfb7eaa5d50548f908f1675a0beae54dcbc9f7adeb62384ab68fee8980df582d0c257721fb3a56ea4968ecdc91c3301172d82d61bee7
-DIST FTP-0.6.tar.gz 161962 BLAKE2B c2a121455589ee76c78df171a9f099737bd006da9775d0edd7c5c9643de79300a720a8cccde7b2ed835b73e3d78079b3c9a8932af52636a0f957d8461ab881ce SHA512 c717a7163b98b00c20aa06ab9acc5f3abca0e2b035a3ad801d5339bc80ad54cd86f1e52c1a28f0d7fb931bf70f0565073c20f9ba5e129cb7514cf0a153ec16a4
-EBUILD ftp-0.5.ebuild 403 BLAKE2B 2154a6fe8a5903171decb86b5cb04f4e450cf426133adb5aef9ee96107a26c0597dcba3a649555f6aa1582c5c59f063f8f1a0acdd69c0fff906a6f7376dba120 SHA512 f1c7285ba5ed3da2c52516a815ac9a13701472b40a28296c3aacd51707528f24a9c7dbfaac868d6634743f43ea53860e756678ad88cc7ba2299e6c70b202fe97
-EBUILD ftp-0.6.ebuild 403 BLAKE2B 2154a6fe8a5903171decb86b5cb04f4e450cf426133adb5aef9ee96107a26c0597dcba3a649555f6aa1582c5c59f063f8f1a0acdd69c0fff906a6f7376dba120 SHA512 f1c7285ba5ed3da2c52516a815ac9a13701472b40a28296c3aacd51707528f24a9c7dbfaac868d6634743f43ea53860e756678ad88cc7ba2299e6c70b202fe97
-MISC metadata.xml 758 BLAKE2B 52bdc4e1bd89a9a1398413c25c48f10c573ad401789a26a1fe7494a6f56d3db9570fa8975100dd8e351b97696fdc03bcab04cf9f095769a6e60223629bbf788b SHA512 b002ee5e922f16c67876213e29a5009d67db75f5af1ed5cd847a4db1bf9b288768ec1d2ea786d941d8b4528d4faa2d256767666f4d857a1a3910b8bdf01da951
diff --git a/gnustep-apps/ftp/ftp-0.5.ebuild b/gnustep-apps/ftp/ftp-0.5.ebuild
deleted file mode 100644
index df4e52448d48..000000000000
--- a/gnustep-apps/ftp/ftp-0.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="FTP-${PV}"
-
-DESCRIPTION="FTP client for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/ftp/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/ftp/ftp-0.6.ebuild b/gnustep-apps/ftp/ftp-0.6.ebuild
deleted file mode 100644
index df4e52448d48..000000000000
--- a/gnustep-apps/ftp/ftp-0.6.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="FTP-${PV}"
-
-DESCRIPTION="FTP client for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/ftp/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/ftp/metadata.xml b/gnustep-apps/ftp/metadata.xml
deleted file mode 100644
index 8c1fd1a8d59e..000000000000
--- a/gnustep-apps/ftp/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>FTP is a file transfer application (RFC 765) featuring a compact and easy interface. As most applications in GAP it tries to work on both GNUstep and MacOS X and retain the utmost possible simlilarity among the two version to ease working in both environments.
-
-Two panes manage local (left) and remote (right) resources.
-Transfer of single files as well as multiple selection is possible, recursive upload (directories and sub-directories) is performed transparently.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gemas-0.4 b/gnustep-apps/gemas-0.4
new file mode 100644
index 000000000000..6787e5e30a41
--- /dev/null
+++ b/gnustep-apps/gemas-0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 projectcenter? ( gnustep-apps/projectcenter ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a simple code editor for GNUstep
+EAPI=5
+HOMEPAGE=http://wiki.gnustep.org/index.php/Gemas.app
+IUSE=projectcenter debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=>=gnustep-libs/highlighterkit-0.1.2 >=virtual/gnustep-back-0.22.0 projectcenter? ( gnustep-apps/projectcenter ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep-nonfsf/Gemas-0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ee4a1abbf166b0530b299704516a9b06
diff --git a/gnustep-apps/gemas/Manifest b/gnustep-apps/gemas/Manifest
deleted file mode 100644
index ba5dc8194497..000000000000
--- a/gnustep-apps/gemas/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gemas-0.4-bundle_makefile.patch 1171 BLAKE2B b6a4e93248b4891a7940f03e36ba6bf88bc47c57b42f7428dcc90d35b3c2ce8b17ecf74f2a58b85b22c43e4677bff010216bb6d7d689215cad2652e174fdb96a SHA512 0d53cf299be329b227152326c3e7e61dbbddfcbe3635a42a5e925a963aa3270d33fc42d9f8758824405bb3520128d4d521bbd4ed50f72d5f5945c565bce42638
-DIST Gemas-0.4.tar.gz 552558 BLAKE2B 0bc3c2ca5a54fd1af5e85816174473910743d0fd045934ccee170f6c13933cd9059fbe9d25040c3dbeeb91325a7c2573663929d7bb984735c2d68f059c665681 SHA512 6ae1acadd1be71362d93ac44498b789d160146f02c995280a003ac748c4d5dde615854014351c560e4e49576c20094dce0c4e2bef0c8096368c0c25679670e58
-EBUILD gemas-0.4.ebuild 911 BLAKE2B 85fa5a0737321e8cc4e4f2ca8d2e97c0fdbea27f2e3bd246eb84be0c7b0e211762799d8736a21e3ef82a52d42fc28e4bbd8d706242b6ee30e1a451a3efdf8f86 SHA512 5cceb8ba7319311bd3b42a6b7acb92f13fccee476898ae67dd886f73153df4bed3dc45213d4c1ceac0110be26fcc162cb01e3c8a97201a3e862fc03dade4083c
-MISC metadata.xml 650 BLAKE2B 2db84c12e3501cbb95af1f6d968aac83337414888094d4989b717eeaf39feddc9de9591c42a340fab70aa733ee60bc6c08e5dc5eaab07c249f3413e94d32f3c8 SHA512 a947ebcee4024d140b0aeb972cbd69b9fc13bb842fdf9866a660240b0914cbe7049c778929749735eabba0cc4a03fdf69aa65a9f324d4ec0386d33c73a1b4e9a
diff --git a/gnustep-apps/gemas/files/gemas-0.4-bundle_makefile.patch b/gnustep-apps/gemas/files/gemas-0.4-bundle_makefile.patch
deleted file mode 100644
index 73595f256b56..000000000000
--- a/gnustep-apps/gemas/files/gemas-0.4-bundle_makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur Gemas-0.4.orig/Bundle/Gemas/GNUmakefile Gemas-0.4/Bundle/Gemas/GNUmakefile
---- Gemas-0.4.orig/Bundle/Gemas/GNUmakefile	2013-12-24 18:51:16.000000000 +0100
-+++ Gemas-0.4/Bundle/Gemas/GNUmakefile	2014-02-10 10:50:45.331011111 +0100
-@@ -10,7 +10,7 @@
- BUNDLE_NAME = Gemas
- BUNDLE_EXTENSION = .editor
- Gemas_PRINCIPAL_CLASS = GemasEditor
--Gemas_INSTALL_DIR=$(GNUSTEP_LOCAL_APPS)/ProjectCenter.app/Resources
-+Gemas_INSTALL_DIR=${DESTDIR}/$(GNUSTEP_SYSTEM_APPS)/ProjectCenter.app/Resources
- 
- #
- # Additional libraries
-diff -Naur Gemas-0.4.orig/Bundle/Gemas/GNUmakefile.preamble Gemas-0.4/Bundle/Gemas/GNUmakefile.preamble
---- Gemas-0.4.orig/Bundle/Gemas/GNUmakefile.preamble	2013-12-24 18:51:16.000000000 +0100
-+++ Gemas-0.4/Bundle/Gemas/GNUmakefile.preamble	2014-02-10 10:50:50.622016109 +0100
-@@ -15,7 +15,7 @@
- ADDITIONAL_LDFLAGS +=
- 
- # Additional include directories the compiler should search
--ADDITIONAL_INCLUDE_DIRS +=-I$(GNUSTEP_LOCAL_HEADERS)/ProjectCenter
-+ADDITIONAL_INCLUDE_DIRS +=-I$(GNUSTEP_SYSTEM_HEADERS)/ProjectCenter
- 
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L./HighlighterKit/HighlighterKit.framework
diff --git a/gnustep-apps/gemas/gemas-0.4.ebuild b/gnustep-apps/gemas/gemas-0.4.ebuild
deleted file mode 100644
index 2fdf624eafe8..000000000000
--- a/gnustep-apps/gemas/gemas-0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnustep-2
-
-MY_P=${P/g/G}
-DESCRIPTION="a simple code editor for GNUstep"
-HOMEPAGE="http://wiki.gnustep.org/index.php/Gemas.app"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="projectcenter"
-
-DEPEND=">=gnustep-libs/highlighterkit-0.1.2
-	>=virtual/gnustep-back-0.22.0
-	projectcenter? ( gnustep-apps/projectcenter )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-bundle_makefile.patch
-}
-
-src_compile() {
-	gnustep-base_src_compile
-	if use projectcenter;
-	then
-		cd Bundle/Gemas || die "compile cd failed"
-		egnustep_make
-	fi
-}
-
-src_install() {
-	gnustep-base_src_install
-	if use projectcenter;
-	then
-		cd Bundle/Gemas || die "install cd failed"
-		egnustep_install
-	fi
-}
diff --git a/gnustep-apps/gemas/metadata.xml b/gnustep-apps/gemas/metadata.xml
deleted file mode 100644
index 3567c784835a..000000000000
--- a/gnustep-apps/gemas/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Gemas is a simple code editor for GNUstep. It have autoindentation and highlight syntax for C, C++, Objective-C, Objective-C++, GSmarkup. And to edit Strings, Plist, GNUmakefile, ChangeLog files and plain text files (INSTALL, README, ...)</longdescription>
-	<use>
-		<flag name="projectcenter">Build and install plugin for <pkg>gnustep-apps/projectcenter</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/gnustep-apps/gmines-0.2 b/gnustep-apps/gmines-0.2
new file mode 100644
index 000000000000..1af504e4a916
--- /dev/null
+++ b/gnustep-apps/gmines-0.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=The well-known minesweeper game
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/gmines/index.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GMines-0.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2d66800d38d7166b021f57342d59f291
diff --git a/gnustep-apps/gmines/Manifest b/gnustep-apps/gmines/Manifest
deleted file mode 100644
index a41c50985301..000000000000
--- a/gnustep-apps/gmines/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GMines-0.2.tar.gz 6768 BLAKE2B 7ff0abddef4d56245b35105d387e0994b2c4ed1c52fec5bd2166fced92153779f5cbd7e7f0b5e0e63f00463662719880db83a50d00c94b3221ef5435d7c4bcaf SHA512 592facdfb5db04418d79404ea2e6908fb7b7d67c4c55ab62e157bc18a7c69f3a5653bf2579257c56f91858f96785c424df7edcb8036c603fc1fb0740e68dd764
-EBUILD gmines-0.2.ebuild 393 BLAKE2B fc2bc2bc77b0b277e652c10d6696f0bb5baf0d15b32f68876f29aa95c849295f46d5805736fd9d1dbcf3dc5f3bab32bb8233158cde56e257a564d55144e0fa96 SHA512 f1a4acdf838c8dedaf850660c1bd6a3e12624ee0553ecf82c5ac0a541301ff3847d08b768e018196072337d8647f97c06428c878334cee9db2d947be0f7dfff4
-MISC metadata.xml 421 BLAKE2B 1bc3a8e001ac097510721f0927bb1779c61a8498508b8265838fba9106c33d2bb88e3da388a14b0b70e4c4ef76e31f789e3282a07dce0a71d2c87d60a3385b47 SHA512 f27f202c480fdcb3dfc9bbf082f35404c4f25baf6cbaa195f04f7a4934c77cb27d83740ae8bcf14cab86f1412aa0dcbf48af87afc0ccfe868acc8922f45ae408
diff --git a/gnustep-apps/gmines/gmines-0.2.ebuild b/gnustep-apps/gmines/gmines-0.2.ebuild
deleted file mode 100644
index 48ad1518b2cc..000000000000
--- a/gnustep-apps/gmines/gmines-0.2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-DESCRIPTION="The well-known minesweeper game"
-HOMEPAGE="http://gap.nongnu.org/gmines/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/gm/GM}.tar.gz"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-S=${WORKDIR}/${P/gm/GM}
diff --git a/gnustep-apps/gmines/metadata.xml b/gnustep-apps/gmines/metadata.xml
deleted file mode 100644
index e6557ded2ad0..000000000000
--- a/gnustep-apps/gmines/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-The well-known minesweeper game.
-Left-click to uncover, right-click to mark.
-
-The look is inspired by the KDE minesweeper program.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gnumail-1.2.2 b/gnustep-apps/gnumail-1.2.2
new file mode 100644
index 000000000000..121f33285166
--- /dev/null
+++ b/gnustep-apps/gnumail-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.11.0 =gnustep-libs/pantomime-1.2* gnustep-apps/addresses >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A fully featured mail application for GNUstep
+EAPI=5
+HOMEPAGE=http://www.collaboration-world.com/gnumail/
+IUSE=crypt debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep-nonfsf/GNUMail-1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b3a3ac1df06a2e5b2df68a93006e50ca
diff --git a/gnustep-apps/gnumail-1.2.3 b/gnustep-apps/gnumail-1.2.3
new file mode 100644
index 000000000000..876763931266
--- /dev/null
+++ b/gnustep-apps/gnumail-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.11.0 =gnustep-libs/pantomime-1.2* gnustep-apps/addresses >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A fully featured mail application for GNUstep
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html
+IUSE=crypt debug doc
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=crypt? ( app-crypt/gnupg ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://nongnu/gnustep-nonfsf/GNUMail-1.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fc96644ee580b395b6da7aa15a93d7ed
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
deleted file mode 100644
index 586b22ea7d4c..000000000000
--- a/gnustep-apps/gnumail/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST GNUMail-1.2.2.tar.gz 1397764 BLAKE2B 8b913d31d93d8bdbd186ecb50530926ccfec4917b3f4bd1ed9c70b86a97110cb1bae620cb24d9f8e1dbcebb652dbf1d30847cf8fdbc68a5ed0b1ede214440c57 SHA512 3243c51eb177c1fabeeb894e6231e5ace09fb08fd0eb9d6311726bdebddc743e3b3958b4c00597e7eb97de7c2a25f1ca7e8f4111e7d543ecd65ee5f35bea89cc
-DIST GNUMail-1.2.3.tar.gz 1411658 BLAKE2B 25feddbe4cb18305421488d3452093b5ef9dd04d4742b06c9260cd5428befa2643af8c34d402ecbcbeed20866adaf3a11c927b7d4aaa141869259799f5b39633 SHA512 5ee9b134b16c9aa8a7a0d4aff1e9d12a8c8d4f1f68c54d58cc354c3444a57a4c0bb31393886589ef83ae588789f00fd6e1313d01eb1f950af6623cc9ee42e598
-EBUILD gnumail-1.2.2.ebuild 871 BLAKE2B 008b8b151e29b919429ba412804c2b2992daecdb83248d6b78390831d7ac446e6e4ae9c13d9f1a90d8663f022ec3f29028769a0fa2d290ad3cad4f590b1ef496 SHA512 5916e7e39f0600389dba2bf50510481ad1b9918a0925889cc3b552c7ea4853a97d4a0110516b71754cea6a5d4c6f0462b3e8722315b90fb57488035d2da6d491
-EBUILD gnumail-1.2.3.ebuild 736 BLAKE2B bde78c8b048ee40c66dd9d01e67895c99974ee4a53c7feeca36e4742a09223606eeaf1338ccc5e08ea6eb1e7608ee4518cddcd3b860be6b00d687718aa3dcbe9 SHA512 afe73dc6225e3b370dc5f7543bd8a942d2cf69de795113cdc3d63e817a6e8934e5b4d94a7b996a322bec622f8c71f43f0a0790fceaee84bf9ac675c693d273e4
-MISC metadata.xml 713 BLAKE2B b7dcad7f57d6ee2d2c8fd3d1fd581d8bf33f11efcebc41514c528f1694d3ead9f086e2ece07fe660696055a41f6c22cf6c06271cdedd7b16802dd6d737784243 SHA512 3abb024b255072dc2ec848d6d356d41ad131be58fbcf68a7cfd2cbd5c21842c2c0c237b84c69519720faf0ff9ac300e8753abfcfe983122a6c617c74e41f24e2
diff --git a/gnustep-apps/gnumail/gnumail-1.2.2.ebuild b/gnustep-apps/gnumail/gnumail-1.2.2.ebuild
deleted file mode 100644
index 66e106bd9472..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/gnum/GNUM}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt"
-DEPEND=">=gnustep-base/gnustep-gui-0.11.0
-	=gnustep-libs/pantomime-1.2*
-	gnustep-apps/addresses"
-RDEPEND="crypt? ( app-crypt/gnupg )"
-
-src_prepare() {
-	sed -i -e 's|GNUMail_GUI_LIBS =|LIBRARIES_DEPEND_UPON +=|' \
-		Framework/GNUMail/GNUmakefile || die "as-needed sed failed"
-	use crypt || sed -i -e 's|Bundles/PGP||' \
-		GNUmakefile || die "PGP bundle sed failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-	dodoc "${S}"/Documentation/*
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.3.ebuild b/gnustep-apps/gnumail/gnumail-1.2.3.ebuild
deleted file mode 100644
index 5cfe2b71f6c0..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${P/gnum/GNUM}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html"
-SRC_URI="mirror://nongnu/gnustep-nonfsf/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt"
-DEPEND=">=gnustep-base/gnustep-gui-0.11.0
-	=gnustep-libs/pantomime-1.2*
-	gnustep-apps/addresses"
-RDEPEND="crypt? ( app-crypt/gnupg )"
-
-src_prepare() {
-	use crypt || sed -i -e 's|Bundles/PGP||' GNUmakefile || die
-
-	default
-}
-
-src_install() {
-	gnustep-base_src_install
-	dodoc "${S}"/Documentation/*
-}
diff --git a/gnustep-apps/gnumail/metadata.xml b/gnustep-apps/gnumail/metadata.xml
deleted file mode 100644
index f9a3efbf8402..000000000000
--- a/gnustep-apps/gnumail/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-GNUMail.app is a fully featured mail application running on Linux (or FreeBSD, OpenBSD, etc) and Apple Mac OS X. It uses the GNUstep development framework or Apple Cocoa, which is based on the OpenStep specification provided by NeXT, Inc.. GNUMail.app is licensed under the GPL, and the full sources of the application are available.
-
-GNUMail.app was written from scratch. It uses Pantomime as its mail handling framework.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gorm-1.2.23 b/gnustep-apps/gorm-1.2.23
new file mode 100644
index 000000000000..1e2a74453116
--- /dev/null
+++ b/gnustep-apps/gorm-1.2.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A clone of the NeXTstep Interface Builder application for GNUstep
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/experience/Gorm.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.22.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/dev-apps/gorm-1.2.23.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5a18df5982715394cd0f5ba76d123268
diff --git a/gnustep-apps/gorm/Manifest b/gnustep-apps/gorm/Manifest
deleted file mode 100644
index cbc65072ae62..000000000000
--- a/gnustep-apps/gorm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gorm-1.2.23.tar.gz 695799 BLAKE2B 93fcf72088a45c553fce4473a489719c84f02aa510e8da6fe4a1bbc80f1fab7d07ac07e05e6a543eaf5340246de4022b0be01fd0aaf48ac327aa52f723838074 SHA512 785ba83a82cee982c688a185300e90c9973b1c3de262770e708199593e7d8bfd9dccfa48ff6951f5d87558dffdda67c70fbc5091504afdd93e6e043d7b134460
-EBUILD gorm-1.2.23.ebuild 946 BLAKE2B 21dd8d7f40db8e0aee2c0a0e2d223fc5c1e0cf63370c66eeef233dc2868f4393172b6b01456a37cc26acdd565d240892c1cc7dd2ffcd048f11727301cc6205ca SHA512 d4cd8cb3f96ab5a9ed6df59643d0c0a204b524578f31eb27d58a29c978254357d2b62b5075b702e048c79194d7712cfccabbf46caca00cb92ccfc982c281545a
-MISC metadata.xml 1582 BLAKE2B f74b9e184307e63211c44930296a121dd4ce21db01ed4f5c2516dee219fbd579f846a28fbbc9508ed68348e1ad0a8bed65b5ab8b8c748393afbfe82f00e22296 SHA512 11e7fac87e8f54b612ad19237f4229e319f22ea8530dbd18fc3be6cce63b2653df2f1d1bd06786288d5dd1453cbc483e1fe98a280145a2c44f702b364870e2af
diff --git a/gnustep-apps/gorm/gorm-1.2.23.ebuild b/gnustep-apps/gorm/gorm-1.2.23.ebuild
deleted file mode 100644
index 314d0c3c5616..000000000000
--- a/gnustep-apps/gorm/gorm-1.2.23.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="A clone of the NeXTstep Interface Builder application for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/Gorm.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/dev-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.22.0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "/DOCUMENT_NAME =.*/a \Gorm_DOC_INSTALL_DIR=Developer/Gorm" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \ANNOUNCE_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \README_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \NEWS_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		-e "/DOCUMENT_TEXT_NAME =.*/a \INSTALL_DOC_INSTALL_DIR=Developer/Gorm/ReleaseNotes" \
-		Documentation/GNUmakefile
-
-	default
-}
diff --git a/gnustep-apps/gorm/metadata.xml b/gnustep-apps/gorm/metadata.xml
deleted file mode 100644
index b0615dd9070a..000000000000
--- a/gnustep-apps/gorm/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>
-Before NeXT Computer Inc. revolutionized software developement with its OpenStep API, a new way of designing graphical user interfaces was already introduced by NeXT at the beginning of the 90s. Its operating system NeXTstep featured Interface Builder, an application that for the first time allowed developers to quickly create nice user interfaces without having to code everything manually. Using drag and drop elements of windows such as buttons, sliders, textfields etc were created abd edited, then linked to functions and variables. Thus, Interface Builder helped developers to focus on the code for the actual functions without having to care about stuff not related to their project goal.
-
-As part of the GNUstep project, Gorm is meant to be the counter part to NeXT's Interface Builder. With Gorm designing tough and complex graphical interfaces for your applications can easy and quickly be done using drag and drop, powerful inspectors and teamwork with ProjectCenter.
-
-Gorm allows developers to quickly create and edit graphical application interfaces using a whole lot of GUI elements: windows, menus, buttons, labels, sliders, tables, textfields, browsers, images, altert panels and more. Custom palettes can be dynamically loaded to add additional elements or functionality.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/graphos-0.6 b/gnustep-apps/graphos-0.6
new file mode 100644
index 000000000000..55bd92e954d5
--- /dev/null
+++ b/gnustep-apps/graphos-0.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=vector drawing application centered around bezier paths
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/graphos/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Graphos-0.6.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4225d8045095ce8ce9a95c28155785cb
diff --git a/gnustep-apps/graphos/Manifest b/gnustep-apps/graphos/Manifest
deleted file mode 100644
index 947747136f9f..000000000000
--- a/gnustep-apps/graphos/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Graphos-0.6.tar.gz 140416 BLAKE2B faee3825e0f8c8c627cefd40e953bb5dccc9302423f788088504d518e5c1ad72153210d1250b8d662680badcaf8ad91cf9048b880dd6779f0873ecd42f21e8a7 SHA512 2bf108ef1fb7ff4d2bf3c1a11766704a35986bd629f879f417eaff4b214f8dd50b2319f8f6739a2f589a8eaf8ac334a55365868d0bb001adcbc0bf1ecf30c2b9
-EBUILD graphos-0.6.ebuild 427 BLAKE2B 7041c0bb2046a1f942531c9e5e4a3515f27f31343ee9bdb195d868418b2b34987b836649592fac61aa6be89f58cf0e33ba4721c92bbe7b057798882c09dc3433 SHA512 565a6a5f67452734a14a0f12dec7bc93af832af2a3945e227714fcb2837787e32ed53d0297d194ff38946371aa38a4b9d209cc13ec187dfeb290017ed3668c3a
-MISC metadata.xml 452 BLAKE2B b002b7fbd67ef39e8ecc0611173a0cd6ff462a66132baca5077b70ce52282ef6b6e1e35e9f4cad6fe507a7aa97491a5936df505074f9b0e20236ed41cd46d02b SHA512 1af68cee22cd39525cc5ccff6070f72f80a714d867e4929bce9c55093eb5a07ef4b6427e088dc0fc83c242caa01889b2c53ba63bc66b11f67620665d8962ce01
diff --git a/gnustep-apps/graphos/graphos-0.6.ebuild b/gnustep-apps/graphos/graphos-0.6.ebuild
deleted file mode 100644
index 4ad643355eba..000000000000
--- a/gnustep-apps/graphos/graphos-0.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN/g/G}-${PV}
-DESCRIPTION="vector drawing application centered around bezier paths"
-HOMEPAGE="http://gap.nongnu.org/graphos/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/graphos/metadata.xml b/gnustep-apps/graphos/metadata.xml
deleted file mode 100644
index cffc647177ec..000000000000
--- a/gnustep-apps/graphos/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Graphos is a vector drawing application centered around bezier paths. Graphos roots are directly set in GDraw, written by Enrico Sersale and released in 2000.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gshisen-1.3.0-r1 b/gnustep-apps/gshisen-1.3.0-r1
new file mode 100644
index 000000000000..daf344ecfa17
--- /dev/null
+++ b/gnustep-apps/gshisen-1.3.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=The first GNUstep game, similar to Mahjongg
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/gshisen/index.html
+IUSE=debug doc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GShisen-1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1427d204f922e458539223d7ca95d840
diff --git a/gnustep-apps/gshisen/Manifest b/gnustep-apps/gshisen/Manifest
deleted file mode 100644
index fa2f2cb19133..000000000000
--- a/gnustep-apps/gshisen/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GShisen-1.3.0.tar.gz 66406 BLAKE2B 454360526433fc3922cd7f1370252991d1d92ef6966f0058a5046b72bd17d89f3455f5d1630b79d35cc42671ede12fafbdabc38d386870c423d41e364ef900a6 SHA512 eaaf4705837c59ec4bb67f183a595f100d95e892d47cb666510228d99e5ebc4551b494f7993d3d134bd9def947bb9255742cd1127abc1995e493ca50707cd4fd
-EBUILD gshisen-1.3.0-r1.ebuild 415 BLAKE2B 23deeae86659888e5b2c14f7e3cabbeefdefe04ef5998427a6734724da7b8d33c6b91c3e19eac5b30462b514c430ba7278b71bdadf1b718ca53493a3292de27e SHA512 abc26df23aa07458ef4bb098549e212fe233e7dac2c17acd95cf4482e643180cba5f19c222946cc6f7c4329c1a355c55c0b09aef18944f583261a65513424c51
-MISC metadata.xml 720 BLAKE2B 78b28da76021e5820e128fd0d523ad33445d47009e0b6edff2d9f89c0398376eb7b182e3e0ba6af5e5113272eb4671c16ac17303d2febfd611246d4ba6763e5d SHA512 9334ac77d8f7bffb66fe3d6fb860f8d5936e15f68cb184b393f7374419e78b530305058058f2f696530bc20d473acc8eb11a281c28bd0cec6e0bf45c59c8d14b
diff --git a/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild b/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
deleted file mode 100644
index c0fa51d3b218..000000000000
--- a/gnustep-apps/gshisen/gshisen-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_PN=GShisen
-DESCRIPTION="The first GNUstep game, similar to Mahjongg"
-HOMEPAGE="http://gap.nongnu.org/gshisen/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/gshisen/metadata.xml b/gnustep-apps/gshisen/metadata.xml
deleted file mode 100644
index e345ab2a273f..000000000000
--- a/gnustep-apps/gshisen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>GShisen is the first GNUstep game!
-The object of the game is to remove all tiles from the field. Only two matching tiles can be removed at a time. Two tiles can only be removed if they can be connected with at most three connected lines. Lines can be horizontal or vertical but not diagonal.
-Remember that lines may cross the empty border. If you are stuck, you can use the Hint feature to find two tiles which may be removed.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gspdf-0.5 b/gnustep-apps/gspdf-0.5
new file mode 100644
index 000000000000..15cd114eda10
--- /dev/null
+++ b/gnustep-apps/gspdf-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Postscript and Pdf Viewer using GhostScript
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/gspdf/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=app-text/ghostscript-gpl >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/GSPdf-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=746179c6241cd084aa4154ed2c4e78ba
diff --git a/gnustep-apps/gspdf/Manifest b/gnustep-apps/gspdf/Manifest
deleted file mode 100644
index 216e897a4154..000000000000
--- a/gnustep-apps/gspdf/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST GSPdf-0.5.tar.gz 44357 BLAKE2B d0c49fac60281c2d6dfa16f70b34cc31bafc265dd8bde064fd2311499388f3990aefbe1fcaa8f9056336450d31f70cd77e2e3e26795852a1a2cc201c5590607c SHA512 ad173c0301bb3d6395e52f911b4657ad8c69e989366035a50c05705c08dc5afd1561c4acfd1a0fea53b2a02842261351407c479919332c65545bde6a10744041
-EBUILD gspdf-0.5.ebuild 461 BLAKE2B deb8e8e805dd1659ffee5dfb350e7574a8ab34d513e07d40950b5c0df6a5cbc6f1ec988f3d1b64b30ac97ed7534637083958d14dadf744daa26b7d21e3c36894 SHA512 91c585d819fd37599da7011dc4198104c52a1b5621ae01b559793b47cd34bbe249de744cddaac0c82decb290cce3c1fd177d4d9f903b16842a424ba2d4ff5602
-MISC metadata.xml 413 BLAKE2B a70404defc045cb71cb9ef405dfe0031ba5a48f7a5ceaaf1ea1388d7631d492270646cc06a73df0b53c87e0ad5eb68dced9199e06de93df682da6b0985333512 SHA512 5038f7a95ddebf9bd2f2a862749603e5b12832573c0bf6770643a06178d5647cce20883f7b30ed15eda05016d5db9ebf8e1132fc3c441ccde57b3fbe9730f8c3
diff --git a/gnustep-apps/gspdf/gspdf-0.5.ebuild b/gnustep-apps/gspdf/gspdf-0.5.ebuild
deleted file mode 100644
index fdc73ac613c8..000000000000
--- a/gnustep-apps/gspdf/gspdf-0.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils gnustep-2
-
-MY_PN=GSPdf
-DESCRIPTION="Postscript and Pdf Viewer using GhostScript"
-HOMEPAGE="http://gap.nongnu.org/gspdf/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-text/ghostscript-gpl"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/gnustep-apps/gspdf/metadata.xml b/gnustep-apps/gspdf/metadata.xml
deleted file mode 100644
index 18684ed15ac5..000000000000
--- a/gnustep-apps/gspdf/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>GSPdf is a Pdf and PostScript file viewer. It is based on GhostScript which it calls at runtime to rasterize the pages.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/gworkspace-0.9.4 b/gnustep-apps/gworkspace-0.9.4
new file mode 100644
index 000000000000..959195024995
--- /dev/null
+++ b/gnustep-apps/gworkspace-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.25.0 gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791 >=dev-db/sqlite-3.2.8 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A workspace manager for GNUstep
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/experience/GWorkspace.html
+IUSE=+gwmetadata debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.25.0 gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791 >=dev-db/sqlite-3.2.8 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/gworkspace-0.9.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4d4d2d710f30c6c0282a56cda84f55e9
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
deleted file mode 100644
index dbf2103c7384..000000000000
--- a/gnustep-apps/gworkspace/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gworkspace-0.9.4.tar.gz 3855909 BLAKE2B 5a636ccfb4fa79acd91bce34d3b5fe8a6d7bccc3f2f1f5a3d9f19c8a91743ec19c2eae0930e81807c6a5f098761b65f17e86a3edc44da155c50c903284ea2b20 SHA512 d2246b87be7d1659ecec3657c314ca333dc983509394c3e383b650056affd108b76241fa0fa59443b183a2e20906d9a7a9d1f2ad601cb569990b5490a6c5d2a7
-EBUILD gworkspace-0.9.4.ebuild 877 BLAKE2B c7d08f264f2984e9a439332ae869d2d3a712d206139cd609f45d72c28d51ffad872746a1d82dba9aeb581b9f19d6b8268e79e6f2ab22a740465534dd63341a7d SHA512 b1b2fa6096b78e3dc1713da29966e720a37927d45766130a90be609112b973a1a57b74b9bb4089f7df9f56279be7a5a7de906fac5139efb38e95783251a8319e
-MISC metadata.xml 579 BLAKE2B 1cee2bbb6f86ab94b59b6e3169c7ffbdb927b9f84c1c62e5c7935fb9ba158768f4a6911d3c357c5a30741843069f69986ad89d3139c614e7fc87572c096ad58c SHA512 d369179dfa43f986b92e64b7d458a00925b0700de1fd8ae910e37312529519694293734464e993ca071cdc995832c2125837c2e28497b10a9a885a4ebff94b12
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild
deleted file mode 100644
index 72574db0a946..000000000000
--- a/gnustep-apps/gworkspace/gworkspace-0.9.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="A workspace manager for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+gwmetadata"
-
-DEPEND=">=gnustep-base/gnustep-gui-0.25.0
-	gwmetadata? (
-		>=gnustep-apps/systempreferences-1.0.1_p24791
-		>=dev-db/sqlite-3.2.8
-	)"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myconf=""
-	use kernel_linux && myconf="${myconf} --with-inotify"
-	use gwmetadata && myconf="${myconf} --enable-gwmetadata"
-
-	egnustep_env
-	econf ${myconf}
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-
-	if use doc;
-	then
-		dodir /usr/share/doc/${PF}
-		cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
-	fi
-}
diff --git a/gnustep-apps/gworkspace/metadata.xml b/gnustep-apps/gworkspace/metadata.xml
deleted file mode 100644
index be6503de9155..000000000000
--- a/gnustep-apps/gworkspace/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-GWorkspace is the official GNUstep workspace manager. It is a clone of the NeXT workspace manager. GWorkspace is becoming more and more stable every day and it is already ready for daily usage.
-</longdescription>
-<use>
-	<flag name="gwmetadata">Enable the metadata indexing and searching system</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-apps/lapispuzzle-1.2 b/gnustep-apps/lapispuzzle-1.2
new file mode 100644
index 000000000000..99e6ba1451a6
--- /dev/null
+++ b/gnustep-apps/lapispuzzle-1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a Tetris-like game where each player is effected by the others game play
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/lapispuzzle/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/LapisPuzzle-1.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1991d2f8451ffb820a6dda7db52c3180
diff --git a/gnustep-apps/lapispuzzle/Manifest b/gnustep-apps/lapispuzzle/Manifest
deleted file mode 100644
index 4a677a8d1273..000000000000
--- a/gnustep-apps/lapispuzzle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST LapisPuzzle-1.2.tar.gz 30188 BLAKE2B 75f5a0c0b748c7be91ac11fd1d3d6b6b44e46d3c446508cc8f54ac7d810b0427b7305868e5045b2e23b1b0f643c6aea9a9ba318d9651b473dcbc7c8c2b2a0b50 SHA512 d7fc846ad2e771a0adace983d4d6c07a71680ab8164e9ca459e2be44774df393602338d125a4c4dac8c8c0d8315a861118e4fa56c59139d964bba64aa7bb443b
-EBUILD lapispuzzle-1.2.ebuild 467 BLAKE2B e52b6a6e9d763cd2e47a4403fa1d6c74ae638074d397862cdab036ccf2215d7d96f5955bbc5b60625ff1b9254b993255f80b3bff50de2080870abc7645b7bf68 SHA512 e1f13f242bc8a270f360e1728c87d8b6329c8a3a52aa848580a13c9b724feb2f5268c12a8a6d846b3ff8d8f5559796eb12f300c3403e4825702d77bac4e721f6
-MISC metadata.xml 427 BLAKE2B b94984b58a33447d1a947a17df89b9112b87c425ba6a89ccd2a8c2f4f664c9e6b75100272ed9c4c94a24144f1e3616b07cad4824d3e496b791b9f9cd5150b116 SHA512 cd109c7f9cf95dc765849ae3780b977e5e7de40cfd909fc064e4bf29cf4ca50e3cfefd022861eaac65c79f31ad5f863b5c7d82255b5254373b459e8c343a1495
diff --git a/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild b/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
deleted file mode 100644
index 628a8ba5a0bd..000000000000
--- a/gnustep-apps/lapispuzzle/lapispuzzle-1.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P=LapisPuzzle-${PV}
-
-DESCRIPTION="a Tetris-like game where each player is effected by the others game play"
-HOMEPAGE="http://gap.nongnu.org/lapispuzzle/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/lapispuzzle/metadata.xml b/gnustep-apps/lapispuzzle/metadata.xml
deleted file mode 100644
index c50272369ea0..000000000000
--- a/gnustep-apps/lapispuzzle/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>a tetris-like game which challenges the player by making the opposing team's victories count doubly against the player and vice versa</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/laternamagica-0.4 b/gnustep-apps/laternamagica-0.4
new file mode 100644
index 000000000000..3425178fe0c1
--- /dev/null
+++ b/gnustep-apps/laternamagica-0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=an image viewer and slideshow application
+EAPI=4
+HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.4.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=659b06e4d7922f8c59539f68a677ba91
diff --git a/gnustep-apps/laternamagica-0.5 b/gnustep-apps/laternamagica-0.5
new file mode 100644
index 000000000000..9f227aea9f78
--- /dev/null
+++ b/gnustep-apps/laternamagica-0.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=an image viewer and slideshow application
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/laternamagica/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/LaternaMagica-0.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7385cad54ddcb0b8043dad9e1ae4efc7
diff --git a/gnustep-apps/laternamagica/Manifest b/gnustep-apps/laternamagica/Manifest
deleted file mode 100644
index 48ffc0eec281..000000000000
--- a/gnustep-apps/laternamagica/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST LaternaMagica-0.4.tar.gz 127317 BLAKE2B facd517eeb6d271d9aed2dfa89db2d44488d12c39fa31b227847598e6e7127f33338929cd5318989b15127302db9c8891b9827f24c66c746a662c83bc0060603 SHA512 ba07abcd3a8f5e700fc1190bdc9664e34d2e26034ec6e2ac1688ed3e5b31659d9a59cbd1df9d4bea5a913e48c5c431a13e646a0be1b1b457e0ce8189d25eecef
-DIST LaternaMagica-0.5.tar.gz 124896 BLAKE2B 90db269b5b7e4e0810cd3c6d0341034d36fb154534d16d0e60dd9ec109a7e93cb1146c6ca434f6dae7fd1afb2fd123f7bc7c2922618c6c4e052b0a7b87178c26 SHA512 830ba5432a8c5f7e4ec15523d53ad16a3e2bf9502ac4324ecfcf71131f4fd0b562424e5b4990732f0841ab06ee668115b5ef2c1ff8066390a193d2f655d207ce
-EBUILD laternamagica-0.4.ebuild 420 BLAKE2B d8619e64b96d25809cd250aca68973564c1c2387a567efd35dcefe5ad80a75ceb34643721130c34989314dc764dfcb353d2b3318ae9901cd6b9ca69c5897d946 SHA512 927b67130f5881eb5078a93896a3cd7b9440a7e85ece86be2426cd1a845255c2503f3ed59dc5e848ce5f76ec307ecc11e3cfd8b786982b3d6de1cad145a802d7
-EBUILD laternamagica-0.5.ebuild 420 BLAKE2B faf285a749f2e7c2e0a075dedf3591767b202c863627d85aadffd730498f915a0e406ab59fddd8ce0369beaeea423bfdf6aa801ea0b57ecc372533f2809a719c SHA512 7e613400eca1203b9fa5e98445619ce9138c0bf35215bd862c494db17ab2407b1a8b3ca562620191edf1a1e0842eddcd102dc000dc83575888a95572472c64a2
-MISC metadata.xml 775 BLAKE2B af9fc6832c8c4487135fc6c88ddb004301f8bbec8724fd94d44b021d56e7e1ff6be3f59c00ec48c76fd1b7440029714c7e8361dccb79476291bb3c1fcc97170e SHA512 0c8640c874db01ddd4b2f4def0684e2e93f19d6f638925dca78c1d86f2149f6f1abfeff795bd5c0b6d678aaabda324ce1ba659b488bb2933797e6e5ecc7f4238
diff --git a/gnustep-apps/laternamagica/laternamagica-0.4.ebuild b/gnustep-apps/laternamagica/laternamagica-0.4.ebuild
deleted file mode 100644
index 73582ce66670..000000000000
--- a/gnustep-apps/laternamagica/laternamagica-0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_P="LaternaMagica-${PV}"
-DESCRIPTION="an image viewer and slideshow application"
-HOMEPAGE="http://gap.nongnu.org/laternamagica/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/laternamagica/laternamagica-0.5.ebuild b/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
deleted file mode 100644
index 02e182c088b0..000000000000
--- a/gnustep-apps/laternamagica/laternamagica-0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="LaternaMagica-${PV}"
-DESCRIPTION="an image viewer and slideshow application"
-HOMEPAGE="http://gap.nongnu.org/laternamagica/index.html"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/laternamagica/metadata.xml b/gnustep-apps/laternamagica/metadata.xml
deleted file mode 100644
index a86c4ecf3822..000000000000
--- a/gnustep-apps/laternamagica/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>LaternaMagica is a single-window image viewer application which is capable of switching to full-screen mode.
-LaternaMagica maintains its image list in a window and the user selects which image to display, making it easy to assemble a show from different source directories.
-LaternaMagica can recurse into directories when looking for images to add and construct the list.
-LaternaMagica is capable of exporting the complete list to a folder by operating resizing and file conversion</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/metadata.xml b/gnustep-apps/metadata.xml
deleted file mode 100644
index 3f0a3a1a216b..000000000000
--- a/gnustep-apps/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The gnustep-apps category contains GNUstep applications.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnustep-apps enthält Applikationen für die
-		GNUstep-Umgebung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría gnustep-apps contiene aplicaciones de GNUstep.
-	</longdescription>
-	<longdescription lang="ja">
-		gnustep-appsカテゴリーにはGNUstepアプリケーションが含まれています
-	</longdescription>
-	<longdescription lang="nl">
-		De gnusteps-apps categorie bevat GNUstep applicaties.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnustep-apps chứa các ứng dụng GNUstep.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnustep-apps contiene applicazioni per GNUstep.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnustep-apps contém aplicações de GNUstep.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnustep-apps zawiera programy GNUstep.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnustep-apps/mpdcon-1.5.1 b/gnustep-apps/mpdcon-1.5.1
new file mode 100644
index 000000000000..810deb71133e
--- /dev/null
+++ b/gnustep-apps/mpdcon-1.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/libbsd >=gnustep-libs/sqlclient-1.6.0[sqlite] >=media-libs/libmpdclient-2.7 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=GNUstep client for the Music Player Daemon
+EAPI=5
+HOMEPAGE=http://gap.nongnu.org/mpdcon/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libbsd >=gnustep-libs/sqlclient-1.6.0[sqlite] >=media-libs/libmpdclient-2.7 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/MPDCon-1.5.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=b931308db9f02102cb957d9868f2b51f
diff --git a/gnustep-apps/mpdcon/Manifest b/gnustep-apps/mpdcon/Manifest
deleted file mode 100644
index ab1428a03bda..000000000000
--- a/gnustep-apps/mpdcon/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MPDCon-1.5.1.tar.gz 90845 BLAKE2B 3b832ccbfbb67a08f0e5006aacb4cce5b20660855d1ca71baec57b24c66c6fa517dc64aa4b2640ea3f8a85806248bfdc8aeff28f0241bf83b42aebd30540287b SHA512 b47c6d603938ace1561fc01ef400a4f217035692eeb2552d59bc924ba20f3e67508a0e6da0e6805ef3ec67e19ba33a5028721ec9294a67419d9ce97c5d4ce6c1
-EBUILD mpdcon-1.5.1.ebuild 571 BLAKE2B c99ac90ba695ccb183dc14957173d92356f64e1c321f8d2ee5f5eaefff22f7b42f964151f2bd77e6abe70acd245aa987e09cbaaba6aa4b73e7948ab359ec9eda SHA512 85b5753eb8ce6c437bb00df6de2b999167e3c150379da59cb477268614d87e76f8182cebc7c7aa47e711663f9e221a61cb45440844a58ed3ce177f033c7b84de
-MISC metadata.xml 340 BLAKE2B 559b3221f234a7a57fb8cad261611b0dd1d1ff04bfcea28f60ba11d91e3e8648f31dd0e36027948efd48f868d995e19f8b8153bbee18557e9d8f50de7fad24bf SHA512 c470ed87528ea7f4174136e50a4805905a94f432b9d80025c1b0b161d31afba59be3733109ff197357e53b692430a802db6b4212e2a42d4b8a0bb6d9d188c67a
diff --git a/gnustep-apps/mpdcon/metadata.xml b/gnustep-apps/mpdcon/metadata.xml
deleted file mode 100644
index 45e2453cdb2c..000000000000
--- a/gnustep-apps/mpdcon/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>MPDCon is a client for the Music Player Daemon</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/mpdcon/mpdcon-1.5.1.ebuild b/gnustep-apps/mpdcon/mpdcon-1.5.1.ebuild
deleted file mode 100644
index 3533c70c8edf..000000000000
--- a/gnustep-apps/mpdcon/mpdcon-1.5.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/mpdc/MPDC}
-DESCRIPTION="GNUstep client for the Music Player Daemon"
-HOMEPAGE="http://gap.nongnu.org/mpdcon/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="dev-libs/libbsd
-	>=gnustep-libs/sqlclient-1.6.0[sqlite]
-	>=media-libs/libmpdclient-2.7"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	egnustep_env
-	egnustep_make need-libbsd=yes
-}
diff --git a/gnustep-apps/pictureframe-1.1.3 b/gnustep-apps/pictureframe-1.1.3
new file mode 100644
index 000000000000..3f06320d70de
--- /dev/null
+++ b/gnustep-apps/pictureframe-1.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=digital picture frame software
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/gap/pictureframe/index.html
+IUSE=debug doc
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://ftp.gnustep.org/pub/gnustep/contrib/PictureFrame-1.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d1d87805fa286f650cbdfa992358c83f
diff --git a/gnustep-apps/pictureframe/Manifest b/gnustep-apps/pictureframe/Manifest
deleted file mode 100644
index f74ae4d7ff71..000000000000
--- a/gnustep-apps/pictureframe/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PictureFrame-1.1.3.tar.gz 343981 BLAKE2B c9553d0c9b9fa4faabb6f06a26a26901189685954731b8529f14dfc938164335fdd0fd6d2508c4adc584156e276f4199e718b629645a8d8955297eacafe96496 SHA512 117dff1519ea21ea3a1b951cb1f1c03574abff14880056339035f29ebb0683fba921afcb28763a79d4aa8d1c28fd3b61aab385444e5fd80878a3088ef1a651b2
-EBUILD pictureframe-1.1.3.ebuild 492 BLAKE2B ab289d3dd11398b2cce54aa346de1678f4d65f364a0a0e50ef98e64e002014d306080015d5f8120f64410b53493e34301482ec4107d7d4a800369c5bedac6f39 SHA512 99b9a880071ad835b0f837376e6565a2d6ffb36149afa920a7616becfe8b24f647c0bb3e5ced59c613613adad0be5ab74289cc34971c2402eead5c472d223eb0
-MISC metadata.xml 324 BLAKE2B bcec5528819e2a35be937ed42f21abb1943f03f13b70dfdb953df6669fbea296dfc90961b54a448b98e31a32d42a5198b7ab227a67df77cb4f76e54e28053ddf SHA512 8bf9bf990b30a238dee402ec733007043eb569b1ec4bdd25b2fe4f3f77457fd6d9b8e79926d28067a00fd27ae1efb787d7d275275b6bd8ad5c4aecb1e07837d2
diff --git a/gnustep-apps/pictureframe/metadata.xml b/gnustep-apps/pictureframe/metadata.xml
deleted file mode 100644
index d605957681b1..000000000000
--- a/gnustep-apps/pictureframe/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>digital picture frame software</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/pictureframe/pictureframe-1.1.3.ebuild b/gnustep-apps/pictureframe/pictureframe-1.1.3.ebuild
deleted file mode 100644
index 4f5216ec06ec..000000000000
--- a/gnustep-apps/pictureframe/pictureframe-1.1.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_PN=PictureFrame
-DESCRIPTION="digital picture frame software"
-HOMEPAGE="http://www.nongnu.org/gap/pictureframe/index.html"
-SRC_URI="http://ftp.gnustep.org/pub/gnustep/contrib/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_install() {
-	gnustep-base_src_install
-	dodoc PICTURE_FRAMES README
-}
diff --git a/gnustep-apps/pikopixel-1.0_beta9-r1 b/gnustep-apps/pikopixel-1.0_beta9-r1
new file mode 100644
index 000000000000..d5cac73f338d
--- /dev/null
+++ b/gnustep-apps/pikopixel-1.0_beta9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9a.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=99a1cb62ba6e917adb87e761dedfd737
diff --git a/gnustep-apps/pikopixel-1.0_beta9-r2 b/gnustep-apps/pikopixel-1.0_beta9-r2
new file mode 100644
index 000000000000..e7fae3689eea
--- /dev/null
+++ b/gnustep-apps/pikopixel-1.0_beta9-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9b.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=e73155547a646600e7cc8dd60f391f49
diff --git a/gnustep-apps/pikopixel-1.0_beta9-r3 b/gnustep-apps/pikopixel-1.0_beta9-r3
new file mode 100644
index 000000000000..c85f98ab8382
--- /dev/null
+++ b/gnustep-apps/pikopixel-1.0_beta9-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a free application for drawing & editing pixel-art images
+EAPI=6
+HOMEPAGE=http://twilightedge.com/mac/pikopixel/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/gnustep-back-0.25.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/PikoPixel.Sources.1.0-b9c.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=492fcbb59c5fe431343912117936177e
diff --git a/gnustep-apps/pikopixel/Manifest b/gnustep-apps/pikopixel/Manifest
deleted file mode 100644
index a61442da4321..000000000000
--- a/gnustep-apps/pikopixel/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST PikoPixel.Sources.1.0-b9a.tar.gz 553753 BLAKE2B 18ab3159c29ba46850a7eee3d5bf45e63f0f2a66270b61141a13ff7fbdf8b9e988979388d608995fc9b8fc089ed2beeafe838db82e16756726422b2ce641bb4a SHA512 03cc3d6dccc26986aeac95074b6cac47d9d5c087c5b3e742409ec41297f634649bcfd4f2d76118e49c95499e1b75dab97e81951ae1186449707c8634ab1519fe
-DIST PikoPixel.Sources.1.0-b9b.tar.gz 566094 BLAKE2B 2f79eb77cbfa5508db600f908b25c2b1543c082364d83f734105b49ef5d0502cc89ac49fc8b08686cd1cee29faa4dcd59ed21372be8ec0fc1d100488f42bb918 SHA512 9579a3455ad77f85686bc01819aa2a008277dc2e8d0205dc0fe26743a150f7f5f4c8aed61eb32c9291fef65f3d1f07db2e560c24b084df53f0360fedd2fc5415
-DIST PikoPixel.Sources.1.0-b9c.tar.gz 566871 BLAKE2B 23b1213dcf553db58b65e2e3e3ad950a7fa55f0ffa288da7c5784bf42b3cdf0d280cc433e03e072dda05b2fd4c818fac28d8ea5e4697b80a40fc583dfb885794 SHA512 0fe4657303be5876229231d45ef8ddf8e04636a5e0137acacecedc634fc5bf52c5bbe3a4c901460cfe629fb545796e7ebf8badd9b19a09f642a77e0d8d17fc85
-EBUILD pikopixel-1.0_beta9-r1.ebuild 616 BLAKE2B 2540d1ebb0130f488ff4f9a59d1a6853c599bc7651e78d96ed7348e483809b3d33f027c709e491a5759ebacb268ea569845cc085e126f1308c6a3c92663156a7 SHA512 76320aced9fcf4267c029546a725289d0b9f4cc0dd354eaedb7e3a63f8f645555ac520c19865c3c041aedfb1f40751ee7446586ffe799dd3bc266620f469e36f
-EBUILD pikopixel-1.0_beta9-r2.ebuild 616 BLAKE2B 6f9c27545090a0fb8a06345a96bde7576b2a0e01f7fdcbf2662034016ba53365e00c0664265f2bab3d2947fff6e9d2e773f0d1cdf4e0150703c8670a91685af8 SHA512 866512d489ab4d4f7151308dface2354890192b618dfa3930c9508cde43df2b08bb6803a42975bb559ce3261a74e3f829a921101fba08ece98f929da96f3c6a0
-EBUILD pikopixel-1.0_beta9-r3.ebuild 616 BLAKE2B 3db887475e2ade7ba42e6fd810d98029c2e6fc83a3a1c667ab30cf7cf9cdb456496cf5be63c453752cb455c0c6a452c43356e17cbb8c90b838480ee8cb8540ab SHA512 8b49fa449c78bd945ec46539ec2246d5eb4bf866242d871ed7b06a2f58a1263cf87f04fff6945c83a2f12d397b1698b8b8b6bfdba464a682611f55e62876a2d0
-MISC metadata.xml 353 BLAKE2B 0a11dabc8c8d4cf8ac0cf566d4f8d6347c4fbbdd3a7501cdfa363c71f370b0898384f966664e8c8f9ae9bf4aec32071b068ee74220ad870970369c8eaeac3aa3 SHA512 638af177226e71ff4d13757ad1d909e627283e92e67475a842280525e3b9fa25980a2f4673b6a194a41b5cd08154e666345961bea4a5dce0e292c2ab6a2256f5
diff --git a/gnustep-apps/pikopixel/metadata.xml b/gnustep-apps/pikopixel/metadata.xml
deleted file mode 100644
index 22f9e3a4a31f..000000000000
--- a/gnustep-apps/pikopixel/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>a free application for drawing and editing pixel-art images</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
deleted file mode 100644
index f4ecbb903ae2..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}a
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
deleted file mode 100644
index aa1e3d93e1a9..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}b
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild b/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
deleted file mode 100644
index 641e11e784ea..000000000000
--- a/gnustep-apps/pikopixel/pikopixel-1.0_beta9-r3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${PN//p/P}.Sources.${PV/_beta/-b}c
-DESCRIPTION="a free application for drawing & editing pixel-art images"
-HOMEPAGE="http://twilightedge.com/mac/pikopixel/"
-# Web hosting wants a proper User-Agent
-#SRC_URI="http://twilightedge.com/downloads/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${MY_P}.tar.gz"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/gnustep-back-0.25.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}/${PN//p/P}
diff --git a/gnustep-apps/preview-0.9 b/gnustep-apps/preview-0.9
new file mode 100644
index 000000000000..73a383a38017
--- /dev/null
+++ b/gnustep-apps/preview-0.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Simple image viewer
+EAPI=6
+HOMEPAGE=http://www.sonappart.net/softwares/preview/
+IUSE=debug doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.sonappart.net/softwares/preview/download/Preview-0.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=bac9d106cc824736922afe489d522dd0
diff --git a/gnustep-apps/preview/Manifest b/gnustep-apps/preview/Manifest
deleted file mode 100644
index 002a175c8415..000000000000
--- a/gnustep-apps/preview/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX preview-0.8.5-compilation-errors.patch 1047 BLAKE2B 6f732887f43265dcf1b6a7da6133e654fbdd71bacaca262f02c9aafc5ba338e2cc0b8c0c4dff4a6def89806b50c7515286a7a611ef4d8663e32fec695db000d4 SHA512 1b34f13c152767a739ade661dadd81891cd27f190b545b4304c7e1dd21f0246181b6abb2fcb835d648f77ee9fd55682a7a2af0a5c6ad672443007c9af1911668
-DIST Preview-0.9.tar.gz 77516 BLAKE2B 08de03008f8b1192e3ab3d41238a4147612a20e13596e6a9d464fbc2162e1fd2ea2869d528fc516f1db21693b5b347bcf022819890de20a571c962bc85beb7e7 SHA512 cfca47e8024f4db2486c3c9c9334b0f5b74f71e6386b227b417f62df541cddf2e2d77d50c9ffce7287284d1339bedb9c929e6254810f370229b59d325fc332ba
-EBUILD preview-0.9.ebuild 572 BLAKE2B e3a8549f32e9584f9b14cae2dffab54ea18eed2bd513e887ad51ae14fecb0a1d5b218b3a64137c229bfb7497af7a0c3eaae5fc5a6308552f348137cdd2e9143d SHA512 bdbd29c5e9ba2fd4a87cbcb05419b469083f92f1b37932e2a455410b7893031d6cb57f86183dbf98d168eb044ec4607519faaa7cc674c4a834326c5796889c01
-MISC metadata.xml 594 BLAKE2B 29ab695c7543b5bf232ed421dcc926f89977933852dfa752244c2a4656b7b83d310feee4357620ff4ae033875b8611bf0911b5a9074330c4c9d32ef6a6a8ed91 SHA512 8db875cb47658ce5a04b46bbdd9335291d131d5a58239fc88c43304d5083e96f91e6a7e03f2f2e6a91052b27bb57254d70f1c4d0875f1bd5e782e08be589cab6
diff --git a/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch b/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch
deleted file mode 100644
index 247a7c8b171d..000000000000
--- a/gnustep-apps/preview/files/preview-0.8.5-compilation-errors.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-2010-05-18  Federico Gimenez Nieto  <fgimenez@coit.es>
-
-	* Document.m: Import <AppKit/AppKit.h>.
-
-Index: preview.app-0.8.5/Document.m
-===================================================================
---- preview.app-0.8.5.orig/Document.m	2010-05-18 19:18:11.000000000 +0200
-+++ preview.app-0.8.5/Document.m	2010-05-18 19:18:23.000000000 +0200
-@@ -35,20 +35,7 @@
- 
- #include <Foundation/NSNotification.h>
- 
--#include <AppKit/NSApplication.h>
--#include <AppKit/NSAffineTransform.h>
--#include <AppKit/NSClipView.h>
--#include <AppKit/NSCursor.h>
--#include <AppKit/NSImage.h>
--#include <AppKit/NSImageView.h>
--#include <AppKit/NSMatrix.h>
--#include <AppKit/NSPasteboard.h>
--#include <AppKit/NSPopUpButton.h>
--#include <AppKit/NSScreen.h>
--#include <AppKit/NSScrollView.h>
--#include <AppKit/NSWindow.h>
--#include <AppKit/NSWindowController.h>
--#include <AppKit/NSScroller.h>
-+#include <AppKit/AppKit.h>
- 
- /*********************************************************************/
- /**************** NSDocument Private methods *************************/
diff --git a/gnustep-apps/preview/metadata.xml b/gnustep-apps/preview/metadata.xml
deleted file mode 100644
index c698becb0fe9..000000000000
--- a/gnustep-apps/preview/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-* Open GNUstep images file supported by GNUstep (usaly tiff/jpeg/gif/png)
-* Save as and Save To (tiff only)
-* Print and Page Layout
-* Zoom
-* The image can be copy into the Pasboard (to be paste or use by services)
-* Documentation
-* Source fully available
-* Release under the GNU GENERAL PUBLIC LICENSE 2
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/preview/preview-0.9.ebuild b/gnustep-apps/preview/preview-0.9.ebuild
deleted file mode 100644
index f7bac95e785d..000000000000
--- a/gnustep-apps/preview/preview-0.9.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2
-
-DESCRIPTION="Simple image viewer"
-HOMEPAGE="http://www.sonappart.net/softwares/preview/"
-SRC_URI="http://www.sonappart.net/softwares/preview/download/${P/p/P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-S=${WORKDIR}/${PN/p/P}
-
-PATCHES=(
-	# Fix compilation, patch from debian
-	"${FILESDIR}"/${PN}-0.8.5-compilation-errors.patch
-)
-
-src_prepare() {
-	default
-	sed -e 's/sel_eq(/sel_isEqual(/' -i Document.m || die
-}
diff --git a/gnustep-apps/price-1.2.0 b/gnustep-apps/price-1.2.0
new file mode 100644
index 000000000000..7a23e16769b0
--- /dev/null
+++ b/gnustep-apps/price-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Precision Raster Image Convolution Engine
+EAPI=5
+HOMEPAGE=http://price.sourceforge.net/
+IUSE=debug doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/price/PRICE-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3f687962463bbf8d646dcb42882f05f2
diff --git a/gnustep-apps/price-1.3.0 b/gnustep-apps/price-1.3.0
new file mode 100644
index 000000000000..980a49c460a9
--- /dev/null
+++ b/gnustep-apps/price-1.3.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Precision Raster Image Convolution Engine
+EAPI=6
+HOMEPAGE=http://price.sourceforge.net/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-gui-0.13.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://sourceforge/price/PRICE-1.3.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3760a65df25fa3c06b5fad3f622729f0
diff --git a/gnustep-apps/price/Manifest b/gnustep-apps/price/Manifest
deleted file mode 100644
index f6cb52592d0e..000000000000
--- a/gnustep-apps/price/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST PRICE-1.2.0.tar.gz 265584 BLAKE2B 2ee51ccf56792cd8bc94315dc978146a9fafa2994c80c1f7202ee3ce48ce9c561f8b9bb64c1e7a5c54c70d548c9f36806f8819681bda3a8c40bf46286570204b SHA512 a8eca27c38afebd382d85ecb18003ad15ede16f7df057c3180cf0529473e884b0ddbfd143554407d07d10001d9a66621775be8d8db4a05febdfe430aa39f06b8
-DIST PRICE-1.3.0.tar.gz 275904 BLAKE2B 89adbb9f735c10aa87cac4b7f65b671231b6da6f3626d2cbb181dc02dff28a08934bdc7523b3ab49f30f906557449ccea98d55e96ff3048da2ec8fd2f3ce63d8 SHA512 dd9530d4c953922a218847420052859cddf23db5513ed8e0e8215c06a5e8f877560bdd039e56e7f47c646d8d8456f335a336a696467b290b7e8376f6ffffd542
-EBUILD price-1.2.0.ebuild 445 BLAKE2B 65ecbb5010df161273fe52a531b3b9985c9f0bc42ebdd49187e7ac27c161db53fd44af53a4f7589f99876a873dadd4f32631da777f9095426f8372f974281532 SHA512 eb8ad0a2c709a00ef69078cb7b7945248fc88c954a958ba60e026ef818207b97724b1b22abcd95f3fae23c94131c8a3345526cccad56eb5f2365df7da59dbfc2
-EBUILD price-1.3.0.ebuild 447 BLAKE2B 2a0bd3f73f784561e9e9e63987ff152dd0e851a75f5fa0a68e931ca18cb5eb3f0a0c7424c966e268847a7ecd5046b1221313b4e94a543b56f2ae93ae29c5ff89 SHA512 b9b60f450b3de0eedb77559b5259b63b6b7ffb5f744dbe5555a7163486c12370f5799fd42911d57c5fc85d36cfe350634db561a6864329509299540eb7be32a2
-MISC metadata.xml 701 BLAKE2B 96b51bf027aec9fe0261d7fe9f4b861d9184bedbc997206458e2b0fe4d0a25e289feecc35b41bb801aba08d6c325195dc730a600049304f67d7478c14b9ecc31 SHA512 cb025bb7bb2102e04a95ee04b842deea28ecd2b81a361320b3e8d01687c08f8e3afd312784ff2f129d0bae62d1483f38edfd4d63e63a0599d07fb0fb73e9bc3f
diff --git a/gnustep-apps/price/metadata.xml b/gnustep-apps/price/metadata.xml
deleted file mode 100644
index 67a6d04eaf95..000000000000
--- a/gnustep-apps/price/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-PRICE, which stands for Precision Raster Image Convolution Engine, aims to be a high quality Image filtering, enhancing and manipulation program. It is written in Objective-C and AppKit, so being designed for Cocoa and GNUstep, it should be portable to OpenSTEP (I hope so, currently I don't have the computers to do the porting).
-</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">price</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/price/price-1.2.0.ebuild b/gnustep-apps/price/price-1.2.0.ebuild
deleted file mode 100644
index b02f3fc12205..000000000000
--- a/gnustep-apps/price/price-1.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=PRICE-${PV}
-DESCRIPTION="Precision Raster Image Convolution Engine"
-HOMEPAGE="http://price.sourceforge.net/"
-SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
-KEYWORDS="amd64 ~ppc x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/price/price-1.3.0.ebuild b/gnustep-apps/price/price-1.3.0.ebuild
deleted file mode 100644
index c9a2e8ae4205..000000000000
--- a/gnustep-apps/price/price-1.3.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=PRICE-${PV}
-DESCRIPTION="Precision Raster Image Convolution Engine"
-HOMEPAGE="http://price.sourceforge.net/"
-SRC_URI="mirror://sourceforge/price/${MY_P}.tar.gz"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=gnustep-base/gnustep-gui-0.13.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/projectcenter-0.6.2 b/gnustep-apps/projectcenter-0.6.2
new file mode 100644
index 000000000000..e57cea0fbaed
--- /dev/null
+++ b/gnustep-apps/projectcenter-0.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=An IDE for GNUstep
+EAPI=5
+HOMEPAGE=http://www.gnustep.org/experience/ProjectCenter.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=sys-devel/gdb-6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://ftpmain.gnustep.org/pub/gnustep/dev-apps/ProjectCenter-0.6.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=489139fd425a9f3fc27217f702d5673e
diff --git a/gnustep-apps/projectcenter/Manifest b/gnustep-apps/projectcenter/Manifest
deleted file mode 100644
index a14b248355c1..000000000000
--- a/gnustep-apps/projectcenter/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ProjectCenter-0.6.2.tar.gz 492409 BLAKE2B d34bd88c0a1b0cae86886a8f2ff322e595d002112c82883f14af66d2a33d2c66fbebee4b8f03ef8049aa054d255c88d594b2f0ffc5982fdbcf84d6ed97670d7d SHA512 91e6712fa03fcb7b6e8239f64ddf89dabb1b4c54f4799204e8e535c9c6ad430a5e98644e28af5b9727a0b5b57a866b4e0837f09e8aedfac863673508a7c67a78
-EBUILD projectcenter-0.6.2.ebuild 454 BLAKE2B 090bcab2a8ce8b1bfb6ba7427b87a2dbee4e9bde7d12ae23600a361e46ccfe68bd938b8d6a8a7ca86f49388651eaa346ad93e160b3e94af97cf6ec4b14a4f5d6 SHA512 50657f309c887aa99e128e95cc5bad48092dd71f9d212654459c53cb305876ecb743661d344521d204902ce22c522fcb4fff848d581b48eff987961ea8b54625
-MISC metadata.xml 557 BLAKE2B 7145c73c55e79dca99530b7dc2cc1b1af82370b1235172083018b8fb4a349bf37051cc78001076111039ae0c4712fff56a62132fa62b5e66839e626c7854d428 SHA512 de8ee824768eaf908c861c6d494424dee0e935c1abebe2fdc8bfbadd50dbd17fe205490c5f9304546a9e466854a5d6830a68608927e7518102de8ea77c9806ce
diff --git a/gnustep-apps/projectcenter/metadata.xml b/gnustep-apps/projectcenter/metadata.xml
deleted file mode 100644
index b351ee5712b4..000000000000
--- a/gnustep-apps/projectcenter/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>
-ProjectCenter is GNUstep's integrated developement environment (IDE). It is based in part on NeXT's original Project Builder. It assists you in starting new projects and lets you manage your project files using a intuitive and well ordered graphical user interface.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild b/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild
deleted file mode 100644
index 6177cc9fbfa4..000000000000
--- a/gnustep-apps/projectcenter/projectcenter-0.6.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=${P/projectc/ProjectC}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An IDE for GNUstep"
-HOMEPAGE="http://www.gnustep.org/experience/ProjectCenter.html"
-SRC_URI="http://ftpmain.gnustep.org/pub/gnustep/dev-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-devel/gdb-6.0"
diff --git a/gnustep-apps/simpleagenda-0.43 b/gnustep-apps/simpleagenda-0.43
new file mode 100644
index 000000000000..e9ace8dad0f6
--- /dev/null
+++ b/gnustep-apps/simpleagenda-0.43
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=a simple calendar and agenda application
+EAPI=4
+HOMEPAGE=http://coyote.octets.fr/simpleagenda
+IUSE=dbus debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/libical-0.27 >=virtual/gnustep-back-0.20.0 dbus? ( gnustep-libs/dbuskit ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://coyote.octets.fr/pub/gnustep/SimpleAgenda-0.43.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3afa1c2c230d17d6f6d87245e2ca9774
diff --git a/gnustep-apps/simpleagenda/Manifest b/gnustep-apps/simpleagenda/Manifest
deleted file mode 100644
index 4e4086f0bcb1..000000000000
--- a/gnustep-apps/simpleagenda/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SimpleAgenda-0.43.tar.gz 155517 BLAKE2B 25c7235eea2a1e5583ca3f1aeaa3b69894bf5d27500c6b03415cfcd18b76d7e1c0d8b93e8ae1cf05401822c801aecc5755b6321abc2e24b3616be6c19d366433 SHA512 85b67cdfb3db633f818adf923b491ecbc5d3767ed15b90f34adaf13737e4ffc5ad021b7be2021ad2017a7ba0a3c7a1a625c296d9a805b2acb948415a89b0a2b0
-EBUILD simpleagenda-0.43.ebuild 602 BLAKE2B 56aa25955c36266e6aa37be5f6d4c4fd447021e7670445fa3e96dc4e494fe7d3b37e2754525719fcc92d7881dfe89a9c507f9df5ecd4f59a509037a8a28a8b99 SHA512 7adcaf139df388495e9793127b7de78f35cb474cf2d68c46f90460f6511e203c502372fae077120e0ce6327ac3cc923336ac6668f2589e39a008e196466a8231
-MISC metadata.xml 334 BLAKE2B 48bb87639b197a9dda12757d85ad56ecefa07104696666d7a6de393893cd94f83209b25e2ee8177855ff52e10a5224a61fc9620b39637f44deaeb3ca7cf44e13 SHA512 824f543cbd6bd26b2a759cd0406048f1b2d1b233afeca9733e41660a46b4f9ebaf7b35e0643cf6436d8e83ac03cda73c308b1192765531b3248cc7396cdfaff2
diff --git a/gnustep-apps/simpleagenda/metadata.xml b/gnustep-apps/simpleagenda/metadata.xml
deleted file mode 100644
index 9c046724b997..000000000000
--- a/gnustep-apps/simpleagenda/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>a simple calendar and agenda application</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/simpleagenda/simpleagenda-0.43.ebuild b/gnustep-apps/simpleagenda/simpleagenda-0.43.ebuild
deleted file mode 100644
index d1c7bf5cf1b7..000000000000
--- a/gnustep-apps/simpleagenda/simpleagenda-0.43.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit gnustep-2
-
-MY_PN=SimpleAgenda
-DESCRIPTION="a simple calendar and agenda application"
-HOMEPAGE="http://coyote.octets.fr/simpleagenda"
-SRC_URI="http://coyote.octets.fr/pub/gnustep/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="dbus"
-
-DEPEND=">=dev-libs/libical-0.27
-	>=virtual/gnustep-back-0.20.0
-	dbus? ( gnustep-libs/dbuskit )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_PN}-${PV}
-
-src_configure() {
-	egnustep_env
-	econf $(use_enable dbus dbuskit)
-}
diff --git a/gnustep-apps/sogo-3.2.10 b/gnustep-apps/sogo-3.2.10
new file mode 100644
index 000000000000..f6ee05a05f67
--- /dev/null
+++ b/gnustep-apps/sogo-3.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.10[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
+EAPI=6
+HOMEPAGE=http://www.sogo.nu
+IUSE=gnutls libressl +ssl debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.10[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-3.2.10.tar.gz -> sogo-3.2.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=b5d5dae7e93f7758966d2ad3d455802c
diff --git a/gnustep-apps/sogo-3.2.9 b/gnustep-apps/sogo-3.2.9
new file mode 100644
index 000000000000..572c1ef4897b
--- /dev/null
+++ b/gnustep-apps/sogo-3.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.9[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.6.3 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Groupware server built around OpenGroupware.org and the SOPE application server
+EAPI=6
+HOMEPAGE=http://www.sogo.nu
+IUSE=gnutls libressl +ssl debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libmemcached net-misc/curl net-misc/memcached >=gnustep-libs/sope-3.2.9[ldap] gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sogo/archive/SOGo-3.2.9.tar.gz -> sogo-3.2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=b5d5dae7e93f7758966d2ad3d455802c
diff --git a/gnustep-apps/sogo/Manifest b/gnustep-apps/sogo/Manifest
deleted file mode 100644
index 2300beb5224e..000000000000
--- a/gnustep-apps/sogo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX sogod.confd 117 BLAKE2B c47c8a6376967682571cd62766d0cf2422f35dc5ecbf599c616aee2cc5d6b2830ae3c4f3483924e15c59f44610eb8be656c21324f17270dd5eca6eb27780fe34 SHA512 d93bde8c500bf8452d5f32efc35ec12f436afc498d7cc6ac1f55769f8696c9b41cc5edec829a19ea01b24c0d3a2c7901fc797cb04ced371bc8e0c3e6e243f15b
-AUX sogod.initd 681 BLAKE2B b8a55f93a0e623bb5aa13d10658aba644cb9a532d7a5c02beeee8d7e01365944531e081afe77562da8da77a42bec10a125bd386ede063ad230e0135e8bd56c03 SHA512 d6925d49c24ff6ebfd989016a5c0a707c1bc866070cbd9e4e8eca867ec81fe1ad78bd6606b13349ac7d251f62bd85f239b42f65e1d22015c38b4ad6fe9058f4e
-DIST sogo-3.2.10.tar.gz 32528115 BLAKE2B 7543f2165ed20026f00adfac7697fe6bc0e54f06b3c2ccb99fbfe0ddd14bcf8818521e161bb118789175c4245b67a8ad5dd0cd3ef71f61d34d869e1c0c2a4a93 SHA512 3dbd465592fd98968b32e251659a70306a781999bcfa9e63e142d75d7c9274edc7cbe5069881e939f0e9472f0ef8580e4e0f20059bfc97f8c69893d86c8cadf3
-DIST sogo-3.2.9.tar.gz 32443733 BLAKE2B 6a2ae4b5346bc48b9301263fe017308ee34aabcee1ce5444744b22c3af040533d98738fca29a195fd0f792d1d4470418840d0b1ff0e264c2ebc92877f420fa75 SHA512 070b3812d65598364d9204432678ea48705bf7481371e44442a13ad86d219415e24c579ad59212a7631922a527d30e69aeb17711c3abfc01960f663f4e0112a3
-EBUILD sogo-3.2.10.ebuild 2083 BLAKE2B 3939ee6ada88110304d8680e374fc79df4bf07eaf15cd90034f700ac6dab55dccba6a760c4427122a646b4f7abf89441d132b3eca974ba9a88392d99990b9d23 SHA512 836b37feb3c0764782f4d63b5f9074a554f4765da4e7c0177c2227c4e091e29d93c62af13dbb30dfa9f5bc4fc87c152f6aa60839b6fd5f2d2313b58a57077a32
-EBUILD sogo-3.2.9.ebuild 2083 BLAKE2B 3939ee6ada88110304d8680e374fc79df4bf07eaf15cd90034f700ac6dab55dccba6a760c4427122a646b4f7abf89441d132b3eca974ba9a88392d99990b9d23 SHA512 836b37feb3c0764782f4d63b5f9074a554f4765da4e7c0177c2227c4e091e29d93c62af13dbb30dfa9f5bc4fc87c152f6aa60839b6fd5f2d2313b58a57077a32
-MISC metadata.xml 442 BLAKE2B a70c31f8e7b1688d5b42869fe6795ee03f409b9fbcc67c263f5a81abb31f165324724d1e7fde0c3b0dae35d196dfbbfba205c457bd2ae0c007d282bfe82b50de SHA512 135d98d4b53981130f0070d5db4ca71beb9f1a42b36b67ee4d08423955f09ab852991eb7247b5f49851214894ee989f158d479db9bd17e0e455a994d445034b3
diff --git a/gnustep-apps/sogo/files/sogod.confd b/gnustep-apps/sogo/files/sogod.confd
deleted file mode 100644
index 906a6978d862..000000000000
--- a/gnustep-apps/sogo/files/sogod.confd
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.d/sogod: config file for /etc/init.d/sogod
-
-SOGOD_WORKERS=3
-
-# Additional options for SOGo
-SOGOD_OPTS=""
diff --git a/gnustep-apps/sogo/files/sogod.initd b/gnustep-apps/sogo/files/sogod.initd
deleted file mode 100644
index ad003be62c9b..000000000000
--- a/gnustep-apps/sogo/files/sogod.initd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-SOGOD_PID=/run/sogo/sogod.pid
-
-depend() {
-	need net
-	need memcached
-	after postgresql mysql
-	after slapd
-	after mta
-}
-
-start() {
-	checkpath -q -d -m 0755 -o sogo:sogo $(dirname "${SOGOD_PID}")
-	ebegin "Starting SOGo service"
-	start-stop-daemon --start --quiet \
-		--user sogo --exec /usr/sbin/sogod \
-		--	-WOWorkersCount ${SOGOD_WORKERS} \
-			-WOLogFile /var/log/sogo/sogod.log \
-			-WOPidFile "${SOGOD_PID}" \
-			"${SOGOD_OPTS}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping SOGo service"
-	start-stop-daemon --stop \
-		--pidfile "${SOGOD_PID}"
-	eend ${?}
-}
diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
deleted file mode 100644
index 2c4b6c6ef092..000000000000
--- a/gnustep-apps/sogo/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">inverse-inc/sogo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-apps/sogo/sogo-3.2.10.ebuild b/gnustep-apps/sogo/sogo-3.2.10.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
-
-RDEPEND="
-	dev-libs/libmemcached
-	net-misc/curl
-	net-misc/memcached
-	>=gnustep-libs/sope-${PV}[ldap]
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	>=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-pkg_setup() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
-	gnustep-base_src_prepare
-	sed -e "s/validateArgs$//" -i configure \
-		|| die "GNUstep.conf sed failed"
-
-	default
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	./configure \
-		--disable-strip \
-		--prefix=/usr \
-		--with-ssl="${ssl_provider}" \
-		$(use_enable debug) \
-		|| die "configure failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	newconfd "${FILESDIR}"/sogod.confd sogod
-	newinitd "${FILESDIR}"/sogod.initd sogod
-
-	insinto /etc/logrotate.d
-	newins Scripts/logrotate sogo
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-
-	insinto /etc/sogo
-	doins Scripts/sogo.conf
-
-	insinto /etc/cron.d
-	newins Scripts/sogo.cron sogo
-	keepdir /var/log/sogo
-
-	fowners sogo:sogo /var/log/sogo
-	fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog "SOGo documentation is available online at:"
-	elog "http://www.sogo.nu/downloads/documentation.html"
-	elog
-	elog "Apache sample configuration file is available in:"
-	elog "/usr/share/doc/${PF}"
-}
diff --git a/gnustep-apps/sogo/sogo-3.2.9.ebuild b/gnustep-apps/sogo/sogo-3.2.9.ebuild
deleted file mode 100644
index 5c728f4bdae5..000000000000
--- a/gnustep-apps/sogo/sogo-3.2.9.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2 user vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls libressl +ssl"
-
-RDEPEND="
-	dev-libs/libmemcached
-	net-misc/curl
-	net-misc/memcached
-	>=gnustep-libs/sope-${PV}[ldap]
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	>=gnustep-base/gnustep-make-2.6.3"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-pkg_setup() {
-	enewuser sogo -1 /bin/bash /var/lib/sogo
-}
-
-src_prepare() {
-	gnustep-base_src_prepare
-	sed -e "s/validateArgs$//" -i configure \
-		|| die "GNUstep.conf sed failed"
-
-	default
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	./configure \
-		--disable-strip \
-		--prefix=/usr \
-		--with-ssl="${ssl_provider}" \
-		$(use_enable debug) \
-		|| die "configure failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	newconfd "${FILESDIR}"/sogod.confd sogod
-	newinitd "${FILESDIR}"/sogod.initd sogod
-
-	insinto /etc/logrotate.d
-	newins Scripts/logrotate sogo
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-
-	insinto /etc/sogo
-	doins Scripts/sogo.conf
-
-	insinto /etc/cron.d
-	newins Scripts/sogo.cron sogo
-	keepdir /var/log/sogo
-
-	fowners sogo:sogo /var/log/sogo
-	fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog "SOGo documentation is available online at:"
-	elog "http://www.sogo.nu/downloads/documentation.html"
-	elog
-	elog "Apache sample configuration file is available in:"
-	elog "/usr/share/doc/${PF}"
-}
diff --git a/gnustep-apps/systempreferences-1.2.0 b/gnustep-apps/systempreferences-1.2.0
new file mode 100644
index 000000000000..95f1479a0b9d
--- /dev/null
+++ b/gnustep-apps/systempreferences-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=System Preferences is a clone of Apple OS X' System Preferences
+EAPI=5
+HOMEPAGE=http://www.gnustep.it/enrico/system-preferences/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/usr-apps/SystemPreferences-1.2.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6d3a94974928894d811227f394a57b8e
diff --git a/gnustep-apps/systempreferences/Manifest b/gnustep-apps/systempreferences/Manifest
deleted file mode 100644
index da5d8f37b23e..000000000000
--- a/gnustep-apps/systempreferences/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SystemPreferences-1.2.0.tar.gz 309496 BLAKE2B 5257ad38e9178967b70d074923dfea2b67eaf14db3fcdb5b53d7634735601d8aa2719efa568f368b26bb0029fe8b65b07e2fb9377386c4b77ddb63e9bc5a6a2b SHA512 22972ac0e51a19276375786759c2b7445691b2a0db4195a448ff1a68871561400fe1f4e194228e903f28d45416db3a00792b320f2749863300ea9117e7e99fbe
-EBUILD systempreferences-1.2.0.ebuild 450 BLAKE2B 469da5ac45988f855e822c60a208d3d1ef171bb89897f6c6de11c5d07211f7edeb611d74087706aec9fe6a0b531673613519ed900a03f425e579b4d97da179c2 SHA512 22890c3dcfe9e150ab69470df411c70d7dbb64bca1d6b06d82b733563c7ad0a760afd3af407b4d97de939b949b53c1ac77f1e93c2e7f7b75c3ac3fc2c051408d
-MISC metadata.xml 304 BLAKE2B a8ee817dcfb57cfa1bf8c89ac7756456b29b0681f834e6f62ae12a6e9554e038c980d2ff4b858581399418cd772b26a3df08939e473c6b01d962cb6072ce720a SHA512 6cbb5c1222ed264cf1ea39f73c22a5681614df03235f4e894b7332e78bd331c52c32a9904551b814d9203e1c029843aa80b3cc68362c79ed2d6270d732679589
diff --git a/gnustep-apps/systempreferences/metadata.xml b/gnustep-apps/systempreferences/metadata.xml
deleted file mode 100644
index 576a117aaf8e..000000000000
--- a/gnustep-apps/systempreferences/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer> 
-	<longdescription>
-		TODO
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild b/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
deleted file mode 100644
index 7fe54791a5f4..000000000000
--- a/gnustep-apps/systempreferences/systempreferences-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P=SystemPreferences-${PV}
-DESCRIPTION="System Preferences is a clone of Apple OS X' System Preferences"
-HOMEPAGE="http://www.gnustep.it/enrico/system-preferences/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${MY_P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/talksoup-1.1 b/gnustep-apps/talksoup-1.1
new file mode 100644
index 000000000000..5e2a9333774a
--- /dev/null
+++ b/gnustep-apps/talksoup-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-libs/netclasses-1.1.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=IRC client for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/talksoup/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-libs/netclasses-1.1.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://savannah.nongnu.org/download/gap/TalkSoup-1.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=ed6b5d8458f918a02d8abc21472246df
diff --git a/gnustep-apps/talksoup/Manifest b/gnustep-apps/talksoup/Manifest
deleted file mode 100644
index 0a3f31f43d65..000000000000
--- a/gnustep-apps/talksoup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TalkSoup-1.1.tar.gz 378488 BLAKE2B 1a96fa3e7cd02e745f1fa5205cada198646b2d3dad1f494959f4d99a3292dcb388ec7711d1967df880a54050d9b84654fab81d31c3845fa2f41691d795026ec6 SHA512 50ee170a4fe729656a5ce2b2d942430fd4e623254ea0750b7bbd3cf57a58340db6e7ae1227c2af7f02e41a53a6ff629821f88a3cca46fd71790bf40674b85395
-EBUILD talksoup-1.1.ebuild 443 BLAKE2B dbd169c2d65e6b35ec5085107643248daeb186049978a94a56cbe531ea1299782e1d1df44249b692b8f3727b3d16eb933db3a71e0ace2a5c0f303db32a51fddd SHA512 4934f5605f91d88a1fbd5985d906a66f5f3272963c610e96d3607f9185869b0581e9b2857043ef39937f9242c27958b8e879a8f591a89fd2eb94c2d423d10636
-MISC metadata.xml 506 BLAKE2B d130dfa77fad56b7eba251478532a6a76d56d110079701cd0bcd83379b93b50fe7a0bffd32ed46d32d8c206ba6b619a683fb804e07958563e60b024c994556d0 SHA512 4a3b0578fe70cc65f74c11b5b22505cdc474e9e14002fe7c510a1361950d968e21776568927891907f17baa301ffa59a7670ccb16881e5c361f40df26400070f
diff --git a/gnustep-apps/talksoup/metadata.xml b/gnustep-apps/talksoup/metadata.xml
deleted file mode 100644
index 7ab1815b1f14..000000000000
--- a/gnustep-apps/talksoup/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer> 
-<longdescription>TalkSoup is an IRC client for GNUstep and Mac OS X. It is highly configurable and extensible with a fully-featured plugin system already in place. It has all the features one would expect from a graphical IRC client.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/talksoup/talksoup-1.1.ebuild b/gnustep-apps/talksoup/talksoup-1.1.ebuild
deleted file mode 100644
index 38910e8eeb51..000000000000
--- a/gnustep-apps/talksoup/talksoup-1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P="TalkSoup-${PV}"
-
-DESCRIPTION="IRC client for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/talksoup/"
-SRC_URI="http://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=gnustep-libs/netclasses-1.1.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
diff --git a/gnustep-apps/terminal-0.9.8 b/gnustep-apps/terminal-0.9.8
new file mode 100644
index 000000000000..d240763e2602
--- /dev/null
+++ b/gnustep-apps/terminal-0.9.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A terminal emulator for GNUstep
+EAPI=4
+HOMEPAGE=http://www.nongnu.org/terminal/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d69f6683ecedced76343a7349180e106
diff --git a/gnustep-apps/terminal-0.9.9 b/gnustep-apps/terminal-0.9.9
new file mode 100644
index 000000000000..41369b1ea361
--- /dev/null
+++ b/gnustep-apps/terminal-0.9.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A terminal emulator for GNUstep
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/terminal/
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=!<x11-terms/terminal-0.6.0 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Terminal-0.9.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f352803746030e4beb499b91f17021cc
diff --git a/gnustep-apps/terminal/Manifest b/gnustep-apps/terminal/Manifest
deleted file mode 100644
index 4662a2f5c3a3..000000000000
--- a/gnustep-apps/terminal/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Terminal-0.9.8.tar.gz 110520 BLAKE2B 7f2f219cb76c8765b9fb4b5017834ab73a10429a8d0843a3c0b01909d54c21979867546d33c6bf07a4aed2cdbb1dc392effdf7e5e6b6f7096748e9fe9c96a13a SHA512 dc282f52662e0e65553562e6684af7ffab25afb62badee5c22c3b5d03c31a75d172b35706512e98d4fa14d68bd3643e0158c67ff61755deab77741d71bf219c0
-DIST Terminal-0.9.9.tar.gz 88762 BLAKE2B a160a5946df6e0261f7f04db4cceb11925f14c814d2c4d66fb34f2febf0efa5d8fb99834a1ba5642e5bd8f7a36d1d30ae830a83cc3c7a36657c8b50325d3c922 SHA512 456b0755ee6751eb3ef1c5e62e969b6981f7874cb358e071fc7edda93b2ebc698224c990ba4335aa62a7acefb9085723e924d1311c96ae8d34d0f8b2c7c920a3
-EBUILD terminal-0.9.8.ebuild 449 BLAKE2B 601d48b8f1a0cae97cd3bc4f891e18b9ce4ef748d3c30e06aa3384d8ad3cf5eeceed1550379cad6fc6ad903696dcfe4b94fb56e5e0919618faa49d745ad95e72 SHA512 3f7d9aa9aefe3e7f29e2dcdbed11275359a149abf5a77163c6d64c6472ebb6fc7d3eb8b124a4cbe060fd551f63995b9cdc595bec1e404263650e46ed6715b52c
-EBUILD terminal-0.9.9.ebuild 452 BLAKE2B 3888011cc3f81aedc1836e3016ab469db70f4a0bc8646fa52e9f5e01fbf9e4f5463fe14e928ea10eb3dcad04b45bfbd2e258665f1f4b3595787a32a4dba7a5f8 SHA512 94d1646a98ba109eec6b60b25d07ff4d03e321b2e2a872fbbd14f0e36241986cc57ce7820ad6930a88f30a4f05d5d558d2c1b32947aa0f773132f878251e6ac3
-MISC metadata.xml 398 BLAKE2B 866baa4e6d912372f4f78059fba2d0244b6adb27910fd54609f2d22259159c1f8a958773e0eb2b0f94c37b34df5c2e65b96cf9ce0d5568ea31b36f5c3be64b22 SHA512 2be2b5a6ff68fad1a03fc4949ef471dc6c9a2c7c9b4401308b893b886c6af925ecf3c817a49bd9cbad3111154e64ccce2cf57cea1915220513c6d0e01a8dddf1
diff --git a/gnustep-apps/terminal/metadata.xml b/gnustep-apps/terminal/metadata.xml
deleted file mode 100644
index 759eb3f6cb07..000000000000
--- a/gnustep-apps/terminal/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Terminal.app - copyright (c) 2002 Alexander Malmberg alexander@malmberg.org
-a terminal emulator for GNUstep
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/terminal/terminal-0.9.8.ebuild b/gnustep-apps/terminal/terminal-0.9.8.ebuild
deleted file mode 100644
index 724bd7200af1..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!<x11-terms/terminal-0.6.0" #376257
-DEPEND="${RDEPEND}"
diff --git a/gnustep-apps/terminal/terminal-0.9.9.ebuild b/gnustep-apps/terminal/terminal-0.9.9.ebuild
deleted file mode 100644
index 751aa1be4172..000000000000
--- a/gnustep-apps/terminal/terminal-0.9.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/t/T}
-
-DESCRIPTION="A terminal emulator for GNUstep"
-HOMEPAGE="http://www.nongnu.org/terminal/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/t/T}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-RDEPEND="!<x11-terms/terminal-0.6.0" #376257
-DEPEND="${RDEPEND}"
diff --git a/gnustep-apps/textedit-0.95_pre20100427-r1 b/gnustep-apps/textedit-0.95_pre20100427-r1
new file mode 100644
index 000000000000..95dfecb4e7bc
--- /dev/null
+++ b/gnustep-apps/textedit-0.95_pre20100427-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A text editor with font, color, and style capabilities for GNUstep
+EAPI=5
+HOMEPAGE=http://www.nongnu.org/backbone/
+IUSE=debug doc
+KEYWORDS=amd64 ~ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://gentoo/textedit-0.95_pre20100427.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3bbe13ac0d97a889c096ed7f9e3bbeb
diff --git a/gnustep-apps/textedit/Manifest b/gnustep-apps/textedit/Manifest
deleted file mode 100644
index cfc85c585580..000000000000
--- a/gnustep-apps/textedit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX textedit-0.95_pre20100427-gcc47.patch 1138 BLAKE2B c1d070e651a162a95f538bcd5ce67068d0c95e12f984c33f7e18dd2c1bda3eb514748930cf88fa20214680eecbdccce5261b0a3451433ef76771fe22241c73bc SHA512 d270ae159399c6a3c3bf8dc815aaf0cbc294151944ff08fe8691093fc8fa26332ec75a86afece97c3b73abb68660cc0e5fbe7ef1145b0a155aeda347c6c3c13e
-AUX textedit-0.95_pre20100427-nsinvalidargument.patch 706 BLAKE2B 3946e4e16f6de2312e779a9f0e16502d5a98d4581cf82e929212af171932ca1280311d837bda2cb5ae97e979211f66a9199f5aa063ad1078ab6f62bfeba2be2b SHA512 251418c683a8b29f47ddd8c67d59573673931576de6455b1365003f51f9c7a3ff53b4e3041e78fe0ed8eeaec62dd730a3c4da13cf30de9b0fea64423fc943f18
-DIST textedit-0.95_pre20100427.tar.gz 131332 BLAKE2B 443c54e243ca23bc1805778e912847f02bd118a9859a61f0c959a4cdeeba91f77daeb53f45f2de4d83defa421d11f3f5ae0c15585ee6ffbbe8dbb108f9a1b6e1 SHA512 df46ce1d0eb61ee776a0c4318f743f365d4d632ec0bbf9d04d1e6afbd35456f4a396fcafcac70e924475ccb2bb8dbbbf7dea18a68014f9634212c2803db59596
-EBUILD textedit-0.95_pre20100427-r1.ebuild 495 BLAKE2B 6bd0e12deaba0fcb5619ea00bd3600ff4a6ed5d0461c246188fbf6bffe11cc5dd16fd94690af10d00f6342fe6aae9dee163fdb6ee291414347f79495b09914c2 SHA512 b8ba3064d37b692d45ec276de39de9252359df9a3d9a6ca006e5afb33aaa0d94a554f270bbb0fd6ae4eba5eb57c18eb02f71c4ffc80a7db9c1094f3516b31fef
-MISC metadata.xml 394 BLAKE2B b7f81fb353d28af53c512d9382e041958efbfcd5f14d68b091f5b5a2f0cb7d36d26c4080dbeff5ef5138061143f06df62b016c97fccad12332ad1b4bb78f2240 SHA512 3ec6a6a517708d591b37510f55b26e22d42e31b42b24b8221a6834158dfa59ec42916c93ccf72a2043454bcb23235b322fc5419213f7122d6a2a7a96665e063e
diff --git a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch b/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch
deleted file mode 100644
index b2a0bfedcd3c..000000000000
--- a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-gcc47.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- textedit.app-4.0+20061029.orig/Document.m
-+++ textedit.app-4.0+20061029/Document.m
-@@ -1361,13 +1361,13 @@ validateToggleItem (NSMenuItem *aCell, B
- {
- 	SEL			action = [aCell action];
- #ifdef GNUSTEP
--	const char	*sel_name = sel_get_name (action);
-+	const char	*sel_name = sel_getName (action);
- 
--	if (!strcmp (sel_name, sel_get_name (@selector (toggleRich:)))) {
-+	if (!strcmp (sel_name, sel_getName (@selector (toggleRich:)))) {
- 		validateToggleItem (aCell, [self isRichText], _(@"&Make Plain Text"), _(@"&Make Rich Text"));
--	} else if (!strcmp (sel_name, sel_get_name (@selector (togglePageBreaks:)))) {
-+	} else if (!strcmp (sel_name, sel_getName (@selector (togglePageBreaks:)))) {
- 		validateToggleItem (aCell, [self hasMultiplePages], _(@"&Wrap to Window"), _(@"&Wrap to Page"));
--	} else if (!strcmp (sel_name, sel_get_name (@selector (toggleHyphenation:)))) {
-+	} else if (!strcmp (sel_name, sel_getName (@selector (toggleHyphenation:)))) {
- 		if (!hyphenationSupported())	// Disable it
- 			return NO;
- 		validateToggleItem (aCell, ([self hyphenationFactor] > 0.0), _(@"Disallow &Hyphenation"), _(@"Allow &Hyphenation"));
diff --git a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-nsinvalidargument.patch b/gnustep-apps/textedit/files/textedit-0.95_pre20100427-nsinvalidargument.patch
deleted file mode 100644
index 345a0641fcbc..000000000000
--- a/gnustep-apps/textedit/files/textedit-0.95_pre20100427-nsinvalidargument.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- textedit.app-4.0+20061029.orig/Document.m
-+++ textedit.app-4.0+20061029/Document.m
-@@ -124,12 +124,6 @@
- 		[self setViewSize: size];
- 	}
- 
--	[[NSNotificationCenter defaultCenter]
--		addObserver: self
--		   selector: @selector (fixUpScrollViewBackgroundColor:)
--			   name: NSSystemColorsDidChangeNotification
--			 object: nil];
--
- 	potentialSaveDirectory = nil;
- 	return self;
- }
-@@ -195,10 +189,6 @@
- 	NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
- 
- 	[center removeObserver: self
--					  name: NSSystemColorsDidChangeNotification
--					object: nil];
--
--	[center removeObserver: self
- 					  name: NSTextStorageDidProcessEditingNotification
- 					object: [self textStorage]];
- 
diff --git a/gnustep-apps/textedit/metadata.xml b/gnustep-apps/textedit/metadata.xml
deleted file mode 100644
index 0c76e2ff1bd4..000000000000
--- a/gnustep-apps/textedit/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-TextEdit
-
-This directory contains the source code for the TextEdit demo, which is a simple text editor.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild b/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
deleted file mode 100644
index c1ded6382b92..000000000000
--- a/gnustep-apps/textedit/textedit-0.95_pre20100427-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnustep-2
-
-S=${WORKDIR}/TextEdit
-
-DESCRIPTION="A text editor with font, color, and style capabilities for GNUstep"
-HOMEPAGE="http://www.nongnu.org/backbone/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-	epatch "${FILESDIR}"/${P}-nsinvalidargument.patch
-}
diff --git a/gnustep-apps/zipper-1.5 b/gnustep-apps/zipper-1.5
new file mode 100644
index 000000000000..be81d2816de8
--- /dev/null
+++ b/gnustep-apps/zipper-1.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Zipper is a tool for inspecting and extracting compressed archives
+EAPI=5
+HOMEPAGE=http://gap.nongnu.org/zipper
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/Zipper-1.5.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=97f8f7a921b9db6217e0d69ed86c0ca5
diff --git a/gnustep-apps/zipper/Manifest b/gnustep-apps/zipper/Manifest
deleted file mode 100644
index 5d1d21ad646f..000000000000
--- a/gnustep-apps/zipper/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Zipper-1.5.tar.gz 81557 BLAKE2B cbd3201de2ba8edd10d3d9a4a748ab559ce1aeafb95ee68ef2a9f2b978d1e08585f519bd557676932a0a4e38a7b401150d6b80d91296df281fc50295cee47e77 SHA512 4b3353c0513f6fb4431778d03a4f980a592d19bbb3dcaface5c618b88a9c76bb7d067cca38fe20ccafc6c3636cd6b2e17b2a2e273673b2ba1153faa6f68ef348
-EBUILD zipper-1.5.ebuild 404 BLAKE2B 362dfbf5f987f411b201eca82451a2897dd27541f7e55154bcdac788329b2bfe10d52111136292a519f7b6195260e875a94582a3f5d2bb7782e612ddcfa12930 SHA512 5493ee9bf5e35cd7f77976d191ced6ae4d24ed612d4d4517388eae418073d5db09743fd4998d171d94b28e8d65fbc31b3b897c6c9c72ab0de9751f0c0e9800a8
-MISC metadata.xml 379 BLAKE2B d47143db4c160090d7b5582b0f8251220cbd0b6f36939ce3dc6c9cab06412dc8e79e7da34d52d9fa16b50928811ea170a9ad671317f812883327b0a9d067b778 SHA512 6f3b1c08459825f43a5d81eebb2e10c98d7330c09cb3f0dd3c746fa6ae299d6872f3400a39a41fc08d0ae3d9bbc14b2e20205efe84a845c9556695c5bf6ad4e2
diff --git a/gnustep-apps/zipper/metadata.xml b/gnustep-apps/zipper/metadata.xml
deleted file mode 100644
index 536e3caa28a4..000000000000
--- a/gnustep-apps/zipper/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-Zipper is a tool for inspecting the contents of a compressed archive and for extracting.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-apps/zipper/zipper-1.5.ebuild b/gnustep-apps/zipper/zipper-1.5.ebuild
deleted file mode 100644
index 92dcaebe97af..000000000000
--- a/gnustep-apps/zipper/zipper-1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit gnustep-2
-
-S=${WORKDIR}/${P/z/Z}
-
-DESCRIPTION="Zipper is a tool for inspecting and extracting compressed archives"
-HOMEPAGE="http://gap.nongnu.org/zipper"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P/z/Z}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
diff --git a/gnustep-base/Manifest.gz b/gnustep-base/Manifest.gz
index ae30c203367b..3ddac05fadbb 100644
--- a/gnustep-base/Manifest.gz
+++ b/gnustep-base/Manifest.gz
diff --git a/gnustep-base/gnustep-back-art-0.25.0 b/gnustep-base/gnustep-back-art-0.25.0
new file mode 100644
index 000000000000..87247c9c3f82
--- /dev/null
+++ b/gnustep-base/gnustep-back-art-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=170a90411dd2cae0f63a677e2944b945
diff --git a/gnustep-base/gnustep-back-art-0.25.1 b/gnustep-base/gnustep-back-art-0.25.1
new file mode 100644
index 000000000000..cc9d89932d7e
--- /dev/null
+++ b/gnustep-base/gnustep-back-art-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6076d25ccca56d564a04a2144b039d5a
diff --git a/gnustep-base/gnustep-back-art-0.26.2 b/gnustep-base/gnustep-back-art-0.26.2
new file mode 100644
index 000000000000..17ceadbe522c
--- /dev/null
+++ b/gnustep-base/gnustep-back-art-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+DESCRIPTION=libart_lgpl back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=media-libs/libart_lgpl-2.3 >=gnustep-base/mknfonts-0.5-r1 media-fonts/dejavu !gnustep-base/gnustep-back-cairo !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=70ffe2db655c900533ec3e6044afeef0
diff --git a/gnustep-base/gnustep-back-art/Manifest b/gnustep-base/gnustep-back-art/Manifest
deleted file mode 100644
index 4ee80b5c2eb5..000000000000
--- a/gnustep-base/gnustep-back-art/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-back-0.25.0.tar.gz 974762 BLAKE2B ef3ef5bf822b2cd96ac8f6256708c275193db9ba2bfe3d669c3a50e1f4ff9bfb1560a0a2ee1c38e58a13e0e3e081548102dd83a06bdf880fe857046d3d7940ef SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770
-DIST gnustep-back-0.25.1.tar.gz 974775 BLAKE2B 8050c20f405da340a0f42655ca2b0f43761d60b8ee6eab7ce4bbd5f323f7ab8b59506b0b8c5c057eb8303c0b7efe4d80ab428ca100b319a9b927d74bdb37ddd4 SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656
-DIST gnustep-back-0.26.2.tar.gz 969473 BLAKE2B a16b8663492ca1d59ac1267b3e5421cc14672251c273624e4bcc5e587783968baebfcca020c3f0ccaf73de9c0c43f872a303be4c1ef83c78e1bf102d47f2feea SHA512 99912430425e36b386b3f7bb3a49989c92edd20e3166292e6697c532a7f8ae17682c80bb39fa6177c67bb75bcd9befc44f53874eb5ca1406f51af44b15c9685e
-EBUILD gnustep-back-art-0.25.0.ebuild 2077 BLAKE2B b797b4e6a40a1207115c153276c45fcc7ba1f067e1b0477a94bf6467d636ef6a1bc4e53420480b035b4891bde1710014e0f2f9b18b8accd5a43440b7d6d3466b SHA512 8d129e05455d8039cea12ac7f085b50a17e12f0c1da0de560fcdb2b440181764a601d71fc6ced662867f6ba4ba98e8b133af9f8fb935e00e024be2df36058d7e
-EBUILD gnustep-back-art-0.25.1.ebuild 2081 BLAKE2B 246c59e1a549a8944bf3f02b7c0452eb61fe3e02aa77dc707b3f8e578bd16372c9775d27d78154b5a46945415ddfb6bf626a5c47b45cf9bcc8c2ff0ffa9456c4 SHA512 21f1a96b3c3c4ffd92754149a192511003e23d131092dc53bf3fffa512ae92cb8a84d352cbde60cae2ef08cf5eb6ebb982e108dc38f54325a50ea7b161c5f552
-EBUILD gnustep-back-art-0.26.2.ebuild 2081 BLAKE2B e0297415c6e046aab06fa5149dc87b7b3c77b51fbc5cc87381282bda73665e69c4a4bc229dc2500135c2c67795257f0620f85773bdf536c7d40698949337a484 SHA512 0c558edbf5d870010b35b67515fbca9b9f97ccb7bc642a055e1b14af8c6f6a96f38b63b9d2d83882a438b7faa4ca2e5a0813b5d7a7238d5e06123a1268de83d3
-MISC metadata.xml 1189 BLAKE2B 10dfa03030e2aa7412a4432eaa2c89727873fb6d567b30b112ebdc37099d14c120712b8632f50c692bd7079577b7dc43ecd0dfc9bc2c0b5bf491d32cbafb1360 SHA512 ab320e4962fcd3abcf36b6082cdf81e3e9cbd94408fa949569589a2880737e725a002b816c455cb61136f8a54e3f45b20fbfc59a52d7707f7fc443b11bbdddbc
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.0.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.0.ebuild
deleted file mode 100644
index 40454b1087e6..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=media-libs/libart_lgpl-2.3
-	>=gnustep-base/mknfonts-0.5-r1
-	media-fonts/dejavu
-
-	!gnustep-base/gnustep-back-cairo
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art"
-
-	econf $myconf
-}
-
-src_compile() {
-	gnustep-base_src_compile
-
-	# Create font lists for DejaVu
-	einfo "Generating nfonts support files"
-	(
-		cd Fonts
-		export "${GS_ENV[@]}"
-		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
-			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
-			|| die "nfonts support files creation failed"
-		# Trim whitepsaces
-		for fdir in *\ */; do
-			mv "$fdir" `echo $fdir | tr -d [:space:]`
-		done
-	)
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-}
-
-gnustep_config_script() {
-	echo "echo ' * setting normal font to DejaVuSans'"
-	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
-	echo "echo ' * setting bold font to DejaVuSans-Bold'"
-	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
-	echo "echo ' * setting fixed font to DejaVuSansMono'"
-	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
-}
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild
deleted file mode 100644
index 7e99c2440f4e..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.25.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=media-libs/libart_lgpl-2.3
-	>=gnustep-base/mknfonts-0.5-r1
-	media-fonts/dejavu
-
-	!gnustep-base/gnustep-back-cairo
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art"
-
-	econf $myconf
-}
-
-src_compile() {
-	gnustep-base_src_compile
-
-	# Create font lists for DejaVu
-	einfo "Generating nfonts support files"
-	(
-		cd Fonts
-		export "${GS_ENV[@]}"
-		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
-			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
-			|| die "nfonts support files creation failed"
-		# Trim whitepsaces
-		for fdir in *\ */; do
-			mv "$fdir" `echo $fdir | tr -d [:space:]`
-		done
-	)
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-}
-
-gnustep_config_script() {
-	echo "echo ' * setting normal font to DejaVuSans'"
-	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
-	echo "echo ' * setting bold font to DejaVuSans-Bold'"
-	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
-	echo "echo ' * setting fixed font to DejaVuSansMono'"
-	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
-}
diff --git a/gnustep-base/gnustep-back-art/gnustep-back-art-0.26.2.ebuild b/gnustep-base/gnustep-back-art/gnustep-back-art-0.26.2.ebuild
deleted file mode 100644
index d178338f8d18..000000000000
--- a/gnustep-base/gnustep-back-art/gnustep-back-art-0.26.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="libart_lgpl back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=media-libs/libart_lgpl-2.3
-	>=gnustep-base/mknfonts-0.5-r1
-	media-fonts/dejavu
-
-	!gnustep-base/gnustep-back-cairo
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=art"
-
-	econf $myconf
-}
-
-src_compile() {
-	gnustep-base_src_compile
-
-	# Create font lists for DejaVu
-	einfo "Generating nfonts support files"
-	(
-		cd Fonts
-		export "${GS_ENV[@]}"
-		${GNUSTEP_SYSTEM_TOOLS}/mknfonts \
-			$(fc-list : file|grep -v '\.gz'|cut -d: -f1) \
-			|| die "nfonts support files creation failed"
-		# Trim whitepsaces
-		for fdir in *\ */; do
-			mv "$fdir" `echo $fdir | tr -d [:space:]`
-		done
-	)
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	mkdir -p "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-	cp -pPR Fonts/*.nfont "${D}/${GNUSTEP_SYSTEM_LIBRARY}/Fonts"
-}
-
-gnustep_config_script() {
-	echo "echo ' * setting normal font to DejaVuSans'"
-	echo "defaults write NSGlobalDomain NSFont DejaVuSans"
-	echo "echo ' * setting bold font to DejaVuSans-Bold'"
-	echo "defaults write NSGlobalDomain NSBoldFont DejaVuSans-Bold"
-	echo "echo ' * setting fixed font to DejaVuSansMono'"
-	echo "defaults write NSGlobalDomain NSUserFixedPitchFont DejaVuSansMono"
-}
diff --git a/gnustep-base/gnustep-back-art/metadata.xml b/gnustep-base/gnustep-back-art/metadata.xml
deleted file mode 100644
index 70ccbad3dada..000000000000
--- a/gnustep-base/gnustep-back-art/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-It is a back-end component for the GNUstep GUI Library.  The
-implementation of the GNUstep GUI Library is designed in two parts.  The
-first part is the front-end component which is independent of platform
-and display system.  This front-end is combined with a back-end
-component which handles all of the display system dependent such as
-specific calls to the X Window System.  This design allows the GNUstep
-applications to have the "look and feel" of the underlying display
-system without any changes to the application, and the library can be
-easily ported to other display systems.
-
-The GNUstep GUI Backend is for platforms using the X-Window System or
-Window's Systems. It works via a DPS emulation engine to emulate the
-DPS functions required by the front-end system.
-
-This package installs a backend that supports libart_lgpl.
-</longdescription>
-<use>
-	<flag name="xim">Enable X11 XiM input method</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-back-cairo-0.25.0 b/gnustep-base/gnustep-back-cairo-0.25.0
new file mode 100644
index 000000000000..5897835de055
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib virtual/pkgconfig
+DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4c6e73087ca068dc339cd0f8d1937f48
diff --git a/gnustep-base/gnustep-back-cairo-0.25.1 b/gnustep-base/gnustep-back-cairo-0.25.1
new file mode 100644
index 000000000000..8f5fbf4250e9
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib virtual/pkgconfig
+DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=45c3edca016da5da3f2319b0c6b5da2c
diff --git a/gnustep-base/gnustep-back-cairo-0.26.2 b/gnustep-base/gnustep-back-cairo-0.26.2
new file mode 100644
index 000000000000..4bc276906939
--- /dev/null
+++ b/gnustep-base/gnustep-back-cairo-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib virtual/pkgconfig
+DESCRIPTION=Cairo back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 >=x11-libs/cairo-1.2.0[X] !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-xlib
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=72705c563d468b8375e17f7717d7282c
diff --git a/gnustep-base/gnustep-back-cairo/Manifest b/gnustep-base/gnustep-back-cairo/Manifest
deleted file mode 100644
index 59da988be5bc..000000000000
--- a/gnustep-base/gnustep-back-cairo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-back-0.25.0.tar.gz 974762 BLAKE2B ef3ef5bf822b2cd96ac8f6256708c275193db9ba2bfe3d669c3a50e1f4ff9bfb1560a0a2ee1c38e58a13e0e3e081548102dd83a06bdf880fe857046d3d7940ef SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770
-DIST gnustep-back-0.25.1.tar.gz 974775 BLAKE2B 8050c20f405da340a0f42655ca2b0f43761d60b8ee6eab7ce4bbd5f323f7ab8b59506b0b8c5c057eb8303c0b7efe4d80ab428ca100b319a9b927d74bdb37ddd4 SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656
-DIST gnustep-back-0.26.2.tar.gz 969473 BLAKE2B a16b8663492ca1d59ac1267b3e5421cc14672251c273624e4bcc5e587783968baebfcca020c3f0ccaf73de9c0c43f872a303be4c1ef83c78e1bf102d47f2feea SHA512 99912430425e36b386b3f7bb3a49989c92edd20e3166292e6697c532a7f8ae17682c80bb39fa6177c67bb75bcd9befc44f53874eb5ca1406f51af44b15c9685e
-EBUILD gnustep-back-cairo-0.25.0.ebuild 1099 BLAKE2B f3aba11eeacff699addea5d6bc6e59b3cb9a38c86aaebbbd3d408bd28fea66aa259fc8d09bf16e2cc46ac018e2a7c4fe61cda7a0dd2923a1f22ec4e9d918e149 SHA512 640c5e203e8a5082b71d9f5099d12d78c1967ad7540ae0785bd8283192a9d33dee80bc82cf395b533d6806512f3732a97c3964f847b9e4c7244bef2a888428c2
-EBUILD gnustep-back-cairo-0.25.1.ebuild 1103 BLAKE2B 2d0e827f9305d299c7c87378680334f2e1635be8aa49562259d4038cd79eff8dcce61aed69231be10290963728d51db878edeef55418ea74516ae1dcb4b450ed SHA512 ae85a55826f01ce0ccffad8a5a2d78a74f8128d62f828e9c8c633704e95aa8883cb8259c4948a3df257a693b4e5f4fd6b637e097242896c011291b2eaa63ae94
-EBUILD gnustep-back-cairo-0.26.2.ebuild 1103 BLAKE2B 0512bfebe347f6534378312be4fec325e723734f543a6d39525f778e17b4839a57c769d67d34aab486d1e3947b06f4b9f8185f2271f8a2265ce7486472be68ed SHA512 28725d1bdbb5958069792d69137e252d1bd73955279178bc302f2940197c93db11def75940d51308ad4291925700c5626d142ed2b177f561fbc752cc90e1acff
-MISC metadata.xml 411 BLAKE2B 77e073c47fbb179efafabc609b3975c85ed445e2c4c88726c75ac17adbbc285178e972d1e9a594a5597530115bd0d077d41438cd3c0d5d3939eab5742e5d4f6a SHA512 34914c27b9630177e6686a9a67f2a864c5130b41b4835c9fae12a3df6c6f81a04a15c41ee4e9d9e707dfeedb546b41caf0460c3a2f180375f8e244553e6b699c
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.0.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.0.ebuild
deleted file mode 100644
index 35666cd92808..000000000000
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=x11-libs/cairo-1.2.0[X]
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild
deleted file mode 100644
index 3f1e6ec37e06..000000000000
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.25.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=x11-libs/cairo-1.2.0[X]
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.26.2.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.26.2.ebuild
deleted file mode 100644
index bce99c6bd9d1..000000000000
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.26.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="Cairo back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	>=x11-libs/cairo-1.2.0[X]
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-xlib"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=cairo"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-cairo/metadata.xml b/gnustep-base/gnustep-back-cairo/metadata.xml
deleted file mode 100644
index 3b202e881261..000000000000
--- a/gnustep-base/gnustep-back-cairo/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-	Cairo back-end component for the GNUstep GUI Library.
-</longdescription>
-<use>
-	<flag name="xim">Enable X11 XiM input method</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-back-xlib-0.25.0 b/gnustep-base/gnustep-back-xlib-0.25.0
new file mode 100644
index 000000000000..23820d6f6dc5
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=7633cd17e55a5b35302e141aae68e06a
diff --git a/gnustep-base/gnustep-back-xlib-0.25.1 b/gnustep-base/gnustep-back-xlib-0.25.1
new file mode 100644
index 000000000000..41fa5784848e
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.25* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6bb50fd66363144961ea10135af36ed5
diff --git a/gnustep-base/gnustep-back-xlib-0.26.2 b/gnustep-base/gnustep-back-xlib-0.26.2
new file mode 100644
index 000000000000..8eb1d7ff38c7
--- /dev/null
+++ b/gnustep-base/gnustep-back-xlib-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+DESCRIPTION=Default X11 back-end component for the GNUstep GUI Library
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=opengl xim debug doc
+KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) =gnustep-base/gnustep-gui-0.26* opengl? ( virtual/opengl virtual/glu ) x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXft x11-libs/libXrender >=media-libs/freetype-2.1.9 !gnustep-base/gnustep-back-art !gnustep-base/gnustep-back-cairo
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=f3748bf919a707c44e8b6d49fbe43140
diff --git a/gnustep-base/gnustep-back-xlib/Manifest b/gnustep-base/gnustep-back-xlib/Manifest
deleted file mode 100644
index 695e6dbbb07a..000000000000
--- a/gnustep-base/gnustep-back-xlib/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-back-0.25.0.tar.gz 974762 BLAKE2B ef3ef5bf822b2cd96ac8f6256708c275193db9ba2bfe3d669c3a50e1f4ff9bfb1560a0a2ee1c38e58a13e0e3e081548102dd83a06bdf880fe857046d3d7940ef SHA512 38a098e7fe207c902428c05f01ebf0336b33fb9213368038c2513236255723b642fd9576524ad119ee9511c708be21c155eeaaf297e05c6ebdab8e59efe05770
-DIST gnustep-back-0.25.1.tar.gz 974775 BLAKE2B 8050c20f405da340a0f42655ca2b0f43761d60b8ee6eab7ce4bbd5f323f7ab8b59506b0b8c5c057eb8303c0b7efe4d80ab428ca100b319a9b927d74bdb37ddd4 SHA512 0515672c38265499dc3f0be5127053bc7b2478130cac69cb70c29e5887832472dfdcf90b756ab0926ba5967c0be93e041a1f820dc58f973e41b648e08a569656
-DIST gnustep-back-0.26.2.tar.gz 969473 BLAKE2B a16b8663492ca1d59ac1267b3e5421cc14672251c273624e4bcc5e587783968baebfcca020c3f0ccaf73de9c0c43f872a303be4c1ef83c78e1bf102d47f2feea SHA512 99912430425e36b386b3f7bb3a49989c92edd20e3166292e6697c532a7f8ae17682c80bb39fa6177c67bb75bcd9befc44f53874eb5ca1406f51af44b15c9685e
-EBUILD gnustep-back-xlib-0.25.0.ebuild 1061 BLAKE2B 2997a32313fb318225d19892df23f16d17ad0c024a9dd64655c03a925262ee47222b560a9233b36c713bcff251e87e490cfc7651ae83e2d883adcc65d92e7a1e SHA512 6b007796b6a85068d0caff28e4ba0a0bf96c4f910cfbc7a30f565f01c098d5817e254fa53f90d425413596a25c389db1b56055c803dc5b7579709c7867a725a6
-EBUILD gnustep-back-xlib-0.25.1.ebuild 1065 BLAKE2B 04f5edf9168756e9e4fb7a08feb3cc35695b6c25ac4781cd3b751fdd9ee945bac62222d305d74d7c8f30dac3282e760ea64b1a01ec755b415dc9620ce4d58acc SHA512 9353bccff959db3b412d784ff1bce22ade4c8dae4d335807d6d207b3fa261b2f7b6c6cd69bd8c7eb392bbe38d6352d911cc9d0bfe3fe2be6da293355b2d49e8f
-EBUILD gnustep-back-xlib-0.26.2.ebuild 1065 BLAKE2B 4f3969000a52c4a1dbe835d6348371a40e013b6b2236c29c785cfbfd93835c0958a49bbd7f496167a93cee81434af63af72c19803ed518e5895756d4eae77845 SHA512 36f9034038d9cbaf9806be401ea26ec8cc7af49a46bf9334ce5684bb0ea64f6a76067b89e6debd2f388e5a17116ca38229379ba85f1b54ddccb9ae02c7f2748f
-MISC metadata.xml 1181 BLAKE2B ee1be4fedf7a4798dd49867781e58c5c068311c1ab5ef52c08d4f5af889b1c78803d68985dfeab54bb821ba80ae88bdf7918f197e21c113e5bf25355f0006115 SHA512 8c98ddaf7050dbe9f511dd053310911f64a2e3b3f2a07822617e7e292c43a5a4ace6126d65e3e4c43bd439111842bf56761bd19baaf33ff2555e64c4882a00d2
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.0.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.0.ebuild
deleted file mode 100644
index 673d2903e9bf..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-cairo"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild
deleted file mode 100644
index 5d8cc7d42a46..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.25.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-cairo"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.26.2.ebuild b/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.26.2.ebuild
deleted file mode 100644
index 9d697a0365e1..000000000000
--- a/gnustep-base/gnustep-back-xlib/gnustep-back-xlib-0.26.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="Default X11 back-end component for the GNUstep GUI Library"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-back-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl xim"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	=gnustep-base/gnustep-gui-${PV%.*}*
-	opengl? ( virtual/opengl virtual/glu )
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=media-libs/freetype-2.1.9
-
-	!gnustep-base/gnustep-back-art
-	!gnustep-base/gnustep-back-cairo"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/gnustep-back-${PV}
-
-src_configure() {
-	egnustep_env
-
-	myconf="$(use_enable opengl glx)"
-	myconf="$myconf $(use_enable xim)"
-	myconf="$myconf --enable-server=x11"
-	myconf="$myconf --enable-graphics=xlib"
-
-	econf $myconf
-}
diff --git a/gnustep-base/gnustep-back-xlib/metadata.xml b/gnustep-base/gnustep-back-xlib/metadata.xml
deleted file mode 100644
index 51a634514545..000000000000
--- a/gnustep-base/gnustep-back-xlib/metadata.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-It is a back-end component for the GNUstep GUI Library.  The
-implementation of the GNUstep GUI Library is designed in two parts.  The
-first part is the front-end component which is independent of platform
-and display system.  This front-end is combined with a back-end
-component which handles all of the display system dependent such as
-specific calls to the X Window System.  This design allows the GNUstep
-applications to have the "look and feel" of the underlying display
-system without any changes to the application, and the library can be
-easily ported to other display systems.
-
-The GNUstep GUI Backend is for platforms using the X-Window System or
-Window's Systems. It works via a DPS emulation engine to emulate the
-DPS functions required by the front-end system.
-
-This package installs a backend that supports X11.
-</longdescription>
-<use>
-	<flag name="xim">Enable X11 XiM input method</flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-base-1.24.9-r1 b/gnustep-base/gnustep-base-1.24.9-r1
new file mode 100644
index 000000000000..6f6b8dd84683
--- /dev/null
+++ b/gnustep-base/gnustep-base-1.24.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=+gnutls +icu +libffi libressl +ssl zeroconf debug doc
+KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.24.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=cfba48ef92474789ce84881a4d624ccc
diff --git a/gnustep-base/gnustep-base-1.25.0 b/gnustep-base/gnustep-base-1.25.0
new file mode 100644
index 000000000000..899d1550b822
--- /dev/null
+++ b/gnustep-base/gnustep-base-1.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=+gnutls +icu +libffi zeroconf debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=69da8251556012a251cca6208f7dab1c
diff --git a/gnustep-base/gnustep-base-1.25.1 b/gnustep-base/gnustep-base-1.25.1
new file mode 100644
index 000000000000..8a94d5867388
--- /dev/null
+++ b/gnustep-base/gnustep-base-1.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi ) virtual/pkgconfig
+DESCRIPTION=A library of general-purpose, non-graphical Objective C objects
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=+gnutls +icu +libffi zeroconf debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=gnustep-base/gnustep-make-2.6.0 gnutls? ( net-libs/gnutls ) icu? ( >=dev-libs/icu-4.0:= ) !libffi? ( dev-libs/ffcall gnustep-base/gnustep-make[-native-exceptions] ) libffi? ( virtual/libffi ) >=dev-libs/libxml2-2.6 >=dev-libs/libxslt-1.1 >=dev-libs/gmp-4.1:= >=sys-libs/zlib-1.2 zeroconf? ( net-dns/avahi )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-base-1.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=59ad8d0384bfa271b7404a3ad6f579c3
diff --git a/gnustep-base/gnustep-base/Manifest b/gnustep-base/gnustep-base/Manifest
deleted file mode 100644
index 4b77f78d664b..000000000000
--- a/gnustep-base/gnustep-base/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-base-1.24.9.tar.gz 3561094 BLAKE2B a50e92ae774826082e743581425cfaab6bcbcdbf65a88df4d58988d3c6723e5d3d76d09cf57b4f9278c489e2ff0d178257e2be1c7147a284d8624f3629aaf4f4 SHA512 baaa3541edf48a5d902f706f9dad261378bf65e5d89f7308ece6a1fe55c348506df4b6d474ae17cdf0072f1e8dec1b2050d59413abe28bd001d5717c54a3ab96
-DIST gnustep-base-1.25.0.tar.gz 3528599 BLAKE2B aa86de9dc26fb48f49bdd796fc25863e8b1baa48a7c8a1536cc39497843b8d37f02e1cc72ea343795d1be6392a6679a4810ae62e6f9c5ec6c34f9ee099f32746 SHA512 0c38baa439a87557e054e37ed7b337e9f90f349fd6683551cf6482a0a53c247e2ca23b7df9ab369e8819a7d0f9f29e8a8dc639b148ec1c0223764796dbbd3608
-DIST gnustep-base-1.25.1.tar.gz 3475169 BLAKE2B 4e2d26ad5782e117f778d298add4c92d40f7c6c73d5aff9692d8eaf7cf06d6ccf6487282e03d4f86bb434d0c7c327b3d80187ca43fdc1c0ff282a246958448fc SHA512 a93c3b4c0fb7df4946ed52dc62c11dfa58f8606fc9666cc7ec7ff5e1c088b67608410b715680e801636bf5ce2caa08e172372f6cab94933459c5e870f962ab11
-EBUILD gnustep-base-1.24.9-r1.ebuild 2372 BLAKE2B ad96ec102bdc01ebad822bb68e640047267d8384d9cf12d0f6fb1ef73ee0bfc9a9b2555ade8d6c6e1e948e2466d916acc4c01749ba74c30d5dcfba7c6b4a410c SHA512 fa11cb04e89b3d85753d5a36166338071c5969c1d8d465b13c1faa92b4eae8071fefb5bdb501e8a886c8bb35a584b41bf6cfa7c62759a38fe374068613cecec9
-EBUILD gnustep-base-1.25.0.ebuild 1898 BLAKE2B 0729b8c6785906f253ac4238c27ca4f8d8bf23933bafd57db227355d3fa940c44a64941e09723bb8bc4803e09d6cb83881735c6645f55043f3bf8d8b6b53f8f4 SHA512 6607de4027ef9771cb31d676a25674df505ab5d99082d18cd6f0b54136ced56ea0660be83255223df6d77e6c8869eaa12e26e84ee84e5032a6c1f9a5a4fb1504
-EBUILD gnustep-base-1.25.1.ebuild 1898 BLAKE2B 4ba1e0639713300c8627c3c25b6684cb5c2286b30f118623a6217be2715006d2005c41bf43665fcd4cd7fcff6194762b11073afc391b47a897e58496a859d8f8 SHA512 b4758ae27ff9366dbcf85f228f29bd7f721cbdcab5c4a358e8f5b7ba0da19ac6cfc1cc2bd14c1be1d3d206323f0d46bd384d1ffcd33b3279e814e30df840960f
-MISC metadata.xml 763 BLAKE2B 471a69f26f594d1081fcd22568ca563d6a8a3fb37c6aeead77e91805de28d2c652d0ebc7a4d9364440008ed563a083eefd1e2c9311ef9f0e95152f8ff8a7c93e SHA512 1adb2cc47580c492a91b7593731b7cd8763cd3d2e45945229346afebc2840be93855e8f62158d59663a49c775e3482bf142a3ef52e087696f7bbc8bc429178b3
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
deleted file mode 100644
index 33bda7c7ebe8..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.24.9-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi libressl +ssl zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	ssl? (
-		gnutls? ( net-libs/gnutls )
-		!gnutls? (
-			!libressl? ( dev-libs/openssl:0= )
-			libressl? ( dev-libs/libressl:= )
-		)
-	)
-	icu? ( >=dev-libs/icu-4.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	if use ssl ; then
-		if use gnutls ; then
-			myconf="$myconf --enable-tls --disable-openssl"
-		else
-			myconf="$myconf --disable-tls --enable-openssl"
-		fi
-	else
-		myconf="$myconf --disable-tls --disable-openssl"
-	fi
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.25.0.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.25.0.ebuild
deleted file mode 100644
index c4443e1e8360..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.25.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	gnutls? ( net-libs/gnutls )
-	icu? ( >=dev-libs/icu-4.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	egnustep_env
-
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	myconf="$myconf $(use_enable gnutls tls)"
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
diff --git a/gnustep-base/gnustep-base/gnustep-base-1.25.1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.25.1.ebuild
deleted file mode 100644
index 997dca9002cb..000000000000
--- a/gnustep-base/gnustep-base/gnustep-base-1.25.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-base
-
-DESCRIPTION="A library of general-purpose, non-graphical Objective C objects"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="+gnutls +icu +libffi zeroconf"
-
-RDEPEND="${GNUSTEP_CORE_DEPEND}
-	>=gnustep-base/gnustep-make-2.6.0
-	gnutls? ( net-libs/gnutls )
-	icu? ( >=dev-libs/icu-4.0:= )
-	!libffi? ( dev-libs/ffcall
-		gnustep-base/gnustep-make[-native-exceptions] )
-	libffi? ( virtual/libffi )
-	>=dev-libs/libxml2-2.6
-	>=dev-libs/libxslt-1.1
-	>=dev-libs/gmp-4.1:=
-	>=sys-libs/zlib-1.2
-	zeroconf? ( net-dns/avahi )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	egnustep_env
-
-	local myconf
-	if use libffi ; then
-		myconf="--enable-libffi --disable-ffcall --with-ffi-include=$(pkg-config --variable=includedir libffi)"
-	else
-		myconf="--disable-libffi --enable-ffcall"
-	fi
-
-	myconf="$myconf $(use_enable gnutls tls)"
-	myconf="$myconf $(use_enable icu)"
-	myconf="$myconf $(use_enable zeroconf)"
-	myconf="$myconf --with-xml-prefix=${EPREFIX}/usr"
-	myconf="$myconf --with-gmp-include=${EPREFIX}/usr/include --with-gmp-library=${EPREFIX}/usr/lib"
-	myconf="$myconf --with-default-config=${EPREFIX}/etc/GNUstep/GNUstep.conf"
-
-	econf $myconf
-}
-
-src_install() {
-	# We need to set LD_LIBRARY_PATH because the doc generation program
-	# uses the gnustep-base libraries.  Since egnustep_env "cleans the
-	# environment" including our LD_LIBRARY_PATH, we're left no choice
-	# but doing it like this.
-
-	egnustep_env
-	egnustep_install
-
-	if use doc ; then
-		export LD_LIBRARY_PATH="${S}/Source/obj:${LD_LIBRARY_PATH}"
-		egnustep_doc
-	fi
-	egnustep_install_config
-}
diff --git a/gnustep-base/gnustep-base/metadata.xml b/gnustep-base/gnustep-base/metadata.xml
deleted file mode 100644
index b036c9f7a481..000000000000
--- a/gnustep-base/gnustep-base/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-The GNUstep Base Library is a library of general-purpose, non-graphical
-Objective C objects.  For example, it includes classes for strings,
-object collections, byte streams, typed coders, invocations,
-notifications, notification dispatchers, moments in time, network ports,
-remote object messaging support (distributed objects), and event loops.
-
-It provides functionality that aims to implement the non-graphical
-portion of the OpenStep standard (the Foundation library).
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-gui-0.25.0 b/gnustep-base/gnustep-gui-0.25.0
new file mode 100644
index 000000000000..b5bacd24856a
--- /dev/null
+++ b/gnustep-base/gnustep-gui-0.25.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+DESCRIPTION=Library of GUI classes written in Obj-C
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=cups gif icu jpeg png speech debug doc
+KEYWORDS=~alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.25.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=947833ba0736a8d4bb6f8b8ac21c38a2
diff --git a/gnustep-base/gnustep-gui-0.25.1 b/gnustep-base/gnustep-gui-0.25.1
new file mode 100644
index 000000000000..4fd5fd29b483
--- /dev/null
+++ b/gnustep-base/gnustep-gui-0.25.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+DESCRIPTION=Library of GUI classes written in Obj-C
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=cups gif icu jpeg png speech debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.24.9[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.25.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5d139aa74123fb61f53707d9487ba8d9
diff --git a/gnustep-base/gnustep-gui-0.26.2 b/gnustep-base/gnustep-gui-0.26.2
new file mode 100644
index 000000000000..974c11144f30
--- /dev/null
+++ b/gnustep-base/gnustep-gui-0.26.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.25.1[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+DESCRIPTION=Library of GUI classes written in Obj-C
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=cups gif icu jpeg png speech debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) app-text/aspell >=gnustep-base/gnustep-base-1.25.1[icu?] media-libs/audiofile >=media-libs/tiff-3:= x11-libs/libXt cups? ( >=net-print/cups-1.7.4:= ) gif? ( >=media-libs/giflib-4.1:= ) icu? ( dev-libs/icu:= ) jpeg? ( virtual/jpeg:= ) png? ( >=media-libs/libpng-1.2:= ) speech? ( app-accessibility/flite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-gui-0.26.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=1bffb887a912ca6101e0cbce56e058b3
diff --git a/gnustep-base/gnustep-gui/Manifest b/gnustep-base/gnustep-gui/Manifest
deleted file mode 100644
index 7cb97b5b382e..000000000000
--- a/gnustep-base/gnustep-gui/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST gnustep-gui-0.25.0.tar.gz 2882556 BLAKE2B 65ac762c5dcc0419d275f2418de695131f87df804350c93dfbcde3a33d7ddd3038b1a4a1fdef2a4b0bfce2a75d21b5b5b46b6837830d701884324ae3bd394b7d SHA512 568c0c9160febbd9bc563bfc7fbec024bc583a2d6ccfb54e527630f1e761a51f57f984a8b83f06cab97f85e3eec183386057fed2d551a383a16cecb60f102dc2
-DIST gnustep-gui-0.25.1.tar.gz 2888779 BLAKE2B 4d11442660b746e4667d3472dadebff93768254efbd8b7548230c5c0df6d4727d582e720ffbd61a5e79ca89735eb104ff7a88dede5932569b2c1d111a30540db SHA512 d69416c471d4f2fc9971e4aaddc5471b13854d00be6e03b78c3e89f9e7f90285c9024fc6992811296434d5dadf8ac02bcb69a1ceaa1c651461f83778165328e8
-DIST gnustep-gui-0.26.2.tar.gz 2860931 BLAKE2B f597901e3a8d3f2d9a334cdcb7f1c89d15555761dc6f99d80ae56bca3b2be553abbadc6f3616f98d45f50efe4accb7f8cd119aad1a5a7ad019572fbf0c65d9df SHA512 165106d96e933b101ca13cc8643c13626165cb2a49794b34a0e898b288c24b9c7e68115362bd363518f0abf2b21341a0746e2d331f320ab0a0685209f3406800
-EBUILD gnustep-gui-0.25.0.ebuild 1344 BLAKE2B 6568823d327771acc64d4861bc0502f429a02b0bef419d619090e1a52d5131066218a69d17f9114e72ca1a9371a2adba15471af61662083c1bf41c5f48444e8c SHA512 700179d830a7584ea9882163c936a15cfef4f72ec69303d4e867ff415c7d1aa7d38700cc19579e9b3622861824825faec419b2373d877f63db23ac85d7540bfd
-EBUILD gnustep-gui-0.25.1.ebuild 1348 BLAKE2B d7b36aaa47ae8d816bfa7c2a0f46aa30ddae9d00a1017b02cb287b68e37dd5bc38891ff2cb5558dccfcf050ac5cb39f2af61939b82fe9ff88900d566ec65c320 SHA512 838eefe948c7d73ceed6f64984d2d4e14758e4172aac9a587a88fbba909e591ef95cc05d5d95e1494629e99a782c5e93cb04c47bc46cd2f061c6380ac339a33e
-EBUILD gnustep-gui-0.26.2.ebuild 1348 BLAKE2B 9d7cd725f72f8cc70ef17fb6f3e427d25bc79134059f608a3f827d5e4ac99a59511a3e31550238470f1b1ecf72a057b136937d364556a5551274442dd13a6b69 SHA512 231447c67b5048a66ba9c1f05e3180a50f4f7d3bdb60954009b5fbed9bf1b3ea87cffd7dd2eedb9b9825773a0bfdd078d081e07e6d8acf1c305a77f58e5d5fdd
-MISC metadata.xml 1544 BLAKE2B 1a590eccc9a65316966873ab9517de3798d31ffbcc19ac864665a6f96289e8483e9b05cd38d32a611de6bcafedc205ef8616214632368ba7a15e2a7793f461d6 SHA512 1c7a16c090c18044752d1033f1884b4ac49ced4f0cc97903b9c3a0b037f06072e291a9d02fd4855682233196b120b60344fedf978049a29ef9c44f0546beea4e
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.25.0.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.25.0.ebuild
deleted file mode 100644
index b761a2ce1839..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.25.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base multilib
-
-DESCRIPTION="Library of GUI classes written in Obj-C"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cups gif icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	app-text/aspell
-	>=gnustep-base/gnustep-base-1.24.9[icu?]
-	media-libs/audiofile
-	>=media-libs/tiff-3:=
-	x11-libs/libXt
-	cups? ( >=net-print/cups-1.7.4:= )
-	gif? ( >=media-libs/giflib-4.1:= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	speech? ( app-accessibility/flite )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	gnustep-base_src_prepare
-
-	# remove hardcoded -g -Werror, bug #378179
-	sed -i -e 's/-g -Werror//' \
-		Tools/say/GNUmakefile \
-		Tools/speech/GNUmakefile \
-		|| die
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf=
-	use gif && myconf="--disable-ungif --enable-libgif"
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable icu) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable speech) \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild
deleted file mode 100644
index 6fc6b5e6daf5..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.25.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base multilib
-
-DESCRIPTION="Library of GUI classes written in Obj-C"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cups gif icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	app-text/aspell
-	>=gnustep-base/gnustep-base-1.24.9[icu?]
-	media-libs/audiofile
-	>=media-libs/tiff-3:=
-	x11-libs/libXt
-	cups? ( >=net-print/cups-1.7.4:= )
-	gif? ( >=media-libs/giflib-4.1:= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	speech? ( app-accessibility/flite )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	gnustep-base_src_prepare
-
-	# remove hardcoded -g -Werror, bug #378179
-	sed -i -e 's/-g -Werror//' \
-		Tools/say/GNUmakefile \
-		Tools/speech/GNUmakefile \
-		|| die
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf=
-	use gif && myconf="--disable-ungif --enable-libgif"
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable icu) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable speech) \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
diff --git a/gnustep-base/gnustep-gui/gnustep-gui-0.26.2.ebuild b/gnustep-base/gnustep-gui/gnustep-gui-0.26.2.ebuild
deleted file mode 100644
index 73bb0ab26e64..000000000000
--- a/gnustep-base/gnustep-gui/gnustep-gui-0.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base multilib
-
-DESCRIPTION="Library of GUI classes written in Obj-C"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cups gif icu jpeg png speech"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	app-text/aspell
-	>=gnustep-base/gnustep-base-1.25.1[icu?]
-	media-libs/audiofile
-	>=media-libs/tiff-3:=
-	x11-libs/libXt
-	cups? ( >=net-print/cups-1.7.4:= )
-	gif? ( >=media-libs/giflib-4.1:= )
-	icu? ( dev-libs/icu:= )
-	jpeg? ( virtual/jpeg:= )
-	png? ( >=media-libs/libpng-1.2:= )
-	speech? ( app-accessibility/flite )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	gnustep-base_src_prepare
-
-	# remove hardcoded -g -Werror, bug #378179
-	sed -i -e 's/-g -Werror//' \
-		Tools/say/GNUmakefile \
-		Tools/speech/GNUmakefile \
-		|| die
-}
-
-src_configure() {
-	egnustep_env
-
-	local myconf=
-	use gif && myconf="--disable-ungif --enable-libgif"
-
-	econf \
-		$(use_enable cups) \
-		$(use_enable icu) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable speech) \
-		--with-tiff-include="${EPREFIX}"/usr/include \
-		--with-tiff-library="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
diff --git a/gnustep-base/gnustep-gui/metadata.xml b/gnustep-base/gnustep-gui/metadata.xml
deleted file mode 100644
index 4317e4f815c3..000000000000
--- a/gnustep-base/gnustep-gui/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<use>
-	<flag name="speech">Audio support using <pkg>app-accessibility/flite</pkg></flag>
-</use>
-<longdescription>
-It is a library of graphical user interface classes written completely
-in the Objective-C language; the classes are based upon the OpenStep
-specification as release by NeXT Software, Inc.  The library has been
-enhanced in a number of ways to take advantage of the GNU system.
-These classes include graphical objects such as buttons, text fields,
-popup lists, browser lists, and windows; there are also many associated
-classes for handling events, colors, fonts, pasteboards and images.
-
-The GNUstep GUI Library is designed in two parts.  The first part is
-the front-end component which is independent of platform and display
-system.  This front-end is combined with a back-end component which
-handles all of the display system dependent such as specific calls to
-X/Windows.  This design allows the GNUstep applications to have the
-"look and feel" of the underlying display system without any changes to
-the application, and the library can be easily ported to other display
-systems.
-
-The GNUstep GUI Library requires the GNU Objective-C compiler, the
-GNUstep Base Library, the TIFF Graphics library, and a back-end
-component like the GNUstep 'Back' Backend.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-make-2.6.8 b/gnustep-base/gnustep-make-2.6.8
new file mode 100644
index 000000000000..e8394029db0e
--- /dev/null
+++ b/gnustep-base/gnustep-make-2.6.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+DESCRIPTION=GNUstep Makefile Package
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=libobjc2 native-exceptions debug doc
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.6.8.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=50cc2b54fb8d1063c2aa5ecd59f1692f
diff --git a/gnustep-base/gnustep-make-2.7.0 b/gnustep-base/gnustep-make-2.7.0
new file mode 100644
index 000000000000..534a219802eb
--- /dev/null
+++ b/gnustep-base/gnustep-make-2.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+DESCRIPTION=GNUstep Makefile Package
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=libobjc2 native-exceptions debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=doc? ( virtual/texi2dvi dev-tex/latex2html app-text/texi2html ) >=sys-devel/make-3.75 libobjc2? ( gnustep-base/libobjc2 sys-devel/clang ) !libobjc2? ( !!gnustep-base/libobjc2 || ( >=sys-devel/gcc-3.3[objc] sys-devel/clang ) )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-2.7.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=466a28387d2642a7b76e6aad39b0fcfe
diff --git a/gnustep-base/gnustep-make/Manifest b/gnustep-base/gnustep-make/Manifest
deleted file mode 100644
index db96eff17853..000000000000
--- a/gnustep-base/gnustep-make/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX gnustep-5.csh 348 BLAKE2B 5a53bd83fffbba5db434c90c1b527cf32697b87ad51bf4abdaf09a843a211c4c52b81c2d2d65772847f1d5eb16e82a2561b6d24fde1efb7709766315261e8a9c SHA512 6345bd8559ead4e8433f9e7d3f85412b4cd155188a8daffb6c99c00257c1a5af89fd492fde53e819b887be19f4ebbdb09ae74428fe492c39256a6b476f073209
-AUX gnustep-5.sh 359 BLAKE2B 2df675c570e6343b3303cb3c82e0eb6c6fe60f842fe61297b147acca485df93b8a5a5ecc235b0e3a9854c0fb25cb06c2fcac34ee75933157fc8c230ac94ca843 SHA512 ceb39b583e7583bc6715723878eff1c06685b4786c9607f3ef581ef230a755efd80c7b18202458d4af54bac01c0ff2f5cec443d8c87639c6cdffc7604bb07700
-DIST gnustep-make-2.6.8.tar.gz 592266 BLAKE2B 12ad6d1b27f3280f99c55d78a899983527620fbb6ec9a7d70bd71917e0d615e62d4930ceb39c3ea3d340749896226a528d18d322629e05cba3a6f636be4b0a47 SHA512 1df6757cd1e0dbca3eb6e4ad4346406799ebb2782f5853014cc3b1e8ae47056026e6c5cd43e5671c8802232444602fde164dde352c15b4e0d64bdfdea06bd8a0
-DIST gnustep-make-2.7.0.tar.gz 596399 BLAKE2B 85c23795bbaaa7ca3a2166d96a1bc6be3506501721ee5bee4fa8513c490affabce7d4f60a13ba3b33f642c73f08afb4e30ba48da4d1b3bcfd17df3ec9b85b8b6 SHA512 7a39c2c79f01c3a93607bba71ef8c482d0610541ebcb3d0ffce6c1a104a74646329d18255a8bd183ccf54f37018e4d6b4a9d8adf419e2cdea29b35c89e81d9a2
-EBUILD gnustep-make-2.6.8.ebuild 3791 BLAKE2B 9ad51d1b31b01aad1b06a0292a744aca86fa1cfd34461e801948a59cca294057e5d92ba7df63eb5404aec0fda03e0bf1b506a4fb40a805ca3a95dd01b6843a4e SHA512 42d7571285d9e9507248a4d46dbeb4d5d17a52bd6fedd015800c239c4026fc1433c3724d7662a3c9df4b82855319f2a85705f3cdc35bacb84cfaece504875a52
-EBUILD gnustep-make-2.7.0.ebuild 3796 BLAKE2B b16ebf072f7ea1ac88bf916f75081a0f89ecab31c7cd0751d1025e27f669f859dd8ae82520970bdc9414638635a01be47cc97d26945d1f8983bd26ecb18b0551 SHA512 cf9ff5bad0bf4f58293f3872d24a71aa0aa4af53a2e9f0a33b176f18d59b2fe718316796515cc394d2cececdaf7004e022931a365e5bec81be21598bad550361
-MISC metadata.xml 991 BLAKE2B 757d5e30738a28bb29dad429845961458f9c66fc4f081504ae72a4e32da2f7a776bdd55e166a3346a4ae7d74cdb452e31dafd74ac466dfc3d7226978b0a7ca6c SHA512 3167eb855a813fa42c61c74fdd4aab284a1273b97d20783afcebd952df53577c4f644917ef0182f1fe436c1aa6e81461fcde315b2b5a45f1dc26110fa411fe27
diff --git a/gnustep-base/gnustep-make/files/gnustep-5.csh b/gnustep-base/gnustep-make/files/gnustep-5.csh
deleted file mode 100644
index 4b7102094187..000000000000
--- a/gnustep-base/gnustep-make/files/gnustep-5.csh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env csh
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Test for an interactive shell
-if ( $?prompt ) then
-	setenv GNUSTEP_SYSTEM_TOOLS "@GENTOO_PORTAGE_EPREFIX@"/usr/bin
-
-	if ( -x $GNUSTEP_SYSTEM_TOOLS/make_services ) then
-		$GNUSTEP_SYSTEM_TOOLS/make_services
-	endif
-endif
diff --git a/gnustep-base/gnustep-make/files/gnustep-5.sh b/gnustep-base/gnustep-make/files/gnustep-5.sh
deleted file mode 100644
index f5e07549cff8..000000000000
--- a/gnustep-base/gnustep-make/files/gnustep-5.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env sh
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Test for an interactive shell
-case $- in
-	*i*)
-	;;
-	*)
-		return
-	;;
-esac
-	
-GNUSTEP_SYSTEM_TOOLS="@GENTOO_PORTAGE_EPREFIX@"/usr/bin
-
-if [ -x ${GNUSTEP_SYSTEM_TOOLS}/make_services ]; then
-    ${GNUSTEP_SYSTEM_TOOLS}/make_services
-fi
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
deleted file mode 100644
index 414a690bff16..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.6.8.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base prefix toolchain-funcs
-
-DESCRIPTION="GNUstep Makefile Package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libobjc2 native-exceptions"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	libobjc2? ( gnustep-base/libobjc2
-		sys-devel/clang )
-	!libobjc2? ( !!gnustep-base/libobjc2
-		|| (
-			>=sys-devel/gcc-3.3[objc]
-			sys-devel/clang
-		) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Determine libobjc.so to use
-	if use libobjc2; then
-		libobjc_version=libobjc.so.4
-	else
-		# Find version in active gcc
-		for ver in {2..5};
-		do
-			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x objective-c \
-				- <<<$'int main() {}' -o /dev/null 2> /dev/null;
-			then
-				libobjc_version=libobjc.so.${ver}
-			fi
-		done
-	fi
-
-	# Stop if we could not get libobjc.so
-	if [[ -z ${libobjc_version} ]]; then
-		eerror "${P} requires a working Objective-C runtime and a compiler with"
-		eerror "Objective-C support. Your current settings lack these requirements"
-		if ! use libobjc2;
-		then
-			eerror "Please switch your active compiler to gcc with USE=objc, or clang"
-		fi
-		die "Could not find Objective-C runtime"
-	fi
-
-	# For existing installations, determine if we will use another libobjc.so
-	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
-		# Old installations did not set this explicitely
-		: ${current_libobjc:=libobjc.so.2}
-
-		if [[ ${current_libobjc} != ${libobjc_version} ]]; then
-			ewarn "Warning: changed libobjc.so version!!"
-			ewarn "The libobjc.so version used for gnustep-make has changed"
-			ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
-			ewarn "You must rebuild all gnustep packages installed."
-			ewarn ""
-			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
-			ewarn "# gnustep-updater -l"
-		fi
-	fi
-
-	if use libobjc2; then
-		export CC=clang
-	fi
-}
-
-src_prepare() {
-	# Multilib-strict
-	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
-	cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
-	eprefixify "${T}"/gnustep-5.{csh,sh}
-
-	default
-}
-
-src_configure() {
-	#--enable-objc-nonfragile-abi: only working in clang for now
-	econf \
-		INSTALL="${EPREFIX}"/usr/bin/install \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		--with-objc-lib-flag=-l:${libobjc_version} \
-		$(use_enable libobjc2 objc-nonfragile-abi) \
-		$(use_enable native-exceptions native-objc-exceptions)
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		emake -C Documentation
-	fi
-}
-
-src_install() {
-	# Get GNUSTEP_* variables
-	. ./GNUstep.conf
-
-	local make_eval
-	use debug || make_eval="${make_eval} debug=no"
-	make_eval="${make_eval} verbose=yes"
-
-	emake ${make_eval} DESTDIR="${D}" install
-
-	# Copy the documentation
-	if use doc ; then
-		emake -C Documentation ${make_eval} DESTDIR="${D}" install
-	fi
-
-	dodoc FAQ README RELEASENOTES
-
-	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-?.sh
-	doexe "${T}"/gnustep-?.csh
-}
-
-pkg_postinst() {
-	# Warn about new layout if old GNUstep directory is still here
-	if [ -e /usr/GNUstep/System ]; then
-		ewarn "Old layout directory detected (/usr/GNUstep/System)"
-		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
-		ewarn "You must first update the configuration files from this package,"
-		ewarn "then remerge all packages still installed with the old layout"
-		ewarn "You can use gnustep-base/gnustep-updater for this task"
-	fi
-}
diff --git a/gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild b/gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild
deleted file mode 100644
index 0ba4fc2bebf3..000000000000
--- a/gnustep-base/gnustep-make/gnustep-make-2.7.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base prefix toolchain-funcs
-
-DESCRIPTION="GNUstep Makefile Package"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/core/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="libobjc2 native-exceptions"
-
-DEPEND="${GNUSTEP_CORE_DEPEND}
-	>=sys-devel/make-3.75
-	libobjc2? ( gnustep-base/libobjc2
-		sys-devel/clang )
-	!libobjc2? ( !!gnustep-base/libobjc2
-		|| (
-			>=sys-devel/gcc-3.3[objc]
-			sys-devel/clang
-		) )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# Determine libobjc.so to use
-	if use libobjc2; then
-		libobjc_version=libobjc.so.4
-	else
-		# Find version in active gcc
-		for ver in {2..5};
-		do
-			if $(tc-getCC) -Werror -Wl,-l:libobjc.so.${ver} -x objective-c \
-				- <<<$'int main() {}' -o /dev/null 2> /dev/null;
-			then
-				libobjc_version=libobjc.so.${ver}
-			fi
-		done
-	fi
-
-	# Stop if we could not get libobjc.so
-	if [[ -z ${libobjc_version} ]]; then
-		eerror "${P} requires a working Objective-C runtime and a compiler with"
-		eerror "Objective-C support. Your current settings lack these requirements"
-		if ! use libobjc2;
-		then
-			eerror "Please switch your active compiler to gcc with USE=objc, or clang"
-		fi
-		die "Could not find Objective-C runtime"
-	fi
-
-	# For existing installations, determine if we will use another libobjc.so
-	if has_version gnustep-base/gnustep-make; then
-		local current_libobjc="$(awk -F: '/^OBJC_LIB_FLAG/ {print $2}' ${EPREFIX}/usr/share/GNUstep/Makefiles/config.make)"
-		# Old installations did not set this explicitely
-		: ${current_libobjc:=libobjc.so.2}
-
-		if [[ ${current_libobjc} != ${libobjc_version} ]]; then
-			ewarn "Warning: changed libobjc.so version!!"
-			ewarn "The libobjc.so version used for gnustep-make has changed"
-			ewarn "(either by the libojbc2 use-flag or a GCC upgrade)"
-			ewarn "You must rebuild all gnustep packages installed."
-			ewarn ""
-			ewarn "To do so, please emerge gnustep-base/gnustep-updater and run:"
-			ewarn "# gnustep-updater -l"
-		fi
-	fi
-
-	if use libobjc2; then
-		export CC=clang
-	fi
-}
-
-src_prepare() {
-	# Multilib-strict
-	sed -e "s#/lib#/$(get_libdir)#" -i FilesystemLayouts/fhs-system || die "sed failed"
-	cp "${FILESDIR}"/gnustep-5.{csh,sh} "${T}"/
-	eprefixify "${T}"/gnustep-5.{csh,sh}
-
-	default
-}
-
-src_configure() {
-	#--enable-objc-nonfragile-abi: only working in clang for now
-	econf \
-		INSTALL="${EPREFIX}"/usr/bin/install \
-		--with-layout=fhs-system \
-		--with-config-file="${EPREFIX}"/etc/GNUstep/GNUstep.conf \
-		--with-objc-lib-flag=-l:${libobjc_version} \
-		$(use_enable libobjc2 objc-nonfragile-abi) \
-		$(use_enable native-exceptions native-objc-exceptions)
-}
-
-src_compile() {
-	emake
-	if use doc ; then
-		emake -C Documentation
-	fi
-}
-
-src_install() {
-	# Get GNUSTEP_* variables
-	. ./GNUstep.conf
-
-	local make_eval
-	use debug || make_eval="${make_eval} debug=no"
-	make_eval="${make_eval} verbose=yes"
-
-	emake ${make_eval} DESTDIR="${D}" install
-
-	# Copy the documentation
-	if use doc ; then
-		emake -C Documentation ${make_eval} DESTDIR="${D}" install
-	fi
-
-	dodoc FAQ README RELEASENOTES
-
-	exeinto /etc/profile.d
-	doexe "${T}"/gnustep-?.sh
-	doexe "${T}"/gnustep-?.csh
-}
-
-pkg_postinst() {
-	# Warn about new layout if old GNUstep directory is still here
-	if [ -e /usr/GNUstep/System ]; then
-		ewarn "Old layout directory detected (/usr/GNUstep/System)"
-		ewarn "Gentoo has switched to FHS layout for GNUstep packages"
-		ewarn "You must first update the configuration files from this package,"
-		ewarn "then remerge all packages still installed with the old layout"
-		ewarn "You can use gnustep-base/gnustep-updater for this task"
-	fi
-}
diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
deleted file mode 100644
index b8baaa59a863..000000000000
--- a/gnustep-base/gnustep-make/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-The makefile package is a simple, powerful and extensible way to write
-makefiles for a GNUstep-based project.  It allows the user to write a
-project without having to deal with the complex issues associated with
-configuration, building, installation, and packaging.  It also allows
-the user to easily create cross-compiled binaries.
-</longdescription>
-<use>
-	<flag name="libobjc2">Enables use of the GNUstep Objective-C runtime (<pkg>gnustep-base/libobjc2</pkg>) with non-fragile ABI and <pkg>sys-devel/clang</pkg> compiler</flag>
-	<flag name="native-exceptions">Enables use of the native Objective-C exception support (@try/@catch/@finally) built-in objective-c exceptions with compilers that support it </flag>
-</use>
-</pkgmetadata>
diff --git a/gnustep-base/gnustep-updater-0.2 b/gnustep-base/gnustep-updater-0.2
new file mode 100644
index 000000000000..81ec012ee49b
--- /dev/null
+++ b/gnustep-base/gnustep-updater-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-shells/bash
+DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
+EAPI=4
+HOMEPAGE=https://www.gentoo.org
+KEYWORDS=~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.2.tar.bz2
+_md5_=5adc7236593c6b6a89b0eb98090370a2
diff --git a/gnustep-base/gnustep-updater-0.3 b/gnustep-base/gnustep-updater-0.3
new file mode 100644
index 000000000000..055ebeff2b6d
--- /dev/null
+++ b/gnustep-base/gnustep-updater-0.3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=app-shells/bash
+DESCRIPTION=Helper tool to upgrade Gentoo GNUstep installations
+EAPI=4
+HOMEPAGE=https://www.gentoo.org
+KEYWORDS=~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=app-shells/bash app-misc/pax-utils >=gnustep-base/gnustep-make-2.6.0
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~voyageur/distfiles/gnustep-updater-0.3.tar.bz2
+_md5_=56eb250cdf6686901369fab4202a1e47
diff --git a/gnustep-base/gnustep-updater/Manifest b/gnustep-base/gnustep-updater/Manifest
deleted file mode 100644
index 465dfe2ec985..000000000000
--- a/gnustep-base/gnustep-updater/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST gnustep-updater-0.2.tar.bz2 3523 BLAKE2B 781f5e090f1dc2aec8c477017066ec8b5dfd00d228329506fb27ecbb5da6cdd7fcda2468ddf879ede910c2d8b329326e1bd87e578b6cbf990c0e70c145840cc8 SHA512 8e543a42bc68b6cf57e59987822528ab23067632f54b6277be7e8723aa24bd10556d75aac88f474e811b491e55b0882b84eb392972d58ed69bfc22011bdf575e
-DIST gnustep-updater-0.3.tar.bz2 3685 BLAKE2B df4d4e54243e0ffaa2ba28c71eefb7107b1cec59574f69ba4587a76a759d33d68c4d06250160b97814ef2c00e6e628664c30c760ad1fc3c9ac0c035451b5520a SHA512 079b51c54a7860c4eea65ffc63172ea69e88de4a34f2ca0d0c5ad3a1342ea37ee69edb107f287f04d33c3ee03658edd5386d1323f47e9bc201bc70d68d0c9c4b
-EBUILD gnustep-updater-0.2.ebuild 591 BLAKE2B bc5779fcb6c792582a50885222b498d8663ab56cbdf45c633531311e0f384dfcb39978e3fd37dddc573a0eb33ca8faaa19d99af5e89e9bee31c890257921340d SHA512 d33f4b2e91caf735461c266d8a2cea4ff6d3aae33f325c7997ef7853aeda611c3583afeb40d677ef5f7d85ea072826e41264e3488b66e00d2e0a6adbd8796198
-EBUILD gnustep-updater-0.3.ebuild 592 BLAKE2B 41cc7d8838b95d604edecca5665b6aec9dd4d86998de5fc6410e6ecd0bee60fa2a0304e8206b13b69a7b610288ab514fa5d77420988e2c87adb95970b629e912 SHA512 cf7d5d8189c66d80d527af90508980c3d79eec395a211c3db215b8c82ea9382e317223f386bc1fc95acfc3a743975e82e312e7a2a5f12effb7b652546a1617f5
-MISC metadata.xml 391 BLAKE2B bd0dd26138078e5a04f3a55ee560af0a2ac353c47af2d043ca28cdc55912d0445925f7a0b3691a13a2eca1735ae00573ba7c8d6b4c210b5217451c743e5d782e SHA512 3f5fbaa301d779e176d67686228b59a3130197055577bbfb2c15703ed63b5f8c40f7edadfd0cc06ae1e08d320161fcc399af4e3886b127e40ec562ecc19a0b0c
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
deleted file mode 100644
index acdb6f8c3ab9..000000000000
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	>=gnustep-base/gnustep-make-2.6.0"
-
-src_install() {
-	dosbin gnustep-updater
-	doman gnustep-updater.1
-}
diff --git a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild b/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
deleted file mode 100644
index b64bbf5e8a64..000000000000
--- a/gnustep-base/gnustep-updater/gnustep-updater-0.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Helper tool to upgrade Gentoo GNUstep installations"
-HOMEPAGE="https://www.gentoo.org"
-SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-shells/bash"
-RDEPEND="${DEPEND}
-	app-misc/pax-utils
-	>=gnustep-base/gnustep-make-2.6.0"
-
-src_install() {
-	dosbin gnustep-updater
-	doman gnustep-updater.1
-}
diff --git a/gnustep-base/gnustep-updater/metadata.xml b/gnustep-base/gnustep-updater/metadata.xml
deleted file mode 100644
index b01c639deaa1..000000000000
--- a/gnustep-base/gnustep-updater/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>Helper tool to upgrade Gentoo GNUstep installations, after
-		the switch to FHS layout for example</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/libobjc2-1.8 b/gnustep-base/libobjc2-1.8
new file mode 100644
index 000000000000..6b70b5110691
--- /dev/null
+++ b/gnustep-base/libobjc2-1.8
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/clang-2.9 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNUstep Objective-C runtime
+EAPI=5
+HOMEPAGE=http://www.gnustep.org
+IUSE=boehm-gc cxx test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
+SLOT=0
+SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.tar.gz -> libobjc2-1.8.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_=dd20671afc6bf5e7d3e7083e21d0819c
diff --git a/gnustep-base/libobjc2-1.8.1 b/gnustep-base/libobjc2-1.8.1
new file mode 100644
index 000000000000..967c6364788d
--- /dev/null
+++ b/gnustep-base/libobjc2-1.8.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=sys-devel/clang-2.9 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNUstep Objective-C runtime
+EAPI=5
+HOMEPAGE=http://www.gnustep.org
+IUSE=boehm-gc cxx test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=boehm-gc? ( dev-libs/boehm-gc ) cxx? ( sys-libs/libcxx )
+SLOT=0
+SRC_URI=https://github.com/gnustep/libobjc2/archive/v1.8.1.tar.gz -> libobjc2-1.8.1.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_=dd20671afc6bf5e7d3e7083e21d0819c
diff --git a/gnustep-base/libobjc2/Manifest b/gnustep-base/libobjc2/Manifest
deleted file mode 100644
index dcbe88c07f23..000000000000
--- a/gnustep-base/libobjc2/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libobjc2-1.7-fix_soname.patch 1827 BLAKE2B fa716ca39eaa0cb78214922ed5bfac139d1ba1f510791938ffcbad2c1a5c096b04056cda1f25baf3ade2b37d0757516c14a9ac2c77684438852ddf38b11d9e09 SHA512 d6ce4a6840e7f3ea22db3f63574a08fe9fad2fd3ebeaac764097935b322f038baa4ec9d0f19124dd84cb6ffe010e267bdb60f76f5d24dd508f520bdb38124ead
-DIST libobjc2-1.8.1.tar.gz 173635 BLAKE2B 1ed9df6ee934a56dd8565904f9a402f5687bac6f876bcef538fed60c4ebd34af8f35921bdabbdf1ad97fb371e591aea3e47170afaffe65056af07c88e01f0b37 SHA512 518f36e96a82a076fc67fe384226bd97310cd10a53c7b0951db9f3658aa534582b245d5cb97956fe91c38338c3fc8f1e569dd8af36f6d12e32bf1460251d02eb
-DIST libobjc2-1.8.tar.gz 173512 BLAKE2B ba494dd2db2bfdcc2cfce906014d75146368f049ebe4ea6b83024705af2b78f916252a084b95be43c245c5fd6574d00db75853d291193ea70cc48a6b5dbeab93 SHA512 1562e42dc43a24c1655d02db7aa101a48a7b026bec23252c8eec3893fbac0d67368685291df0954ee79f07b92ecc13c68ee7c7b0f351428a31e99ed05ed2230d
-EBUILD libobjc2-1.8.1.ebuild 967 BLAKE2B 2a889a88c29b8442f65361cbfbbc1bf2cda8323685ef3fa8c9643e46e34d523f1bafa4a663a9565426973c87c07cbb4d8e14ff0b10a46dab5c83c280ee8717ac SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20
-EBUILD libobjc2-1.8.ebuild 967 BLAKE2B 2a889a88c29b8442f65361cbfbbc1bf2cda8323685ef3fa8c9643e46e34d523f1bafa4a663a9565426973c87c07cbb4d8e14ff0b10a46dab5c83c280ee8717ac SHA512 d7118b2b81816fd965251a3d19e246b1b6393c6f3fc8b83772dae17e3a61ea9be39f9714e8c4fbb26f861fafdb7f677bf8728a36cd4eaf252650b6c8a4f9ef20
-MISC metadata.xml 1348 BLAKE2B b5eec1f6af50d0a90d62c6dce21fe14b6c20ec7d534ac49030bbc89bb2f5665af7d40750386f84d3aedb67802807e25ad04f824c7b6908e41a3de256c07dead3 SHA512 5adcc9a3d5527c5e86da2ae7884f334d68ebd884b26e9f0d3329af7c877921c90bef4f77d8c535c82102e3bacb5a199e5fd940471036004f66858850040ee936
diff --git a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch b/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
deleted file mode 100644
index ba1aa8ecea91..000000000000
--- a/gnustep-base/libobjc2/files/libobjc2-1.7-fix_soname.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur libobjc2-1.7.orig/CMakeLists.txt libobjc2-1.7/CMakeLists.txt
---- libobjc2-1.7.orig/CMakeLists.txt	2013-06-27 13:30:41.000000000 +0200
-+++ libobjc2-1.7/CMakeLists.txt	2015-05-20 13:20:55.214244088 +0200
-@@ -8,7 +8,8 @@
- set(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS_RELEASE}")
- set(CMAKE_C_FLAGS "-std=gnu99 ${CMAKE_C_FLAGS}")
- 
--set(libobjc_VERSION 4.6)
-+set(libobjc_SOVERSION 4)
-+set(libobjc_VERSION 4.6.0)
- 
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexceptions")
- # Build configuration
-@@ -204,7 +205,8 @@
- 			add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 			set_target_properties(objcxx PROPERTIES
- 				LINKER_LANGUAGE C
--				SOVERSION ${libobjc_VERSION}
-+            SOVERSION ${libobjc_SOVERSION}
-+            VERSION ${libobjc_VERSION}
- 				)
- 			target_link_libraries(objcxx ${CXX_RUNTIME})
- 			set(CXX_RUNTIME "")
-@@ -220,7 +222,8 @@
- 		add_library(objcxx SHARED ${libobjcxx_CXX_SRCS})
- 		set_target_properties(objcxx PROPERTIES
- 			LINKER_LANGUAGE C
--			SOVERSION ${libobjc_VERSION}
-+         SOVERSION ${libobjc_SOVERSION}
-+         VERSION ${libobjc_VERSION}
- 			)
- 		set(CXX_RUNTIME "")
- 		list(APPEND INSTALL_TARGETS objcxx)
-@@ -241,7 +244,8 @@
- 
- set_target_properties(objc PROPERTIES
- 	LINKER_LANGUAGE C
--	SOVERSION ${libobjc_VERSION}
-+   SOVERSION ${libobjc_SOVERSION}
-+   VERSION ${libobjc_VERSION}
- 	OUTPUT_NAME ${LIBOBJC_NAME}
- 	LINK_FLAGS "${objc_LINK_FLAGS}"
- 	)
-@@ -349,3 +353,14 @@
- 	add_subdirectory(Test)
- endif (TESTS)
- 
-+
-+MESSAGE(STATUS "<<< Gentoo configuration >>>
-+Build type      ${CMAKE_BUILD_TYPE}
-+Install path    ${CMAKE_INSTALL_PREFIX}
-+Compiler flags:
-+C               ${CMAKE_C_FLAGS}
-+C++             ${CMAKE_CXX_FLAGS}
-+Linker flags:
-+Executable      ${CMAKE_EXE_LINKER_FLAGS}
-+Module          ${CMAKE_MODULE_LINKER_FLAGS}
-+Shared          ${CMAKE_SHARED_LINKER_FLAGS}\n")
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
deleted file mode 100644
index a6d1aa123871..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/gnustep-base/libobjc2/libobjc2-1.8.ebuild b/gnustep-base/libobjc2/libobjc2-1.8.ebuild
deleted file mode 100644
index a6d1aa123871..000000000000
--- a/gnustep-base/libobjc2/libobjc2-1.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils eutils
-
-DESCRIPTION="GNUstep Objective-C runtime"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="https://github.com/gnustep/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boehm-gc cxx test"
-
-RDEPEND="boehm-gc? ( dev-libs/boehm-gc )
-	cxx? ( sys-libs/libcxx )"
-DEPEND="${DEPEND}
-	>=sys-devel/clang-2.9"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.7-fix_soname.patch )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use cxx;
-	then
-		sed -e 's/addtest_flags(CXXExceptions.*//' \
-			-i Test/CMakeLists.txt || die "test sed failed"
-	fi
-}
-
-src_configure() {
-	export CC=clang
-	export CXX=clang++
-
-	local mycmakeargs=(
-		-DGNUSTEP_CONFIG=GNUSTEP_CONFIG-NOTFOUND
-		$(cmake-utils_use boehm-gc BOEHM_GC)
-		$(cmake-utils_use_enable cxx OBJCXX)
-		$(cmake-utils_use test TESTS)
-	)
-	cmake-utils_src_configure
-}
diff --git a/gnustep-base/libobjc2/metadata.xml b/gnustep-base/libobjc2/metadata.xml
deleted file mode 100644
index b347a3b63481..000000000000
--- a/gnustep-base/libobjc2/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-		The GNUstep Objective-C runtime is designed as a drop-in replacement for the
-		GCC runtime.  It supports both a legacy and a modern ABI, allowing code
-		compiled with old versions of GCC to be supported without requiring
-		recompilation.  The modern ABI adds the following features:
-		- Non-fragile instance variables.
-		- Protocol uniquing.
-		- Object planes support.
-		- Declared property introspection.
-
-		Both ABIs support the following feature above and beyond the GCC runtime:
-		- The modern Objective-C runtime APIs, introduced with OS X 10.5.
-		- Blocks (closures).
-		- Low memory profile for platforms where memory usage is more important than speed.
-		- Synthesised property accessors.
-		- Efficient support for @synchronized()
-		- Type-dependent dispatch, eliminating stack corruption from mismatched selectors.
-	</longdescription>
-	<use>
-		<flag name="boehm-gc">Enable Hans Boehm's garbage collector
-		(<pkg>dev-libs/boehm-gc</pkg>). Not recommended by upstream</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">gnustep/libobjc2</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-base/metadata.xml b/gnustep-base/metadata.xml
deleted file mode 100644
index cdf763f14e4c..000000000000
--- a/gnustep-base/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The gnustep-base category contains GNUstep base packages.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnustep-base enthält die Basispakete der
-		GNUstep-Umgebung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría gnustep-base contiene los paquetes base de GNUstep.
-	</longdescription>
-	<longdescription lang="ja">
-		gnustep-baseカテゴリーにはGNUstepのベース・パッケージが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De gnustep-base categorie bevat de basispakketten van GNUstep.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnustep-base chứa các ứng dụng GNUstep cơ bản.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnustep-base contiene i pacchetti base di GNUstep.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnustep-base contém os pacotes de base de GNUstep.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnustep-base zawiera podstawowe pakiety GNUstep.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnustep-base/mknfonts-0.5-r2 b/gnustep-base/mknfonts-0.5-r2
new file mode 100644
index 000000000000..b2d7d2fb9fd8
--- /dev/null
+++ b/gnustep-base/mknfonts-0.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+DESCRIPTION=A tool to create .nfont packages for use with gnustep-back-art
+EAPI=6
+HOMEPAGE=https://packages.debian.org/mknfonts.tool
+IUSE=debug doc
+KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c52c08fb14eaf384b7d8c6e7c0d42ee4
diff --git a/gnustep-base/mknfonts-0.5-r3 b/gnustep-base/mknfonts-0.5-r3
new file mode 100644
index 000000000000..d9062d4c7dc8
--- /dev/null
+++ b/gnustep-base/mknfonts-0.5-r3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1 virtual/pkgconfig
+DESCRIPTION=A tool to create .nfont packages for use with gnustep-back-art
+EAPI=7
+HOMEPAGE=https://packages.debian.org/mknfonts.tool
+IUSE=debug doc
+KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=gnustep-base/gnustep-gui >=media-libs/freetype-2.1
+SLOT=0
+SRC_URI=mirror://debian/pool/main/m/mknfonts.tool/mknfonts.tool_0.5.orig.tar.gz
+_eclasses_=eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
+_md5_=8ec6611ca86e07e9066235020f2bd86b
diff --git a/gnustep-base/mknfonts/Manifest b/gnustep-base/mknfonts/Manifest
deleted file mode 100644
index 270e0c841b26..000000000000
--- a/gnustep-base/mknfonts/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX mknfonts-0.5-pkgconfig.patch 510 BLAKE2B b74790dbad72f52c0075114861ecbb66a428c41cda8510252e41611a57a16eaff34461f18d87659bce469167e28d75bcfe20fdf5b5419acb2b5d12416236f506 SHA512 c45b6eb60365cb6b0125127cfaf9292756a5f6490249f5fa5be600054ec4743f84bd1c56e9d199441e74de829a4ebf63241c4aae5e13a64af449a1ec4ba6a00f
-AUX mknfonts-rename.patch 499 BLAKE2B 50430871a2f4a99bf1c4996291dadacf1bf6cbd296b1ae5ef25d896a7d48d034ea2fbfc91f5f490661d0ba3c5b87ead5794a4402104e670c090ac654c117c5c0 SHA512 9107b0e6de1d228bce2e4796dd69a65a5644ca290dbe7c2953f44576d5485204bb52659895302e243d2f92bb3dbdf33991cbfa62a59d2486914b62a8e4675f7f
-DIST mknfonts.tool_0.5.orig.tar.gz 2890 BLAKE2B 584989b90c0fb44d62f69174e0dca706a8bcfab942442228ae4e5c98dfb8221e9bfc43cb32b4f48609b51ff7217f591f2d7acaccf219a2ed34b99fb9f5ea2f4e SHA512 a6ad5810576285f16a8dc3596205b64bc6b183a6b9377df1c9e40d28cdba7ce2ae6e6b883478429f8c931bdd3f9f23396c6f5cd3fa1d155025638bb77ccd86ed
-EBUILD mknfonts-0.5-r2.ebuild 739 BLAKE2B 8ab135c1c469b872477d59f2692ad42ef8297c7955fc4c2ebba1e9667804a63bc6212fe65777b91ce88b8d6a2dfab4d155c5f28176d125815e6d9b6672ef8614 SHA512 69da2c1eaaa4ac84be7d0ee8f2a168895ef28ebf02b4f7f44a36e59bef2552133950120c350e6ca5eb72ee82171f27d483b9183851717422c13642e198abb6ba
-EBUILD mknfonts-0.5-r3.ebuild 787 BLAKE2B d700765e5b44ee42c607435db7e0d2c4c807668f18d6fbaaa1d0f03d8873309a41a10642c22f5865fa6824c5833a785a6676125b8c28884ee6e172c01f9fdcbc SHA512 dd962aac428abca33a4797a6b4a5f61e15b9014a54928744f297057f5bd482a16422b64479e88fe1abbd6dfee23eaaab77d26fa21b11455c942ffed5333dd79d
-MISC metadata.xml 386 BLAKE2B 9e51e731459b36cc9d7b65926248bd40c8e8461659b126cf302101221043916d50de5240435e8ec1fa242f63ecd0c8e628c24f45c9228c0019edd3b2e6db8668 SHA512 de1d2ee898b37b1ae1d2d2763d13275bb9c733065588ec367f5505ff3a027f3ee965ec02b7c3709ce7946b9afe3860a02933a12e57064fe6f30ee51c7455a533
diff --git a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch b/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
deleted file mode 100644
index e73bac5c1ddf..000000000000
--- a/gnustep-base/mknfonts/files/mknfonts-0.5-pkgconfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mknfonts-0.5.orig/GNUmakefile mknfonts-0.5/GNUmakefile
---- mknfonts-0.5.orig/GNUmakefile	2002-09-28 12:27:26.000000000 +0200
-+++ mknfonts-0.5/GNUmakefile	2018-06-29 11:27:01.871588321 +0200
-@@ -9,8 +9,8 @@
- 
- ADDITIONAL_OBJCFLAGS += -Wall -O2
- 
--ADDITIONAL_INCLUDE_DIRS += `freetype-config --cflags`
--ADDITIONAL_LDFLAGS += `freetype-config --libs`
-+ADDITIONAL_INCLUDE_DIRS += `pkg-config --cflags freetype2`
-+ADDITIONAL_LDFLAGS += `pkg-config --libs freetype2`
- 
- mknfonts_OBJC_FILES = mknfonts.m
- 
diff --git a/gnustep-base/mknfonts/files/mknfonts-rename.patch b/gnustep-base/mknfonts/files/mknfonts-rename.patch
deleted file mode 100644
index e62618b7844c..000000000000
--- a/gnustep-base/mknfonts/files/mknfonts-rename.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- mknfonts-0.5/mknfonts.m.orig	2007-05-03 11:46:27.000000000 +0200
-+++ mknfonts-0.5/mknfonts.m	2007-05-03 11:47:34.000000000 +0200
-@@ -310,12 +310,6 @@
- 			{
- 				fi=[faceinfos objectAtIndex: i];
- 				[faces addObject: [fi faceInfoDictionary]];
--				for (j=0;j<[fi->files count];j++)
--				{
--					[fm movePath: [fi->files objectAtIndex: j]
--						toPath: [path stringByAppendingPathComponent: [[fi->files objectAtIndex: j] lastPathComponent]]
--						handler: nil];
--				}
- 			}
- 
- 			[family_info
diff --git a/gnustep-base/mknfonts/metadata.xml b/gnustep-base/mknfonts/metadata.xml
deleted file mode 100644
index 7fc083dde574..000000000000
--- a/gnustep-base/mknfonts/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-mknfonts is a tool that offers ease of creating new font sets for the gnustep-back-art package.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
deleted file mode 100644
index b4e3d0b21090..000000000000
--- a/gnustep-base/mknfonts/mknfonts-0.5-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-base
-
-DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
-HOMEPAGE="https://packages.debian.org/mknfonts.tool"
-SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-DEPEND="gnustep-base/gnustep-gui
-	>=media-libs/freetype-2.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-rename.patch )
-
-src_prepare() {
-	# Correct link command for --as-needed
-	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die "sed failed"
-
-	default
-}
diff --git a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild b/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
deleted file mode 100644
index af4957771143..000000000000
--- a/gnustep-base/mknfonts/mknfonts-0.5-r3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit gnustep-base
-
-DESCRIPTION="A tool to create .nfont packages for use with gnustep-back-art"
-HOMEPAGE="https://packages.debian.org/mknfonts.tool"
-SRC_URI="mirror://debian/pool/main/m/${PN}.tool/${PN}.tool_${PV}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE=""
-
-RDEPEND="gnustep-base/gnustep-gui
-	>=media-libs/freetype-2.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-rename.patch
-	"${FILESDIR}"/${P}-pkgconfig.patch
-)
-
-src_prepare() {
-	default
-
-	# Correct link command for --as-needed
-	sed -i -e "s/ADDITIONAL_LDFLAGS/ADDITIONAL_TOOL_LIBS/" GNUmakefile || die
-}
diff --git a/gnustep-libs/Manifest.gz b/gnustep-libs/Manifest.gz
index b2795ac1ad72..99c8a41f79c3 100644
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
diff --git a/gnustep-libs/cenonlibrary-4.0.0 b/gnustep-libs/cenonlibrary-4.0.0
new file mode 100644
index 000000000000..a363215a3596
--- /dev/null
+++ b/gnustep-libs/cenonlibrary-4.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Default library required to run Cenon
+EAPI=5
+HOMEPAGE=http://www.cenon.info/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=Cenon
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.cenon.zone/download/source/CenonLibrary-4.0.0-1.tar.bz2
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a4417d91ff125973a2dd9162f2ed13ef
diff --git a/gnustep-libs/cenonlibrary/Manifest b/gnustep-libs/cenonlibrary/Manifest
deleted file mode 100644
index d429d42247d3..000000000000
--- a/gnustep-libs/cenonlibrary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CenonLibrary-4.0.0-1.tar.bz2 2131692 BLAKE2B 2f00e3c5b743e239b116493e23f4bd6acee34b0f88d02ed791b4cec8487a24b28b442cecd3483773f8339eb93bcc0b1065edc0d2a15179d1caa83ad218700e5b SHA512 75d1acc2635cb5daee3311d2c54a43abf9d0de7b29997fec86effc4dd3932fe73449c08cda642d1f92adcea9da74cd4732014bb04f7418c1f331701bafe44427
-EBUILD cenonlibrary-4.0.0.ebuild 535 BLAKE2B 156dd723a037f4031b19ab02e2fc15baa927acfe4dd61dc45e2656e7734ad8ade94205c013dd1301b30e90cb9c36d56bc171ab00f5928c401a8460ef9aa37c1f SHA512 a30ef96cf04e290f25af5a85ca96c0b10f9a10cb730a34ffbe390447c1bfcdf74fa370622eef4d52ced6bc006b12d1690b4373ca0fed1d5da241eab546ee40cc
-MISC metadata.xml 514 BLAKE2B 279e28730fdba3e0a619038a0ee87724083dfe4ec052ca387aa869b3f0a7fab76be6d7731ebd864cc3f3c21d594e13536125559196d9b0978fc1c61bf6a79b28 SHA512 06125a3d405f811589e4312606ab281719b8856d52bdcaeb78b414e20236b1f3e916d738c3df8d676f2853f53ea44f1226f14472b8b055630fc649cb8f5aa51d
diff --git a/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild b/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
deleted file mode 100644
index ef8bf528a2b6..000000000000
--- a/gnustep-libs/cenonlibrary/cenonlibrary-4.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-S=${WORKDIR}/Cenon
-
-DESCRIPTION="Default library required to run Cenon"
-HOMEPAGE="http://www.cenon.info/"
-SRC_URI="http://www.cenon.zone/download/source/CenonLibrary-${PV}-1.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-SLOT="0"
-LICENSE="Cenon"
-IUSE=""
-
-src_compile() {
-	echo "nothing to compile"
-}
-
-src_install() {
-	egnustep_env
-	dodir ${GNUSTEP_SYSTEM_LIBRARY}
-	cp -pPR "${S}" "${D}"${GNUSTEP_SYSTEM_LIBRARY}
-}
diff --git a/gnustep-libs/cenonlibrary/metadata.xml b/gnustep-libs/cenonlibrary/metadata.xml
deleted file mode 100644
index 133f8e2acd95..000000000000
--- a/gnustep-libs/cenonlibrary/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-		Cenon is a graphical tool of a special kind. Build upon a
-		modular graphical core, Cenon offers a wide variety of
-		possibilities and applications.
-		This package contains the supporting libraries for cenon itself.
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/dbuskit-0.1.1 b/gnustep-libs/dbuskit-0.1.1
new file mode 100644
index 000000000000..f8693a0f0de5
--- /dev/null
+++ b/gnustep-libs/dbuskit-0.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=sys-apps/dbus-1.2.1 >=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 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IPC service
+EAPI=5
+HOMEPAGE=http://www.gnustep.org
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=fb57d53bb289aef3bcedcfe2e3473b49
diff --git a/gnustep-libs/dbuskit-0.1.1-r1 b/gnustep-libs/dbuskit-0.1.1-r1
new file mode 100644
index 000000000000..bf77402f997f
--- /dev/null
+++ b/gnustep-libs/dbuskit-0.1.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=sys-apps/dbus-1.2.1 >=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 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=framework that interfaces Objective-C applications with the D-Bus IPC service
+EAPI=6
+HOMEPAGE=http://www.gnustep.org
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep/dbuskit-0.1.1.tar.gz
+_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6fba3b11ca875ba4faf22a0eaf240d96
diff --git a/gnustep-libs/dbuskit/Manifest b/gnustep-libs/dbuskit/Manifest
deleted file mode 100644
index 0583a14ae83d..000000000000
--- a/gnustep-libs/dbuskit/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX dbuskit-0.1.1-remove_gc.patch 926 BLAKE2B 16ba95a5966f4c3e666ad786dcd9d4f3a6db3aef0ebdbeab1f7882d931d4a935cd956ada3f9b2d85905bbd0a38b118e630fd4789bbf5907b925c465c12a9dc2d SHA512 37e72f44aaaa670ea61511592a899fd9573c838c93f2a7da246d8aaeceeac03454369887f5c63fdfd778cbddd78fc89440f07ebb5e0089f4035a830bdf1497a4
-DIST dbuskit-0.1.1.tar.gz 706783 BLAKE2B 3963b955d16bea9bb063142277f367748a4c9b005c63d17904b3421cfa6d9a8590d2d2ac1037dfb592ff62ed5e3988682ea14ddb0c45bde2b71fc9f3cd5ef5fc SHA512 1d98a05bda7558ebca80c5a4985009bdcb2f875c25f44872a2ae589793deb2d6d832c91e3eeaed7846980f5921a6a543efd04db3f7b228a0d0bae37cdc5ccfae
-EBUILD dbuskit-0.1.1-r1.ebuild 799 BLAKE2B 66fba694420f7aea44ecda6e949fff4abbdfe9507e95b5d5ee3ed2dd407bd4cec3b4d15b1f581f6962c446a7ca6c4272547dce4d4162c4b2f424e90b6130d01a SHA512 830607a3fa462440b74f462d9cf8ccd3ae22355aa21ab63a941789cd7648d63724c70dc076ba4ddd2d3237203c411c6eb1da3743cce48fa676a923dd9b1b8404
-EBUILD dbuskit-0.1.1.ebuild 739 BLAKE2B 5271bb9c1a7ca8ad91d43c9bdfec5d5db3838b2f9ec0ddcf0d69fdbd8172ed2a1183dd7f3da7f7b4cce8f99c6dceeaf03ff52b363f0a99e1d645a661892e24cd SHA512 23e488d4c0675b7aaf0e1233e87ab9d65107dc7234f38eef591402cfcd0a6b669bf31fc2da1a4fce99421cadf0a0c0506458b513945f3117daada12ece46e7ed
-MISC metadata.xml 619 BLAKE2B c1a7767af86a48d595b038bdfff6e59f71bad20870f64c130452e68d185f70c02f22b4f3592394bc4b61be8bd140892b74b0564d12531fb348f52f696de9cc9c SHA512 9748c7f960bc4ee8e21b4bd7109fe45bb34f288387456b0e69a1062ef4b43b70af18415e8a3f73a9a74349860cbb84a2a7dc29d98db8979a32043fb6c03ec284
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
deleted file mode 100644
index de48698483fe..000000000000
--- a/gnustep-libs/dbuskit/dbuskit-0.1.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools gnustep-2
-
-DESCRIPTION="framework that interfaces Objective-C applications with the D-Bus IPC service"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="http://download.gna.org/gnustep/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=sys-apps/dbus-1.2.1"
-RDEPEND="${DEPEND}"
-
-PATCHES=( ${FILESDIR}/${P}-remove_gc.patch )
-
-src_prepare() {
-	default
-
-	if ! use doc; then
-		# Remove doc target
-		sed -i -e "/SUBPROJECTS/s/Documentation//" GNUmakefile \
-			|| die "doc sed failed"
-	fi
-
-	# Bug 410697
-	sed -e "s#ObjectiveC2/runtime.h#ObjectiveC2/objc/runtime.h#" \
-		-i configure.ac || die "ObjectiveC2 runtime sed failed"
-
-	eautoreconf
-}
diff --git a/gnustep-libs/dbuskit/dbuskit-0.1.1.ebuild b/gnustep-libs/dbuskit/dbuskit-0.1.1.ebuild
deleted file mode 100644
index 7176cc290c8b..000000000000
--- a/gnustep-libs/dbuskit/dbuskit-0.1.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools gnustep-2
-
-DESCRIPTION="framework that interfaces Objective-C applications with the D-Bus IPC service"
-HOMEPAGE="http://www.gnustep.org"
-SRC_URI="http://download.gna.org/gnustep/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=sys-apps/dbus-1.2.1"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if ! use doc; then
-		# Remove doc target
-		sed -i -e "/SUBPROJECTS/s/Documentation//" GNUmakefile \
-			|| die "doc sed failed"
-	fi
-
-	# Bug 410697
-	sed -e "s#ObjectiveC2/runtime.h#ObjectiveC2/objc/runtime.h#" \
-		-i configure.ac || die "ObjectiveC2 runtime sed failed"
-	eautoreconf
-}
diff --git a/gnustep-libs/dbuskit/files/dbuskit-0.1.1-remove_gc.patch b/gnustep-libs/dbuskit/files/dbuskit-0.1.1-remove_gc.patch
deleted file mode 100644
index cc20e8dbe166..000000000000
--- a/gnustep-libs/dbuskit/files/dbuskit-0.1.1-remove_gc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- trunk/Source/DKNotificationCenter.m	2016/03/26 05:10:00	39611
-+++ trunk/Source/DKNotificationCenter.m	2016/03/28 06:16:41	39612
-@@ -519,7 +519,7 @@
-   {
-     return nil;
-   }
--  observer = GS_GC_HIDE(anObserver);
-+  observer = anObserver;
-   selector = aSelector;
- 
-   // Make sure the necessary components are there and that the selector takes a
-@@ -535,7 +535,7 @@
- 
- - (id)observer
- {
--  return GS_GC_UNHIDE(observer);
-+  return observer;
- }
- 
- - (SEL)selector
-@@ -561,7 +561,7 @@
-   // callback and need to avoid the reentrancy. We do this by scheduling
-   // delivery of the notification on the run loop.
-   [[NSRunLoop currentRunLoop] performSelector: selector
--                                      target: GS_GC_UNHIDE(observer)
-+                                      target: observer
- 				    argument: notification
- 				       order: UINT_MAX
- 				       modes: [NSArray arrayWithObject: NSDefaultRunLoopMode]];
diff --git a/gnustep-libs/dbuskit/metadata.xml b/gnustep-libs/dbuskit/metadata.xml
deleted file mode 100644
index d55fc839b21a..000000000000
--- a/gnustep-libs/dbuskit/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>The DBusKit framework offers tight integration of D-Bus services into Objective-C applications. It handles all low-level details of communication with D-Bus daemons and the services connected to them and exposes an interface similar to Distributed Objects to make it easy for Objective-C programmers to access D-Bus services.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/gsldap-0.0.1_pre20070219 b/gnustep-libs/gsldap-0.0.1_pre20070219
new file mode 100644
index 000000000000..e6642afe6c96
--- /dev/null
+++ b/gnustep-libs/gsldap-0.0.1_pre20070219
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=GNUstep LDAP library for open ldap C libraries
+EAPI=6
+HOMEPAGE=http://www.gnustep.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=net-nds/openldap >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://gentoo/gsldap-0.0.1_pre20070219.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=80d64d8631cbe7f4a514364fb1128eba
diff --git a/gnustep-libs/gsldap/Manifest b/gnustep-libs/gsldap/Manifest
deleted file mode 100644
index 64f510e5075b..000000000000
--- a/gnustep-libs/gsldap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gsldap-0.0.1_pre20070219.tar.gz 33275 BLAKE2B 012cc8b8aea304bce6793c9eee13a61e92fcd13727ada8f5191d904ce1e7abb636c727a464f3bfd6b2dd142a60d3e3b7dc06ca83e9fdd2113b45467b79ca9d2f SHA512 b7915e75f76eb97ef033ce0516c6c1606f4bbf81465b1ac93053a92858706ce50f3e3746e04e3e4bf6b4ffc822917c0816ca03f5cb5f79ac50bd9018100bf216
-EBUILD gsldap-0.0.1_pre20070219.ebuild 510 BLAKE2B 9bec7a9a20f68c6a34031a5f25443b78b240b59435854dd3652d03f7a9f7c7eaf715c3f4256ac069fc4b0c36e3d44cc7def6e16dd609a7f3f842e77b2449323e SHA512 35f9b37ea46f80e3097f6176cd659ff69a988de9bbbb42ee4bba817fe6961c2db6c1f59c80e6e25788a7b3f5048fe0319166e61861f1c2708f56ea04a4e5d4a8
-MISC metadata.xml 433 BLAKE2B 5c460239a173969011977881845dfdceeb92b9d39bdde02036c7df39a2d2bfe496d9cf2ad5d609c3923064ce533b5669db7d5a4c33f850b7d23ad34c6ac87e35 SHA512 8a4b076edc720fe2d02324304bec6b0b153b55ecf524b10d36836dc1ef0e33541bd39e175f9972f25840ecfd2ccd2a364183b621dad1f44e0ee0743aa3416378
diff --git a/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild b/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild
deleted file mode 100644
index 4deadee636c5..000000000000
--- a/gnustep-libs/gsldap/gsldap-0.0.1_pre20070219.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnustep-2
-
-DESCRIPTION="GNUstep LDAP library for open ldap C libraries"
-HOMEPAGE="http://www.gnustep.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="net-nds/openldap"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i -e "s|#include <GNUstepBase/GSCategories.h>||" \
-		GSLDAPCom.h || die "GSCategories.h sed failed"
-}
diff --git a/gnustep-libs/gsldap/metadata.xml b/gnustep-libs/gsldap/metadata.xml
deleted file mode 100644
index db4934e58761..000000000000
--- a/gnustep-libs/gsldap/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-		gsldap is a library which use open ldap (www.openldap.org) C
-		libraries to provide an  Objective-C interface to access LDAP
-		Servers
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/highlighterkit-0.1.3 b/gnustep-libs/highlighterkit-0.1.3
new file mode 100644
index 000000000000..2297b0f1edb1
--- /dev/null
+++ b/gnustep-libs/highlighterkit-0.1.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Syntax highlighter framework
+EAPI=5
+HOMEPAGE=http://wiki.gnustep.org/index.php/HighlighterKit
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep-nonfsf/HighlighterKit-0.1.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=a34967b1288c51fbecad9cdfd7f76e42
diff --git a/gnustep-libs/highlighterkit/Manifest b/gnustep-libs/highlighterkit/Manifest
deleted file mode 100644
index 84fe79f0230f..000000000000
--- a/gnustep-libs/highlighterkit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST HighlighterKit-0.1.3.tar.gz 54952 BLAKE2B 1d1561b83808245694eaf45c9c1265c7a4c089c8a6f78c04a4db64ff49f1a76e83b875f5f6874df5bdb9c31d7889272080dd381bb2aadedc0b7ce66dd373fa08 SHA512 3a6fbd8387ec545b7004b8ddb7e5210a1a6d324d584499b6c0e99f1f74a6cd453b9451aae59d6c4147c8aebb4556b500d1477d3a05211bc19aae5a64d9133e86
-EBUILD highlighterkit-0.1.3.ebuild 413 BLAKE2B f9329351b973b3efb9802ba271901d42ad8506b65d921a851f0ed9c212fcec17c6922ca4b57037e418e76c7d04b9210ce342820ae233173ea5a052071ede3a18 SHA512 74b1c864652129e8e520826334a335c2bf5a82b94eb6ddcf595e6ce5a751b420b077b3e86a23154d177e9712674d681cc02182943f367358dd90dbce06ac96dd
-MISC metadata.xml 406 BLAKE2B 3dabc89cf368fa5b3301e5908b7c7486dc4419679a19b2b24145f226c9486836c5869f5ea0b32d1679a5ae9f6112994af06cbc131faa57bf0c809eaef5249ff5 SHA512 55baea8414ec41f7e0585f5ef1d8da5ecc00abe670258a7156f00afc4847e3c70b2d445784bd1c372939f52298fabdfdd5ca7dbb9a1420d7b2c87d44b2ddd76e
diff --git a/gnustep-libs/highlighterkit/highlighterkit-0.1.3.ebuild b/gnustep-libs/highlighterkit/highlighterkit-0.1.3.ebuild
deleted file mode 100644
index a4ebe1190da7..000000000000
--- a/gnustep-libs/highlighterkit/highlighterkit-0.1.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit gnustep-2
-
-MY_P="HighlighterKit-${PV}"
-
-DESCRIPTION="Syntax highlighter framework"
-HOMEPAGE="http://wiki.gnustep.org/index.php/HighlighterKit"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/gnustep-libs/highlighterkit/metadata.xml b/gnustep-libs/highlighterkit/metadata.xml
deleted file mode 100644
index 9d74e72b1f60..000000000000
--- a/gnustep-libs/highlighterkit/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>HighlighterKit is a framework to allow easy incorporation of syntax highlighting features into your application.</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/metadata.xml b/gnustep-libs/metadata.xml
deleted file mode 100644
index 0cd2afaae61a..000000000000
--- a/gnustep-libs/metadata.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<catmetadata>
-	<longdescription lang="en">
-		The gnustep-libs category contains GNUstep libraries.
-	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie gnustep-libs enthält Bibliotheken für die
-		GNUstep-Umgebung.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría gnustep-libs contiene las librerías de GNUstep.
-	</longdescription>
-	<longdescription lang="ja">
-		gnustep-libsカテゴリーにはGNUstepライブラリが含まれています。
-	</longdescription>				
-	<longdescription lang="nl">
-		De gnustep-libs categorie bevat GNUstep bibliotheken.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm gnustep-libs chứa các thư viện GNUstep.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria gnustep-libs contiene le librerie di GNUstep.
-	</longdescription>
-	<longdescription lang="pt">
-		A categoria gnustep-libs contém as bibliotecas de GNUstep.
-	</longdescription>
-	<longdescription lang="pl">
-		Kategoria gnustep-libs zawiera biblioteki GNUstep.
-	</longdescription>
-</catmetadata>
-
diff --git a/gnustep-libs/netclasses-1.1.0 b/gnustep-libs/netclasses-1.1.0
new file mode 100644
index 000000000000..95191f8518c6
--- /dev/null
+++ b/gnustep-libs/netclasses-1.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=An asynchronous networking library for GNUstep
+EAPI=6
+HOMEPAGE=http://gap.nongnu.org/talksoup/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/gap/netclasses-1.1.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=0c5ca675acd684765674d020c7d25161
diff --git a/gnustep-libs/netclasses/Manifest b/gnustep-libs/netclasses/Manifest
deleted file mode 100644
index 5f8cb66860cb..000000000000
--- a/gnustep-libs/netclasses/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX netclasses-1.1.0-no_rfc.patch 410 BLAKE2B 0fc6ff01a80998b7f41420499ec79aecb93150efad04c366c7cb768f939da3115e0fd42d366b0f567fcaca49bbd85c26951c160ac42e4afd9a9d38b024294f5c SHA512 11a2db7a5b1123acafe1b47ea68946118328ce4af751b2521bdef592f0cddd9e0a21deaaed83a3112f44c6a292da881b5313e537724d45e18fc7fbc2a334ca65
-DIST netclasses-1.1.0.tar.gz 92479 BLAKE2B 4683a59e42347e49bc4cd25900545389358f1c80d64b9b55f2d7d94f3dfd3521bfa179649ebc42d489f2104152bc0e05ed98f07e93466c65a6323a8f0a576b05 SHA512 9db604189260237f5ad6e8314abdd8475fc2d462273ab851062af6175be44b347e0da40c70706bcae2800cef89f38a1e37a0f33c53d97681713bd1f22786b8c5
-EBUILD netclasses-1.1.0.ebuild 406 BLAKE2B f1f7836b62345b68ee6602a99d3aba1d76ab2682e89c07dfa8054acb4813a98f1d1a8910dec057ca99db96078d93afd2a0cc132f00365d39a01ce2fe9c432ef5 SHA512 54cf52686e9f04d9daa7970172863bfb942ac1b213b2c607b7f5f1e7202cd7c671334765e5ac2aa104c855ab23db303a677e68d7294477b436dcf75cc0bf28d7
-MISC metadata.xml 592 BLAKE2B baa743584293ca71993e73cb3869c9ffe0637ea66a37016072cddab800000e81108caab4a4416431c67dd3237bb0c911d00f7b74f4ca9d32402f5ab6ed7c7392 SHA512 53e0cdf62f13171ed7a986c207105d13a14dfbac8df740f32d5b72b8c63330fa9324c9fa70c541101047093b549513abd2354126b0bd955ee4e6bcb59dc2afd7
diff --git a/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch b/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch
deleted file mode 100644
index 16936db956c9..000000000000
--- a/gnustep-libs/netclasses/files/netclasses-1.1.0-no_rfc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -Naur netclasses-1.1.0.orig/Documentation/GNUmakefile.postamble netclasses-1.1.0/Documentation/GNUmakefile.postamble
---- netclasses-1.1.0.orig/Documentation/GNUmakefile.postamble	2014-06-10 10:16:08.000000000 +0200
-+++ netclasses-1.1.0/Documentation/GNUmakefile.postamble	1970-01-01 01:00:00.000000000 +0100
-@@ -1,4 +0,0 @@
--before-all::
--	mkdir -p $(DOCUMENT_NAME)
--	cp -f rfc1459.txt $(DOCUMENT_NAME)
--
diff --git a/gnustep-libs/netclasses/metadata.xml b/gnustep-libs/netclasses/metadata.xml
deleted file mode 100644
index 1e5277913294..000000000000
--- a/gnustep-libs/netclasses/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-		netclasses is an asynchronous networking library that works on
-		OS X natively, and any of the multitude of platforms supported
-		by GNUstep. You've never seen an easier way to put together
-		network applications!
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">netclasses</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-libs/netclasses/netclasses-1.1.0.ebuild b/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
deleted file mode 100644
index ca6e8bc37101..000000000000
--- a/gnustep-libs/netclasses/netclasses-1.1.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="An asynchronous networking library for GNUstep"
-HOMEPAGE="http://gap.nongnu.org/talksoup/"
-SRC_URI="https://savannah.nongnu.org/download/gap/${P}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-PATCHES=( "${FILESDIR}"/${P}-no_rfc.patch )
diff --git a/gnustep-libs/pantomime-1.2.2 b/gnustep-libs/pantomime-1.2.2
new file mode 100644
index 000000000000..05bef11e06f5
--- /dev/null
+++ b/gnustep-libs/pantomime-1.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of Objective-C classes that model a mail system
+EAPI=5
+HOMEPAGE=http://www.collaboration-world.com/pantomime/
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86 ~x86-fbsd
+LICENSE=LGPL-2.1 Elm
+RDEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://download.gna.org/gnustep-nonfsf/Pantomime-1.2.2.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=63467d716a5d3aa23e95daff002e4719
diff --git a/gnustep-libs/pantomime-1.2.3 b/gnustep-libs/pantomime-1.2.3
new file mode 100644
index 000000000000..dd64721ec64c
--- /dev/null
+++ b/gnustep-libs/pantomime-1.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of Objective-C classes that model a mail system
+EAPI=6
+HOMEPAGE=http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1 Elm
+RDEPEND=dev-libs/openssl:0= >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=mirror://nongnu/gnustep-nonfsf/Pantomime-1.2.3.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=76d1b7e8897edd32e38d05c096cc4071
diff --git a/gnustep-libs/pantomime/Manifest b/gnustep-libs/pantomime/Manifest
deleted file mode 100644
index dbb691277a70..000000000000
--- a/gnustep-libs/pantomime/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Pantomime-1.2.2.tar.gz 468276 BLAKE2B fcd740b52acd5351fe1d257b6bf5c0f517183e24bc8c8ac6c7753f3047b3b941817ba65a130e43f2b8b9e1f51f0759238420f84dcfc75b7ac49b23e69156c8bb SHA512 198c1e0248f47bbd2cc284eec0d804959ea2a51e4a4810f8909048b41fc4bfbbaab9fc86e1ad507611a77382f353b357615c52845228e2411a0da7af88b2988f
-DIST Pantomime-1.2.3.tar.gz 474666 BLAKE2B b2fc4db717f06a3fea889a2b99de4ca88f5253e0cdf026d96b24200ccd01b6eca058869eaef0a52cfd4585585e7e909ac39d1ad50b7e788a97bb3eeb75784634 SHA512 01c56411a6822dbe246c1ff7f2c8be7654e8a0b2fb2c0b4e868ea80a47a16ba832cf4a912bf5eb66e7823900d835698966d64f51bf414978cef2cb606a215ad6
-EBUILD pantomime-1.2.2.ebuild 759 BLAKE2B 93080ff4fdf39f74db63a0e141488cf4c8bb75fe9cce1142a84a61ebafa784d85f5c863296e90c9788a86e4f11b87222746c621463444441519eb39e1f8581e5 SHA512 5d8add82e9ad7611870ba4ec2dc873094897e7b48d4e63684d68d0027f19fb4dd114076b82775b6afdc0b5bbdd6146584bb6759118f0d0ffbea8ee1183e7fb87
-EBUILD pantomime-1.2.3.ebuild 622 BLAKE2B 61e85ba003797c19987574dfe480e4745e4f936abe4b549e0ff60ee070096a6e2160c8b3f1f02b0147954561325fa956c0df70761fd500eb3317f7f3fc28c6df SHA512 d61795b7a49be9565f1f55906494541c93c94fadd71506cc0de375b7a1dbf761ce11d1b8d2222f76f2ceeb8b9946e4bf6c7f574daf0c0bd2f9c725b7cccbb502
-MISC metadata.xml 437 BLAKE2B c0cdcb5ca0acd059966be1c055a4e1c53405e9b0ba1a3db3f61f1dc90fac27afe36707c29099f1ae0e6aa2f6258e9bd7e99ec922b10d1a5e8e2c679b212b0919 SHA512 16697a1ec563eed2bd922aa07fc29c312fbeccbecef4964741ae99685c88743f1224f027791da6cd85e93612023e46365c6dc114705044a5b1d94043c8b124b9
diff --git a/gnustep-libs/pantomime/metadata.xml b/gnustep-libs/pantomime/metadata.xml
deleted file mode 100644
index f26605696466..000000000000
--- a/gnustep-libs/pantomime/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnustep@gentoo.org</email>
-	<name>Gentoo GNUstep Project</name>
-</maintainer>
-<longdescription>
-A set of Objective-C classes that model a mail system.
-Author Ludovic Marcotte ludovic@Sophos.ca
-The name "Pantomime" was proposed by Jay Kominek.
-</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/pantomime/pantomime-1.2.2.ebuild b/gnustep-libs/pantomime/pantomime-1.2.2.ebuild
deleted file mode 100644
index 6a0806e6054e..000000000000
--- a/gnustep-libs/pantomime/pantomime-1.2.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils gnustep-2
-
-MY_P=${P/p/P}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A set of Objective-C classes that model a mail system"
-HOMEPAGE="http://www.collaboration-world.com/pantomime/"
-SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 Elm"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e "s|ADDITIONAL_LDFLAGS|LIBRARIES_DEPEND_UPON|" \
-		Framework/Pantomime/GNUmakefile || die "as-needed sed failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	cd "${S}"/Documentation
-	dodoc AUTHORS README TODO
-	docinto rfc
-	dodoc RFC/*
-}
diff --git a/gnustep-libs/pantomime/pantomime-1.2.3.ebuild b/gnustep-libs/pantomime/pantomime-1.2.3.ebuild
deleted file mode 100644
index 3d45d2507118..000000000000
--- a/gnustep-libs/pantomime/pantomime-1.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils gnustep-2
-
-MY_P=${P/p/P}
-
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A set of Objective-C classes that model a mail system"
-HOMEPAGE="http://www.nongnu.org/gnustep-nonfsf/gnumail/index.html"
-SRC_URI="mirror://nongnu/gnustep-nonfsf/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 Elm"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	gnustep-base_src_install
-
-	cd "${S}"/Documentation
-	dodoc AUTHORS README TODO
-	docinto rfc
-	dodoc RFC/*
-}
diff --git a/gnustep-libs/performance-0.5.0 b/gnustep-libs/performance-0.5.0
new file mode 100644
index 000000000000..adc581525734
--- /dev/null
+++ b/gnustep-libs/performance-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=Help improve the performance of GNUstep applications
+EAPI=6
+HOMEPAGE=http://wiki.gnustep.org/index.php/Performance
+IUSE=debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-3
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/Performance-0.5.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=29f6c2d7ca21f33fd50ef12fd852f57f
diff --git a/gnustep-libs/performance/Manifest b/gnustep-libs/performance/Manifest
deleted file mode 100644
index a84e965ab476..000000000000
--- a/gnustep-libs/performance/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Performance-0.5.0.tar.gz 50569 BLAKE2B b79f27fc0974c6005725b916cfb528c15d380b62dea2b846c129fda04e4b56ad33d00c4432d19f0ee9bfa3593cd9fa8781d0dbd168c26cceb9e007054252d7b2 SHA512 ac83d046c801e1c2b69c708fa806cccf40fca4d5dabe5d461524c3c3eea989c939a11e58d8bff177f45e55a3e1be73bd03b0bb80b611c8390560740cd5cf9fd5
-EBUILD performance-0.5.0.ebuild 566 BLAKE2B 96076852e3b834a65b3d917196e4d8a9da4f71c91565e5a5acb692ce24438a391a168f8f2863eea74d7ac1b9f367720d0e6cc0ecc80b134fdeb159e1f7ad0b3e SHA512 a17efa9f4f9150868de791f64e981d0e42524c4d2a2a20ff619e86c20694a273a2f4951c2d3dc78957a531fd28815f528dbcdc2a2e8d571294aac88ef52e4e52
-MISC metadata.xml 368 BLAKE2B 653d9f2799b5cf5be3a6a8214fd71db599e2603f64bbf0d49320ad9b3b970c0aeb4977d736cd89b812afeffa1c3d3c107a780a9832e12cf50b4e1268b518fb32 SHA512 bbed0181555aa329b43ef8839daff91b7dc447a25992687b0009ab63327fb3568b5753bf3406febabc7c75f90f5786b70fdc7708f6bf99c3caaf7c39d750a40e
diff --git a/gnustep-libs/performance/metadata.xml b/gnustep-libs/performance/metadata.xml
deleted file mode 100644
index 3f6082034133..000000000000
--- a/gnustep-libs/performance/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>A collection of classes to help improve/tune performance of your software </longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/performance/performance-0.5.0.ebuild b/gnustep-libs/performance/performance-0.5.0.ebuild
deleted file mode 100644
index 5f6bcc8b2665..000000000000
--- a/gnustep-libs/performance/performance-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-MY_P=${P/p/P}
-DESCRIPTION="Help improve the performance of GNUstep applications"
-HOMEPAGE="http://wiki.gnustep.org/index.php/Performance"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="LGPL-3"
-SLOT="0"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if ! use doc; then
-		# Remove doc target
-		sed -i -e '/documentation\.make/d' GNUmakefile \
-			|| die "doc sed failed"
-	fi
-
-	default
-}
diff --git a/gnustep-libs/renaissance-0.9.0-r1 b/gnustep-libs/renaissance-0.9.0-r1
new file mode 100644
index 000000000000..6403436e271e
--- /dev/null
+++ b/gnustep-libs/renaissance-0.9.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=GNUstep Renaissance allows to describe user interfaces XML files
+EAPI=6
+HOMEPAGE=http://www.gnustep.it/Renaissance/index.html
+IUSE=debug doc
+KEYWORDS=amd64 ppc x86
+LICENSE=LGPL-2.1
+RDEPEND=>=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=http://www.gnustep.it/Renaissance/Download/Renaissance-0.9.0.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=c33995f967193ffd0edae5d3493603ba
diff --git a/gnustep-libs/renaissance/Manifest b/gnustep-libs/renaissance/Manifest
deleted file mode 100644
index 70366e351090..000000000000
--- a/gnustep-libs/renaissance/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX renaissance-0.8.1_pre20070522-docpath.patch 1071 BLAKE2B ab6229fa8e9bce80c74611acfb5ebdb8f7a907c134f327f9c013af872d2e3a3abe69bddf6514f9579381edd2e67688aeb05b90d7c657718f8e9d27f873270c4f SHA512 99d32b951824ed85e3f9455bacb2410ad990c5e6af5debf52ae257ba64e5dad91f01270ed93fcbfd1a25c8d7a4706c30735aae199a1bf5f1fae2c1d750d828ec
-DIST Renaissance-0.9.0.tar.gz 404888 BLAKE2B fbaf2665dfe1f27e716298873eb0b01c9b76fbed305c18fedd8b377f1dcaecf5ab6d5250586f597ab7f51cbe667f870c0c07b5fb9d607f878561d1d510b7e4e3 SHA512 67ee9612619ef9d6ba3c4fbad7b561206424b235735e847df091e05593fa57001201196cfd0b5c8e6027299cb6d68de75442ef82b44178535c60110df29cdf64
-EBUILD renaissance-0.9.0-r1.ebuild 488 BLAKE2B 0bdc78f45cbf3d15089c321aa08456573f74e834a7e6c03ddd0301258f4cb0be9d60f67f525576c344ef5874d09400a9e853b32c189d20def185296f896c76be SHA512 ce1f406b396ec33b31411abd378cbc77780eed34cce17520b3bafbe9b1f7244cec5e07a47c3bb1711f87da0952a70669e94a7fcfd9dc82af17bf6eea4ddedbcd
-MISC metadata.xml 1288 BLAKE2B c0287c6eb3a7ac5586a3b4aa1fbce8a194e4173c20f4cbf7c52077d250f434551a75b1e07837bc1868c51a00d9ee947dc2208dab1d7dbc418beebdc1074ed4ce SHA512 96e6192c305ac7b47c6dbbadf688a1cc595b36c55ee4f9a2b7550977abbcb3ba12347fe95efde62d91b1f38dd270a2d7ea624aae53de395207fdfe3026c08fdb
diff --git a/gnustep-libs/renaissance/files/renaissance-0.8.1_pre20070522-docpath.patch b/gnustep-libs/renaissance/files/renaissance-0.8.1_pre20070522-docpath.patch
deleted file mode 100644
index df4f8c43ca1e..000000000000
--- a/gnustep-libs/renaissance/files/renaissance-0.8.1_pre20070522-docpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur renaissance-0.8.1_pre20070522.orig/Documentation/GNUmakefile renaissance-0.8.1_pre20070522/Documentation/GNUmakefile
---- renaissance-0.8.1_pre20070522.orig/Documentation/GNUmakefile	2007-10-17 14:32:41.000000000 +0200
-+++ renaissance-0.8.1_pre20070522/Documentation/GNUmakefile	2007-10-17 14:33:18.000000000 +0200
-@@ -8,6 +8,7 @@
- macros.tex \
- autolayout.tex \
- gsmarkup.tex
-+manual_DOC_INSTALL_DIR = Developer/Renaissance
- 
- SUBPROJECTS = Tutorials
- 
-diff -Naur renaissance-0.8.1_pre20070522.orig/Documentation/Tutorials/Renaissance/GNUmakefile renaissance-0.8.1_pre20070522/Documentation/Tutorials/Renaissance/GNUmakefile
---- renaissance-0.8.1_pre20070522.orig/Documentation/Tutorials/Renaissance/GNUmakefile	2007-10-17 14:32:41.000000000 +0200
-+++ renaissance-0.8.1_pre20070522/Documentation/Tutorials/Renaissance/GNUmakefile	2007-10-17 14:33:07.000000000 +0200
-@@ -3,5 +3,6 @@
- DOCUMENT_NAME = Renaissance
- 
- Renaissance_LATEX_FILES = Renaissance.tex
-+Renaissance_DOC_INSTALL_DIR = Developer/Renaissance
- 
- include $(GNUSTEP_MAKEFILES)/documentation.make
diff --git a/gnustep-libs/renaissance/metadata.xml b/gnustep-libs/renaissance/metadata.xml
deleted file mode 100644
index c3412174d787..000000000000
--- a/gnustep-libs/renaissance/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>
-Welcome to GNUstep Renaissance!
-
-GNUstep Renaissance is free software (GNU LGPL), and part of the
-GNUstep project.  It is a development framework which runs on top of
-the GNUstep libraries.  It also works on top of the Apple Mac OS X
-Cocoa libraries, providing an opaque layer to write portable
-applications.
-
-In short, GNUstep Renaissance allows you to describe your user
-interfaces (that is, the windows in your application, and the buttons,
-boxes, textfields, etc in the windows) in simple and intuitive XML
-files, using an open, standard format describing the logic of the
-interface.  GNUstep Renaissance can then, at run time, generate the
-user interfaces (using the native host OpenStep-like libraries) by
-reading the XML files.  The connections between the objects created
-from the XML files, and the other objects in the application are done
-via outlets (as traditionally in OpenStep); a new quick and intuitive
-syntax has been developed to make creating outlets as easy as
-possible.
-	</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild b/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild
deleted file mode 100644
index 3b3a87fae083..000000000000
--- a/gnustep-libs/renaissance/renaissance-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnustep-2
-
-DESCRIPTION="GNUstep Renaissance allows to describe user interfaces XML files"
-HOMEPAGE="http://www.gnustep.it/Renaissance/index.html"
-SRC_URI="http://www.gnustep.it/Renaissance/Download/${P/r/R}.tar.gz"
-
-KEYWORDS="amd64 ppc x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-S=${WORKDIR}/${P/r/R}
-
-PATCHES=( "${FILESDIR}"/${PN}-0.8.1_pre20070522-docpath.patch )
diff --git a/gnustep-libs/sope-3.2.10 b/gnustep-libs/sope-3.2.10
new file mode 100644
index 000000000000..37d2d2988ab5
--- /dev/null
+++ b/gnustep-libs/sope-3.2.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of frameworks forming a complete Web application server environment
+EAPI=6
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.10.tar.gz -> sope-3.2.10.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=2046f6bfe44c968c59486d61630c1026
diff --git a/gnustep-libs/sope-3.2.9 b/gnustep-libs/sope-3.2.9
new file mode 100644
index 000000000000..ba5ce92c2f05
--- /dev/null
+++ b/gnustep-libs/sope-3.2.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup unpack
+DEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=A set of frameworks forming a complete Web application server environment
+EAPI=6
+HOMEPAGE=http://www.sogo.nu/
+IUSE=gnutls ldap libressl mysql postgres +ssl +xml debug doc
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+RDEPEND=sys-libs/zlib ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) mysql? ( virtual/libmysqlclient:= ) postgres? ( dev-db/postgresql:= ) xml? ( dev-libs/libxml2:2 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+SLOT=0
+SRC_URI=https://github.com/inverse-inc/sope/archive/SOPE-3.2.9.tar.gz -> sope-3.2.9.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
+_md5_=2046f6bfe44c968c59486d61630c1026
diff --git a/gnustep-libs/sope/Manifest b/gnustep-libs/sope/Manifest
deleted file mode 100644
index 3dde6492db7e..000000000000
--- a/gnustep-libs/sope/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST sope-3.2.10.tar.gz 2197170 BLAKE2B 29c3400d3162b2bd659d06fbd806fcfa3307fbf6f00048567e26c3fdac5e492bd511773b402f79b92db457e9dc995b5dadd5dc84baf6cbd89b463ae5e4d65457 SHA512 09c0e8ca7333e89c48e30b19dc3bbacca5a28688145848ff332ff304f92a791b3895774e5fd1f77c6d4c8615ecb5a461ba348792502fc7c5bbd9d445a191bccf
-DIST sope-3.2.9.tar.gz 2196831 BLAKE2B 9f62310ed61893d85d38f192b5639de44a8e6240463563c64e9c0551624c9bfafdddad5e6a819f15cf7fa12842d55fe417bff3972fe42fe07ac8e99655d90730 SHA512 ffa3d63eed5862aba9740ab84408297218ad6cd75b0dc7e40f2810366281bf139c55e27c11405b51dc1cf640d5f5434ee14c2d5f1d0384ad50684c23d8bc58b7
-EBUILD sope-3.2.10.ebuild 1414 BLAKE2B e2cb7e5db51c0cc02c34a5bac89443227d319b3a8cd83aaf93b55c9147633a3b15036c5d92ccca93d061f0a0542dc2169152849e52048bbea094c4f92f7984ba SHA512 631d0864daf4e5ff495e1d5f99ce2421ec811d8501a8f340ee21125ff4e1adf0040e43d674a62bdee192b8536c0292321dfc922845547eeb15175b7d5879288c
-EBUILD sope-3.2.9.ebuild 1414 BLAKE2B e2cb7e5db51c0cc02c34a5bac89443227d319b3a8cd83aaf93b55c9147633a3b15036c5d92ccca93d061f0a0542dc2169152849e52048bbea094c4f92f7984ba SHA512 631d0864daf4e5ff495e1d5f99ce2421ec811d8501a8f340ee21125ff4e1adf0040e43d674a62bdee192b8536c0292321dfc922845547eeb15175b7d5879288c
-MISC metadata.xml 442 BLAKE2B c22c04cfdb873406b9b6c25ca6b6be0800c21847c62d08e46c3d6077bdf008bef48e9ae510eb193379bf68e239d577a081bca6b4ced2b1295dce707365779b7b SHA512 f3bc549fe00de1ba3f2f0d89d8a9e12a3dd2dea22e7afc26774de402ec73f97eb7408622c82eb9aace249e9edc358fa431a41d6ab71bf10ba0002652be359136
diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
deleted file mode 100644
index 57b2b4522b3c..000000000000
--- a/gnustep-libs/sope/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">inverse-inc/sope</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/gnustep-libs/sope/sope-3.2.10.ebuild b/gnustep-libs/sope/sope-3.2.10.ebuild
deleted file mode 100644
index 550358b4884d..000000000000
--- a/gnustep-libs/sope/sope-3.2.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sope/sope-3.2.9.ebuild b/gnustep-libs/sope/sope-3.2.9.ebuild
deleted file mode 100644
index 550358b4884d..000000000000
--- a/gnustep-libs/sope/sope-3.2.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap libressl mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	mysql? ( virtual/libmysqlclient:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	if use ssl && use gnutls && use libressl ; then
-		ewarn "You have enabled both gnutls and libressl, but only"
-		ewarn "one provider can be active. Using gnutls!"
-	fi
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}
diff --git a/gnustep-libs/sqlclient-1.8.1 b/gnustep-libs/sqlclient-1.8.1
new file mode 100644
index 000000000000..580ab40cd02c
--- /dev/null
+++ b/gnustep-libs/sqlclient-1.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup
+DEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+DESCRIPTION=GNUstep lightweight database abstraction layer
+EAPI=6
+HOMEPAGE=http://wiki.gnustep.org/index.php/SQLClient
+IUSE=java mysql postgres +sqlite elibc_FreeBSD java debug doc
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=LGPL-3
+RDEPEND=>=gnustep-libs/performance-0.3.2 mysql? ( virtual/mysql:= ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3 ) java? ( >=dev-java/java-config-2.2.0-r3 ) >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( !<sys-devel/gdb-6.0 )
+REQUIRED_USE=|| ( java mysql postgres sqlite )
+SLOT=0
+SRC_URI=ftp://ftp.gnustep.org/pub/gnustep/libs/SQLClient-1.8.1.tar.gz
+_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnustep-2	08755606aae625944316a7bd6d8228f5	gnustep-base	7a6c767d10a6758f97c305691b7d7a2a	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e670e5b3bfa373cce3c2b7643d2a681f
diff --git a/gnustep-libs/sqlclient/Manifest b/gnustep-libs/sqlclient/Manifest
deleted file mode 100644
index d2664f93a6be..000000000000
--- a/gnustep-libs/sqlclient/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SQLClient-1.8.1.tar.gz 148622 BLAKE2B 824d7510dacaa813b9b696530cbc4c3ab49c6de3303a6c4c8694226907c84b780f0eb5ec1298214247a41191a393931c89aba7d08c6e3cc5ef953fa6e1553ce1 SHA512 f0339063bf1f0a9050826440f9d4c116fddf61e62f4a8fd4c694afd079d82b54b306dcdadcd29951bbb3502129de211d166e2958de4d31cd6e78563498f2b50f
-EBUILD sqlclient-1.8.1.ebuild 1124 BLAKE2B 8e4fcdf6eef24215e962770b1ce54ba94c5af3182efc44e5e0b3c11ee94dee38eb5151382ac2340414679d9609e8365d5ead3146709e4a7d3f0bfb6a572b3f50 SHA512 83855211fe2bececedcec1bfc3ed309583b44001932b446d0cd0bbf6d14334b46a74c0c65402f02bd69b7e0bb3814cea09279eefc0a953bca79ef1c5c70bd020
-MISC metadata.xml 796 BLAKE2B 1695ffe2d2b9fe6ff8038689854907b7ec6290c027f3f7a5ab03098db92b79862ccfc67f6f5f8c3233aea0f06df37fce63f5f5361e43ea98186bb3a8a7a5bbc2 SHA512 a395bcea0e303cfd0a2a37fb51c13ea1828aad9e9dea0cc8d271e9f94d1073f1b99bf3162eaa2094e8e0e251e476505a1f94c1e4b00816e6cce4599e2cc02b4b
diff --git a/gnustep-libs/sqlclient/metadata.xml b/gnustep-libs/sqlclient/metadata.xml
deleted file mode 100644
index d044d0bd0362..000000000000
--- a/gnustep-libs/sqlclient/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>gnustep@gentoo.org</email>
-		<name>Gentoo GNUstep Project</name>
-	</maintainer>
-	<longdescription>The SQLClient library is designed to provide a simple interface to SQL databases for GNUstep applications. It does not attempt the sort of abstraction provided by the much more sophisticated GDL2 library but rather allows applications to directly execute SQL queries and statements.
-
-SQLClient provides for the Objective-C programmer much the same thing that JDBC provides for the Java programmer (though SQLClient is a bit faster, easier to use, and easier to add new database backends for than JDBC).</longdescription>
-</pkgmetadata>
diff --git a/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild b/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild
deleted file mode 100644
index 6861f637d3cb..000000000000
--- a/gnustep-libs/sqlclient/sqlclient-1.8.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit java-pkg-opt-2 gnustep-2
-
-MY_P=${P/sqlc/SQLC}
-DESCRIPTION="GNUstep lightweight database abstraction layer"
-HOMEPAGE="http://wiki.gnustep.org/index.php/SQLClient"
-SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/libs/${MY_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="LGPL-3"
-SLOT="0"
-
-IUSE="java mysql postgres +sqlite"
-
-RDEPEND=">=gnustep-libs/performance-0.3.2
-	mysql? ( virtual/mysql:= )
-	postgres? ( dev-db/postgresql:= )
-	sqlite? ( >=dev-db/sqlite-3 )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( java mysql postgres sqlite )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	if ! use doc; then
-		# Remove doc target
-		sed -i -e '/documentation\.make/d' GNUmakefile \
-			|| die "doc sed failed"
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=""
-	use java || myconf="${myconf} --disable-jdbc-bundle"
-	use mysql || myconf="${myconf} --disable-mysql-bundle"
-	use postgres || myconf="${myconf} --disable-postgres-bundle"
-	use sqlite || myconf="${myconf} --disable-sqllite-bundle"
-
-	egnustep_env
-	econf ${myconf}
-}